From b072add9515e35d733e089b3b54af910d47d9eb1 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Tue, 4 Feb 2025 20:02:58 +0100 Subject: [PATCH] post-update cleanup: step 1 --- config/eur/arm9/symbols.txt | 10 +- config/usa/arm9/symbols.txt | 10 +- include/Message/MessageManager.hpp | 94 +--- include/Message/MsgProc.hpp | 697 +------------------------ include/Unknown/UnkStruct_0202e1a0.hpp | 1 + include/Unknown/UnkStruct_02032f0c.hpp | 108 +++- include/Unknown/UnkStruct_02035064.hpp | 31 +- include/Unknown/UnkStruct_02037750.hpp | 37 +- include/Unknown/UnkStruct_02038aa0.hpp | 101 +++- include/Unknown/UnkStruct_020397f8.hpp | 177 ++++++- include/Unknown/UnkStruct_0203dae0.hpp | 95 +++- src/Main/Message/MessageManager.cpp | 20 +- src/Main/Message/func_02032f0c.cpp | 10 +- src/Main/Message/func_0203744c.cpp | 10 +- 14 files changed, 540 insertions(+), 861 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 0b0513a6..cde17c14 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1803,15 +1803,15 @@ _ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x203 _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_02036888EP31UnkStruct_027E0C68_UnkSubClass2 kind:function(arm,size=0x6c) addr:0x2036888 -_ZN18UnkStruct_027E0C6813func_020368f4EP37UnkStruct_027E0C68_UnkSubClass2_Base1 kind:function(arm,size=0x18) addr:0x20368f4 +_ZN18UnkStruct_027E0C6813func_02036888EP31UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036888 +_ZN18UnkStruct_027E0C6813func_020368f4EP37UnkStruct_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_02036ce4EP31UnkStruct_027E0C68_UnkSubClass2i kind:function(arm,size=0x4c) addr:0x2036ce4 -_ZN18UnkStruct_027E0C6813func_02036d30EP37UnkStruct_027E0C68_UnkSubClass2_Base1 kind:function(arm,size=0x1c) addr:0x2036d30 -_ZN18UnkStruct_027E0C6813func_02036d4cEP37UnkStruct_027E0C68_UnkSubClass2_Base1 kind:function(arm,size=0x20) addr:0x2036d4c +_ZN18UnkStruct_027E0C6813func_02036ce4EP31UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ce4 +_ZN18UnkStruct_027E0C6813func_02036d30EP37UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036d30 +_ZN18UnkStruct_027E0C6813func_02036d4cEP37UnkStruct_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 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index be600b90..2f75dcff 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1803,15 +1803,15 @@ _ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x203 _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_02036888EP31UnkStruct_027E0C68_UnkSubClass2 kind:function(arm,size=0x6c) addr:0x2036844 -_ZN18UnkStruct_027E0C6813func_020368f4EP37UnkStruct_027E0C68_UnkSubClass2_Base1 kind:function(arm,size=0x18) addr:0x20368b0 +_ZN18UnkStruct_027E0C6813func_02036888EP31UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036844 +_ZN18UnkStruct_027E0C6813func_020368f4EP37UnkStruct_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_02036ce4EP31UnkStruct_027E0C68_UnkSubClass2i kind:function(arm,size=0x4c) addr:0x2036ca0 -_ZN18UnkStruct_027E0C6813func_02036d30EP37UnkStruct_027E0C68_UnkSubClass2_Base1 kind:function(arm,size=0x1c) addr:0x2036cec -_ZN18UnkStruct_027E0C6813func_02036d4cEP37UnkStruct_027E0C68_UnkSubClass2_Base1 kind:function(arm,size=0x20) addr:0x2036d08 +_ZN18UnkStruct_027E0C6813func_02036ce4EP31UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ca0 +_ZN18UnkStruct_027E0C6813func_02036d30EP37UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036cec +_ZN18UnkStruct_027E0C6813func_02036d4cEP37UnkStruct_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 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index f8098ca0..c5739430 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -6,78 +6,8 @@ #include "System/SysNew.hpp" #include "Message/BMG.hpp" #include "Message/MsgProc.hpp" -#include "lib/math.h" - -// astruct_14, UnkStruct_02037750 -class UnkStruct_027E0C68_UnkSubClass2_Base1 : public SysObject { -public: - /* 0x00 (vtable) */ - /* 0x04 */ unk32 unk_04[4]; - /* 0x14 */ unk32 unk_14; - /* 0x18 */ u32 unk_18; - /* 0x1C */ unk8 unk_1C; - /* 0x1D */ u8 unk_1D; - /* 0x1E */ unk16 unk_1E; - /* 0x20 */ - - UnkStruct_027E0C68_UnkSubClass2_Base1(unk32 param_2, unk32 param_3); - - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass2_Base1(); - /* 0x08 */ virtual void vfunc_08(u32 param_1); - /* 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); - /* 0x1C */ virtual UNK_TYPE vfunc_1C(void); - /* 0x20 */ virtual UNK_TYPE vfunc_20(void); - /* 0x24 */ virtual UNK_TYPE vfunc_24(void); - /* 0x28 */ virtual UNK_TYPE vfunc_28(void); - /* 0x2C */ virtual UNK_TYPE vfunc_2C(void); - /* 0x30 */ virtual UNK_TYPE vfunc_30(void); - /* 0x34 */ -}; - -class UnkStruct_027E0C68_UnkSubClass2_unk_24 { -public: - /* 0x00 */ unk32 unk_00; - /* 0x04 */ - - void func_020376c0(Vec3p param_2); -}; - -// astruct_15, UnkStruct_020386d88 -class UnkStruct_027E0C68_UnkSubClass2 : public UnkStruct_027E0C68_UnkSubClass2_Base1 { -public: - /* 0x20 */ unk8 unk_20; - /* 0x21 */ unk8 unk_21; - /* 0x22 */ unk8 unk_22; - /* 0x23 */ unk8 unk_23; - /* 0x24 */ UnkStruct_027E0C68_UnkSubClass2_unk_24 unk_24; - /* 0x28 */ unk32 unk_28; - /* 0x2C */ unk32 unk_2C; - /* 0x30 */ unk32 unk_30; - /* 0x34 */ unk16 unk_34; - /* 0x36 */ unk16 unk_36; - /* 0x38 */ u8 unk_38; - /* 0x39 */ u8 unk_39; - /* 0x3A */ unk16 unk_3A; - /* 0x3C */ - - UnkStruct_027E0C68_UnkSubClass2(); - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass2() override; - /* 0x08 */ virtual void vfunc_08(u32 param_1) 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; - /* 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 */ -}; +#include "libs/nds/include/nds/math.h" +#include "Unknown/UnkStruct_02037750.hpp" class UnkStruct_027E0C68 : public SysObject { public: @@ -94,8 +24,8 @@ public: /* 0x10 */ unk16 unk_10; /* 0x10 */ unk16 unk_12; /* 0x14 */ BMGGroups* pGroups; - /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18[2]; - /* 0x20 */ UnkStruct_027E0C68_UnkSubClass2_Base1* unk_20[2]; + /* 0x18 */ UnkStruct_020386d8* unk_18[2]; + /* 0x20 */ UnkStruct_02037750* unk_20[2]; /* 0x28 */ MsgProc_Main* unk_28[6]; /* 0x40 */ MsgProc_Type1* unk_40[2]; // is array size 6? /* 0x48 */ @@ -107,7 +37,7 @@ public: ~UnkStruct_027E0C68(); MsgProc_Type1* func_020366c4(void); MsgProc_Type1* func_02036700(void); - UnkStruct_027E0C68_UnkSubClass2* func_0203673c(void); + UnkStruct_020386d8* func_0203673c(void); bool func_02036770(u32 param_2); unk32 func_02036798(void); bool func_020367dc(int param_2); @@ -115,21 +45,21 @@ public: bool func_02036808(void); bool func_02036824(void); bool func_02036850(void); - void func_02036888(UnkStruct_027E0C68_UnkSubClass2* param_2); - bool func_020368f4(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2); + void func_02036888(UnkStruct_020386d8* param_2); + bool func_020368f4(UnkStruct_02037750* param_2); void func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4); void func_02036bbc(void); void func_02036c50(unk32 param_2); void func_02036ca4(unk32 param_2); - bool func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param_2, unk32 param_3); - bool func_02036d30(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2); - bool func_02036d4c(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2); + bool func_02036ce4(UnkStruct_020386d8* param_2, unk32 param_3); + bool func_02036d30(UnkStruct_02037750* param_2); + bool func_02036d4c(UnkStruct_02037750* param_2); void func_02036d6c(void); MsgProc_Main* func_02036da8(u32 param_2, s16* param_3); void func_02036edc(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); + UnkStruct_020386d8* func_020370d0(unk32 param_2, unk32 param_3); + UnkStruct_020386d8* func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); void func_02037158(UnkSubClass1_02256FF8* param_2); MsgProc_Main* func_02037178(UnkSubClass1_02256FF8* param_2); }; diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp index c2e0f68c..50dcbc60 100644 --- a/include/Message/MsgProc.hpp +++ b/include/Message/MsgProc.hpp @@ -3,7 +3,14 @@ #include "System/SysNew.hpp" #include "Message/BMG.hpp" #include "Unknown/func_ov000_020d0644.hpp" -#include "lib/math.h" +#include "Unknown/UnkStruct_0202e1a0.hpp" +#include "Unknown/UnkStruct_0203dae0.hpp" +#include "Unknown/UnkStruct_02032f0c.hpp" +#include "Unknown/UnkStruct_02038aa0.hpp" +#include "Unknown/UnkStruct_020397f8.hpp" +#include "Unknown/UnkStruct_02035064.hpp" +#include "Unknown/UnkStruct_02037750.hpp" +#include "libs/nds/include/nds/math.h" // temp #define UNK_TYPE void @@ -11,126 +18,12 @@ #define ESCAPE_SEQUENCE_MARKER '\x1A' #define CHECK_UNK_FLAGS(val) (((data_02056be4[data_027e077c.mUnk_0] & (val)) != 0)) -struct func_0203b410_param_2 { - unk32 unk_00; - unk32 unk_04; - unk32 unk_08; - unk32 unk_0C; - unk16 unk_10; - unk16 unk_12; -}; - typedef struct UnkStruct_0203b264 { /* 0 */ u8 mUnk_0[0x4]; /* 4 */ u16 *mUnk_4; /* 8 */ } UnkStruct_0203b264; -typedef u32 (*UnkCallback1)(void); - -// astruct_11, UnkStruct_02035064 -class UnkSubClass1_UnkownClass1_Sub1 { -public: - /* 0x00 */ unk16 unk_00; - /* 0x02 */ unk16 unk_02; - /* 0x04 */ unk32 unk_04; - /* 0x08 */ unk32 unk_08; - /* 0x0C */ unk32 unk_0C; - /* 0x10 */ unk32 unk_10; - /* 0x14 */ unk32 unk_14; - /* 0x18 */ - - UnkSubClass1_UnkownClass1_Sub1(); -}; - -// astruct_10, UnkStruct_02035064 -class UnkSubClass1_UnkownClass1 { -public: - /* 0x00 (vtable) */ - /* 0x04 */ unk16 unk_04; - /* 0x06 */ unk16 unk_06; - /* 0x08 */ u32* unk_08; - /* 0x0C */ unk32 unk_0C; - /* 0x10 */ unk32 unk_10; - /* 0x14 */ unk32 unk_14; - /* 0x18 */ unk32 unk_18; - /* 0x1C */ unk32 unk_1C; - /* 0x20 */ u32* unk_20; - /* 0x24 */ unk32 unk_24; - /* 0x28 */ unk32 unk_28; - /* 0x2C */ unk32 unk_2C; - /* 0x30 */ unk32 unk_30; - /* 0x34 */ u32* unk_34; - /* 0x38 */ u32* unk_38; - /* 0x3C */ unk32 unk_3C; - /* 0x40 */ unk32 unk_40; - /* 0x44 */ unk32 unk_44; - /* 0x48 */ unk32 unk_48; - /* 0x4C */ unk32 unk_4C; - /* 0x50 */ unk32 unk_50; - /* 0x54 */ unk32 unk_54; - /* 0x58 */ unk32 unk_58; - /* 0x5C */ UnkSubClass1_UnkownClass1_Sub1 unk_5C; - /* 0x74 */ u32* unk_74; - /* 0x78 */ u32* unk_78; - /* 0x7C */ unk32 unk_7C; - /* 0x80 */ unk16 unk_80; - /* 0x80 */ unk16 unk_82; - /* 0x84 */ unk16 unk_84; - /* 0x84 */ unk8 unk_86; - /* 0x84 */ unk8 unk_87; - /* 0x88 */ - - /* 0x00 */ virtual unk16 func_020351a8(void); - /* 0x04 */ virtual unk16 func_020351b0(void); - /* 0x08 */ - - static unk32 func_02035428(u8 param_2); - - UnkSubClass1_UnkownClass1(); - ~UnkSubClass1_UnkownClass1(); - void func_02034a1c(unk32, unk32, struct UnkStruct_01ffbe34*); - void func_02034b0c(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5, unk32 param_6); - void func_020350b4(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5, unk32 param_6); - void func_0203516c(void); - void func_020351b8(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); - void func_020352d8(void); -}; - -class UnkSubClass1_UnkownClass2_Base1 { -public: - /* 0x00 (vtable) */ - /* 0x04 */ u16* unk_00; // pointer to the current position in the message to display - /* 0x08 */ unk16 unk_08; - /* 0x0A */ unk16 unk_0A; - /* 0x0C */ unk16 unk_0C; - /* 0x0E */ unk16 unk_0E; - /* 0x10 */ unk32 unk_10; - - UnkSubClass1_UnkownClass2_Base1(); - /* 0x00 */ virtual ~UnkSubClass1_UnkownClass2_Base1() override; - /* 0x08 */ -}; - -typedef bool (*UnknownCallback)(class MsgProc_Type1*); - -// UnkStruct_0203881c -class UnkSubClass1_UnkownClass2 : public UnkSubClass1_UnkownClass2_Base1 { -public: - /* 0x14 */ unk32 unk_14; - /* 0x18 */ unk32 unk_18; - /* 0x1C */ UnknownCallback unk_1C; - /* 0x20 */ class MsgProc_Type1* unk_20; - /* 0x24 */ unk32 unk_24; - /* 0x2C */ - - UnkSubClass1_UnkownClass2(); - /* 0x00 */ virtual ~UnkSubClass1_UnkownClass2() override; - /* 0x08 */ - - void func_02038858(unk32); -}; - class UnkSubClass1_unk_410 { public: /* 0x00 */ struct MsgProc_Type1* unk_00; @@ -155,146 +48,6 @@ public: UnkStruct_0203b264* func_0203eeb0(unk32 param_2, unk32 param_3); }; -class UnkSubClass1_unk_124 { -public: - /* 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; - /* 0x10 */ unk32 unk_10; - /* 0x14 */ unk32 unk_14; - /* 0x18 */ unk32 unk_18; - /* 0x1C */ unk32 unk_1C; - /* 0x20 */ unk32 unk_20; - /* 0x24 */ unk32 unk_24; - /* 0x28 */ unk8 unk_28; - /* 0x29 */ unk8 unk_29; - /* 0x2A */ unk8 unk_2A; - /* 0x2B */ unk8 unk_2B; - /* 0x2C */ - - void func_0203f020(s16*, unk32); -}; - -class UnkSubClass1_02256FF8 { -public: - /* 0x00 (vtable) */ - /* 0x04 */ unk32 unk_04; - /* 0x08 */ unk32 unk_08; - /* 0x0C */ unk32 unk_0C; - /* 0x10 */ unk32 unk_10; - /* 0x14 */ unk32 unk_14; - /* 0x18 */ unk32 unk_18; - /* 0x1C */ u8 unk_1C; - /* 0x20 */ - - UnkSubClass1_02256FF8(); - /* 0x00 */ virtual ~UnkSubClass1_02256FF8() override; - /* 0x08 */ virtual UNK_TYPE vfunc_08(UNK_TYPE) override; - /* 0x0C */ virtual UNK_TYPE vfunc_0C(UNK_TYPE) override; - /* 0x10 */ virtual UNK_TYPE vfunc_10(UNK_TYPE) override; - /* 0x14 */ virtual UNK_TYPE vfunc_14(UNK_TYPE) override; - /* 0x18 */ virtual UNK_TYPE vfunc_18(UNK_TYPE) override; - /* 0x1C */ virtual UNK_TYPE vfunc_1C(UNK_TYPE) override; - /* 0x20 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override; - /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override; - /* 0x28 */ virtual UNK_TYPE vfunc_28(UNK_TYPE) override; - /* 0x2C */ virtual UNK_TYPE vfunc_2C(UNK_TYPE) override; - /* 0x30 */ virtual UNK_TYPE vfunc_30(UNK_TYPE) override; - /* 0x34 */ virtual UNK_TYPE vfunc_34(UNK_TYPE) override; - /* 0x38 */ virtual UNK_TYPE vfunc_38(UNK_TYPE) override; - /* 0x3C */ -}; - -struct UnkStruct_MsgProc_Base_unk_2C_2 { - /* 0x00 */ s8 unk_00; - /* 0x00 */ s8 unk_01; - /* 0x00 */ s8 unk_02; - /* 0x00 */ s8 unk_03; - /* 0x04 */ unk32 unk_04; - /* 0x00 */ u8* unk_08; - /* 0x04 */ -}; -struct UnkStruct_MsgProc_Base_unk_2C { - /* 0x00 */ UnkStruct_MsgProc_Base_unk_2C_2* unk_00; - /* 0x04 */ unk32 unk_04; - /* 0x08 */ unk32 unk_08; - /* 0x0C */ -}; - -// astruct_8, UnkStruct_02032e7c -class MsgProc_Base : public SysObject { -public: - /* 0x000 (vtable) */ - /* 0x004 */ unk32* unk_04; - /* 0x008 */ UnkSubClass1_02256FF8* unk_08; - /* 0x00C */ unk32 unk_0C; - /* 0x010 */ unk32* unk_10; - /* 0x014 */ s32 unk_14; - /* 0x018 */ s32 unk_18; - /* 0x01C */ unk32 unk_1C; - /* 0x020 */ unk32 unk_20; - /* 0x024 */ unk32* unk_24; - /* 0x028 */ unk32* unk_28; - /* 0x02C */ UnkStruct_MsgProc_Base_unk_2C* unk_2C; - /* 0x030 */ unk32 unk_30; - /* 0x034 */ unk32 unk_34; - /* 0x038 */ unk32 unk_38; - /* 0x03C */ unk16 unk_3C; - /* 0x03E */ unk16 unk_3E; - /* 0x040 */ unk32 unk_40; - /* 0x044 */ unk32 unk_44; - /* 0x048 */ u8 unk_48; - /* 0x049 */ u8 unk_49; - /* 0x04A */ u16 unk_4A; - /* 0x04C */ u8 unk_4C; - /* 0x04C */ unk8 unk_4D; - /* 0x04C */ unk8 unk_4E; - /* 0x04C */ unk8 unk_4F; - /* 0x050 */ u8 unk_50; - /* 0x051 */ unk8 unk_51; - /* 0x052 */ - - MsgProc_Base(); - /* 0x00 */ virtual ~MsgProc_Base(); - /* 0x08 */ /* func_02033030 */ virtual void vfunc_08(unk32* param_2, unk32* param_3); - /* 0x0C */ /* func_02033190 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); - /* 0x10 */ /* func_020331c4 */ virtual void vfunc_10(u8 param_2, u8 param_3); - /* 0x14 */ /* func_02032fcc */ virtual bool vfunc_14(u16 param_2, u8 param_3); - /* 0x18 */ /* func_020332e4 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4); - /* 0x1C */ /* func_02033360 */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); - /* 0x20 */ /* func_020333e0 */ virtual UNK_TYPE vfunc_20(UNK_TYPE); - /* 0x24 */ /* func_02033af4 */ virtual UNK_TYPE vfunc_24(UNK_TYPE); - - //! TODO: fake? - /* 0x28 */ virtual bool vfunc_28(void); - /* 0x2C */ virtual void vfunc_2C(void); - /* 0x30 */ virtual void vfunc_30(void); - /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2); - /* 0x38 */ virtual bool vfunc_38(void); - /* 0x3C */ virtual void vfunc_3C(unk32 param_2); - /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3); - /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); - /* 0x48 */ virtual void vfunc_48(void); - /* 0x4C */ virtual void vfunc_4C(void); - /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5); - /* 0x54 */ virtual void vfunc_54(void); - /* 0x58 */ virtual void vfunc_58(void); - /* 0x5C */ virtual void vfunc_5C(void); - /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4); - /* 0x64 */ virtual void vfunc_64(s16* param_2); - /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2); - /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3); - /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3); - /* 0x74 */ - - unk32* func_02032f98(unk32 param_2); - unk32 func_02032fa4(void); - unk32 func_02032fb4(void); - unk32 func_02033360(void); - unk32 func_020337d8(unk32 param_2); -}; - class MsgProc_Base2_unk_114 : public SysObject { public: /* 0x00 (vtable) */ @@ -310,109 +63,6 @@ public: unk32 func_0203d1b4(void); }; -// astruct_7, UnkStruct_0203dae0 -class MsgProc_Base2 : public MsgProc_Base { -public: - /* 0x052 */ unk16 unk_52; - /* 0x054 */ unk16 unk_54; - /* 0x054 */ unk16 unk_56; - /* 0x058 */ unk32 unk_58; - /* 0x05C */ s16 unk_5C; - /* 0x05E */ s16 unk_5E; - /* 0x060 */ unk32 unk_60; - /* 0x064 */ unk32 unk_64; - /* 0x068 */ unk32 unk_68; - /* 0x06C */ unk32 unk_6C; - /* 0x070 */ unk32 unk_70; - /* 0x074 */ unk32 unk_74; - /* 0x078 */ unk32 unk_78; - /* 0x07C */ unk32 unk_7C; - /* 0x080 */ unk32 unk_80; - /* 0x084 */ unk32 unk_84; - /* 0x088 */ unk32 unk_88; - /* 0x08C */ unk32 unk_8C; - /* 0x090 */ unk32 unk_90; - /* 0x094 */ unk32 unk_94; - /* 0x098 */ unk32 unk_98; - /* 0x09C */ unk32 unk_9C; - /* 0x0A0 */ unk32 unk_A0; - /* 0x0A4 */ unk32 unk_A4; - /* 0x0A8 */ unk32 unk_A8; - /* 0x0AC */ unk32 unk_AC; - /* 0x0B0 */ unk32 unk_B0; - /* 0x0B4 */ unk32 unk_B4; - /* 0x0B8 */ unk32 unk_B8; - /* 0x0BC */ unk32 unk_BC; - /* 0x0C0 */ unk32 unk_C0; - /* 0x0C4 */ unk32 unk_C4; - /* 0x0C8 */ unk32 unk_C8; - /* 0x0CC */ unk32 unk_CC; - /* 0x0D0 */ unk32 unk_D0; - /* 0x0D4 */ unk32 unk_D4; - /* 0x0D8 */ unk32 unk_D8; - /* 0x0DC */ unk32 unk_DC; - /* 0x0E0 */ unk32 unk_E0; - /* 0x0E4 */ unk32 unk_E4; - /* 0x0E8 */ unk32 unk_E8; - /* 0x0EC */ unk32 unk_EC; - /* 0x0F0 */ unk32 unk_F0; - /* 0x0F4 */ unk32 unk_F4; - /* 0x0F8 */ unk32 unk_F8; - /* 0x0FC */ unk32 unk_FC; - /* 0x100 */ unk32 unk_100; - /* 0x104 */ unk32 unk_104; - /* 0x108 */ unk8 unk_108; - /* 0x108 */ unk8 unk_109; - /* 0x108 */ unk8 unk_10A; - /* 0x108 */ unk8 unk_10B; - /* 0x10C */ unk32 unk_10C; - /* 0x110 */ unk32 unk_110; - /* 0x118 */ MsgProc_Base2_unk_114* unk_114; - /* 0x118 */ s32 unk_118; - /* 0x11C */ unk16 unk_11C; - /* 0x11E */ unk8 unk_11E; - /* 0x11F */ unk8 unk_11F; - /* 0x120 */ u8 unk_120; - /* 0x121 */ s8 unk_121; - /* 0x122 */ u8 unk_122; - /* 0x123 */ u8 unk_123; - /* 0x124 */ - - MsgProc_Base2(unk32 param_2, unk32 param_3, unk32 param_4); - //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~MsgProc_Base2(); - /* 0x08 */ /* func_0203e2ac */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; - /* 0x0C */ /* func_02039578 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; - /* 0x10 */ /* func_0203e060 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? - /* 0x14 */ /* func_0203dcb4 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; - /* 0x18 */ /* func_0203e284 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; - /* 0x1C */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; - /* 0x20 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override; - /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override; - /* 0x28 */ /* func_0203e0c8 */ virtual bool vfunc_28(void) override; - /* 0x2C */ /* func_0203e19c */ virtual void vfunc_2C(void) override; - /* 0x30 */ /* func_0203e090 */ virtual void vfunc_30(void) override; - - //! TODO: fake? - /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2) override; - /* 0x38 */ virtual bool vfunc_38(void) override; - /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override; - /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; - /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; - /* 0x48 */ virtual void vfunc_48(void) override; - /* 0x4C */ virtual void vfunc_4C(void) override; // func_02039a3c? - /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; - /* 0x54 */ virtual void vfunc_54(void) override; - /* 0x58 */ virtual void vfunc_58(void) override; - /* 0x5C */ virtual void vfunc_5C(void) override; - /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; - /* 0x64 */ virtual void vfunc_64(s16* param_2) override; - /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2) override; - /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; - /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; - /* 0x74 */ -}; - struct func_02038f44_param4 { u8 unk_00; u8 unk_01; @@ -426,337 +76,6 @@ struct func_02038f44_param4 { u8 unk_15; }; -// astruct_6, UnkStruct_02038aa0 -class MsgProc_Main : public MsgProc_Base2 { -public: - /* 0x124 */ UnkSubClass1_unk_124* unk_124; - /* 0x128 */ UnkSubClass1_UnkownClass2 unk_128; - /* 0x150 */ u8 unk_150[4]; - /* 0x154 */ EntryINF1* pInfoEntry; - /* 0x158 */ Vec2s unk_158; // textbox position? - /* 0x15C */ s16 unk_15C; - /* 0x15E */ s8 unk_15E; - /* 0x15F */ s8 unk_15F; - /* 0x160 */ unk8 unk_160; - /* 0x160 */ unk8 unk_161; - /* 0x160 */ unk16 unk_162; - /* 0x164 */ - - MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4); - //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~MsgProc_Main(); - /* 0x08 */ /* func_02039228 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; - /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; - /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? - /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; - /* 0x18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; - /* 0x1C */ /* func_0203905c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; - /* 0x20 */ /* func_020390a4 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override; - /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override; - /* 0x28 */ virtual bool vfunc_28(void) override; - /* 0x2C */ /* func_02038d20 */ virtual void vfunc_2C(void) override; - /* 0x30 */ /* func_02038ed0 */ virtual void vfunc_30(void) override; - /* 0x34 */ /* func_02038c34 */ virtual unk32 vfunc_34(unk32 param_2) override; - /* 0x38 */ /* func_02039570 */ virtual bool vfunc_38(void) override; - - //! TODO: fake? - /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override; - /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; - /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; - /* 0x48 */ virtual void vfunc_48(void) override; - /* 0x4C */ virtual void vfunc_4C(void) override; // func_02039a3c? - /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; - /* 0x54 */ virtual void vfunc_54(void) override; - /* 0x58 */ virtual void vfunc_58(void) override; - /* 0x5C */ virtual void vfunc_5C(void) override; - /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; - /* 0x64 */ virtual void vfunc_64(s16* param_2) override; - /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2) override; - /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; - /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; - /* 0x74 */ - - static void func_020387e0(u8* param_2); - - unk32 func_02032fb4(void); - u16* func_02037604(u16**); - - void func_02038b28(void); - void func_02038b34(u8 param_2, u8 param_3); - void func_02038b40(void); - void func_02038b74(void); // is this a dtor? - bool func_02038b78(void); - unk32 func_02038cb8(unk32 param_2); - void func_02038ef4(unk32 param_2, unk32 param_3); - void func_02038f40(void); - void func_02038f44(EntryINF1* param_2, u32 param_3, func_02038f44_param4* param_4, UnkSubClass1_02256FF8* param_5, unk32 param_6); - void func_02039058(void); - unk32 func_0203905c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); - - void func_02039208(unk32 param_2); - unk32 func_02038d10(void); - void func_02038d20(void); - void func_020392b4(void); - void func_02039398(void); - void func_020393a8(s16* param_2); - void func_0203a188(unk32, unk32); - unk32 func_0203a3e0(void); - unk32 func_0203cb5c(unk8, s16); - void func_0203dc10(u8 param_2); - void func_0203dc10(u8 param_2, u8 param_3); - void func_0203dcfc(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); - unk32 func_0203de14(unk32); - void func_0203e090(void); - void func_0203e0f8(void); - void func_0203e1b0(unk32, unk32, unk32); - void func_02039440(unk32, unk32); - - // not sure it belongs to this class: - void func_02032fcc(unk32, unk32); - void func_02033190(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); - void func_020331c4(unk32, unk32); - unk32 func_02038cf4(void); - void func_0203947c(void); - unk32 func_0203951c(void); - void func_0203cabc(unk32); - unk32 func_0203e284(UnkStruct_0203b264*, unk32, unk32); - void func_0203e2ac(unk32* param_2); - void func_0203fc78(unk32*, unk32*); - s16 func_0203d318(s16, s16); -}; - -// does it host both choices? -struct UnknownMsgChoiceStruct { - /* 0x00 */ UnkStruct_0203b264* unk_00; - /* 0x04 */ unk32 unk_04; - /* 0x08 */ -}; - -// astruct_2, UnkStruct_020397f8 -class MsgProc_Type1 : public MsgProc_Main { -public: - /* 0x164 */ MsgProc_Type1* unk_164; - /* 0x168 */ UnkSubClass1_UnkownClass1 unk_168; - /* 0x1F0 */ UnkSubClass1_UnkownClass1 unk_1F0; - /* 0x278 */ UnkSubClass1_UnkownClass1 unk_278; - /* 0x300 */ UnkSubClass1_UnkownClass1 unk_300; - /* 0x388 */ UnkSubClass1_UnkownClass1 unk_388; - /* 0x410 */ UnkSubClass1_unk_410 unk_410; - /* 0x414 */ unk32 unk_414; - /* 0x418 */ MsgProc_Main* unk_418; - /* 0x41C */ unk16 unk_41C; - /* 0x41C */ unk16 unk_41E; - /* 0x420 */ unk16 unk_420; - /* 0x420 */ unk16 unk_422; - /* 0x424 */ UnkSubClass1_unk_424 unk_424; - /* 0x428 */ UnknownMsgChoiceStruct unk_428[0x20]; - /* 0x528 */ unk16 unk_528[4]; // number of choices? - /* 0x55C */ unk32 unk_530; - /* 0x55C */ unk16 unk_534; - /* 0x55C */ unk16 unk_536; - /* 0x55C */ unk16 unk_538; - /* 0x55C */ unk16 unk_53A; - /* 0x55C */ unk32 unk_53C; - /* 0x55C */ unk32 unk_540; - /* 0x55C */ unk8 unk_544; - /* 0x55C */ unk8 unk_545; - /* 0x55C */ unk8 unk_546; - /* 0x55C */ unk8 unk_547; - /* 0x55C */ unk16 unk_548; - /* 0x55C */ unk16 unk_54A; - /* 0x55C */ unk16 unk_54C; - /* 0x55C */ unk16 unk_54E; - /* 0x55C */ unk32 unk_550; - /* 0x55C */ unk32 unk_554; - /* 0x55C */ unk8 unk_558; - /* 0x55C */ unk8 unk_559; - /* 0x55C */ unk8 unk_55A; - /* 0x55C */ unk8 unk_55B; - /* 0x55C */ unk32 unk_55C; - /* 0x560 */ unk32 unk_560; - /* 0x564 */ u16 unk_564[4]; - /* 0x56C */ unk16 unk_56C; - /* 0x56E */ unk16 unk_56E; - /* 0x570 */ unk16 unk_570; - /* 0x572 */ u16 unk_572; - /* 0x574 */ s16 unk_574; - /* 0x576 */ unk16 unk_576; - /* 0x578 */ s16 unk_578; - /* 0x57A */ u8 unk_57A; - /* 0x57B */ s8 unk_57B; - /* 0x57C */ u8 unk_57C; - /* 0x57D */ u8 unk_57D; - /* 0x57E */ u8 unk_57E; - /* 0x57F */ u8 unk_57F; - /* 0x580 */ u8 unk_580; - /* 0x581 */ u8 unk_581; - /* 0x582 */ u8 unk_582; - /* 0x583 */ u8 unk_583; - /* 0x584 */ u8 unk_584; - /* 0x585 */ u8 unk_585; - /* 0x586 */ u8 unk_586; - /* 0x586 */ u8 unk_587; - /* 0x588 */ UnkSubClass1_unk_124 unk_588; - /* 0x5B4 */ - - MsgProc_Type1(); - MsgProc_Type1(unk32 param_2, unk16 param_3, unk32 param_4); - //! TODO: remove the function declarations that are not overridden - /* 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; - /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; - /* 0x18 */ /* func_0203b264 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; - /* 0x1C */ /* func_0203b310 */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; - /* 0x20 */ /* func_0203b814 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override; - /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override; - /* 0x28 */ virtual bool vfunc_28(void) override; - /* 0x2C */ /* func_02039a5c */ virtual void vfunc_2C(void) override; - /* 0x30 */ virtual void vfunc_30(void) override; - /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2) override; - /* 0x38 */ /* func_0203c350 */ virtual bool vfunc_38(void) override; - /* 0x3C */ /* func_02039ccc */ virtual void vfunc_3C(unk32 param_2) override; - /* 0x40 */ /* func_02039d74 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; - /* 0x44 */ /* func_0203a3fc */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; - /* 0x48 */ /* func_0203a328 */ virtual void vfunc_48(void) override; - /* 0x4C */ /* func_02039a3c */ virtual void vfunc_4C(void) override; - /* 0x50 */ /* func_0203a7f0 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; - /* 0x54 */ /* func_0203a988 */ virtual void vfunc_54(void) override; - /* 0x58 */ /* func_0203af1c */ virtual void vfunc_58(void) override; - /* 0x5C */ /* func_0203aea8 */ virtual void vfunc_5C(void) override; - /* 0x60 */ /* func_0203b410 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; - /* 0x64 */ /* func_0203b5d0 */ virtual void vfunc_64(s16* param_2) override; - /* 0x68 */ /* func_020393d0 */ virtual unk32 vfunc_68(unk32 param_2) override; - /* 0x6C */ /* func_0203bdcc */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; - /* 0x70 */ /* func_020394d8 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; - /* 0x74 */ - - static bool func_0203c25c(class MsgProc_Type1* param_1); - static void func_0203e060(MsgProc_Main* param_1, u8 param_2, u8 param_3); - - void func_02039a3c(void); - - unk32 func_02039250(void); - void func_02039ca8(void); - void func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4); - bool func_0203a2c0(void); - unk32 func_0203a30c(void); - void func_0203a35c(void); - bool func_0203a3e0(void); - bool func_0203a6d0(unk32 param_2, unk32 param_3); - bool func_0203b0bc(void); - unk32 func_0203b0ec(unk32 param_2); - void func_0203b764(void); - void func_0203bd8c(u16 param_2); - void func_0203be08(void); - void func_0203be64(void); - unk32 func_0203c084(void); - bool func_0203c13c(void); - unk32 func_0203c1a0(void); -}; - -class MsgProc_Type3 : public MsgProc_Main { -public: - /* 0x164 */ unk16 unk_164; - /* 0x166 */ unk16 unk_166; - /* 0x168 */ unk16 unk_168; - /* 0x16A */ unk16 unk_16A; - /* 0x16C */ unk16 unk_16C; - /* 0x16E */ unk16 unk_16E; - /* 0x170 */ unk16 unk_170; - /* 0x172 */ unk16 unk_172; - /* 0x174 */ unk16 unk_174; - /* 0x178 */ unk32 unk_178; - /* 0x17C */ unk32 unk_17C; - /* 0x180 */ UnkClass_func_ov000_020d0644 unk_180[4]; - /* 0x1C0 */ - - MsgProc_Type3(); - MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4); - //! TODO: remove the function declarations that are not overridden - /* 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? - /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; - /* 0x18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; - /* 0x1C */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; - /* 0x20 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override; - /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override; - /* 0x28 */ virtual bool vfunc_28(void) override; - /* 0x2C */ virtual void vfunc_2C(void) override; - /* 0x30 */ virtual void vfunc_30(void) override; - /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2) override; - /* 0x38 */ virtual bool vfunc_38(void) override; - /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override; - /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; - /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; - /* 0x48 */ virtual void vfunc_48(void) override; - /* 0x4C */ virtual void vfunc_4C(void) override; // func_02039a3c? - /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; - /* 0x54 */ virtual void vfunc_54(void) override; - /* 0x58 */ virtual void vfunc_58(void) override; - /* 0x5C */ virtual void vfunc_5C(void) override; - /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; - /* 0x64 */ virtual void vfunc_64(s16* param_2) override; - /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2) override; - /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; - /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; - /* 0x74 */ - - static void func_0203c83c(void); -}; - -class MsgProc_Type2 : public MsgProc_Main { -public: - /* 0x164 */ unk16 unk_164; - /* 0x164 */ unk16 unk_166; - /* 0x164 */ unk16 unk_168; - /* 0x164 */ unk16 unk_16A; - /* 0x164 */ unk16 unk_16C; - /* 0x164 */ unk16 unk_16E; - /* 0x170 */ - - MsgProc_Type2(); - MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4); - //! TODO: remove the function declarations that are not overridden - /* 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? - /* 0x14 */ /* func_0203c5c4 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; - /* 0x18 */ /* func_0203e284 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; - /* 0x1C */ /* func_0203905c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; - /* 0x20 */ /* func_020390a4 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override; - /* 0x24 */ /* astruct_8::vfunc_24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override; - /* 0x28 */ /* func_0203e0c8 */ virtual bool vfunc_28(void) override; - /* 0x2C */ /* func_02038d20 */ virtual void vfunc_2C(void) override; - /* 0x30 */ /* func_02038ed0 */ virtual void vfunc_30(void) override; - /* 0x34 */ /* func_02038c34 */ virtual unk32 vfunc_34(unk32 param_2) override; - /* 0x38 */ /* func_02039570 */ virtual bool vfunc_38(void) override; - /* 0x3C */ /* func_0203c414 */ virtual void vfunc_3C(unk32 param_2) override; - /* 0x40 */ /* func_0203c460 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; - /* 0x44 */ /* func_02038f40 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; - /* 0x48 */ /* func_02038b74 */ virtual void vfunc_48(void) override; - /* 0x4C */ /* func_0203c39c */ virtual void vfunc_4C(void) override; // func_02039a3c? - /* 0x50 */ /* func_02038f44 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; - /* 0x54 */ /* func_020392b4 */ virtual void vfunc_54(void) override; - /* 0x58 */ /* func_02039398 */ virtual void vfunc_58(void) override; - /* 0x5C */ /* func_02039058 */ virtual void vfunc_5C(void) override; - /* 0x60 */ /* func_020393a4 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; - /* 0x64 */ /* func_020393a8 */ virtual void vfunc_64(s16* param_2) override; - /* 0x68 */ /* func_020393d0 */ virtual unk32 vfunc_68(unk32 param_2) override; - /* 0x6C */ /* func_0203947c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; - /* 0x70 */ /* func_020394d8 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; - /* 0x74 */ - - //! TODO: vfunc_4C? - void func_0203c39c(unk32 param_2, unk32 param_3); - - void func_0203c4ac(unk32, unk32); -}; - // TEMPORARY extern "C" u32 func_01ff9b4c(unk32, unk32); diff --git a/include/Unknown/UnkStruct_0202e1a0.hpp b/include/Unknown/UnkStruct_0202e1a0.hpp index a99956bc..d6d6a793 100644 --- a/include/Unknown/UnkStruct_0202e1a0.hpp +++ b/include/Unknown/UnkStruct_0202e1a0.hpp @@ -3,6 +3,7 @@ #include "global.h" #include "types.h" +// astruct_11 struct UnkStruct_0202e1a0 { /* 00 */ unk16 mUnk_00; /* 02 */ unk16 mUnk_02; diff --git a/include/Unknown/UnkStruct_02032f0c.hpp b/include/Unknown/UnkStruct_02032f0c.hpp index 4907f95d..60e807ab 100644 --- a/include/Unknown/UnkStruct_02032f0c.hpp +++ b/include/Unknown/UnkStruct_02032f0c.hpp @@ -2,12 +2,12 @@ #include "global.h" #include "types.h" +#include "Message/BMG.hpp" -// MsgProc_Base class UnkStruct_02032e7c { public: /* 00 (vtable) */ - /* 04 */ unk32 mUnk_04; + /* 04 */ u16* mUnk_04; // pointer to the current position in the message to display /* 08 */ unk16 mUnk_08; /* 0a */ unk16 mUnk_0a; /* 0c */ unk16 mUnk_0c; @@ -21,20 +21,79 @@ public: UnkStruct_02032e7c(); }; +class UnkSubClass1_02256FF8 { +public: + /* 0x00 (vtable) */ + /* 0x04 */ unk32 unk_04; + /* 0x08 */ unk32 unk_08; + /* 0x0C */ unk32 unk_0C; + /* 0x10 */ unk32 unk_10; + /* 0x14 */ unk32 unk_14; + /* 0x18 */ unk32 unk_18; + /* 0x1C */ u8 unk_1C; + /* 0x20 */ + + UnkSubClass1_02256FF8(); + /* 0x00 */ virtual ~UnkSubClass1_02256FF8() override; + /* 0x08 */ virtual void vfunc_08(void) override; + /* 0x0C */ virtual void vfunc_0c(void) override; + /* 0x10 */ virtual void vfunc_10(void) override; + /* 0x14 */ virtual void vfunc_14(void) override; + /* 0x18 */ virtual void vfunc_18(void) override; + /* 0x1C */ virtual void vfunc_1c(void) override; + /* 0x20 */ virtual void vfunc_20(void) override; + /* 0x24 */ virtual void vfunc_24(void) override; + /* 0x28 */ virtual void vfunc_28(void) override; + /* 0x2C */ virtual void vfunc_2c(void) override; + /* 0x30 */ virtual void vfunc_30(void) override; + /* 0x34 */ virtual void vfunc_34(void) override; + /* 0x38 */ virtual void vfunc_38(void) override; + /* 0x3C */ +}; + +struct UnkStruct_MsgProc_Base_unk_2C { + /* 0x00 */ s8 unk_00; + /* 0x00 */ s8 unk_01; + /* 0x00 */ s8 unk_02; + /* 0x00 */ s8 unk_03; + /* 0x04 */ unk32 unk_04; + /* 0x00 */ u8* unk_08; + /* 0x04 */ +}; + +struct func_0203b410_param_2 { + unk32 unk_00; + unk32 unk_04; + unk32 unk_08; + unk32 unk_0C; + unk16 unk_10; + unk16 unk_12; +}; + +// astruct_8, MsgProc_Base class UnkStruct_02032f0c { public: /* 00 (vtable) */ - /* 04 */ unk32 mUnk_04; - /* 08 */ unk32 mUnk_08; + /* 04 */ unk32* mUnk_04; + /* 08 */ UnkSubClass1_02256FF8* mUnk_08; /* 0c */ u16 *mUnk_0c; - /* 10 */ unk32 mUnk_10[6]; - /* 28 */ unk32 mUnk_28; - /* 2c */ s32 **mUnk_2c; + /* 0x010 */ unk32* unk_10; + /* 0x014 */ s32 unk_14; + /* 0x018 */ s32 unk_18; + /* 0x01C */ unk32 unk_1C; + /* 0x020 */ unk32 unk_20; + /* 0x024 */ unk32* unk_24; + /* 28 */ unk32* mUnk_28; + /* 2c */ UnkStruct_MsgProc_Base_unk_2C **mUnk_2c; /* 30 */ s32 mUnk_30; /* 34 */ s32 mUnk_34; /* 38 */ unk32 mUnk_38; /* 3c */ unk16 mUnk_3c; - /* 3e */ unk16 mUnk_3e[6]; + /* 0x03E */ unk16 unk_3E; + /* 0x040 */ unk32 unk_40; + /* 0x044 */ unk32 unk_44; + /* 0x048 */ u8 unk_48; + /* 0x049 */ u8 unk_49; /* 4a */ u16 mUnk_4a; /* 4c */ u8 mUnk_4c; /* 4d */ bool mUnk_4d; @@ -55,12 +114,45 @@ public: /* 24 */ virtual bool vfunc_24(s16 **param1); /* 28 */ + // /* 0x08 */ /* func_02033030 */ virtual void vfunc_08(unk32* param_2, unk32* param_3); + // /* 0x0C */ /* func_02033190 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); + // /* 0x10 */ /* func_020331c4 */ virtual void vfunc_10(u8 param_2, u8 param_3); + // /* 0x14 */ /* func_02032fcc */ virtual bool vfunc_14(u16 param_2, u8 param_3); + // /* 0x18 */ /* func_020332e4 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4); + // /* 0x1C */ /* func_02033360 */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); + // /* 0x20 */ /* func_020333e0 */ virtual UNK_TYPE vfunc_20(UNK_TYPE); + // /* 0x24 */ /* func_02033af4 */ virtual UNK_TYPE vfunc_24(UNK_TYPE); + + //! TODO: fake? + /* 0x28 */ virtual bool vfunc_28(void); + /* 0x2C */ virtual void vfunc_2C(void); + /* 0x30 */ virtual void vfunc_30(void); + /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2); + /* 0x38 */ virtual bool vfunc_38(void); + /* 0x3C */ virtual void vfunc_3C(unk32 param_2); + /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3); + /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); + /* 0x48 */ virtual void vfunc_48(void); + /* 0x4C */ virtual void vfunc_4C(void); + /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5); + /* 0x54 */ virtual void vfunc_54(void); + /* 0x58 */ virtual void vfunc_58(void); + /* 0x5C */ virtual void vfunc_5C(void); + /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4); + /* 0x64 */ virtual void vfunc_64(s16* param_2); + /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2); + /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3); + /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3); + /* 0x74 */ + UnkStruct_02032f0c(); void func_02032f94(); + unk32* func_02032f98(unk32 param_2); u16 **SetUnk_0c(u16 *value); u8 func_02032fa4(); s32 func_02032fb4(); void func_02033214(unk32 param1, unk32 param2, unk32 param3, u8 param4, unk32 param5); + unk32 func_02033360(void); void func_020334b4(u32 param1, s32 param2, s32 param3, s32 param4); void func_02033628(unk32 param1, u16 *param2); u32 func_0203369c(u16 *param1, s32 param2); diff --git a/include/Unknown/UnkStruct_02035064.hpp b/include/Unknown/UnkStruct_02035064.hpp index 69011e21..b48f7768 100644 --- a/include/Unknown/UnkStruct_02035064.hpp +++ b/include/Unknown/UnkStruct_02035064.hpp @@ -9,18 +9,31 @@ class UnkStruct_02035064 { public: /* 00 (vtable) */ /* 04 */ unk32 mUnk_04; - /* 08 */ unk8 mUnk_08[0xc]; + /* 0x08 */ u32* unk_08; + /* 0x0C */ unk32 unk_0C; + /* 0x10 */ unk32 unk_10; /* 14 */ u32 mUnk_14; - /* 18 */ unk8 mUnk_18[0x4]; + /* 18 */ unk32 unk_18; /* 1c */ unk32 mUnk_1c; - /* 20 */ u32 mUnk_20; - /* 24 */ unk8 mUnk_24[0x28]; + /* 20 */ u32* mUnk_20; + /* 0x24 */ unk32 unk_24; + /* 0x28 */ unk32 unk_28; + /* 0x2C */ unk32 unk_2C; + /* 0x30 */ unk32 unk_30; + /* 0x34 */ u32* unk_34; + /* 0x38 */ u32* unk_38; + /* 0x3C */ unk32 unk_3C; + /* 0x40 */ unk32 unk_40; + /* 0x44 */ unk32 unk_44; + /* 0x48 */ unk32 unk_48; /* 4c */ s16 mUnk_4c; /* 4e */ s16 mUnk_4e; - /* 50 */ unk8 mUnk_50[0xc]; + /* 50 */ unk32 unk_50; + /* 0x54 */ unk32 unk_54; + /* 0x58 */ unk32 unk_58; /* 5c */ UnkStruct_0202e1a0 mUnk_5c; /* 74 */ u16 *mUnk_74; - /* 78 */ s32 mUnk_78; + /* 78 */ s32* mUnk_78; /* 7c */ u32 mUnk_7c; /* 80 */ u16 mUnk_80; /* 82 */ unk16 mUnk_82; @@ -29,13 +42,15 @@ public: /* 87 */ unk8 mUnk_87; /* 88 */ - /* 0 */ virtual s32 vfunc_0(); - /* 4 */ virtual s32 vfunc_4(); + /* 0 */ virtual s32 vfunc_0(); // func_020351a8 + /* 4 */ virtual s32 vfunc_4(); // func_020351b0 /* 8 */ UnkStruct_02035064(); ~UnkStruct_02035064(); + void func_02034a1c(unk32, unk32, struct UnkStruct_01ffbe34*); + void func_02034b0c(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5, unk32 param_6); void func_020350b0(); void func_020350b4(s32 param1, unk32 param2, unk8 param3, unk16 param4, unk16 param5); void func_0203516c(); diff --git a/include/Unknown/UnkStruct_02037750.hpp b/include/Unknown/UnkStruct_02037750.hpp index 5fe84a89..138ae201 100644 --- a/include/Unknown/UnkStruct_02037750.hpp +++ b/include/Unknown/UnkStruct_02037750.hpp @@ -4,21 +4,25 @@ #include "types.h" #include "Player/LinkStateInteract.hpp" +#include "System/SysNew.hpp" -class UnkStruct_02037750 { +class MsgProc_Type1; + +// astruct_14 +class UnkStruct_02037750 : public SysObject { public: /* 00 (vtable) */ /* 04 */ unk32 mUnk_04[0x4]; /* 14 */ unk32 mUnk_14; - /* 18 */ unk32 mUnk_18; + /* 18 */ u32 mUnk_18; /* 1c */ u8 mUnk_1c; - /* 1d */ unk8 mUnk_1d; + /* 1d */ u8 mUnk_1d; /* 1e */ u16 mUnk_1e; /* 20 */ /* 00 */ virtual ~UnkStruct_02037750(); - /* 08 */ virtual void vfunc_08(unk32 param1); - /* 0c */ virtual void vfunc_0c(s32 param1); + /* 08 */ virtual void vfunc_08(u32 param1); + /* 0c */ virtual void vfunc_0c(class MsgProc_Type1* param1); /* 10 */ virtual void vfunc_10(); /* 14 */ virtual void vfunc_14(); /* 18 */ virtual void vfunc_18(); @@ -35,17 +39,34 @@ public: void func_020385d0(s32 param1, unk32 *param2); }; +class UnkStruct_020386d8_24 { +public: + /* 0x00 */ unk32 mUnk_00; + /* 0x04 */ + + void func_020376c0(Vec3p param_2); +}; + +// astruct_15 class UnkStruct_020386d8 : public UnkStruct_02037750 { public: /* 00 (base) */ /* 20 */ unk8 mUnk_20; /* 21 */ unk8 mUnk_21[0x3]; - /* 24 */ unk32 mUnk_24; - /* 28 */ + /* 24 */ UnkStruct_020386d8_24 mUnk_24; + /* 28 */ unk32 mUnk_28; + /* 2C */ unk32 mUnk_2C; + /* 30 */ unk32 mUnk_30; + /* 34 */ unk16 mUnk_34; + /* 36 */ unk16 mUnk_36; + /* 38 */ u8 mUnk_38; + /* 39 */ u8 mUnk_39; + /* 3A */ unk16 mUnk_3A; + /* 3C */ UnkStruct_020386d8(); /* 00 */ virtual ~UnkStruct_020386d8(); - /* 08 */ virtual void vfunc_08(unk32 param1); + /* 08 */ virtual void vfunc_08(u32 param1); /* 24 */ virtual void vfunc_24(unk32 param1); /* 28 */ virtual void vfunc_28(); /* 30 */ virtual unk32 vfunc_30(); diff --git a/include/Unknown/UnkStruct_02038aa0.hpp b/include/Unknown/UnkStruct_02038aa0.hpp index 1053b7ef..0f00c585 100644 --- a/include/Unknown/UnkStruct_02038aa0.hpp +++ b/include/Unknown/UnkStruct_02038aa0.hpp @@ -6,14 +6,15 @@ #include "Unknown/UnkStruct_0203dae0.hpp" class UnkStruct_02038aa0; +typedef bool (*UnknownCallback)(class MsgProc_Type1*); class UnkStruct_0203881c : public UnkStruct_02032e7c { public: /* 00 (base) */ /* 14 */ unk32 mUnk_14; /* 18 */ unk32 mUnk_18; - /* 1c */ unk32 mUnk_1c; - /* 20 */ unk32 mUnk_20; + /* 1c */ UnknownCallback mUnk_1c; + /* 20 */ class MsgProc_Type1* mUnk_20; /* 24 */ unk32 mUnk_24; /* 28 */ @@ -27,24 +28,40 @@ public: void func_02038a80(s32 param1); }; +class UnkSubClass1_unk_124 { +public: + /* 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; + /* 0x10 */ unk32 unk_10; + /* 0x14 */ unk32 unk_14; + /* 0x18 */ unk32 unk_18; + /* 0x1C */ unk32 unk_1C; + /* 0x20 */ unk32 unk_20; + /* 0x24 */ unk32 unk_24; + /* 0x28 */ unk8 unk_28; + /* 0x29 */ unk8 unk_29; + /* 0x2A */ unk8 unk_2A; + /* 0x2B */ unk8 unk_2B; + /* 0x2C */ + + void func_0203f020(s16*, unk32); +}; + +// astruct_6, MsgProc_Main class UnkStruct_02038aa0 : public UnkStruct_0203dae0 { public: /* 000 (base) */ /* 123 */ unk8 mUnk_123; - /* 124 */ unk32 mUnk_124; - /* 128 */ unk32 mUnk_128; - /* 12c */ unk32 mUnk_12c; - /* 130 */ unk8 mUnk_130[0x20]; - /* 150 */ unk8 mUnk_150; - /* 151 */ unk8 mUnk_151; - /* 152 */ unk8 mUnk_152; - /* 153 */ unk8 mUnk_153; - /* 154 */ unk32 mUnk_154; - /* 158 */ unk8 mUnk_158[0x2]; - /* 15a */ unk16 mUnk_15a; - /* 15c */ unk16 mUnk_15c; - /* 15e */ u8 mUnk_15e; - /* 15f */ u8 mUnk_15f; + /* 124 */ UnkSubClass1_unk_124* mUnk_124; + /* 128 */ UnkStruct_0203881c mUnk_128; + /* 150 */ u8 unk_150[4]; + /* 154 */ EntryINF1* pInfoEntry; + /* 158 */ Vec2s unk_158; // textbox position? + /* 15c */ s16 mUnk_15c; + /* 15e */ s8 mUnk_15e; + /* 15f */ s8 mUnk_15f; /* 160 */ u8 mUnk_160; /* 161 */ @@ -73,6 +90,20 @@ public: /* 70 */ virtual void vfunc_70(s32 *param1, s32 *param2); /* 74 */ + // /* 0x08 */ /* func_02039228 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; + // /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; + // /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? + // /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; + // /* 0x18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; + // /* 0x1C */ /* func_0203905c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; + // /* 0x20 */ /* func_020390a4 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override; + // /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override; + // /* 0x28 */ virtual bool vfunc_28(void) override; + // /* 0x2C */ /* func_02038d20 */ virtual void vfunc_2C(void) override; + // /* 0x30 */ /* func_02038ed0 */ virtual void vfunc_30(void) override; + // /* 0x34 */ /* func_02038c34 */ virtual unk32 vfunc_34(unk32 param_2) override; + // /* 0x38 */ /* func_02039570 */ virtual bool vfunc_38(void) override; + UnkStruct_02038aa0(u8 param1, u8 param2); void func_02038b34(u32 param1, unk32 param2); void func_02038b40(); @@ -85,4 +116,42 @@ public: unk32 func_02039250(); void func_02039440(unk32 param1, unk32 param2); bool func_0203951c(); + + static void func_020387e0(u8* param_2); + + unk32 func_02032fb4(void); + u16* func_02037604(u16**); + void func_02038b28(void); + void func_02038b74(void); // is this a dtor? + void func_02038f40(void); + void func_02038f44(EntryINF1* param_2, u32 param_3, func_02038f44_param4* param_4, UnkSubClass1_02256FF8* param_5, unk32 param_6); + void func_02039058(void); + unk32 func_0203905c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); + void func_02038d20(void); + void func_020392b4(void); + void func_02039398(void); + void func_020393a8(s16* param_2); + void func_0203a188(unk32, unk32); + unk32 func_0203a3e0(void); + unk32 func_0203cb5c(unk8, s16); + + void func_0203dc10(u8 param_2); + void func_0203dc10(u8 param_2, u8 param_3); + + void func_0203dcfc(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); + unk32 func_0203de14(unk32); + void func_0203e090(void); + void func_0203e0f8(void); + void func_0203e1b0(unk32, unk32, unk32); + + //! TODO: not sure it belongs to this class: + void func_02032fcc(unk32, unk32); + void func_02033190(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); + void func_020331c4(unk32, unk32); + void func_0203947c(void); + void func_0203cabc(unk32); + unk32 func_0203e284(UnkStruct_0203b264*, unk32, unk32); + void func_0203e2ac(unk32* param_2); + void func_0203fc78(unk32*, unk32*); + s16 func_0203d318(s16, s16); }; diff --git a/include/Unknown/UnkStruct_020397f8.hpp b/include/Unknown/UnkStruct_020397f8.hpp index 53c37017..6d1b6fdc 100644 --- a/include/Unknown/UnkStruct_020397f8.hpp +++ b/include/Unknown/UnkStruct_020397f8.hpp @@ -6,39 +6,65 @@ #include "Unknown/UnkStruct_02035064.hpp" #include "Unknown/UnkStruct_02038aa0.hpp" +// does it host both choices? +struct UnknownMsgChoiceStruct { + /* 0x00 */ UnkStruct_0203b264* unk_00; + /* 0x04 */ unk32 unk_04; + /* 0x08 */ +}; + +// astruct_2, MsgProc_Type1 class UnkStruct_020397f8 : public UnkStruct_02038aa0 { public: /* 000 (base) */ /* 161 */ unk8 mUnk_161[0x3]; - /* 164 */ unk32 mUnk_164; + /* 164 */ MsgProc_Type1* mUnk_164; /* 168 */ UnkStruct_02035064 mUnk_168; /* 1f0 */ UnkStruct_02035064 mUnk_1f0; /* 278 */ UnkStruct_02035064 mUnk_278; /* 300 */ UnkStruct_02035064 mUnk_300; /* 388 */ UnkStruct_02035064 mUnk_388; - /* 410 */ unk32 *mUnk_410; + /* 410 */ unk32 *mUnk_410; // UnkSubClass1_unk_410? /* 414 */ unk32 mUnk_414; - /* 418 */ unk32 mUnk_418; + /* 418 */ UnkStruct_02038aa0* mUnk_418; /* 41c */ unk16 mUnk_41c; /* 41e */ unk16 mUnk_41e; /* 420 */ unk16 mUnk_420; - /* 422 */ unk8 mUnk_422[0x2]; - /* 424 */ unk32 *mUnk_424; - /* 428 */ unk32 mUnk_428; - /* 42c */ unk8 mUnk_42c[0x124]; + /* 422 */ unk16 unk_422; + /* 424 */ unk32 *mUnk_424; // UnkSubClass1_unk_424? + /* 428 */ UnknownMsgChoiceStruct unk_428[0x20]; + /* 0x528 */ unk16 unk_528[4]; // number of choices? + /* 0x55C */ unk32 unk_530; + /* 0x55C */ unk16 unk_534; + /* 0x55C */ unk16 unk_536; + /* 0x55C */ unk16 unk_538; + /* 0x55C */ unk16 unk_53A; + /* 0x55C */ unk32 unk_53C; + /* 0x55C */ unk32 unk_540; + /* 0x55C */ unk8 unk_544; + /* 0x55C */ unk8 unk_545; + /* 0x55C */ unk8 unk_546; + /* 0x55C */ unk8 unk_547; + /* 0x55C */ unk16 unk_548; + /* 0x55C */ unk16 unk_54A; + /* 0x55C */ unk16 unk_54C; + /* 0x55C */ unk16 unk_54E; /* 550 */ unk32 mUnk_550; /* 554 */ unk32 mUnk_554; - /* 558 */ unk8 mUnk_558[0x4]; + /* 558 */ unk8 unk_558; + /* 0x55C */ unk8 unk_559; + /* 0x55C */ unk8 unk_55A; + /* 0x55C */ unk8 unk_55B; /* 55c */ unk32 mUnk_55c; /* 560 */ unk32 mUnk_560; - /* 564 */ unk8 mUnk_564[0x8]; + /* 564 */ u16 unk_564[4]; /* 56c */ unk16 mUnk_56c; /* 56e */ unk16 mUnk_56e; /* 570 */ unk16 mUnk_570; - /* 572 */ unk16 mUnk_572; - /* 574 */ unk16 mUnk_574; + /* 572 */ u16 mUnk_572; + /* 574 */ s16 mUnk_574; /* 576 */ unk16 mUnk_576; - /* 578 */ unk16 mUnk_578; + /* 578 */ s16 mUnk_578; /* 57a */ u8 mUnk_57a; /* 57b */ u8 mUnk_57b; /* 57c */ u8 mUnk_57c; @@ -53,8 +79,8 @@ public: /* 585 */ u8 mUnk_585; /* 586 */ u8 mUnk_586; /* 587 */ unk8 mUnk_587; - /* 588 */ unk32 mUnk_588; - /* 58c */ + /* 588 */ UnkSubClass1_unk_124 mUnk_588; + /* 5b4 */ UnkStruct_020397f8(); /* 4c */ virtual void vfunc_4c(); @@ -93,4 +119,127 @@ public: /* 00 */ virtual ~UnkStruct_020397f8(); /* 38 */ virtual unk32 vfunc_38(); /* 74 */ + + //! TODO: check if this is really here + static bool func_0203c25c(class MsgProc_Type1* param_1); + static void func_0203e060(MsgProc_Main* param_1, u8 param_2, u8 param_3); + void func_02039a3c(void); + unk32 func_02039250(void); + void func_02039ca8(void); + void func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4); + bool func_0203a2c0(void); + unk32 func_0203a30c(void); + void func_0203a35c(void); + bool func_0203a3e0(void); + bool func_0203a6d0(unk32 param_2, unk32 param_3); + bool func_0203b0bc(void); + unk32 func_0203b0ec(unk32 param_2); + void func_0203b764(void); + void func_0203bd8c(u16 param_2); + void func_0203be08(void); + void func_0203be64(void); + unk32 func_0203c084(void); + bool func_0203c13c(void); + unk32 func_0203c1a0(void); +}; + +class MsgProc_Type3 : public UnkStruct_02038aa0 { +public: + /* 0x164 */ unk16 unk_164; + /* 0x166 */ unk16 unk_166; + /* 0x168 */ unk16 unk_168; + /* 0x16A */ unk16 unk_16A; + /* 0x16C */ unk16 unk_16C; + /* 0x16E */ unk16 unk_16E; + /* 0x170 */ unk16 unk_170; + /* 0x172 */ unk16 unk_172; + /* 0x174 */ unk16 unk_174; + /* 0x178 */ unk32 unk_178; + /* 0x17C */ unk32 unk_17C; + /* 0x180 */ UnkClass_func_ov000_020d0644 unk_180[4]; + /* 0x1C0 */ + + MsgProc_Type3(); + MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4); + //! TODO: remove the function declarations that are not overridden + /* 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? + /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; + /* 0x18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; + /* 0x1C */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; + /* 0x20 */ virtual void vfunc_20(void) override; + /* 0x24 */ virtual void vfunc_24(void) override; + /* 0x28 */ virtual bool vfunc_28(void) override; + /* 0x2C */ virtual void vfunc_2C(void) override; + /* 0x30 */ virtual void vfunc_30(void) override; + /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2) override; + /* 0x38 */ virtual bool vfunc_38(void) override; + /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override; + /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; + /* 0x48 */ virtual void vfunc_48(void) override; + /* 0x4C */ virtual void vfunc_4C(void) override; // func_02039a3c? + /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; + /* 0x54 */ virtual void vfunc_54(void) override; + /* 0x58 */ virtual void vfunc_58(void) override; + /* 0x5C */ virtual void vfunc_5C(void) override; + /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 0x64 */ virtual void vfunc_64(s16* param_2) override; + /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2) override; + /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; + /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; + /* 0x74 */ + + static void func_0203c83c(void); +}; + +class MsgProc_Type2 : public UnkStruct_02038aa0 { +public: + /* 0x164 */ unk16 unk_164; + /* 0x164 */ unk16 unk_166; + /* 0x164 */ unk16 unk_168; + /* 0x164 */ unk16 unk_16A; + /* 0x164 */ unk16 unk_16C; + /* 0x164 */ unk16 unk_16E; + /* 0x170 */ + + MsgProc_Type2(); + MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4); + //! TODO: remove the function declarations that are not overridden + /* 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? + /* 0x14 */ /* func_0203c5c4 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; + /* 0x18 */ /* func_0203e284 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; + /* 0x1C */ /* func_0203905c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; + /* 0x20 */ /* func_020390a4 */ virtual void vfunc_20(void) override; + /* 0x24 */ /* astruct_8::vfunc_24 */ virtual void vfunc_24(void) override; + /* 0x28 */ /* func_0203e0c8 */ virtual bool vfunc_28(void) override; + /* 0x2C */ /* func_02038d20 */ virtual void vfunc_2C(void) override; + /* 0x30 */ /* func_02038ed0 */ virtual void vfunc_30(void) override; + /* 0x34 */ /* func_02038c34 */ virtual unk32 vfunc_34(unk32 param_2) override; + /* 0x38 */ /* func_02039570 */ virtual bool vfunc_38(void) override; + /* 0x3C */ /* func_0203c414 */ virtual void vfunc_3C(unk32 param_2) override; + /* 0x40 */ /* func_0203c460 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 0x44 */ /* func_02038f40 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; + /* 0x48 */ /* func_02038b74 */ virtual void vfunc_48(void) override; + /* 0x4C */ /* func_0203c39c */ virtual void vfunc_4C(void) override; // func_02039a3c? + /* 0x50 */ /* func_02038f44 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; + /* 0x54 */ /* func_020392b4 */ virtual void vfunc_54(void) override; + /* 0x58 */ /* func_02039398 */ virtual void vfunc_58(void) override; + /* 0x5C */ /* func_02039058 */ virtual void vfunc_5C(void) override; + /* 0x60 */ /* func_020393a4 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 0x64 */ /* func_020393a8 */ virtual void vfunc_64(s16* param_2) override; + /* 0x68 */ /* func_020393d0 */ virtual unk32 vfunc_68(unk32 param_2) override; + /* 0x6C */ /* func_0203947c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; + /* 0x70 */ /* func_020394d8 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; + /* 0x74 */ + + //! TODO: vfunc_4C? + void func_0203c39c(unk32 param_2, unk32 param_3); + + void func_0203c4ac(unk32, unk32); }; diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp index cfda7368..7870c0f9 100644 --- a/include/Unknown/UnkStruct_0203dae0.hpp +++ b/include/Unknown/UnkStruct_0203dae0.hpp @@ -5,20 +5,72 @@ #include "Unknown/UnkStruct_02032f0c.hpp" +// astruct_7, MsgProc_Base2 class UnkStruct_0203dae0 : public UnkStruct_02032f0c { public: /* 000 (base) */ - /* 052 */ unk8 mUnk_052[0x2]; - /* 054 */ unk32 mUnk_054[0x30]; - /* 114 */ void *mUnk_114; - /* 118 */ unk32 mUnk_118; + /* 0x052 */ unk16 unk_52; + /* 0x054 */ unk16 unk_54; + /* 0x054 */ unk16 unk_56; + /* 0x058 */ unk32 unk_58; + /* 0x05C */ s16 unk_5C; + /* 0x05E */ s16 unk_5E; + /* 0x060 */ unk32 unk_60; + /* 0x064 */ unk32 unk_64; + /* 0x068 */ unk32 unk_68; + /* 0x06C */ unk32 unk_6C; + /* 0x070 */ unk32 unk_70; + /* 0x074 */ unk32 unk_74; + /* 0x078 */ unk32 unk_78; + /* 0x07C */ unk32 unk_7C; + /* 0x080 */ unk32 unk_80; + /* 0x084 */ unk32 unk_84; + /* 0x088 */ unk32 unk_88; + /* 0x08C */ unk32 unk_8C; + /* 0x090 */ unk32 unk_90; + /* 0x094 */ unk32 unk_94; + /* 0x098 */ unk32 unk_98; + /* 0x09C */ unk32 unk_9C; + /* 0x0A0 */ unk32 unk_A0; + /* 0x0A4 */ unk32 unk_A4; + /* 0x0A8 */ unk32 unk_A8; + /* 0x0AC */ unk32 unk_AC; + /* 0x0B0 */ unk32 unk_B0; + /* 0x0B4 */ unk32 unk_B4; + /* 0x0B8 */ unk32 unk_B8; + /* 0x0BC */ unk32 unk_BC; + /* 0x0C0 */ unk32 unk_C0; + /* 0x0C4 */ unk32 unk_C4; + /* 0x0C8 */ unk32 unk_C8; + /* 0x0CC */ unk32 unk_CC; + /* 0x0D0 */ unk32 unk_D0; + /* 0x0D4 */ unk32 unk_D4; + /* 0x0D8 */ unk32 unk_D8; + /* 0x0DC */ unk32 unk_DC; + /* 0x0E0 */ unk32 unk_E0; + /* 0x0E4 */ unk32 unk_E4; + /* 0x0E8 */ unk32 unk_E8; + /* 0x0EC */ unk32 unk_EC; + /* 0x0F0 */ unk32 unk_F0; + /* 0x0F4 */ unk32 unk_F4; + /* 0x0F8 */ unk32 unk_F8; + /* 0x0FC */ unk32 unk_FC; + /* 0x100 */ unk32 unk_100; + /* 0x104 */ unk32 unk_104; + /* 0x108 */ unk8 unk_108; + /* 0x108 */ unk8 unk_109; + /* 0x108 */ unk8 unk_10A; + /* 0x108 */ unk8 unk_10B; + /* 0x10C */ unk32 unk_10C; + /* 0x110 */ unk32 unk_110; + /* 114 */ void *mUnk_114; // MsgProc_Base2_unk_114? + /* 118 */ s32 mUnk_118; /* 11c */ unk16 mUnk_11c; /* 11e */ u8 mUnk_11e; /* 11f */ u8 mUnk_11f; /* 120 */ u8 mUnk_120; /* 121 */ u8 mUnk_121; - /* 122 */ u8 mUnk_122; - /* 123 */ + /* 123 */ u8 mUnk_122; /* 00 */ virtual ~UnkStruct_0203dae0(); /* 08 */ virtual void vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4); @@ -31,6 +83,37 @@ public: /* 30 */ virtual void vfunc_30(); /* 34 */ + // /* 0x08 */ /* func_0203e2ac */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; + // /* 0x0C */ /* func_02039578 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; + // /* 0x10 */ /* func_0203e060 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? + // /* 0x14 */ /* func_0203dcb4 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; + // /* 0x18 */ /* func_0203e284 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; + // /* 0x1C */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; + // /* 0x20 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override; + // /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override; + // /* 0x28 */ /* func_0203e0c8 */ virtual bool vfunc_28(void) override; + // /* 0x2C */ /* func_0203e19c */ virtual void vfunc_2C(void) override; + // /* 0x30 */ /* func_0203e090 */ virtual void vfunc_30(void) override; + + //! TODO: fake? + /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2) override; + /* 0x38 */ virtual bool vfunc_38(void) override; + /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override; + /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; + /* 0x48 */ virtual void vfunc_48(void) override; + /* 0x4C */ virtual void vfunc_4C(void) override; // func_02039a3c? + /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; + /* 0x54 */ virtual void vfunc_54(void) override; + /* 0x58 */ virtual void vfunc_58(void) override; + /* 0x5C */ virtual void vfunc_5C(void) override; + /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 0x64 */ virtual void vfunc_64(s16* param_2) override; + /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2) override; + /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; + /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; + /* 0x74 */ + UnkStruct_0203dae0(u8 param1); void func_0203dc10(s32 param1); bool func_0203dc74(s32 param1, s32 param2); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 12851d46..70caaf7b 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -63,7 +63,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 } for (i = 0; i < ARRAY_LEN(this->unk_18); i++) { - this->unk_18[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass2(); + this->unk_18[i] = new(*data_027e0ce0[0], 4) UnkStruct_020386d8(); } this->unk_18[0]->unk_39 = 0; @@ -147,7 +147,7 @@ ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036700(void) { return (MsgProc_Type1*)this->unk_28[2]; } -ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_0203673c(void) { +ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_0203673c(void) { bool iVar1 = this->func_02036824(); bool iVar2 = this->func_02036850(); @@ -214,7 +214,7 @@ ARM bool UnkStruct_027E0C68::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_027E0C68_UnkSubClass2* param_2) { +ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8* param_2) { if ((param_2->unk_18 & ~0xFFFF) != (0x100 << 0x10)) { MsgProc_Type1* iVar1 = this->func_020366c4(); @@ -226,7 +226,7 @@ ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_027E0C68_UnkSubClass2* para } } -ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2) { +ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750* param_2) { if (this->unk_20[1] != NULL) { return false; } @@ -375,7 +375,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { } } -ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param_2, unk32 param_3) { +ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8* param_2, unk32 param_3) { u32 uVar1; if (param_3 == 0) { @@ -392,7 +392,7 @@ ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* para return false; } -ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2) { +ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750* param_2) { if (this->unk_20[0] != NULL && this->unk_20[0] != param_2) { return false; } @@ -401,7 +401,7 @@ ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_027E0C68_UnkSubClass2_Base1 return true; } -ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2) { +ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750* param_2) { if (this->unk_20[0] == param_2) { this->unk_20[0] = NULL; return true; @@ -530,12 +530,12 @@ ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { return pSVar5; } -ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370d0(unk32 param_2, unk32 param_3) { +ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_020370d0(unk32 param_2, unk32 param_3) { return this->func_020370e8(param_2, -1, -1, param_3); } -ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { - UnkStruct_027E0C68_UnkSubClass2* puVar2; +ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { + UnkStruct_020386d8* puVar2; if (this->func_02036824()) { puVar2 = this->unk_18[0]; diff --git a/src/Main/Message/func_02032f0c.cpp b/src/Main/Message/func_02032f0c.cpp index bd7ae4fc..75b64d70 100644 --- a/src/Main/Message/func_02032f0c.cpp +++ b/src/Main/Message/func_02032f0c.cpp @@ -10,7 +10,7 @@ extern "C" void func_020078f4(unk32, void*, unk32); extern "C" void func_020078c0(unk32, void*, unk32); extern "C" void func_020296e0(unk32**, UnkStruct_MsgProc_Base_unk_2C*, u8, u8, unk32, u8); -ARM UnkSubClass1_UnkownClass2_Base1::UnkSubClass1_UnkownClass2_Base1() { +ARM UnkStruct_02032e7c::UnkStruct_02032e7c() { this->unk_00 = NULL; this->unk_08 = 0; this->unk_0A = 0; @@ -55,7 +55,7 @@ ARM unk32* MsgProc_Base::func_02032f98(unk32 param_2) { } ARM unk32 MsgProc_Base::func_02032fa4(void) { - return UnkSubClass1_UnkownClass1::func_02035428(this->unk_50); + return UnkStruct_02035064::func_02035428(this->unk_50); } ARM unk32 MsgProc_Base::func_02032fb4(void) { @@ -85,9 +85,9 @@ ARM unk32 MsgProc_Base::func_020337d8(unk32 param_2) { return this->unk_2C->unk_00->unk_08[1] * param_2 + (param_2 - 1) * this->unk_34; } -ARM UnkSubClass1_UnkownClass1::UnkSubClass1_UnkownClass1() { +ARM UnkStruct_02035064::UnkStruct_02035064() { this->unk_74 = NULL; - this->unk_78 = 0; + this->unk_78 = NULL; this->unk_7C = 0; this->unk_80 = 0; this->unk_82 = 0; @@ -96,5 +96,5 @@ ARM UnkSubClass1_UnkownClass1::UnkSubClass1_UnkownClass1() { this->unk_87 = 0; } -ARM UnkSubClass1_UnkownClass1::~UnkSubClass1_UnkownClass1() { +ARM UnkStruct_02035064::~UnkStruct_02035064() { } diff --git a/src/Main/Message/func_0203744c.cpp b/src/Main/Message/func_0203744c.cpp index 986d9e1e..7ae70831 100644 --- a/src/Main/Message/func_0203744c.cpp +++ b/src/Main/Message/func_0203744c.cpp @@ -6,7 +6,7 @@ #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" -ARM UnkStruct_027E0C68_UnkSubClass2_Base1::UnkStruct_027E0C68_UnkSubClass2_Base1(unk32 param_2, unk32 param_3) { +ARM UnkStruct_02037750::UnkStruct_02037750(unk32 param_2, unk32 param_3) { s32 i; this->unk_14 = param_3; @@ -20,22 +20,22 @@ ARM UnkStruct_027E0C68_UnkSubClass2_Base1::UnkStruct_027E0C68_UnkSubClass2_Base1 } } -ARM UnkStruct_027E0C68_UnkSubClass2_Base1::~UnkStruct_027E0C68_UnkSubClass2_Base1() { +ARM UnkStruct_02037750::~UnkStruct_02037750() { if (data_027e0c68.unk_20[0] == this) { data_027e0c68.func_02036d4c(this); } } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass2::UnkStruct_027E0C68_UnkSubClass2() : UnkStruct_027E0C68_UnkSubClass2_Base1(0x1000000, 0) { +ARM UnkStruct_020386d8::UnkStruct_020386d8() : UnkStruct_02037750(0x1000000, 0) { this->unk_20 = -1; this->unk_24.func_020376c0(gVec3p_ZERO); } -ARM UnkStruct_027E0C68_UnkSubClass2::~UnkStruct_027E0C68_UnkSubClass2() { +ARM UnkStruct_020386d8::~UnkStruct_020386d8() { } -ARM UnkSubClass1_UnkownClass2::UnkSubClass1_UnkownClass2() { +ARM UnkStruct_0203881c::UnkStruct_0203881c() { this->unk_14 = 0x1000; this->unk_18 = 0; this->unk_1C = 0;