treat emptyLvl as actual level overlay
This commit is contained in:
parent
8a10cbae14
commit
9dc37b91f5
4
Makefile
4
Makefile
|
@ -323,7 +323,7 @@ $(DECOMPRESSED_BASEROM): $(BASEROM) $(BK_ROM_DECOMPRESS)
|
||||||
# .o -> .elf (dummy symbols)
|
# .o -> .elf (dummy symbols)
|
||||||
$(PRELIM_ELF): $(ALL_OBJS) $(LD_SCRIPT) $(ASSET_OBJS)
|
$(PRELIM_ELF): $(ALL_OBJS) $(LD_SCRIPT) $(ASSET_OBJS)
|
||||||
$(call print1,Linking elf:,$@)
|
$(call print1,Linking elf:,$@)
|
||||||
@$(LD) $(LDFLAGS) -T undefined_syms_auto.$(VERSION).txt -T undefined_syms.$(VERSION).txt -T rzip_dummy_addrs.txt -T emptyLvl_dummy_addrs.txt -o $@
|
@$(LD) $(LDFLAGS) -T undefined_syms_auto.$(VERSION).txt -T undefined_syms.$(VERSION).txt -T rzip_dummy_addrs.txt -o $@
|
||||||
|
|
||||||
# .elf -> .z64 (dummy symbols)
|
# .elf -> .z64 (dummy symbols)
|
||||||
$(PRELIM_Z64) : $(PRELIM_ELF)
|
$(PRELIM_Z64) : $(PRELIM_ELF)
|
||||||
|
@ -337,7 +337,7 @@ $(COMPRESSED_SYMBOLS): $(PRELIM_ELF) $(PRELIM_Z64) $(BK_ROM_COMPRESS)
|
||||||
# .o -> .elf (game)
|
# .o -> .elf (game)
|
||||||
$(ELF): $(ALL_OBJS) $(LD_SCRIPT) $(ASSET_OBJS) $(COMPRESSED_SYMBOLS)
|
$(ELF): $(ALL_OBJS) $(LD_SCRIPT) $(ASSET_OBJS) $(COMPRESSED_SYMBOLS)
|
||||||
$(call print1,Linking elf:,$@)
|
$(call print1,Linking elf:,$@)
|
||||||
@$(LD) $(LDFLAGS) -T undefined_syms_auto.$(VERSION).txt -T undefined_syms.$(VERSION).txt -T $(COMPRESSED_SYMBOLS) -T emptyLvl_dummy_addrs.txt -o $@
|
@$(LD) $(LDFLAGS) -T undefined_syms_auto.$(VERSION).txt -T undefined_syms.$(VERSION).txt -T $(COMPRESSED_SYMBOLS) -o $@
|
||||||
|
|
||||||
# .elf -> .z64 (uncompressed)
|
# .elf -> .z64 (uncompressed)
|
||||||
$(UNCOMPRESSED_Z64) : $(ELF)
|
$(UNCOMPRESSED_Z64) : $(ELF)
|
||||||
|
|
|
@ -195,6 +195,8 @@ segments:
|
||||||
type: bin #type: rzip_code/overlay #compressed code
|
type: bin #type: rzip_code/overlay #compressed code
|
||||||
start: 0xFD6190
|
start: 0xFD6190
|
||||||
#vram: 0x803863F0
|
#vram: 0x803863F0
|
||||||
- [0xFDAA10, bin, emptyLvl.us.v10.rzip]
|
- name: emptyLvl.us.v10.rzip
|
||||||
|
type: bin #type: rzip_code/overlay #compressed code
|
||||||
|
start: 0xFD6190
|
||||||
- [0xFDAA30, bin, trailer] # 0xff to end
|
- [0xFDAA30, bin, trailer] # 0xff to end
|
||||||
- [0x1000000] # end of ROM
|
- [0x1000000] # end of ROM
|
||||||
|
|
|
@ -2223,6 +2223,13 @@ segments:
|
||||||
- [0x10BCC50, .rodata, code_7BF0]
|
- [0x10BCC50, .rodata, code_7BF0]
|
||||||
- [0x10BCC60, .rodata, code_8050]
|
- [0x10BCC60, .rodata, code_8050]
|
||||||
- [0x10BCD00, .bss, code_3310]
|
- [0x10BCD00, .bss, code_3310]
|
||||||
- [0x010BCD00, bin, emptyLvl.us.v10.rzip]
|
- name: emptyLvl
|
||||||
- [0x010BCD10, bin, trailer] # 0x00 to end
|
dir: emptyLvl
|
||||||
|
type: code
|
||||||
|
start: 0x010BCD00
|
||||||
|
vram: 0x803863F0
|
||||||
|
exclusive_ram_id: overlay
|
||||||
|
subsegments:
|
||||||
|
- [0x10BCD00, c, code_0]
|
||||||
|
- [0x10BCD10, .data, code_0]
|
||||||
- [0x010BCD20] # end of ROM
|
- [0x010BCD20] # end of ROM
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
boot_core1_us_v10_rzip_ROM_START = 0xF19250;
|
|
||||||
boot_core1_us_v10_rzip_ROM_END = 0xF37F90;
|
|
||||||
boot_core2_us_v10_rzip_ROM_START = 0xF37F90;
|
|
||||||
boot_core2_us_v10_rzip_ROM_END = 0xFA3FD0;
|
|
||||||
boot_CC_us_v10_rzip_ROM_START = 0xFA3FD0;
|
|
||||||
boot_CC_us_v10_rzip_ROM_END = 0xFA5F50;
|
|
||||||
boot_MMM_us_v10_rzip_ROM_START = 0xFA5F50;
|
|
||||||
boot_MMM_us_v10_rzip_ROM_END = 0xFA9150;
|
|
||||||
boot_GV_us_v10_rzip_ROM_START = 0xFA9150;
|
|
||||||
boot_GV_us_v10_rzip_ROM_END = 0xFAE860;
|
|
||||||
boot_TTC_us_v10_rzip_ROM_START = 0xFAE860;
|
|
||||||
boot_TTC_us_v10_rzip_ROM_END = 0xFB24A0;
|
|
||||||
boot_MM_us_v10_rzip_ROM_START = 0xFB24A0;
|
|
||||||
boot_MM_us_v10_rzip_ROM_END = 0xFB44E0;
|
|
||||||
boot_BGS_us_v10_rzip_ROM_START = 0xFB44E0;
|
|
||||||
boot_BGS_us_v10_rzip_ROM_END = 0xFB9A30;
|
|
||||||
boot_RBB_us_v10_rzip_ROM_START = 0xFB9A30;
|
|
||||||
boot_RBB_us_v10_rzip_ROM_END = 0xFBEBE0;
|
|
||||||
boot_FP_us_v10_rzip_ROM_START = 0xFBEBE0;
|
|
||||||
boot_FP_us_v10_rzip_ROM_END = 0xFC4810;
|
|
||||||
boot_CCW_us_v10_rzip_ROM_START = 0xFD6190;
|
|
||||||
boot_CCW_us_v10_rzip_ROM_END = 0xFDAA10;
|
|
||||||
boot_SM_us_v10_rzip_ROM_START = 0xFC4810;
|
|
||||||
boot_SM_us_v10_rzip_ROM_END = 0xFC6F20;
|
|
||||||
boot_cutscenes_us_v10_rzip_ROM_START = 0xFC6F20;
|
|
||||||
boot_cutscenes_us_v10_rzip_ROM_END = 0xFC9150;
|
|
||||||
boot_lair_us_v10_rzip_ROM_START = 0xFC9150;
|
|
||||||
boot_lair_us_v10_rzip_ROM_END = 0xFD0420;
|
|
||||||
boot_fight_us_v10_rzip_ROM_START = 0xFD0420;
|
|
||||||
boot_fight_us_v10_rzip_ROM_END = 0xFD6190;
|
|
||||||
boot_emptyLvl_us_v10_rzip_ROM_START = 0xFDAA10;
|
|
||||||
boot_emptyLvl_us_v10_rzip_ROM_END = 0xFDAA30;
|
|
|
@ -28,3 +28,5 @@ boot_lair_us_v10_rzip_ROM_START = 0xFC9150;
|
||||||
boot_lair_us_v10_rzip_ROM_END = 0xFD0420;
|
boot_lair_us_v10_rzip_ROM_END = 0xFD0420;
|
||||||
boot_fight_us_v10_rzip_ROM_START = 0xFD0420;
|
boot_fight_us_v10_rzip_ROM_START = 0xFD0420;
|
||||||
boot_fight_us_v10_rzip_ROM_END = 0xFD6190;
|
boot_fight_us_v10_rzip_ROM_END = 0xFD6190;
|
||||||
|
boot_emptyLvl_us_v10_rzip_ROM_START = 0xFDAA10;
|
||||||
|
boot_emptyLvl_us_v10_rzip_ROM_END = 0xFDAA30;
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
unsigned char emptyLvl = 0;
|
||||||
|
|
||||||
|
void emptyLvl_func_803863F0(void){}
|
|
@ -1 +1 @@
|
||||||
Subproject commit 8e4127e7499df843352b7461c751f79adca5d314
|
Subproject commit af9f3e18913dfe5b1f5ed2b69b28946444538a9c
|
Loading…
Reference in New Issue