From 1af423e8ae2dd22a8dd77e23d5ae26c69dc343bc Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sun, 26 Jan 2025 14:19:50 +0100 Subject: [PATCH] update symbols --- config/eur/arm9/symbols.txt | 44 +++++++++---------- config/usa/arm9/symbols.txt | 44 +++++++++---------- include/Message/MessageManager.hpp | 7 +-- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 2 +- src/Main/Message/MessageManager.cpp | 23 ++++------ 5 files changed, 58 insertions(+), 62 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 2fdf257f..95119be6 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1818,8 +1818,8 @@ _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x20 _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f68 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x20370d0 _ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370e8 -_ZN18UnkStruct_027E0C6813func_02037158EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x20) addr:0x2037158 -_ZN18UnkStruct_027E0C6813func_02037178EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x38) addr:0x2037178 +_ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037158 +_ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037178 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x20371b0 _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 @@ -1881,7 +1881,7 @@ func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 _Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1 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 -func_02038c34 kind:function(arm,size=0x84) addr:0x2038c34 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02038c34Ei 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 @@ -1907,36 +1907,36 @@ _ZN31UnkStruct_027E0C68_UnkSubClass113func_020394d8EPiS0_ kind:function(arm,size 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_UnkSubClass113func_02039578Eccci kind:function(arm,size=0x3c) addr:0x2039578 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039578 func_020395b4 kind:function(thumb,size=0x244) addr:0x20395b4 func_020397f8 kind:function(thumb,size=0x244) addr:0x20397f8 _ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c -func_02039a5c kind:function(arm,size=0x24c) addr:0x2039a5c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a5c func_02039ca8 kind:function(arm,size=0x24) addr:0x2039ca8 -func_02039ccc kind:function(arm,size=0xa8) addr:0x2039ccc -func_02039d74 kind:function(arm,size=0x414) addr:0x2039d74 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039ccc +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039d74Eii 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_UnkSubClass113func_0203a328Ev 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 -func_0203a3fc kind:function(arm,size=0x2d4) addr:0x203a3fc +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3fc func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a6d0 -func_0203a7f0 kind:function(arm,size=0x198) addr:0x203a7f0 -func_0203a988 kind:function(arm,size=0x520) addr:0x203a988 -func_0203aea8 kind:function(arm,size=0x74) addr:0x203aea8 -func_0203af1c kind:function(arm,size=0x1a0) addr:0x203af1c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7f0 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a988 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203aea8 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203af1cEv 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 -func_0203b264 kind:function(arm,size=0xac) addr:0x203b264 -func_0203b310 kind:function(arm,size=0x100) addr:0x203b310 -func_0203b410 kind:function(arm,size=0x1c0) addr:0x203b410 -func_0203b5d0 kind:function(arm,size=0x194) addr:0x203b5d0 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b410 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b5d0 func_0203b764 kind:function(arm,size=0xb0) addr:0x203b764 -func_0203b814 kind:function(arm,size=0x578) addr:0x203b814 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b814 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd8c -func_0203bdcc kind:function(arm,size=0x3c) addr:0x203bdcc +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203bdccEPiS0_ 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 @@ -1945,7 +1945,7 @@ func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c1a0 func_0203c25c kind:function(arm,size=0x6c) addr:0x203c25c _ZN31UnkStruct_027E0C68_UnkSubClass1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 _ZN31UnkStruct_027E0C68_UnkSubClass1D1Ev kind:function(arm,size=0x40) addr:0x203c310 -func_0203c350 kind:function(arm,size=0x8) addr:0x203c350 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c350 func_0203c358 kind:function(thumb,size=0x44) addr:0x203c358 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c39c func_0203c414 kind:function(arm,size=0x4c) addr:0x203c414 @@ -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 -func_0203dcb4 kind:function(arm,size=0x48) addr:0x203dcb4 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203dcb4Eii 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_UnkSubClass1i 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 -func_0203e060 kind:function(arm,size=0x30) addr:0x203e060 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 func_0203e090 kind:function(arm,size=0x38) addr:0x203e090 -func_0203e0c8 kind:function(arm,size=0x30) addr:0x203e0c8 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e0c8Ev 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 4413339c..f96bbfbb 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1818,8 +1818,8 @@ _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x20 _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f24 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x203708c _ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370a4 -_ZN18UnkStruct_027E0C6813func_02037158EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x20) addr:0x2037114 -_ZN18UnkStruct_027E0C6813func_02037178EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x38) addr:0x2037134 +_ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037114 +_ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037134 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x203716c _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 @@ -1881,7 +1881,7 @@ func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0 _Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1 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 -func_02038c34 kind:function(arm,size=0x84) addr:0x2038bf0 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02038c34Ei 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 @@ -1907,36 +1907,36 @@ _ZN31UnkStruct_027E0C68_UnkSubClass113func_020394d8EPiS0_ kind:function(arm,size 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_UnkSubClass113func_02039578Eccci kind:function(arm,size=0x3c) addr:0x2039534 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039534 func_020395b4 kind:function(thumb,size=0x244) addr:0x2039570 func_020397f8 kind:function(thumb,size=0x244) addr:0x20397b4 _ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 -func_02039a5c kind:function(arm,size=0x24c) addr:0x2039a18 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a18 func_02039ca8 kind:function(arm,size=0x24) addr:0x2039c64 -func_02039ccc kind:function(arm,size=0xa8) addr:0x2039c88 -func_02039d74 kind:function(arm,size=0x414) addr:0x2039d30 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039c88 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039d74Eii 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_UnkSubClass113func_0203a328Ev 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 -func_0203a3fc kind:function(arm,size=0x2d4) addr:0x203a3b8 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3b8 func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a68c -func_0203a7f0 kind:function(arm,size=0x198) addr:0x203a7ac -func_0203a988 kind:function(arm,size=0x520) addr:0x203a944 -func_0203aea8 kind:function(arm,size=0x74) addr:0x203ae64 -func_0203af1c kind:function(arm,size=0x1a0) addr:0x203aed8 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7ac +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a944 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203ae64 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203af1cEv 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 -func_0203b264 kind:function(arm,size=0xac) addr:0x203b220 -func_0203b310 kind:function(arm,size=0x100) addr:0x203b2cc -func_0203b410 kind:function(arm,size=0x1c0) addr:0x203b3cc -func_0203b5d0 kind:function(arm,size=0x194) addr:0x203b58c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b3cc +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b58c func_0203b764 kind:function(arm,size=0xb0) addr:0x203b720 -func_0203b814 kind:function(arm,size=0x578) addr:0x203b7d0 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b7d0 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd48 -func_0203bdcc kind:function(arm,size=0x3c) addr:0x203bd88 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203bdccEPiS0_ 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 @@ -1945,7 +1945,7 @@ func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c15c func_0203c25c kind:function(arm,size=0x6c) addr:0x203c218 _ZN31UnkStruct_027E0C68_UnkSubClass1D0Ev kind:function(arm,size=0x48) addr:0x203c284 _ZN31UnkStruct_027E0C68_UnkSubClass1D1Ev kind:function(arm,size=0x40) addr:0x203c2cc -func_0203c350 kind:function(arm,size=0x8) addr:0x203c30c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c30c func_0203c358 kind:function(thumb,size=0x44) addr:0x203c314 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c358 func_0203c414 kind:function(arm,size=0x4c) addr:0x203c3d0 @@ -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 -func_0203dcb4 kind:function(arm,size=0x48) addr:0x203dc70 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203dcb4Eii 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_UnkSubClass1i 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 -func_0203e060 kind:function(arm,size=0x30) addr:0x203e01c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c func_0203e090 kind:function(arm,size=0x38) addr:0x203e04c -func_0203e0c8 kind:function(arm,size=0x30) addr:0x203e084 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e0c8Ev 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/MessageManager.hpp b/include/Message/MessageManager.hpp index 2ab2dcc8..8f70ce23 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -34,13 +34,14 @@ public: /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1* 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; /* 0x1C */ virtual UNK_TYPE vfunc_1C(void) override; /* 0x20 */ virtual UNK_TYPE vfunc_20(void) override; /* 0x24 */ virtual UNK_TYPE vfunc_24(void) override; /* 0x28 */ virtual UNK_TYPE vfunc_28(void) override; /* 0x2C */ virtual UNK_TYPE vfunc_2C(void) override; /* 0x30 */ virtual UNK_TYPE vfunc_30(void) override; - /* 0x34 */ virtual UNK_TYPE vfunc_34(void) override; + /* 0x34 */ }; class UnkStruct_027E0C68_UnkSubClass3 : public SysObject { @@ -119,8 +120,8 @@ public: UnkStruct_027E0C68_UnkSubClass1* 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(UnkStruct_027E0C68_UnkSubClass1* param_2); - UnkStruct_027E0C68_UnkSubClass1* func_02037178(UnkStruct_027E0C68_UnkSubClass1* param_2); + void func_02037158(UnkSubClass1_02256FF8* param_2); + UnkStruct_027E0C68_UnkSubClass1* 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 60320873..61c057f0 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -286,6 +286,7 @@ public: unk32 func_02032fb4(void); unk32 func_020337d8(unk32 param_2); void func_02038b28(void); + void func_02038b40(void); unk32 func_02038d10(void); void func_02038d20(void); unk32 func_0203905c(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); @@ -312,7 +313,6 @@ public: void func_020331c4(unk32, unk32); unk32 func_02038cf4(void); void func_02038b1c(void); - void func_02038b40(void); void func_0203947c(void); unk32 func_0203951c(void); unk32 func_0203e284(UnkStruct_0203b264*, unk32, unk32); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 8a1255bc..8e61f134 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -6,8 +6,6 @@ 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_02038b40(UnkStruct_027E0C68_UnkSubClass1*); -extern ARM unk32 func_0203de14(UnkStruct_027E0C68_UnkSubClass1*, unk32); extern ARM void func_0203dc74(UnkStruct_027E0C68_UnkSubClass1*, unk32, unk32); // see Actor.cpp @@ -329,7 +327,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p this->unk_04 = 1; //! TODO: fake? - pSVar4 = this->func_02037178((UnkStruct_027E0C68_UnkSubClass1*)this->unk_18[0]); + pSVar4 = this->func_02037178((UnkSubClass1_02256FF8*)this->unk_18[0]); if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { this->unk_04 = 0; @@ -380,7 +378,7 @@ ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - if (this->unk_28[i] != NULL && func_0203de14(this->unk_28[i], param_2) != 0) { + if (this->unk_28[i] != NULL && this->unk_28[i]->func_0203de14(param_2) != 0) { this->unk_28[i]->func_0203e0c8(); } } @@ -438,7 +436,7 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { if (func_0202ab48() == 0 || i != 5) { - func_02038b40(this->unk_28[i]); + this->unk_28[i]->func_02038b40(); } } } @@ -578,7 +576,7 @@ ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370e8(unk32 par return NULL; } -ARM void UnkStruct_027E0C68::func_02037158(UnkStruct_027E0C68_UnkSubClass1* param_2) { +ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { UnkStruct_027E0C68_UnkSubClass1* pSVar1; pSVar1 = this->func_02037178(param_2); @@ -588,15 +586,12 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkStruct_027E0C68_UnkSubClass1* para } } -ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02037178(UnkStruct_027E0C68_UnkSubClass1* param_2) { - UnkStruct_027E0C68_UnkSubClass1* piVar1; - s32 iVar2; +ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) { + s32 i; - for (iVar2 = 0; iVar2 < ARRAY_LEN(this->unk_28); iVar2++) { - piVar1 = this->unk_28[iVar2]; - - if (piVar1 != NULL && piVar1->unk_08 == (unk32*)param_2) { - return piVar1; + for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + if (this->unk_28[i] != NULL && this->unk_28[i]->unk_08 == param_2) { + return this->unk_28[i]; } }