From f8e7f9a17dd50694fbf7f318c99116bad76ae7b4 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:01:41 +0100 Subject: [PATCH] rename UnkStruct_027E0C68 --- config/eur/arm9/dtcm/symbols.txt | 2 +- config/eur/arm9/symbols.txt | 62 ++++++++++++------------- config/usa/arm9/dtcm/symbols.txt | 2 +- config/usa/arm9/symbols.txt | 62 ++++++++++++------------- include/Message/MessageManager.hpp | 20 ++++---- include/Unknown/UnkStruct_0203dae0.hpp | 7 ++- src/Main/Message/MessageManager.cpp | 62 ++++++++++++------------- src/Main/Unknown/UnkStruct_02037750.cpp | 8 ++-- src/Main/Unknown/UnkStruct_02038aa0.cpp | 4 +- src/Main/Unknown/UnkStruct_020397f8.cpp | 14 +++--- 10 files changed, 126 insertions(+), 117 deletions(-) diff --git a/config/eur/arm9/dtcm/symbols.txt b/config/eur/arm9/dtcm/symbols.txt index 62eea4b0..2bb4c8fb 100644 --- a/config/eur/arm9/dtcm/symbols.txt +++ b/config/eur/arm9/dtcm/symbols.txt @@ -85,7 +85,7 @@ data_027e0c38 kind:bss addr:0x27e0c38 data_027e0c50 kind:bss addr:0x27e0c50 data_027e0c54 kind:bss addr:0x27e0c54 data_027e0c5c kind:bss addr:0x27e0c5c -data_027e0c68 kind:bss addr:0x27e0c68 +gMessageManager kind:bss addr:0x27e0c68 data_027e0cb4 kind:bss addr:0x27e0cb4 data_027e0cbc kind:bss addr:0x27e0cbc data_027e0ce0 kind:bss addr:0x27e0ce0 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 5de9a047..3caaf962 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1789,38 +1789,38 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x20361d0 func_02036240 kind:function(arm,size=0x170) addr:0x2036240 func_020363b0 kind:function(arm,size=0x18) addr:0x20363b0 func_020363c8 kind:function(arm,size=0x74) addr:0x20363c8 -_ZN18UnkStruct_027E0C6813func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x203643c -_ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x2036490 -_ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x203665c +_ZN14MessageManager13func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x203643c +_ZN14MessageManager13func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x2036490 +_ZN14MessageManager13func_0203665cEv kind:function(thumb,size=0x4c) addr:0x203665c func_020366a8 kind:function(arm,size=0x1c) addr:0x20366a8 -_ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x20366c4 -_ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x2036700 -_ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x203673c -_ZN18UnkStruct_027E0C6813func_02036770Ej kind:function(arm,size=0x28) addr:0x2036770 -_ZN18UnkStruct_027E0C6813func_02036798Ev kind:function(arm,size=0x44) addr:0x2036798 -_ZN18UnkStruct_027E0C6813func_020367dcEi kind:function(arm,size=0x10) addr:0x20367dc -_ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367ec -_ZN18UnkStruct_027E0C6813func_02036808Ev kind:function(arm,size=0x1c) addr:0x2036808 -_ZN18UnkStruct_027E0C6813func_02036824Ev kind:function(arm,size=0x2c) addr:0x2036824 -_ZN18UnkStruct_027E0C6813func_02036850Ev kind:function(arm,size=0x38) addr:0x2036850 -_ZN18UnkStruct_027E0C6813func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036888 -_ZN18UnkStruct_027E0C6813func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368f4 -_ZN18UnkStruct_027E0C6813func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x203690c -_ZN18UnkStruct_027E0C6813func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036bbc -_ZN18UnkStruct_027E0C6813func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c50 -_ZN18UnkStruct_027E0C6813func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036ca4 -_ZN18UnkStruct_027E0C6813func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ce4 -_ZN18UnkStruct_027E0C6813func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036d30 -_ZN18UnkStruct_027E0C6813func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d4c -_ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c -_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 -_ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370e8 -_ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037158 -_ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037178 -_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x4) addr:0x20371b0 +_ZN14MessageManager13func_020366c4Ev kind:function(arm,size=0x3c) addr:0x20366c4 +_ZN14MessageManager13func_02036700Ev kind:function(arm,size=0x3c) addr:0x2036700 +_ZN14MessageManager13func_0203673cEv kind:function(arm,size=0x34) addr:0x203673c +_ZN14MessageManager13func_02036770Ej kind:function(arm,size=0x28) addr:0x2036770 +_ZN14MessageManager13func_02036798Ev kind:function(arm,size=0x44) addr:0x2036798 +_ZN14MessageManager13func_020367dcEi kind:function(arm,size=0x10) addr:0x20367dc +_ZN14MessageManager13func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367ec +_ZN14MessageManager13func_02036808Ev kind:function(arm,size=0x1c) addr:0x2036808 +_ZN14MessageManager13func_02036824Ev kind:function(arm,size=0x2c) addr:0x2036824 +_ZN14MessageManager13func_02036850Ev kind:function(arm,size=0x38) addr:0x2036850 +_ZN14MessageManager13func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036888 +_ZN14MessageManager13func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368f4 +_ZN14MessageManager13func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x203690c +_ZN14MessageManager13func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036bbc +_ZN14MessageManager13func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c50 +_ZN14MessageManager13func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036ca4 +_ZN14MessageManager13func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ce4 +_ZN14MessageManager13func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036d30 +_ZN14MessageManager13func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d4c +_ZN14MessageManager13func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c +_ZN14MessageManager13func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036da8 +_ZN14MessageManager13func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036edc +_ZN14MessageManager13func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f68 +_ZN14MessageManager13func_020370d0Eii kind:function(arm,size=0x18) addr:0x20370d0 +_ZN14MessageManager13func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370e8 +_ZN14MessageManager13func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037158 +_ZN14MessageManager13func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037178 +_ZN14MessageManagerD2Ev kind:function(arm,size=0x4) addr:0x20371b0 _ZN11BMGFileInfo13func_020371b4Ev kind:function(thumb,size=0x14) addr:0x20371b4 _ZN11BMGFileInfo13func_020371c8EPjs kind:function(thumb,size=0x90) addr:0x20371c8 _ZN11BMGFileInfo13func_02037258Et kind:function(arm,size=0x34) addr:0x2037258 diff --git a/config/usa/arm9/dtcm/symbols.txt b/config/usa/arm9/dtcm/symbols.txt index 62eea4b0..2bb4c8fb 100644 --- a/config/usa/arm9/dtcm/symbols.txt +++ b/config/usa/arm9/dtcm/symbols.txt @@ -85,7 +85,7 @@ data_027e0c38 kind:bss addr:0x27e0c38 data_027e0c50 kind:bss addr:0x27e0c50 data_027e0c54 kind:bss addr:0x27e0c54 data_027e0c5c kind:bss addr:0x27e0c5c -data_027e0c68 kind:bss addr:0x27e0c68 +gMessageManager kind:bss addr:0x27e0c68 data_027e0cb4 kind:bss addr:0x27e0cb4 data_027e0cbc kind:bss addr:0x27e0cbc data_027e0ce0 kind:bss addr:0x27e0ce0 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 177c5404..b19fdb53 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1789,38 +1789,38 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x203618c func_02036240 kind:function(arm,size=0x170) addr:0x20361fc func_020363b0 kind:function(arm,size=0x18) addr:0x203636c func_020363c8 kind:function(arm,size=0x74) addr:0x2036384 -_ZN18UnkStruct_027E0C6813func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x20363f8 -_ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x203644c -_ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x2036618 +_ZN14MessageManager13func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x20363f8 +_ZN14MessageManager13func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x203644c +_ZN14MessageManager13func_0203665cEv kind:function(thumb,size=0x4c) addr:0x2036618 func_020366a8 kind:function(arm,size=0x1c) addr:0x2036664 -_ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x2036680 -_ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x20366bc -_ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x20366f8 -_ZN18UnkStruct_027E0C6813func_02036770Ej kind:function(arm,size=0x28) addr:0x203672c -_ZN18UnkStruct_027E0C6813func_02036798Ev kind:function(arm,size=0x44) addr:0x2036754 -_ZN18UnkStruct_027E0C6813func_020367dcEi kind:function(arm,size=0x10) addr:0x2036798 -_ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367a8 -_ZN18UnkStruct_027E0C6813func_02036808Ev kind:function(arm,size=0x1c) addr:0x20367c4 -_ZN18UnkStruct_027E0C6813func_02036824Ev kind:function(arm,size=0x2c) addr:0x20367e0 -_ZN18UnkStruct_027E0C6813func_02036850Ev kind:function(arm,size=0x38) addr:0x203680c -_ZN18UnkStruct_027E0C6813func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036844 -_ZN18UnkStruct_027E0C6813func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368b0 -_ZN18UnkStruct_027E0C6813func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x20368c8 -_ZN18UnkStruct_027E0C6813func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036b78 -_ZN18UnkStruct_027E0C6813func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c0c -_ZN18UnkStruct_027E0C6813func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036c60 -_ZN18UnkStruct_027E0C6813func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ca0 -_ZN18UnkStruct_027E0C6813func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036cec -_ZN18UnkStruct_027E0C6813func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d08 -_ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 -_ZN18UnkStruct_027E0C6813func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036d64 -_ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036e98 -_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_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037114 -_ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037134 -_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x4) addr:0x203716c +_ZN14MessageManager13func_020366c4Ev kind:function(arm,size=0x3c) addr:0x2036680 +_ZN14MessageManager13func_02036700Ev kind:function(arm,size=0x3c) addr:0x20366bc +_ZN14MessageManager13func_0203673cEv kind:function(arm,size=0x34) addr:0x20366f8 +_ZN14MessageManager13func_02036770Ej kind:function(arm,size=0x28) addr:0x203672c +_ZN14MessageManager13func_02036798Ev kind:function(arm,size=0x44) addr:0x2036754 +_ZN14MessageManager13func_020367dcEi kind:function(arm,size=0x10) addr:0x2036798 +_ZN14MessageManager13func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367a8 +_ZN14MessageManager13func_02036808Ev kind:function(arm,size=0x1c) addr:0x20367c4 +_ZN14MessageManager13func_02036824Ev kind:function(arm,size=0x2c) addr:0x20367e0 +_ZN14MessageManager13func_02036850Ev kind:function(arm,size=0x38) addr:0x203680c +_ZN14MessageManager13func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036844 +_ZN14MessageManager13func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368b0 +_ZN14MessageManager13func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x20368c8 +_ZN14MessageManager13func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036b78 +_ZN14MessageManager13func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c0c +_ZN14MessageManager13func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036c60 +_ZN14MessageManager13func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ca0 +_ZN14MessageManager13func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036cec +_ZN14MessageManager13func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d08 +_ZN14MessageManager13func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 +_ZN14MessageManager13func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036d64 +_ZN14MessageManager13func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036e98 +_ZN14MessageManager13func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f24 +_ZN14MessageManager13func_020370d0Eii kind:function(arm,size=0x18) addr:0x203708c +_ZN14MessageManager13func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370a4 +_ZN14MessageManager13func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037114 +_ZN14MessageManager13func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037134 +_ZN14MessageManagerD2Ev kind:function(arm,size=0x4) addr:0x203716c _ZN11BMGFileInfo13func_020371b4Ev kind:function(thumb,size=0x14) addr:0x2037170 _ZN11BMGFileInfo13func_020371c8EPjs kind:function(thumb,size=0x90) addr:0x2037184 _ZN11BMGFileInfo13func_02037258Et kind:function(arm,size=0x34) addr:0x2037214 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 28537830..28e4764e 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -7,6 +7,7 @@ #include "Message/MsgProc.hpp" #include "System/SysNew.hpp" #include "nds/math.h" +#include "Debug/DebugHierarchy.hpp" #include "Unknown/UnkStruct_0202e1a0.hpp" #include "Unknown/UnkStruct_02032f0c.hpp" @@ -16,12 +17,12 @@ #include "Unknown/UnkStruct_020397f8.hpp" #include "Unknown/UnkStruct_0203dae0.hpp" -class UnkStruct_027E0C68 : public SysObject { +class MessageManager : public SysObject { public: /* 0x00 */ u8 mUnk_00[2]; /* 0x02 */ u8 mUnk_02; /* 0x03 */ u8 mUnk_03; - /* 0x04 */ u8 mUnk_04; + /* 0x04 */ u8 mUnk_04; // halts actors and hides the item menu /* 0x05 */ u8 mUnk_05; /* 0x06 */ unk16 mUnk_06; /* 0x08 */ UnkStruct_020397f8 *mUnk_08; @@ -35,20 +36,21 @@ public: /* 0x20 */ UnkStruct_02037750 *mUnk_20[2]; /* 0x28 */ UnkStruct_02038aa0 *mUnk_28[6]; //! TODO: is it the right type? /* 0x40 */ UnkStruct_020397f8 *mUnk_40[2]; // is array size 6? - /* 0x48 */ + /* 0x48 */ DebugHierarchy* mDebug; + /* 0x4C */ - static void func_0203643c(u32 *param_1, UnkStruct_027E0C68 *param_2, u32 param_3); + static void func_0203643c(u32 *param_1, MessageManager *param_2, u32 param_3); void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); void func_0203665c(void); - UnkStruct_027E0C68(); - ~UnkStruct_027E0C68(); + MessageManager(); + ~MessageManager(); UnkStruct_020397f8 *func_020366c4(void); UnkStruct_020397f8 *func_02036700(void); UnkStruct_020386d8 *func_0203673c(void); bool func_02036770(u32 param_2); unk32 func_02036798(void); bool func_020367dc(int param_2); - bool UnkStruct_027E0C68::func_020367ec(void); + bool MessageManager::func_020367ec(void); bool func_02036808(void); bool func_02036824(void); bool func_02036850(void); @@ -69,6 +71,8 @@ public: UnkStruct_020386d8 *func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); void func_02037158(UnkSubClass1_02256FF8 *param_2); UnkStruct_02038aa0 *func_02037178(UnkSubClass1_02256FF8 *param_2); + + void func_ov004_021069c4(void); }; -extern UnkStruct_027E0C68 data_027e0c68; +extern MessageManager gMessageManager; diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp index 5315c958..7cb67a00 100644 --- a/include/Unknown/UnkStruct_0203dae0.hpp +++ b/include/Unknown/UnkStruct_0203dae0.hpp @@ -52,7 +52,10 @@ public: /* 0dc */ unk32 mUnk_dc; /* 0e0 */ unk32 mUnk_e0; /* 0e4 */ unk32 mUnk_e4; - /* 0e8 */ unk32 mUnk_e8; + /* 0e8 */ unk8 mUnk_e8; + /* 0e8 */ unk8 mUnk_e9; + /* 0e8 */ unk8 mUnk_ea; + /* 0e8 */ unk8 mUnk_eb; /* 0ec */ unk32 mUnk_ec; /* 0f0 */ unk32 mUnk_f0; /* 0f4 */ unk32 mUnk_f4; @@ -134,4 +137,6 @@ public: void func_0203e510(s32 *param1, s32 param2, s32 param3); void func_0203e62c(s32 *param1, s32 param2); bool func_0203e6e4(u32 param1, u32 param2, s32 param3); + + void func_ov003_020f13b0(unk32 param1); }; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index a1a5da09..812a9b2a 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -21,7 +21,7 @@ extern UnkStruct_027e0ffc *data_027e0ffc; extern u32 data_027e0618[]; // non-matching -ARM void UnkStruct_027E0C68::func_0203643c(u32 *param_1, UnkStruct_027E0C68 *param_2, u32 param_3) { +ARM void MessageManager::func_0203643c(u32 *param_1, MessageManager *param_2, u32 param_3) { BMGGroups *pBVar2 = param_2->pGroups; *param_1 = ((u32) pBVar2->entries[param_3 >> 0x10].pDAT1 + @@ -29,7 +29,7 @@ ARM void UnkStruct_027E0C68::func_0203643c(u32 *param_1, UnkStruct_027E0C68 *par } // non-matching -THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 param_4) { +THUMB void MessageManager::func_02036490(unk32 param_2, unk32 param_3, unk32 param_4) { this->mUnk_03 = 0; this->mUnk_0c = 0; @@ -103,7 +103,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 } } -THUMB void UnkStruct_027E0C68::func_0203665c(void) { +THUMB void MessageManager::func_0203665c(void) { for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { if (this->mUnk_28[i] != NULL) { delete this->mUnk_28[i]; @@ -124,7 +124,7 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) { } // non-matching -ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_020366c4(void) { +ARM UnkStruct_020397f8 *MessageManager::func_020366c4(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { return (UnkStruct_020397f8 *) this->mUnk_28[2]; } @@ -133,7 +133,7 @@ ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_020366c4(void) { } // non-matching -ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036700(void) { +ARM UnkStruct_020397f8 *MessageManager::func_02036700(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { return (UnkStruct_020397f8 *) this->mUnk_28[0]; } @@ -141,7 +141,7 @@ ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036700(void) { return (UnkStruct_020397f8 *) this->mUnk_28[2]; } -ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_0203673c(void) { +ARM UnkStruct_020386d8 *MessageManager::func_0203673c(void) { bool iVar1 = this->func_02036824(); bool iVar2 = this->func_02036850(); @@ -156,11 +156,11 @@ ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_0203673c(void) { return NULL; } -ARM bool UnkStruct_027E0C68::func_02036770(u32 param_2) { +ARM bool MessageManager::func_02036770(u32 param_2) { return (this->mUnk_18[param_2]->mUnk_18 & ~0xFFFF) == (0x100 << 0x10); } -ARM unk32 UnkStruct_027E0C68::func_02036798(void) { +ARM unk32 MessageManager::func_02036798(void) { unk32 uVar2 = 1; if (this->mUnk_04 == 0) { @@ -178,19 +178,19 @@ ARM unk32 UnkStruct_027E0C68::func_02036798(void) { return uVar2; } -ARM bool UnkStruct_027E0C68::func_020367dc(int param_2) { +ARM bool MessageManager::func_020367dc(int param_2) { return param_2 == 0; } -ARM bool UnkStruct_027E0C68::func_020367ec(void) { +ARM bool MessageManager::func_020367ec(void) { return ((UnkStruct_020397f8 *) this->mUnk_28[0])->mUnk_15c > 0; } -ARM bool UnkStruct_027E0C68::func_02036808(void) { +ARM bool MessageManager::func_02036808(void) { return ((UnkStruct_020397f8 *) this->mUnk_28[2])->mUnk_15c > 0; } -ARM bool UnkStruct_027E0C68::func_02036824(void) { +ARM bool MessageManager::func_02036824(void) { switch (data_027e077c.mUnk_0) { case 0x01: case 0x37: @@ -202,11 +202,11 @@ ARM bool UnkStruct_027E0C68::func_02036824(void) { } // non-matching -ARM bool UnkStruct_027E0C68::func_02036850(void) { +ARM bool MessageManager::func_02036850(void) { return !(data_02056be4[data_027e077c.mUnk_0] & 2) && (data_02056be4[data_027e077c.mUnk_0] & 1); } -ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8 *param_2) { +ARM void MessageManager::func_02036888(UnkStruct_020386d8 *param_2) { if ((param_2->mUnk_18 & ~0xFFFF) != (0x100 << 0x10)) { UnkStruct_020397f8 *iVar1 = this->func_020366c4(); @@ -218,7 +218,7 @@ ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8 *param_2) { } } -ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750 *param_2) { +ARM bool MessageManager::func_020368f4(UnkStruct_02037750 *param_2) { if (this->mUnk_20[1] != NULL) { return false; } @@ -228,7 +228,7 @@ ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750 *param_2) { } // non-matching -ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { +ARM void MessageManager::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { UnkStruct_020397f8 *unk_28_0; UnkStruct_020397f8 *unk_28_2; UnkStruct_02038aa0 *pSVar4; @@ -323,7 +323,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p } } -ARM void UnkStruct_027E0C68::func_02036bbc(void) { +ARM void MessageManager::func_02036bbc(void) { UnkStruct_02038aa0 *pSVar3; bool bVar2; bool bVar4; @@ -345,7 +345,7 @@ ARM void UnkStruct_027E0C68::func_02036bbc(void) { } } -ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { +ARM void MessageManager::func_02036c50(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { @@ -355,7 +355,7 @@ ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { } } -ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { +ARM void MessageManager::func_02036ca4(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { @@ -367,7 +367,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { } } -ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8 *param_2, unk32 param_3) { +ARM bool MessageManager::func_02036ce4(UnkStruct_020386d8 *param_2, unk32 param_3) { u32 uVar1; if (param_3 == 0) { @@ -384,7 +384,7 @@ ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8 *param_2, unk32 pa return false; } -ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750 *param_2) { +ARM bool MessageManager::func_02036d30(UnkStruct_02037750 *param_2) { if (this->mUnk_20[0] != NULL && this->mUnk_20[0] != param_2) { return false; } @@ -393,7 +393,7 @@ ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750 *param_2) { return true; } -ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750 *param_2) { +ARM bool MessageManager::func_02036d4c(UnkStruct_02037750 *param_2) { if (this->mUnk_20[0] == param_2) { this->mUnk_20[0] = NULL; return true; @@ -402,7 +402,7 @@ ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750 *param_2) { return false; } -ARM void UnkStruct_027E0C68::func_02036d6c(void) { +ARM void MessageManager::func_02036d6c(void) { s32 i; for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { @@ -413,7 +413,7 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { } // non-matching -ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02036da8(u32 param_2, s16 *param_3) { +ARM UnkStruct_02038aa0 *MessageManager::func_02036da8(u32 param_2, s16 *param_3) { EntryINF1 *pEVar1; EntryINF1 *pEVar2; UnkStruct_02038aa0 *pSVar4; @@ -461,7 +461,7 @@ ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02036da8(u32 param_2, s16 *para } // non-matching -ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { +ARM void MessageManager::func_02036edc(u32 param_2, u8 param_3) { UnkStruct_020397f8 *pSVar1; u8 auStack_28[24]; u8 local_13; @@ -485,7 +485,7 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { } // non-matching -ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036f68(u32 param_2, u8 *param_3) { +ARM UnkStruct_020397f8 *MessageManager::func_02036f68(u32 param_2, u8 *param_3) { EntryINF1 *pEVar1; UnkStruct_02038aa0 *pSVar2; EntryINF1 *pEVar3; @@ -523,11 +523,11 @@ ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036f68(u32 param_2, u8 *param return pSVar5; } -ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_020370d0(unk32 param_2, unk32 param_3) { +ARM UnkStruct_020386d8 *MessageManager::func_020370d0(unk32 param_2, unk32 param_3) { return this->func_020370e8(param_2, -1, -1, param_3); } -ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { +ARM UnkStruct_020386d8 *MessageManager::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { UnkStruct_020386d8 *puVar2; if (this->func_02036824()) { @@ -551,7 +551,7 @@ ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 p return NULL; } -ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8 *param_2) { +ARM void MessageManager::func_02037158(UnkSubClass1_02256FF8 *param_2) { UnkStruct_02038aa0 *pSVar1; pSVar1 = this->func_02037178(param_2); @@ -561,7 +561,7 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8 *param_2) { } } -ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8 *param_2) { +ARM UnkStruct_02038aa0 *MessageManager::func_02037178(UnkSubClass1_02256FF8 *param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { @@ -573,4 +573,4 @@ ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8 return NULL; } -ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() {} +ARM MessageManager::~MessageManager() {} diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp index f6e739b5..489c4534 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -24,8 +24,8 @@ ARM UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { } ARM UnkStruct_02037750::~UnkStruct_02037750() { - if (data_027e0c68.mUnk_20[0] == this) { - data_027e0c68.func_02036d4c(this); + if (gMessageManager.mUnk_20[0] == this) { + gMessageManager.func_02036d4c(this); } } @@ -86,7 +86,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { case 0x1: case 0x2: case 0x3: - UnkStruct_020397f8 *ret_3 = data_027e0c68.func_020366c4(); + UnkStruct_020397f8 *ret_3 = gMessageManager.func_020366c4(); if (0x0 < ret_3->mUnk_15c) { return -0x1; @@ -220,7 +220,7 @@ ARM unk32 UnkStruct_020386d8::vfunc_28(s32 param1) { } ARM bool UnkStruct_020386d8::vfunc_30() { - return data_027e0c68.func_020366c4()->mUnk_15c <= 0; + return gMessageManager.func_020366c4()->mUnk_15c <= 0; } ARM UnkStruct_020386d8::~UnkStruct_020386d8() {} diff --git a/src/Main/Unknown/UnkStruct_02038aa0.cpp b/src/Main/Unknown/UnkStruct_02038aa0.cpp index 31256b1c..038d25b6 100644 --- a/src/Main/Unknown/UnkStruct_02038aa0.cpp +++ b/src/Main/Unknown/UnkStruct_02038aa0.cpp @@ -57,8 +57,8 @@ ARM void UnkStruct_02038aa0::func_02038b74(void) {} // non-matching ARM bool UnkStruct_02038aa0::func_02038b78() { if (data_027e0c54 == 0) { - if ((this->mUnk_50 != 0 && data_027e0c68.func_02036850() != 0) || - (this->mUnk_50 == 0 && data_027e0c68.func_02036824() != 0)) + if ((this->mUnk_50 != 0 && gMessageManager.func_02036850() != 0) || + (this->mUnk_50 == 0 && gMessageManager.func_02036824() != 0)) { return true; } diff --git a/src/Main/Unknown/UnkStruct_020397f8.cpp b/src/Main/Unknown/UnkStruct_020397f8.cpp index 25fdc1bf..dba982d6 100644 --- a/src/Main/Unknown/UnkStruct_020397f8.cpp +++ b/src/Main/Unknown/UnkStruct_020397f8.cpp @@ -212,7 +212,7 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { local_8c = 0; local_90 = 0; - bVar1 = data_027e0c68.mUnk_28[this->mUnk_50]; + bVar1 = gMessageManager.mUnk_28[this->mUnk_50]; this->vfunc_6C(&local_8c, &local_90); this->func_0203a188(local_8c + param1, local_90 + param2); @@ -313,9 +313,9 @@ ARM void UnkStruct_020397f8::func_0203a188(s32 param1, s32 param2) { return; } - // (short)(ushort)*(byte *)((int)data_027e0c68.mUnk_28[(this->mUnk_50 - 0x28) * 0x18]; + // (short)(ushort)*(byte *)((int)gMessageManager.mUnk_28[(this->mUnk_50 - 0x28) * 0x18]; - iVar6 = data_027e0c68.mUnk_10 + this->mUnk_50; + iVar6 = gMessageManager.mUnk_10 + this->mUnk_50; // uStack_24 = param_4; if (data_027e0cbc.func_0203d7e0(data_02056a00[iVar6]) != 0) { @@ -514,7 +514,7 @@ ARM void UnkStruct_020397f8::vfunc_50(EntryINF1 *param1, unk32 param2, s32 *para iVar6 = param3[0]; if (data_027e0c54 != 0) { - UnkStruct_020397f8 *pVar4 = data_027e0c68.func_02036700(); + UnkStruct_020397f8 *pVar4 = gMessageManager.func_02036700(); if (pVar4 != NULL && pVar4->mUnk_15c > 0) { this->func_02038b40(); @@ -524,7 +524,7 @@ ARM void UnkStruct_020397f8::vfunc_50(EntryINF1 *param1, unk32 param2, s32 *para if (*((s32 *) data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { - UnkStruct_020397f8 *pVar4 = (UnkStruct_020397f8 *) data_027e0c68.mUnk_28[4]; + UnkStruct_020397f8 *pVar4 = (UnkStruct_020397f8 *) gMessageManager.mUnk_28[4]; if (pVar4 != NULL && pVar4->mUnk_15c > 0) { this->func_02038b40(); @@ -790,7 +790,7 @@ ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1 *param1, unk32 param2 } // PTR_PTR_0203b5ac[(byte)param_1[0x50]] = (char)uVar6; - data_027e0c68.mUnk_28[this->mUnk_50]->mUnk_50 = uVar6; + gMessageManager.mUnk_28[this->mUnk_50]->mUnk_50 = uVar6; if (this->mUnk_15e == 7) { uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); @@ -853,7 +853,7 @@ ARM void UnkStruct_020397f8::vfunc_64(s16 *param1) { // non-matching ARM void UnkStruct_020397f8::func_0203b764() { - s32 i = data_027e0c68.mUnk_00[this->mUnk_50]; + s32 i = gMessageManager.mUnk_00[this->mUnk_50]; this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]);