diff --git a/disassembly/GE007.rom.asm b/disassembly/GE007.rom.asm index 3fae540..6c0a07e 100644 --- a/disassembly/GE007.rom.asm +++ b/disassembly/GE007.rom.asm @@ -7,7 +7,7 @@ origin $00000000 include "rom/romheader.asm" include "code/boot.asm" -include "rodata/rodata.asm" +include "rodata/rodata.inc" include "code/rarezip.asm" include "code/tlb_code.asm" include "unk/unknown.asm" diff --git a/disassembly/GE007.sym.REMOVED.git-id b/disassembly/GE007.sym.REMOVED.git-id index 256d879..157e869 100644 --- a/disassembly/GE007.sym.REMOVED.git-id +++ b/disassembly/GE007.sym.REMOVED.git-id @@ -1 +1 @@ -18effcffdf485e565bfb1c9e6c823e6dd24ea4c1 \ No newline at end of file +755312a6cfbc11251c3b6504a121fcb6f6f10782 \ No newline at end of file diff --git a/disassembly/rodata/code.inc b/disassembly/rodata/code.inc new file mode 100644 index 0000000..da61520 --- /dev/null +++ b/disassembly/rodata/code.inc @@ -0,0 +1,17 @@ +base $803ab400 +sp_boot: + +base $803ab410 +sp_rmon: + +base $803ab710 +sp_idle: + +base $803ab750 +sp_shed: + +base $803ab950 +sp_main: + +base $803b3950 +sp_audi: diff --git a/disassembly/rodata/rodata.asm b/disassembly/rodata/rodata.asm index 2ce7672..e5787d3 100644 --- a/disassembly/rodata/rodata.asm +++ b/disassembly/rodata/rodata.asm @@ -1,20 +1,66 @@ -//arch n64.cpu -//endian msb -//output "rodata.bin", create +arch n64.cpu +endian msb +output "rodata.bin", create base origin() -rodata_rom_offset: - +include "code.inc" base $80020D90 rodata_start: -//insert rsp.bin, "rsp.bin" -//compressed binary for now -//will probably have to make rodata itself a project -//then have a tool to parse symtable into rodata.inc and matching rodata.rz -insert rodata_rz, "021990.rz" +rspcode_start: +insert rsp.bin, "rsp.bin" +rspcode_end: + +dword_80023040: +dw $00 + +dword_80023044: +dw $02 + +cart_hw_address: +dw $10000000 + +debug_handler_table: +dw sp_boot, aBoot +dw sp_rmon, aRmon +dw sp_idle, aIdle +dw sp_shed, aShed +dw sp_main, aMain +dw sp_audi, aAudi + +insert rodata.bin_filler, "021990.bin", origin(), ($800283D0 - $8002307C) + +base $800283D0 +aBoot: + db "boot" + dw $00 + +//base $800283D8 +aRmon: + db "rmon" + dw $00 + +//base $800283E0 +aIdle: + db "idle" + dw $00 + +//base $800283E8 +aShed: + db "shed" + dw $00 + +//base $800283F0 +aMain: + db "main" + dw $00 + +//base $800283F8 +aAudi: + db "audi" + dw $00 + +insert rodata.bin_raw, "021990.bin", origin() base $8005D2E0 rodata_end: -insert padding,"pad_to_33590" - diff --git a/disassembly/rodata/rodata.inc b/disassembly/rodata/rodata.inc new file mode 100644 index 0000000..51c0753 --- /dev/null +++ b/disassembly/rodata/rodata.inc @@ -0,0 +1,25 @@ + +base origin() +rodata_rom_offset: + +base $80020D90 +rodata_start: + +base $80020D90 +rspcode_start: + +base $8002303C +rspcode_end: + +base $80023044 +dword_80023044: + +base $80023048 +cart_hw_address: + +insert rodata_rz, "021990.rz" +base $8005D2E0 +rodata_end: + +insert padding,"pad_to_33590" + diff --git a/disassembly/rodata/rodata.sym b/disassembly/rodata/rodata.sym new file mode 100644 index 0000000..c6ace36 --- /dev/null +++ b/disassembly/rodata/rodata.sym @@ -0,0 +1,20 @@ +803ab400 sp_boot +803ab410 sp_rmon +803ab710 sp_idle +803ab750 sp_shed +803ab950 sp_main +803b3950 sp_audi +80020d90 rodata_start +80020d90 rspcode_start +80023040 rspcode_end +80023040 dword_80023040 +80023044 dword_80023044 +80023048 cart_hw_address +8002304c debug_handler_table +800283d0 aBoot +800283d8 aRmon +800283e0 aIdle +800283e8 aShed +800283f0 aMain +800283f8 aAudi +8005d2e0 rodata_end diff --git a/readme.md.REMOVED.git-id b/readme.md.REMOVED.git-id index f617d97..d3e0e8e 100644 --- a/readme.md.REMOVED.git-id +++ b/readme.md.REMOVED.git-id @@ -1 +1 @@ -92fb4f580c8ed2a4d2bf4bebb32ee39fdd0ea624 \ No newline at end of file +d2473b227edbd106a5f03c8dc99b807f26ecd41c \ No newline at end of file