From 06a1f74615de91663c877fe526790b2323edcbf9 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:21:40 +0100 Subject: [PATCH] fix function names (and more) --- config/eur/arm9/symbols.txt | 58 +++--- config/usa/arm9/symbols.txt | 58 +++--- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 182 ++++++++++++------ src/Main/Message/MessageManager.cpp | 36 ++-- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 14 +- src/Main/Message/func_020397f8.cpp | 40 ++-- src/Main/Message/func_0203c8a8.cpp | 4 +- 7 files changed, 223 insertions(+), 169 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 94fd6b55..cf99695c 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1813,7 +1813,7 @@ _ZN18UnkStruct_027E0C6813func_02036ce4EP31UnkStruct_027E0C68_UnkSubClass2i kind: _ZN18UnkStruct_027E0C6813func_02036d30EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x1c) addr:0x2036d30 _ZN18UnkStruct_027E0C6813func_02036d4cEP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x20) addr:0x2036d4c _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c -_ZN18UnkStruct_027E0C6813func_02036da8EjPi kind:function(arm,size=0x134) addr:0x2036da8 +_ZN18UnkStruct_027E0C6813func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036da8 _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036edc _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f68 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x20370d0 @@ -1881,12 +1881,12 @@ func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 _Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1_Sub1 kind:function(arm,size=0x34) addr:0x2038b40 func_02038b74 kind:function(arm,size=0x4) addr:0x2038b74 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b78 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038c34Ei kind:function(arm,size=0x84) addr:0x2038c34 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038c34 func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038cb8 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cf4 func_02038d10 kind:function(arm,size=0x10) addr:0x2038d10 func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038d20 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038ed0Ev kind:function(arm,size=0x24) addr:0x2038ed0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038ed0 func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038ef4 func_02038f40 kind:function(arm,size=0x4) addr:0x2038f40 func_02038f44 kind:function(arm,size=0x114) addr:0x2038f44 @@ -1894,58 +1894,58 @@ func_02039058 kind:function(arm,size=0x4) addr:0x2039058 func_0203905c kind:function(arm,size=0x48) addr:0x203905c func_020390a4 kind:function(arm,size=0x164) addr:0x20390a4 func_02039208 kind:function(arm,size=0x20) addr:0x2039208 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039228EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 func_02039250 kind:function(arm,size=0x64) addr:0x2039250 func_020392b4 kind:function(arm,size=0xe4) addr:0x20392b4 func_02039398 kind:function(arm,size=0xc) addr:0x2039398 func_020393a4 kind:function(arm,size=0x4) addr:0x20393a4 func_020393a8 kind:function(arm,size=0x28) addr:0x20393a8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020393d0Ei kind:function(arm,size=0x70) addr:0x20393d0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_68Ei kind:function(arm,size=0x70) addr:0x20393d0 func_02039440 kind:function(arm,size=0x3c) addr:0x2039440 func_0203947c kind:function(arm,size=0x5c) addr:0x203947c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020394d8EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 func_0203951c kind:function(arm,size=0x40) addr:0x203951c func_0203955c kind:function(arm,size=0x14) addr:0x203955c func_02039570 kind:function(arm,size=0x8) addr:0x2039570 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039578 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039578 func_020395b4 kind:function(thumb,size=0x244) addr:0x20395b4 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397f8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a5c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a5c func_02039ca8 kind:function(arm,size=0x24) addr:0x2039ca8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039ccc -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039d74Eii kind:function(arm,size=0x414) addr:0x2039d74 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039ccc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d74 func_0203a188 kind:function(arm,size=0x138) addr:0x203a188 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a2c0 func_0203a30c kind:function(arm,size=0x1c) addr:0x203a30c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a328 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a328 func_0203a35c kind:function(arm,size=0x84) addr:0x203a35c func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a3e0 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3fc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3fc func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a6d0 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7f0 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a988 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203aea8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203af1cEv kind:function(arm,size=0x1a0) addr:0x203af1c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7f0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a988 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203aea8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203af1c func_0203b0bc kind:function(arm,size=0x30) addr:0x203b0bc func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0ec -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b410 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b5d0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b410 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b5d0 func_0203b764 kind:function(arm,size=0xb0) addr:0x203b764 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b814 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b814 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd8c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203bdccEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc func_0203be08 kind:function(arm,size=0x5c) addr:0x203be08 func_0203be64 kind:function(arm,size=0x220) addr:0x203be64 func_0203c084 kind:function(arm,size=0xb8) addr:0x203c084 func_0203c13c kind:function(arm,size=0x64) addr:0x203c13c func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c1a0 func_0203c25c kind:function(arm,size=0x6c) addr:0x203c25c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c310 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c350 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c310 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c350 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3C1Ev 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 @@ -2030,16 +2030,16 @@ func_0203dba8 kind:function(thumb,size=0x38) addr:0x203dba8 func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203dbe0 func_0203dc10 kind:function(arm,size=0x64) addr:0x203dc10 func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc74 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203dcb4Eii kind:function(arm,size=0x48) addr:0x203dcb4 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dcb4 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcfc func_0203ddec kind:function(arm,size=0x10) addr:0x203ddec func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddfc _Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1_Sub1i kind:function(arm,size=0x10) addr:0x203de14 func_0203de24 kind:function(arm,size=0x34) addr:0x203de24 func_0203de58 kind:function(arm,size=0x208) addr:0x203de58 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 func_0203e090 kind:function(arm,size=0x38) addr:0x203e090 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e0c8Ev kind:function(arm,size=0x30) addr:0x203e0c8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e0c8 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0f8 func_0203e19c kind:function(arm,size=0x14) addr:0x203e19c func_0203e1b0 kind:function(arm,size=0xd4) addr:0x203e1b0 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 3b5e6bfe..f7d7b31a 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1813,7 +1813,7 @@ _ZN18UnkStruct_027E0C6813func_02036ce4EP31UnkStruct_027E0C68_UnkSubClass2i kind: _ZN18UnkStruct_027E0C6813func_02036d30EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x1c) addr:0x2036cec _ZN18UnkStruct_027E0C6813func_02036d4cEP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x20) addr:0x2036d08 _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 -_ZN18UnkStruct_027E0C6813func_02036da8EjPi kind:function(arm,size=0x134) addr:0x2036d64 +_ZN18UnkStruct_027E0C6813func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036d64 _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036e98 _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f24 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x203708c @@ -1881,12 +1881,12 @@ func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0 _Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1_Sub1 kind:function(arm,size=0x34) addr:0x2038afc func_02038b74 kind:function(arm,size=0x4) addr:0x2038b30 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b34 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038c34Ei kind:function(arm,size=0x84) addr:0x2038bf0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0 func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038c74 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cb0 func_02038d10 kind:function(arm,size=0x10) addr:0x2038ccc func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038cdc -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038ed0Ev kind:function(arm,size=0x24) addr:0x2038e8c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038e8c func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038eb0 func_02038f40 kind:function(arm,size=0x4) addr:0x2038efc func_02038f44 kind:function(arm,size=0x114) addr:0x2038f00 @@ -1894,58 +1894,58 @@ func_02039058 kind:function(arm,size=0x4) addr:0x2039014 func_0203905c kind:function(arm,size=0x48) addr:0x2039018 func_020390a4 kind:function(arm,size=0x164) addr:0x2039060 func_02039208 kind:function(arm,size=0x20) addr:0x20391c4 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039228EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 func_02039250 kind:function(arm,size=0x64) addr:0x203920c func_020392b4 kind:function(arm,size=0xe4) addr:0x2039270 func_02039398 kind:function(arm,size=0xc) addr:0x2039354 func_020393a4 kind:function(arm,size=0x4) addr:0x2039360 func_020393a8 kind:function(arm,size=0x28) addr:0x2039364 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020393d0Ei kind:function(arm,size=0x70) addr:0x203938c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_68Ei kind:function(arm,size=0x70) addr:0x203938c func_02039440 kind:function(arm,size=0x3c) addr:0x20393fc func_0203947c kind:function(arm,size=0x5c) addr:0x2039438 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020394d8EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 func_0203951c kind:function(arm,size=0x40) addr:0x20394d8 func_0203955c kind:function(arm,size=0x14) addr:0x2039518 func_02039570 kind:function(arm,size=0x8) addr:0x203952c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039534 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039534 func_020395b4 kind:function(thumb,size=0x244) addr:0x2039570 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397b4 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a18 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a18 func_02039ca8 kind:function(arm,size=0x24) addr:0x2039c64 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039c88 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039d74Eii kind:function(arm,size=0x414) addr:0x2039d30 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039c88 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d30 func_0203a188 kind:function(arm,size=0x138) addr:0x203a144 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a27c func_0203a30c kind:function(arm,size=0x1c) addr:0x203a2c8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a2e4 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a2e4 func_0203a35c kind:function(arm,size=0x84) addr:0x203a318 func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a39c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3b8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3b8 func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a68c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7ac -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a944 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203ae64 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203af1cEv kind:function(arm,size=0x1a0) addr:0x203aed8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7ac +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a944 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203ae64 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203aed8 func_0203b0bc kind:function(arm,size=0x30) addr:0x203b078 func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0a8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b3cc -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b58c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b3cc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b58c func_0203b764 kind:function(arm,size=0xb0) addr:0x203b720 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b7d0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b7d0 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd48 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203bdccEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88 func_0203be08 kind:function(arm,size=0x5c) addr:0x203bdc4 func_0203be64 kind:function(arm,size=0x220) addr:0x203be20 func_0203c084 kind:function(arm,size=0xb8) addr:0x203c040 func_0203c13c kind:function(arm,size=0x64) addr:0x203c0f8 func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c15c func_0203c25c kind:function(arm,size=0x6c) addr:0x203c218 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c284 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c2cc -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c30c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c284 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c2cc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c30c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3C1Ev 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 @@ -2030,16 +2030,16 @@ func_0203dba8 kind:function(thumb,size=0x38) addr:0x203db64 func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203db9c func_0203dc10 kind:function(arm,size=0x64) addr:0x203dbcc func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc30 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203dcb4Eii kind:function(arm,size=0x48) addr:0x203dc70 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dc70 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcb8 func_0203ddec kind:function(arm,size=0x10) addr:0x203dda8 func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddb8 _Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1_Sub1i kind:function(arm,size=0x10) addr:0x203ddd0 func_0203de24 kind:function(arm,size=0x34) addr:0x203dde0 func_0203de58 kind:function(arm,size=0x208) addr:0x203de14 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c func_0203e090 kind:function(arm,size=0x38) addr:0x203e04c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e0c8Ev kind:function(arm,size=0x30) addr:0x203e084 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e084 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0b4 func_0203e19c kind:function(arm,size=0x14) addr:0x203e158 func_0203e1b0 kind:function(arm,size=0xd4) addr:0x203e16c diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index 447cb216..e6a985f9 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -228,33 +228,33 @@ public: UnkStruct_027E0C68_UnkSubClass1_Base(); /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base(); - /* 0x08 */ virtual UNK_TYPE vfunc_08(void); // func_0203c2c8 (dtor?) - /* 0x0C */ virtual void func_02039228(unk32* param_2, unk32* param_3); - /* 0x10 */ virtual void func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); - /* 0x14 */ virtual void func_0203e060(u8 param_2, u8 param_3); - /* 0x18 */ virtual bool func_0203dcb4(unk32 param_2, unk32 param_3); - /* 0x1C */ virtual unk32 func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4); - /* 0x20 */ virtual unk32 func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); - /* 0x24 */ virtual UNK_TYPE func_0203b814(UNK_TYPE); - /* 0x28 */ virtual bool func_0203e0c8(void); - /* 0x2C */ virtual void func_02039a5c(void); - /* 0x30 */ virtual void func_02038ed0(void); - /* 0x34 */ virtual unk32 func_02038c34(unk32 param_2); - /* 0x38 */ virtual bool func_0203c350(void); - /* 0x3C */ virtual void func_02039ccc(unk32 param_2); - /* 0x40 */ virtual void func_02039d74(unk32 param_2, unk32 param_3); - /* 0x44 */ virtual void func_0203a3fc(s32 touchLastX, s32 touchLastY); - /* 0x48 */ virtual void func_0203a328(void); - /* 0x4C */ virtual void func_02039a3c(void); - /* 0x50 */ virtual void func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5); - /* 0x54 */ virtual void func_0203a988(void); - /* 0x58 */ virtual void func_0203af1c(void); - /* 0x5C */ virtual void func_0203aea8(void); - /* 0x60 */ virtual void func_0203b410(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4); - /* 0x64 */ virtual void func_0203b5d0(unk32 param_2); - /* 0x68 */ virtual unk32 func_020393d0(unk32 param_2); - /* 0x6C */ virtual void func_0203bdcc(unk32* param_2, unk32* param_3); - /* 0x70 */ virtual void func_020394d8(unk32* param_2, unk32* param_3); + /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3); + /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); + /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3); // func_0203e060? + /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3); + /* 0x18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4); + /* 0x1C */ virtual unk32 vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); + /* 0x20 */ virtual UNK_TYPE vfunc_20(UNK_TYPE); + /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE); + /* 0x28 */ virtual bool vfunc_28(void); + /* 0x2C */ virtual void vfunc_2C(void); + /* 0x30 */ virtual void vfunc_30(void); + /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2); + /* 0x38 */ virtual bool vfunc_38(void); + /* 0x3C */ virtual void vfunc_3C(unk32 param_2); + /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3); + /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); + /* 0x48 */ virtual void vfunc_48(void); + /* 0x4C */ virtual void vfunc_4C(void); // func_02039a3c? + /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5); + /* 0x54 */ virtual void vfunc_54(void); + /* 0x58 */ virtual void vfunc_58(void); + /* 0x5C */ virtual void vfunc_5C(void); + /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4); + /* 0x64 */ virtual void vfunc_64(unk32 param_2); + /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2); + /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3); + /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3); /* 0x74 */ unk32 func_02032fa4(void); @@ -358,37 +358,41 @@ public: /* 0x588 */ u8 unk_588[0x2C]; /* 0x5B4 */ - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub1() override; - /* 0x08 */ virtual UNK_TYPE vfunc_08(void); // func_0203c2c8 (dtor? override) - /* 0x0C */ virtual void func_02039228(unk32* param_2, unk32* param_3) override; - /* 0x10 */ virtual void func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; - /* 0x14 */ virtual void func_0203e060(u8 param_2, u8 param_3) override; - /* 0x18 */ virtual bool func_0203dcb4(unk32 param_2, unk32 param_3) override; - /* 0x1C */ virtual unk32 func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; - /* 0x20 */ virtual unk32 func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; - /* 0x24 */ virtual UNK_TYPE func_0203b814(UNK_TYPE) override; - /* 0x28 */ virtual bool func_0203e0c8(void) override; - /* 0x2C */ virtual void func_02039a5c(void) override; - /* 0x30 */ virtual void func_02038ed0(void) override; - /* 0x34 */ virtual unk32 func_02038c34(unk32 param_2) override; - /* 0x38 */ virtual bool func_0203c350(void) override; - /* 0x3C */ virtual void func_02039ccc(unk32 param_2) override; - /* 0x40 */ virtual void func_02039d74(unk32 param_2, unk32 param_3) override; - /* 0x44 */ virtual void func_0203a3fc(s32 touchLastX, s32 touchLastY) override; - /* 0x48 */ virtual void func_0203a328(void) override; - /* 0x4C */ virtual void func_02039a3c(void) override; - /* 0x50 */ virtual void func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) override; - /* 0x54 */ virtual void func_0203a988(void) override; - /* 0x58 */ virtual void func_0203af1c(void) override; - /* 0x5C */ virtual void func_0203aea8(void) override; - /* 0x60 */ virtual void func_0203b410(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; - /* 0x64 */ virtual void func_0203b5d0(unk32 param_2) override; - /* 0x68 */ virtual unk32 func_020393d0(unk32 param_2) override; - /* 0x6C */ virtual void func_0203bdcc(unk32* param_2, unk32* param_3) override; - /* 0x70 */ virtual void func_020394d8(unk32* param_2, unk32* param_3) override; - /* 0x74 */ + //! TODO: remove the function declarations that are not overridden UnkStruct_027E0C68_UnkSubClass1_Sub1(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub1() override; + /* 0x08 */ 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 */ virtual unk32 vfunc_1C(unk8 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 */ virtual bool vfunc_28(void) override; + /* 0x2C */ virtual void vfunc_2C(void) override; + /* 0x30 */ virtual void vfunc_30(void) override; + /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2) override; + /* 0x38 */ virtual bool vfunc_38(void) override; + /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override; + /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; + /* 0x48 */ virtual void vfunc_48(void) override; + /* 0x4C */ virtual void vfunc_4C(void) override; // func_02039a3c? + /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) override; + /* 0x54 */ virtual void vfunc_54(void) override; + /* 0x58 */ virtual void vfunc_58(void) override; + /* 0x5C */ virtual void vfunc_5C(void) override; + /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 0x64 */ virtual void vfunc_64(unk32 param_2) override; + /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2) override; + /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; + /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; + /* 0x74 */ + + void func_0203e060(u8 param_2, u8 param_3); + void func_02039a3c(void); }; class UnkStruct_027E0C68_UnkSubClass1_Sub2 : public UnkStruct_027E0C68_UnkSubClass1_Base { @@ -396,8 +400,39 @@ public: /* 0x15E */ u8 unk_15E[0x62]; /* 0x1C0 */ + //! TODO: remove the function declarations that are not overridden + UnkStruct_027E0C68_UnkSubClass1_Sub2(); - virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub2(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub2(); + /* 0x08 */ 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 */ virtual unk32 vfunc_1C(unk8 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 */ virtual bool vfunc_28(void) override; + /* 0x2C */ virtual void vfunc_2C(void) override; + /* 0x30 */ virtual void vfunc_30(void) override; + /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2) override; + /* 0x38 */ virtual bool vfunc_38(void) override; + /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override; + /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; + /* 0x48 */ virtual void vfunc_48(void) override; + /* 0x4C */ virtual void vfunc_4C(void) override; // func_02039a3c? + /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) override; + /* 0x54 */ virtual void vfunc_54(void) override; + /* 0x58 */ virtual void vfunc_58(void) override; + /* 0x5C */ virtual void vfunc_5C(void) override; + /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 0x64 */ virtual void vfunc_64(unk32 param_2) override; + /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2) override; + /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; + /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; + /* 0x74 */ + }; class UnkStruct_027E0C68_UnkSubClass1_Sub3 : public UnkStruct_027E0C68_UnkSubClass1_Base { @@ -405,8 +440,39 @@ public: /* 0x15E */ u8 unk_15E[0x12]; /* 0x170 */ + //! TODO: remove the function declarations that are not overridden + UnkStruct_027E0C68_UnkSubClass1_Sub3(); - virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub3(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub3(); + /* 0x08 */ 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 */ virtual unk32 vfunc_1C(unk8 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 */ virtual bool vfunc_28(void) override; + /* 0x2C */ virtual void vfunc_2C(void) override; + /* 0x30 */ virtual void vfunc_30(void) override; + /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2) override; + /* 0x38 */ virtual bool vfunc_38(void) override; + /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override; + /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; + /* 0x48 */ virtual void vfunc_48(void) override; + /* 0x4C */ virtual void vfunc_4C(void) override; // func_02039a3c? + /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) override; + /* 0x54 */ virtual void vfunc_54(void) override; + /* 0x58 */ virtual void vfunc_58(void) override; + /* 0x5C */ virtual void vfunc_5C(void) override; + /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 0x64 */ virtual void vfunc_64(unk32 param_2) override; + /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2) override; + /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; + /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; + /* 0x74 */ + }; // TEMPORARY diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 15573317..282ed162 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -5,27 +5,15 @@ extern ARM unk32 func_ov000_020d7f18(u32*, unk32); extern ARM unk32 func_ov000_020d77e4(u32*, unk32); extern ARM unk32 func_02037628(u8*); -extern THUMB unk32 func_0202ab48(void); extern ARM void func_0203dc74(UnkStruct_027E0C68_UnkSubClass1_Base*, unk32, unk32); -// see Actor.cpp -struct UnkStruct2 { - /* 0 */ u32 mUnk_0; - /* 4 */ u32 mUnk_4; - /* 8 */ -}; -extern UnkStruct2 data_027e077c; -extern u8 data_02056be4[]; extern u32 data_ov000_020eec9c[]; -extern u32 data_027e0618; extern u32** data_027e0ce0[]; extern u32 data_02056924[]; extern u32* data_02068e6c; extern u32* data_02068e8c; extern u16 data_02056918[]; extern ActorTypeId data_0205691c[]; -extern u8 data_027e0c54; -extern TouchControl data_027e0d78; extern s16 data_027e0d04; // this should be `data_027e0ffc->func_ov000_020cec60(u16, Vec3p*, s32);` @@ -45,7 +33,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 this->pGroups->func_020372f0(BMG_FILE_INDEX_SYSTEM, 2); - switch (data_027e0618) { + switch (*data_027e0618) { case 3: this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2); this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2); @@ -85,11 +73,11 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 this->unk_18[1]->unk_39 = 1; // switch? - if (data_027e0618 == 2 || data_027e0618 == 3 || data_027e0618 == 6) { + if (*data_027e0618 == 2 || *data_027e0618 == 3 || *data_027e0618 == 6) { for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { switch (data_02056924[i + 1]) { case 0: - if (data_027e0618 != 2) { + if (*data_027e0618 != 2) { this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Sub1(); func_0203dc74(this->unk_28[i], 0xE0, 0x40); this->unk_28[i]->unk_2C = data_02068e6c; @@ -118,7 +106,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 } if (this->unk_28[i] != NULL) { - this->unk_28[i]->func_02039a3c(); + this->unk_28[i]->vfunc_4C(); } } } @@ -306,7 +294,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { if (this->unk_28[i] != NULL) { - this->unk_28[i]->func_02039a5c(); + this->unk_28[i]->vfunc_2C(); } } @@ -366,7 +354,7 @@ ARM void UnkStruct_027E0C68::func_02036bbc(void) { pSVar3 = this->unk_28[i]; if (pSVar3 != NULL && ((bVar2 && pSVar3->unk_50 == 0) || (bVar4 && pSVar3->unk_50 != 0))) { - pSVar3->func_0203a3fc(data_027e0d78.mTouchLastX, data_027e0d78.mTouchLastY); + pSVar3->vfunc_44(data_027e0d78.mTouchLastX, data_027e0d78.mTouchLastY); } } } @@ -376,7 +364,7 @@ ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { if (this->unk_28[i] != NULL && this->unk_28[i]->func_0203de14(param_2) != 0) { - this->unk_28[i]->func_0203e0c8(); + this->unk_28[i]->vfunc_28(); } } } @@ -388,7 +376,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { UnkStruct_027E0C68_UnkSubClass1_Base* pSVar1 = this->unk_28[i]; if (pSVar1 != NULL) { - pSVar1->func_02039ccc(param_2); + pSVar1->vfunc_3C(param_2); } } } @@ -472,9 +460,9 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02036da8(u32 // iStack_34 = param_3[1]; // iStack_30 = param_3[2]; pBVar5 = this->pGroups; - // pSVar4->func_0203a7f0(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); + // pSVar4->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); BMGFileInfo* entry = &(pBVar5)->entries[(param_2) >> 0x10]; - pSVar4->func_0203a7f0(pEVar1, + pSVar4->vfunc_50(pEVar1, ((u32)entry->pDAT1 + (((func_02037258(entry, (((param_2))) & 0xFFFF))->offset) & ~1)), // BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); @@ -536,7 +524,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036f68(u32 pSVar5->unk_164 = pSVar2; pSVar5->unk_418 = this->unk_28[5]; - pSVar5->func_0203a7f0(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s16*)param_3, 0); + pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s16*)param_3, 0); if (func_ov000_020d7f18(data_ov000_020eec9c, 0x19) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x18) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x34) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x35) == 0 && @@ -582,7 +570,7 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { pSVar1 = this->func_02037178(param_2); if (pSVar1 != NULL) { - pSVar1->func_0203af1c(); + pSVar1->vfunc_58(); } } diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index 16cb9de9..3c206b20 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -6,7 +6,7 @@ #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02038c34(unk32 param_2) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_34(unk32 param_2) { s16 iVar1; unk32 iVar2; unk32 iVar3; @@ -27,7 +27,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02038c34(unk32 param_2) { return func_01ff9b4c(iVar2 + iVar3 / 2, uVar4); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02038ed0(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_30(void) { if (this->unk_15C > 0) { this->func_0203e090(); } else { @@ -36,13 +36,13 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02038ed0(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039228(unk32* param_2, unk32* param_3) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_08(unk32* param_2, unk32* param_3) { this->unk_15C = 10; this->unk_152 = 1; this->func_0203e2ac(param_3); } -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_020393d0(unk32 param_2) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_68(unk32 param_2) { switch (param_2) { case 0: break; @@ -65,13 +65,13 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_020393d0(unk32 param_2) { return ((this->unk_18 << 3) - this->func_020337d8(param_2)) / 2; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_020394d8(unk32* param_2, unk32* param_3) { - this->func_0203bdcc(param_2, param_3); +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_70(unk32* param_2, unk32* param_3) { + this->vfunc_6C(param_2, param_3); *param_2 += this->unk_158; *param_3 += this->unk_15A; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::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/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index 1519e764..96616221 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -13,7 +13,7 @@ THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a3c(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a5c(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_2C(void) { if (data_027e0618[0x101] != 0) { if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { return; @@ -88,7 +88,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a5c(void) { } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ccc(unk32 param_2) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_3C(unk32 param_2) { if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { if (this->unk_124->unk_29 != 3) { if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { @@ -101,14 +101,14 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ccc(unk32 param_2) { } } - this->func_02039d74(0, 0); + this->vfunc_40(0, 0); } } } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039d74(unk32 param_2, unk32 param_3) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 param_3) { UnkStruct_027E0C68_UnkSubClass1_Base* bVar1; s8 cVar2; unk32 iVar4; @@ -133,7 +133,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039d74(unk32 param_2, unk3 local_90 = 0; bVar1 = data_027e0c68.unk_28[this->unk_50]; - this->func_0203bdcc(&local_8c, &local_90); + this->vfunc_6C(&local_8c, &local_90); this->func_0203a188(local_8c + param_2, local_90 + param_3); this->func_0203e1b0(param_2 + local_8c + (this->unk_158 - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_15A - (this->unk_18 << 3) / 2), 0); @@ -214,7 +214,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039d74(unk32 param_2, unk3 } // non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a328(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_48(void) { if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { this->func_02038b40(); } @@ -223,7 +223,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a328(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3fc(s32 touchLastX, s32 touchLastY) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_44(s32 touchLastX, s32 touchLastY) { unk32 iVar2; unk32 iVar5; unk32 iStack_14; @@ -236,7 +236,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3fc(s32 touchLastX, s32 iStack_14 = 0; iStack_18 = 0; - this->func_0203bdcc(&iStack_14, &iStack_18); + this->vfunc_6C(&iStack_14, &iStack_18); iVar5 = touchLastX - iStack_14; iVar2 = touchLastY - iStack_18; @@ -317,7 +317,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3fc(s32 touchLastX, s32 } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { bool bVar5; bool bVar2; int iVar4; @@ -364,7 +364,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a7f0(EntryINF1* param_2, } // non-matching (can't get the switch decomp...) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a988(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { short sVar1; int iVar2; u16* puVar3; @@ -556,11 +556,11 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a988(void) { this->unk_1F0.unk_64 = 0; this->unk_1F0.func_020352d8(); - this->func_02039578(0, 0, 0, 0); + this->vfunc_0C(0, 0, 0, 0); // (**(code **)(*(int *)param_1 + 0x10))(0); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203aea8(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_5C(void) { if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { this->unk_168.unk_64 = this->unk_168.unk_7C; this->unk_168.func_020352d8(); @@ -572,7 +572,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203aea8(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203af1c(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_58(void) { bool bVar1; unk8* puVar2; int iVar3; @@ -619,7 +619,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203af1c(void) { } // non-matching (regalloc) -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { u16 sVar1; u32 uVar4; s32 unaff_r4; @@ -657,7 +657,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b264(UnkStruct_0203b264 } // non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { int iVar1; u16* psVar3; @@ -690,7 +690,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b310(unk8 param_2, UnkS } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b410(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { unk16 sVar1; unk16 uVar2; unk32 iVar3; @@ -771,7 +771,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b410(func_0203b410_param } // non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b5d0(unk32 param_2) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_64(unk32 param_2) { unk32 uVar2; if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { @@ -800,11 +800,11 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b5d0(unk32 param_2) { } // switch decomp issue -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b814(UNK_TYPE) { +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_20(UNK_TYPE) { // TODO } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203bdcc(unk32* param_2, unk32* param_3) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_6C(unk32* param_2, unk32* param_3) { this->func_0203947c(); *param_2 += this->unk_56E; *param_3 += this->unk_570; @@ -819,6 +819,6 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub1::~UnkStruct_027E0C68_UnkSubClass1_Sub1( this->func_02038b1c(); } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c350(void) { +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_38(void) { return true; } diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp index 53a37f9a..90fc7dd3 100644 --- a/src/Main/Message/func_0203c8a8.cpp +++ b/src/Main/Message/func_0203c8a8.cpp @@ -7,7 +7,7 @@ #include "Item/ItemManager.hpp" // non-matching -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203dcb4(unk32 param_2, unk32 param_3) { +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_14(unk32 param_2, unk32 param_3) { unk32 uVar1; unk32 local_c; unk32 local_10; @@ -29,7 +29,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e060(u8 param_2, u8 para this->func_020331c4(param_2, -1); } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e0c8(void) { +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_28(void) { if (this->unk_122 != 0) { this->func_0203e0f8(); this->func_0203dc10(0);