diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 8a7c227b..3fac0e60 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1647,7 +1647,7 @@ func_02032e44 kind:function(arm,size=0x1c) addr:0x2032e44 func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e60 _ZN31UnkSubClass1_UnkownClass2_Base1C2Ev kind:function(arm,size=0x48) addr:0x2032e7c _ZN31UnkSubClass1_UnkownClass2_Base1C1Ev kind:function(arm,size=0x48) addr:0x2032ec4 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_1C2Ev kind:function(thumb,size=0x78) addr:0x2032f0c +_ZN12MsgProc_BaseC2Ev kind:function(thumb,size=0x78) addr:0x2032f0c func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f84 func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f88 func_02032f94 kind:function(thumb,size=0x4) addr:0x2032f94 @@ -1872,21 +1872,21 @@ func_02038888 kind:function(arm,size=0xc8) addr:0x2038888 func_02038950 kind:function(arm,size=0x130) addr:0x2038950 func_02038a80 kind:function(arm,size=0x1c) addr:0x2038a80 func_02038a9c kind:function(thumb,size=0x4) addr:0x2038a9c -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseC2Eisi kind:function(thumb,size=0x5c) addr:0x2038aa0 -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD1Ev kind:function(thumb,size=0xc) addr:0x2038afc -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD0Ev kind:function(thumb,size=0x14) addr:0x2038b08 -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD2Ev kind:function(thumb,size=0xc) addr:0x2038b1c +_ZN12MsgProc_MainC2Eisi kind:function(thumb,size=0x5c) addr:0x2038aa0 +_ZN12MsgProc_MainD1Ev kind:function(thumb,size=0xc) addr:0x2038afc +_ZN12MsgProc_MainD0Ev kind:function(thumb,size=0x14) addr:0x2038b08 +_ZN12MsgProc_MainD2Ev kind:function(thumb,size=0xc) addr:0x2038b1c func_02038b28 kind:function(thumb,size=0xc) addr:0x2038b28 func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Base13func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038b40 +_ZN12MsgProc_Main13func_02038b40Ev 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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038c34 +_ZN13MsgProc_Type18vfunc_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038ed0 +_ZN13MsgProc_Type18vfunc_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,71 +1894,71 @@ 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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 +_ZN13MsgProc_Type18vfunc_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_68Ei kind:function(arm,size=0x70) addr:0x20393d0 +_ZN13MsgProc_Type18vfunc_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 +_ZN13MsgProc_Type18vfunc_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039578 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C2Eisi kind:function(thumb,size=0x244) addr:0x20395b4 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Eisi kind:function(thumb,size=0x244) addr:0x20397f8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a5c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039ca8Ev kind:function(arm,size=0x24) addr:0x2039ca8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039ccc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d74 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a188Eiii kind:function(arm,size=0x138) addr:0x203a188 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a2c0Ev kind:function(arm,size=0x4c) addr:0x203a2c0 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a30cEv kind:function(arm,size=0x1c) addr:0x203a30c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a328 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a35cEv kind:function(arm,size=0x84) addr:0x203a35c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a3e0Ev kind:function(arm,size=0x1c) addr:0x203a3e0 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3fc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a6d0Eii kind:function(arm,size=0x120) addr:0x203a6d0 -_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b0bcEv kind:function(arm,size=0x30) addr:0x203b0bc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b0ecEi kind:function(arm,size=0x178) addr:0x203b0ec -_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b764Ev kind:function(arm,size=0xb0) addr:0x203b764 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b814 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203bd8cEt kind:function(arm,size=0x40) addr:0x203bd8c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203be08Ev kind:function(arm,size=0x5c) addr:0x203be08 +_ZN13MsgProc_Type18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039578 +_ZN13MsgProc_Type1C2Eisi kind:function(thumb,size=0x244) addr:0x20395b4 +_ZN13MsgProc_Type1C1Eisi kind:function(thumb,size=0x244) addr:0x20397f8 +_ZN13MsgProc_Type113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c +_ZN13MsgProc_Type18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a5c +_ZN13MsgProc_Type113func_02039ca8Ev kind:function(arm,size=0x24) addr:0x2039ca8 +_ZN13MsgProc_Type18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039ccc +_ZN13MsgProc_Type18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d74 +_ZN13MsgProc_Type113func_0203a188Eiii kind:function(arm,size=0x138) addr:0x203a188 +_ZN13MsgProc_Type113func_0203a2c0Ev kind:function(arm,size=0x4c) addr:0x203a2c0 +_ZN13MsgProc_Type113func_0203a30cEv kind:function(arm,size=0x1c) addr:0x203a30c +_ZN13MsgProc_Type18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a328 +_ZN13MsgProc_Type113func_0203a35cEv kind:function(arm,size=0x84) addr:0x203a35c +_ZN13MsgProc_Type113func_0203a3e0Ev kind:function(arm,size=0x1c) addr:0x203a3e0 +_ZN13MsgProc_Type18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3fc +_ZN13MsgProc_Type113func_0203a6d0Eii kind:function(arm,size=0x120) addr:0x203a6d0 +_ZN13MsgProc_Type18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7f0 +_ZN13MsgProc_Type18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a988 +_ZN13MsgProc_Type18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203aea8 +_ZN13MsgProc_Type18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203af1c +_ZN13MsgProc_Type113func_0203b0bcEv kind:function(arm,size=0x30) addr:0x203b0bc +_ZN13MsgProc_Type113func_0203b0ecEi kind:function(arm,size=0x178) addr:0x203b0ec +_ZN13MsgProc_Type18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 +_ZN13MsgProc_Type18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 +_ZN13MsgProc_Type18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b410 +_ZN13MsgProc_Type18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b5d0 +_ZN13MsgProc_Type113func_0203b764Ev kind:function(arm,size=0xb0) addr:0x203b764 +_ZN13MsgProc_Type18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b814 +_ZN13MsgProc_Type113func_0203bd8cEt kind:function(arm,size=0x40) addr:0x203bd8c +_ZN13MsgProc_Type18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc +_ZN13MsgProc_Type113func_0203be08Ev kind:function(arm,size=0x5c) addr:0x203be08 func_0203be64 kind:function(arm,size=0x220) addr:0x203be64 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c084Ev kind:function(arm,size=0xb8) addr:0x203c084 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c13cEv kind:function(arm,size=0x64) addr:0x203c13c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c1a0Ev kind:function(arm,size=0xbc) addr:0x203c1a0 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c25cEPS_ kind:function(arm,size=0x6c) addr:0x203c25c -_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_Sub3C1Eisi kind:function(thumb,size=0x44) addr:0x203c358 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub313func_0203c39cEii kind:function(thumb,size=0x78) addr:0x203c39c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub38vfunc_3CEi kind:function(arm,size=0x4c) addr:0x203c414 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub38vfunc_40Eii kind:function(arm,size=0x4c) addr:0x203c460 +_ZN13MsgProc_Type113func_0203c084Ev kind:function(arm,size=0xb8) addr:0x203c084 +_ZN13MsgProc_Type113func_0203c13cEv kind:function(arm,size=0x64) addr:0x203c13c +_ZN13MsgProc_Type113func_0203c1a0Ev kind:function(arm,size=0xbc) addr:0x203c1a0 +_ZN13MsgProc_Type113func_0203c25cEPS_ kind:function(arm,size=0x6c) addr:0x203c25c +_ZN13MsgProc_Type1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 +_ZN13MsgProc_Type1D2Ev kind:function(arm,size=0x40) addr:0x203c310 +_ZN13MsgProc_Type18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c350 +_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 func_0203c4ac kind:function(arm,size=0x118) addr:0x203c4ac -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub38vfunc_14Eii kind:function(arm,size=0x18) addr:0x203c5c4 +_ZN13MsgProc_Type28vfunc_14Eii kind:function(arm,size=0x18) addr:0x203c5c4 func_0203c5dc kind:function(arm,size=0x120) addr:0x203c5dc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3D0Ev kind:function(arm,size=0x1c) addr:0x203c6fc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3D2Ev kind:function(arm,size=0x14) addr:0x203c718 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2C1Eisi kind:function(arm,size=0x110) addr:0x203c72c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub213func_0203c83cEv kind:function(arm,size=0x4) addr:0x203c83c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2D2Ev kind:function(arm,size=0x30) addr:0x203c840 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2D0Ev 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 @@ -2024,22 +2024,22 @@ func_0203d848 kind:function(arm,size=0x8c) addr:0x203d848 func_0203d8d4 kind:function(arm,size=0x8c) addr:0x203d8d4 func_0203d960 kind:function(arm,size=0xc0) addr:0x203d960 func_0203da20 kind:function(arm,size=0xc0) addr:0x203da20 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0C2Eiii kind:function(thumb,size=0x98) addr:0x203dae0 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0D1Ev kind:function(thumb,size=0x30) addr:0x203db78 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0D0Ev kind:function(thumb,size=0x38) addr:0x203dba8 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0D2Ev kind:function(thumb,size=0x30) addr:0x203dbe0 +_ZN13MsgProc_Base2C2Eiii kind:function(thumb,size=0x98) addr:0x203dae0 +_ZN13MsgProc_Base2D1Ev kind:function(thumb,size=0x30) addr:0x203db78 +_ZN13MsgProc_Base2D0Ev kind:function(thumb,size=0x38) addr:0x203dba8 +_ZN13MsgProc_Base2D2Ev 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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dcb4 +_ZN13MsgProc_Type18vfunc_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Base13func_0203de14Ei kind:function(arm,size=0x10) addr:0x203de14 +_ZN12MsgProc_Main13func_0203de14Ei 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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 +_ZN13MsgProc_Type113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 func_0203e090 kind:function(arm,size=0x38) addr:0x203e090 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e0c8 +_ZN13MsgProc_Type18vfunc_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 764f42f0..124be2c6 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1647,7 +1647,7 @@ func_02032e44 kind:function(arm,size=0x1c) addr:0x2032e40 func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e5c func_02032e7c kind:function(arm,size=0x48) addr:0x2032e78 func_02032ec4 kind:function(arm,size=0x48) addr:0x2032ec0 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_1C2Ev kind:function(thumb,size=0x78) addr:0x2032f08 +_ZN12MsgProc_BaseC2Ev kind:function(thumb,size=0x78) addr:0x2032f08 func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f80 func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f84 func_02032f94 kind:function(thumb,size=0x4) addr:0x2032f90 @@ -1872,21 +1872,21 @@ func_02038888 kind:function(arm,size=0xc8) addr:0x2038844 func_02038950 kind:function(arm,size=0x130) addr:0x203890c func_02038a80 kind:function(arm,size=0x1c) addr:0x2038a3c func_02038a9c kind:function(thumb,size=0x4) addr:0x2038a58 -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseC1Eic kind:function(thumb,size=0x5c) addr:0x2038a5c +_ZN12MsgProc_MainC1Eic kind:function(thumb,size=0x5c) addr:0x2038a5c func_02038afc kind:function(thumb,size=0xc) addr:0x2038ab8 func_02038b08 kind:function(thumb,size=0x14) addr:0x2038ac4 func_02038b1c kind:function(thumb,size=0xc) addr:0x2038ad8 func_02038b28 kind:function(thumb,size=0xc) addr:0x2038ae4 func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0 -_Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1_Sub1 kind:function(arm,size=0x34) addr:0x2038afc +_Z13func_02038b40P31MsgProc_Type1 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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0 +_ZN13MsgProc_Type18vfunc_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038e8c +_ZN13MsgProc_Type18vfunc_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,59 +1894,59 @@ 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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 +_ZN13MsgProc_Type18vfunc_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_68Ei kind:function(arm,size=0x70) addr:0x203938c +_ZN13MsgProc_Type18vfunc_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 +_ZN13MsgProc_Type18vfunc_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039534 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C2Ev kind:function(thumb,size=0x244) addr:0x2039570 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397b4 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a18 +_ZN13MsgProc_Type18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039534 +_ZN13MsgProc_Type1C2Ev kind:function(thumb,size=0x244) addr:0x2039570 +_ZN13MsgProc_Type1C1Ev kind:function(thumb,size=0x244) addr:0x20397b4 +_ZN13MsgProc_Type113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 +_ZN13MsgProc_Type18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a18 func_02039ca8 kind:function(arm,size=0x24) addr:0x2039c64 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039c88 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d30 +_ZN13MsgProc_Type18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039c88 +_ZN13MsgProc_Type18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d30 func_0203a188 kind:function(arm,size=0x138) addr:0x203a144 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a27c func_0203a30c kind:function(arm,size=0x1c) addr:0x203a2c8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a2e4 +_ZN13MsgProc_Type18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a2e4 func_0203a35c kind:function(arm,size=0x84) addr:0x203a318 func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a39c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3b8 +_ZN13MsgProc_Type18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3b8 func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a68c -_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 +_ZN13MsgProc_Type18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7ac +_ZN13MsgProc_Type18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a944 +_ZN13MsgProc_Type18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203ae64 +_ZN13MsgProc_Type18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203aed8 func_0203b0bc kind:function(arm,size=0x30) addr:0x203b078 func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0a8 -_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 +_ZN13MsgProc_Type18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 +_ZN13MsgProc_Type18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc +_ZN13MsgProc_Type18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b3cc +_ZN13MsgProc_Type18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b58c func_0203b764 kind:function(arm,size=0xb0) addr:0x203b720 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b7d0 +_ZN13MsgProc_Type18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b7d0 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd48 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88 +_ZN13MsgProc_Type18vfunc_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 -_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 +_ZN13MsgProc_Type1D0Ev kind:function(arm,size=0x48) addr:0x203c284 +_ZN13MsgProc_Type1D2Ev kind:function(arm,size=0x40) addr:0x203c2cc +_ZN13MsgProc_Type18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c30c +_ZN13MsgProc_Type2C1Ev kind:function(thumb,size=0x44) addr:0x203c314 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c358 func_0203c414 kind:function(arm,size=0x4c) addr:0x203c3d0 func_0203c460 kind:function(arm,size=0x4c) addr:0x203c41c @@ -1955,7 +1955,7 @@ func_0203c5c4 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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2C1Ev kind:function(arm,size=0x110) addr:0x203c6e8 +_ZN13MsgProc_Type3C1Ev kind:function(arm,size=0x110) addr:0x203c6e8 func_0203c83c kind:function(arm,size=0x4) addr:0x203c7f8 func_0203c840 kind:function(arm,size=0x30) addr:0x203c7fc func_0203c870 kind:function(arm,size=0x38) addr:0x203c82c @@ -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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dc70 +_ZN13MsgProc_Type18vfunc_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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Base13func_0203de14Ei kind:function(arm,size=0x10) addr:0x203ddd0 +_ZN12MsgProc_Main13func_0203de14Ei 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 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c +_ZN13MsgProc_Type113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c func_0203e090 kind:function(arm,size=0x38) addr:0x203e04c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e084 +_ZN13MsgProc_Type18vfunc_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/DTCM/UnkStruct_027e103c.hpp b/include/DTCM/UnkStruct_027e103c.hpp index 6da1a887..5a8199ed 100644 --- a/include/DTCM/UnkStruct_027e103c.hpp +++ b/include/DTCM/UnkStruct_027e103c.hpp @@ -36,7 +36,7 @@ struct UnkStruct_027e103c { void func_ov000_020cfb58(u8*); unk32 func_ov000_020cf8fc(unk32); - //! TODO: find out if the type is always `UnkStruct_027E0C68_UnkSubClass1_Sub1*` + //! TODO: find out if the type is always `MsgProc_Type1*` void func_ov000_020cfb20(void*); }; diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 0ef665b9..db89656b 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -24,7 +24,7 @@ public: /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass2_Base1(); /* 0x08 */ virtual void vfunc_08(u32 param_1); - /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1_Sub1* param_2); + /* 0x0C */ virtual void vfunc_0C(MsgProc_Type1* param_2); /* 0x10 */ virtual void vfunc_10(void); /* 0x14 */ virtual UNK_TYPE vfunc_14(void); /* 0x18 */ virtual UNK_TYPE vfunc_18(void); @@ -66,7 +66,7 @@ public: UnkStruct_027E0C68_UnkSubClass2(); /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass2() override; /* 0x08 */ virtual void vfunc_08(u32 param_1) override; - /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1_Sub1* param_2) override; + /* 0x0C */ virtual void vfunc_0C(MsgProc_Type1* param_2) override; /* 0x10 */ virtual void vfunc_10(void) override; /* 0x14 */ virtual UNK_TYPE vfunc_14(void) override; /* 0x18 */ virtual UNK_TYPE vfunc_18(void) override; @@ -87,7 +87,7 @@ public: /* 0x04 */ u8 unk_04; /* 0x05 */ u8 unk_05; /* 0x06 */ unk16 unk_06; - /* 0x08 */ UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_08; + /* 0x08 */ MsgProc_Type1* unk_08; /* 0x0C */ u8 unk_0C; /* 0x0C */ u8 unk_0D; /* 0x0C */ unk16 unk_0E; @@ -96,8 +96,8 @@ public: /* 0x14 */ BMGGroups* pGroups; /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18[2]; /* 0x20 */ UnkStruct_027E0C68_UnkSubClass2_Base1* unk_20[2]; - /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1_Base* unk_28[6]; - /* 0x40 */ UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_40[2]; // is array size 6? + /* 0x28 */ MsgProc_Main* unk_28[6]; + /* 0x40 */ MsgProc_Type1* unk_40[2]; // is array size 6? /* 0x48 */ static void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3); @@ -105,8 +105,8 @@ public: void func_0203665c(void); UnkStruct_027E0C68(); ~UnkStruct_027E0C68(); - UnkStruct_027E0C68_UnkSubClass1_Sub1* func_020366c4(void); - UnkStruct_027E0C68_UnkSubClass1_Sub1* func_02036700(void); + MsgProc_Type1* func_020366c4(void); + MsgProc_Type1* func_02036700(void); UnkStruct_027E0C68_UnkSubClass2* func_0203673c(void); bool func_02036770(u32 param_2); unk32 func_02036798(void); @@ -125,13 +125,13 @@ public: bool func_02036d30(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2); bool func_02036d4c(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2); void func_02036d6c(void); - UnkStruct_027E0C68_UnkSubClass1_Base* func_02036da8(u32 param_2, s16* param_3); + MsgProc_Main* func_02036da8(u32 param_2, s16* param_3); void func_02036edc(u32 param_2, u8 param_3); - UnkStruct_027E0C68_UnkSubClass1_Sub1* func_02036f68(u32 param_2, u8* param_3); + MsgProc_Type1* func_02036f68(u32 param_2, u8* param_3); UnkStruct_027E0C68_UnkSubClass2* func_020370d0(unk32 param_2, unk32 param_3); UnkStruct_027E0C68_UnkSubClass2* func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); void func_02037158(UnkSubClass1_02256FF8* param_2); - UnkStruct_027E0C68_UnkSubClass1_Base* func_02037178(UnkSubClass1_02256FF8* param_2); + MsgProc_Main* func_02037178(UnkSubClass1_02256FF8* param_2); }; extern UnkStruct_027E0C68 data_027e0c68; diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index a40d5982..3a442151 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -119,14 +119,14 @@ public: /* 0x08 */ }; -typedef bool (*UnknownCallback)(class UnkStruct_027E0C68_UnkSubClass1_Sub1*); +typedef bool (*UnknownCallback)(class MsgProc_Type1*); class UnkSubClass1_UnkownClass2 : public UnkSubClass1_UnkownClass2_Base1 { public: /* 0x14 */ unk32 unk_14; /* 0x18 */ unk32 unk_18; /* 0x1C */ UnknownCallback unk_1C; - /* 0x20 */ class UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_20; + /* 0x20 */ class MsgProc_Type1* unk_20; /* 0x24 */ unk32 unk_24; /* 0x2C */ @@ -137,7 +137,7 @@ public: class UnkSubClass1_unk_410 { public: - /* 0x00 */ struct UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_00; + /* 0x00 */ struct MsgProc_Type1* unk_00; /* 0x04 */ void func_0203ec34(void); @@ -149,7 +149,7 @@ public: // same as UnkSubClass1_unk_410? class UnkSubClass1_unk_424 { public: - /* 0x00 */ struct UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_00; + /* 0x00 */ struct MsgProc_Type1* unk_00; /* 0x04 */ void func_0203ee80(unk32); @@ -161,7 +161,7 @@ public: class UnkSubClass1_unk_124 { public: - /* 0x00 */ void* unk_00; // pointer to UnkStruct_027E0C68_UnkSubClass1_Base (well, the first members of the base class) + /* 0x00 */ void* unk_00; // pointer to MsgProc_Main (well, the first members of the base class) /* 0x04 */ unk32 unk_04; /* 0x08 */ unk32 unk_08; /* 0x0C */ unk32 unk_0C; @@ -211,7 +211,7 @@ public: }; // astruct_8? -class UnkStruct_027E0C68_UnkSubClass1_Base_1 : public SysObject { +class MsgProc_Base : public SysObject { public: /* 0x000 (vtable) */ /* 0x004 */ unk32* unk_04; @@ -243,8 +243,8 @@ public: /* 0x051 */ unk8 unk_51; /* 0x052 */ - UnkStruct_027E0C68_UnkSubClass1_Base_1(); - /* 0x00*/ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_1(); + MsgProc_Base(); + /* 0x00*/ virtual ~MsgProc_Base(); /* 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? @@ -277,14 +277,14 @@ public: unk32 func_02032fa4(void); }; -class UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114 : public SysObject { +class MsgProc_Base2_unk_114 : public SysObject { public: /* 0x00 (vtable) */ /* 0x04 */ unk32* unk_04; /* 0x08 */ - UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114(); - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114() override; + MsgProc_Base2_unk_114(); + /* 0x00 */ virtual ~MsgProc_Base2_unk_114() override; /* 0x04 */ virtual UNK_TYPE vfunc_04(UNK_TYPE); /* 0x08 */ virtual unk32 vfunc_08(void*, s16); /* 0x0C */ @@ -293,7 +293,7 @@ public: }; // astruct_7 -class UnkStruct_027E0C68_UnkSubClass1_Base_0 : public UnkStruct_027E0C68_UnkSubClass1_Base_1 { +class MsgProc_Base2 : public MsgProc_Base { public: /* 0x052 */ unk16 unk_52; /* 0x054 */ unk16 unk_54; @@ -349,7 +349,7 @@ public: /* 0x108 */ unk8 unk_10B; /* 0x10C */ unk32 unk_10C; /* 0x110 */ unk32 unk_110; - /* 0x118 */ UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114* unk_114; + /* 0x118 */ MsgProc_Base2_unk_114* unk_114; /* 0x118 */ s32 unk_118; /* 0x11C */ unk16 unk_11C; /* 0x11E */ unk8 unk_11E; @@ -360,9 +360,9 @@ public: /* 0x123 */ u8 unk_123; /* 0x124 */ - UnkStruct_027E0C68_UnkSubClass1_Base_0(unk32 param_2, unk32 param_3, unk32 param_4); + MsgProc_Base2(unk32 param_2, unk32 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_0(); + /* 0x00 */ virtual ~MsgProc_Base2(); /* 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? @@ -394,7 +394,7 @@ public: }; // astruct_6 -class UnkStruct_027E0C68_UnkSubClass1_Base : public UnkStruct_027E0C68_UnkSubClass1_Base_0 { +class MsgProc_Main : public MsgProc_Base2 { public: /* 0x124 */ UnkSubClass1_unk_124* unk_124; /* 0x128 */ UnkSubClass1_UnkownClass2 unk_128; @@ -409,9 +409,9 @@ public: /* 0x160 */ unk16 unk_162; /* 0x164 */ - UnkStruct_027E0C68_UnkSubClass1_Base(unk32 param_2, unk16 param_3, unk32 param_4); + MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base(); + /* 0x00 */ virtual ~MsgProc_Main(); /* 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? @@ -491,9 +491,9 @@ struct UnknownMsgChoiceStruct { }; // astruct_2 -class UnkStruct_027E0C68_UnkSubClass1_Sub1 : public UnkStruct_027E0C68_UnkSubClass1_Base { +class MsgProc_Type1 : public MsgProc_Main { public: - /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_164; + /* 0x164 */ MsgProc_Type1* unk_164; /* 0x168 */ UnkSubClass1_UnkownClass1 unk_168; /* 0x1F0 */ UnkSubClass1_UnkownClass1 unk_1F0; /* 0x278 */ UnkSubClass1_UnkownClass1 unk_278; @@ -501,7 +501,7 @@ public: /* 0x388 */ UnkSubClass1_UnkownClass1 unk_388; /* 0x410 */ UnkSubClass1_unk_410 unk_410; /* 0x414 */ unk32 unk_414; - /* 0x418 */ UnkStruct_027E0C68_UnkSubClass1_Base* unk_418; + /* 0x418 */ MsgProc_Main* unk_418; /* 0x41C */ unk16 unk_41C; /* 0x41C */ unk16 unk_41E; /* 0x420 */ unk16 unk_420; @@ -557,10 +557,10 @@ public: /* 0x588 */ UnkSubClass1_unk_124 unk_588; /* 0x5B4 */ - UnkStruct_027E0C68_UnkSubClass1_Sub1(); - UnkStruct_027E0C68_UnkSubClass1_Sub1(unk32 param_2, unk16 param_3, unk32 param_4); + MsgProc_Type1(); + MsgProc_Type1(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub1() override; + /* 0x00 */ virtual ~MsgProc_Type1() 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? @@ -590,7 +590,7 @@ public: /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; /* 0x74 */ - static bool func_0203c25c(class UnkStruct_027E0C68_UnkSubClass1_Sub1* param_1); + static bool func_0203c25c(class MsgProc_Type1* param_1); void func_0203e060(u8 param_2, u8 param_3); void func_02039a3c(void); @@ -617,7 +617,7 @@ public: unk32 func_02038cb8(unk32 param_2); }; -class UnkStruct_027E0C68_UnkSubClass1_Sub2 : public UnkStruct_027E0C68_UnkSubClass1_Base { +class MsgProc_Type3 : public MsgProc_Main { public: /* 0x164 */ unk16 unk_164; /* 0x166 */ unk16 unk_166; @@ -633,10 +633,10 @@ public: /* 0x180 */ UnkClass_func_ov000_020d0644 unk_180[4]; /* 0x1C0 */ - UnkStruct_027E0C68_UnkSubClass1_Sub2(); - UnkStruct_027E0C68_UnkSubClass1_Sub2(unk32 param_2, unk16 param_3, unk32 param_4); + MsgProc_Type3(); + MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub2(); + /* 0x00 */ virtual ~MsgProc_Type3(); /* 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? @@ -669,7 +669,7 @@ public: static void func_0203c83c(void); }; -class UnkStruct_027E0C68_UnkSubClass1_Sub3 : public UnkStruct_027E0C68_UnkSubClass1_Base { +class MsgProc_Type2 : public MsgProc_Main { public: /* 0x164 */ unk16 unk_164; /* 0x164 */ unk16 unk_166; @@ -679,10 +679,10 @@ public: /* 0x164 */ unk16 unk_16E; /* 0x170 */ - UnkStruct_027E0C68_UnkSubClass1_Sub3(); - UnkStruct_027E0C68_UnkSubClass1_Sub3(unk32 param_2, unk16 param_3, unk32 param_4); + MsgProc_Type2(); + MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub3(); + /* 0x00 */ virtual ~MsgProc_Type2(); /* 0x08 */ /* func_02039228 */ 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? @@ -722,7 +722,7 @@ public: extern "C" u32 func_01ff9b4c(unk32, unk32); extern "C" unk32 func_0203c084(void); -extern "C" void func_ov018_02169634(UnkStruct_027E0C68_UnkSubClass1_Sub1*); +extern "C" void func_ov018_02169634(MsgProc_Type1*); extern "C" unk32 func_ov000_02079e04(void); extern "C" unk32 func_02016fcc(unk32); extern "C" void func_02032304(unk32*, char*, unk32, unk32, unk32); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 6a9577ac..9e022c8a 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -4,7 +4,7 @@ extern ARM unk32 func_ov000_020d7f18(u32*, unk32); extern ARM unk32 func_02037628(u8*); -extern ARM void func_0203dc74(UnkStruct_027E0C68_UnkSubClass1_Base*, unk32, unk32); +extern ARM void func_0203dc74(MsgProc_Main*, unk32, unk32); extern u32** data_027e0ce0[]; extern u32 data_02056924[]; @@ -75,14 +75,14 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 switch (data_02056924[i + 1]) { case 0: if (*data_027e0618 != 2) { - this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Sub1(); + this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type1(); func_0203dc74(this->unk_28[i], 0xE0, 0x40); this->unk_28[i]->unk_2C = data_02068e6c; this->unk_28[i]->unk_50 = i != 0; } break; case 1: - this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Sub2(); + this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type3(); func_0203dc74(this->unk_28[i], 0x50, 0x60); this->unk_28[i]->unk_2C = data_02068e6c; break; @@ -91,7 +91,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 break; case 3: if (func_0202ab48() == 0) { - this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Sub3(); + this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type2(); func_0203dc74(this->unk_28[i], 0xC0, 0x20); this->unk_28[i]->unk_2C = data_02068e8c; } else { @@ -130,21 +130,21 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) { } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_020366c4(void) { +ARM MsgProc_Type1* UnkStruct_027E0C68::func_020366c4(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { - return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; + return (MsgProc_Type1*)this->unk_28[2]; } - return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; + return (MsgProc_Type1*)this->unk_28[0]; } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036700(void) { +ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036700(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { - return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; + return (MsgProc_Type1*)this->unk_28[0]; } - return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; + return (MsgProc_Type1*)this->unk_28[2]; } ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_0203673c(void) { @@ -189,11 +189,11 @@ ARM bool UnkStruct_027E0C68::func_020367dc(int param_2) { } ARM bool UnkStruct_027E0C68::func_020367ec(void) { - return ((UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0])->unk_15C > 0; + return ((MsgProc_Type1*)this->unk_28[0])->unk_15C > 0; } ARM bool UnkStruct_027E0C68::func_02036808(void) { - return ((UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2])->unk_15C > 0; + return ((MsgProc_Type1*)this->unk_28[2])->unk_15C > 0; } ARM bool UnkStruct_027E0C68::func_02036824(void) { @@ -216,7 +216,7 @@ ARM bool UnkStruct_027E0C68::func_02036850(void) { ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_027E0C68_UnkSubClass2* param_2) { if ((param_2->unk_18 & ~0xFFFF) != (0x100 << 0x10)) { - UnkStruct_027E0C68_UnkSubClass1_Sub1* iVar1 = this->func_020366c4(); + MsgProc_Type1* iVar1 = this->func_020366c4(); if (iVar1->unk_15C <= 0) { param_2->vfunc_10(); @@ -237,9 +237,9 @@ ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_027E0C68_UnkSubClass2_Base1 // non-matching ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { - UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_28_0; - UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_28_2; - UnkStruct_027E0C68_UnkSubClass1_Base *pSVar4; + MsgProc_Type1* unk_28_0; + MsgProc_Type1* unk_28_2; + MsgProc_Main *pSVar4; ActorRef actorRef; Actor* pActor; bool iVar1; @@ -252,10 +252,10 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p this->unk_40[1] = this->unk_40[0]; - unk_28_0 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; + unk_28_0 = (MsgProc_Type1*)this->unk_28[0]; if (unk_28_0 != NULL && unk_28_0->unk_15C > 0) { - unk_28_2 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; + unk_28_2 = (MsgProc_Type1*)this->unk_28[2]; if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) { this->unk_40[0] = this->func_020366c4(); @@ -263,7 +263,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p this->unk_40[0] = unk_28_2; } } else { - unk_28_2 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; + unk_28_2 = (MsgProc_Type1*)this->unk_28[2]; if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) { this->unk_40[0] = unk_28_0; @@ -332,7 +332,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p } ARM void UnkStruct_027E0C68::func_02036bbc(void) { - UnkStruct_027E0C68_UnkSubClass1_Base* pSVar3; + MsgProc_Main* pSVar3; bool bVar2; bool bVar4; s32 i; @@ -367,7 +367,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - UnkStruct_027E0C68_UnkSubClass1_Base* pSVar1 = this->unk_28[i]; + MsgProc_Main* pSVar1 = this->unk_28[i]; if (pSVar1 != NULL) { pSVar1->vfunc_3C(param_2); @@ -421,10 +421,10 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { +ARM MsgProc_Main* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { EntryINF1 *pEVar1; EntryINF1 *pEVar2; - UnkStruct_027E0C68_UnkSubClass1_Base *pSVar4; + MsgProc_Main *pSVar4; BMGGroups *pBVar5; bool bVar6; s16 iStack_38; @@ -470,7 +470,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02036da8(u32 // non-matching ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { - UnkStruct_027E0C68_UnkSubClass1_Sub1 *pSVar1; + MsgProc_Type1 *pSVar1; u8 auStack_28[24]; u8 local_13; @@ -493,12 +493,12 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { +ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { EntryINF1 *pEVar1; - UnkStruct_027E0C68_UnkSubClass1_Base *pSVar2; + MsgProc_Main *pSVar2; EntryINF1 *pEVar3; int iVar4; - UnkStruct_027E0C68_UnkSubClass1_Sub1 *pSVar5; + MsgProc_Type1 *pSVar5; pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xffff); @@ -507,15 +507,15 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036f68(u32 } if (param_3[21] != 0) { - pSVar5 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; + pSVar5 = (MsgProc_Type1*)this->unk_28[2]; pSVar2 = this->unk_28[3]; } else { - pSVar5 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; + pSVar5 = (MsgProc_Type1*)this->unk_28[0]; pSVar2 = this->unk_28[1]; } //! TODO: fake? - pSVar5->unk_164 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)pSVar2; + pSVar5->unk_164 = (MsgProc_Type1*)pSVar2; pSVar5->unk_418 = this->unk_28[5]; pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s16*)param_3, 0); @@ -559,7 +559,7 @@ ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370e8(unk32 par } ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { - UnkStruct_027E0C68_UnkSubClass1_Base* pSVar1; + MsgProc_Main* pSVar1; pSVar1 = this->func_02037178(param_2); @@ -568,7 +568,7 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { } } -ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) { +ARM MsgProc_Main* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index 8aed417b..187cde77 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::vfunc_34(unk32 param_2) { +ARM unk32 MsgProc_Type1::vfunc_34(unk32 param_2) { s16 iVar1; unk32 iVar2; unk32 iVar3; @@ -27,7 +27,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_34(unk32 param_2) { return func_01ff9b4c(iVar2 + iVar3 / 2, uVar4); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_30(void) { +ARM void MsgProc_Type1::vfunc_30(void) { if (this->unk_15C > 0) { this->func_0203e090(); } else { @@ -36,13 +36,13 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_30(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_08(unk32* param_2, unk32* param_3) { +ARM void MsgProc_Type1::vfunc_08(unk32* param_2, unk32* param_3) { this->unk_15C = 10; this->unk_150[2] = 1; this->func_0203e2ac(param_3); } -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_68(unk32 param_2) { +ARM unk32 MsgProc_Type1::vfunc_68(unk32 param_2) { switch (param_2) { case 0: break; @@ -65,13 +65,13 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_68(unk32 param_2) { return ((this->unk_18 << 3) - this->func_020337d8(param_2)) / 2; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_70(unk32* param_2, unk32* param_3) { +ARM void MsgProc_Type1::vfunc_70(unk32* param_2, unk32* param_3) { this->vfunc_6C(param_2, param_3); *param_2 += this->unk_158.x; *param_3 += this->unk_158.y; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { +ARM void MsgProc_Type1::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_02032f0c.cpp b/src/Main/Message/func_02032f0c.cpp index 35cfbef0..a9f3c196 100644 --- a/src/Main/Message/func_02032f0c.cpp +++ b/src/Main/Message/func_02032f0c.cpp @@ -23,7 +23,7 @@ ARM UnkSubClass1_UnkownClass2_Base1::UnkSubClass1_UnkownClass2_Base1() { } } -THUMB UnkStruct_027E0C68_UnkSubClass1_Base_1::UnkStruct_027E0C68_UnkSubClass1_Base_1() { +THUMB MsgProc_Base::MsgProc_Base() { this->unk_04 = 0; this->unk_08 = 0; this->unk_0C = NULL; diff --git a/src/Main/Message/func_0203744c.cpp b/src/Main/Message/func_0203744c.cpp index 2bac7b25..ab05bf4b 100644 --- a/src/Main/Message/func_0203744c.cpp +++ b/src/Main/Message/func_0203744c.cpp @@ -43,8 +43,8 @@ ARM UnkSubClass1_UnkownClass2::UnkSubClass1_UnkownClass2() { this->unk_24 = 0; } -THUMB UnkStruct_027E0C68_UnkSubClass1_Base::UnkStruct_027E0C68_UnkSubClass1_Base(unk32 param_2, unk16 param_3, unk32 param_4) - : UnkStruct_027E0C68_UnkSubClass1_Base_0(param_2, param_3, param_4), +THUMB MsgProc_Main::MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4) + : MsgProc_Base2(param_2, param_3, param_4), unk_124(0) { this->func_020387e0(this->unk_150); @@ -57,5 +57,5 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Base::UnkStruct_027E0C68_UnkSubClass1_Base this->unk_11E = param_3; } -THUMB UnkStruct_027E0C68_UnkSubClass1_Base::~UnkStruct_027E0C68_UnkSubClass1_Base() { +THUMB MsgProc_Main::~MsgProc_Main() { } diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index bdb4432a..89c9399a 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -14,8 +14,8 @@ extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void* extern unk16 data_02056a0e[]; extern u8 data_02056a08[]; -THUMB UnkStruct_027E0C68_UnkSubClass1_Sub1::UnkStruct_027E0C68_UnkSubClass1_Sub1(unk32 param_2, unk16 param_3, unk32 param_4) : - UnkStruct_027E0C68_UnkSubClass1_Base(0, 0, param_4), +THUMB MsgProc_Type1::MsgProc_Type1(unk32 param_2, unk16 param_3, unk32 param_4) : + MsgProc_Main(0, 0, param_4), unk_164(NULL) { UnknownMsgChoiceStruct* puVar3; @@ -84,13 +84,13 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Sub1::UnkStruct_027E0C68_UnkSubClass1_Sub1 this->unk_278.func_020351b8(false, false, false, false); } -THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a3c(void) { +THUMB void MsgProc_Type1::func_02039a3c(void) { this->func_02038b28(); this->func_0203dcfc(this->unk_50, 0, 0, 2); } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_2C(void) { +ARM void MsgProc_Type1::vfunc_2C(void) { if (data_027e0618[0x101] != 0) { if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { return; @@ -165,7 +165,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_2C(void) { } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ca8(void) { +ARM void MsgProc_Type1::func_02039ca8(void) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_564); i++) { @@ -174,7 +174,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ca8(void) { } // non-matching -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a2c0(void) { +ARM bool MsgProc_Type1::func_0203a2c0(void) { if ((this->unk_150[1] != 1 && this->unk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { return true; } @@ -182,11 +182,11 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a2c0(void) { return false; } -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a30c(void) { +ARM unk32 MsgProc_Type1::func_0203a30c(void) { return this->unk_574 / this->unk_154->unk_06; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_3C(unk32 param_2) { +ARM void MsgProc_Type1::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) { @@ -206,8 +206,8 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_3C(unk32 param_2) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 param_3) { - UnkStruct_027E0C68_UnkSubClass1_Base* bVar1; +ARM void MsgProc_Type1::vfunc_40(unk32 param_2, unk32 param_3) { + MsgProc_Main* bVar1; s8 cVar2; unk32 iVar4; unk32 iVar6; @@ -311,7 +311,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 par } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4) { +ARM void MsgProc_Type1::func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4) { unk16 sVar1; unk16 sVar2; unk32 iVar3; @@ -355,7 +355,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a188(unk32 param_2, unk3 } // non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_48(void) { +ARM void MsgProc_Type1::vfunc_48(void) { if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { this->func_02038b40(); } @@ -363,12 +363,12 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_48(void) { this->unk_410.func_0203ec34(); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a35c(void) { +ARM void MsgProc_Type1::func_0203a35c(void) { if ((this->unk_57C == 1 || this->unk_150[3] != 0) || (this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { if (this->func_0203a3e0()) { s16 unk_56E = this->unk_56E; s16 unk_570 = this->unk_570; - UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_164 = this->unk_164; + MsgProc_Type1* unk_164 = this->unk_164; unk_164->unk_168.unk_10 = unk_56E; unk_164->unk_168.unk_14 = unk_570; @@ -379,12 +379,12 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a35c(void) { } } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3e0(void) { +ARM bool MsgProc_Type1::func_0203a3e0(void) { return this->unk_164->unk_168.unk_06 > 0; } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_44(s32 touchLastX, s32 touchLastY) { +ARM void MsgProc_Type1::vfunc_44(s32 touchLastX, s32 touchLastY) { unk32 iVar2; unk32 iVar5; unk32 iStack_14; @@ -477,7 +477,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_44(s32 touchLastX, s32 touc } } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a6d0(unk32 param_2, unk32 param_3) { +ARM bool MsgProc_Type1::func_0203a6d0(unk32 param_2, unk32 param_3) { unk32 iVar1; unk32 uVar2; UnkStruct_0203b264* piVar3; @@ -508,7 +508,7 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a6d0(unk32 param_2, unk3 } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { +ARM void MsgProc_Type1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { bool bVar5; bool bVar2; int iVar4; @@ -518,7 +518,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_50(EntryINF1* param_2, u32 iVar6 = param_4[0]; if (data_027e0c54 != 0) { - UnkStruct_027E0C68_UnkSubClass1_Sub1* pVar4 = data_027e0c68.func_02036700(); + MsgProc_Type1* pVar4 = data_027e0c68.func_02036700(); if (pVar4 != NULL && pVar4->unk_15C > 0) { this->func_02038b40(); @@ -526,7 +526,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_50(EntryINF1* param_2, u32 } if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { - UnkStruct_027E0C68_UnkSubClass1_Sub1* pVar4 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)data_027e0c68.unk_28[4]; + MsgProc_Type1* pVar4 = (MsgProc_Type1*)data_027e0c68.unk_28[4]; if (pVar4 != NULL && pVar4->unk_15C > 0) { this->func_02038b40(); @@ -555,7 +555,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_50(EntryINF1* param_2, u32 } // non-matching (can't get the switch decomp...) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { +ARM void MsgProc_Type1::vfunc_54(void) { short sVar1; int iVar2; u16* puVar3; @@ -751,7 +751,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { // (**(code **)(*(int *)param_1 + 0x10))(0); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_5C(void) { +ARM void MsgProc_Type1::vfunc_5C(void) { if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; this->unk_168.func_020352d8(); @@ -763,7 +763,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_5C(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_58(void) { +ARM void MsgProc_Type1::vfunc_58(void) { bool bVar1; s8* puVar2; int iVar3; @@ -777,7 +777,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_58(void) { if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { puVar2 = data_027e103c->func_ov000_020cef9c(); - if ((UnkStruct_027E0C68_UnkSubClass1_Sub1*)(puVar2 + 0x244) == this) { + if ((MsgProc_Type1*)(puVar2 + 0x244) == this) { data_027e103c->func_ov000_020cfb38(); } } @@ -809,12 +809,12 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_58(void) { this->func_02039398(); } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b0bc(void) { +ARM bool MsgProc_Type1::func_0203b0bc(void) { return this->unk_57F != 0 && data_027e077c.mUnk_0 == data_027e077c.mUnk_4; } // non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b0ec(unk32 param_2) { +ARM unk32 MsgProc_Type1::func_0203b0ec(unk32 param_2) { s32 iVar4; u16 *puVar2; u32 uVar3; @@ -878,7 +878,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b0ec(unk32 param_2) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b764(void) { +ARM void MsgProc_Type1::func_0203b764(void) { s32 i = data_027e0c68.unk_00[this->unk_50]; this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); @@ -904,7 +904,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b764(void) { } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203bd8c(u16 param_2) { +ARM void MsgProc_Type1::func_0203bd8c(u16 param_2) { this->unk_576 = param_2; if (this->func_0203b0ec(0) != 0) { @@ -913,7 +913,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203bd8c(u16 param_2) { } // non-matching (regalloc) -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { +ARM unk32 MsgProc_Type1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { u16 sVar1; u32 uVar4; s32 unaff_r4; @@ -951,7 +951,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_18(UnkStruct_0203b264* par } // non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { +ARM unk32 MsgProc_Type1::vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { int iVar1; u16* psVar3; @@ -986,7 +986,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_1C(unk8 param_2, UnkStruct } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { +ARM void MsgProc_Type1::vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { unk16 sVar1; unk16 uVar2; unk32 iVar3; @@ -1067,7 +1067,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_60(func_0203b410_param_2* p } // non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_64(unk32 param_2) { +ARM void MsgProc_Type1::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())) { @@ -1096,17 +1096,17 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_64(unk32 param_2) { } // switch decomp issue -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_20(UNK_TYPE) { +ARM UNK_TYPE MsgProc_Type1::vfunc_20(UNK_TYPE) { // TODO } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_6C(unk32* param_2, unk32* param_3) { +ARM void MsgProc_Type1::vfunc_6C(unk32* param_2, unk32* param_3) { this->func_0203947c(); *param_2 += this->unk_56E; *param_3 += this->unk_570; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203be08(void) { +ARM void MsgProc_Type1::func_0203be08(void) { if (data_027e0d38 != 0) { if (data_027e103c->func_ov000_020cf42c() != 0) { this->unk_534 = this->unk_538; @@ -1121,7 +1121,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203be08(void) { } // non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c084(void) { +ARM unk32 MsgProc_Type1::func_0203c084(void) { unk32 uVar4; bool bVar2; bool bVar1; @@ -1151,7 +1151,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c084(void) { return uVar4; } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c13c(void) { +ARM bool MsgProc_Type1::func_0203c13c(void) { if (this->func_02032fa4() == 0) { data_ov000_020eec9c.func_ov000_020d77e4(6); data_027e103c->func_ov000_020cfb20(this); @@ -1169,7 +1169,7 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c13c(void) { } // non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c1a0(void) { +ARM unk32 MsgProc_Type1::func_0203c1a0(void) { s8* pVar1; u8* iVar3; @@ -1193,7 +1193,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c1a0(void) { return 0; } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c25c(UnkStruct_027E0C68_UnkSubClass1_Sub1* param_1) { +ARM bool MsgProc_Type1::func_0203c25c(MsgProc_Type1* param_1) { if (data_027e1054.unk_00->unk_00->unk_95 != 0) { return false; } @@ -1210,15 +1210,15 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c25c(UnkStruct_027E0C68_ return false; } -ARM UnkStruct_027E0C68_UnkSubClass1_Sub1::~UnkStruct_027E0C68_UnkSubClass1_Sub1() { +ARM MsgProc_Type1::~MsgProc_Type1() { } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_38(void) { +ARM bool MsgProc_Type1::vfunc_38(void) { return true; } -THUMB UnkStruct_027E0C68_UnkSubClass1_Sub3::UnkStruct_027E0C68_UnkSubClass1_Sub3(unk32 param_2, unk16 param_3, unk32 param_4) : - UnkStruct_027E0C68_UnkSubClass1_Base(0, 0, param_4) +THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) : + MsgProc_Main(0, 0, param_4) { this->unk_162 = 4; this->unk_164 = 1; @@ -1230,7 +1230,7 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Sub3::UnkStruct_027E0C68_UnkSubClass1_Sub3 } // non-matching -THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub3::func_0203c39c(unk32 param_2, unk32 param_3) { +THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) { u16 uVar1; unk32 uVar2; s16 uVar3; @@ -1262,7 +1262,7 @@ THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub3::func_0203c39c(unk32 param_2, un } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_3C(unk32 param_2) { +ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) { if (this->unk_15C > 0 && this->unk_122 != 1) { if (this->func_0203de14(param_2) != 0) { this->vfunc_40(0, 0); @@ -1270,7 +1270,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_3C(unk32 param_2) { } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_40(unk32 param_2, unk32 param_3) { +ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) { param_2 += this->unk_166; param_3 += this->unk_168; @@ -1281,16 +1281,16 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_40(unk32 param_2, unk32 par //! TODO: solve vfunc oddities extern "C" bool func_0203dcb4(unk32); // non-matching -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_14(unk32 param_2, unk32 param_3) { +ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) { return func_0203dcb4(param_2 + this->unk_162); } -ARM UnkStruct_027E0C68_UnkSubClass1_Sub3::~UnkStruct_027E0C68_UnkSubClass1_Sub3() { +ARM MsgProc_Type2::~MsgProc_Type2() { } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1_Sub2::UnkStruct_027E0C68_UnkSubClass1_Sub2(unk32 param_2, unk16 param_3, unk32 param_4) : - UnkStruct_027E0C68_UnkSubClass1_Base(1, 0, param_4) +ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) : + MsgProc_Main(1, 0, param_4) { this->unk_162 = 1; this->unk_164 = 0x1A; @@ -1310,8 +1310,8 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub2::UnkStruct_027E0C68_UnkSubClass1_Sub2(u this->unk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub2::func_0203c83c(void) { +ARM void MsgProc_Type3::func_0203c83c(void) { } -ARM UnkStruct_027E0C68_UnkSubClass1_Sub2::~UnkStruct_027E0C68_UnkSubClass1_Sub2() { +ARM MsgProc_Type3::~MsgProc_Type3() { } diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp index 3d044be2..3f88720e 100644 --- a/src/Main/Message/func_0203c8a8.cpp +++ b/src/Main/Message/func_0203c8a8.cpp @@ -11,7 +11,7 @@ extern u32 *data_027e0ce0[]; extern "C" void func_02007938(unk32, unk16*, unk32, unk32, unk32); // non-matching -THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::UnkStruct_027E0C68_UnkSubClass1_Base_0(unk32 param_2, unk32 param_3, unk32 param_4) { +THUMB MsgProc_Base2::MsgProc_Base2(unk32 param_2, unk32 param_3, unk32 param_4) { this->unk_114 = NULL; this->unk_118 = -1; this->unk_11C = 0; @@ -24,13 +24,13 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::UnkStruct_027E0C68_UnkSubClass1_Ba func_02007938(0, &this->unk_54, 0xC0, 1, param_4); if (this->unk_121 == 0) { - this->unk_114 = new(data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114(); + this->unk_114 = new(data_027e0ce0[0], 4) MsgProc_Base2_unk_114(); } else { - this->unk_114 = new(data_027e0ce0[1], 4) UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114(); + this->unk_114 = new(data_027e0ce0[1], 4) MsgProc_Base2_unk_114(); } } -THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::~UnkStruct_027E0C68_UnkSubClass1_Base_0() { +THUMB MsgProc_Base2::~MsgProc_Base2() { if (this->unk_114 != NULL) { delete this->unk_114; this->unk_114 = NULL; @@ -38,7 +38,7 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::~UnkStruct_027E0C68_UnkSubClass1_B } // non-matching -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_14(unk32 param_2, unk32 param_3) { +ARM bool MsgProc_Type1::vfunc_14(unk32 param_2, unk32 param_3) { unk32 uVar1; unk32 local_c; unk32 local_10; @@ -53,14 +53,14 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_14(unk32 param_2, unk32 par return true; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e060(u8 param_2, u8 param_3) { +ARM void MsgProc_Type1::func_0203e060(u8 param_2, u8 param_3) { this->func_0203dc10(1, param_3); this->unk_11E = param_2; this->unk_118 = -1; this->func_020331c4(param_2, -1); } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_28(void) { +ARM bool MsgProc_Type1::vfunc_28(void) { if (this->unk_122 != 0) { this->func_0203e0f8(); this->func_0203dc10(0);