diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2025-07-01 00:37:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-01 00:37:52 +0200 |
| commit | cfb0123c4a582a7cd28e1a49e7642cba0260cc6f (patch) | |
| tree | f5e88a237371e2f30a7694df7fdb13d8ba14814c | |
| parent | 3fe49695b4936ea29526eb8b7d07250a69a06c38 (diff) | |
| parent | d5ee59ebf71787a0c6a8ac9c5f5890e79407c60d (diff) | |
Merge pull request #60 from Yanis002/bmg
Decomp functions related to BMG files
36 files changed, 4058 insertions, 475 deletions
diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index bea20dd6..99db48e3 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -17,3 +17,37 @@ libs/cpp/src/__register_global_object.cpp: complete .text start:0x0204f8d4 end:0x0204f8f4 .bss start:0x02076da8 end:0x02076dac + +src/Main/Message/BmgRelatedFunctions.cpp: + .text start:0x0202d3bc end:0x0202d56c + +src/Main/Unknown/UnkStruct_02032f0c.cpp: + .text start:0x02032f0c end:0x02033d40 + +src/Main/Unknown/UnkStruct_02035064.cpp: + .text start:0x02035064 end:0x02035370 + .data start:0x02057b28 end:0x02057b30 + +src/Main/Message/MessageManager.cpp: + .text start:0x0203643c end:0x020371b4 + +src/Main/Message/BMG.cpp: + .text start:0x020371b4 end:0x0203744c + .data start:0x02057b78 end:0x02057cb8 + .rodata start:0x02056958 end:0x020569e0 + +src/Main/Unknown/UnkStruct_02037750.cpp: + .text start:0x02037750 end:0x020387e0 + .data start:0x02057cb8 end:0x02057d70 + +src/Main/Unknown/UnkStruct_02038aa0.cpp: + .text start:0x0203881c end:0x02039578 + +src/Main/Message/func_0203c358.cpp: + .text start:0x0203c358 end:0x0203c72c + +src/Main/Message/func_0203c72c.cpp: + .text start:0x0203c72c end:0x0203c8a8 + +src/Main/Unknown/UnkStruct_0203dae0.cpp: + .text start:0x0203dae0 end:0x0203e784 diff --git a/config/eur/arm9/dtcm/symbols.txt b/config/eur/arm9/dtcm/symbols.txt index 585b0761..e6b1dcba 100644 --- a/config/eur/arm9/dtcm/symbols.txt +++ b/config/eur/arm9/dtcm/symbols.txt @@ -85,7 +85,7 @@ data_027e0c38 kind:bss addr:0x27e0c38 data_027e0c50 kind:bss addr:0x27e0c50 data_027e0c54 kind:bss addr:0x27e0c54 data_027e0c5c kind:bss addr:0x27e0c5c -data_027e0c68 kind:bss addr:0x27e0c68 +gMessageManager kind:bss addr:0x27e0c68 data_027e0cb4 kind:bss addr:0x27e0cb4 data_027e0cbc kind:bss addr:0x27e0cbc data_027e0ce0 kind:bss addr:0x27e0ce0 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index ce2d0904..18b022a1 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1304,8 +1304,8 @@ func_0202a8dc kind:function(arm,size=0x1cc) addr:0x202a8dc func_0202aaa8 kind:function(arm,size=0x40) addr:0x202aaa8 func_0202aae8 kind:function(thumb,size=0xe) addr:0x202aae8 func_0202aaf8 kind:function(thumb,size=0x40) addr:0x202aaf8 -func_0202ab38 kind:function(thumb,size=0x10) addr:0x202ab38 -func_0202ab48 kind:function(thumb,size=0x4) addr:0x202ab48 +_Z13func_0202ab38Pj kind:function(thumb,size=0x10) addr:0x202ab38 +_Z13func_0202ab48v kind:function(thumb,size=0x4) addr:0x202ab48 GetRegion kind:function(thumb,size=0x8) addr:0x202ab4c _ZN11FadeControl8RegisterEv kind:function(thumb,size=0x10) addr:0x202ab54 _ZN11FadeControl10UnregisterEv kind:function(thumb,size=0x14) addr:0x202ab64 @@ -1395,11 +1395,11 @@ func_0202d164 kind:function(thumb,size=0x60) addr:0x202d164 func_0202d1c4 kind:function(thumb,size=0x58) addr:0x202d1c4 func_0202d21c kind:function(thumb,size=0x20) addr:0x202d21c func_0202d23c kind:function(thumb,size=0x180) addr:0x202d23c -func_0202d3bc kind:function(thumb,size=0xb8) addr:0x202d3bc +_Z13func_0202d3bciPjPciibii kind:function(thumb,size=0xb8) addr:0x202d3bc func_0202d474 kind:function(thumb,size=0xdc) addr:0x202d474 -func_0202d550 kind:function(thumb,size=0x1c) addr:0x202d550 +_Z13func_0202d550iPjPciii kind:function(thumb,size=0x1c) addr:0x202d550 LoadFile kind:function(thumb,size=0x22) addr:0x202d56c -func_0202d590 kind:function(thumb,size=0x8) addr:0x202d590 +_Z13func_0202d590P9BMGHeader kind:function(thumb,size=0x8) addr:0x202d590 func_0202d598 kind:function(thumb,size=0x1c) addr:0x202d598 MountCompressedNarc kind:function(thumb,size=0x26) addr:0x202d5b4 func_0202d5dc kind:function(thumb,size=0x10) addr:0x202d5dc @@ -1422,7 +1422,7 @@ func_0202dc38 kind:function(arm,size=0xc4) addr:0x202dc38 func_0202dcfc kind:function(arm,size=0x140) addr:0x202dcfc Mat4x3p_MultiplyMat4x3p kind:function(arm,size=0x1f4) addr:0x202de3c Mat3p_MultiplyMat3p kind:function(arm,size=0x170) addr:0x202e030 -_ZN18UnkStruct_0202e1a0C2Ev kind:function(arm,size=0x24) addr:0x202e1a0 +_ZN18UnkStruct_0202e1a0C1Ev kind:function(arm,size=0x24) addr:0x202e1a0 _ZN18UnkStruct_0202e1a013func_0202e1c4Ev kind:function(arm,size=0x24) addr:0x202e1c4 _ZN18UnkStruct_0202e1a013func_0202e1e8Ev kind:function(arm,size=0x128) addr:0x202e1e8 _ZN18UnkStruct_0202e1a013func_0202e310Ei kind:function(arm,size=0x234) addr:0x202e310 @@ -1650,7 +1650,7 @@ _ZN18UnkStruct_02032e7cC1Ev kind:function(arm,size=0x48) addr:0x2032ec4 _ZN18UnkStruct_02032f0cC2Ev kind:function(thumb,size=0x78) addr:0x2032f0c _ZN18UnkStruct_02032f0cD1Ev kind:function(thumb,size=0x2) addr:0x2032f84 _ZN18UnkStruct_02032f0cD0Ev kind:function(thumb,size=0xc) addr:0x2032f88 -_ZN18UnkStruct_02032f0c13func_02032f94Ev kind:function(thumb,size=0x2) addr:0x2032f94 +_ZN18UnkStruct_02032f0cD2Ev kind:function(thumb,size=0x4) addr:0x2032f94 _ZN18UnkStruct_02032f0c9SetUnk_0cEPt kind:function(arm,size=0xc) addr:0x2032f98 _ZN18UnkStruct_02032f0c13func_02032fa4Ev kind:function(arm,size=0x10) addr:0x2032fa4 _ZN18UnkStruct_02032f0c13func_02032fb4Ev kind:function(arm,size=0x18) addr:0x2032fb4 @@ -1738,14 +1738,14 @@ _ZN18UnkStruct_02035064D1Ev kind:function(arm,size=0x4) addr:0x20350ac _ZN18UnkStruct_0203506413func_020350b0Ev kind:function(arm,size=0x4) addr:0x20350b0 _ZN18UnkStruct_0203506413func_020350b4Eiicss kind:function(arm,size=0xb8) addr:0x20350b4 _ZN18UnkStruct_0203506413func_0203516cEv kind:function(arm,size=0x3c) addr:0x203516c -_ZN18UnkStruct_020350647vfunc_0Ev kind:function(arm,size=0x8) addr:0x20351a8 -_ZN18UnkStruct_020350647vfunc_4Ev kind:function(arm,size=0x8) addr:0x20351b0 +_ZN18UnkStruct_020350648vfunc_00Ev kind:function(arm,size=0x8) addr:0x20351a8 +_ZN18UnkStruct_020350648vfunc_04Ev kind:function(arm,size=0x8) addr:0x20351b0 _ZN18UnkStruct_0203506413func_020351b8Ebbbb kind:function(arm,size=0x120) addr:0x20351b8 _ZN18UnkStruct_0203506413func_020352d8Ev kind:function(arm,size=0x98) addr:0x20352d8 func_02035370 kind:function(arm,size=0x18) addr:0x2035370 func_02035388 kind:function(arm,size=0x50) addr:0x2035388 func_020353d8 kind:function(arm,size=0x50) addr:0x20353d8 -func_02035428 kind:function(arm,size=0x18) addr:0x2035428 +_ZN18UnkStruct_0203506413func_02035428Eh kind:function(arm,size=0x18) addr:0x2035428 func_02035440 kind:function(arm,size=0x140) addr:0x2035440 func_02035580 kind:function(thumb,size=0x14) addr:0x2035580 func_02035594 kind:function(thumb,size=0x3c) addr:0x2035594 @@ -1789,45 +1789,45 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x20361d0 func_02036240 kind:function(arm,size=0x170) addr:0x2036240 func_020363b0 kind:function(arm,size=0x18) addr:0x20363b0 func_020363c8 kind:function(arm,size=0x74) addr:0x20363c8 -func_0203643c kind:function(arm,size=0x54) addr:0x203643c -func_02036490 kind:function(thumb,size=0x1cc) addr:0x2036490 -func_0203665c kind:function(thumb,size=0x4a) addr:0x203665c +_ZN14MessageManager13func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x203643c +_ZN14MessageManager13func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x2036490 +_ZN14MessageManager13func_0203665cEv kind:function(thumb,size=0x4a) addr:0x203665c func_020366a8 kind:function(arm,size=0x1c) addr:0x20366a8 -func_020366c4 kind:function(arm,size=0x3c) addr:0x20366c4 -func_02036700 kind:function(arm,size=0x3c) addr:0x2036700 -func_0203673c kind:function(arm,size=0x34) addr:0x203673c -func_02036770 kind:function(arm,size=0x28) addr:0x2036770 -func_02036798 kind:function(arm,size=0x44) addr:0x2036798 -func_020367dc kind:function(arm,size=0x10) addr:0x20367dc -func_020367ec kind:function(arm,size=0x1c) addr:0x20367ec -func_02036808 kind:function(arm,size=0x1c) addr:0x2036808 -func_02036824 kind:function(arm,size=0x2c) addr:0x2036824 -func_02036850 kind:function(arm,size=0x38) addr:0x2036850 -func_02036888 kind:function(arm,size=0x6c) addr:0x2036888 -func_020368f4 kind:function(arm,size=0x18) addr:0x20368f4 -func_0203690c kind:function(arm,size=0x2b0) addr:0x203690c -func_02036bbc kind:function(arm,size=0x94) addr:0x2036bbc -func_02036c50 kind:function(arm,size=0x54) addr:0x2036c50 -func_02036ca4 kind:function(arm,size=0x40) addr:0x2036ca4 -func_02036ce4 kind:function(arm,size=0x4c) addr:0x2036ce4 -func_02036d30 kind:function(arm,size=0x1c) addr:0x2036d30 -func_02036d4c kind:function(arm,size=0x20) addr:0x2036d4c -func_02036d6c kind:function(arm,size=0x3c) addr:0x2036d6c -func_02036da8 kind:function(arm,size=0x134) addr:0x2036da8 -func_02036edc kind:function(arm,size=0x8c) addr:0x2036edc -func_02036f68 kind:function(arm,size=0x168) addr:0x2036f68 -func_020370d0 kind:function(arm,size=0x18) addr:0x20370d0 -func_020370e8 kind:function(arm,size=0x70) addr:0x20370e8 -func_02037158 kind:function(arm,size=0x20) addr:0x2037158 -func_02037178 kind:function(arm,size=0x38) addr:0x2037178 -func_020371b0 kind:function(arm,size=0x4) addr:0x20371b0 -func_020371b4 kind:function(thumb,size=0x12) addr:0x20371b4 -func_020371c8 kind:function(thumb,size=0x90) addr:0x20371c8 -func_02037258 kind:function(arm,size=0x34) addr:0x2037258 -func_0203728c kind:function(arm,size=0x64) addr:0x203728c -func_020372f0 kind:function(thumb,size=0xc4) addr:0x20372f0 -func_020373b4 kind:function(thumb,size=0x36) addr:0x20373b4 -func_020373ec kind:function(arm,size=0x60) addr:0x20373ec +_ZN14MessageManager13func_020366c4Ev kind:function(arm,size=0x3c) addr:0x20366c4 +_ZN14MessageManager13func_02036700Ev kind:function(arm,size=0x3c) addr:0x2036700 +_ZN14MessageManager13func_0203673cEv kind:function(arm,size=0x34) addr:0x203673c +_ZN14MessageManager13func_02036770Ej kind:function(arm,size=0x28) addr:0x2036770 +_ZN14MessageManager13func_02036798Ev kind:function(arm,size=0x44) addr:0x2036798 +_ZN14MessageManager13func_020367dcEi kind:function(arm,size=0x10) addr:0x20367dc +_ZN14MessageManager13func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367ec +_ZN14MessageManager13func_02036808Ev kind:function(arm,size=0x1c) addr:0x2036808 +_ZN14MessageManager13func_02036824Ev kind:function(arm,size=0x2c) addr:0x2036824 +_ZN14MessageManager13func_02036850Ev kind:function(arm,size=0x38) addr:0x2036850 +_ZN14MessageManager13func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036888 +_ZN14MessageManager13func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368f4 +_ZN14MessageManager13func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x203690c +_ZN14MessageManager13func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036bbc +_ZN14MessageManager13func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c50 +_ZN14MessageManager13func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036ca4 +_ZN14MessageManager13func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ce4 +_ZN14MessageManager13func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036d30 +_ZN14MessageManager13func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d4c +_ZN14MessageManager13func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c +_ZN14MessageManager13func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036da8 +_ZN14MessageManager13func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036edc +_ZN14MessageManager13func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f68 +_ZN14MessageManager13func_020370d0Eii kind:function(arm,size=0x18) addr:0x20370d0 +_ZN14MessageManager13func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370e8 +_ZN14MessageManager13func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037158 +_ZN14MessageManager13func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037178 +_ZN14MessageManagerD2Ev kind:function(arm,size=0x4) addr:0x20371b0 +_ZN11BMGFileInfo13func_020371b4Ev kind:function(thumb,size=0x12) addr:0x20371b4 +_ZN11BMGFileInfo13func_020371c8EPjs kind:function(thumb,size=0x90) addr:0x20371c8 +_ZN11BMGFileInfo13func_02037258Et kind:function(arm,size=0x34) addr:0x2037258 +_ZN11BMGFileInfo13func_0203728cEi kind:function(arm,size=0x64) addr:0x203728c +_ZN9BMGGroups13func_020372f0E12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372f0 +_ZN9BMGGroups13func_020373b4Es kind:function(thumb,size=0x36) addr:0x20373b4 +_ZN9BMGGroups13func_020373ecEi kind:function(arm,size=0x60) addr:0x20373ec _ZN18UnkStruct_027e05f8C2Ev kind:function(thumb,size=0xa) addr:0x203744c _ZN18UnkStruct_027e05f813func_02037458Et kind:function(arm,size=0x28) addr:0x2037458 _ZN18UnkStruct_027e05f813func_02037480Ev kind:function(arm,size=0x10) addr:0x2037480 @@ -1843,26 +1843,26 @@ _ZN18UnkStruct_02037750C2Eii kind:function(arm,size=0x44) addr:0x2037750 _ZN18UnkStruct_02037750D1Ev kind:function(arm,size=0x38) addr:0x2037794 _ZN18UnkStruct_02037750D0Ev kind:function(arm,size=0x40) addr:0x20377cc _ZN18UnkStruct_02037750D2Ev kind:function(arm,size=0x38) addr:0x203780c -_ZN18UnkStruct_020377508vfunc_08Ei kind:function(arm,size=0x10) addr:0x2037844 -_ZN18UnkStruct_020377508vfunc_0cEi kind:function(arm,size=0xc4) addr:0x2037854 +_ZN18UnkStruct_020377508vfunc_08Ej kind:function(arm,size=0x10) addr:0x2037844 +_ZN18UnkStruct_020377508vfunc_0cEP18UnkStruct_020397f8 kind:function(arm,size=0xc4) addr:0x2037854 _ZN18UnkStruct_020377508vfunc_10Ev kind:function(arm,size=0x234) addr:0x2037918 _ZN18UnkStruct_020377508vfunc_24Ei kind:function(arm,size=0x3c) addr:0x2037b4c _ZN18UnkStruct_020377508vfunc_28Ei kind:function(arm,size=0x3d0) addr:0x2037b88 _ZN18UnkStruct_020377508vfunc_2cEi kind:function(arm,size=0x660) addr:0x2037f58 _ZN18UnkStruct_0203775020GetLinkStateInteractEv kind:function(arm,size=0x10) addr:0x20385b8 _ZN18UnkStruct_020377508vfunc_30Ev kind:function(arm,size=0x8) addr:0x20385c8 -_ZN18UnkStruct_0203775013func_020385d0EiPi kind:function(arm,size=0xe4) addr:0x20385d0 +_ZN18UnkStruct_0203775013func_020385d0EiPh kind:function(arm,size=0xe4) addr:0x20385d0 _ZN18UnkStruct_020377508vfunc_14Ev kind:function(arm,size=0x4) addr:0x20386b4 -_ZN18UnkStruct_020377508vfunc_18Ev kind:function(arm,size=0xc) addr:0x20386b8 +_ZN18UnkStruct_020377508vfunc_18EPi kind:function(arm,size=0xc) addr:0x20386b8 _ZN18UnkStruct_020377508vfunc_1cEv kind:function(arm,size=0x8) addr:0x20386c4 _ZN18UnkStruct_020377508vfunc_20Ev kind:function(arm,size=0xc) addr:0x20386cc _ZN18UnkStruct_020386d8C2Ev kind:function(arm,size=0x40) addr:0x20386d8 _ZN18UnkStruct_020386d8C1Ev kind:function(arm,size=0x40) addr:0x2038718 -_ZN18UnkStruct_020386d88vfunc_08Ei kind:function(arm,size=0x18) addr:0x2038758 +_ZN18UnkStruct_020386d88vfunc_08Ej kind:function(arm,size=0x18) addr:0x2038758 _ZN18UnkStruct_020386d88vfunc_24Ei kind:function(arm,size=0x1c) addr:0x2038770 -_ZN18UnkStruct_020386d88vfunc_28Ev kind:function(arm,size=0x18) addr:0x203878c +_ZN18UnkStruct_020386d88vfunc_28Ei kind:function(arm,size=0x18) addr:0x203878c _ZN18UnkStruct_020386d88vfunc_30Ev kind:function(arm,size=0x28) addr:0x20387a4 -_ZN18UnkStruct_020386d88D0Ev kind:function(arm,size=0x14) addr:0x20387cc +_ZN18UnkStruct_020386d8D2Ev kind:function(arm,size=0x14) addr:0x20387cc func_020387e0 kind:function(thumb,size=0xc) addr:0x20387e0 func_020387ec kind:function(arm,size=0x18) addr:0x20387ec func_02038804 kind:function(arm,size=0x18) addr:0x2038804 @@ -1876,36 +1876,36 @@ _ZN18UnkStruct_02038aa0C2Ehh kind:function(thumb,size=0x5c) addr:0x2038aa0 _ZN18UnkStruct_02038aa0D1Ev kind:function(thumb,size=0xc) addr:0x2038afc _ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x12) addr:0x2038b08 _ZN18UnkStruct_02038aa0D2Ev kind:function(thumb,size=0xc) addr:0x2038b1c -_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(thumb,size=0xc) addr:0x2038b28 -_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0xc) addr:0x2038b34 -_ZN18UnkStruct_02038aa013func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038b40 -_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0x4) addr:0x2038b74 -_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0xbc) addr:0x2038b78 -_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038c34 -_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x3c) addr:0x2038cb8 +_ZN18UnkStruct_02038aa013func_02038b28Ev kind:function(thumb,size=0xc) addr:0x2038b28 +_ZN18UnkStruct_02038aa08vfunc_4cEji kind:function(arm,size=0xc) addr:0x2038b34 +_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038b40 +_ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b74 +_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b78 +_ZN18UnkStruct_02038aa013func_02038c34Ev kind:function(arm,size=0x84) addr:0x2038c34 +_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x3c) addr:0x2038cb8 _ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x2038cf4 _ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038d10 -_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x1b0) addr:0x2038d20 -_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038ed0 -_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4c) addr:0x2038ef4 -_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x4) addr:0x2038f40 -_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x114) addr:0x2038f44 -_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x4) addr:0x2039058 -_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x48) addr:0x203905c -_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x164) addr:0x20390a4 -_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x20) addr:0x2039208 -_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x28) addr:0x2039228 -_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0x64) addr:0x2039250 -_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xe4) addr:0x20392b4 -_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0xc) addr:0x2039398 -_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x4) addr:0x20393a4 -_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x28) addr:0x20393a8 -_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x70) addr:0x20393d0 -_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x3c) addr:0x2039440 -_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x5c) addr:0x203947c -_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 -_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x40) addr:0x203951c -_ZN18UnkStruct_0203881cD0Ev kind:function(arm,size=0x14) addr:0x203955c +_ZN18UnkStruct_02038aa013func_02038d20Ev kind:function(arm,size=0x1b0) addr:0x2038d20 +_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038ed0 +_ZN18UnkStruct_02038aa08vfunc_30Eii kind:function(arm,size=0x4c) addr:0x2038ef4 +_ZN18UnkStruct_02038aa013func_02038f40Eii kind:function(arm,size=0x4) addr:0x2038f40 +_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x114) addr:0x2038f44 +_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x4) addr:0x2039058 +_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x48) addr:0x203905c +_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x164) addr:0x20390a4 +_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x20) addr:0x2039208 +_ZN18UnkStruct_02038aa013func_02039228Es kind:function(arm,size=0x28) addr:0x2039228 +_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x64) addr:0x2039250 +_ZN18UnkStruct_02038aa013func_020392b4Ev kind:function(arm,size=0xe4) addr:0x20392b4 +_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xc) addr:0x2039398 +_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0x4) addr:0x20393a4 +_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x28) addr:0x20393a8 +_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x70) addr:0x20393d0 +_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x3c) addr:0x2039440 +_ZN18UnkStruct_02038aa013func_0203947cEii kind:function(arm,size=0x5c) addr:0x203947c +_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 +_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x40) addr:0x203951c +_ZN18UnkStruct_02038aa013func_0203955cEv kind:function(arm,size=0x14) addr:0x203955c _ZN18UnkStruct_02038aa08vfunc_38Ev kind:function(arm,size=0x8) addr:0x2039570 func_02039578 kind:function(arm,size=0x3c) addr:0x2039578 _ZN18UnkStruct_020397f8C2Ev kind:function(thumb,size=0x244) addr:0x20395b4 @@ -1946,19 +1946,19 @@ _ZN18UnkStruct_020397f813func_0203c25cEv kind:function(arm,size=0x6c) addr:0x203 _ZN18UnkStruct_020397f8D1Ev kind:function(arm,size=0x48) addr:0x203c2c8 _ZN18UnkStruct_020397f8D0Ev kind:function(arm,size=0x40) addr:0x203c310 _ZN18UnkStruct_020397f88vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c350 -func_0203c358 kind:function(thumb,size=0x44) addr:0x203c358 -func_0203c39c kind:function(thumb,size=0x78) addr:0x203c39c -func_0203c414 kind:function(arm,size=0x4c) addr:0x203c414 -func_0203c460 kind:function(arm,size=0x4c) addr:0x203c460 -func_0203c4ac kind:function(arm,size=0x118) addr:0x203c4ac -func_0203c5c4 kind:function(arm,size=0x18) addr:0x203c5c4 +_ZN13MsgProc_Type2C1Eisi kind:function(thumb,size=0x44) addr:0x203c358 +_ZN13MsgProc_Type213func_0203c39cEii kind:function(thumb,size=0x78) addr:0x203c39c +_ZN13MsgProc_Type28vfunc_3CEi kind:function(arm,size=0x4c) addr:0x203c414 +_ZN13MsgProc_Type28vfunc_40Eii kind:function(arm,size=0x4c) addr:0x203c460 +_ZN13MsgProc_Type213func_0203c4acEii kind:function(arm,size=0x118) addr:0x203c4ac +_ZN13MsgProc_Type28vfunc_14Eii kind:function(arm,size=0x18) addr:0x203c5c4 func_0203c5dc kind:function(arm,size=0x120) addr:0x203c5dc -func_0203c6fc kind:function(arm,size=0x1c) addr:0x203c6fc -func_0203c718 kind:function(arm,size=0x14) addr:0x203c718 -func_0203c72c kind:function(arm,size=0x110) addr:0x203c72c -func_0203c83c kind:function(arm,size=0x4) addr:0x203c83c -func_0203c840 kind:function(arm,size=0x30) addr:0x203c840 -func_0203c870 kind:function(arm,size=0x38) addr:0x203c870 +_ZN13MsgProc_Type2D0Ev kind:function(arm,size=0x1c) addr:0x203c6fc +_ZN13MsgProc_Type2D2Ev kind:function(arm,size=0x14) addr:0x203c718 +_ZN13MsgProc_Type3C1Eisi kind:function(arm,size=0x110) addr:0x203c72c +_ZN13MsgProc_Type313func_0203c83cEv kind:function(arm,size=0x4) addr:0x203c83c +_ZN13MsgProc_Type3D2Ev kind:function(arm,size=0x30) addr:0x203c840 +_ZN13MsgProc_Type3D0Ev kind:function(arm,size=0x38) addr:0x203c870 func_0203c8a8 kind:function(arm,size=0x58) addr:0x203c8a8 func_0203c900 kind:function(arm,size=0x4) addr:0x203c900 func_0203c904 kind:function(arm,size=0x11c) addr:0x203c904 @@ -2034,13 +2034,13 @@ _ZN18UnkStruct_0203dae08vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dcb4 _ZN18UnkStruct_0203dae013func_0203dcfcEhiii kind:function(arm,size=0xf0) addr:0x203dcfc _ZN18UnkStruct_0203dae013func_0203ddecEv kind:function(arm,size=0x10) addr:0x203ddec _ZN18UnkStruct_0203dae013func_0203ddfcEv kind:function(arm,size=0x18) addr:0x203ddfc -_ZN18UnkStruct_0203dae013func_0203de14Ev kind:function(arm,size=0x10) addr:0x203de14 +_ZN18UnkStruct_02038aa013func_0203de14Ei kind:function(arm,size=0x10) addr:0x203de14 _ZN18UnkStruct_0203dae013func_0203de24Ev kind:function(arm,size=0x34) addr:0x203de24 _ZN18UnkStruct_0203dae013func_0203de58Ei kind:function(arm,size=0x208) addr:0x203de58 _ZN18UnkStruct_0203dae08vfunc_10Eji kind:function(arm,size=0x30) addr:0x203e060 _ZN18UnkStruct_0203dae08vfunc_30Ev kind:function(arm,size=0x38) addr:0x203e090 _ZN18UnkStruct_0203dae08vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e0c8 -_ZN18UnkStruct_0203dae013func_0203e0f8Eii kind:function(arm,size=0xa4) addr:0x203e0f8 +_ZN18UnkStruct_0203dae013func_0203e0f8Ev kind:function(arm,size=0xa4) addr:0x203e0f8 _ZN18UnkStruct_0203dae08vfunc_2cEv kind:function(arm,size=0x14) addr:0x203e19c _ZN18UnkStruct_0203dae013func_0203e1b0Eiii kind:function(arm,size=0xd4) addr:0x203e1b0 _ZN18UnkStruct_0203dae08vfunc_18Ei kind:function(arm,size=0x28) addr:0x203e284 @@ -2565,7 +2565,7 @@ data_02056898 kind:data(any) addr:0x2056898 data_02056918 kind:data(any) addr:0x2056918 data_0205691c kind:data(any) addr:0x205691c data_02056924 kind:data(any) addr:0x2056924 -data_02056958 kind:data(any) addr:0x2056958 +sBMGFileNames kind:data(any) addr:0x2056958 data_020569e0 kind:data(any) addr:0x20569e0 data_020569ec kind:data(any) addr:0x20569ec data_020569f0 kind:data(any) addr:0x20569f0 @@ -2800,12 +2800,12 @@ data_02057ed4 kind:data(any) addr:0x2057ed4 data_02057ed8 kind:data(any) addr:0x2057ed8 data_02057eec kind:data(any) addr:0x2057eec data_02057f08 kind:data(any) addr:0x2057f08 -data_02057f14 kind:data(any) addr:0x2057f14 +_ZTV13MsgProc_Type2 kind:data(any) addr:0x2057f14 data_02057f90 kind:data(any) addr:0x2057f90 data_0205800c kind:data(any) addr:0x205800c data_02058024 kind:data(any) addr:0x2058024 data_0205803c kind:data(any) addr:0x205803c -data_02058054 kind:data(any) addr:0x2058054 +_ZTV13MsgProc_Base2 kind:data(any) addr:0x2058054 data_02058088 kind:data(any) addr:0x2058088 data_02058090 kind:data(any) addr:0x2058090 data_02058094 kind:data(any) addr:0x2058094 diff --git a/config/usa/arm9/delinks.txt b/config/usa/arm9/delinks.txt index d3ab3589..3913ca13 100644 --- a/config/usa/arm9/delinks.txt +++ b/config/usa/arm9/delinks.txt @@ -17,3 +17,37 @@ libs/cpp/src/__register_global_object.cpp: complete .text start:0x0204f890 end:0x0204f8b0 .bss start:0x02076d48 end:0x02076d4c + +src/Main/Message/BmgRelatedFunctions.cpp: + .text start:0x0202d3b8 end:0x0202d568 + +src/Main/Unknown/UnkStruct_02032f0c.cpp: + .text start:0x02032f08 end:0x02033cfc + +src/Main/Unknown/UnkStruct_02035064.cpp: + .text start:0x02035020 end:0x0203532c + .data start:0x02057ae0 end:0x02057ae8 + +src/Main/Message/MessageManager.cpp: + .text start:0x020363f8 end:0x02037170 + +src/Main/Message/BMG.cpp: + .text start:0x02037170 end:0x02037408 + .data start:0x02057b30 end:0x02057c70 + .rodata start:0x02056914 end:0x0205699c + +src/Main/Unknown/UnkStruct_02037750.cpp: + .text start:0x0203770c end:0x0203879c + .data start:0x02057c70 end:0x02057d28 + +src/Main/Unknown/UnkStruct_02038aa0.cpp: + .text start:0x020387d8 end:0x02039534 + +src/Main/Message/func_0203c358.cpp: + .text start:0x0203c314 end:0x0203c6e8 + +src/Main/Message/func_0203c72c.cpp: + .text start:0x0203c6e8 end:0x0203c864 + +src/Main/Unknown/UnkStruct_0203dae0.cpp: + .text start:0x0203da9c end:0x0203e740 diff --git a/config/usa/arm9/dtcm/symbols.txt b/config/usa/arm9/dtcm/symbols.txt index 62eea4b0..2bb4c8fb 100644 --- a/config/usa/arm9/dtcm/symbols.txt +++ b/config/usa/arm9/dtcm/symbols.txt @@ -85,7 +85,7 @@ data_027e0c38 kind:bss addr:0x27e0c38 data_027e0c50 kind:bss addr:0x27e0c50 data_027e0c54 kind:bss addr:0x27e0c54 data_027e0c5c kind:bss addr:0x27e0c5c -data_027e0c68 kind:bss addr:0x27e0c68 +gMessageManager kind:bss addr:0x27e0c68 data_027e0cb4 kind:bss addr:0x27e0cb4 data_027e0cbc kind:bss addr:0x27e0cbc data_027e0ce0 kind:bss addr:0x27e0ce0 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index fe14219e..649b6fcb 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1304,8 +1304,8 @@ func_0202a8dc kind:function(arm,size=0x1cc) addr:0x202a8dc func_0202aaa8 kind:function(arm,size=0x40) addr:0x202aaa8 func_0202aae8 kind:function(thumb,size=0xe) addr:0x202aae8 func_0202aaf8 kind:function(thumb,size=0x26) addr:0x202aaf8 -func_0202ab38 kind:function(thumb,size=0x10) addr:0x202ab20 -func_0202ab48 kind:function(thumb,size=0x4) addr:0x202ab30 +_Z13func_0202ab38Pj kind:function(thumb,size=0x10) addr:0x202ab20 +_Z13func_0202ab48v kind:function(thumb,size=0x4) addr:0x202ab30 GetRegion kind:function(thumb,size=0x8) addr:0x202ab34 _ZN11FadeControl3AddEv kind:function(thumb,size=0x10) addr:0x202ab3c _ZN11FadeControl6RemoveEv kind:function(thumb,size=0x14) addr:0x202ab4c @@ -1395,11 +1395,11 @@ func_0202d164 kind:function(thumb,size=0x74) addr:0x202d14c func_0202d1c4 kind:function(thumb,size=0x58) addr:0x202d1c0 func_0202d21c kind:function(thumb,size=0x20) addr:0x202d218 func_0202d23c kind:function(thumb,size=0x180) addr:0x202d238 -func_0202d3bc kind:function(thumb,size=0xb8) addr:0x202d3b8 +_Z13func_0202d3bciPjPciibii kind:function(thumb,size=0xb8) addr:0x202d3b8 func_0202d474 kind:function(thumb,size=0xdc) addr:0x202d470 -func_0202d550 kind:function(thumb,size=0x1c) addr:0x202d54c +_Z13func_0202d550iPjPciii kind:function(thumb,size=0x1c) addr:0x202d54c LoadFile kind:function(thumb,size=0x22) addr:0x202d568 -func_0202d590 kind:function(thumb,size=0x8) addr:0x202d58c +_Z13func_0202d590P9BMGHeader kind:function(thumb,size=0x8) addr:0x202d58c func_0202d598 kind:function(thumb,size=0x1c) addr:0x202d594 MountCompressedNarc kind:function(thumb,size=0x26) addr:0x202d5b0 func_0202d5dc kind:function(thumb,size=0x10) addr:0x202d5d8 @@ -1422,7 +1422,7 @@ func_0202dc38 kind:function(arm,size=0xc4) addr:0x202dc34 func_0202dcfc kind:function(arm,size=0x140) addr:0x202dcf8 Mat4x3p_MultiplyMat4x3p kind:function(arm,size=0x1f4) addr:0x202de38 Mat3p_MultiplyMat3p kind:function(arm,size=0x170) addr:0x202e02c -_ZN18UnkStruct_0202e1a0C2Ev kind:function(arm,size=0x24) addr:0x202e19c +_ZN18UnkStruct_0202e1a0C1Ev kind:function(arm,size=0x24) addr:0x202e19c _ZN18UnkStruct_0202e1a013func_0202e1c4Ev kind:function(arm,size=0x24) addr:0x202e1c0 _ZN18UnkStruct_0202e1a013func_0202e1e8Ev kind:function(arm,size=0x128) addr:0x202e1e4 _ZN18UnkStruct_0202e1a013func_0202e310Ei kind:function(arm,size=0x234) addr:0x202e30c @@ -1650,7 +1650,7 @@ _ZN18UnkStruct_02032e7cC1Ev kind:function(arm,size=0x48) addr:0x2032ec0 _ZN18UnkStruct_02032f0cC2Ev kind:function(thumb,size=0x78) addr:0x2032f08 _ZN18UnkStruct_02032f0cD1Ev kind:function(thumb,size=0x2) addr:0x2032f80 _ZN18UnkStruct_02032f0cD0Ev kind:function(thumb,size=0xc) addr:0x2032f84 -_ZN18UnkStruct_02032f0c13func_02032f94Ev kind:function(thumb,size=0x2) addr:0x2032f90 +_ZN18UnkStruct_02032f0cD2Ev kind:function(thumb,size=0x4) addr:0x2032f90 _ZN18UnkStruct_02032f0c9SetUnk_0cEPt kind:function(arm,size=0xc) addr:0x2032f94 _ZN18UnkStruct_02032f0c13func_02032fa4Ev kind:function(arm,size=0x10) addr:0x2032fa0 _ZN18UnkStruct_02032f0c13func_02032fb4Ev kind:function(arm,size=0x18) addr:0x2032fb0 @@ -1738,14 +1738,14 @@ _ZN18UnkStruct_02035064D1Ev kind:function(arm,size=0x4) addr:0x2035068 _ZN18UnkStruct_0203506413func_020350b0Ev kind:function(arm,size=0x4) addr:0x203506c _ZN18UnkStruct_0203506413func_020350b4Eiicss kind:function(arm,size=0xb8) addr:0x2035070 _ZN18UnkStruct_0203506413func_0203516cEv kind:function(arm,size=0x3c) addr:0x2035128 -_ZN18UnkStruct_020350647vfunc_0Ev kind:function(arm,size=0x8) addr:0x2035164 -_ZN18UnkStruct_020350647vfunc_4Ev kind:function(arm,size=0x8) addr:0x203516c +_ZN18UnkStruct_020350648vfunc_00Ev kind:function(arm,size=0x8) addr:0x2035164 +_ZN18UnkStruct_020350648vfunc_04Ev kind:function(arm,size=0x8) addr:0x203516c _ZN18UnkStruct_0203506413func_020351b8Ebbbb kind:function(arm,size=0x120) addr:0x2035174 _ZN18UnkStruct_0203506413func_020352d8Ev kind:function(arm,size=0x98) addr:0x2035294 func_02035370 kind:function(arm,size=0x18) addr:0x203532c func_02035388 kind:function(arm,size=0x50) addr:0x2035344 func_020353d8 kind:function(arm,size=0x50) addr:0x2035394 -func_02035428 kind:function(arm,size=0x18) addr:0x20353e4 +_ZN18UnkStruct_0203506413func_02035428Eh kind:function(arm,size=0x18) addr:0x20353e4 func_02035440 kind:function(arm,size=0x140) addr:0x20353fc func_02035580 kind:function(thumb,size=0x14) addr:0x203553c func_02035594 kind:function(thumb,size=0x3c) addr:0x2035550 @@ -1789,45 +1789,45 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x203618c func_02036240 kind:function(arm,size=0x170) addr:0x20361fc func_020363b0 kind:function(arm,size=0x18) addr:0x203636c func_020363c8 kind:function(arm,size=0x74) addr:0x2036384 -func_0203643c kind:function(arm,size=0x54) addr:0x20363f8 -func_02036490 kind:function(thumb,size=0x1cc) addr:0x203644c -func_0203665c kind:function(thumb,size=0x4a) addr:0x2036618 +_ZN14MessageManager13func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x20363f8 +_ZN14MessageManager13func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x203644c +_ZN14MessageManager13func_0203665cEv kind:function(thumb,size=0x4a) addr:0x2036618 func_020366a8 kind:function(arm,size=0x1c) addr:0x2036664 -func_020366c4 kind:function(arm,size=0x3c) addr:0x2036680 -func_02036700 kind:function(arm,size=0x3c) addr:0x20366bc -func_0203673c kind:function(arm,size=0x34) addr:0x20366f8 -func_02036770 kind:function(arm,size=0x28) addr:0x203672c -func_02036798 kind:function(arm,size=0x44) addr:0x2036754 -func_020367dc kind:function(arm,size=0x10) addr:0x2036798 -func_020367ec kind:function(arm,size=0x1c) addr:0x20367a8 -func_02036808 kind:function(arm,size=0x1c) addr:0x20367c4 -func_02036824 kind:function(arm,size=0x2c) addr:0x20367e0 -func_02036850 kind:function(arm,size=0x38) addr:0x203680c -func_02036888 kind:function(arm,size=0x6c) addr:0x2036844 -func_020368f4 kind:function(arm,size=0x18) addr:0x20368b0 -func_0203690c kind:function(arm,size=0x2b0) addr:0x20368c8 -func_02036bbc kind:function(arm,size=0x94) addr:0x2036b78 -func_02036c50 kind:function(arm,size=0x54) addr:0x2036c0c -func_02036ca4 kind:function(arm,size=0x40) addr:0x2036c60 -func_02036ce4 kind:function(arm,size=0x4c) addr:0x2036ca0 -func_02036d30 kind:function(arm,size=0x1c) addr:0x2036cec -func_02036d4c kind:function(arm,size=0x20) addr:0x2036d08 -func_02036d6c kind:function(arm,size=0x3c) addr:0x2036d28 -func_02036da8 kind:function(arm,size=0x134) addr:0x2036d64 -func_02036edc kind:function(arm,size=0x8c) addr:0x2036e98 -func_02036f68 kind:function(arm,size=0x168) addr:0x2036f24 -func_020370d0 kind:function(arm,size=0x18) addr:0x203708c -func_020370e8 kind:function(arm,size=0x70) addr:0x20370a4 -func_02037158 kind:function(arm,size=0x20) addr:0x2037114 -func_02037178 kind:function(arm,size=0x38) addr:0x2037134 -func_020371b0 kind:function(arm,size=0x4) addr:0x203716c -func_020371b4 kind:function(thumb,size=0x12) addr:0x2037170 -func_020371c8 kind:function(thumb,size=0x90) addr:0x2037184 -func_02037258 kind:function(arm,size=0x34) addr:0x2037214 -func_0203728c kind:function(arm,size=0x64) addr:0x2037248 -func_020372f0 kind:function(thumb,size=0xc4) addr:0x20372ac -func_020373b4 kind:function(thumb,size=0x36) addr:0x2037370 -func_020373ec kind:function(arm,size=0x60) addr:0x20373a8 +_ZN14MessageManager13func_020366c4Ev kind:function(arm,size=0x3c) addr:0x2036680 +_ZN14MessageManager13func_02036700Ev kind:function(arm,size=0x3c) addr:0x20366bc +_ZN14MessageManager13func_0203673cEv kind:function(arm,size=0x34) addr:0x20366f8 +_ZN14MessageManager13func_02036770Ej kind:function(arm,size=0x28) addr:0x203672c +_ZN14MessageManager13func_02036798Ev kind:function(arm,size=0x44) addr:0x2036754 +_ZN14MessageManager13func_020367dcEi kind:function(arm,size=0x10) addr:0x2036798 +_ZN14MessageManager13func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367a8 +_ZN14MessageManager13func_02036808Ev kind:function(arm,size=0x1c) addr:0x20367c4 +_ZN14MessageManager13func_02036824Ev kind:function(arm,size=0x2c) addr:0x20367e0 +_ZN14MessageManager13func_02036850Ev kind:function(arm,size=0x38) addr:0x203680c +_ZN14MessageManager13func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036844 +_ZN14MessageManager13func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368b0 +_ZN14MessageManager13func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x20368c8 +_ZN14MessageManager13func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036b78 +_ZN14MessageManager13func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c0c +_ZN14MessageManager13func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036c60 +_ZN14MessageManager13func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ca0 +_ZN14MessageManager13func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036cec +_ZN14MessageManager13func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d08 +_ZN14MessageManager13func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 +_ZN14MessageManager13func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036d64 +_ZN14MessageManager13func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036e98 +_ZN14MessageManager13func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f24 +_ZN14MessageManager13func_020370d0Eii kind:function(arm,size=0x18) addr:0x203708c +_ZN14MessageManager13func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370a4 +_ZN14MessageManager13func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037114 +_ZN14MessageManager13func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037134 +_ZN14MessageManagerD2Ev kind:function(arm,size=0x4) addr:0x203716c +_ZN11BMGFileInfo13func_020371b4Ev kind:function(thumb,size=0x12) addr:0x2037170 +_ZN11BMGFileInfo13func_020371c8EPjs kind:function(thumb,size=0x90) addr:0x2037184 +_ZN11BMGFileInfo13func_02037258Et kind:function(arm,size=0x34) addr:0x2037214 +_ZN11BMGFileInfo13func_0203728cEi kind:function(arm,size=0x64) addr:0x2037248 +_ZN9BMGGroups13func_020372f0E12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372ac +_ZN9BMGGroups13func_020373b4Es kind:function(thumb,size=0x36) addr:0x2037370 +_ZN9BMGGroups13func_020373ecEi kind:function(arm,size=0x60) addr:0x20373a8 _ZN18UnkStruct_027e05f8C2Ev kind:function(thumb,size=0xa) addr:0x2037408 _ZN18UnkStruct_027e05f813func_02037458Et kind:function(arm,size=0x28) addr:0x2037414 _ZN18UnkStruct_027e05f813func_02037480Ev kind:function(arm,size=0x10) addr:0x203743c @@ -1843,26 +1843,26 @@ _ZN18UnkStruct_02037750C2Eii kind:function(arm,size=0x44) addr:0x203770c _ZN18UnkStruct_02037750D1Ev kind:function(arm,size=0x38) addr:0x2037750 _ZN18UnkStruct_02037750D0Ev kind:function(arm,size=0x40) addr:0x2037788 _ZN18UnkStruct_02037750D2Ev kind:function(arm,size=0x38) addr:0x20377c8 -_ZN18UnkStruct_020377508vfunc_08Ei kind:function(arm,size=0x10) addr:0x2037800 -_ZN18UnkStruct_020377508vfunc_0cEi kind:function(arm,size=0xc4) addr:0x2037810 +_ZN18UnkStruct_020377508vfunc_08Ej kind:function(arm,size=0x10) addr:0x2037800 +_ZN18UnkStruct_020377508vfunc_0cEP18UnkStruct_020397f8 kind:function(arm,size=0xc4) addr:0x2037810 _ZN18UnkStruct_020377508vfunc_10Ev kind:function(arm,size=0x234) addr:0x20378d4 _ZN18UnkStruct_020377508vfunc_24Ei kind:function(arm,size=0x3c) addr:0x2037b08 _ZN18UnkStruct_020377508vfunc_28Ei kind:function(arm,size=0x3d0) addr:0x2037b44 _ZN18UnkStruct_020377508vfunc_2cEi kind:function(arm,size=0x660) addr:0x2037f14 _ZN18UnkStruct_0203775020GetLinkStateInteractEv kind:function(arm,size=0x10) addr:0x2038574 _ZN18UnkStruct_020377508vfunc_30Ev kind:function(arm,size=0x8) addr:0x2038584 -_ZN18UnkStruct_0203775013func_020385d0EiPi kind:function(arm,size=0xe4) addr:0x203858c +_ZN18UnkStruct_0203775013func_020385d0EiPh kind:function(arm,size=0xe4) addr:0x203858c _ZN18UnkStruct_020377508vfunc_14Ev kind:function(arm,size=0x4) addr:0x2038670 -_ZN18UnkStruct_020377508vfunc_18Ev kind:function(arm,size=0xc) addr:0x2038674 +_ZN18UnkStruct_020377508vfunc_18EPi kind:function(arm,size=0xc) addr:0x2038674 _ZN18UnkStruct_020377508vfunc_1cEv kind:function(arm,size=0x8) addr:0x2038680 _ZN18UnkStruct_020377508vfunc_20Ev kind:function(arm,size=0xc) addr:0x2038688 _ZN18UnkStruct_020386d8C2Ev kind:function(arm,size=0x40) addr:0x2038694 _ZN18UnkStruct_020386d8C1Ev kind:function(arm,size=0x40) addr:0x20386d4 -_ZN18UnkStruct_020386d88vfunc_08Ei kind:function(arm,size=0x18) addr:0x2038714 +_ZN18UnkStruct_020386d88vfunc_08Ej kind:function(arm,size=0x18) addr:0x2038714 _ZN18UnkStruct_020386d88vfunc_24Ei kind:function(arm,size=0x1c) addr:0x203872c -_ZN18UnkStruct_020386d88vfunc_28Ev kind:function(arm,size=0x18) addr:0x2038748 +_ZN18UnkStruct_020386d88vfunc_28Ei kind:function(arm,size=0x18) addr:0x2038748 _ZN18UnkStruct_020386d88vfunc_30Ev kind:function(arm,size=0x28) addr:0x2038760 -_ZN18UnkStruct_020386d88D0Ev kind:function(arm,size=0x14) addr:0x2038788 +_ZN18UnkStruct_020386d8D2Ev 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 @@ -1876,36 +1876,36 @@ _ZN18UnkStruct_02038aa0C2Ehh kind:function(thumb,size=0x5c) addr:0x2038a5c _ZN18UnkStruct_02038aa0D1Ev kind:function(thumb,size=0xc) addr:0x2038ab8 _ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x12) addr:0x2038ac4 _ZN18UnkStruct_02038aa0D2Ev kind:function(thumb,size=0xc) addr:0x2038ad8 -_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(thumb,size=0xc) addr:0x2038ae4 -_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0xc) addr:0x2038af0 -_ZN18UnkStruct_02038aa013func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038afc -_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0x4) addr:0x2038b30 -_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0xbc) addr:0x2038b34 -_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0 -_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x3c) addr:0x2038c74 +_ZN18UnkStruct_02038aa013func_02038b28Ev kind:function(thumb,size=0xc) addr:0x2038ae4 +_ZN18UnkStruct_02038aa08vfunc_4cEji kind:function(arm,size=0xc) addr:0x2038af0 +_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038afc +_ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b30 +_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b34 +_ZN18UnkStruct_02038aa013func_02038c34Ev kind:function(arm,size=0x84) addr:0x2038bf0 +_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x3c) addr:0x2038c74 _ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x2038cb0 _ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038ccc -_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x1b0) addr:0x2038cdc -_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038e8c -_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4c) addr:0x2038eb0 -_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x4) addr:0x2038efc -_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x114) addr:0x2038f00 -_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x4) addr:0x2039014 -_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x48) addr:0x2039018 -_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x164) addr:0x2039060 -_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x20) addr:0x20391c4 -_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x28) addr:0x20391e4 -_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0x64) addr:0x203920c -_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xe4) addr:0x2039270 -_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0xc) addr:0x2039354 -_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x4) addr:0x2039360 -_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x28) addr:0x2039364 -_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x70) addr:0x203938c -_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x3c) addr:0x20393fc -_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x5c) addr:0x2039438 -_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 -_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x40) addr:0x20394d8 -_ZN18UnkStruct_0203881cD0Ev kind:function(arm,size=0x14) addr:0x2039518 +_ZN18UnkStruct_02038aa013func_02038d20Ev kind:function(arm,size=0x1b0) addr:0x2038cdc +_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038e8c +_ZN18UnkStruct_02038aa08vfunc_30Eii kind:function(arm,size=0x4c) addr:0x2038eb0 +_ZN18UnkStruct_02038aa013func_02038f40Eii kind:function(arm,size=0x4) addr:0x2038efc +_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x114) addr:0x2038f00 +_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x4) addr:0x2039014 +_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x48) addr:0x2039018 +_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x164) addr:0x2039060 +_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x20) addr:0x20391c4 +_ZN18UnkStruct_02038aa013func_02039228Es kind:function(arm,size=0x28) addr:0x20391e4 +_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x64) addr:0x203920c +_ZN18UnkStruct_02038aa013func_020392b4Ev kind:function(arm,size=0xe4) addr:0x2039270 +_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xc) addr:0x2039354 +_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0x4) addr:0x2039360 +_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x28) addr:0x2039364 +_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x70) addr:0x203938c +_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x3c) addr:0x20393fc +_ZN18UnkStruct_02038aa013func_0203947cEii kind:function(arm,size=0x5c) addr:0x2039438 +_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x44) addr:0x2039494 +_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x40) addr:0x20394d8 +_ZN18UnkStruct_02038aa013func_0203955cEv kind:function(arm,size=0x14) addr:0x2039518 _ZN18UnkStruct_02038aa08vfunc_38Ev kind:function(arm,size=0x8) addr:0x203952c func_02039578 kind:function(arm,size=0x3c) addr:0x2039534 _ZN18UnkStruct_020397f8C2Ev kind:function(thumb,size=0x244) addr:0x2039570 @@ -1946,19 +1946,19 @@ _ZN18UnkStruct_020397f813func_0203c25cEv kind:function(arm,size=0x6c) addr:0x203 _ZN18UnkStruct_020397f8D1Ev kind:function(arm,size=0x48) addr:0x203c284 _ZN18UnkStruct_020397f8D0Ev kind:function(arm,size=0x40) addr:0x203c2cc _ZN18UnkStruct_020397f88vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c30c -func_0203c358 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 -func_0203c4ac kind:function(arm,size=0x118) addr:0x203c468 -func_0203c5c4 kind:function(arm,size=0x18) addr:0x203c580 +_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 +_ZN13MsgProc_Type213func_0203c4acEii kind:function(arm,size=0x118) addr:0x203c468 +_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 -func_0203c72c 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 @@ -2034,13 +2034,13 @@ _ZN18UnkStruct_0203dae08vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dc70 _ZN18UnkStruct_0203dae013func_0203dcfcEhiii kind:function(arm,size=0xf0) addr:0x203dcb8 _ZN18UnkStruct_0203dae013func_0203ddecEv kind:function(arm,size=0x10) addr:0x203dda8 _ZN18UnkStruct_0203dae013func_0203ddfcEv kind:function(arm,size=0x18) addr:0x203ddb8 -_ZN18UnkStruct_0203dae013func_0203de14Ev kind:function(arm,size=0x10) addr:0x203ddd0 +_ZN18UnkStruct_02038aa013func_0203de14Ei kind:function(arm,size=0x10) addr:0x203ddd0 _ZN18UnkStruct_0203dae013func_0203de24Ev kind:function(arm,size=0x34) addr:0x203dde0 _ZN18UnkStruct_0203dae013func_0203de58Ei kind:function(arm,size=0x208) addr:0x203de14 _ZN18UnkStruct_0203dae08vfunc_10Eji kind:function(arm,size=0x30) addr:0x203e01c _ZN18UnkStruct_0203dae08vfunc_30Ev kind:function(arm,size=0x38) addr:0x203e04c _ZN18UnkStruct_0203dae08vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e084 -_ZN18UnkStruct_0203dae013func_0203e0f8Eii kind:function(arm,size=0xa4) addr:0x203e0b4 +_ZN18UnkStruct_0203dae013func_0203e0f8Ev kind:function(arm,size=0xa4) addr:0x203e0b4 _ZN18UnkStruct_0203dae08vfunc_2cEv kind:function(arm,size=0x14) addr:0x203e158 _ZN18UnkStruct_0203dae013func_0203e1b0Eiii kind:function(arm,size=0xd4) addr:0x203e16c _ZN18UnkStruct_0203dae08vfunc_18Ei kind:function(arm,size=0x28) addr:0x203e240 @@ -2565,7 +2565,7 @@ data_02056898 kind:data(any) addr:0x2056854 data_02056918 kind:data(any) addr:0x20568d4 data_0205691c kind:data(any) addr:0x20568d8 data_02056924 kind:data(any) addr:0x20568e0 -data_02056958 kind:data(any) addr:0x2056914 +sBMGFileNames kind:data(any) addr:0x2056914 data_020569e0 kind:data(any) addr:0x205699c data_020569ec kind:data(any) addr:0x20569a8 data_020569f0 kind:data(any) addr:0x20569ac @@ -2801,12 +2801,12 @@ data_02057ed4 kind:data(any) addr:0x2057e8c data_02057ed8 kind:data(any) addr:0x2057e90 data_02057eec kind:data(any) addr:0x2057ea4 data_02057f08 kind:data(any) addr:0x2057ec0 -data_02057f14 kind:data(any) addr:0x2057ecc +_ZTV13MsgProc_Type2 kind:data(any) addr:0x2057ecc data_02057f90 kind:data(any) addr:0x2057f48 data_0205800c kind:data(any) addr:0x2057fc4 data_02058024 kind:data(any) addr:0x2057fdc data_0205803c kind:data(any) addr:0x2057ff4 -data_02058054 kind:data(any) addr:0x205800c +_ZTV13MsgProc_Base2 kind:data(any) addr:0x205800c data_02058088 kind:data(any) addr:0x2058040 data_02058090 kind:data(any) addr:0x2058048 data_02058094 kind:data(any) addr:0x205804c diff --git a/include/DTCM/UnkStruct_027e103c.hpp b/include/DTCM/UnkStruct_027e103c.hpp index 0538e54e..02f58f4c 100644 --- a/include/DTCM/UnkStruct_027e103c.hpp +++ b/include/DTCM/UnkStruct_027e103c.hpp @@ -57,7 +57,7 @@ struct UnkStruct_027e103c { void func_ov000_020cf3f0(); void func_ov000_020cf404(); void func_ov000_020cf414(); - void func_ov000_020cf42c(); + bool func_ov000_020cf42c(); bool func_ov000_020cf444(); bool func_ov000_020cf488(); bool func_ov000_020cf4bc(); @@ -80,7 +80,10 @@ struct UnkStruct_027e103c { unk8 func_ov000_020cfab0(); void func_ov000_020cfabc(s32 param1, s32 param2); void func_ov000_020cfae8(s32 param1, s32 param2); - void func_ov000_020cfb20(unk32 param1); + + //! TODO: find out if the type is always `UnkStruct_020397f8*` + void func_ov000_020cfb20(void *); + void func_ov000_020cfb38(); void func_ov000_020cfb48(); void func_ov000_020cfb58(); diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 34d5a636..3de57def 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -8,7 +8,8 @@ extern "C" { #include "nds/math.h"
#include "types.h"
-#include "Actor/Navi/ActorNaviBase.hpp"
+#include "Actor/Navi/ActorNavi.hpp"
+#include "DTCM/UnkStruct_027e0d38.hpp"
#include "Item/Item.hpp"
#include "Player/EquipItem.hpp"
#include "Render/ModelRender.hpp"
@@ -186,6 +187,9 @@ public: // Rupees
s32 GetMaxRupees() const;
void GiveRupees(s32 amount, bool param2);
+ inline u16 GetNumRupees(void) {
+ return this->mNumRupees;
+ }
// Potion
void SetPotion(u32 index, Potion potion);
diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp new file mode 100644 index 00000000..c3d4479d --- /dev/null +++ b/include/Message/BMG.hpp @@ -0,0 +1,208 @@ +#pragma once + +#include "System/SysNew.hpp" +#include "global.h" +#include "types.h" + +#define BMG_MAGIC "MESGbmg1" +#define BMG_GET_INF1(pGroups, flags) ((pGroups)->entries[(flags) >> 0x10].func_02037258((flags) & 0xFFFF)) +#define BMG_GET_MSG_OFFSET(pGroups, flags) (BMG_GET_INF1((pGroups), (flags))->offset) +#define BMG_GET_MSG_ADDR(pGroups, flags) \ + ((u32) (pGroups)->entries[(flags) >> 0x10].pDAT1 + (BMG_GET_MSG_OFFSET((pGroups), (flags)) & ~1)) + +enum BMGTag { + /* "INF1" */ BMG_TAG_INF1 = '1FNI', + /* "FLW1" */ BMG_TAG_FLW1 = '1WLF', + /* "FLI1" */ BMG_TAG_FLI1 = '1ILF', + /* "DAT1" */ BMG_TAG_DAT1 = '1TAD', + /* "MID1" */ BMG_TAG_MID1 = '1DIM', + /* "STR1" */ BMG_TAG_STR1 = '1RTS', +}; + +enum BMGEncoding { + /* 1 */ BMG_ENCODING_CP1252 = 1, + /* 2 */ BMG_ENCODING_UTF16_BE, + /* 3 */ BMG_ENCODING_SHIFT_JIS, + /* 4 */ BMG_ENCODING_UTF8, + /* 5 */ BMG_ENCODING_MAX +}; + +typedef enum BMGFileIndex { + /* 0 */ BMG_FILE_INDEX_SYSTEM, + /* 1 */ BMG_FILE_INDEX_REGULAR, + /* 2 */ BMG_FILE_INDEX_BATTLE, + /* 3 */ BMG_FILE_INDEX_TEST, + /* 4 */ BMG_FILE_INDEX_DEFAULT, + /* 5 */ BMG_FILE_INDEX_SEA, + /* 6 */ BMG_FILE_INDEX_KAITEI, + /* 7 */ BMG_FILE_INDEX_MAIN_ISL, + /* 8 */ BMG_FILE_INDEX_BRAVE, + /* 9 */ BMG_FILE_INDEX_FLAME, + /* 10 */ BMG_FILE_INDEX_WIND, + /* 11 */ BMG_FILE_INDEX_FROST, + /* 12 */ BMG_FILE_INDEX_POWER, + /* 13 */ BMG_FILE_INDEX_WISDOM, + /* 14 */ BMG_FILE_INDEX_GHOST, + /* 15 */ BMG_FILE_INDEX_HIDARI, + /* 16 */ BMG_FILE_INDEX_SENNIN, + /* 17 */ BMG_FILE_INDEX_SHIP, + /* 18 */ BMG_FILE_INDEX_COLLECT, + /* 19 */ BMG_FILE_INDEX_MAINSELECT, + /* 20 */ BMG_FILE_INDEX_FIELD, + /* 21 */ BMG_FILE_INDEX_WISDOM_DNGN, + /* 22 */ BMG_FILE_INDEX_DEMO, + /* 23 */ BMG_FILE_INDEX_BATTLECOMMON, + /* 24 */ BMG_FILE_INDEX_BOSSLAST1, + /* 25 */ BMG_FILE_INDEX_BOSSLAST3, + /* 26 */ BMG_FILE_INDEX_TORII, + /* 27 */ BMG_FILE_INDEX_MYOU, + /* 28 */ BMG_FILE_INDEX_KOJIMA1, + /* 29 */ BMG_FILE_INDEX_KOJIMA2, + /* 30 */ BMG_FILE_INDEX_KOJIMA5, + /* 31 */ BMG_FILE_INDEX_KOJIMA3, + /* 32 */ BMG_FILE_INDEX_STAFF, + /* 33 */ BMG_FILE_INDEX_KAITEI_F, + /* 34 */ BMG_FILE_INDEX_MAX +} BMGFileIndex; + +struct SectionBase { + /* 00 */ u32 tag; // "INF1", "DAT1", ... + /* 04 */ u32 size; // the size of the section + /* 08 */ +}; + +struct BMGHeader { + /* 00 */ char magic[8]; // always "MESGbmg1" + /* 08 */ u32 fileSize; // the size of the BMG file + /* 0c */ u32 numSections; // the number of sections (INF1, DAT1, ...) + /* 10 */ u8 encoding; // see `BMGEncoding` + /* 11 */ u8 unk_11[0xF]; // alignment padding? + /* 20 */ +}; + +struct EntryINF1 { + /* 00 */ u32 offset; // relative to the end of the DAT1 header + /* 04 */ u8 mUnk_04; // flags/attributes? (+0x04 to +0x06) + /* 05 */ u8 mUnk_05; + /* 06 */ u8 mUnk_06; + /* 07 */ u8 mUnk_07; + /* 08 */ +}; + +struct SectionINF1 { + /* 00 */ SectionBase base; + /* 08 */ u16 numEntries; + /* 0a */ u16 entrySize; + /* 0c */ u16 groupId; + /* 0e */ u8 colorId; + /* 0f */ u8 mUnk_0F[0x1]; // alignment padding? + /* 10 */ EntryINF1 *entries; + /* 14 */ +}; + +enum InstrType { + /* 1 */ FLW1_TYPE_SHOW_MSG = 1, + /* 2 */ FLW1_TYPE_BRANCH = 2, + /* 3 */ FLW1_TYPE_EVENT = 3, + /* 4 */ +}; + +struct InstrShowMsg { + /* 01 */ u8 bmgFileIndex; // index into sBMGFiles + /* 02 */ u16 msgIndex; // index of INF1 entry + /* 04 */ s16 nextIndex; // index of FLW1 entry, 0xFFFF stops the conversation + /* 06 */ s16 nextBMGFileIndex; // index into sBMGFiles + /* 08 */ +}; + +struct InstrBranch { + /* 01 */ u8 mUnk_01; + /* 02 */ u16 funcIndex; // index of the query function to run + /* 04 */ u16 funcArg; // the argument to use in the function + /* 06 */ u16 flwEntry; // the index of the second section table to be used next in the conversation. + /* 08 */ +}; + +struct InstrEvent { + /* 01 */ u8 funcIndex; // index of the query function to run + /* 02 */ u16 flwEntry; // the index of the second section table to be used next in the conversation. + /* 04 */ u32 funcArg; // the argument to use in the function + /* 08 */ +}; + +struct FLW1Instr { + /* 00 */ u8 type; // see InstrType + /* 01 */ union { + InstrShowMsg showMsg; + InstrBranch branch; + InstrEvent event; + }; + /* 09 */ +}; + +struct SectionFLW1 { + /* 00 */ SectionBase base; + /* 04 */ u16 numInstructions; + /* 08 */ u16 numLabels; + /* 0c */ u32 mUnk_0c; // always zero? + /* 10 */ FLW1Instr *instructions; + /* 14 */ s16 *flwEntries; + /* 18 */ s8 *bmgFileIndices; + /* 1c */ +}; + +struct EntryFLI1 { + /* 00 */ u32 msgFlowID; + /* 04 */ u32 msgFlowNodeIndex; + /* 08 */ +}; + +struct SectionFLI1 { + /* 00 */ SectionBase base; + /* 04 */ u16 numEntries; + /* 08 */ u16 entrySize; + /* 0c */ u32 mUnk_0c; // always zero? + /* 10 */ EntryFLI1 *entries; + /* 14 */ +}; + +struct EntryDAT1 { + /* 00 */ char *text; + /* 04 */ +}; + +struct SectionDAT1 { + /* 00 */ SectionBase base; + /* 08 */ EntryDAT1 *entries; + /* 0c */ +}; + +struct BMGFileInfo { + /* 00 */ BMGHeader *pHeader; // pointer to the file's header + /* 04 */ SectionINF1 *pINF1; // pointer to the data informations (INF -> informations) + /* 08 */ SectionFLW1 *pFLW1; // pointer to the message flow data (FLW -> flow) + /* 0c */ SectionFLI1 *pFLI1; // pointer to the message flow index table (FLI -> flow index table) + /* 10 */ SectionDAT1 *pDAT1; // pointer to the data (DAT -> data) + /* 14 */ BMGHeader *mUnk_14; // same as pHeader (?) + /* 18 */ s16 mUnk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose) + /* 1a */ s16 groupId; // stores the group id + /* 1c */ + + void func_020371b4(); + u16 func_020371c8(u32 *pFile, s16 unk_18); + EntryINF1 *func_02037258(u16 param_2); + u16 func_0203728c(unk32 param_2); +}; + +class BMGGroups : public SysObject { +public: + /* 00 */ BMGFileInfo *entries; // accessed with `groupId` + /* 04 */ s32 numEntries; + /* 08 */ + + BMGGroups(); + ~BMGGroups(); + void func_020372f0(BMGFileIndex eIndex, s16 unk_18); + void func_020373b4(s16 unk_18); + u32 func_020373ec(unk32 param_2); +}; diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp new file mode 100644 index 00000000..ed4ddcd2 --- /dev/null +++ b/include/Message/MessageManager.hpp @@ -0,0 +1,78 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include "Debug/DebugHierarchy.hpp" +#include "Message/BMG.hpp" +#include "Message/MsgProc.hpp" +#include "System/SysNew.hpp" +#include "nds/math.h" + +#include "Unknown/UnkStruct_0202e1a0.hpp" +#include "Unknown/UnkStruct_02032f0c.hpp" +#include "Unknown/UnkStruct_02035064.hpp" +#include "Unknown/UnkStruct_02037750.hpp" +#include "Unknown/UnkStruct_02038aa0.hpp" +#include "Unknown/UnkStruct_020397f8.hpp" +#include "Unknown/UnkStruct_0203dae0.hpp" + +class MessageManager : public SysObject { +public: + /* 0x00 */ u8 mUnk_00[2]; + /* 0x02 */ u8 mUnk_02; + /* 0x03 */ u8 mUnk_03; + /* 0x04 */ u8 mUnk_04; // halts actors and hides the item menu + /* 0x05 */ u8 mUnk_05; + /* 0x06 */ unk16 mUnk_06; + /* 0x08 */ UnkStruct_020397f8 *mUnk_08; + /* 0x0C */ u8 mUnk_0c; + /* 0x0C */ u8 mUnk_0d; + /* 0x0C */ unk16 mUnk_0e; + /* 0x10 */ unk16 mUnk_10; + /* 0x10 */ unk16 mUnk_12; + /* 0x14 */ BMGGroups *pGroups; + /* 0x18 */ UnkStruct_020386d8 *mUnk_18[2]; + /* 0x20 */ UnkStruct_02037750 *mUnk_20[2]; + /* 0x28 */ UnkStruct_02038aa0 *mUnk_28[6]; //! TODO: is it the right type? + /* 0x40 */ UnkStruct_020397f8 *mUnk_40[2]; // is array size 6? + /* 0x48 */ DebugHierarchy *mDebug; + /* 0x4C */ + + static void func_0203643c(u32 *param_1, MessageManager *param_2, u32 param_3); + void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); + void func_0203665c(void); + MessageManager(); + ~MessageManager(); + UnkStruct_020397f8 *func_020366c4(void); + UnkStruct_020397f8 *func_02036700(void); + UnkStruct_020386d8 *func_0203673c(void); + bool func_02036770(u32 param_2); + unk32 func_02036798(void); + bool func_020367dc(int param_2); + bool MessageManager::func_020367ec(void); + bool func_02036808(void); + bool func_02036824(void); + bool func_02036850(void); + void func_02036888(UnkStruct_020386d8 *param_2); + bool func_020368f4(UnkStruct_02037750 *param_2); + void func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4); + void func_02036bbc(void); + void func_02036c50(unk32 param_2); + void func_02036ca4(unk32 param_2); + bool func_02036ce4(UnkStruct_020386d8 *param_2, unk32 param_3); + bool func_02036d30(UnkStruct_02037750 *param_2); + bool func_02036d4c(UnkStruct_02037750 *param_2); + void func_02036d6c(void); + UnkStruct_02038aa0 *func_02036da8(u32 param_2, s16 *param_3); + void func_02036edc(u32 param_2, u8 param_3); + UnkStruct_020397f8 *func_02036f68(u32 param_2, u8 *param_3); + UnkStruct_020386d8 *func_020370d0(unk32 param_2, unk32 param_3); + UnkStruct_020386d8 *func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); + void func_02037158(UnkSubClass1_02256FF8 *param_2); + UnkStruct_02038aa0 *func_02037178(UnkSubClass1_02256FF8 *param_2); + + void func_ov004_021069c4(void); +}; + +extern MessageManager gMessageManager; diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp new file mode 100644 index 00000000..bfdbc86b --- /dev/null +++ b/include/Message/MsgProc.hpp @@ -0,0 +1,186 @@ +#pragma once + +#include "Message/BMG.hpp" +#include "System/SysNew.hpp" +#include "Unknown/func_ov000_020d0644.hpp" +#include "nds/math.h" + +// temp +#define UNK_TYPE void + +#define ESCAPE_SEQUENCE_MARKER '\x1A' +#define CHECK_UNK_FLAGS(val) (((data_02056be4[data_027e077c.mUnk_0] & (val)) != 0)) + +typedef struct UnkStruct_0203b264 { + /* 0 */ u8 mUnk_0[0x4]; + /* 4 */ u16 *mUnk_4; + /* 8 */ +} UnkStruct_0203b264; + +class UnkStruct_020397f8_410 { +public: + /* 0x00 */ struct UnkStruct_020397f8 *mUnk_00; + /* 0x04 */ + + void func_0203ec34(void); + void func_0203ebe0(void); + void func_0203ebf8(void); + void func_0203ec4c(UnkStruct_0203b264 *param_2, unk32 param_3, s32 param_4, s32 param_5); +}; + +// same as UnkStruct_020397f8_410? +class UnkStruct_020397f8_424 { +public: + /* 0x00 */ struct UnkStruct_020397f8 *mUnk_00; + /* 0x04 */ + + void func_0203ee80(unk32); + void func_0203ef78(unk16, u16, unk8); + void func_0203ef78(unk16); // overload? + void func_0203ee48(void); + UnkStruct_0203b264 *func_0203eeb0(unk32 param_2, unk32 param_3); +}; + +class UnkStruct_0203dae0_114 : public SysObject { +public: + /* 0x00 (vtable) */ + /* 0x04 */ unk32 *mUnk_04; + /* 0x08 */ + + UnkStruct_0203dae0_114(); + /* 0x00 */ virtual ~UnkStruct_0203dae0_114() override; + /* 0x08 */ virtual unk32 vfunc_08(void *); + /* 0x08 */ virtual unk32 vfunc_0c(void); + /* 0x0C */ + + unk32 *func_0203d1b4(void); +}; + +struct func_02038f44_param4 { + u8 mUnk_00; + u8 mUnk_01; + u8 mUnk_02; + u8 mUnk_03; + unk32 mUnk_04; + unk32 mUnk_08; + unk32 mUnk_0c; + unk32 mUnk_10; + unk8 mUnk_14; + u8 mUnk_15; +}; + +// TEMPORARY + +extern "C" u32 func_01ff9b4c(unk32, unk32); +extern "C" unk32 func_0203c084(void); +extern "C" unk32 func_ov000_02079e04(void); +extern "C" unk32 func_02016fcc(unk32); +extern "C" void func_02032304(unk32 *, char *, unk32, unk32, unk32); +extern "C" unk32 func_0202d5b4(char *, char *, unk32, unk32, unk32); +extern unk32 data_020691a0; +extern unk32 *data_02068894; +extern unk32 data_02056af0; +extern unk32 *data_02056a00; +extern char *data_02057f08; // "MSP" +extern char *data_02057eec; // "Menu/UI_main/opening.bin" +extern char *data_02057ed8; // "MSP:opening.nclr" + +struct Struct_027e0db0 { + /* 0x00 */ unk32 mUnk_00; + /* 0x04 */ unk32 mUnk_04; +}; +extern Struct_027e0db0 data_027e0db0; + +// see Actor.cpp +struct UnkStruct2 { + /* 0 */ u32 mUnk_0; + /* 4 */ u32 mUnk_4; + /* 8 */ +}; +extern UnkStruct2 data_027e077c; +extern u8 data_02056be4[]; + +class UnkClass_027e0cbc { +public: + unk32 func_0203d7e0(unk32); + unk32 func_0203d77c(unk32, s32, s32); +}; +extern UnkClass_027e0cbc data_027e0cbc; +extern unk16 data_02056a10[]; +extern unk16 data_02056a16[]; +extern unk32 data_02056a04[]; +extern unk32 data_027e0c38[]; +extern "C" void func_0203489c(unk32, unk16, unk32 *, unk32 *); +extern "C" void func_020347b0(unk32, unk16, unk32 *, unk32 *, unk32, unk32); +extern THUMB unk32 func_0202ab48(void); +extern "C" void func_02034984(unk32, u8, unk32, unk32); +extern "C" void func_02034698(unk32, unk32, unk32 *, unk32 *); +extern struct TouchControl gTouchControl; + +class UnkClass_027e0e28 { +public: + unk32 func_ov000_0207bc48(); +}; +extern UnkClass_027e0e28 *data_027e0e28; +extern u8 data_027e0c54; +extern unk32 *data_ov009_0211f5b4; +extern "C" unk32 func_ov003_020f3f94(unk32 *); +extern unk32 *data_02057ed4; + +// see Actor.cpp +typedef struct UnkStruct_01ffbe34 { + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk8 mUnk_08; + /* 09 */ unk8 mUnk_09; + /* 0a */ unk8 mUnk_0a; + /* 0b */ unk8 mUnk_0b; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk8 mUnk_14; + /* 15 */ unk8 mUnk_15; + /* 16 */ unk16 mUnk_16; + /* 18 */ unk32 mUnk_18; + /* 1c */ unk32 mUnk_1c; + /* 20 */ +} UnkStruct_01ffbe34; +extern "C" void func_01ffbe34(UnkStruct_01ffbe34 *param1); + +struct UnkClass_027e1054_unk_00_unk00 { + /* 0x00 */ u8 mUnk_00[0x95]; + /* 0x95 */ u8 mUnk_95; +}; +struct UnkClass_027e1054_unk_00 { + /* 0x00 */ unk32 mUnk_04; + /* 0x00 */ UnkClass_027e1054_unk_00_unk00 *mUnk_00; +}; +class UnkClass_027e1054 { +public: + UnkClass_027e1054_unk_00 *mUnk_00; + unk32 mUnk_04; + + void func_ov003_020f4874(void); + void func_ov003_020f4760(u8, unk32); +}; +extern UnkClass_027e1054 data_027e1054; + +class UnkClass_ov000_020eec9c { +public: + void func_ov000_020d77e4(unk32); + unk32 func_ov000_020d7f18(unk32); +}; +extern UnkClass_ov000_020eec9c data_ov000_020eec9c; + +class UnkClass_ov000_027e0d04 { +public: + /* 0x00 */ unk16 mUnk_00; + + void func_0203fe60(unk32); +}; +extern UnkClass_ov000_027e0d04 data_027e0d04; + +class UnkClass_data_027e0f7c { +public: + u8 *func_ov000_0209d90c(s8, s8); +}; +extern UnkClass_data_027e0f7c data_027e0f7c; diff --git a/include/Player/LinkStateCutscene.hpp b/include/Player/LinkStateCutscene.hpp index 224350fd..750f1b8a 100644 --- a/include/Player/LinkStateCutscene.hpp +++ b/include/Player/LinkStateCutscene.hpp @@ -16,7 +16,7 @@ public: /* 00 */ virtual ~UnkStruct_ov004_0210abb8() override; /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 24 */ virtual void vfunc_24(unk32 param1) override; + /* 24 */ virtual bool vfunc_24(unk32 param1) override; /* 2c */ virtual unk32 vfunc_2c(s32 param1) override; /* 34 */ }; diff --git a/include/Unknown/UnkStruct_0202e1a0.hpp b/include/Unknown/UnkStruct_0202e1a0.hpp index a99956bc..d6d6a793 100644 --- a/include/Unknown/UnkStruct_0202e1a0.hpp +++ b/include/Unknown/UnkStruct_0202e1a0.hpp @@ -3,6 +3,7 @@ #include "global.h" #include "types.h" +// astruct_11 struct UnkStruct_0202e1a0 { /* 00 */ unk16 mUnk_00; /* 02 */ unk16 mUnk_02; diff --git a/include/Unknown/UnkStruct_02032f0c.hpp b/include/Unknown/UnkStruct_02032f0c.hpp index 602861bd..ec589e51 100644 --- a/include/Unknown/UnkStruct_02032f0c.hpp +++ b/include/Unknown/UnkStruct_02032f0c.hpp @@ -3,10 +3,13 @@ #include "global.h" #include "types.h" -class UnkStruct_02032e7c { +#include "Message/BMG.hpp" +#include "System/SysNew.hpp" + +class UnkStruct_02032e7c : public SysObject { public: /* 00 (vtable) */ - /* 04 */ unk32 mUnk_04; + /* 04 */ u16 *mUnk_04; // pointer to the current position in the message to display /* 08 */ unk16 mUnk_08; /* 0a */ unk16 mUnk_0a; /* 0c */ unk16 mUnk_0c; @@ -20,20 +23,80 @@ public: UnkStruct_02032e7c(); }; -class UnkStruct_02032f0c { +class UnkSubClass1_02256FF8 { public: /* 00 (vtable) */ /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1c */ u8 mUnk_1c; + /* 20 */ + + UnkSubClass1_02256FF8(); + /* 00 */ virtual ~UnkSubClass1_02256FF8() override; + /* 08 */ virtual void vfunc_08(void) override; + /* 0c */ virtual void vfunc_0c(void) override; + /* 10 */ virtual void vfunc_10(void) override; + /* 14 */ virtual void vfunc_14(void) override; + /* 18 */ virtual void vfunc_18(void) override; + /* 1c */ virtual void vfunc_1c(void) override; + /* 20 */ virtual void vfunc_20(void) override; + /* 24 */ virtual void vfunc_24(void) override; + /* 28 */ virtual void vfunc_28(void) override; + /* 2c */ virtual void vfunc_2c(void) override; + /* 30 */ virtual void vfunc_30(void) override; + /* 34 */ virtual void vfunc_34(void) override; + /* 38 */ virtual void vfunc_38(void) override; + /* 3c */ +}; + +struct UnkStruct_MsgProc_Base_unk_2C { + /* 00 */ s8 mUnk_00; + /* 01 */ s8 mUnk_01; + /* 02 */ s8 mUnk_02; + /* 03 */ s8 mUnk_03; + /* 04 */ unk32 mUnk_04; + /* 08 */ u8 *mUnk_08; + /* 0c */ +}; + +struct func_0203b410_param1 { + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk16 mUnk_10; + /* 12 */ unk16 mUnk_12; + /* 14 */ +}; + +// astruct_8, MsgProc_Base +class UnkStruct_02032f0c : public SysObject { +public: + /* 00 (vtable) */ + /* 04 */ unk32 *mUnk_04; + /* 08 */ UnkSubClass1_02256FF8 *mUnk_08; /* 0c */ u16 *mUnk_0c; - /* 10 */ unk32 mUnk_10[6]; - /* 28 */ unk32 mUnk_28; - /* 2c */ s32 **mUnk_2c; + /* 10 */ unk32 *mUnk_10; + /* 14 */ s32 mUnk_14; + /* 18 */ s32 mUnk_18; + /* 1c */ unk32 mUnk_1c; + /* 20 */ unk32 mUnk_20; + /* 24 */ unk32 *mUnk_24; + /* 28 */ unk32 *mUnk_28; + /* 2c */ UnkStruct_MsgProc_Base_unk_2C **mUnk_2c; /* 30 */ s32 mUnk_30; /* 34 */ s32 mUnk_34; /* 38 */ unk32 mUnk_38; /* 3c */ unk16 mUnk_3c; - /* 3e */ unk16 mUnk_3e[6]; + /* 3e */ unk16 mUnk_3e; + /* 40 */ unk32 mUnk_40; + /* 44 */ unk32 mUnk_44; + /* 48 */ u8 mUnk_48; + /* 49 */ u8 mUnk_49; /* 4a */ u16 mUnk_4a; /* 4c */ u8 mUnk_4c; /* 4d */ bool mUnk_4d; @@ -54,12 +117,47 @@ public: /* 24 */ virtual bool vfunc_24(s16 **param1); /* 28 */ + // /* 0x08 */ /* func_02033030 */ virtual void vfunc_08(unk32* param_2, unk32* param_3); + // /* 0x0C */ /* func_02033190 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); + // /* 0x10 */ /* func_020331c4 */ virtual void vfunc_10(u8 param_2, u8 param_3); + // /* 0x14 */ /* func_02032fcc */ virtual bool vfunc_14(u16 param_2, u8 param_3); + // /* 0x18 */ /* func_020332e4 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4); + // /* 0x1C */ /* func_02033360 */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 + // param_5); + // /* 0x20 */ /* func_020333e0 */ virtual UNK_TYPE vfunc_20(UNK_TYPE); + // /* 0x24 */ /* func_02033af4 */ virtual UNK_TYPE vfunc_24(UNK_TYPE); + + //! TODO: fake? + /* 28 */ virtual bool vfunc_28(void); + /* 2c */ virtual void vfunc_2C(void); + /* 30 */ virtual void vfunc_30(void); + /* 34 */ virtual unk32 vfunc_34(unk32 param_2); + /* 38 */ virtual bool vfunc_38(void); + /* 3c */ virtual void vfunc_3C(unk32 param_2); + /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3); + /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); + /* 48 */ virtual void vfunc_48(void); + /* 4c */ virtual void vfunc_4C(void); + /* 50 */ virtual void vfunc_50(EntryINF1 *param_2, u32 param_3, s16 *param_4, UnkSubClass1_02256FF8 *param_5); + /* 54 */ virtual void vfunc_54(void); + /* 58 */ virtual void vfunc_58(void); + /* 5c */ virtual void vfunc_5C(void); + /* 60 */ virtual void vfunc_60(func_0203b410_param1 *param_2, unk32 param_3, unk32 param_4); + /* 64 */ virtual void vfunc_64(s16 *param_2); + /* 68 */ virtual unk32 vfunc_68(unk32 param_2); + /* 6c */ virtual void vfunc_6C(unk32 *param_2, unk32 *param_3); + /* 70 */ virtual void vfunc_70(unk32 *param_2, unk32 *param_3); + /* 74 */ + UnkStruct_02032f0c(); void func_02032f94(); + unk32 *func_02032f98(unk32 param_2); u16 **SetUnk_0c(u16 *value); u8 func_02032fa4(); s32 func_02032fb4(); + void func_02032fcc(unk32, unk32); void func_02033214(unk32 param1, unk32 param2, unk32 param3, u8 param4, unk32 param5); + unk32 func_02033360(void); void func_020334b4(u32 param1, s32 param2, s32 param3, s32 param4); void func_02033628(unk32 param1, u16 *param2); u32 func_0203369c(u16 *param1, s32 param2); diff --git a/include/Unknown/UnkStruct_02035064.hpp b/include/Unknown/UnkStruct_02035064.hpp index 69011e21..a55b8808 100644 --- a/include/Unknown/UnkStruct_02035064.hpp +++ b/include/Unknown/UnkStruct_02035064.hpp @@ -8,19 +8,33 @@ class UnkStruct_02035064 { public: /* 00 (vtable) */ - /* 04 */ unk32 mUnk_04; - /* 08 */ unk8 mUnk_08[0xc]; + /* 04 */ unk16 mUnk_04; + /* 04 */ unk16 mUnk_06; + /* 08 */ u32 *mUnk_08; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk32 mUnk_10; /* 14 */ u32 mUnk_14; - /* 18 */ unk8 mUnk_18[0x4]; + /* 18 */ unk32 mUnk_18; /* 1c */ unk32 mUnk_1c; - /* 20 */ u32 mUnk_20; - /* 24 */ unk8 mUnk_24[0x28]; + /* 20 */ u32 *mUnk_20; + /* 24 */ unk32 mUnk_24; + /* 28 */ unk32 mUnk_28; + /* 2c */ unk32 mUnk_2c; + /* 30 */ unk32 mUnk_30; + /* 34 */ u32 *mUnk_34; + /* 38 */ u32 *mUnk_38; + /* 3c */ unk32 mUnk_3c; + /* 40 */ unk32 mUnk_40; + /* 44 */ unk32 mUnk_44; + /* 48 */ unk32 mUnk_48; /* 4c */ s16 mUnk_4c; /* 4e */ s16 mUnk_4e; - /* 50 */ unk8 mUnk_50[0xc]; + /* 50 */ unk32 mUnk_50; + /* 54 */ unk32 mUnk_54; + /* 58 */ unk32 mUnk_58; /* 5c */ UnkStruct_0202e1a0 mUnk_5c; /* 74 */ u16 *mUnk_74; - /* 78 */ s32 mUnk_78; + /* 78 */ s32 *mUnk_78; /* 7c */ u32 mUnk_7c; /* 80 */ u16 mUnk_80; /* 82 */ unk16 mUnk_82; @@ -29,13 +43,17 @@ public: /* 87 */ unk8 mUnk_87; /* 88 */ - /* 0 */ virtual s32 vfunc_0(); - /* 4 */ virtual s32 vfunc_4(); + /* 0 */ virtual s32 vfunc_00(); // func_020351a8 + /* 4 */ virtual s32 vfunc_04(); // func_020351b0 /* 8 */ UnkStruct_02035064(); ~UnkStruct_02035064(); + static u8 func_02035428(u8 param1); + + void func_02034a1c(unk32, unk32, struct UnkStruct_01ffbe34 *); + void func_02034b0c(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5, unk32 param_6); void func_020350b0(); void func_020350b4(s32 param1, unk32 param2, unk8 param3, unk16 param4, unk16 param5); void func_0203516c(); diff --git a/include/Unknown/UnkStruct_02037750.hpp b/include/Unknown/UnkStruct_02037750.hpp index 2e5ea7b6..a480c1a3 100644 --- a/include/Unknown/UnkStruct_02037750.hpp +++ b/include/Unknown/UnkStruct_02037750.hpp @@ -4,50 +4,77 @@ #include "types.h" #include "Player/LinkStateInteract.hpp" +#include "System/SysNew.hpp" -class UnkStruct_02037750 { +class UnkStruct_020397f8; +typedef unk32 (*UnkStruct_02037750_Callback1)(unk32); + +// astruct_14 +class UnkStruct_02037750 : public SysObject { public: /* 00 (vtable) */ - /* 04 */ unk32 mUnk_04[0x4]; + /* 04 */ UnkStruct_02037750_Callback1 mUnk_04[0x4]; /* 14 */ unk32 mUnk_14; - /* 18 */ unk32 mUnk_18; + /* 18 */ u32 mUnk_18; /* 1c */ u8 mUnk_1c; - /* 1d */ unk8 mUnk_1d; + /* 1d */ u8 mUnk_1d; /* 1e */ u16 mUnk_1e; /* 20 */ /* 00 */ virtual ~UnkStruct_02037750(); - /* 08 */ virtual void vfunc_08(unk32 param1); - /* 0c */ virtual void vfunc_0c(s32 param1); + /* 08 */ virtual void vfunc_08(u32 param1); + /* 0c */ virtual void vfunc_0c(class UnkStruct_020397f8 *param1); /* 10 */ virtual void vfunc_10(); /* 14 */ virtual void vfunc_14(); - /* 18 */ virtual void vfunc_18(); - /* 1c */ virtual unk32 vfunc_1c(); + /* 18 */ virtual void vfunc_18(unk32 *param1); + /* 1c */ virtual bool vfunc_1c(); /* 20 */ virtual void vfunc_20(); - /* 24 */ virtual void vfunc_24(unk32 param1); - /* 28 */ virtual void vfunc_28(s32 param1); + /* 24 */ virtual bool vfunc_24(unk32 param1); + /* 28 */ virtual unk32 vfunc_28(s32 param1); /* 2c */ virtual unk32 vfunc_2c(s32 param1); - /* 30 */ virtual unk32 vfunc_30(); + /* 30 */ virtual bool vfunc_30(); /* 34 */ UnkStruct_02037750(unk32 param1, unk32 param2); static LinkStateInteract *GetLinkStateInteract(); - void func_020385d0(s32 param1, unk32 *param2); + unk32 func_020385d0(s32 param1, u8 *param2); +}; + +class UnkStruct_020386d8_24 { +public: + /* 00 */ u8 mUnk_00; + /* 00 */ u8 mUnk_01; + /* 00 */ u8 mUnk_02; + /* 00 */ u8 mUnk_03; + /* 04 */ + + void func_020376c0(const Vec3p *param_2); }; +// astruct_15 class UnkStruct_020386d8 : public UnkStruct_02037750 { public: /* 00 (base) */ /* 20 */ unk8 mUnk_20; - /* 21 */ unk8 mUnk_21[0x3]; - /* 24 */ unk32 mUnk_24; - /* 28 */ + /* 21 */ unk8 mUnk_21; + /* 21 */ unk8 mUnk_22; + /* 21 */ unk8 mUnk_23; + /* 24 */ UnkStruct_020386d8_24 mUnk_24; + /* 28 */ unk32 mUnk_28; + /* 2C */ unk32 mUnk_2C; + /* 30 */ unk32 mUnk_30; + /* 34 */ unk16 mUnk_34; + /* 36 */ unk16 mUnk_36; + /* 38 */ u8 mUnk_38; + /* 39 */ u8 mUnk_39; + /* 3A */ unk16 mUnk_3A; + /* 3C */ UnkStruct_020386d8(); /* 00 */ virtual ~UnkStruct_020386d8(); - /* 08 */ virtual void vfunc_08(unk32 param1); - /* 24 */ virtual void vfunc_24(unk32 param1); - /* 28 */ virtual void vfunc_28(); - /* 30 */ virtual unk32 vfunc_30(); + /* 08 */ virtual void vfunc_08(u32 param1); + /* 24 */ virtual bool vfunc_24(unk32 param1); + /* 28 */ virtual unk32 vfunc_28(s32 param1); + /* 30 */ virtual bool vfunc_30(); /* 34 */ }; diff --git a/include/Unknown/UnkStruct_02038aa0.hpp b/include/Unknown/UnkStruct_02038aa0.hpp index 63d63fe2..c0f31f16 100644 --- a/include/Unknown/UnkStruct_02038aa0.hpp +++ b/include/Unknown/UnkStruct_02038aa0.hpp @@ -3,17 +3,21 @@ #include "global.h" #include "types.h" +#include "Message/MsgProc.hpp" +#include "System/SysNew.hpp" #include "Unknown/UnkStruct_0203dae0.hpp" +#include "nds/math.h" class UnkStruct_02038aa0; +typedef bool (*UnknownCallback)(class UnkStruct_020397f8 *); class UnkStruct_0203881c : public UnkStruct_02032e7c { public: /* 00 (base) */ /* 14 */ unk32 mUnk_14; /* 18 */ unk32 mUnk_18; - /* 1c */ unk32 mUnk_1c; - /* 20 */ unk32 mUnk_20; + /* 1c */ UnknownCallback mUnk_1c; + /* 20 */ class UnkStruct_020397f8 *mUnk_20; /* 24 */ unk32 mUnk_24; /* 28 */ @@ -27,45 +31,65 @@ public: void func_02038a80(s32 param1); }; +class UnkSubClass1_unk_124 { +public: + /* 00 */ void *mUnk_00; // pointer to MsgProc_Main (well, the first members of the base class) + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1c */ unk32 mUnk_1c; + /* 20 */ unk32 mUnk_20; + /* 24 */ unk32 mUnk_24; + /* 28 */ unk8 mUnk_28; + /* 29 */ unk8 mUnk_29; + /* 2a */ unk8 mUnk_2a; + /* 2b */ unk8 mUnk_2b; + /* 2c */ + + void func_0203f020(s16 *, unk32); +}; + +struct UnkStruct_0203b264; +struct func_02038f44_param4; + +// astruct_6, MsgProc_Main class UnkStruct_02038aa0 : public UnkStruct_0203dae0 { public: /* 000 (base) */ /* 123 */ unk8 mUnk_123; - /* 124 */ unk32 mUnk_124; - /* 128 */ unk32 mUnk_128; - /* 12c */ unk32 mUnk_12c; - /* 130 */ unk8 mUnk_130[0x20]; - /* 150 */ unk8 mUnk_150; - /* 151 */ unk8 mUnk_151; - /* 152 */ unk8 mUnk_152; - /* 153 */ unk8 mUnk_153; - /* 154 */ unk32 mUnk_154; - /* 158 */ unk8 mUnk_158[0x2]; - /* 15a */ unk16 mUnk_15a; - /* 15c */ unk16 mUnk_15c; - /* 15e */ u8 mUnk_15e; - /* 15f */ u8 mUnk_15f; + /* 124 */ UnkSubClass1_unk_124 *mUnk_124; + /* 128 */ UnkStruct_0203881c mUnk_128; + /* 150 */ u8 mUnk_150[4]; + /* 154 */ EntryINF1 *pInfoEntry; + /* 158 */ Vec2s mUnk_158; // textbox position? + /* 15c */ s16 mUnk_15c; + /* 15e */ s8 mUnk_15e; + /* 15f */ s8 mUnk_15f; /* 160 */ u8 mUnk_160; /* 161 */ /* 00 */ virtual ~UnkStruct_02038aa0(); - /* 08 */ virtual void vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4); - /* 10 */ virtual void vfunc_10(unk32 param1); + /* 08 */ virtual void vfunc_08(s32 param1, unk32 *param2, s16 *param3, unk32 param4); + /* 0c */ virtual void vfunc_0c(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); + /* 10 */ virtual void vfunc_10(); /* 1c */ virtual unk32 vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4); /* 20 */ virtual unk32 vfunc_20(s32 param1, s32 *param2); /* 2c */ virtual void vfunc_2c(); - /* 30 */ virtual void vfunc_30(); + /* 30 */ virtual void vfunc_30(unk32 param_2, unk32 param_3); /* 34 */ virtual unk32 vfunc_34(s32 param1); - /* 38 */ virtual unk32 vfunc_38(); - /* 3c */ virtual void vfunc_3c() = 0; - /* 40 */ virtual void vfunc_40() = 0; - /* 44 */ virtual void vfunc_44(); + /* 38 */ virtual bool vfunc_38(); + /* 3c */ virtual void vfunc_3c(); + /* 40 */ virtual void vfunc_40(); + /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); /* 48 */ virtual void vfunc_48(); - /* 4c */ virtual void vfunc_4c(); - /* 50 */ virtual void vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4); + /* 4c */ virtual void vfunc_4c(u32 param1, unk32 param2); + /* 50 */ virtual void vfunc_50(EntryINF1 *param1, u32 param2, s16 *param3, UnkSubClass1_02256FF8 *param4); /* 54 */ virtual void vfunc_54(); /* 58 */ virtual void vfunc_58(); - /* 5c */ virtual void vfunc_5c(); + /* 5c */ virtual void vfunc_5c(u16 *param_2, struct UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5); /* 60 */ virtual void vfunc_60(); /* 64 */ virtual void vfunc_64(); /* 68 */ virtual s32 vfunc_68(unk32 param1); @@ -73,6 +97,21 @@ public: /* 70 */ virtual void vfunc_70(s32 *param1, s32 *param2); /* 74 */ + // /* 0x08 */ /* func_02039228 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; + // /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; + // /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? + // /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; + // /* 0x18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; + // /* 0x1C */ /* func_0203905c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 + // param_5) override; + // /* 0x20 */ /* func_020390a4 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override; + // /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override; + // /* 0x28 */ virtual bool vfunc_28(void) override; + // /* 0x2C */ /* func_02038d20 */ virtual void vfunc_2C(void) override; + // /* 0x30 */ /* func_02038ed0 */ virtual void vfunc_30(void) override; + // /* 0x34 */ /* func_02038c34 */ virtual unk32 vfunc_34(unk32 param_2) override; + // /* 0x38 */ /* func_02039570 */ virtual bool vfunc_38(void) override; + UnkStruct_02038aa0(u8 param1, u8 param2); void func_02038b40(); bool func_02038b78(); @@ -84,4 +123,38 @@ public: unk32 func_02039250(); void func_02039440(unk32 param1, unk32 param2); bool func_0203951c(); + + static void func_020387e0(u8 *param_2); + + unk32 func_02032fb4(void); + u16 *func_02037604(u16 **); + void func_02038b28(void); + void func_02038b74(void); // is this a dtor? + void func_02038f40(void); + void func_02038f44(EntryINF1 *param_2, u32 param_3, struct func_02038f44_param4 *param_4, UnkSubClass1_02256FF8 *param_5, + unk32 param_6); + void func_02039058(void); + unk32 func_0203905c(u16 *param_2, UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5); + void func_02038d20(void); + void func_020392b4(void); + void func_02039398(void); + void func_020393a8(s16 *param_2); + void func_0203a188(unk32, unk32); + unk32 func_0203a3e0(void); + unk32 func_0203cb5c(unk8, s16); + + void func_0203dcfc(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); + unk32 func_0203de14(unk32); + void func_0203e090(void); + void func_0203e1b0(unk32, unk32, unk32); + + //! TODO: not sure it belongs to this class: + + void func_02033190(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); + void func_020331c4(unk32, unk32); + void func_0203947c(void); + void func_0203cabc(unk32); + unk32 func_0203e284(UnkStruct_0203b264 *, unk32, unk32); + void func_0203e2ac(unk32 *param_2); + s16 func_0203d318(s16, s16); }; diff --git a/include/Unknown/UnkStruct_020397f8.hpp b/include/Unknown/UnkStruct_020397f8.hpp index 53c37017..668f1922 100644 --- a/include/Unknown/UnkStruct_020397f8.hpp +++ b/include/Unknown/UnkStruct_020397f8.hpp @@ -3,42 +3,72 @@ #include "global.h" #include "types.h" +#include "Message/MsgProc.hpp" +#include "System/SysNew.hpp" #include "Unknown/UnkStruct_02035064.hpp" #include "Unknown/UnkStruct_02038aa0.hpp" +// does it host both choices? +struct UnknownMsgChoiceStruct { + /* 00 */ UnkStruct_0203b264 *mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ +}; + +class UnkStruct_020397f8_410; + +// astruct_2, MsgProc_Type1 class UnkStruct_020397f8 : public UnkStruct_02038aa0 { public: /* 000 (base) */ /* 161 */ unk8 mUnk_161[0x3]; - /* 164 */ unk32 mUnk_164; + /* 164 */ UnkStruct_020397f8 *mUnk_164; /* 168 */ UnkStruct_02035064 mUnk_168; /* 1f0 */ UnkStruct_02035064 mUnk_1f0; /* 278 */ UnkStruct_02035064 mUnk_278; /* 300 */ UnkStruct_02035064 mUnk_300; /* 388 */ UnkStruct_02035064 mUnk_388; - /* 410 */ unk32 *mUnk_410; + /* 410 */ UnkStruct_020397f8_410 mUnk_410; /* 414 */ unk32 mUnk_414; - /* 418 */ unk32 mUnk_418; + /* 418 */ UnkStruct_02038aa0 *mUnk_418; /* 41c */ unk16 mUnk_41c; /* 41e */ unk16 mUnk_41e; /* 420 */ unk16 mUnk_420; - /* 422 */ unk8 mUnk_422[0x2]; - /* 424 */ unk32 *mUnk_424; - /* 428 */ unk32 mUnk_428; - /* 42c */ unk8 mUnk_42c[0x124]; + /* 422 */ unk16 mUnk_422; + /* 424 */ UnkStruct_020397f8_424 mUnk_424; + /* 428 */ UnknownMsgChoiceStruct mUnk_428[0x20]; + /* 528 */ unk16 mUnk_528[4]; // number of choices? + /* 530 */ unk32 mUnk_530; + /* 534 */ unk16 mUnk_534; + /* 536 */ unk16 mUnk_536; + /* 538 */ unk16 mUnk_538; + /* 53a */ unk16 mUnk_53a; + /* 53c */ unk32 mUnk_53c; + /* 540 */ unk32 mUnk_540; + /* 544 */ unk8 mUnk_544; + /* 545 */ unk8 mUnk_545; + /* 546 */ unk8 mUnk_546; + /* 547 */ unk8 mUnk_547; + /* 548 */ unk16 mUnk_548; + /* 54a */ unk16 mUnk_54a; + /* 54c */ unk16 mUnk_54c; + /* 54e */ unk16 mUnk_54e; /* 550 */ unk32 mUnk_550; /* 554 */ unk32 mUnk_554; - /* 558 */ unk8 mUnk_558[0x4]; + /* 558 */ unk8 mUnk_558; + /* 559 */ unk8 mUnk_559; + /* 55a */ unk8 mUnk_55a; + /* 55b */ unk8 mUnk_55b; /* 55c */ unk32 mUnk_55c; /* 560 */ unk32 mUnk_560; - /* 564 */ unk8 mUnk_564[0x8]; + /* 564 */ u16 mUnk_564[4]; /* 56c */ unk16 mUnk_56c; /* 56e */ unk16 mUnk_56e; /* 570 */ unk16 mUnk_570; - /* 572 */ unk16 mUnk_572; - /* 574 */ unk16 mUnk_574; + /* 572 */ u16 mUnk_572; + /* 574 */ s16 mUnk_574; /* 576 */ unk16 mUnk_576; - /* 578 */ unk16 mUnk_578; + /* 578 */ s16 mUnk_578; /* 57a */ u8 mUnk_57a; /* 57b */ u8 mUnk_57b; /* 57c */ u8 mUnk_57c; @@ -53,44 +83,130 @@ public: /* 585 */ u8 mUnk_585; /* 586 */ u8 mUnk_586; /* 587 */ unk8 mUnk_587; - /* 588 */ unk32 mUnk_588; - /* 58c */ + /* 588 */ UnkSubClass1_unk_124 mUnk_588; + /* 5b4 */ UnkStruct_020397f8(); /* 4c */ virtual void vfunc_4c(); /* 2c */ virtual void vfunc_2c(); void func_02039ca8(); - /* 3c */ virtual void vfunc_3c(); + /* 3c */ virtual void vfunc_3c(unk32 param1); /* 40 */ virtual void vfunc_40(s32 param1, s32 param2); - void func_0203a188(s32 param1, s32 param2); + void func_0203a188(s32 param1, s32 param2); // void func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4); bool func_0203a2c0(); unk32 func_0203a30c(); /* 48 */ virtual void vfunc_48(); void func_0203a35c(); bool func_0203a3e0(); - /* 44 */ virtual void vfunc_44(s32 param1, s32 param2); - bool func_0203a6d0(unk32 param1); - /* 50 */ virtual void vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4); + /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); + bool func_0203a6d0(unk32 param1, unk32 param2); + /* 50 */ virtual void vfunc_50(EntryINF1 *param1, unk32 param2, s32 *param3, unk32 param4); /* 54 */ virtual void vfunc_54(); /* 5c */ virtual void vfunc_5c(); /* 58 */ virtual void vfunc_58(); bool func_0203b0bc(); s32 func_0203b0ec(u32 param1); - /* 18 */ virtual unk32 vfunc_18(s32 param1); - /* 1c */ virtual unk32 vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4); - /* 60 */ virtual void vfunc_60(s32 param1); - /* 64 */ virtual void vfunc_64(unk32 param1); + /* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264 *param1, unk32 param2, unk32 param3); + /* 1c */ virtual unk32 vfunc_1c(u16 *param1, UnkStruct_0203b264 *param2, unk8 param3, unk32 param4); + /* 60 */ virtual void vfunc_60(func_0203b410_param1 *param1, unk32 param2, unk32 param3); + /* 64 */ virtual void vfunc_64(s16 *param1); void func_0203b764(); /* 20 */ virtual unk32 vfunc_20(s32 param1, s32 *param2); - void func_0203bd8c(s32 param1); + void func_0203bd8c(s32 param1); // void func_0203bd8c(u16 param_2); /* 6c */ virtual void vfunc_6c(s32 *param1, s32 *param2); void func_0203be08(); void func_0203be64(); bool func_0203c084(); bool func_0203c13c(); bool func_0203c1a0(); - bool func_0203c25c(); + static bool func_0203c25c(class UnkStruct_020397f8 *param1); /* 00 */ virtual ~UnkStruct_020397f8(); - /* 38 */ virtual unk32 vfunc_38(); + /* 38 */ virtual bool vfunc_38(); + /* 74 */ + + //! TODO: check if this is really here + void func_02039a3c(void); + unk32 func_02039250(void); +}; + +class MsgProc_Type3 : public UnkStruct_02038aa0 { +public: + /* 000 (base) */ + /* 161 */ unk8 mUnk_161; + /* 162 */ unk16 mUnk_162; + /* 164 */ unk16 mUnk_164; + /* 166 */ unk16 mUnk_166; + /* 168 */ unk16 mUnk_168; + /* 16a */ unk16 mUnk_16a; + /* 16c */ unk16 mUnk_16c; + /* 16e */ unk16 mUnk_16e; + /* 170 */ unk16 mUnk_170; + /* 172 */ unk16 mUnk_172; + /* 174 */ unk16 mUnk_174; + /* 178 */ unk32 mUnk_178; + /* 17c */ unk32 mUnk_17c; + /* 180 */ UnkClass_func_ov000_020d0644 mUnk_180[4]; + /* 1c0 */ + + MsgProc_Type3(); + MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4); + //! TODO: remove the function declarations that are not overridden + /* 00 */ virtual ~MsgProc_Type3(); + /* 08 */ virtual void vfunc_08(unk32 *param_2, unk32 *param_3) override; + /* 0c */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; + /* 10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? + /* 14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; + /* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264 *param_2, unk32 param_3, unk32 param_4) override; + /* 1c */ virtual unk32 vfunc_1C(u16 *param_2, UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5) override; + /* 20 */ virtual void vfunc_20(void) override; + /* 24 */ virtual void vfunc_24(void) override; + /* 28 */ virtual bool vfunc_28(void) override; + /* 2c */ virtual void vfunc_2C(void) override; + /* 30 */ virtual void vfunc_30(void) override; + /* 34 */ virtual unk32 vfunc_34(unk32 param_2) override; + /* 38 */ virtual bool vfunc_38(void) override; + /* 3c */ virtual void vfunc_3C(unk32 param_2) override; + /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; + /* 48 */ virtual void vfunc_48(void) override; + /* 4c */ virtual void vfunc_4C(void) override; // func_02039a3c? + /* 50 */ virtual void vfunc_50(EntryINF1 *param_2, u32 param_3, s16 *param_4, UnkSubClass1_02256FF8 *param_5) override; + /* 54 */ virtual void vfunc_54(void) override; + /* 58 */ virtual void vfunc_58(void) override; + /* 5c */ virtual void vfunc_5C(void) override; + /* 60 */ virtual void vfunc_60(func_0203b410_param1 *param_2, unk32 param_3, unk32 param_4) override; + /* 64 */ virtual void vfunc_64(s16 *param_2) override; + /* 68 */ virtual unk32 vfunc_68(unk32 param_2) override; + /* 6c */ virtual void vfunc_6C(unk32 *param_2, unk32 *param_3) override; + /* 70 */ virtual void vfunc_70(unk32 *param_2, unk32 *param_3) override; /* 74 */ + + static void func_0203c83c(void); +}; + +class MsgProc_Type2 : public UnkStruct_02038aa0 { +public: + /* 000 (base) */ + /* 161 */ unk8 mUnk_161; + /* 162 */ unk16 mUnk_162; + /* 164 */ unk16 mUnk_164; + /* 166 */ unk16 mUnk_166; + /* 168 */ unk16 mUnk_168; + /* 16a */ unk16 mUnk_16a; + /* 16c */ unk16 mUnk_16c; + /* 16e */ unk16 mUnk_16e; + /* 170 */ + + MsgProc_Type2(); + MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4); + /* 00 */ virtual ~MsgProc_Type2(); + /* 14 */ /* func_0203c5c4 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; + /* 3c */ /* func_0203c414 */ virtual void vfunc_3C(unk32 param_2) override; + /* 40 */ /* func_0203c460 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 4c */ /* func_0203c39c */ virtual void vfunc_4C(void) override; // func_02039a3c? + + //! TODO: vfunc_4C? + void func_0203c39c(unk32 param_2, unk32 param_3); + + void func_0203c4ac(unk32, unk32); }; diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp index cfda7368..7cb67a00 100644 --- a/include/Unknown/UnkStruct_0203dae0.hpp +++ b/include/Unknown/UnkStruct_0203dae0.hpp @@ -3,22 +3,80 @@ #include "global.h" #include "types.h" +#include "Message/MsgProc.hpp" #include "Unknown/UnkStruct_02032f0c.hpp" +class UnkStruct_0203dae0_114; + +// astruct_7, MsgProc_Base2 class UnkStruct_0203dae0 : public UnkStruct_02032f0c { public: /* 000 (base) */ - /* 052 */ unk8 mUnk_052[0x2]; - /* 054 */ unk32 mUnk_054[0x30]; - /* 114 */ void *mUnk_114; - /* 118 */ unk32 mUnk_118; - /* 11c */ unk16 mUnk_11c; + /* 052 */ unk16 mUnk_52; + /* 054 */ unk16 mUnk_54; + /* 054 */ unk16 mUnk_56; + /* 058 */ unk32 mUnk_58; + /* 05c */ s16 mUnk_5c; + /* 05e */ s16 mUnk_5e; + /* 060 */ unk32 mUnk_60; + /* 064 */ unk32 mUnk_64; + /* 068 */ unk32 mUnk_68; + /* 06c */ unk32 mUnk_6c; + /* 070 */ unk32 mUnk_70; + /* 074 */ unk32 mUnk_74; + /* 078 */ unk32 mUnk_78; + /* 07c */ unk32 mUnk_7c; + /* 080 */ unk32 mUnk_80; + /* 084 */ unk32 mUnk_84; + /* 088 */ unk32 mUnk_88; + /* 08c */ unk32 mUnk_8c; + /* 090 */ unk32 mUnk_90; + /* 094 */ unk32 mUnk_94; + /* 098 */ unk32 mUnk_98; + /* 09c */ unk32 mUnk_9c; + /* 0a0 */ unk32 mUnk_a0; + /* 0a4 */ unk32 mUnk_a4; + /* 0a8 */ unk32 mUnk_a8; + /* 0ac */ unk32 mUnk_ac; + /* 0b0 */ unk32 mUnk_b0; + /* 0b4 */ unk32 mUnk_b4; + /* 0b8 */ unk32 mUnk_b8; + /* 0bc */ unk32 mUnk_bc; + /* 0c0 */ unk32 mUnk_c0; + /* 0c4 */ unk32 mUnk_c4; + /* 0c8 */ unk32 mUnk_c8; + /* 0cc */ unk32 mUnk_cc; + /* 0d0 */ unk32 mUnk_d0; + /* 0d4 */ unk32 mUnk_d4; + /* 0d8 */ unk32 mUnk_d8; + /* 0dc */ unk32 mUnk_dc; + /* 0e0 */ unk32 mUnk_e0; + /* 0e4 */ unk32 mUnk_e4; + /* 0e8 */ unk8 mUnk_e8; + /* 0e8 */ unk8 mUnk_e9; + /* 0e8 */ unk8 mUnk_ea; + /* 0e8 */ unk8 mUnk_eb; + /* 0ec */ unk32 mUnk_ec; + /* 0f0 */ unk32 mUnk_f0; + /* 0f4 */ unk32 mUnk_f4; + /* 0f8 */ unk32 mUnk_f8; + /* 0fc */ unk32 mUnk_fc; + /* 100 */ unk32 mUnk_100; + /* 104 */ unk32 mUnk_104; + /* 108 */ unk8 mUnk_108; + /* 108 */ unk8 mUnk_109; + /* 108 */ unk8 mUnk_10a; + /* 108 */ unk8 mUnk_10b; + /* 10c */ unk32 mUnk_10c; + /* 110 */ unk32 mUnk_110; + /* 114 */ UnkStruct_0203dae0_114 *mUnk_114; + /* 118 */ s32 mUnk_118; + /* 11c */ u16 mUnk_11c; /* 11e */ u8 mUnk_11e; /* 11f */ u8 mUnk_11f; /* 120 */ u8 mUnk_120; - /* 121 */ u8 mUnk_121; - /* 122 */ u8 mUnk_122; - /* 123 */ + /* 121 */ s8 mUnk_121; + /* 123 */ u8 mUnk_122; /* 00 */ virtual ~UnkStruct_0203dae0(); /* 08 */ virtual void vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4); @@ -31,19 +89,54 @@ public: /* 30 */ virtual void vfunc_30(); /* 34 */ + // /* 0x08 */ /* func_0203e2ac */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; + // /* 0x0C */ /* func_02039578 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; + // /* 0x10 */ /* func_0203e060 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? + // /* 0x14 */ /* func_0203dcb4 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; + // /* 0x18 */ /* func_0203e284 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) + // override; + // /* 0x1C */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; + // /* 0x20 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override; + // /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override; + // /* 0x28 */ /* func_0203e0c8 */ virtual bool vfunc_28(void) override; + // /* 0x2C */ /* func_0203e19c */ virtual void vfunc_2C(void) override; + // /* 0x30 */ /* func_0203e090 */ virtual void vfunc_30(void) override; + + //! TODO: fake? + /* 34 */ virtual unk32 vfunc_34(unk32 param_2) override; + /* 38 */ virtual bool vfunc_38(void) override; + /* 3c */ virtual void vfunc_3C(unk32 param_2) override; + /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; + /* 48 */ virtual void vfunc_48(void) override; + /* 4c */ virtual void vfunc_4C(void) override; // func_02039a3c? + /* 50 */ virtual void vfunc_50(EntryINF1 *param_2, u32 param_3, s16 *param_4, UnkSubClass1_02256FF8 *param_5) override; + /* 54 */ virtual void vfunc_54(void) override; + /* 58 */ virtual void vfunc_58(void) override; + /* 5c */ virtual void vfunc_5C(void) override; + /* 60 */ virtual void vfunc_60(func_0203b410_param1 *param_2, unk32 param_3, unk32 param_4) override; + /* 64 */ virtual void vfunc_64(s16 *param_2) override; + /* 68 */ virtual unk32 vfunc_68(unk32 param_2) override; + /* 6c */ virtual void vfunc_6C(unk32 *param_2, unk32 *param_3) override; + /* 70 */ virtual void vfunc_70(unk32 *param_2, unk32 *param_3) override; + /* 74 */ + UnkStruct_0203dae0(u8 param1); - void func_0203dc10(s32 param1); + void func_0203dc10(unk32 param1); + void func_0203dc10(unk32 param_2, unk32 param_3); bool func_0203dc74(s32 param1, s32 param2); void func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4); - void func_0203ddec(); + unk32 *func_0203ddec(); void func_0203ddfc(); void func_0203de14(); s32 func_0203de24(); bool func_0203de58(s32 param1); - bool func_0203e0f8(unk32 param1, s32 param2); + bool func_0203e0f8(); bool func_0203e1b0(unk32 param1, unk32 param2, s32 param3); void func_0203e2e8(s32 param1, s32 param2, unk32 param3, u32 param4); void func_0203e510(s32 *param1, s32 param2, s32 param3); void func_0203e62c(s32 *param1, s32 param2); bool func_0203e6e4(u32 param1, u32 param2, s32 param3); + + void func_ov003_020f13b0(unk32 param1); }; diff --git a/include/Unknown/func_ov000_020d0644.hpp b/include/Unknown/func_ov000_020d0644.hpp new file mode 100644 index 00000000..74b88be3 --- /dev/null +++ b/include/Unknown/func_ov000_020d0644.hpp @@ -0,0 +1,19 @@ +#pragma once + +#include "System/SysNew.hpp" +#include "global.h" + +class UnkClass_func_ov000_020d0644 { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + // /* 0c */ unk32 mUnk_0c; + /* 0x10 */ + + static void func_020d060c(void); + + UnkClass_func_ov000_020d0644(); + virtual ~UnkClass_func_ov000_020d0644(); + void func_ov000_020d0644(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5, unk32 param_6); +}; diff --git a/include/global.h b/include/global.h index 593c720b..ca961164 100644 --- a/include/global.h +++ b/include/global.h @@ -5,7 +5,8 @@ #define SET_FLAG(arr, pos) ((arr)[((u32) (pos)) >> 5] |= 1 << ((pos) & 0x1f)) #define RESET_FLAG(arr, pos) ((arr)[((u32) (pos)) >> 5] &= ~(1 << ((pos) & 0x1f))) -#define ARRAY_LEN(arr) ((sizeof(arr) / sizeof(*arr))) +#define ARRAY_LEN_U(arr) (u32)((sizeof(arr) / sizeof(*arr))) +#define ARRAY_LEN(arr) (s32)(sizeof(arr) / sizeof(*arr)) // Prevent the IDE from reporting errors that the compiler/linker won't report #ifdef __INTELLISENSE__ diff --git a/src/00_Core/Actor/ActorManager.cpp b/src/00_Core/Actor/ActorManager.cpp index 955c447d..d9dbe8b1 100644 --- a/src/00_Core/Actor/ActorManager.cpp +++ b/src/00_Core/Actor/ActorManager.cpp @@ -312,7 +312,7 @@ ARM s32 ActorManager::func_ov00_020c3bb0(unk32 param1, s32 *param2) { if (param2 != NULL) *param2 = 0; AABB boxes[8]; - s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN(boxes)); + s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN_U(boxes)); if (numBoxes <= 0) return 0; s32 i; @@ -349,7 +349,7 @@ ARM s32 ActorManager::func_ov00_020c3bb0(unk32 param1, s32 *param2) { ARM void ActorManager::func_ov00_020c3ce8(unk32 param1, bool param2) { AABB boxes[8]; - s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN(boxes)); + s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN_U(boxes)); if (numBoxes <= 0) return; s32 i; diff --git a/src/00_Core/DTCM/UnkStruct_027e103c.cpp b/src/00_Core/DTCM/UnkStruct_027e103c.cpp index 53f72d35..e455c9c9 100644 --- a/src/00_Core/DTCM/UnkStruct_027e103c.cpp +++ b/src/00_Core/DTCM/UnkStruct_027e103c.cpp @@ -36,7 +36,7 @@ void UnkStruct_027e103c::func_ov000_020cf3dc() {} void UnkStruct_027e103c::func_ov000_020cf3f0() {} void UnkStruct_027e103c::func_ov000_020cf404() {} void UnkStruct_027e103c::func_ov000_020cf414() {} -void UnkStruct_027e103c::func_ov000_020cf42c() {} +bool UnkStruct_027e103c::func_ov000_020cf42c() {} bool UnkStruct_027e103c::func_ov000_020cf444() {} bool UnkStruct_027e103c::func_ov000_020cf488() {} bool UnkStruct_027e103c::func_ov000_020cf4bc() {} @@ -59,7 +59,7 @@ void UnkStruct_027e103c::func_ov000_020cfa70(s32 param1, s32 param2) {} unk8 UnkStruct_027e103c::func_ov000_020cfab0() {} void UnkStruct_027e103c::func_ov000_020cfabc(s32 param1, s32 param2) {} void UnkStruct_027e103c::func_ov000_020cfae8(s32 param1, s32 param2) {} -void UnkStruct_027e103c::func_ov000_020cfb20(unk32 param1) {} +void UnkStruct_027e103c::func_ov000_020cfb20(void *param1) {} void UnkStruct_027e103c::func_ov000_020cfb38() {} void UnkStruct_027e103c::func_ov000_020cfb48() {} void UnkStruct_027e103c::func_ov000_020cfb58() {} diff --git a/src/05/Player/LinkStateCutscene.cpp b/src/05/Player/LinkStateCutscene.cpp index 7eaf872c..6875d229 100644 --- a/src/05/Player/LinkStateCutscene.cpp +++ b/src/05/Player/LinkStateCutscene.cpp @@ -1,7 +1,7 @@ #include "Player/LinkStateCutscene.hpp" unk32 UnkStruct_ov004_0210abb8::vfunc_2c(s32 param1) {} -void UnkStruct_ov004_0210abb8::vfunc_24(unk32 param1) {} +bool UnkStruct_ov004_0210abb8::vfunc_24(unk32 param1) {} void LinkStateCutscene::func_ov005_021089c0() {} void LinkStateCutscene::func_ov005_021089f4() {} void LinkStateCutscene::func_ov005_02108d08() {} diff --git a/src/Main/Message/BMG.cpp b/src/Main/Message/BMG.cpp new file mode 100644 index 00000000..cb9deac8 --- /dev/null +++ b/src/Main/Message/BMG.cpp @@ -0,0 +1,211 @@ +extern "C" { +#include <string.h> +} +#include "Message/BMG.hpp" + +char *func_0202ab38(u32 *lang); +u32 *func_0202d550(int, u32 *, char *path, int, int, int); +void func_0202d590(BMGHeader *); + +extern u32 *data_027e0ce0[]; +extern u32 data_027e05f4; // language +extern u32 *data_ov002_0210016c; + +static char *sBMGFileNames[BMG_FILE_INDEX_MAX] = { + "system", // BMG_FILE_INDEX_SYSTEM + "regular", // BMG_FILE_INDEX_REGULAR + "battle", // BMG_FILE_INDEX_BATTLE + "test", // BMG_FILE_INDEX_TEST + "default", // BMG_FILE_INDEX_DEFAULT + "sea", // BMG_FILE_INDEX_SEA + "kaitei", // BMG_FILE_INDEX_KAITEI + "main_isl", // BMG_FILE_INDEX_MAIN_ISL + "brave", // BMG_FILE_INDEX_BRAVE + "flame", // BMG_FILE_INDEX_FLAME + "wind", // BMG_FILE_INDEX_WIND + "frost", // BMG_FILE_INDEX_FROST + "power", // BMG_FILE_INDEX_POWER + "wisdom", // BMG_FILE_INDEX_WISDOM + "ghost", // BMG_FILE_INDEX_GHOST + "hidari", // BMG_FILE_INDEX_HIDARI + "sennin", // BMG_FILE_INDEX_SENNIN + "ship", // BMG_FILE_INDEX_SHIP + "collect", // BMG_FILE_INDEX_COLLECT + "mainselect", // BMG_FILE_INDEX_MAINSELECT + "field", // BMG_FILE_INDEX_FIELD + "wisdom_dngn", // BMG_FILE_INDEX_WISDOM_DNGN + "demo", // BMG_FILE_INDEX_DEMO + "battleCommon", // BMG_FILE_INDEX_BATTLECOMMON + "bossLast1", // BMG_FILE_INDEX_BOSSLAST1 + "bossLast3", // BMG_FILE_INDEX_BOSSLAST3 + "torii", // BMG_FILE_INDEX_TORII + "myou", // BMG_FILE_INDEX_MYOU + "kojima1", // BMG_FILE_INDEX_KOJIMA1 + "kojima2", // BMG_FILE_INDEX_KOJIMA2 + "kojima5", // BMG_FILE_INDEX_KOJIMA5 + "kojima3", // BMG_FILE_INDEX_KOJIMA3 + "staff", // BMG_FILE_INDEX_STAFF + "kaitei_F", // BMG_FILE_INDEX_KAITEI_F +}; + +THUMB void BMGFileInfo::func_020371b4() { + this->pHeader = NULL; + this->pINF1 = NULL; + this->pFLW1 = NULL; + this->pFLI1 = NULL; + this->pDAT1 = NULL; + this->mUnk_14 = NULL; + this->mUnk_18 = 0; +} + +// non-matching (equivalent) +THUMB u16 BMGFileInfo::func_020371c8(u32 *pFile, s16 unk_18) { + SectionBase *pSection; + u16 groupId; + u32 i; + BMGHeader *pHeader = (BMGHeader *) pFile; + + groupId = -1; + this->mUnk_14 = pHeader; + this->mUnk_18 = unk_18; + this->pHeader = pHeader; + pSection = (SectionBase *) ((u8 *) pFile + sizeof(BMGHeader)); + + for (i = 0; i < this->mUnk_14->numSections; i++) { + switch (pSection->tag) { + case BMG_TAG_MID1: + // unused + break; + case BMG_TAG_STR1: + // unused + break; + case BMG_TAG_INF1: + this->pINF1 = (SectionINF1 *) pSection; + groupId = this->pINF1->groupId; + break; + case BMG_TAG_DAT1: + //! TODO: fake? + this->pDAT1 = (SectionDAT1 *) (pSection + 1); + break; + case BMG_TAG_FLW1: this->pFLW1 = (SectionFLW1 *) pSection; break; + case BMG_TAG_FLI1: this->pFLI1 = (SectionFLI1 *) pSection; break; + } + + pSection = (SectionBase *) ((u8 *) pSection + pSection->size); + } + + return groupId; +} + +ARM EntryINF1 *BMGFileInfo::func_02037258(u16 param_2) { + if (this->pINF1 != NULL) { + if (param_2 < this->pINF1->numEntries) { + return (EntryINF1 *) ((u32) & this->pINF1->entries + this->pINF1->entrySize * param_2); + } + + return NULL; + } + + return NULL; +} + +// non-matching +ARM u16 BMGFileInfo::func_0203728c(unk32 param_2) { + SectionFLI1 *pFLI1; + EntryFLI1 *entry; + u32 i; + u16 j; + + pFLI1 = this->pFLI1; + + if (pFLI1 == NULL) { + return -1; + } + + i = 0; + do { + entry = &pFLI1->entries[i]; + + if (param_2 > entry->msgFlowID) { + return entry->msgFlowNodeIndex; + } + + // i++; + j = i + 1; + i = j & 0xFFFF; + } while (j < pFLI1->numEntries); + + // for (i = 0; (u16)i < pFLI1->numEntries; i++) { + // if (param_2 == pFLI1->entries[i].msgFlowID) { + // return pFLI1->entries[i].msgFlowNodeIndex; + // } + // } + + return -1; +} + +THUMB void BMGGroups::func_020372f0(BMGFileIndex eIndex, s16 unk_18) { + char bmgPath[64]; + BMGFileInfo bmgFile; + u32 *pFile; + u16 groupId; + + // path to the bmg file for the current language (i.e.: "English/Message/battle.bmg") + strcpy(bmgPath, func_0202ab38(&data_027e05f4)); + strcat(bmgPath, "/Message/"); + strcat(bmgPath, sBMGFileNames[eIndex]); + strcat(bmgPath, ".bmg"); + + pFile = data_027e0ce0[1]; + + if (unk_18 != 1) { + if (unk_18 != 4) { + pFile = data_027e0ce0[0]; + } else { + pFile = data_ov002_0210016c; + } + } else { + // pFile = data_027e0ce0[0]; + } + + // get file data + pFile = func_0202d550(0xC4, pFile, bmgPath, 0, 0x10, 0); + + // initialize file info + bmgFile.groupId = 0; + bmgFile.func_020371b4(); + + // assign sections and set the file info in the groups entries + groupId = bmgFile.func_020371c8(pFile, unk_18); + this->entries[groupId] = bmgFile; + this->entries[groupId].groupId = groupId; +} + +THUMB void BMGGroups::func_020373b4(s16 unk_18) { + s32 i; + + for (i = 0; i < this->numEntries; i++) { + if (this->entries[i].mUnk_18 == unk_18) { + func_0202d590(this->entries[i].mUnk_14); + this->entries[i].func_020371b4(); + } + } +} + +ARM u32 BMGGroups::func_020373ec(unk32 param_2) { + u16 dVar1; + u16 uVar2; + s32 i; + + dVar1 = -1; + + for (i = 0; i < this->numEntries; i++) { + uVar2 = this->entries[i].func_0203728c(param_2); + + if (uVar2 != dVar1) { + return uVar2 | i << 0x10; + } + } + + return -1; +} diff --git a/src/Main/Message/BmgRelatedFunctions.cpp b/src/Main/Message/BmgRelatedFunctions.cpp new file mode 100644 index 00000000..dcb3d255 --- /dev/null +++ b/src/Main/Message/BmgRelatedFunctions.cpp @@ -0,0 +1,68 @@ +extern "C" { +#include <string.h> +} + +#include "global.h" +#include "types.h" + +THUMB void func_0202d3bc(int param_1, unsigned int *param_2, char *path, int param_4, int param_5, bool param_6, int param_7, + int param_8) { + // bool bVar1; + // dword dVar2; + // int iVar3; + // dword *pdVar4; + // uint uVar5; + // dword local_64; + // astruct_3 aStack_60; + // dword *pdStack_18; + + // pdVar4 = (dword *)(uint)param_4; + // *(char **)PTR_DWORD_0202d46c = path; + // local_64 = DWORD_0202d470; + // if (pdVar4 != (dword *)0x0) { + // *pdVar4 = DWORD_0202d470; + // } + // pdStack_18 = pdVar4; + // astruct_3(&aStack_60); + // bVar1 = FUN_02041e7c(&aStack_60,path); + // if (bVar1) { + // uVar5 = aStack_60._40_4_ - aStack_60._36_4_; + // if (uVar5 != 0) { + // if (param_6) { + // local_64 = FUN_0202d23c(&aStack_60,param_1,param_2,param_5,0,uVar5,pdVar4,param_7,param_8); + // } + // else { + // if (param_7 == 0) { + // dVar2 = FUN_0202d1c4(param_1,param_2,uVar5,param_5); + // } + // else { + // dVar2 = 0; + // if (uVar5 <= param_8) { + // dVar2 = param_7; + // } + // } + // if (dVar2 != 0) { + // iVar3 = astruct_3::FUN_02041fa4(&aStack_60,dVar2,uVar5); + // if (iVar3 == -1) { + // if (param_7 == 0) { + // FUN_0202d21c(dVar2); + // } + // } + // else { + // local_64 = dVar2; + // if (pdVar4 != (dword *)0x0) { + // *pdVar4 = uVar5; + // } + // } + // } + // } + // } + // astruct_3::FUN_02041ea8(&aStack_60); + // } + + // return local_64; +} + +THUMB void func_0202d550(int param_1, unsigned int *param_2, char *path, int param_4, int param_5, bool param_6) { + func_0202d3bc(param_1, param_2, path, param_4, param_5, param_6, 0, 0); +} diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp new file mode 100644 index 00000000..812a9b2a --- /dev/null +++ b/src/Main/Message/MessageManager.cpp @@ -0,0 +1,576 @@ +#include "Message/MessageManager.hpp" +#include "Actor/ActorManager.hpp" +#include "Player/TouchControl.hpp" +#include "System/SysNew.hpp" + +extern ARM unk32 func_ov000_020d7f18(u32 *, unk32); +extern ARM unk32 func_02037628(u8 *); + +extern u32 *data_027e0ce0[]; +extern u32 data_02056924[]; +extern UnkStruct_MsgProc_Base_unk_2C *data_02068e6c; +extern UnkStruct_MsgProc_Base_unk_2C *data_02068e8c; +extern u16 data_02056918[]; +extern ActorTypeId data_0205691c[]; + +struct UnkStruct_027e0ffc { + void func_ov000_020cec60(u16, Vec3p *, Actor *, unk32); +}; +extern UnkStruct_027e0ffc *data_027e0ffc; + +extern u32 data_027e0618[]; + +// non-matching +ARM void MessageManager::func_0203643c(u32 *param_1, MessageManager *param_2, u32 param_3) { + BMGGroups *pBVar2 = param_2->pGroups; + + *param_1 = ((u32) pBVar2->entries[param_3 >> 0x10].pDAT1 + + (pBVar2->entries[param_3 >> 0x10].func_02037258(param_3 & 0xFFFF)->offset & ~1)); +} + +// non-matching +THUMB void MessageManager::func_02036490(unk32 param_2, unk32 param_3, unk32 param_4) { + this->mUnk_03 = 0; + this->mUnk_0c = 0; + + this->pGroups->func_020372f0(BMG_FILE_INDEX_SYSTEM, 2); + + switch (*data_027e0618) { + case 3: + this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2); + this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2); + break; + case 5: + this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2); + this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLECOMMON, 2); + break; + case 6: + this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2); + this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLECOMMON, 2); + break; + case 7: this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2); break; + default: break; + } + + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { + this->mUnk_18[i] = NULL; + } + + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + this->mUnk_28[i] = NULL; + } + + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { + this->mUnk_18[i] = new(data_027e0ce0[1], 4) UnkStruct_020386d8(); + } + + this->mUnk_18[0]->mUnk_39 = 0; + this->mUnk_18[1]->mUnk_39 = 1; + + if (*data_027e0618 == 2 || *data_027e0618 == 3 || *data_027e0618 == 6) { + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + switch (data_02056924[i + 1]) { + case 0: + if (*data_027e0618 != 2) { + this->mUnk_28[i] = new(data_027e0ce0[1], 4) UnkStruct_020397f8(); + this->mUnk_28[i]->func_0203dc74(0xE0, 0x40); + this->mUnk_28[i]->mUnk_2c = &data_02068e6c; + this->mUnk_28[i]->mUnk_50 = i != 0; + } + break; + case 1: + this->mUnk_28[i] = new(data_027e0ce0[1], 4) MsgProc_Type3(); + this->mUnk_28[i]->func_0203dc74(0x50, 0x60); + this->mUnk_28[i]->mUnk_2c = &data_02068e6c; + break; + case 2: this->mUnk_28[i] = NULL; break; + case 3: + if (func_0202ab48() == 0) { + this->mUnk_28[i] = new(data_027e0ce0[1], 4) MsgProc_Type2(); + this->mUnk_28[i]->func_0203dc74(0xC0, 0x20); + this->mUnk_28[i]->mUnk_2c = &data_02068e8c; + } else { + this->mUnk_28[i] = NULL; + } + break; + default: break; + } + + if (this->mUnk_28[i] != NULL) { + this->mUnk_28[i]->vfunc_4C(); + } + } + } +} + +THUMB void MessageManager::func_0203665c(void) { + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + if (this->mUnk_28[i] != NULL) { + delete this->mUnk_28[i]; + + this->mUnk_28[i] = NULL; + } + } + + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { + if (this->mUnk_18[i] != NULL) { + delete this->mUnk_18[i]; + + this->mUnk_18[i] = NULL; + } + } + + this->pGroups->func_020373b4(2); +} + +// non-matching +ARM UnkStruct_020397f8 *MessageManager::func_020366c4(void) { + if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { + return (UnkStruct_020397f8 *) this->mUnk_28[2]; + } + + return (UnkStruct_020397f8 *) this->mUnk_28[0]; +} + +// non-matching +ARM UnkStruct_020397f8 *MessageManager::func_02036700(void) { + if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { + return (UnkStruct_020397f8 *) this->mUnk_28[0]; + } + + return (UnkStruct_020397f8 *) this->mUnk_28[2]; +} + +ARM UnkStruct_020386d8 *MessageManager::func_0203673c(void) { + bool iVar1 = this->func_02036824(); + bool iVar2 = this->func_02036850(); + + if (iVar1) { + return this->mUnk_18[0]; + } + + if (iVar2) { + return this->mUnk_18[1]; + } + + return NULL; +} + +ARM bool MessageManager::func_02036770(u32 param_2) { + return (this->mUnk_18[param_2]->mUnk_18 & ~0xFFFF) == (0x100 << 0x10); +} + +ARM unk32 MessageManager::func_02036798(void) { + unk32 uVar2 = 1; + + if (this->mUnk_04 == 0) { + bool bVar1 = false; + + if (this->mUnk_18[1] != NULL && (this->mUnk_18[1]->mUnk_18 & 0xFFFF0000) != (1 << 24)) { + bVar1 = true; + } + + if (!bVar1) { + uVar2 = 0; + } + } + + return uVar2; +} + +ARM bool MessageManager::func_020367dc(int param_2) { + return param_2 == 0; +} + +ARM bool MessageManager::func_020367ec(void) { + return ((UnkStruct_020397f8 *) this->mUnk_28[0])->mUnk_15c > 0; +} + +ARM bool MessageManager::func_02036808(void) { + return ((UnkStruct_020397f8 *) this->mUnk_28[2])->mUnk_15c > 0; +} + +ARM bool MessageManager::func_02036824(void) { + switch (data_027e077c.mUnk_0) { + case 0x01: + case 0x37: + case 0x3B: return true; + default: break; + } + + return false; +} + +// non-matching +ARM bool MessageManager::func_02036850(void) { + return !(data_02056be4[data_027e077c.mUnk_0] & 2) && (data_02056be4[data_027e077c.mUnk_0] & 1); +} + +ARM void MessageManager::func_02036888(UnkStruct_020386d8 *param_2) { + if ((param_2->mUnk_18 & ~0xFFFF) != (0x100 << 0x10)) { + UnkStruct_020397f8 *iVar1 = this->func_020366c4(); + + if (iVar1->mUnk_15c <= 0) { + param_2->vfunc_10(); + } else { + param_2->vfunc_0c(this->func_020366c4()); + } + } +} + +ARM bool MessageManager::func_020368f4(UnkStruct_02037750 *param_2) { + if (this->mUnk_20[1] != NULL) { + return false; + } + + this->mUnk_20[1] = param_2; + return true; +} + +// non-matching +ARM void MessageManager::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { + UnkStruct_020397f8 *unk_28_0; + UnkStruct_020397f8 *unk_28_2; + UnkStruct_02038aa0 *pSVar4; + ActorRef actorRef; + Actor *pActor; + bool iVar1; + bool iVar2; + s32 i; + + if (!this->func_020367dc(param_2)) { + return; + } + + this->mUnk_40[1] = this->mUnk_40[0]; + + unk_28_0 = (UnkStruct_020397f8 *) this->mUnk_28[0]; + + if (unk_28_0 != NULL && unk_28_0->mUnk_15c > 0) { + unk_28_2 = (UnkStruct_020397f8 *) this->mUnk_28[2]; + + if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) { + this->mUnk_40[0] = this->func_020366c4(); + } else { + this->mUnk_40[0] = unk_28_2; + } + } else { + unk_28_2 = (UnkStruct_020397f8 *) this->mUnk_28[2]; + + if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) { + this->mUnk_40[0] = unk_28_0; + } else { + this->mUnk_40[0] = NULL; + } + } + + iVar1 = this->func_02036824(); + iVar2 = this->func_02036850(); + + if (this->mUnk_20[1] != NULL && ((this->mUnk_20[1]->mUnk_18 & ~0xFFFF) != (0x100 << 0x10))) { + this->mUnk_20[1]->vfunc_10(); + this->mUnk_20[1] = NULL; + } + + if (iVar1) { + this->func_02036888(this->mUnk_18[0]); + } else if (iVar2) { + this->func_02036888(this->mUnk_18[1]); + } + + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + if (this->mUnk_28[i] != NULL) { + this->mUnk_28[i]->vfunc_2C(); + } + } + + this->mUnk_04 = 0; + + if (this->mUnk_20[0] != NULL) { + if ((this->mUnk_20[0]->mUnk_18 & ~0xFFFF) == (0x100 << 0x10)) { + this->mUnk_20[0] = NULL; + } else { + this->mUnk_04 = 1; + } + } + + if ((this->mUnk_18[0] != NULL) && ((this->mUnk_18[0]->mUnk_18 & ~0xFFFF) != (0x100 << 0x10))) { + this->mUnk_04 = 1; + + //! TODO: fake? + pSVar4 = this->func_02037178((UnkSubClass1_02256FF8 *) this->mUnk_18[0]); + + if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->mUnk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { + this->mUnk_04 = 0; + } + } + + if (this->mUnk_08 != NULL && this->mUnk_08->mUnk_15c > 0) { + this->mUnk_04 = 1; + } else { + this->mUnk_08 = NULL; + } + + this->func_02036bbc(); + + if (this->mUnk_10 != 0) { + ActorManager::FindActorByType(&actorRef, gActorManager, data_0205691c[this->mUnk_10]); + pActor = gActorManager->GetActor(&actorRef); + + if (pActor != NULL) { + data_027e0ffc->func_ov000_020cec60(data_02056918[this->mUnk_10], &pActor->mPos, pActor, 0); + } + } +} + +ARM void MessageManager::func_02036bbc(void) { + UnkStruct_02038aa0 *pSVar3; + bool bVar2; + bool bVar4; + s32 i; + + if (data_027e0d04.mUnk_00 > 0) { + return; + } + + bVar2 = this->func_02036824(); + bVar4 = this->func_02036850(); + + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + pSVar3 = this->mUnk_28[i]; + + if (pSVar3 != NULL && ((bVar2 && pSVar3->mUnk_50 == 0) || (bVar4 && pSVar3->mUnk_50 != 0))) { + pSVar3->vfunc_44(gTouchControl.mTouchLastX, gTouchControl.mTouchLastY); + } + } +} + +ARM void MessageManager::func_02036c50(unk32 param_2) { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + if (this->mUnk_28[i] != NULL && this->mUnk_28[i]->func_0203de14(param_2) != 0) { + this->mUnk_28[i]->vfunc_28(); + } + } +} + +ARM void MessageManager::func_02036ca4(unk32 param_2) { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + UnkStruct_02038aa0 *pSVar1 = this->mUnk_28[i]; + + if (pSVar1 != NULL) { + pSVar1->vfunc_3C(param_2); + } + } +} + +ARM bool MessageManager::func_02036ce4(UnkStruct_020386d8 *param_2, unk32 param_3) { + u32 uVar1; + + if (param_3 == 0) { + return false; + } + + uVar1 = this->pGroups->func_020373ec(param_3); + + if (uVar1 != -1) { + param_2->vfunc_08(uVar1); + return true; + } + + return false; +} + +ARM bool MessageManager::func_02036d30(UnkStruct_02037750 *param_2) { + if (this->mUnk_20[0] != NULL && this->mUnk_20[0] != param_2) { + return false; + } + + this->mUnk_20[0] = param_2; + return true; +} + +ARM bool MessageManager::func_02036d4c(UnkStruct_02037750 *param_2) { + if (this->mUnk_20[0] == param_2) { + this->mUnk_20[0] = NULL; + return true; + } + + return false; +} + +ARM void MessageManager::func_02036d6c(void) { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + if (func_0202ab48() == 0 || i != 5) { + this->mUnk_28[i]->UnkStruct_02038aa0::vfunc_10(); + } + } +} + +// non-matching +ARM UnkStruct_02038aa0 *MessageManager::func_02036da8(u32 param_2, s16 *param_3) { + EntryINF1 *pEVar1; + EntryINF1 *pEVar2; + UnkStruct_02038aa0 *pSVar4; + BMGGroups *pBVar5; + bool bVar6; + s16 iStack_38; + int iStack_34; + int iStack_30; + + pEVar1 = this->pGroups->entries[param_2 >> 0x10].func_02037258(param_2 & 0xFFFF); + + if (pEVar1 == NULL) { + return NULL; + } + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { + pSVar4 = this->mUnk_28[4]; + func_02037628((u8 *) &iStack_38); + + // ??? + bVar6 = (data_02056be4[data_027e077c.mUnk_0] & 1) == 0; + if (bVar6) { + data_02056be4[0] = 1; + } + if (!bVar6) { + data_02056be4[0] = 0; + } + + iStack_38 = *param_3; + // iStack_34 = param_3[1]; + // iStack_30 = param_3[2]; + pBVar5 = this->pGroups; + // pSVar4->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); + BMGFileInfo *entry = &(pBVar5)->entries[(param_2) >> 0x10]; + // pSVar4->vfunc_50(pEVar1, + // ((u32)entry->pDAT1 + (((entry.func_02037258((((param_2))) & 0xFFFF))->offset) & ~1)), + // // BMG_GET_MSG_ADDR(pBVar5, param_2), + // (s16*)&iStack_38, 1); + + data_ov000_020eec9c.func_ov000_020d77e4(0x1C); + return pSVar4; + } + + return NULL; +} + +// non-matching +ARM void MessageManager::func_02036edc(u32 param_2, u8 param_3) { + UnkStruct_020397f8 *pSVar1; + u8 auStack_28[24]; + u8 local_13; + + func_02037628(auStack_28); + local_13 = 0; + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { + local_13 = 1; + } + + auStack_28[21] = local_13; + auStack_28[20] = param_3; + pSVar1 = this->func_02036f68(param_2, auStack_28); + + if (pSVar1 != NULL) { + if (this->mUnk_04 == 0) { + this->mUnk_08 = pSVar1; + } + } +} + +// non-matching +ARM UnkStruct_020397f8 *MessageManager::func_02036f68(u32 param_2, u8 *param_3) { + EntryINF1 *pEVar1; + UnkStruct_02038aa0 *pSVar2; + EntryINF1 *pEVar3; + int iVar4; + UnkStruct_020397f8 *pSVar5; + + pEVar1 = this->pGroups->entries[param_2 >> 0x10].func_02037258(param_2 & 0xffff); + + if (pEVar1 == NULL) { + return NULL; + } + + if (param_3[21] != 0) { + pSVar5 = (UnkStruct_020397f8 *) this->mUnk_28[2]; + pSVar2 = this->mUnk_28[3]; + } else { + pSVar5 = (UnkStruct_020397f8 *) this->mUnk_28[0]; + pSVar2 = this->mUnk_28[1]; + } + + //! TODO: fake? + pSVar5->mUnk_164 = (UnkStruct_020397f8 *) pSVar2; + pSVar5->mUnk_418 = this->mUnk_28[5]; + + pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s32 *) param_3, 0); + + if (data_ov000_020eec9c.func_ov000_020d7f18(0x19) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x18) == 0 && + data_ov000_020eec9c.func_ov000_020d7f18(0x34) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x35) == 0 && + data_ov000_020eec9c.func_ov000_020d7f18(0x1A) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x1B) == 0 && + (param_3[12]) != 7) + { + data_ov000_020eec9c.func_ov000_020d77e4(0x1C); + } + + return pSVar5; +} + +ARM UnkStruct_020386d8 *MessageManager::func_020370d0(unk32 param_2, unk32 param_3) { + return this->func_020370e8(param_2, -1, -1, param_3); +} + +ARM UnkStruct_020386d8 *MessageManager::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { + UnkStruct_020386d8 *puVar2; + + if (this->func_02036824()) { + puVar2 = this->mUnk_18[0]; + } else { + if (this->func_02036850()) { + puVar2 = this->mUnk_18[1]; + } else { + return NULL; + } + } + + puVar2->mUnk_30 = param_5; + puVar2->mUnk_34 = param_3; + puVar2->mUnk_36 = param_4; + + if (this->func_02036ce4(puVar2, param_2)) { + return puVar2; + } + + return NULL; +} + +ARM void MessageManager::func_02037158(UnkSubClass1_02256FF8 *param_2) { + UnkStruct_02038aa0 *pSVar1; + + pSVar1 = this->func_02037178(param_2); + + if (pSVar1 != NULL) { + pSVar1->vfunc_58(); + } +} + +ARM UnkStruct_02038aa0 *MessageManager::func_02037178(UnkSubClass1_02256FF8 *param_2) { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + if (this->mUnk_28[i] != NULL && this->mUnk_28[i]->mUnk_08 == param_2) { + return this->mUnk_28[i]; + } + } + + return NULL; +} + +ARM MessageManager::~MessageManager() {} diff --git a/src/Main/Message/func_0203c358.cpp b/src/Main/Message/func_0203c358.cpp new file mode 100644 index 00000000..ee80f15e --- /dev/null +++ b/src/Main/Message/func_0203c358.cpp @@ -0,0 +1,76 @@ +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Item/ItemManager.hpp" +#include "Message/MessageManager.hpp" +#include "Message/MsgProc.hpp" +#include "Player/TouchControl.hpp" +#include "Save/AdventureFlags.hpp" +#include "System/SysNew.hpp" +#include "global.h" + +extern "C" void func_0203fc78(unk32 *, unk32 *); + +THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) : + UnkStruct_02038aa0(0, 0) { + this->mUnk_162 = 4; + this->mUnk_164 = 1; + this->mUnk_166 = 0; + this->mUnk_168 = -1; + this->mUnk_16a = 0; + this->mUnk_16c = 1; + this->mUnk_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) { + 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->mUnk_114->vfunc_08(this) != 0) { + this->mUnk_10 = this->mUnk_114->func_0203d1b4(); + } +} + +ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) { + if (this->mUnk_15c > 0 && this->mUnk_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->mUnk_166; + param_3 += this->mUnk_168; + + this->func_0203c4ac(param_2 + this->mUnk_16a, param_3 + this->mUnk_16c); + this->UnkStruct_02038aa0::vfunc_30(param_2, param_3); +} + +ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) { + return this->UnkStruct_0203dae0::vfunc_14(param_2 + this->mUnk_162, param_3); +} + +ARM MsgProc_Type2::~MsgProc_Type2() {} diff --git a/src/Main/Message/func_0203c72c.cpp b/src/Main/Message/func_0203c72c.cpp new file mode 100644 index 00000000..b61c35be --- /dev/null +++ b/src/Main/Message/func_0203c72c.cpp @@ -0,0 +1,36 @@ +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Item/ItemManager.hpp" +#include "Message/MessageManager.hpp" +#include "Message/MsgProc.hpp" +#include "Player/TouchControl.hpp" +#include "Save/AdventureFlags.hpp" +#include "System/SysNew.hpp" +#include "global.h" + +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) : + UnkStruct_02038aa0(1, 0) { + this->mUnk_162 = 1; + this->mUnk_164 = 0x1A; + this->mUnk_166 = 0xA6; + this->mUnk_168 = 0x1D; + this->mUnk_16a = 0; + this->mUnk_16c = 1; + this->mUnk_170 = -1; + this->mUnk_172 = -1; + this->mUnk_174 = -1; + + func_0204f614(this->mUnk_180, ARRAY_LEN(this->mUnk_180), sizeof(UnkClass_func_ov000_020d0644), + UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c); + + this->mUnk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0); + this->mUnk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0); + this->mUnk_180[2].func_ov000_020d0644(0x1E, 2, 0x8C, 0, 0); + this->mUnk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0); +} + +ARM void MsgProc_Type3::func_0203c83c(void) {} + +ARM MsgProc_Type3::~MsgProc_Type3() {} diff --git a/src/Main/Unknown/UnkStruct_02032f0c.cpp b/src/Main/Unknown/UnkStruct_02032f0c.cpp index 6a03a93a..16e22b29 100644 --- a/src/Main/Unknown/UnkStruct_02032f0c.cpp +++ b/src/Main/Unknown/UnkStruct_02032f0c.cpp @@ -1,34 +1,109 @@ #include "Unknown/UnkStruct_02032f0c.hpp" +#include "Unknown/UnkStruct_02035064.hpp" -UnkStruct_02032e7c::UnkStruct_02032e7c() {} -UnkStruct_02032f0c::UnkStruct_02032f0c() {} -UnkStruct_02032f0c::~UnkStruct_02032f0c() {} -void UnkStruct_02032f0c::func_02032f94() {} -u16 **UnkStruct_02032f0c::SetUnk_0c(u16 *value) {} -u8 UnkStruct_02032f0c::func_02032fa4() {} -s32 UnkStruct_02032f0c::func_02032fb4() {} -bool UnkStruct_02032f0c::vfunc_14(s32 param1, s32 param2) {} -void UnkStruct_02032f0c::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {} -void UnkStruct_02032f0c::vfunc_0c(unk32 param1, unk32 param2, unk32 param3, unk32 param4) {} -void UnkStruct_02032f0c::vfunc_10(u32 param1, unk32 param2) {} -void UnkStruct_02032f0c::func_02033214(unk32 param1, unk32 param2, unk32 param3, u8 param4, unk32 param5) {} -unk32 UnkStruct_02032f0c::vfunc_18(s32 param1) {} -unk32 UnkStruct_02032f0c::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {} -unk32 UnkStruct_02032f0c::vfunc_20(s32 param1, s32 *param2) {} -void UnkStruct_02032f0c::func_020334b4(u32 param1, s32 param2, s32 param3, s32 param4) {} -void UnkStruct_02032f0c::func_02033628(unk32 param1, u16 *param2) {} -u32 UnkStruct_02032f0c::func_0203369c(u16 *param1, s32 param2) {} -void UnkStruct_02032f0c::func_02033780(s32 param1) {} -s32 UnkStruct_02032f0c::func_020337d8(s32 param1) {} -s32 UnkStruct_02032f0c::func_020337fc(s16 *param1, s32 param2) {} -void UnkStruct_02032f0c::func_020338a8(s32 param1, unk32 param2) {} -void UnkStruct_02032f0c::func_020338d0(unk32 *param1, unk32 param2) {} -s32 UnkStruct_02032f0c::func_02033904(unk32 param1, unk32 param2) {} -s32 UnkStruct_02032f0c::func_02033938(unk32 param1) {} -s32 UnkStruct_02032f0c::func_0203396c(u16 *param1) {} -bool UnkStruct_02032f0c::vfunc_24(s16 **param1) {} -u16 *UnkStruct_02032f0c::func_02033b0c(s32 param1) {} -bool UnkStruct_02032f0c::func_02033c6c() {} -unk32 UnkStruct_02032f0c::func_02033c88(u32 param1) {} -s32 UnkStruct_02032f0c::func_02033cbc(s16 *param1) {} -UnkStruct_02032e7c::~UnkStruct_02032e7c() {} +extern "C" void Fill32(unk32, void *, unk32); +extern "C" void Fill16(unk32, void *, unk32); +extern "C" void func_020296e0(unk32 **, UnkStruct_MsgProc_Base_unk_2C **, unk32, unk32, unk32, unk32); +extern THUMB unk32 func_0202ab48(void); + +ARM UnkStruct_02032e7c::UnkStruct_02032e7c() { + this->mUnk_04 = NULL; + this->mUnk_08 = 0; + this->mUnk_0a = 0; + this->mUnk_0c = 0; + this->mUnk_0e = 0; + + if (func_0202ab48() == 0) { + this->mUnk_10 = 2; + } else { + this->mUnk_10 = 3; + } +} + +THUMB UnkStruct_02032f0c::UnkStruct_02032f0c() { + this->mUnk_04 = 0; + this->mUnk_08 = 0; + this->mUnk_0c = NULL; + this->mUnk_38 = 0; + this->mUnk_3c = 0; + this->mUnk_4a = 0; + this->mUnk_4c = 0; + this->mUnk_4d = 0; + this->mUnk_4e = 0; + this->mUnk_4f = 0; + this->mUnk_50 = 0; + this->mUnk_51 = 0; + Fill32(0, &this->mUnk_10, 0x18); + Fill32(0, &this->mUnk_28, 0x10); + Fill16(0, &this->mUnk_3e, 0xC); + this->mUnk_10 = NULL; + this->mUnk_2c = NULL; + this->mUnk_30 = 2; + this->mUnk_34 = 3; +} + +THUMB UnkStruct_02032f0c::~UnkStruct_02032f0c() {} + +ARM void UnkStruct_02032f0c::func_02032f94() {} + +ARM u16 **UnkStruct_02032f0c::SetUnk_0c(u16 *value) { + this->mUnk_0c = value; + return &this->mUnk_0c; +} + +ARM u8 UnkStruct_02032f0c::func_02032fa4() { + return UnkStruct_02035064::func_02035428(this->mUnk_50); +} + +ARM s32 UnkStruct_02032f0c::func_02032fb4() { + return this->mUnk_2c[0]->mUnk_01 + this->mUnk_34; +} + +// non-matching +ARM bool UnkStruct_02032f0c::vfunc_14(s32 param1, s32 param2) { + s16 iVar1; + s16 iVar2; + + iVar1 = ((param1 + 0x7 + ((param1 + 0x7) >> 0x1D))) * 0x8; + iVar2 = ((param2 + 0x7 + ((param2 + 0x7) >> 0x1D))) * 0x8; + this->mUnk_4a = param1; + this->mUnk_4c = param2; + this->mUnk_14 = (iVar1 + (iVar1 >> 0x1D)) * 0x2000 >> 0x10; + this->mUnk_18 = (iVar2 + (iVar2 >> 0x1D)) * 0x2000 >> 0x10; + + return true; +} + +ARM void UnkStruct_02032f0c::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {} + +ARM void UnkStruct_02032f0c::vfunc_0c(unk32 param1, unk32 param2, unk32 param3, unk32 param4) { + func_020296e0(&this->mUnk_10, this->mUnk_2c, param1, param2, param4, param3); +} + +ARM void UnkStruct_02032f0c::vfunc_10(u32 param1, unk32 param2) {} +ARM void UnkStruct_02032f0c::func_02033214(unk32 param1, unk32 param2, unk32 param3, u8 param4, unk32 param5) {} +ARM unk32 UnkStruct_02032f0c::vfunc_18(s32 param1) {} +ARM unk32 UnkStruct_02032f0c::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {} +ARM unk32 UnkStruct_02032f0c::vfunc_20(s32 param1, s32 *param2) {} +ARM void UnkStruct_02032f0c::func_020334b4(u32 param1, s32 param2, s32 param3, s32 param4) {} +ARM void UnkStruct_02032f0c::func_02033628(unk32 param1, u16 *param2) {} +ARM u32 UnkStruct_02032f0c::func_0203369c(u16 *param1, s32 param2) {} +ARM void UnkStruct_02032f0c::func_02033780(s32 param1) {} + +ARM s32 UnkStruct_02032f0c::func_020337d8(s32 param1) { + return this->mUnk_2c[0]->mUnk_08[1] * param1 + (param1 - 1) * this->mUnk_34; +} + +ARM s32 UnkStruct_02032f0c::func_020337fc(s16 *param1, s32 param2) {} +ARM void UnkStruct_02032f0c::func_020338a8(s32 param1, unk32 param2) {} +ARM void UnkStruct_02032f0c::func_020338d0(unk32 *param1, unk32 param2) {} +ARM s32 UnkStruct_02032f0c::func_02033904(unk32 param1, unk32 param2) {} +ARM s32 UnkStruct_02032f0c::func_02033938(unk32 param1) {} +ARM s32 UnkStruct_02032f0c::func_0203396c(u16 *param1) {} +ARM bool UnkStruct_02032f0c::vfunc_24(s16 **param1) {} +ARM u16 *UnkStruct_02032f0c::func_02033b0c(s32 param1) {} +ARM bool UnkStruct_02032f0c::func_02033c6c() {} +ARM unk32 UnkStruct_02032f0c::func_02033c88(u32 param1) {} +ARM s32 UnkStruct_02032f0c::func_02033cbc(s16 *param1) {} + +ARM UnkStruct_02032e7c::~UnkStruct_02032e7c() {} diff --git a/src/Main/Unknown/UnkStruct_02035064.cpp b/src/Main/Unknown/UnkStruct_02035064.cpp index 4c3562ab..7a9646f4 100644 --- a/src/Main/Unknown/UnkStruct_02035064.cpp +++ b/src/Main/Unknown/UnkStruct_02035064.cpp @@ -1,11 +1,40 @@ #include "Unknown/UnkStruct_02035064.hpp" -UnkStruct_02035064::UnkStruct_02035064() {} -UnkStruct_02035064::~UnkStruct_02035064() {} -void UnkStruct_02035064::func_020350b0() {} -void UnkStruct_02035064::func_020350b4(s32 param1, unk32 param2, unk8 param3, unk16 param4, unk16 param5) {} -void UnkStruct_02035064::func_0203516c() {} -s32 UnkStruct_02035064::vfunc_0() {} -s32 UnkStruct_02035064::vfunc_4() {} -void UnkStruct_02035064::func_020351b8(bool param1, bool param2, bool param3, bool param4) {} -void UnkStruct_02035064::func_020352d8() {} +ARM UnkStruct_02035064::UnkStruct_02035064() { + this->mUnk_74 = NULL; + this->mUnk_78 = NULL; + this->mUnk_7c = 0; + this->mUnk_80 = 0; + this->mUnk_82 = 0; + this->mUnk_84 = 0; + this->mUnk_86 = 0; + this->mUnk_87 = 0; +} + +ARM UnkStruct_02035064::~UnkStruct_02035064() {} + +ARM void UnkStruct_02035064::func_020350b0() {} + +ARM void UnkStruct_02035064::func_020350b4(s32 param1, unk32 param2, unk8 param3, unk16 param4, unk16 param5) {} + +ARM void UnkStruct_02035064::func_0203516c() { + if (this->mUnk_78 != 0x0) { + if (this->mUnk_86 == false) { + this->mUnk_5c.func_0202e1e8(); + this->func_020352d8(); + } else { + this->mUnk_86 = false; + } + } +} + +ARM s32 UnkStruct_02035064::vfunc_00() { + return this->mUnk_4c; +} + +ARM s32 UnkStruct_02035064::vfunc_04() { + return this->mUnk_4e; +} + +ARM void UnkStruct_02035064::func_020351b8(bool param1, bool param2, bool param3, bool param4) {} +ARM void UnkStruct_02035064::func_020352d8() {} diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp index cefbb0cc..0fa56bfb 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -1,25 +1,224 @@ #include "Unknown/UnkStruct_02037750.hpp" +#include "Actor/ActorManager.hpp" +#include "Item/ItemManager.hpp" +#include "Message/MessageManager.hpp" +#include "Save/AdventureFlags.hpp" +#include "System/Random.hpp" -UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) {} -UnkStruct_02037750::~UnkStruct_02037750() {} -void UnkStruct_02037750::vfunc_08(unk32 param1) {} -void UnkStruct_02037750::vfunc_0c(s32 param1) {} -void UnkStruct_02037750::vfunc_10() {} -void UnkStruct_02037750::vfunc_24(unk32 param1) {} -void UnkStruct_02037750::vfunc_28(s32 param1) {} -unk32 UnkStruct_02037750::vfunc_2c(s32 param1) {} -LinkStateInteract *UnkStruct_02037750::GetLinkStateInteract() {} -unk32 UnkStruct_02037750::vfunc_30() {} -void UnkStruct_02037750::func_020385d0(s32 param1, unk32 *param2) {} -void UnkStruct_02037750::vfunc_14() {} -void UnkStruct_02037750::vfunc_18() {} -unk32 UnkStruct_02037750::vfunc_1c() {} -void UnkStruct_02037750::vfunc_20() {} - -UnkStruct_020386d8::UnkStruct_020386d8() : - UnkStruct_02037750(0x1000000, 0) {} -void UnkStruct_020386d8::vfunc_08(unk32 param1) {} -void UnkStruct_020386d8::vfunc_24(unk32 param1) {} -void UnkStruct_020386d8::vfunc_28() {} -unk32 UnkStruct_020386d8::vfunc_30() {} -UnkStruct_020386d8::~UnkStruct_020386d8() {} +extern "C" ARM unk32 func_02037628(u8 *); +extern u8 *data_027e0d54; +extern unk32 *data_027e0cb4; + +ARM UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { + s32 i; + + this->mUnk_14 = param2; + this->mUnk_18 = param1; + this->mUnk_1c = 0; + this->mUnk_1d = 0xFF; + this->mUnk_1e = 0; + + for (i = 0; i < ARRAY_LEN(this->mUnk_04); i++) { + this->mUnk_04[i] = 0; + } +} + +ARM UnkStruct_02037750::~UnkStruct_02037750() { + if (gMessageManager.mUnk_20[0] == this) { + gMessageManager.func_02036d4c(this); + } +} + +ARM void UnkStruct_02037750::vfunc_08(u32 param1) { + this->mUnk_18 = param1; + this->mUnk_1c = 0; +} + +ARM void UnkStruct_02037750::vfunc_0c(UnkStruct_020397f8 *param1) {} +ARM void UnkStruct_02037750::vfunc_10() {} + +ARM bool UnkStruct_02037750::vfunc_24(unk32 param1) { + u8 auStack_28[0x18]; + + func_02037628(auStack_28); + return this->func_020385d0(param1, auStack_28) != 0; +} + +// non-matching +ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { + u16 uVar1; + s64 lVar2; + char cVar4; + u16 uVar5; + int iVar6; + u32 uVar7; + UnkStruct_02037750_Callback1 pcVar8; + int iVar9; + u32 uVar10; + u32 uVar11; + bool bVar12; + + uVar7 = (u32) * (u16 *) (param1 + 0x2); + + if (uVar7 >= 0xF && uVar7 <= 0x2E) { + pcVar8 = this->mUnk_04[((uVar7 - 0xF) << 0x1E) >> 0x1C]; + iVar9 = 0; + + if (pcVar8 != NULL) { + iVar9 = pcVar8(this->mUnk_14); + } + + return iVar9; + } + + if ((s32) uVar7 <= 0) { + switch (uVar7) { + case 0x0: + case 0x2f: break; + case 0x7: + if (data_027e0d54[0xd] != 0) { + return -0x1; + } + + return (data_027e0d54[0xf] != 0); + case 0x1: + case 0x2: + case 0x3: + UnkStruct_020397f8 *ret_3 = gMessageManager.func_020366c4(); + + if (0x0 < ret_3->mUnk_15c) { + return -0x1; + } + + uVar7 = (param1 + 0x1); + + if (ret_3->mUnk_576 < uVar7) { + return ret_3->mUnk_576; + } + + if (uVar7 == 0x0) { + uVar10 = 0x0; + } else { + lVar2 = gRandom.mRandomValue * gRandom.mFactor; + uVar10 = gRandom.Next(lVar2); + // uVar10 = *(int *)((int)&gRandom.mAddend + 0x4) + + // *(int *)((int)&gRandom.mFactor + 0x4) * + // *(uint *)&gRandom.mRandomValue + *(uint *)&gRandom.mFactor * + // *(int *)((int)&gRandom.mRandomValue + 0x4) + + // (lVar2 >> 0x20) + (gRandom.mAddend << uVar11); // CARRY4 + + // part of the inline? + // *(uint *)&gRandom.mRandomValue = *(uint *)&gRandom.mAddend + uVar11; + // *(uint *)((int)&gRandom.mRandomValue + 0x4) = uVar10; + + if (uVar7 != 0x0) { + uVar10 = (uVar7 * uVar10 >> 0x20); + } + } + + return uVar10; + case 0x4: return gAdventureFlags->Get(param1 + 0x4) != false; + case 0x5: return gActorManager->func_ov00_020c3b2c(NULL) != 0; + case 0x6: break; + case 0x8: return (((data_027e0cb4[(param1 + 0x4) >> 5]) & 1) << ((param1 + 0x4) & 0x1f)) == 0x0; + case 0x9: break; + case 0xa: break; + case 0xb: + lVar2 = gRandom.mRandomValue * gRandom.mFactor; + uVar7 = lVar2; + uVar10 = gRandom.Next(uVar7); + + return (int) (uVar10 * 0x64 >> 0x20) < (param1 + 0x4); + case 0xc: + uVar7 = (param1 + 0x1); + if (uVar7 == 0x0) { + uVar10 = 0x0; + } else { + lVar2 = gRandom.mRandomValue * gRandom.mFactor; + uVar11 = lVar2; + uVar10 = gRandom.Next(uVar11); + + if (uVar7 != 0x0) { + uVar10 = (uVar7 * uVar10 >> 0x20); + } + } + return (int) (char) uVar10; + case 0xd: return gItemManager->GetNumRupees() != 0; + case 0xe: return gItemManager->HasItem(param1 + 0x4) != 0; + default: + if (uVar7 == 0x2f) { + return gItemManager->HasItem((param1 + 0x4) + 0x60) != 0; + } + break; + } + } + + uVar7 = (param1 + 0x1); + if (uVar7 == 0x0) { + uVar10 = 0x0; + } else { + lVar2 = gRandom.mRandomValue * gRandom.mFactor; + uVar11 = lVar2; + uVar10 = gRandom.Next(uVar11); + + if (uVar7 != 0x0) { + uVar10 = (uVar7 * uVar10 >> 0x20); + } + } + + return (int) (char) uVar10; +} + +ARM unk32 UnkStruct_02037750::vfunc_2c(s32 param1) {} + +ARM LinkStateInteract *UnkStruct_02037750::GetLinkStateInteract() { + return (LinkStateInteract *) GetLinkState(2); +} + +ARM bool UnkStruct_02037750::vfunc_30() { + return true; +} + +ARM unk32 UnkStruct_02037750::func_020385d0(s32 param1, u8 *param2) {} + +ARM void UnkStruct_02037750::vfunc_14() {} + +// non-matching +ARM void UnkStruct_02037750::vfunc_18(unk32 *param1) { + param1[0] = 0; +} + +ARM bool UnkStruct_02037750::vfunc_1c() { + return false; +} + +ARM void UnkStruct_02037750::vfunc_20() { + this->mUnk_18 = 1 << 24; +} + +// non-matching +ARM UnkStruct_020386d8::UnkStruct_020386d8() : + UnkStruct_02037750(1 << 24, 0) { + this->mUnk_20 = -1; + this->mUnk_24.func_020376c0(&gVec3p_ZERO); +} + +ARM void UnkStruct_020386d8::vfunc_08(u32 param1) { + this->UnkStruct_02037750::vfunc_08(param1); + this->mUnk_20 = 0xff; +} + +ARM bool UnkStruct_020386d8::vfunc_24(unk32 param1) { + return this->func_020385d0(param1, &this->mUnk_24.mUnk_00) != 0; +} + +ARM unk32 UnkStruct_020386d8::vfunc_28(s32 param1) { + this->mUnk_20 = this->UnkStruct_02037750::vfunc_28(param1); + return this->mUnk_20; +} + +ARM bool UnkStruct_020386d8::vfunc_30() { + return gMessageManager.func_020366c4()->mUnk_15c <= 0; +} + +ARM UnkStruct_020386d8::~UnkStruct_020386d8() {} diff --git a/src/Main/Unknown/UnkStruct_02038aa0.cpp b/src/Main/Unknown/UnkStruct_02038aa0.cpp index 19380f4f..038d25b6 100644 --- a/src/Main/Unknown/UnkStruct_02038aa0.cpp +++ b/src/Main/Unknown/UnkStruct_02038aa0.cpp @@ -1,42 +1,234 @@ #include "Unknown/UnkStruct_02038aa0.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Message/MessageManager.hpp" -UnkStruct_0203881c::UnkStruct_0203881c() {} -void UnkStruct_0203881c::func_02038858(unk32 param1) {} -void UnkStruct_0203881c::func_02038888() {} -void UnkStruct_0203881c::func_02038950(UnkStruct_02038aa0 *param1, s32 param2) {} -void UnkStruct_0203881c::func_02038a80(s32 param1) {} -UnkStruct_0203881c::~UnkStruct_0203881c() {} - -UnkStruct_02038aa0::UnkStruct_02038aa0(u8 param1, u8 param2) : - UnkStruct_0203dae0(param1) {} -UnkStruct_02038aa0::~UnkStruct_02038aa0() {} -void UnkStruct_02038aa0::vfunc_4c() {} -void UnkStruct_02038aa0::vfunc_10(unk32 param1) {} -void UnkStruct_02038aa0::func_02038b40() {} -void UnkStruct_02038aa0::vfunc_48() {} -bool UnkStruct_02038aa0::func_02038b78() {} -unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) {} -s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) {} -s32 UnkStruct_02038aa0::func_02038cf4() {} -s32 UnkStruct_02038aa0::func_02038d10() {} -void UnkStruct_02038aa0::vfunc_2c() {} -void UnkStruct_02038aa0::vfunc_30() {} -bool UnkStruct_02038aa0::func_02038ef4(s32 param1, s32 param2) {} -void UnkStruct_02038aa0::vfunc_44() {} -void UnkStruct_02038aa0::vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4) {} -void UnkStruct_02038aa0::vfunc_5c() {} -unk32 UnkStruct_02038aa0::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {} -unk32 UnkStruct_02038aa0::vfunc_20(s32 param1, s32 *param2) {} -void UnkStruct_02038aa0::func_02039208(unk16 param1) {} -void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {} -unk32 UnkStruct_02038aa0::func_02039250() {} -void UnkStruct_02038aa0::vfunc_54() {} -void UnkStruct_02038aa0::vfunc_58() {} -void UnkStruct_02038aa0::vfunc_60() {} -void UnkStruct_02038aa0::vfunc_64() {} -s32 UnkStruct_02038aa0::vfunc_68(unk32 param1) {} -void UnkStruct_02038aa0::func_02039440(unk32 param1, unk32 param2) {} -void UnkStruct_02038aa0::vfunc_6c(s32 *param1, s32 *param2) {} -void UnkStruct_02038aa0::vfunc_70(s32 *param1, s32 *param2) {} -bool UnkStruct_02038aa0::func_0203951c() {} -unk32 UnkStruct_02038aa0::vfunc_38() {} +extern u32 data_027e0618[]; + +ARM UnkStruct_0203881c::UnkStruct_0203881c() { + this->mUnk_14 = 0x1000; + this->mUnk_18 = 0; + this->mUnk_1c = 0; + this->mUnk_20 = 0; + this->mUnk_24 = 0; +} + +ARM void UnkStruct_0203881c::func_02038858(unk32 param1) {} +ARM void UnkStruct_0203881c::func_02038888() {} +ARM void UnkStruct_0203881c::func_02038950(UnkStruct_02038aa0 *param1, s32 param2) {} +ARM void UnkStruct_0203881c::func_02038a80(s32 param1) {} +ARM UnkStruct_0203881c::~UnkStruct_0203881c() {} + +THUMB UnkStruct_02038aa0::UnkStruct_02038aa0(u8 param1, u8 param2) : + UnkStruct_0203dae0(param1), + mUnk_124(0) { + this->func_020387e0(this->mUnk_150); + this->pInfoEntry = 0; + this->mUnk_158.y = 0; + this->mUnk_15c = 0; + this->mUnk_15e = 0xFF; + this->mUnk_15f = 0xFF; + this->mUnk_160 = 1; + this->mUnk_11e = param2; +} + +THUMB UnkStruct_02038aa0::~UnkStruct_02038aa0() {} + +THUMB void UnkStruct_02038aa0::func_02038b28(void) { + this->mUnk_114->mUnk_04 = NULL; +} + +ARM void UnkStruct_02038aa0::vfunc_4c(u32 param1, unk32 param2) { + this->UnkStruct_0203dae0::vfunc_10(param1, param2); +} + +ARM void UnkStruct_02038aa0::vfunc_10() {} + +ARM void UnkStruct_02038aa0::func_02038b40() { + this->mUnk_15c = -1; + this->mUnk_128.mUnk_04 = NULL; + this->func_0203dc10(0); + this->vfunc_48(); +} + +ARM void UnkStruct_02038aa0::vfunc_48() {} + +ARM void UnkStruct_02038aa0::func_02038b74(void) {} + +// non-matching +ARM bool UnkStruct_02038aa0::func_02038b78() { + if (data_027e0c54 == 0) { + if ((this->mUnk_50 != 0 && gMessageManager.func_02036850() != 0) || + (this->mUnk_50 == 0 && gMessageManager.func_02036824() != 0)) + { + return true; + } + + return false; + } else { + bool ret = CHECK_UNK_FLAGS(1); + + if ((this->mUnk_50 == 0 || ret)) { + return (this->mUnk_50 != 0 && ret); + } + + return false; + } +} + +ARM unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) { + s16 iVar1; + unk32 iVar2; + unk32 iVar3; + unk32 uVar4; + + iVar2 = this->func_02038cf4(); + iVar3 = this->func_02038d10(); + iVar1 = ((this->mUnk_158.y - (this->mUnk_18 << 3) / 2)); + + if ((param1 < iVar2 + iVar1) || (iVar2 + iVar3 + iVar1 <= param1)) { + return -1; + } + + iVar3 = this->mUnk_34; + uVar4 = this->func_02032fb4(); + iVar2 = (param1 - iVar1) - iVar2; + + return func_01ff9b4c(iVar2 + iVar3 / 2, uVar4); +} + +ARM s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) { + u8 bVar1 = this->mUnk_2c[0]->mUnk_08[1]; + unk32 iVar2 = this->func_02038cf4(); + unk32 iVar1 = this->func_020337d8(param1 + 1); + return iVar2 + iVar1 - bVar1; +} + +ARM s32 UnkStruct_02038aa0::func_02038cf4() { + unk32 iVar1; + unk32 iVar2; + + iVar2 = this->mUnk_18; + iVar1 = this->func_02038d10(); + return (iVar2 * 8 - iVar1) / 2; +} + +ARM s32 UnkStruct_02038aa0::func_02038d10() { + return this->func_020337d8(this->mUnk_150[0]); +} + +ARM void UnkStruct_02038aa0::vfunc_2c() {} + +ARM void UnkStruct_02038aa0::vfunc_30(unk32 param_2, unk32 param_3) { + if (this->mUnk_15c > 0) { + this->func_0203e090(); + } else { + this->mUnk_118 = -1; + } +} + +ARM bool UnkStruct_02038aa0::func_02038ef4(s32 param1, s32 param2) { + unk32 local_14; + unk32 local_18; + + this->vfunc_70(&local_14, &local_18); + this->func_0203e1b0(local_14 + param1, local_18 + param2, 0); +} + +ARM void UnkStruct_02038aa0::func_02038f40(void) {} + +ARM void UnkStruct_02038aa0::vfunc_44(s32 touchLastX, s32 touchLastY) {} + +// non-matching +ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1 *param1, u32 param2, s16 *param3, UnkSubClass1_02256FF8 *param4) { + int iVar1; + + this->pInfoEntry = param1; + this->mUnk_08 = param4; + this->mUnk_15f = -1; + this->mUnk_15c = 0x78; + this->mUnk_15e = param4->mUnk_0c; + this->func_0203dcfc(0, 0, this->mUnk_11e, 2); + this->mUnk_128.func_02038858(param2); + this->mUnk_30 = this->mUnk_150[4] + 5; + + this->vfunc_54(); + // this->vfunc_60(0, 0, (unk32)param3); + // this->vfunc_64(param3); + + if (*(unk32 *) data_027e0618 == 2) { + if (this->func_02032fa4() == 0) { + data_027e103c->func_ov000_020cfc9c(1, 0); + } else { + data_027e103c->func_ov000_020cfc9c(0, 1); + } + } + + this->vfunc_5C(); +} + +// non-matching +ARM void UnkStruct_02038aa0::vfunc_5c(u16 *param_2, UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5) { + u16 sVar1; + bool bVar5; + + sVar1 = param_2[0]; + bVar5 = (sVar1 == 0xA || sVar1 == 0x20) || sVar1 == 0x3000; + + if (bVar5 && this->mUnk_150[2] != 0) { + this->mUnk_150[2] = 1; + } else { + this->mUnk_150[2] = 0; + } + + // this->mUnk_150[2] = bVar5; + + // return? + this->func_02033360(); +} + +ARM unk32 UnkStruct_02038aa0::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {} +ARM unk32 UnkStruct_02038aa0::vfunc_20(s32 param1, s32 *param2) {} +ARM void UnkStruct_02038aa0::func_02039208(unk16 param1) {} + +// non-matching +ARM void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32 *param2, s16 *param3, unk32 param4) { + this->mUnk_15c = 10; + this->mUnk_150[2] = 1; + this->func_0203e2ac(param2); +} + +ARM unk32 UnkStruct_02038aa0::func_02039250() {} +ARM void UnkStruct_02038aa0::vfunc_54() {} +ARM void UnkStruct_02038aa0::vfunc_58() {} +ARM void UnkStruct_02038aa0::vfunc_60() {} +ARM void UnkStruct_02038aa0::vfunc_64() {} + +ARM s32 UnkStruct_02038aa0::vfunc_68(unk32 param1) { + switch (param1) { + case 0: break; + case 1: this->mUnk_34 = 4; break; + case 2: this->mUnk_34 = 6; break; + case 3: this->mUnk_34 = 1; break; + case 4: this->mUnk_34 = 0; break; + default: break; + } + + return ((this->mUnk_18 << 3) - this->func_020337d8(param1)) / 2; +} + +ARM void UnkStruct_02038aa0::func_02039440(unk32 param1, unk32 param2) {} +ARM void UnkStruct_02038aa0::vfunc_6c(s32 *param1, s32 *param2) {} + +ARM void UnkStruct_02038aa0::vfunc_70(s32 *param1, s32 *param2) { + this->vfunc_6C(param1, param2); + *param1 += this->mUnk_158.x; + *param2 += this->mUnk_158.y; +} + +ARM bool UnkStruct_02038aa0::func_0203951c() {} +ARM bool UnkStruct_02038aa0::vfunc_38() {} + +ARM void UnkStruct_02038aa0::vfunc_0c(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { + this->func_0203dc10(1, param_3); + this->func_02033190(param_2, param_3, param_4, param_5); +} diff --git a/src/Main/Unknown/UnkStruct_020397f8.cpp b/src/Main/Unknown/UnkStruct_020397f8.cpp index 3bd676db..dba982d6 100644 --- a/src/Main/Unknown/UnkStruct_020397f8.cpp +++ b/src/Main/Unknown/UnkStruct_020397f8.cpp @@ -1,39 +1,1000 @@ #include "Unknown/UnkStruct_020397f8.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Message/MessageManager.hpp" +#include "Message/MsgProc.hpp" +#include "Player/TouchControl.hpp" +#include "Save/AdventureFlags.hpp" -UnkStruct_020397f8::UnkStruct_020397f8() : - UnkStruct_02038aa0(0, 0) {} -void UnkStruct_020397f8::vfunc_4c() {} -void UnkStruct_020397f8::vfunc_2c() {} -void UnkStruct_020397f8::func_02039ca8() {} -void UnkStruct_020397f8::vfunc_3c() {} -void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) {} -void UnkStruct_020397f8::func_0203a188(s32 param1, s32 param2) {} -bool UnkStruct_020397f8::func_0203a2c0() {} -unk32 UnkStruct_020397f8::func_0203a30c() {} -void UnkStruct_020397f8::vfunc_48() {} -void UnkStruct_020397f8::func_0203a35c() {} -bool UnkStruct_020397f8::func_0203a3e0() {} -void UnkStruct_020397f8::vfunc_44(s32 param1, s32 param2) {} -bool UnkStruct_020397f8::func_0203a6d0(unk32 param1) {} -void UnkStruct_020397f8::vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4) {} -void UnkStruct_020397f8::vfunc_54() {} -void UnkStruct_020397f8::vfunc_5c() {} -void UnkStruct_020397f8::vfunc_58() {} -bool UnkStruct_020397f8::func_0203b0bc() {} -s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) {} -unk32 UnkStruct_020397f8::vfunc_18(s32 param1) {} -unk32 UnkStruct_020397f8::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {} -void UnkStruct_020397f8::vfunc_60(s32 param1) {} -void UnkStruct_020397f8::vfunc_64(unk32 param1) {} -void UnkStruct_020397f8::func_0203b764() {} -unk32 UnkStruct_020397f8::vfunc_20(s32 param1, s32 *param2) {} -void UnkStruct_020397f8::func_0203bd8c(s32 param1) {} -void UnkStruct_020397f8::vfunc_6c(s32 *param1, s32 *param2) {} -void UnkStruct_020397f8::func_0203be08() {} -void UnkStruct_020397f8::func_0203be64() {} -bool UnkStruct_020397f8::func_0203c084() {} -bool UnkStruct_020397f8::func_0203c13c() {} -bool UnkStruct_020397f8::func_0203c1a0() {} -bool UnkStruct_020397f8::func_0203c25c() {} -UnkStruct_020397f8::~UnkStruct_020397f8() {} -unk32 UnkStruct_020397f8::vfunc_38() {} +extern "C" void func_ov000_020d0460(void *); +extern "C" void func_0203efd8(void *, void *); +extern "C" void func_0203ee48(void *); +extern "C" void func_ov018_02169634(UnkStruct_020397f8 *); + +extern unk16 data_02056a0e[]; +extern u8 data_02056a08[]; +extern u32 data_027e0618[]; + +THUMB UnkStruct_020397f8::UnkStruct_020397f8() : + UnkStruct_02038aa0(0, 0), + mUnk_164(NULL) { + UnknownMsgChoiceStruct *puVar3; + + this->mUnk_410.mUnk_00 = this; + this->mUnk_414 = 0; + this->mUnk_418 = NULL; + this->mUnk_41c = 0; + this->mUnk_41e = 0; + this->mUnk_420 = 0; + this->mUnk_424.mUnk_00 = this; + + // ??? + puVar3 = this->mUnk_428; + do { + puVar3->mUnk_00 = NULL; + puVar3 += 1; + } while ((unk32 *) puVar3 < (unk32 *) this->mUnk_528); + + func_0203ee48(&this->mUnk_424); + func_ov000_020d0460(&this->mUnk_534); + this->mUnk_53c = 0; + this->mUnk_540 = ~0x7FFF; + this->mUnk_544 = 3; + func_ov000_020d0460(&this->mUnk_548); + this->mUnk_550 = 0; + this->mUnk_554 = 0x00016000; + this->mUnk_558 = 3; + this->mUnk_55c = -1; + this->mUnk_560 = -1; + this->mUnk_56c = 0; + this->mUnk_56e = 0; + this->mUnk_570 = 0; + this->mUnk_572 = 0; + this->mUnk_574 = 0; + this->mUnk_576 = 0; + this->mUnk_578 = 3; + this->mUnk_57a = 0; + this->mUnk_57b = -1; + this->mUnk_57c = 0; + this->mUnk_57d = 0; + this->mUnk_57e = 0; + this->mUnk_57f = 0; + this->mUnk_580 = 0; + this->mUnk_581 = 0; + this->mUnk_582 = 0; + this->mUnk_583 = 0; + this->mUnk_585 = 0; + this->mUnk_586 = 0; + func_0203efd8(&this->mUnk_588, this); + this->mUnk_124 = (UnkSubClass1_unk_124 *) &this->mUnk_588; + this->func_02039ca8(); + + if (this->func_02032fa4() != 0) { + this->mUnk_168.func_020350b4(0x39, 0, 2, 0, 0); + this->mUnk_1f0.func_020350b4(0x33, 0, 2, 0, 0); + this->mUnk_278.func_020350b4(0x33, 1, 2, 0, 0); + } else { + this->mUnk_168.func_020350b4(0x34, 0, 2, 0, 0); + this->mUnk_1f0.func_020350b4(0x32, 0, 2, 0, 0); + this->mUnk_278.func_020350b4(0x32, 1, 2, 0, 0); + } + + this->mUnk_168.func_020351b8(true, false, false, false); + this->mUnk_1f0.func_020351b8(false, false, false, false); + this->mUnk_278.func_020351b8(false, false, false, false); +} + +THUMB void UnkStruct_020397f8::vfunc_4c() { + this->func_02038b28(); + this->func_0203dcfc(this->mUnk_50, 0, 0, 2); +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_2c() { + if (data_027e0618[0x101] != 0) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->mUnk_50) { + return; + } + } + + this->func_02038d20(); + + if (this->mUnk_56c > 0) { + this->mUnk_56c--; + } + + if (this->mUnk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { + this->mUnk_57f = 0; + } + + if (this->mUnk_15c > 0) { + if ((this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0) { + this->mUnk_424.func_0203ef78(this->mUnk_128.mUnk_08); + } + + this->func_0203be64(); + this->func_0203a35c(); + + if (this->mUnk_580 != 0) { + this->mUnk_168.func_0203516c(); + } + + if (this->mUnk_584 != 0) { + this->mUnk_300.func_0203516c(); + } + + if (this->mUnk_585 != 0) { + this->mUnk_388.func_0203516c(); + } + + if ((this->func_0203a2c0() != 0 && this->mUnk_57f == 0) && this->mUnk_56c <= 0) { + this->mUnk_1f0.func_0203516c(); + } + + if (this->mUnk_08 != NULL) { + bool value = this->mUnk_08->mUnk_1c; + + if ((value == 1) || (value == 2)) { + this->mUnk_278.func_0203516c(); + } + } + + if (this->mUnk_15e == 6) { + func_ov018_02169634(this); + } else { + this->mUnk_410.func_0203ebf8(); + } + } + + if (this->mUnk_15c == 1) { + if (this->mUnk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { + switch (this->mUnk_150[1]) { + case 0: this->func_0203b0ec(1); break; + case 2: + case 3: + if (this->func_0203a3e0() != 0) { + this->func_0203bd8c(this->mUnk_572); + } else { + this->func_0203b0ec(1); + } + break; + } + } + } +} + +ARM void UnkStruct_020397f8::func_02039ca8() { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->mUnk_564); i++) { + this->mUnk_564[i] = 0x1A; + } +} + +ARM void UnkStruct_020397f8::vfunc_3c(unk32 param1) { + if (this->mUnk_15c > 0 && this->func_0203de14(param1) != 0) { + if (this->mUnk_124->mUnk_29 != 3) { + if ((this->mUnk_50 == 0) && func_ov000_02079e04() != 0) { + return; + } + + if (data_027e0618[0x101] != 0) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->mUnk_50) { + return; + } + } + + this->vfunc_40(0, 0); + } + } +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { + UnkStruct_02038aa0 *bVar1; + s8 cVar2; + unk32 iVar4; + unk32 iVar6; + unk32 iVar7; + unk32 iVar8; + unk32 uVar9; + unk32 iStack_a8; + unk32 iStack_a4; + unk32 local_a0; + unk32 local_9c; + unk32 local_98; + unk32 local_94; + unk32 local_90; + unk32 local_8c; + unk32 iVar5; + UnkStruct_01ffbe34 aStack_88; + UnkStruct_01ffbe34 aStack_68; + UnkStruct_01ffbe34 aStack_48; + + local_8c = 0; + local_90 = 0; + bVar1 = gMessageManager.mUnk_28[this->mUnk_50]; + + this->vfunc_6C(&local_8c, &local_90); + this->func_0203a188(local_8c + param1, local_90 + param2); + this->func_0203e1b0(param1 + local_8c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), + param2 + local_90 + (this->mUnk_158.y - (this->mUnk_18 << 3) / 2), 0); + + if (this->mUnk_584 != 0) { + iVar5 = this->mUnk_18 << 3; + + if (this->mUnk_580 != 0) { + iVar5 = -0xC; + } else { + iVar5 = 0; + } + + this->mUnk_300.func_02034a1c(param1 + local_8c + this->mUnk_55c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), + iVar5 + param2 + local_90 + this->mUnk_560 + ((this->mUnk_158.y - (iVar5 / 2))), 0); + } + + if (this->mUnk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { + switch (data_027e0618[0]) { + case 2: + if (data_027e0cbc.func_0203d7e0(3) != 0) { + this->mUnk_388.func_02034b0c(0xBE, 0, 0, 0, 0); + } + break; + case 6: + if (data_027e0cbc.func_0203d7e0(0x58) != 0) { + this->mUnk_388.func_02034b0c(0x013B, 0, 0, 0, 0); + } + break; + } + } + + iVar5 = this->func_02032fa4(); + iVar8 = bVar1->mUnk_18; + uVar9 = data_02056a04[iVar8]; + // func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); + iVar6 = this->mUnk_158.x - local_94; + iVar7 = this->mUnk_158.y - local_98; + + if ((this->mUnk_15e != 7) && (this->func_0203a2c0() != 0)) { + func_01ffbe34(&aStack_48); + func_020347b0(uVar9, data_02056a10[iVar8], &local_9c, &local_a0, 4, 4); + local_9c += param1 + local_8c + iVar6; + local_a0 += param2 + local_90 + iVar7; + + if (data_027e0c38[5] == 1) { + iVar8 = func_0202ab48(); + + if (iVar8 == 0) { + iVar8 = 0; + } else { + iVar8 = -3; + } + + local_9c = (0x108 - local_9c) + iVar8; + } + + if ((this->mUnk_57f == 0) && (this->mUnk_56c <= 0)) { + func_01ffbe34(&aStack_68); + aStack_68.mUnk_0a = 1; + this->mUnk_1f0.func_02034a1c(local_9c, local_a0, &aStack_68); + } else { + // func_02034984(iVar5 != 0 ? 0x11F : 0x18, 0, local_9c, local_a0 + 2, 0); + } + } + + if (this->mUnk_08 != 0) { + if ((this->mUnk_08->mUnk_1c == 1 || this->mUnk_08->mUnk_1c == 2) == 0) { + return; + } + + func_01ffbe34(&aStack_88); + aStack_88.mUnk_0a = 1; + func_02034698(iVar5 != 0 ? 0x11F : 0x18, 2, &iStack_a4, &iStack_a8); + iStack_a4 += param1 + local_8c + iVar6; + iStack_a8 += param2 + local_90 + iVar7; + this->mUnk_278.func_02034a1c(iStack_a4, iStack_a8, &aStack_88); + } +} + +ARM void UnkStruct_020397f8::func_0203a188(s32 param1, s32 param2) { + unk16 sVar1; + unk16 sVar2; + unk32 iVar3; + unk32 iVar4; + unk32 uVar5; + unk32 iVar6; + unk32 iStack_54; + unk32 iStack_50; + unk32 iStack_4c; + unk32 iStack_48; + UnkStruct_01ffbe34 aStack_44; + unk32 uStack_24; + + if (this->mUnk_15e == 7) { + return; + } + + // (short)(ushort)*(byte *)((int)gMessageManager.mUnk_28[(this->mUnk_50 - 0x28) * 0x18]; + + iVar6 = gMessageManager.mUnk_10 + this->mUnk_50; + // uStack_24 = param_4; + + if (data_027e0cbc.func_0203d7e0(data_02056a00[iVar6]) != 0) { + uVar5 = data_02056a04[iVar6]; + + func_0203489c(uVar5, data_02056a16[iVar6], &iStack_48, &iStack_4c); + iVar3 = iStack_50 + (this->mUnk_158.x - iStack_48); + + func_02034698(uVar5, data_02056a0e[iVar6], &iStack_50, &iStack_54); + iVar4 = iStack_54 + (this->mUnk_158.y - iStack_4c); + + func_01ffbe34(&aStack_44); + aStack_44.mUnk_0a = 1; + + if (this->mUnk_580 != 0) { + this->mUnk_168.func_02034a1c(param1 + iVar3, param2 + iVar4, &aStack_44); + } else { + func_02034984(uVar5, data_02056a08[iVar6], param1 + iVar3, param2 + iVar4); + } + } +} + +// non-matching +ARM bool UnkStruct_020397f8::func_0203a2c0() { + if ((this->mUnk_150[1] != 1 && this->mUnk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { + return true; + } + + return false; +} + +ARM unk32 UnkStruct_020397f8::func_0203a30c() { + return this->mUnk_574 / this->pInfoEntry->mUnk_06; +} + +// non-matching (regalloc) +ARM void UnkStruct_020397f8::vfunc_48() { + if (this->mUnk_164 != NULL && this->mUnk_164->mUnk_15c > 0) { + this->func_02038b40(); + } + + this->mUnk_410.func_0203ec34(); +} + +ARM void UnkStruct_020397f8::func_0203a35c() { + if ((this->mUnk_57c == 1 || this->mUnk_150[3] != 0) || + (this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0) + { + if (this->func_0203a3e0()) { + s16 mUnk_56e = this->mUnk_56e; + s16 mUnk_570 = this->mUnk_570; + UnkStruct_020397f8 *mUnk_164 = this->mUnk_164; + + mUnk_164->mUnk_168.mUnk_10 = mUnk_56e; + mUnk_164->mUnk_168.mUnk_14 = mUnk_570; + this->mUnk_164->func_02039208(4); + } + } else { + this->mUnk_164->func_02038b40(); + } +} + +ARM bool UnkStruct_020397f8::func_0203a3e0() { + return this->mUnk_164->mUnk_168.mUnk_06 > 0; +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) { + unk32 iVar2; + unk32 iVar5; + unk32 iStack_14; + unk32 iStack_18; + + if (this->mUnk_15c <= 0 || this->func_0203951c() == 0) { + return; + } + + iStack_14 = 0; + iStack_18 = 0; + + this->vfunc_6C(&iStack_14, &iStack_18); + + iVar5 = touchLastX - iStack_14; + iVar2 = touchLastY - iStack_18; + + if ((data_027e103c != 0 && data_027e103c->mUnk_1c == 0x8F) || (data_027e077c.mUnk_0 != data_027e077c.mUnk_4)) { + return; + } + + if ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { + if ((gTouchControl.mFlags & 1) != 0) { + if (this->mUnk_50 == 0 && data_027e0d38 != 0) { + if (func_ov000_02079e04() == 0 && data_027e0e28->func_ov000_0207bc48() == 0) { + if (data_027e0618[0x101] == 0 && data_027e103c->mUnk_24 == 0) { + return; + } + } + } + + if (this->func_0203a6d0(iVar5, iVar2) == 0 && this->func_0203a2c0() != 0) { + this->mUnk_57f = 1; + } + } else { + if (gTouchControl.mTouch != 0) { + this->func_0203a6d0(iVar5, iVar2); + return; + } + + if (gTouchControl.mTouch == 0) { + switch (this->mUnk_150[1]) { + case 3: + case 4: break; + case 5: + if (data_027e103c->mUnk_20 == 3) { + this->func_0203b0ec(1); + } + break; + case 6: + if (data_027e103c->mUnk_20 == 5) { + this->func_0203b0ec(1); + } + break; + case 7: break; + case 2: + //! TODO: fixme + // if (this->mUnk_164->mUnk_168.mUnk_06 <= 0) { + // if ((gTouchControl.mFlags & 2) != 0) { + // this->mUnk_128.mUnk_14 = 0; + + // if (this->func_0203b0bc() != 0) { + // this->func_0203b0ec(1); + // } + + // this->mUnk_1f0.mUnk_5c.mUnk_08 = 0; + // this->mUnk_1f0.func_020352d8(); + // } + // } + break; + case 0: + case 1: + default: + if ((gTouchControl.mFlags & 2) != 0) { + this->mUnk_128.mUnk_14 = 0; + + if (this->func_0203b0bc() != 0) { + this->func_0203b0ec(1); + } + + this->mUnk_1f0.mUnk_5c.mUnk_08 = 0; + this->mUnk_1f0.func_020352d8(); + } + break; + } + } + } + } +} + +ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1, unk32 param2) { + unk32 iVar1; + unk32 uVar2; + UnkStruct_0203b264 *piVar3; + + if (this->mUnk_164->mUnk_168.mUnk_06 > 0 && this->mUnk_164->mUnk_15c <= 0) { + return false; + } + + iVar1 = this->vfunc_34(param2); + piVar3 = NULL; + + if (!(iVar1 < 0) && iVar1 < 4) { + piVar3 = this->mUnk_424.func_0203eeb0(iVar1, param1); + } + + if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16 *) piVar3->mUnk_0)[2]) == 0x00FF0002) { + uVar2 = this->func_02038cb8(iVar1); + this->mUnk_410.func_0203ec4c(piVar3, uVar2, + (s16) (this->mUnk_158.x - ((this->mUnk_14 << 3) / 2)) + iVar1 + this->mUnk_56e, + (s16) (this->mUnk_158.y - ((this->mUnk_18 << 3) / 2)) + iVar1 + this->mUnk_570); + + this->mUnk_57f = 0; + return true; + } + + return false; +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_50(EntryINF1 *param1, unk32 param2, s32 *param3, unk32 param4) { + bool bVar5; + bool bVar2; + int iVar4; + int iVar6; + s16 temp; + + iVar6 = param3[0]; + + if (data_027e0c54 != 0) { + UnkStruct_020397f8 *pVar4 = gMessageManager.func_02036700(); + + if (pVar4 != NULL && pVar4->mUnk_15c > 0) { + this->func_02038b40(); + } + } + + if (*((s32 *) data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && + func_ov003_020f3f94(data_ov009_0211f5b4) == 0) + { + UnkStruct_020397f8 *pVar4 = (UnkStruct_020397f8 *) gMessageManager.mUnk_28[4]; + + if (pVar4 != NULL && pVar4->mUnk_15c > 0) { + this->func_02038b40(); + } + } + + this->mUnk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; + temp = param3[8]; + + if (temp >= 0 && param3[9] >= 0) { + temp = param3[10]; + } + + if (temp < 0) { + this->mUnk_57b = temp; + } else { + this->mUnk_57b = 0; + } + + // this->func_02038f44(param1, param2, param3, param4, iVar6); + this->mUnk_574 = 0; + + if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param3[11])) { + data_027e103c->func_ov000_020cf284(0x80, 0); + } +} + +// switch decomp issue +ARM void UnkStruct_020397f8::vfunc_54() {} + +ARM void UnkStruct_020397f8::vfunc_5c() { + if (this->mUnk_15f == 0 || this->pInfoEntry->mUnk_06 <= 2) { + this->mUnk_168.mUnk_5c.mUnk_08 = this->mUnk_168.mUnk_7c; + this->mUnk_168.func_020352d8(); + } else { + this->mUnk_168.mUnk_5c.mUnk_08 = 0; + this->mUnk_168.func_020352d8(); + this->mUnk_168.func_020351b8(1, 0, 0, 0); + } +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_58() { + bool bVar1; + s8 *puVar2; + int iVar3; + char *pcVar4; + + if (this->mUnk_160 != 0) { + if (data_027e103c != NULL) { + if (data_027e103c->func_ov000_020cf4bc() != 0) { + puVar2 = (s8 *) data_027e103c->func_ov000_020cef9c(); + + if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { + puVar2 = (s8 *) data_027e103c->func_ov000_020cef9c(); + + if ((UnkStruct_020397f8 *) (puVar2 + 0x244) == this) { + data_027e103c->func_ov000_020cfb38(); + } + } + } + + if (this->mUnk_581 != 0 && data_027e103c->func_ov000_020cf488() != 0) { + data_027e103c->func_ov000_020cfa24(0, 0); + this->mUnk_581 = 0; + } + + if (this->mUnk_582 != 0) { + data_027e103c->func_ov000_020cfe40(0, 2); + this->mUnk_582 = 0; + } + + if (this->mUnk_583 != 0) { + data_027e103c->func_ov005_02104028(0); + this->mUnk_583 = 0; + } + } + + // if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.mUnk_04 + 0x99) != 0 && + // (data_027e077c.mUnk_0 != 0x39 || data_027e103c->func_ov000_020cf0bc())) { + // data_027e1054.func_ov003_020f4874(); + // data_027e103c->func_ov005_02103f8c(data_02057ed4); + // } + } + + this->func_02039398(); +} + +ARM bool UnkStruct_020397f8::func_0203b0bc() { + return this->mUnk_57f != 0 && data_027e077c.mUnk_0 == data_027e077c.mUnk_4; +} + +// non-matching +ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) { + s32 iVar4; + u16 *puVar2; + u32 uVar3; + s32 unaff_r6; + bool bVar1; + + iVar4 = 0; + bVar1 = false; + + uVar3 = param1; + + if (((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { + uVar3 = 0; + } else { + uVar3 = 1; + } + + unaff_r6 = this->mUnk_50 == uVar3; + + this->mUnk_410.func_0203ec34(); + this->mUnk_585 = 0; + this->mUnk_584 = 0; + + if (this->mUnk_150[3] != 0) { + iVar4 = 1; + this->mUnk_56c = this->mUnk_578; + bVar1 = true; + this->mUnk_15c = 0x78; + } else { + if ((this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0) { + this->func_02038b40(); + + if (data_027e0d38 != 0) { + data_027e103c->func_ov000_020cf224(1); + data_027e103c->func_ov000_020cf2a0(1); + } + + if (this->mUnk_08 == NULL) { + this->vfunc_58(); + } + + iVar4 = 1; + } + } + + if (iVar4 != 0) { + if (bVar1) { + this->vfunc_54(); + } + + if (unaff_r6 != 0) { + data_027e0d04.func_0203fe60(0); + } + } + + if (((param1 != 0 && iVar4 != 0) && unaff_r6 != 0) && this->mUnk_15e != 7) { + data_ov000_020eec9c.func_ov000_020d77e4(0x19); + } + + return iVar4; +} + +// non-matching (regalloc) +ARM unk32 UnkStruct_020397f8::vfunc_18(UnkStruct_0203b264 *param1, unk32 param2, unk32 param3) { + u16 sVar1; + u32 uVar4; + s32 unaff_r4; + bool bVar5; + + if (this->func_0203951c() == 0) { + return 1; + } + + if (this->mUnk_580 != 0) { + unaff_r4 = -0xC; + } else { + unaff_r4 = 0; + } + + sVar1 = param1->mUnk_4[0]; + + if (sVar1 != 0x1A || sVar1 == 0x1A) { + bVar5 = true; + + if (sVar1 == 0x1A) { + uVar4 = (param1->mUnk_0[3] << 0x10) | ((u16 *) param1->mUnk_0)[2]; + + if (((uVar4 == 0x0001000A || uVar4 == 0x00020000) || uVar4 == 0x00FF0000)) { + bVar5 = false; + } + } + + if (bVar5) { + this->mUnk_424.func_0203ee80(this->mUnk_128.mUnk_08); + } + } + + return this->func_0203e284(param1, param2, param3 + unaff_r4); +} + +// non-matching +ARM unk32 UnkStruct_020397f8::vfunc_1c(u16 *param1, UnkStruct_0203b264 *param2, unk8 param3, unk32 param4) { + int iVar1; + u16 *psVar3; + + psVar3 = param2->mUnk_4; + + if (psVar3[0] == 10) { + this->mUnk_424.func_0203ef78(this->mUnk_128.mUnk_08, psVar3[0], param3); + this->mUnk_574++; + + if (this->func_0203a30c() == 0) { + this->mUnk_150[3] = 1; + } + } + + if (this->mUnk_15e == 6) { + return 1; + } + + switch (this->mUnk_57a) { + case 0: return this->func_0203905c(param1, param2, param3, param4); + case 1: + UnknownMsgChoiceStruct *pChoiceData; + s32 i = this->func_0203a30c(); + pChoiceData = &this->mUnk_428[this->mUnk_528[i]]; + return this->mUnk_164->func_0203cb5c( + *param1, (((pChoiceData->mUnk_00->mUnk_0[3] << 0x10) | ((u16 *) pChoiceData->mUnk_00->mUnk_0)[2]) + ~0xFFFE)); + default: break; + } + + return 0; +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1 *param1, unk32 param2, unk32 param3) { + unk16 sVar1; + unk16 uVar2; + unk32 iVar3; + unk32 iVar4; + unk32 uVar5; + u32 uVar6; + + uVar6 = 0; + + if (this->func_02032fa4() == 0) { + switch (param1->mUnk_0c) { + case 0: + case 1: uVar6 = this->mUnk_580 != 0; break; + case 2: uVar6 = 2; break; + case 3: uVar6 = 3; break; + case 5: uVar6 = 4; break; + case 6: uVar6 = 5; break; + default: + // why??? + switch (param1->mUnk_0c) { + case 4: uVar6 = 8; break; + case 7: uVar6 = 9; break; + default: + if (this->mUnk_580 != 0) { + uVar6 = 7; + } else { + uVar6 = 6; + } + break; + } + break; + } + } + + // PTR_PTR_0203b5ac[(byte)param_1[0x50]] = (char)uVar6; + gMessageManager.mUnk_28[this->mUnk_50]->mUnk_50 = uVar6; + + if (this->mUnk_15e == 7) { + uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); + func_02032304(data_02068894, data_02057ed8, data_02056af0, 1, param3); + iVar3 = func_02016fcc(uVar5); + } else { + if (this->func_02032fa4() != 0) { + uVar5 = 0x33; + } else { + uVar5 = 0x32; + } + + data_027e0cbc.func_0203d77c(uVar5, 1, 1); + iVar3 = data_027e0cbc.func_0203d77c(data_02056a00[uVar6 * 0x18] - 2, 1, 1); + } + + if (param1->mUnk_10 < 0) { + iVar3 = param1->mUnk_12; + } + + if (param1->mUnk_10 <= 0 && iVar3 > 0) { + uVar2 = param1->mUnk_12; + this->mUnk_158.x = param1->mUnk_10; + this->mUnk_158.y = uVar2; + } else { + this->func_0203b764(); + } +} + +// non-matching (regalloc) +ARM void UnkStruct_020397f8::vfunc_64(s16 *param1) { + unk32 uVar2; + + if (this->mUnk_50 != 0 || data_027e0db0.mUnk_04 > 0 || func_0203c084() != 0 || + (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) + { + uVar2 = 0x16; + } else { + uVar2 = 0; + } + + this->mUnk_124->func_0203f020(param1, uVar2); + this->func_0203be08(); + + if (this->func_02032fa4()) { + this->mUnk_168.func_020350b4(0x39, 0, 2, 0, 0); + this->mUnk_1f0.func_020350b4(0x33, 0, 2, 0, 0); + this->mUnk_278.func_020350b4(0x33, 1, 2, 0, 0); + } else { + this->mUnk_168.func_020350b4(0x34, 0, 2, 0, 0); + this->mUnk_1f0.func_020350b4(0x32, 0, 2, 0, 0); + this->mUnk_278.func_020350b4(0x32, 1, 2, 0, 0); + } + + this->mUnk_168.func_020351b8(1, 0, 0, 0); + this->mUnk_1f0.func_020351b8(0, 0, 0, 0); + this->mUnk_278.func_020351b8(0, 0, 0, 0); + this->func_020393a8(param1); +} + +// non-matching +ARM void UnkStruct_020397f8::func_0203b764() { + s32 i = gMessageManager.mUnk_00[this->mUnk_50]; + + this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); + + switch (this->mUnk_57b) { + case 1: this->mUnk_158.y -= 38; break; + case 2: + switch (this->pInfoEntry->mUnk_06) { + case 2: this->mUnk_158.y -= 111; break; + case 3: this->mUnk_158.y -= 98; break; + default: break; + } + break; + default: break; + } +} + +// switch decomp issue +ARM unk32 UnkStruct_020397f8::vfunc_20(s32 param1, s32 *param2) {} + +ARM void UnkStruct_020397f8::func_0203bd8c(s32 param1) { + this->mUnk_576 = param1; + + if (this->func_0203b0ec(0) != 0) { + data_ov000_020eec9c.func_ov000_020d77e4(this->mUnk_564[param1]); + } +} + +ARM void UnkStruct_020397f8::vfunc_6c(s32 *param1, s32 *param2) { + this->func_0203947c(); + *param1 += this->mUnk_56e; + *param2 += this->mUnk_570; +} + +ARM void UnkStruct_020397f8::func_0203be08() { + if (data_027e0d38 != 0) { + if (data_027e103c->func_ov000_020cf42c() != 0) { + this->mUnk_534 = this->mUnk_538; + } else { + this->mUnk_534 = this->mUnk_536; + } + + if (this->func_0203c084() != 0) { + this->mUnk_548 = this->mUnk_54c; + } + } +} + +ARM void UnkStruct_020397f8::func_0203be64() {} + +// non-matching +ARM bool UnkStruct_020397f8::func_0203c084() { + unk32 uVar4; + bool bVar2; + bool bVar1; + bool bVar3; + + uVar4 = 0; + + if (this->mUnk_50 == 0) { + bVar2 = true; + bVar1 = true; + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0 && data_027e103c->func_ov000_020cf8fc(0x8F) == 0) { + bVar1 = false; + } + + if (!bVar1 && data_027e0618[0x101] == 0) { + if ((data_027e0d38 != NULL && data_027e0d38->mUnk_14 == 1) == 0) { + bVar2 = false; + } + } + + if (bVar2) { + uVar4 = 1; + } + } + + return uVar4; +} + +ARM bool UnkStruct_020397f8::func_0203c13c() { + if (this->func_02032fa4() == 0) { + data_ov000_020eec9c.func_ov000_020d77e4(6); + data_027e103c->func_ov000_020cfb20(this); + this->mUnk_585 = 1; + this->mUnk_584 = 1; + this->mUnk_128.mUnk_18 = 0x00016000; + this->mUnk_128.mUnk_1c = NULL; + this->mUnk_128.mUnk_20 = 0; + this->mUnk_128.mUnk_24 = 0; + + return true; + } + + return false; +} + +// non-matching +ARM bool UnkStruct_020397f8::func_0203c1a0() { + s8 *pVar1; + u8 *iVar3; + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { + this->mUnk_584 = 1; + + pVar1 = (s8 *) data_027e103c->func_ov000_020cef9c(); + iVar3 = data_027e0f7c.func_ov000_0209d90c(pVar1[0x24F], 0); + data_027e1054.func_ov003_020f4760(iVar3[1], 0); + data_ov000_020eec9c.func_ov000_020d77e4(6); + data_027e103c->func_ov000_020cfb58(); + + this->mUnk_128.mUnk_18 = 0x0000A000; + this->mUnk_128.mUnk_1c = this->func_0203c25c; + this->mUnk_128.mUnk_20 = this; + this->mUnk_128.mUnk_24 = 0; + + return 0; + } + + return 0; +} + +ARM bool UnkStruct_020397f8::func_0203c25c(UnkStruct_020397f8 *param1) { + if (data_027e1054.mUnk_00->mUnk_00->mUnk_95 != 0) { + return false; + } + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { + param1->mUnk_585 = 1; + param1->mUnk_128.mUnk_18 = 0x00016000; + param1->mUnk_128.mUnk_1c = NULL; + param1->mUnk_128.mUnk_20 = 0; + param1->mUnk_128.mUnk_24 = 0; + return true; + } + + return false; +} + +ARM UnkStruct_020397f8::~UnkStruct_020397f8() {} + +ARM bool UnkStruct_020397f8::vfunc_38() { + return true; +} diff --git a/src/Main/Unknown/UnkStruct_0203dae0.cpp b/src/Main/Unknown/UnkStruct_0203dae0.cpp index 5d19b0b3..880511ae 100644 --- a/src/Main/Unknown/UnkStruct_0203dae0.cpp +++ b/src/Main/Unknown/UnkStruct_0203dae0.cpp @@ -1,25 +1,192 @@ #include "Unknown/UnkStruct_0203dae0.hpp" +#include "System/SysNew.hpp" -UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) {} -UnkStruct_0203dae0::~UnkStruct_0203dae0() {} -void UnkStruct_0203dae0::func_0203dc10(s32 param1) {} -bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) {} -bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) {} -void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) {} -void UnkStruct_0203dae0::func_0203ddec() {} -void UnkStruct_0203dae0::func_0203ddfc() {} -void UnkStruct_0203dae0::func_0203de14() {} -s32 UnkStruct_0203dae0::func_0203de24() {} -bool UnkStruct_0203dae0::func_0203de58(s32 param1) {} -void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) {} -void UnkStruct_0203dae0::vfunc_30() {} -bool UnkStruct_0203dae0::vfunc_28() {} -bool UnkStruct_0203dae0::func_0203e0f8(unk32 param1, s32 param2) {} -void UnkStruct_0203dae0::vfunc_2c() {} -bool UnkStruct_0203dae0::func_0203e1b0(unk32 param1, unk32 param2, s32 param3) {} -unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) {} -void UnkStruct_0203dae0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {} -void UnkStruct_0203dae0::func_0203e2e8(s32 param1, s32 param2, unk32 param3, u32 param4) {} -void UnkStruct_0203dae0::func_0203e510(s32 *param1, s32 param2, s32 param3) {} -void UnkStruct_0203dae0::func_0203e62c(s32 *param1, s32 param2) {} -bool UnkStruct_0203dae0::func_0203e6e4(u32 param1, u32 param2, s32 param3) {} +extern u32 *data_027e0ce0[]; +extern "C" void Fill256(unk32, unk16 *, unk32, unk32); +extern "C" void func_0203fc78(u8, unk32 *, unk32 *); +extern "C" u16 func_0203d318(unk32, unk32); +extern "C" void func_020298b8(unk32 *, unk32, unk32, unk32, unk32); +extern "C" void func_02029830(unk32 *, unk32, unk32, unk32, unk32); +extern "C" unk32 func_0203d400(u8); +extern "C" void func_02035440(u8); + +class UnkStruct_02075dac { +public: + unk32 func_0203f9b8(void *); +}; +extern UnkStruct_02075dac data_02075dac; + +// non-matching +THUMB UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) { + this->mUnk_114 = NULL; + this->mUnk_118 = -1; + this->mUnk_11c = 0; + this->mUnk_11e = 0; + this->mUnk_11f = 0; + this->mUnk_120 = 1; + this->mUnk_121 = param1; + this->mUnk_122 = 0; + + Fill256(0, &this->mUnk_54, 0xC0, 1); + + if (this->mUnk_121 == 0) { + this->mUnk_114 = new(data_027e0ce0[1], 4) UnkStruct_0203dae0_114(); + } else { + this->mUnk_114 = new(data_027e0ce0[1], 4) UnkStruct_0203dae0_114(); + } +} + +THUMB UnkStruct_0203dae0::~UnkStruct_0203dae0() { + if (this->mUnk_114 != NULL) { + delete this->mUnk_114; + this->mUnk_114 = NULL; + } +} + +// non-matching (regalloc) +ARM void UnkStruct_0203dae0::func_0203dc10(s32 param1) { + if (param1 != 0) { + if (this->mUnk_11c == 0x0) { + return; + } + + if (this->mUnk_114->vfunc_08(this) != 0) { + this->mUnk_10 = this->mUnk_114->func_0203d1b4(); + } + } else { + this->mUnk_114->vfunc_0c(); + } + + this->mUnk_122 = param1; +} + +ARM bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) { + this->func_0203ddfc(); + this->vfunc_14(param1, param2); + this->mUnk_11c = 0; + return true; +} + +ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) { + unk32 local_c; + unk32 local_10; + + local_c = param1; + local_10 = param2; + + func_0203fc78(this->func_02032fa4(), &local_c, &local_10); + this->UnkStruct_02032f0c::vfunc_14(local_c, local_10); + this->mUnk_10 = 0; + return true; +} + +// non-matching +ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) { + unk32 *uVar5; + + this->mUnk_50 = param1; + this->vfunc_14(this->mUnk_4a, this->mUnk_4c); + this->mUnk_11c = func_0203d318(this->mUnk_10[0x1], this->mUnk_10[0x2]); + this->func_0203dc10(1); + + if (func_0203d400(this->UnkStruct_02032f0c::func_02032fa4()) != 0x0) { + uVar5 = this->func_0203ddec(); + func_020298b8(this->mUnk_10, *uVar5, this->mUnk_10[0x1], this->mUnk_10[0x2], 0x4); + } else { + uVar5 = this->func_0203ddec(); + func_02029830(this->mUnk_10, *uVar5, this->mUnk_10[0x1], this->mUnk_10[0x2], 0x4); + } + + this->mUnk_28 = this->mUnk_10; + this->mUnk_2c = this->mUnk_2c; // this->mUnk_2c = &(UnkStruct_MsgProc_Base_unk_2C*)this->mUnk_10; + this->mUnk_30 = param4; + this->mUnk_34 = 3; + this->vfunc_10(param3, 3); + + this->func_0203de58(param2); +} + +ARM unk32 *UnkStruct_0203dae0::func_0203ddec() { + return this->mUnk_114->func_0203d1b4(); +} + +ARM void UnkStruct_0203dae0::func_0203ddfc() { + this->mUnk_114->mUnk_04 = 0; + this->mUnk_11c = 0; +} + +ARM void UnkStruct_0203dae0::func_0203de14() { + //! TODO: class? + func_02035440(this->mUnk_50); +} + +// non-matching +ARM s32 UnkStruct_0203dae0::func_0203de24() { + if (func_0203d400(this->UnkStruct_02032f0c::func_02032fa4()) == 0x0) { + return this->mUnk_10[5] * this->mUnk_10[6] * 0x20; + } + + return this->mUnk_10[6] << 0xa; +} + +ARM bool UnkStruct_0203dae0::func_0203de58(s32 param1) {} + +ARM void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) { + this->func_0203dc10(1, param2); + this->mUnk_11e = param1; + this->mUnk_118 = -1; + this->UnkStruct_02032f0c::vfunc_10(param1, -1); +} + +ARM void UnkStruct_0203dae0::vfunc_30() { + unk32 iVar2; + + iVar2 = this->mUnk_118; + this->mUnk_118 = data_02075dac.func_0203f9b8(this); + + if (this->mUnk_118 == iVar2) { + return; + } + + this->func_0203dc10(1); +} + +ARM bool UnkStruct_0203dae0::vfunc_28() { + if (this->mUnk_122 != 0) { + this->func_0203e0f8(); + this->func_0203dc10(0); + return true; + } + + return false; +} + +ARM bool UnkStruct_0203dae0::func_0203e0f8() {} + +ARM void UnkStruct_0203dae0::vfunc_2c() { + this->vfunc_30(); +} + +ARM bool UnkStruct_0203dae0::func_0203e1b0(unk32 param1, unk32 param2, s32 param3) {} + +ARM unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) { + unk32 iVar1; + + iVar1 = this->UnkStruct_02032f0c::vfunc_18(param1); + + if (iVar1 != 0) { + this->func_0203dc10(1); + } + + return iVar1; +} + +ARM void UnkStruct_0203dae0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) { + this->func_0203dc10(1); + this->UnkStruct_02032f0c::vfunc_08(param1, param2, param3, param4); +} + +ARM void UnkStruct_0203dae0::func_0203e2e8(s32 param1, s32 param2, unk32 param3, u32 param4) {} +ARM void UnkStruct_0203dae0::func_0203e510(s32 *param1, s32 param2, s32 param3) {} +ARM void UnkStruct_0203dae0::func_0203e62c(s32 *param1, s32 param2) {} +ARM bool UnkStruct_0203dae0::func_0203e6e4(u32 param1, u32 param2, s32 param3) {} diff --git a/tools/configure.py b/tools/configure.py index 0662b332..ef93ed71 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -28,7 +28,7 @@ args = parser.parse_args() GAME = "ph" DSD_VERSION = 'v0.9.1' WIBO_VERSION = '0.6.16' -OBJDIFF_VERSION = 'v2.7.1' +OBJDIFF_VERSION = 'v3.0.0-beta.6' MWCC_VERSION = "2.0/sp1p5" DECOMP_ME_COMPILER = "mwcc_30_131" CC_FLAGS = " ".join([ |