mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-23 15:01:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

better splits and fixed us syms

Browse Source
This commit is contained in:
Yanis002
2025-01-30 17:54:54 +01:00
parent 268d0822eb
commit 59203c7bb9
11 changed files with 203 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/eur/arm9/delinks.txt
+8 -5
View File
@@ -30,13 +30,16 @@ src/Main/Message/BMG.cpp:
.rodata start:0x02056958 end:0x020569e0
src/Main/Message/func_0203744c.cpp:
.text start:0x0203744c end:0x02038b28
.text start:0x0203744c end:0x02038aa0
src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp:
.text start:0x02038b28 end:0x020397f8
src/Main/Message/func_02038aa0.cpp:
.text start:0x02038aa0 end:0x0203c358
src/Main/Message/func_020397f8.cpp:
.text start:0x020397f8 end:0x0203c8a8
src/Main/Message/func_0203c358.cpp:
.text start:0x0203c358 end:0x0203c72c
src/Main/Message/func_0203c72c.cpp:
.text start:0x0203c72c end:0x0203c8a8
src/Main/Message/func_0203c8a8.cpp:
.text start:0x0203c8a8 end:0x0203e784
config/usa/arm9/symbols.txt
+55 -55
View File
@@ -1645,8 +1645,8 @@ func_02032d40 kind:function(thumb,size=0x28) addr:0x2032d3c
func_02032d68 kind:function(arm,size=0xdc) addr:0x2032d64
func_02032e44 kind:function(arm,size=0x1c) addr:0x2032e40
func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e5c
func_02032e7c kind:function(arm,size=0x48) addr:0x2032e78
func_02032ec4 kind:function(arm,size=0x48) addr:0x2032ec0
_ZN31UnkSubClass1_UnkownClass2_Base1C2Ev kind:function(arm,size=0x48) addr:0x2032e78
_ZN31UnkSubClass1_UnkownClass2_Base1C1Ev kind:function(arm,size=0x48) addr:0x2032ec0
_ZN12MsgProc_BaseC2Ev kind:function(thumb,size=0x78) addr:0x2032f08
func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f80
func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f84
@@ -1732,10 +1732,10 @@ func_02034fac kind:function(arm,size=0x14) addr:0x2034f68
func_02034fc0 kind:function(arm,size=0x14) addr:0x2034f7c
func_02034fd4 kind:function(arm,size=0x38) addr:0x2034f90
func_0203500c kind:function(arm,size=0x10) addr:0x2034fc8
func_0203501c kind:function(arm,size=0x48) addr:0x2034fd8
_ZN25UnkSubClass1_UnkownClass1C2Ev kind:function(arm,size=0x48) addr:0x2034fd8
_ZN25UnkSubClass1_UnkownClass1C1Ev kind:function(arm,size=0x48) addr:0x2035020
func_020350ac kind:function(arm,size=0x4) addr:0x2035068
func_020350b0 kind:function(arm,size=0x4) addr:0x203506c
_ZN25UnkSubClass1_UnkownClass1D1Ev kind:function(arm,size=0x4) addr:0x2035068
_ZN25UnkSubClass1_UnkownClass1D2Ev kind:function(arm,size=0x4) addr:0x203506c
func_020350b4 kind:function(arm,size=0xb8) addr:0x2035070
func_0203516c kind:function(arm,size=0x3c) addr:0x2035128
func_020351a8 kind:function(arm,size=0x8) addr:0x2035164
@@ -1792,7 +1792,7 @@ func_020363c8 kind:function(arm,size=0x74) addr:0x2036384
_ZN18UnkStruct_027E0C6813func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x20363f8
_ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x203644c
_ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x2036618
_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x2036664
func_020366a8 kind:function(arm,size=0x1c) addr:0x2036664
_ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x2036680
_ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x20366bc
_ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x20366f8
@@ -1804,14 +1804,14 @@ _ZN18UnkStruct_027E0C6813func_02036808Ev kind:function(arm,size=0x1c) addr:0x203
_ZN18UnkStruct_027E0C6813func_02036824Ev kind:function(arm,size=0x2c) addr:0x20367e0
_ZN18UnkStruct_027E0C6813func_02036850Ev kind:function(arm,size=0x38) addr:0x203680c
_ZN18UnkStruct_027E0C6813func_02036888EP31UnkStruct_027E0C68_UnkSubClass2 kind:function(arm,size=0x6c) addr:0x2036844
_ZN18UnkStruct_027E0C6813func_020368f4EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x18) addr:0x20368b0
_ZN18UnkStruct_027E0C6813func_020368f4EP37UnkStruct_027E0C68_UnkSubClass2_Base1 kind:function(arm,size=0x18) addr:0x20368b0
_ZN18UnkStruct_027E0C6813func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x20368c8
_ZN18UnkStruct_027E0C6813func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036b78
_ZN18UnkStruct_027E0C6813func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c0c
_ZN18UnkStruct_027E0C6813func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036c60
_ZN18UnkStruct_027E0C6813func_02036ce4EP31UnkStruct_027E0C68_UnkSubClass2i kind:function(arm,size=0x4c) addr:0x2036ca0
_ZN18UnkStruct_027E0C6813func_02036d30EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x1c) addr:0x2036cec
_ZN18UnkStruct_027E0C6813func_02036d4cEP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x20) addr:0x2036d08
_ZN18UnkStruct_027E0C6813func_02036d30EP37UnkStruct_027E0C68_UnkSubClass2_Base1 kind:function(arm,size=0x1c) addr:0x2036cec
_ZN18UnkStruct_027E0C6813func_02036d4cEP37UnkStruct_027E0C68_UnkSubClass2_Base1 kind:function(arm,size=0x20) addr:0x2036d08
_ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28
_ZN18UnkStruct_027E0C6813func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036d64
_ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036e98
@@ -1820,7 +1820,7 @@ _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x20
_ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370a4
_ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037114
_ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037134
_Z13func_020371b0v kind:function(arm,size=0x4) addr:0x203716c
_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x4) addr:0x203716c
_Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170
_Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184
_Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037214
@@ -1839,10 +1839,10 @@ func_02037604 kind:function(arm,size=0x24) addr:0x20375c0
func_02037628 kind:function(arm,size=0x98) addr:0x20375e4
func_020376c0 kind:function(arm,size=0x64) addr:0x203767c
func_02037724 kind:function(arm,size=0x2c) addr:0x20376e0
func_02037750 kind:function(arm,size=0x44) addr:0x203770c
func_02037794 kind:function(arm,size=0x38) addr:0x2037750
func_020377cc kind:function(arm,size=0x40) addr:0x2037788
func_0203780c kind:function(arm,size=0x38) addr:0x20377c8
_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1C2Eii kind:function(arm,size=0x44) addr:0x203770c
_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1D1Ev kind:function(arm,size=0x38) addr:0x2037750
_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1D0Ev kind:function(arm,size=0x40) addr:0x2037788
_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1D2Ev kind:function(arm,size=0x38) addr:0x20377c8
func_02037844 kind:function(arm,size=0x10) addr:0x2037800
func_02037854 kind:function(arm,size=0xc4) addr:0x2037810
func_02037918 kind:function(arm,size=0x234) addr:0x20378d4
@@ -1856,29 +1856,29 @@ func_020386b4 kind:function(arm,size=0x4) addr:0x2038670
func_020386b8 kind:function(arm,size=0xc) addr:0x2038674
func_020386c4 kind:function(arm,size=0x8) addr:0x2038680
func_020386cc kind:function(arm,size=0xc) addr:0x2038688
func_020386d8 kind:function(arm,size=0x40) addr:0x2038694
_ZN31UnkStruct_027E0C68_UnkSubClass2C2Ev kind:function(arm,size=0x40) addr:0x2038694
_ZN31UnkStruct_027E0C68_UnkSubClass2C1Ev kind:function(arm,size=0x40) addr:0x20386d4
func_02038758 kind:function(arm,size=0x18) addr:0x2038714
func_02038770 kind:function(arm,size=0x1c) addr:0x203872c
func_0203878c kind:function(arm,size=0x18) addr:0x2038748
func_020387a4 kind:function(arm,size=0x28) addr:0x2038760
func_020387cc kind:function(arm,size=0x14) addr:0x2038788
_ZN31UnkStruct_027E0C68_UnkSubClass2D2Ev kind:function(arm,size=0x14) addr:0x2038788
func_020387e0 kind:function(thumb,size=0xc) addr:0x203879c
func_020387ec kind:function(arm,size=0x18) addr:0x20387a8
func_02038804 kind:function(arm,size=0x18) addr:0x20387c0
func_0203881c kind:function(arm,size=0x3c) addr:0x20387d8
_ZN25UnkSubClass1_UnkownClass2C1Ev kind:function(arm,size=0x3c) addr:0x20387d8
func_02038858 kind:function(arm,size=0x30) addr:0x2038814
func_02038888 kind:function(arm,size=0xc8) addr:0x2038844
func_02038950 kind:function(arm,size=0x130) addr:0x203890c
func_02038a80 kind:function(arm,size=0x1c) addr:0x2038a3c
func_02038a9c kind:function(thumb,size=0x4) addr:0x2038a58
_ZN12MsgProc_MainC1Eic kind:function(thumb,size=0x5c) addr:0x2038a5c
func_02038afc kind:function(thumb,size=0xc) addr:0x2038ab8
func_02038b08 kind:function(thumb,size=0x14) addr:0x2038ac4
func_02038b1c kind:function(thumb,size=0xc) addr:0x2038ad8
_ZN12MsgProc_MainC2Eisi kind:function(thumb,size=0x5c) addr:0x2038a5c
_ZN12MsgProc_MainD1Ev kind:function(thumb,size=0xc) addr:0x2038ab8
_ZN12MsgProc_MainD0Ev kind:function(thumb,size=0x14) addr:0x2038ac4
_ZN12MsgProc_MainD2Ev kind:function(thumb,size=0xc) addr:0x2038ad8
func_02038b28 kind:function(thumb,size=0xc) addr:0x2038ae4
func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0
_Z13func_02038b40P31MsgProc_Type1 kind:function(arm,size=0x34) addr:0x2038afc
_ZN12MsgProc_Main13func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038afc
func_02038b74 kind:function(arm,size=0x4) addr:0x2038b30
func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b34
_ZN13MsgProc_Type18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0
@@ -1908,57 +1908,57 @@ func_0203951c kind:function(arm,size=0x40) addr:0x20394d8
func_0203955c kind:function(arm,size=0x14) addr:0x2039518
func_02039570 kind:function(arm,size=0x8) addr:0x203952c
_ZN13MsgProc_Type18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039534
_ZN13MsgProc_Type1C2Ev kind:function(thumb,size=0x244) addr:0x2039570
_ZN13MsgProc_Type1C1Ev kind:function(thumb,size=0x244) addr:0x20397b4
_ZN13MsgProc_Type1C2Eisi kind:function(thumb,size=0x244) addr:0x2039570
_ZN13MsgProc_Type1C1Eisi kind:function(thumb,size=0x244) addr:0x20397b4
_ZN13MsgProc_Type113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8
_ZN13MsgProc_Type18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a18
func_02039ca8 kind:function(arm,size=0x24) addr:0x2039c64
_ZN13MsgProc_Type113func_02039ca8Ev kind:function(arm,size=0x24) addr:0x2039c64
_ZN13MsgProc_Type18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039c88
_ZN13MsgProc_Type18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d30
func_0203a188 kind:function(arm,size=0x138) addr:0x203a144
func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a27c
func_0203a30c kind:function(arm,size=0x1c) addr:0x203a2c8
_ZN13MsgProc_Type113func_0203a188Eiii kind:function(arm,size=0x138) addr:0x203a144
_ZN13MsgProc_Type113func_0203a2c0Ev kind:function(arm,size=0x4c) addr:0x203a27c
_ZN13MsgProc_Type113func_0203a30cEv kind:function(arm,size=0x1c) addr:0x203a2c8
_ZN13MsgProc_Type18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a2e4
func_0203a35c kind:function(arm,size=0x84) addr:0x203a318
func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a39c
_ZN13MsgProc_Type113func_0203a35cEv kind:function(arm,size=0x84) addr:0x203a318
_ZN13MsgProc_Type113func_0203a3e0Ev kind:function(arm,size=0x1c) addr:0x203a39c
_ZN13MsgProc_Type18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3b8
func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a68c
_ZN13MsgProc_Type113func_0203a6d0Eii kind:function(arm,size=0x120) addr:0x203a68c
_ZN13MsgProc_Type18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7ac
_ZN13MsgProc_Type18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a944
_ZN13MsgProc_Type18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203ae64
_ZN13MsgProc_Type18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203aed8
func_0203b0bc kind:function(arm,size=0x30) addr:0x203b078
func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0a8
_ZN13MsgProc_Type113func_0203b0bcEv kind:function(arm,size=0x30) addr:0x203b078
_ZN13MsgProc_Type113func_0203b0ecEi kind:function(arm,size=0x178) addr:0x203b0a8
_ZN13MsgProc_Type18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220
_ZN13MsgProc_Type18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc
_ZN13MsgProc_Type18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b3cc
_ZN13MsgProc_Type18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b58c
func_0203b764 kind:function(arm,size=0xb0) addr:0x203b720
_ZN13MsgProc_Type113func_0203b764Ev kind:function(arm,size=0xb0) addr:0x203b720
_ZN13MsgProc_Type18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b7d0
func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd48
_ZN13MsgProc_Type113func_0203bd8cEt kind:function(arm,size=0x40) addr:0x203bd48
_ZN13MsgProc_Type18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88
func_0203be08 kind:function(arm,size=0x5c) addr:0x203bdc4
_ZN13MsgProc_Type113func_0203be08Ev kind:function(arm,size=0x5c) addr:0x203bdc4
func_0203be64 kind:function(arm,size=0x220) addr:0x203be20
func_0203c084 kind:function(arm,size=0xb8) addr:0x203c040
func_0203c13c kind:function(arm,size=0x64) addr:0x203c0f8
func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c15c
func_0203c25c kind:function(arm,size=0x6c) addr:0x203c218
_ZN13MsgProc_Type113func_0203c084Ev kind:function(arm,size=0xb8) addr:0x203c040
_ZN13MsgProc_Type113func_0203c13cEv kind:function(arm,size=0x64) addr:0x203c0f8
_ZN13MsgProc_Type113func_0203c1a0Ev kind:function(arm,size=0xbc) addr:0x203c15c
_ZN13MsgProc_Type113func_0203c25cEPS_ kind:function(arm,size=0x6c) addr:0x203c218
_ZN13MsgProc_Type1D0Ev kind:function(arm,size=0x48) addr:0x203c284
_ZN13MsgProc_Type1D2Ev kind:function(arm,size=0x40) addr:0x203c2cc
_ZN13MsgProc_Type18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c30c
_ZN13MsgProc_Type2C1Ev kind:function(thumb,size=0x44) addr:0x203c314
func_0203c39c kind:function(thumb,size=0x78) addr:0x203c358
func_0203c414 kind:function(arm,size=0x4c) addr:0x203c3d0
func_0203c460 kind:function(arm,size=0x4c) addr:0x203c41c
_ZN13MsgProc_Type2C1Eisi kind:function(thumb,size=0x44) addr:0x203c314
_ZN13MsgProc_Type213func_0203c39cEii kind:function(thumb,size=0x78) addr:0x203c358
_ZN13MsgProc_Type28vfunc_3CEi kind:function(arm,size=0x4c) addr:0x203c3d0
_ZN13MsgProc_Type28vfunc_40Eii kind:function(arm,size=0x4c) addr:0x203c41c
func_0203c4ac kind:function(arm,size=0x118) addr:0x203c468
func_0203c5c4 kind:function(arm,size=0x18) addr:0x203c580
_ZN13MsgProc_Type28vfunc_14Eii kind:function(arm,size=0x18) addr:0x203c580
func_0203c5dc kind:function(arm,size=0x120) addr:0x203c598
func_0203c6fc kind:function(arm,size=0x1c) addr:0x203c6b8
func_0203c718 kind:function(arm,size=0x14) addr:0x203c6d4
_ZN13MsgProc_Type3C1Ev kind:function(arm,size=0x110) addr:0x203c6e8
func_0203c83c kind:function(arm,size=0x4) addr:0x203c7f8
func_0203c840 kind:function(arm,size=0x30) addr:0x203c7fc
func_0203c870 kind:function(arm,size=0x38) addr:0x203c82c
_ZN13MsgProc_Type2D0Ev kind:function(arm,size=0x1c) addr:0x203c6b8
_ZN13MsgProc_Type2D2Ev kind:function(arm,size=0x14) addr:0x203c6d4
_ZN13MsgProc_Type3C1Eisi kind:function(arm,size=0x110) addr:0x203c6e8
_ZN13MsgProc_Type313func_0203c83cEv kind:function(arm,size=0x4) addr:0x203c7f8
_ZN13MsgProc_Type3D2Ev kind:function(arm,size=0x30) addr:0x203c7fc
_ZN13MsgProc_Type3D0Ev kind:function(arm,size=0x38) addr:0x203c82c
func_0203c8a8 kind:function(arm,size=0x58) addr:0x203c864
func_0203c900 kind:function(arm,size=0x4) addr:0x203c8bc
func_0203c904 kind:function(arm,size=0x11c) addr:0x203c8c0
@@ -2024,10 +2024,10 @@ func_0203d848 kind:function(arm,size=0x8c) addr:0x203d804
func_0203d8d4 kind:function(arm,size=0x8c) addr:0x203d890
func_0203d960 kind:function(arm,size=0xc0) addr:0x203d91c
func_0203da20 kind:function(arm,size=0xc0) addr:0x203d9dc
func_0203dae0 kind:function(thumb,size=0x98) addr:0x203da9c
func_0203db78 kind:function(thumb,size=0x30) addr:0x203db34
func_0203dba8 kind:function(thumb,size=0x38) addr:0x203db64
func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203db9c
_ZN13MsgProc_Base2C2Eiii kind:function(thumb,size=0x98) addr:0x203da9c
_ZN13MsgProc_Base2D1Ev kind:function(thumb,size=0x30) addr:0x203db34
_ZN13MsgProc_Base2D0Ev kind:function(thumb,size=0x38) addr:0x203db64
_ZN13MsgProc_Base2D2Ev kind:function(thumb,size=0x30) addr:0x203db9c
func_0203dc10 kind:function(arm,size=0x64) addr:0x203dbcc
func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc30
_ZN13MsgProc_Type18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dc70
include/Message/MessageManager.hpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "System/SysNew.hpp"
#include "Message/BMG.hpp"
#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp"
#include "Message/MsgProc.hpp"
#include "lib/math.h"
// astruct_14
include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp → include/Message/MsgProc.hpp
View File
src/Main/Message/func_02032f0c.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp"
#include "Message/MsgProc.hpp"
#include "Message/MessageManager.hpp"
#include "Save/AdventureFlags.hpp"
#include "DTCM/UnkStruct_027e103c.hpp"
src/Main/Message/func_0203744c.cpp
+1 -18
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp"
#include "Message/MsgProc.hpp"
#include "Message/MessageManager.hpp"
#include "Save/AdventureFlags.hpp"
#include "DTCM/UnkStruct_027e103c.hpp"
@@ -42,20 +42,3 @@ ARM UnkSubClass1_UnkownClass2::UnkSubClass1_UnkownClass2() {
this->unk_20 = 0;
this->unk_24 = 0;
}
THUMB MsgProc_Main::MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4)
: MsgProc_Base2(param_2, param_3, param_4),
unk_124(0)
{
this->func_020387e0(this->unk_150);
this->unk_154 = 0;
this->unk_158.y = 0;
this->unk_15C = 0;
this->unk_15E = 0xFF;
this->unk_15F = 0xFF;
this->unk_160 = 1;
this->unk_11E = param_3;
}
THUMB MsgProc_Main::~MsgProc_Main() {
}
src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp → src/Main/Message/func_02038aa0.cpp
+18 -1
View File
@@ -1,11 +1,28 @@
#include "global.h"
#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp"
#include "Message/MsgProc.hpp"
#include "Message/MessageManager.hpp"
#include "Save/AdventureFlags.hpp"
#include "DTCM/UnkStruct_027e103c.hpp"
#include "Player/TouchControl.hpp"
#include "Item/ItemManager.hpp"
THUMB MsgProc_Main::MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4)
: MsgProc_Base2(param_2, param_3, param_4),
unk_124(0)
{
this->func_020387e0(this->unk_150);
this->unk_154 = 0;
this->unk_158.y = 0;
this->unk_15C = 0;
this->unk_15E = 0xFF;
this->unk_15F = 0xFF;
this->unk_160 = 1;
this->unk_11E = param_3;
}
THUMB MsgProc_Main::~MsgProc_Main() {
}
ARM unk32 MsgProc_Type1::vfunc_34(unk32 param_2) {
s16 iVar1;
unk32 iVar2;
src/Main/Message/func_020397f8.cpp
+1 -101
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp"
#include "Message/MsgProc.hpp"
#include "Message/MessageManager.hpp"
#include "Save/AdventureFlags.hpp"
#include "DTCM/UnkStruct_027e103c.hpp"
@@ -9,7 +9,6 @@
extern "C" void func_ov000_020d0460(void*);
extern "C" void func_0203efd8(void*, void*);
extern "C" void func_0203ee48(void*);
extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void*, void*);
extern unk16 data_02056a0e[];
extern u8 data_02056a08[];
@@ -1216,102 +1215,3 @@ ARM MsgProc_Type1::~MsgProc_Type1() {
ARM bool MsgProc_Type1::vfunc_38(void) {
return true;
}
THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) :
MsgProc_Main(0, 0, param_4)
{
this->unk_162 = 4;
this->unk_164 = 1;
this->unk_166 = 0;
this->unk_168 = -1;
this->unk_16A = 0;
this->unk_16C = 1;
this->unk_16E = 0;
}
// non-matching
THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) {
u16 uVar1;
unk32 uVar2;
s16 uVar3;
s32 iVar4;
s32 local_20;
s32 local_1c [2];
this->func_02038b28();
uVar3 = 0;
for (iVar4 = 0; iVar4 < 2; iVar4++) {
local_1c[0] = 0xC0;
local_20 = 0x10;
if (iVar4 != 0) {
this->func_0203fc78(local_1c, &local_20);
}
uVar1 = this->func_0203d318((s32)(local_1c[0] + 7 + ((u32)(local_1c[0] + 7 >> 2) >> 0x1D)) >> 3,
(s32)(local_20 + 7 + ((u32)(local_20 + 7 >> 2) >> 0x1D)) >> 3);
if (uVar3 < uVar1) {
uVar3 = uVar1;
}
}
if (this->unk_114->vfunc_08(this, uVar3) != 0) {
this->unk_10 = this->unk_114->func_0203d1b4();
}
}
ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) {
if (this->unk_15C > 0 && this->unk_122 != 1) {
if (this->func_0203de14(param_2) != 0) {
this->vfunc_40(0, 0);
}
}
}
ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) {
param_2 += this->unk_166;
param_3 += this->unk_168;
this->func_0203c4ac(param_2 + this->unk_16A, param_3 + this->unk_16C);
this->func_02038ef4(param_2, param_3);
}
//! TODO: solve vfunc oddities
extern "C" bool func_0203dcb4(unk32);
// non-matching
ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) {
return func_0203dcb4(param_2 + this->unk_162);
}
ARM MsgProc_Type2::~MsgProc_Type2() {
}
// non-matching
ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) :
MsgProc_Main(1, 0, param_4)
{
this->unk_162 = 1;
this->unk_164 = 0x1A;
this->unk_166 = 0xA6;
this->unk_168 = 0x1D;
this->unk_16A = 0;
this->unk_16C = 1;
this->unk_170 = -1;
this->unk_172 = -1;
this->unk_174 = -1;
func_0204f614(this->unk_180, ARRAY_LEN(this->unk_180), sizeof(UnkClass_func_ov000_020d0644), UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c);
this->unk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0);
this->unk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0);
this->unk_180[2].func_ov000_020d0644(0x1E, 2, 0x8C, 0, 0);
this->unk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0);
}
ARM void MsgProc_Type3::func_0203c83c(void) {
}
ARM MsgProc_Type3::~MsgProc_Type3() {
}
src/Main/Message/func_0203c358.cpp
+79
View File
@@ -0,0 +1,79 @@
#include "global.h"
#include "Message/MsgProc.hpp"
#include "Message/MessageManager.hpp"
#include "Save/AdventureFlags.hpp"
#include "DTCM/UnkStruct_027e103c.hpp"
#include "Player/TouchControl.hpp"
#include "Item/ItemManager.hpp"
#include "System/SysNew.hpp"
THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) :
MsgProc_Main(0, 0, param_4)
{
this->unk_162 = 4;
this->unk_164 = 1;
this->unk_166 = 0;
this->unk_168 = -1;
this->unk_16A = 0;
this->unk_16C = 1;
this->unk_16E = 0;
}
// non-matching
THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) {
u16 uVar1;
unk32 uVar2;
s16 uVar3;
s32 iVar4;
s32 local_20;
s32 local_1c [2];
this->func_02038b28();
uVar3 = 0;
for (iVar4 = 0; iVar4 < 2; iVar4++) {
local_1c[0] = 0xC0;
local_20 = 0x10;
if (iVar4 != 0) {
this->func_0203fc78(local_1c, &local_20);
}
uVar1 = this->func_0203d318((s32)(local_1c[0] + 7 + ((u32)(local_1c[0] + 7 >> 2) >> 0x1D)) >> 3,
(s32)(local_20 + 7 + ((u32)(local_20 + 7 >> 2) >> 0x1D)) >> 3);
if (uVar3 < uVar1) {
uVar3 = uVar1;
}
}
if (this->unk_114->vfunc_08(this, uVar3) != 0) {
this->unk_10 = this->unk_114->func_0203d1b4();
}
}
ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) {
if (this->unk_15C > 0 && this->unk_122 != 1) {
if (this->func_0203de14(param_2) != 0) {
this->vfunc_40(0, 0);
}
}
}
ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) {
param_2 += this->unk_166;
param_3 += this->unk_168;
this->func_0203c4ac(param_2 + this->unk_16A, param_3 + this->unk_16C);
this->func_02038ef4(param_2, param_3);
}
//! TODO: solve vfunc oddities
extern "C" bool func_0203dcb4(unk32);
// non-matching
ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) {
return func_0203dcb4(param_2 + this->unk_162);
}
ARM MsgProc_Type2::~MsgProc_Type2() {
}
src/Main/Message/func_0203c72c.cpp
+38
View File
@@ -0,0 +1,38 @@
#include "global.h"
#include "Message/MsgProc.hpp"
#include "Message/MessageManager.hpp"
#include "Save/AdventureFlags.hpp"
#include "DTCM/UnkStruct_027e103c.hpp"
#include "Player/TouchControl.hpp"
#include "Item/ItemManager.hpp"
#include "System/SysNew.hpp"
extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void*, void*);
// non-matching
ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) :
MsgProc_Main(1, 0, param_4)
{
this->unk_162 = 1;
this->unk_164 = 0x1A;
this->unk_166 = 0xA6;
this->unk_168 = 0x1D;
this->unk_16A = 0;
this->unk_16C = 1;
this->unk_170 = -1;
this->unk_172 = -1;
this->unk_174 = -1;
func_0204f614(this->unk_180, ARRAY_LEN(this->unk_180), sizeof(UnkClass_func_ov000_020d0644), UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c);
this->unk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0);
this->unk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0);
this->unk_180[2].func_ov000_020d0644(0x1E, 2, 0x8C, 0, 0);
this->unk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0);
}
ARM void MsgProc_Type3::func_0203c83c(void) {
}
ARM MsgProc_Type3::~MsgProc_Type3() {
}
src/Main/Message/func_0203c8a8.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp"
#include "Message/MsgProc.hpp"
#include "Message/MessageManager.hpp"
#include "Save/AdventureFlags.hpp"
#include "DTCM/UnkStruct_027e103c.hpp"