mirror of https://github.com/pmret/papermario.git
Merge jp and us source directories (#390)
* match last bow fumction * decomp more partner functions * :) * :) * resolve merge conflict and style conflicts * fix * decomp :) * :( * :((( * :) * :( * :) * :))))) * :( * :/ * idk * :/ * What * Done. * PR comments * :( * decompile dead funcs * find_duplicates.py +x * rename dead functions and resolve PR * :) * . * . * decompile duplicate functions * :( * decompile several dupliacte funcions * decompile several dupliacte funcions * . * -- * resolve coverage issue * rename include-file to specify original use-case * upload broken splat/configure Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
Alexander Faßbender
GitHub
parent
d0be37641b
commit
109db7c43a
|
|
@ -12,7 +12,7 @@ options:
|
|||
symbol_addrs_path: ver/jp/symbol_addrs.txt
|
||||
ld_script_path: ver/jp/papermario.ld
|
||||
linker_symbol_header_path: ver/jp/build/include/ld_addrs.h
|
||||
src_path: src/jp
|
||||
src_path: src
|
||||
asm_path: ver/jp/asm
|
||||
asset_path: assets/jp
|
||||
build_path: ver/jp/build
|
||||
|
|
@ -33,197 +33,197 @@ segments:
|
|||
subalign: 8
|
||||
subsegments:
|
||||
- [0x1000, hasm, entry_point]
|
||||
- [0x1060, c] # 1060 (identical)
|
||||
- [0x1370, c] # 1370
|
||||
- [0x1B10, c] # 1B40
|
||||
- [0x2570, c]
|
||||
- [0x3BC0, c]
|
||||
- [0x42B0, c]
|
||||
- [0x5FC0, c]
|
||||
- [0x6200, c]
|
||||
- [0x6E00, c] # 6E40?
|
||||
- [0x7300, c]
|
||||
- [0x7E00, c]
|
||||
- [0x80A0, c]
|
||||
- [0x8490, c]
|
||||
- [0x99A0, c]
|
||||
- [0xAA20, c]
|
||||
- [0xAD70, c]
|
||||
- [0xD2A0, c]
|
||||
- [0xE5D0, c]
|
||||
- [0xE860, c]
|
||||
- [0xEF00, c]
|
||||
- [0x10080, c]
|
||||
- [0x10DB0, c]
|
||||
- [0x10E70, c]
|
||||
- [0x116D0, c]
|
||||
- [0x11E70, c]
|
||||
- [0x13140, c]
|
||||
- [0x13530, c]
|
||||
- [0x19EB0, c]
|
||||
- [0x1F240, c]
|
||||
- [0x20B80, c]
|
||||
- [0x23330, c]
|
||||
- [0x257A0, c]
|
||||
- [0x25BB0, c]
|
||||
- [0x264F0, c]
|
||||
- [0x285C0, c]
|
||||
- [0x2BC40, c]
|
||||
- [0x2D650, c]
|
||||
- [0x2DEE0, c]
|
||||
- [0x30070, c]
|
||||
- [0x30100, c]
|
||||
- [0x31300, c]
|
||||
- [0x33100, c]
|
||||
- [0x33E80, c]
|
||||
- [0x35770, c]
|
||||
- [0x35F50, c]
|
||||
- [0x38EC0, c]
|
||||
- [0x39960, c]
|
||||
- [0x3A300, c]
|
||||
- [0x3A340, c]
|
||||
- [0x3A380, c]
|
||||
- [0x3A3A0, c]
|
||||
- [0x3A4B0, c]
|
||||
- [0x3A4E0, c]
|
||||
- [0x3A500, c]
|
||||
- [0x3A610, c]
|
||||
- [0x3A700, c]
|
||||
- [0x3A760, c]
|
||||
- [0x3A9D0, c]
|
||||
- [0x3AF40, c]
|
||||
- [0x3AFA0, c]
|
||||
- [0x3B040, c]
|
||||
- [0x3B150, c, os/nusys/3B150] # 3b4a0
|
||||
- [0x3B2A0, c]
|
||||
- [0x3B400, c]
|
||||
- [0x3B420, c]
|
||||
- [0x3B4A0, c]
|
||||
- [0x3B7C0, c]
|
||||
- [0x3B8E0, c]
|
||||
- [0x3BCF0, c]
|
||||
- [0x3C130, c, os/osEPiWriteIo]
|
||||
- [0x3C190, c, os/osEPiReadIo]
|
||||
- [0x3C1F0, c]
|
||||
- [0x3C290, c]
|
||||
- [0x3C2E0, c]
|
||||
- [0x3C460, c]
|
||||
- [0x3C820, c]
|
||||
- [0x3C910, c]
|
||||
- [0x3CA50, c]
|
||||
- [0x3CAF0, c]
|
||||
- [0x3CC20, c]
|
||||
- [0x3CCA0, c]
|
||||
- [0x3CCD0, c]
|
||||
- [0x3CF50, c]
|
||||
- [0x3D260, c]
|
||||
- [0x3D2C0, c]
|
||||
- [0x3D2D0, c]
|
||||
- [0x3D300, c]
|
||||
- [0x3D580, c]
|
||||
- [0x3DC90, c]
|
||||
- [0x3E6F0, c]
|
||||
- [0x3ECE0, c]
|
||||
- [0x3EF60, c]
|
||||
- [0x3F2E0, c]
|
||||
- [0x3F6A0, c]
|
||||
- [0x3F9C0, c]
|
||||
- [0x3FA20, c]
|
||||
- [0x3FE70, c]
|
||||
- [0x40950, c]
|
||||
- [0x40980, c]
|
||||
- [0x40AC0, c]
|
||||
- [0x40BF0, c]
|
||||
- [0x40DD0, c]
|
||||
- [0x40DE0, c]
|
||||
- [0x41020, c]
|
||||
- [0x41040, c]
|
||||
- [0x41090, c]
|
||||
- [0x41140, c]
|
||||
- [0x41230, c]
|
||||
- [0x41320, c]
|
||||
- [0x413F0, c]
|
||||
- [0x41510, c]
|
||||
- [0x415D0, c]
|
||||
- [0x41610, c]
|
||||
- [0x41660, c]
|
||||
- [0x41670, c]
|
||||
- [0x41700, c]
|
||||
- [0x41720, c]
|
||||
- [0x41850, c]
|
||||
- [0x41B70, c]
|
||||
- [0x41C30, c]
|
||||
- [0x41CF0, c]
|
||||
- [0x41D30, c]
|
||||
- [0x41D80, c]
|
||||
- [0x41DC0, c]
|
||||
- [0x41E00, c]
|
||||
- [0x41E40, c]
|
||||
- [0x42180, c]
|
||||
- [0x421E0, c]
|
||||
- [0x42230, c]
|
||||
- [0x423A0, c]
|
||||
- [0x423F0, c]
|
||||
- [0x42440, c]
|
||||
- [0x42750, c]
|
||||
- [0x427B0, c]
|
||||
- [0x42820, c]
|
||||
- [0x42880, c]
|
||||
- [0x428E0, c]
|
||||
- [0x42960, c]
|
||||
- [0x429E0, c]
|
||||
- [0x42AE0, c]
|
||||
- [0x42BA0, c]
|
||||
- [0x42C00, c]
|
||||
- [0x42CE0, c]
|
||||
- [0x42D40, c]
|
||||
- [0x42DC0, c]
|
||||
- [0x42E50, c]
|
||||
- [0x42F00, c]
|
||||
- [0x431E0, c]
|
||||
- [0x43570, c]
|
||||
- [0x439A0, c]
|
||||
- [0x43BC0, c]
|
||||
- [0x441A0, c]
|
||||
- [0x44360, c]
|
||||
- [0x44470, c]
|
||||
- [0x44840, c]
|
||||
- [0x448A0, c]
|
||||
- [0x44AB0, c]
|
||||
- [0x44B20, c]
|
||||
- [0x455B0, c]
|
||||
- [0x457A0, c]
|
||||
- [0x45A10, c]
|
||||
- [0x45A30, c]
|
||||
- [0x45DD0, c]
|
||||
- [0x467D0, c]
|
||||
- [0x46860, c]
|
||||
- [0x46AC0, c]
|
||||
- [0x46C30, c]
|
||||
- [0x46C50, c]
|
||||
- [0x47A40, c]
|
||||
- [0x47A50, c]
|
||||
- [0x47A60, c]
|
||||
- [0x47A70, c]
|
||||
- [0x47AC0, c]
|
||||
- [0x47BA0, c]
|
||||
- [0x47BF0, c]
|
||||
- [0x47C40, c]
|
||||
- [0x47D30, c]
|
||||
- [0x47E10, c]
|
||||
- [0x47E70, c]
|
||||
- [0x47F80, c]
|
||||
- [0x47FA0, c]
|
||||
- [0x48000, c]
|
||||
- [0x48A00, c]
|
||||
- [0x48BC0, c]
|
||||
- [0x48BE0, c]
|
||||
- [0x491A0, c]
|
||||
- [0x49C50, c]
|
||||
- [0x4A120, c]
|
||||
- [0x4A190, c]
|
||||
- [0x4A1D0, c]
|
||||
- [0x4AC70, c]
|
||||
- [0x1060, c, jp/1060] # 1060 (identical)
|
||||
- [0x1370, c, jp/1370] # 1370
|
||||
- [0x1B10, c, jp/1B10] # 1B40
|
||||
- [0x2570, c, jp/2570]
|
||||
- [0x3BC0, c, jp/3BC0]
|
||||
- [0x42B0, c, jp/42B0]
|
||||
- [0x5FC0, c, jp/5FC0]
|
||||
- [0x6200, c, jp/6200]
|
||||
- [0x6E00, c, jp/6E00] # 6E40?
|
||||
- [0x7300, c, jp/7300]
|
||||
- [0x7E00, c, jp/7E00]
|
||||
- [0x80A0, c, jp/80A0]
|
||||
- [0x8490, c, jp/8490]
|
||||
- [0x99A0, c, jp/99A0]
|
||||
- [0xAA20, c, jp/AA20]
|
||||
- [0xAD70, c, jp/AD70]
|
||||
- [0xD2A0, c, jp/D2A0]
|
||||
- [0xE5D0, c, jp/E5D0]
|
||||
- [0xE860, c, jp/E860]
|
||||
- [0xEF00, c, jp/EF00]
|
||||
- [0x10080, c, jp/10080]
|
||||
- [0x10DB0, c, jp/10DB0]
|
||||
- [0x10E70, c, jp/10E70]
|
||||
- [0x116D0, c, jp/116D0]
|
||||
- [0x11E70, c, jp/11E70]
|
||||
- [0x13140, c, jp/13140]
|
||||
- [0x13530, c, jp/13530]
|
||||
- [0x19EB0, c, jp/19EB0]
|
||||
- [0x1F240, c, jp/1F240]
|
||||
- [0x20B80, c, jp/20B80]
|
||||
- [0x23330, c, jp/23330]
|
||||
- [0x257A0, c, jp/257A0]
|
||||
- [0x25BB0, c, jp/25BB0]
|
||||
- [0x264F0, c, jp/264F0]
|
||||
- [0x285C0, c, jp/285C0]
|
||||
- [0x2BC40, c, jp/2BC40]
|
||||
- [0x2D650, c, jp/2D650]
|
||||
- [0x2DEE0, c, jp/2DEE0]
|
||||
- [0x30070, c, jp/30070]
|
||||
- [0x30100, c, jp/30100]
|
||||
- [0x31300, c, jp/31300]
|
||||
- [0x33100, c, jp/33100]
|
||||
- [0x33E80, c, jp/33E80]
|
||||
- [0x35770, c, jp/35770]
|
||||
- [0x35F50, c, jp/35F50]
|
||||
- [0x38EC0, c, jp/38EC0]
|
||||
- [0x39960, c, jp/39960]
|
||||
- [0x3A300, c, jp/3A300]
|
||||
- [0x3A340, c, jp/3A340]
|
||||
- [0x3A380, c, jp/3A380]
|
||||
- [0x3A3A0, c, jp/3A3A0]
|
||||
- [0x3A4B0, c, jp/3A4B0]
|
||||
- [0x3A4E0, c, jp/3A4E0]
|
||||
- [0x3A500, c, jp/3A500]
|
||||
- [0x3A610, c, jp/3A610]
|
||||
- [0x3A700, c, jp/3A700]
|
||||
- [0x3A760, c, jp/3A760]
|
||||
- [0x3A9D0, c, jp/3A9D0]
|
||||
- [0x3AF40, c, jp/3AF40]
|
||||
- [0x3AFA0, c, jp/3AFA0]
|
||||
- [0x3B040, c, jp/3B040]
|
||||
- [0x3B150, c, jp/os/nusys/3B150] # 3b4a0
|
||||
- [0x3B2A0, c, jp/3B2A0]
|
||||
- [0x3B400, c, jp/3B400]
|
||||
- [0x3B420, c, jp/3B420]
|
||||
- [0x3B4A0, c, jp/3B4A0]
|
||||
- [0x3B7C0, c, jp/3B7C0]
|
||||
- [0x3B8E0, c, jp/3B8E0]
|
||||
- [0x3BCF0, c, jp/3BCF0]
|
||||
- [0x3C130, c, jp/os/osEPiWriteIo]
|
||||
- [0x3C190, c, jp/os/osEPiReadIo]
|
||||
- [0x3C1F0, c, jp/3C1F0]
|
||||
- [0x3C290, c, jp/3C290]
|
||||
- [0x3C2E0, c, jp/3C2E0]
|
||||
- [0x3C460, c, jp/3C460]
|
||||
- [0x3C820, c, jp/3C820]
|
||||
- [0x3C910, c, jp/3C910]
|
||||
- [0x3CA50, c, jp/3CA50]
|
||||
- [0x3CAF0, c, jp/3CAF0]
|
||||
- [0x3CC20, c, jp/3CC20]
|
||||
- [0x3CCA0, c, jp/3CCA0]
|
||||
- [0x3CCD0, c, jp/3CCD0]
|
||||
- [0x3CF50, c, jp/3CF50]
|
||||
- [0x3D260, c, jp/3D260]
|
||||
- [0x3D2C0, c, jp/3D2C0]
|
||||
- [0x3D2D0, c, jp/3D2D0]
|
||||
- [0x3D300, c, jp/3D300]
|
||||
- [0x3D580, c, jp/3D580]
|
||||
- [0x3DC90, c, jp/3DC90]
|
||||
- [0x3E6F0, c, jp/3E6F0]
|
||||
- [0x3ECE0, c, jp/3ECE0]
|
||||
- [0x3EF60, c, jp/3EF60]
|
||||
- [0x3F2E0, c, jp/3F2E0]
|
||||
- [0x3F6A0, c, jp/3F6A0]
|
||||
- [0x3F9C0, c, jp/3F9C0]
|
||||
- [0x3FA20, c, jp/3FA20]
|
||||
- [0x3FE70, c, jp/3FE70]
|
||||
- [0x40950, c, jp/40950]
|
||||
- [0x40980, c, jp/40980]
|
||||
- [0x40AC0, c, jp/40AC0]
|
||||
- [0x40BF0, c, jp/40BF0]
|
||||
- [0x40DD0, c, jp/40DD0]
|
||||
- [0x40DE0, c, jp/40DE0]
|
||||
- [0x41020, c, jp/41020]
|
||||
- [0x41040, c, jp/41040]
|
||||
- [0x41090, c, jp/41090]
|
||||
- [0x41140, c, jp/41140]
|
||||
- [0x41230, c, jp/41230]
|
||||
- [0x41320, c, jp/41320]
|
||||
- [0x413F0, c, jp/413F0]
|
||||
- [0x41510, c, jp/41510]
|
||||
- [0x415D0, c, jp/415D0]
|
||||
- [0x41610, c, jp/41610]
|
||||
- [0x41660, c, jp/41660]
|
||||
- [0x41670, c, jp/41670]
|
||||
- [0x41700, c, jp/41700]
|
||||
- [0x41720, c, jp/41720]
|
||||
- [0x41850, c, jp/41850]
|
||||
- [0x41B70, c, jp/41B70]
|
||||
- [0x41C30, c, jp/41C30]
|
||||
- [0x41CF0, c, jp/41CF0]
|
||||
- [0x41D30, c, jp/41D30]
|
||||
- [0x41D80, c, jp/41D80]
|
||||
- [0x41DC0, c, jp/41DC0]
|
||||
- [0x41E00, c, jp/41E00]
|
||||
- [0x41E40, c, jp/41E40]
|
||||
- [0x42180, c, jp/42180]
|
||||
- [0x421E0, c, jp/421E0]
|
||||
- [0x42230, c, jp/42230]
|
||||
- [0x423A0, c, jp/423A0]
|
||||
- [0x423F0, c, jp/423F0]
|
||||
- [0x42440, c, jp/42440]
|
||||
- [0x42750, c, jp/42750]
|
||||
- [0x427B0, c, jp/427B0]
|
||||
- [0x42820, c, jp/42820]
|
||||
- [0x42880, c, jp/42880]
|
||||
- [0x428E0, c, jp/428E0]
|
||||
- [0x42960, c, jp/42960]
|
||||
- [0x429E0, c, jp/429E0]
|
||||
- [0x42AE0, c, jp/42AE0]
|
||||
- [0x42BA0, c, jp/42BA0]
|
||||
- [0x42C00, c, jp/42C00]
|
||||
- [0x42CE0, c, jp/42CE0]
|
||||
- [0x42D40, c, jp/42D40]
|
||||
- [0x42DC0, c, jp/42DC0]
|
||||
- [0x42E50, c, jp/42E50]
|
||||
- [0x42F00, c, jp/42F00]
|
||||
- [0x431E0, c, jp/431E0]
|
||||
- [0x43570, c, jp/43570]
|
||||
- [0x439A0, c, jp/439A0]
|
||||
- [0x43BC0, c, jp/43BC0]
|
||||
- [0x441A0, c, jp/441A0]
|
||||
- [0x44360, c, jp/44360]
|
||||
- [0x44470, c, jp/44470]
|
||||
- [0x44840, c, jp/44840]
|
||||
- [0x448A0, c, jp/448A0]
|
||||
- [0x44AB0, c, jp/44AB0]
|
||||
- [0x44B20, c, jp/44B20]
|
||||
- [0x455B0, c, jp/455B0]
|
||||
- [0x457A0, c, jp/457A0]
|
||||
- [0x45A10, c, jp/45A10]
|
||||
- [0x45A30, c, jp/45A30]
|
||||
- [0x45DD0, c, jp/45DD0]
|
||||
- [0x467D0, c, jp/467D0]
|
||||
- [0x46860, c, jp/46860]
|
||||
- [0x46AC0, c, jp/46AC0]
|
||||
- [0x46C30, c, jp/46C30]
|
||||
- [0x46C50, c, jp/46C50]
|
||||
- [0x47A40, c, jp/47A40]
|
||||
- [0x47A50, c, jp/47A50]
|
||||
- [0x47A60, c, jp/47A60]
|
||||
- [0x47A70, c, jp/47A70]
|
||||
- [0x47AC0, c, jp/47AC0]
|
||||
- [0x47BA0, c, jp/47BA0]
|
||||
- [0x47BF0, c, jp/47BF0]
|
||||
- [0x47C40, c, jp/47C40]
|
||||
- [0x47D30, c, jp/47D30]
|
||||
- [0x47E10, c, jp/47E10]
|
||||
- [0x47E70, c, jp/47E70]
|
||||
- [0x47F80, c, jp/47F80]
|
||||
- [0x47FA0, c, jp/47FA0]
|
||||
- [0x48000, c, jp/48000]
|
||||
- [0x48A00, c, jp/48A00]
|
||||
- [0x48BC0, c, jp/48BC0]
|
||||
- [0x48BE0, c, jp/48BE0]
|
||||
- [0x491A0, c, jp/491A0]
|
||||
- [0x49C50, c, jp/49C50]
|
||||
- [0x4A120, c, jp/4A120]
|
||||
- [0x4A190, c, jp/4A190]
|
||||
- [0x4A1D0, c, jp/4A1D0]
|
||||
- [0x4AC70, c, jp/4AC70]
|
||||
- [0x4E580, bin]
|
||||
- name: mapfs
|
||||
type: pm_map_data
|
||||
|
|
|
|||
Loading…
Reference in New Issue