kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed splitting on latest splat by adding exclusive ram IDs to each overlay and IPL3

Browse Source
This commit is contained in:
Mr-Wiseguy
2022-11-15 20:35:03 -05:00
parent 91e1b93a22
commit 9d1e0d6c00
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -303,10 +303,10 @@ $(BOOT_MIPS3_OBJS) : $(BUILD_DIR)/%.c.o : %.c | $(C_BUILD_DIRS)
# Split baserom # Split baserom
$(BUILD_DIR)/SPLAT_TIMESTAMP: decompressed.$(VERSION).yaml $(SYMBOL_ADDRS) | $(BUILD_DIR) $(BUILD_DIR)/SPLAT_TIMESTAMP: decompressed.$(VERSION).yaml $(SYMBOL_ADDRS) | $(BUILD_DIR)
$(call print1,Splitting rom:,$<) $(call print1,Splitting rom:,$<)
@touch $@
@$(SPLAT) decompressed.$(VERSION).yaml @$(SPLAT) decompressed.$(VERSION).yaml
@touch $@
@touch $(LD_SCRIPT) @touch $(LD_SCRIPT)
sed -i '7s/.*/glabel D_80392D90\n .double 0.99999/' asm/nonmatchings/FP/code_5CC0/func_8038C428.s
# Dummy target to make the LD script and overlay rzips depend on splat being run # Dummy target to make the LD script and overlay rzips depend on splat being run
# without causing it to be rerun once for every overlay # without causing it to be rerun once for every overlay
# Bin files are also dependent on the splat timestamp since they get overwritten on resplit # Bin files are also dependent on the splat timestamp since they get overwritten on resplit

14
decompressed.us.v10.yaml
View File

@@ -29,6 +29,7 @@ segments:
type: code type: code
start: 0x0040 start: 0x0040
vram: 0xA4000040 vram: 0xA4000040
exclusive_ram_id: ipl3
subsegments: subsegments:
- [0x0040, bin, ipl3] - [0x0040, bin, ipl3]
- [0x0B70, bin, ipl3font] - [0x0B70, bin, ipl3font]
@@ -1546,6 +1547,7 @@ segments:
type: code type: code
start: 0x01048560 start: 0x01048560
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x1048560, c, code_0] - [0x1048560, c, code_0]
- [0x1048A90, c, code_530] #Done - [0x1048A90, c, code_530] #Done
@@ -1576,6 +1578,7 @@ segments:
type: code type: code
start: 0x0104C0E0 start: 0x0104C0E0
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x104C0E0, c, code_0] #DONE - [0x104C0E0, c, code_0] #DONE
- [0x104C310, c, code_230] #DONE - [0x104C310, c, code_230] #DONE
@@ -1663,6 +1666,7 @@ segments:
type: code type: code
start: 0x01057710 start: 0x01057710
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x1057710, c, ch/loggo] #DONE - [0x1057710, c, ch/loggo] #DONE
- [0x1057C80, c, ch/napper] #DONE - [0x1057C80, c, ch/napper] #DONE
@@ -1703,6 +1707,7 @@ segments:
type: code type: code
start: 0x0105D7E0 start: 0x0105D7E0
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x105D7E0, c, code_0] #DONE - [0x105D7E0, c, code_0] #DONE
- [0x105E880, c, code_10A0] #DONE - [0x105E880, c, code_10A0] #DONE
@@ -1741,6 +1746,7 @@ segments:
type: code type: code
start: 0x01064AE0 start: 0x01064AE0
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x1064AE0, c, ch/orangepad] - [0x1064AE0, c, ch/orangepad]
- [0x1065050, c, ch/hut] - [0x1065050, c, ch/hut]
@@ -1776,6 +1782,7 @@ segments:
type: code type: code
start: 0x01068370 start: 0x01068370
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
# after: core2-data # after: core2-data
subsegments: subsegments:
- [0x1068370, c, ch/flibbit] #DONE - [0x1068370, c, ch/flibbit] #DONE
@@ -1832,6 +1839,7 @@ segments:
type: code type: code
start: 0x010731B0 start: 0x010731B0
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x10731B0, c, code_0] - [0x10731B0, c, code_0]
- [0x10737F0, c, code_640] - [0x10737F0, c, code_640]
@@ -1916,6 +1924,7 @@ segments:
type: code type: code
start: 0x0107E030 start: 0x0107E030
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x107E030, c, code_0] #DONE - [0x107E030, c, code_0] #DONE
- [0x107E500, c, code_4D0] #DONE - [0x107E500, c, code_4D0] #DONE
@@ -1985,6 +1994,7 @@ segments:
type: code type: code
start: 0x0108AB50 start: 0x0108AB50
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x108AB50, c, code_0] - [0x108AB50, c, code_0]
- [0x108AC40, c, code_F0] - [0x108AC40, c, code_F0]
@@ -2019,6 +2029,7 @@ segments:
type: code type: code
start: 0x0108FA80 start: 0x0108FA80
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x108FA80, c, code_0] - [0x108FA80, c, code_0]
- [0x1095B70, c, code_60F0] #DONE - [0x1095B70, c, code_60F0] #DONE
@@ -2039,6 +2050,7 @@ segments:
type: code type: code
start: 0x01098070 start: 0x01098070
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x1098070, c, code_0] #DONE - [0x1098070, c, code_0] #DONE
- [0x109C310, c, code_42A0] #DONE - [0x109C310, c, code_42A0] #DONE
@@ -2086,6 +2098,7 @@ segments:
type: code type: code
start: 0x010A6FD0 start: 0x010A6FD0
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x10A6FD0, c, code_0] #DONE - [0x10A6FD0, c, code_0] #DONE
- [0x10A7150, c, chfinalboss] - [0x10A7150, c, chfinalboss]
@@ -2127,6 +2140,7 @@ segments:
type: code type: code
start: 0x010B3320 start: 0x010B3320
vram: 0x803863F0 vram: 0x803863F0
exclusive_ram_id: overlay
subsegments: subsegments:
- [0x10B3320, c, code_0] #DONE - [0x10B3320, c, code_0] #DONE
- [0x10B3480, c, code_160] #DONE - [0x10B3480, c, code_160] #DONE

3
symbol_addrs.global.us.v10.txt
View File

@@ -69,4 +69,5 @@ D_803907B0 = 0x803907B0;
core2_TEXT_START = 0x80286F90; core2_TEXT_START = 0x80286F90;
ml_min_w = 0x80258948; ml_min_w = 0x80258948;
guLookAtReflect = 0x8024128C; guLookAtReflect = 0x8024128C;
D_80392D90 = 0x80392D90; // defined:false rom:0x108A9D0 D_80392D90 = 0x80392D90; // defined:false rom:0x108A9D0
lair_D_80392D90 = 0x80392D90; // defined:false rom:0x10A4A10

1
undefined_syms.us.v10.txt
View File

@@ -13,7 +13,6 @@ D_8038D590 = 0x8038D590;
D_8038D6DC = 0x8038D6DC; D_8038D6DC = 0x8038D6DC;
D_8038D844 = 0x8038D844; D_8038D844 = 0x8038D844;
fight_D_80391A10 = 0x80391A10; fight_D_80391A10 = 0x80391A10;
D_80392D90 = 0x80392D90;
FP_D_80392840 = 0x80392840; FP_D_80392840 = 0x80392840;
core1_D_803727F4 = 0x803727F4; core1_D_803727F4 = 0x803727F4;
__osBaseTimer = 0x80285D00; __osBaseTimer = 0x80285D00;