From 978a7532c4c0b4c756b619c2d5fcfc7cc2215fb0 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 5 Feb 2025 17:52:48 +0100 Subject: [PATCH] more progress --- config/eur/arm9/symbols.txt | 14 ++--- config/usa/arm9/symbols.txt | 14 ++--- include/Message/MsgProc.hpp | 4 +- include/Unknown/UnkStruct_02032f0c.hpp | 2 +- include/Unknown/UnkStruct_02038aa0.hpp | 4 -- include/Unknown/UnkStruct_0203dae0.hpp | 11 ++-- src/Main/Unknown/UnkStruct_02032f0c.cpp | 18 +++--- src/Main/Unknown/UnkStruct_02035064.cpp | 15 ++++- src/Main/Unknown/UnkStruct_02037750.cpp | 7 ++- src/Main/Unknown/UnkStruct_0203dae0.cpp | 83 +++++++++++++++++++------ 10 files changed, 114 insertions(+), 58 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index dac20832..e3053d8b 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1422,7 +1422,7 @@ func_0202dc38 kind:function(arm,size=0xc4) addr:0x202dc38 func_0202dcfc kind:function(arm,size=0x140) addr:0x202dcfc Mat4x3p_MultiplyMat4x3p kind:function(arm,size=0x1f4) addr:0x202de3c Mat3p_MultiplyMat3p kind:function(arm,size=0x170) addr:0x202e030 -_ZN18UnkStruct_0202e1a0C2Ev kind:function(arm,size=0x24) addr:0x202e1a0 +_ZN18UnkStruct_0202e1a0C1Ev kind:function(arm,size=0x24) addr:0x202e1a0 _ZN18UnkStruct_0202e1a013func_0202e1c4Ev kind:function(arm,size=0x24) addr:0x202e1c4 _ZN18UnkStruct_0202e1a013func_0202e1e8Ev kind:function(arm,size=0x128) addr:0x202e1e8 _ZN18UnkStruct_0202e1a013func_0202e310Ei kind:function(arm,size=0x234) addr:0x202e310 @@ -1650,7 +1650,7 @@ _ZN18UnkStruct_02032e7cC1Ev kind:function(arm,size=0x48) addr:0x2032ec4 _ZN18UnkStruct_02032f0cC2Ev kind:function(thumb,size=0x78) addr:0x2032f0c _ZN18UnkStruct_02032f0cD1Ev kind:function(thumb,size=0x4) addr:0x2032f84 _ZN18UnkStruct_02032f0cD0Ev kind:function(thumb,size=0xc) addr:0x2032f88 -_ZN18UnkStruct_02032f0c13func_02032f94Ev kind:function(thumb,size=0x4) addr:0x2032f94 +_ZN18UnkStruct_02032f0cD2Ev kind:function(thumb,size=0x4) addr:0x2032f94 _ZN18UnkStruct_02032f0c9SetUnk_0cEPt kind:function(arm,size=0xc) addr:0x2032f98 _ZN18UnkStruct_02032f0c13func_02032fa4Ev kind:function(arm,size=0x10) addr:0x2032fa4 _ZN18UnkStruct_02032f0c13func_02032fb4Ev kind:function(arm,size=0x18) addr:0x2032fb4 @@ -1745,7 +1745,7 @@ _ZN18UnkStruct_0203506413func_020352d8Ev kind:function(arm,size=0x98) addr:0x203 func_02035370 kind:function(arm,size=0x18) addr:0x2035370 func_02035388 kind:function(arm,size=0x50) addr:0x2035388 func_020353d8 kind:function(arm,size=0x50) addr:0x20353d8 -_ZN25UnkSubClass1_UnkownClass113func_02035428Eh kind:function(arm,size=0x18) addr:0x2035428 +_ZN18UnkStruct_0203506413func_02035428Eh kind:function(arm,size=0x18) addr:0x2035428 func_02035440 kind:function(arm,size=0x140) addr:0x2035440 func_02035580 kind:function(thumb,size=0x14) addr:0x2035580 func_02035594 kind:function(thumb,size=0x3c) addr:0x2035594 @@ -1811,7 +1811,7 @@ _ZN18UnkStruct_027E0C6813func_02036c50Ei kind:function(arm,size=0x54) addr:0x203 _ZN18UnkStruct_027E0C6813func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036ca4 _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_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 @@ -1862,7 +1862,7 @@ _ZN18UnkStruct_020386d88vfunc_08Ei kind:function(arm,size=0x18) addr:0x2038758 _ZN18UnkStruct_020386d88vfunc_24Ei kind:function(arm,size=0x1c) addr:0x2038770 _ZN18UnkStruct_020386d88vfunc_28Ev kind:function(arm,size=0x18) addr:0x203878c _ZN18UnkStruct_020386d88vfunc_30Ev kind:function(arm,size=0x28) addr:0x20387a4 -_ZN18UnkStruct_020386d88D0Ev kind:function(arm,size=0x14) addr:0x20387cc +_ZN18UnkStruct_020386d8D2Ev kind:function(arm,size=0x14) addr:0x20387cc func_020387e0 kind:function(thumb,size=0xc) addr:0x20387e0 func_020387ec kind:function(arm,size=0x18) addr:0x20387ec func_02038804 kind:function(arm,size=0x18) addr:0x2038804 @@ -1876,7 +1876,7 @@ _ZN18UnkStruct_02038aa0C2Ehh kind:function(thumb,size=0x5c) addr:0x2038aa0 _ZN18UnkStruct_02038aa0D1Ev kind:function(thumb,size=0xc) addr:0x2038afc _ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x14) addr:0x2038b08 _ZN18UnkStruct_02038aa0D2Ev kind:function(thumb,size=0xc) addr:0x2038b1c -_ZN18UnkStruct_02038aa013func_02038b28Eji kind:function(thumb,size=0xc) addr:0x2038b28 +_ZN18UnkStruct_02038aa013func_02038b28Ev kind:function(thumb,size=0xc) addr:0x2038b28 _ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(arm,size=0xc) addr:0x2038b34 _ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038b40 _ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b74 @@ -2040,7 +2040,7 @@ _ZN18UnkStruct_0203dae013func_0203de58Ei kind:function(arm,size=0x208) addr:0x20 _ZN18UnkStruct_0203dae08vfunc_10Eji kind:function(arm,size=0x30) addr:0x203e060 _ZN18UnkStruct_0203dae08vfunc_30Ev kind:function(arm,size=0x38) addr:0x203e090 _ZN18UnkStruct_0203dae08vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e0c8 -_ZN18UnkStruct_0203dae013func_0203e0f8Eii kind:function(arm,size=0xa4) addr:0x203e0f8 +_ZN18UnkStruct_0203dae013func_0203e0f8Ev kind:function(arm,size=0xa4) addr:0x203e0f8 _ZN18UnkStruct_0203dae08vfunc_2cEv kind:function(arm,size=0x14) addr:0x203e19c _ZN18UnkStruct_0203dae013func_0203e1b0Eiii kind:function(arm,size=0xd4) addr:0x203e1b0 _ZN18UnkStruct_0203dae08vfunc_18Ei kind:function(arm,size=0x28) addr:0x203e284 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 7ba35c25..a4051d56 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1422,7 +1422,7 @@ func_0202dc38 kind:function(arm,size=0xc4) addr:0x202dc34 func_0202dcfc kind:function(arm,size=0x140) addr:0x202dcf8 Mat4x3p_MultiplyMat4x3p kind:function(arm,size=0x1f4) addr:0x202de38 Mat3p_MultiplyMat3p kind:function(arm,size=0x170) addr:0x202e02c -_ZN18UnkStruct_0202e1a0C2Ev kind:function(arm,size=0x24) addr:0x202e19c +_ZN18UnkStruct_0202e1a0C1Ev kind:function(arm,size=0x24) addr:0x202e19c _ZN18UnkStruct_0202e1a013func_0202e1c4Ev kind:function(arm,size=0x24) addr:0x202e1c0 _ZN18UnkStruct_0202e1a013func_0202e1e8Ev kind:function(arm,size=0x128) addr:0x202e1e4 _ZN18UnkStruct_0202e1a013func_0202e310Ei kind:function(arm,size=0x234) addr:0x202e30c @@ -1650,7 +1650,7 @@ _ZN18UnkStruct_02032e7cC1Ev kind:function(arm,size=0x48) addr:0x2032ec0 _ZN18UnkStruct_02032f0cC2Ev kind:function(thumb,size=0x78) addr:0x2032f08 _ZN18UnkStruct_02032f0cD1Ev kind:function(thumb,size=0x4) addr:0x2032f80 _ZN18UnkStruct_02032f0cD0Ev kind:function(thumb,size=0xc) addr:0x2032f84 -_ZN18UnkStruct_02032f0c13func_02032f94Ev kind:function(thumb,size=0x4) addr:0x2032f90 +_ZN18UnkStruct_02032f0cD2Ev kind:function(thumb,size=0x4) addr:0x2032f90 _ZN18UnkStruct_02032f0c9SetUnk_0cEPt kind:function(arm,size=0xc) addr:0x2032f94 _ZN18UnkStruct_02032f0c13func_02032fa4Ev kind:function(arm,size=0x10) addr:0x2032fa0 _ZN18UnkStruct_02032f0c13func_02032fb4Ev kind:function(arm,size=0x18) addr:0x2032fb0 @@ -1745,7 +1745,7 @@ _ZN18UnkStruct_0203506413func_020352d8Ev kind:function(arm,size=0x98) addr:0x203 func_02035370 kind:function(arm,size=0x18) addr:0x203532c func_02035388 kind:function(arm,size=0x50) addr:0x2035344 func_020353d8 kind:function(arm,size=0x50) addr:0x2035394 -_ZN25UnkSubClass1_UnkownClass113func_02035428Eh kind:function(arm,size=0x18) addr:0x20353e4 +_ZN18UnkStruct_0203506413func_02035428Eh kind:function(arm,size=0x18) addr:0x20353e4 func_02035440 kind:function(arm,size=0x140) addr:0x20353fc func_02035580 kind:function(thumb,size=0x14) addr:0x203553c func_02035594 kind:function(thumb,size=0x3c) addr:0x2035550 @@ -1811,7 +1811,7 @@ _ZN18UnkStruct_027E0C6813func_02036c50Ei kind:function(arm,size=0x54) addr:0x203 _ZN18UnkStruct_027E0C6813func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036c60 _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_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 @@ -1862,7 +1862,7 @@ _ZN18UnkStruct_020386d88vfunc_08Ei kind:function(arm,size=0x18) addr:0x2038714 _ZN18UnkStruct_020386d88vfunc_24Ei kind:function(arm,size=0x1c) addr:0x203872c _ZN18UnkStruct_020386d88vfunc_28Ev kind:function(arm,size=0x18) addr:0x2038748 _ZN18UnkStruct_020386d88vfunc_30Ev kind:function(arm,size=0x28) addr:0x2038760 -_ZN18UnkStruct_020386d88D0Ev kind:function(arm,size=0x14) addr:0x2038788 +_ZN18UnkStruct_020386d8D2Ev kind:function(arm,size=0x14) addr:0x2038788 func_020387e0 kind:function(thumb,size=0xc) addr:0x203879c func_020387ec kind:function(arm,size=0x18) addr:0x20387a8 func_02038804 kind:function(arm,size=0x18) addr:0x20387c0 @@ -1876,7 +1876,7 @@ _ZN18UnkStruct_02038aa0C2Ehh kind:function(thumb,size=0x5c) addr:0x2038a5c _ZN18UnkStruct_02038aa0D1Ev kind:function(thumb,size=0xc) addr:0x2038ab8 _ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x14) addr:0x2038ac4 _ZN18UnkStruct_02038aa0D2Ev kind:function(thumb,size=0xc) addr:0x2038ad8 -_ZN18UnkStruct_02038aa013func_02038b28Eji kind:function(thumb,size=0xc) addr:0x2038ae4 +_ZN18UnkStruct_02038aa013func_02038b28Ev kind:function(thumb,size=0xc) addr:0x2038ae4 _ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(arm,size=0xc) addr:0x2038af0 _ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038afc _ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b30 @@ -2040,7 +2040,7 @@ _ZN18UnkStruct_0203dae013func_0203de58Ei kind:function(arm,size=0x208) addr:0x20 _ZN18UnkStruct_0203dae08vfunc_10Eji kind:function(arm,size=0x30) addr:0x203e01c _ZN18UnkStruct_0203dae08vfunc_30Ev kind:function(arm,size=0x38) addr:0x203e04c _ZN18UnkStruct_0203dae08vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e084 -_ZN18UnkStruct_0203dae013func_0203e0f8Eii kind:function(arm,size=0xa4) addr:0x203e0b4 +_ZN18UnkStruct_0203dae013func_0203e0f8Ev kind:function(arm,size=0xa4) addr:0x203e0b4 _ZN18UnkStruct_0203dae08vfunc_2cEv kind:function(arm,size=0x14) addr:0x203e158 _ZN18UnkStruct_0203dae013func_0203e1b0Eiii kind:function(arm,size=0xd4) addr:0x203e16c _ZN18UnkStruct_0203dae08vfunc_18Ei kind:function(arm,size=0x28) addr:0x203e240 diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp index f7e4608b..fecdd18c 100644 --- a/include/Message/MsgProc.hpp +++ b/include/Message/MsgProc.hpp @@ -49,8 +49,8 @@ public: UnkStruct_0203dae0_114(); /* 0x00 */ virtual ~UnkStruct_0203dae0_114() override; - /* 0x04 */ virtual UNK_TYPE vfunc_04(UNK_TYPE); - /* 0x08 */ virtual unk32 vfunc_08(void*, s16); + /* 0x08 */ virtual unk32 vfunc_08(void*); + /* 0x08 */ virtual unk32 vfunc_0c(void); /* 0x0C */ unk32* func_0203d1b4(void); diff --git a/include/Unknown/UnkStruct_02032f0c.hpp b/include/Unknown/UnkStruct_02032f0c.hpp index 84fb93f0..67be855a 100644 --- a/include/Unknown/UnkStruct_02032f0c.hpp +++ b/include/Unknown/UnkStruct_02032f0c.hpp @@ -6,7 +6,7 @@ #include "Message/BMG.hpp" #include "System/SysNew.hpp" -class UnkStruct_02032e7c { +class UnkStruct_02032e7c : public SysObject { public: /* 00 (vtable) */ /* 04 */ u16* mUnk_04; // pointer to the current position in the message to display diff --git a/include/Unknown/UnkStruct_02038aa0.hpp b/include/Unknown/UnkStruct_02038aa0.hpp index 9ace8473..fcb9ae0d 100644 --- a/include/Unknown/UnkStruct_02038aa0.hpp +++ b/include/Unknown/UnkStruct_02038aa0.hpp @@ -142,13 +142,9 @@ public: 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: diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp index 054c8900..b3447c9a 100644 --- a/include/Unknown/UnkStruct_0203dae0.hpp +++ b/include/Unknown/UnkStruct_0203dae0.hpp @@ -68,11 +68,11 @@ public: /* 110 */ unk32 mUnk_110; /* 114 */ UnkStruct_0203dae0_114 *mUnk_114; /* 118 */ s32 mUnk_118; - /* 11c */ unk16 mUnk_11c; + /* 11c */ u16 mUnk_11c; /* 11e */ u8 mUnk_11e; /* 11f */ u8 mUnk_11f; /* 120 */ u8 mUnk_120; - /* 121 */ u8 mUnk_121; + /* 121 */ s8 mUnk_121; /* 123 */ u8 mUnk_122; /* 00 */ virtual ~UnkStruct_0203dae0(); @@ -118,15 +118,16 @@ public: /* 74 */ UnkStruct_0203dae0(u8 param1); - void func_0203dc10(s32 param1); + void func_0203dc10(unk32 param1); + void func_0203dc10(unk32 param_2, unk32 param_3); bool func_0203dc74(s32 param1, s32 param2); void func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4); - void func_0203ddec(); + unk32 func_0203ddec(); void func_0203ddfc(); void func_0203de14(); s32 func_0203de24(); bool func_0203de58(s32 param1); - bool func_0203e0f8(unk32 param1, s32 param2); + bool func_0203e0f8(); bool func_0203e1b0(unk32 param1, unk32 param2, s32 param3); void func_0203e2e8(s32 param1, s32 param2, unk32 param3, u32 param4); void func_0203e510(s32 *param1, s32 param2, s32 param3); diff --git a/src/Main/Unknown/UnkStruct_02032f0c.cpp b/src/Main/Unknown/UnkStruct_02032f0c.cpp index dc4dda7f..f95b7df3 100644 --- a/src/Main/Unknown/UnkStruct_02032f0c.cpp +++ b/src/Main/Unknown/UnkStruct_02032f0c.cpp @@ -1,9 +1,9 @@ #include "Unknown/UnkStruct_02032f0c.hpp" #include "Unknown/UnkStruct_02035064.hpp" -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); +extern "C" void Fill32(unk32, void*, unk32); +extern "C" void Fill16(unk32, void*, unk32); +extern "C" void func_020296e0(unk32**, UnkStruct_MsgProc_Base_unk_2C**, unk32, unk32, unk32, unk32); extern THUMB unk32 func_0202ab48(void); ARM UnkStruct_02032e7c::UnkStruct_02032e7c() { @@ -33,9 +33,9 @@ THUMB UnkStruct_02032f0c::UnkStruct_02032f0c() { this->mUnk_4f = 0; this->mUnk_50 = 0; this->mUnk_51 = 0; - func_020078f4(0, &this->mUnk_10, 0x18); - func_020078f4(0, &this->mUnk_28, 0x10); - func_020078c0(0, &this->mUnk_3e, 0xC); + Fill32(0, &this->mUnk_10, 0x18); + Fill32(0, &this->mUnk_28, 0x10); + Fill16(0, &this->mUnk_3e, 0xC); this->mUnk_10 = NULL; this->mUnk_2c = NULL; this->mUnk_30 = 2; @@ -78,7 +78,7 @@ ARM bool UnkStruct_02032f0c::vfunc_14(s32 param1, s32 param2) { ARM void UnkStruct_02032f0c::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {} ARM void UnkStruct_02032f0c::vfunc_0c(unk32 param1, unk32 param2, unk32 param3, unk32 param4) { - func_020296e0(&this->mUnk_10, *this->mUnk_2c, param1, param2, param4, param3); + func_020296e0(&this->mUnk_10, this->mUnk_2c, param1, param2, param4, param3); } ARM void UnkStruct_02032f0c::vfunc_10(u32 param1, unk32 param2) {} @@ -106,4 +106,6 @@ ARM u16 *UnkStruct_02032f0c::func_02033b0c(s32 param1) {} ARM bool UnkStruct_02032f0c::func_02033c6c() {} ARM unk32 UnkStruct_02032f0c::func_02033c88(u32 param1) {} ARM s32 UnkStruct_02032f0c::func_02033cbc(s16 *param1) {} -ARM UnkStruct_02032e7c::~UnkStruct_02032e7c() {} + +ARM UnkStruct_02032e7c::~UnkStruct_02032e7c() { +} diff --git a/src/Main/Unknown/UnkStruct_02035064.cpp b/src/Main/Unknown/UnkStruct_02035064.cpp index 01aaa47c..6841fdc0 100644 --- a/src/Main/Unknown/UnkStruct_02035064.cpp +++ b/src/Main/Unknown/UnkStruct_02035064.cpp @@ -14,10 +14,19 @@ ARM UnkStruct_02035064::UnkStruct_02035064() { ARM UnkStruct_02035064::~UnkStruct_02035064() { } -ARM void UnkStruct_02035064::func_020350b0() {} +ARM void UnkStruct_02035064::func_020350b0() { +} + ARM void UnkStruct_02035064::func_020350b4(s32 param1, unk32 param2, unk8 param3, unk16 param4, unk16 param5) {} ARM void UnkStruct_02035064::func_0203516c() {} -ARM s32 UnkStruct_02035064::vfunc_0() {} -ARM s32 UnkStruct_02035064::vfunc_4() {} + +ARM s32 UnkStruct_02035064::vfunc_0() { + return this->mUnk_4c; +} + +ARM s32 UnkStruct_02035064::vfunc_4() { + return this->mUnk_4e; +} + ARM void UnkStruct_02035064::func_020351b8(bool param1, bool param2, bool param3, bool param4) {} ARM void UnkStruct_02035064::func_020352d8() {} diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp index 5f09ff3f..b6db048e 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -1,7 +1,7 @@ #include "Unknown/UnkStruct_02037750.hpp" #include "Message/MessageManager.hpp" -UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { +ARM UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { s32 i; this->mUnk_14 = param2; @@ -30,7 +30,10 @@ ARM unk32 UnkStruct_02037750::vfunc_2c(s32 param1) {} ARM LinkStateInteract *UnkStruct_02037750::GetLinkStateInteract() {} ARM unk32 UnkStruct_02037750::vfunc_30() {} ARM void UnkStruct_02037750::func_020385d0(s32 param1, unk32 *param2) {} -ARM void UnkStruct_02037750::vfunc_14() {} + +ARM void UnkStruct_02037750::vfunc_14() { +} + ARM void UnkStruct_02037750::vfunc_18() {} ARM unk32 UnkStruct_02037750::vfunc_1c() {} ARM void UnkStruct_02037750::vfunc_20() {} diff --git a/src/Main/Unknown/UnkStruct_0203dae0.cpp b/src/Main/Unknown/UnkStruct_0203dae0.cpp index 8e39ed05..59221042 100644 --- a/src/Main/Unknown/UnkStruct_0203dae0.cpp +++ b/src/Main/Unknown/UnkStruct_0203dae0.cpp @@ -2,8 +2,8 @@ #include "System/SysNew.hpp" extern u32 *data_027e0ce0[]; -extern "C" void func_02007938(unk32, unk16*, unk32, unk32, unk32); -extern "C" void func_0203fc78(unk32*, unk32*); +extern "C" void Fill256(unk32, unk16*, unk32, unk32); +extern "C" void func_0203fc78(u8, unk32*, unk32*); // non-matching THUMB UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) { @@ -16,10 +16,10 @@ THUMB UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) { this->mUnk_121 = param1; this->mUnk_122 = 0; - // func_02007938(0, &this->mUnk_54, 0xC0, 1, param_4); + Fill256(0, &this->mUnk_54, 0xC0, 1); if (this->mUnk_121 == 0) { - this->mUnk_114 = new(data_027e0ce0[0], 4) UnkStruct_0203dae0_114(); + this->mUnk_114 = new(data_027e0ce0[1], 4) UnkStruct_0203dae0_114(); } else { this->mUnk_114 = new(data_027e0ce0[1], 4) UnkStruct_0203dae0_114(); } @@ -32,46 +32,91 @@ THUMB UnkStruct_0203dae0::~UnkStruct_0203dae0() { } } -ARM void UnkStruct_0203dae0::func_0203dc10(s32 param1) {} -ARM bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) {} +// non-matching (regalloc) +ARM void UnkStruct_0203dae0::func_0203dc10(s32 param1) { + if (param1 != 0) { + if (this->mUnk_11c == 0x0) { + return; + } + + if (this->mUnk_114->vfunc_08(this) != 0) { + this->mUnk_10 = this->mUnk_114->func_0203d1b4(); + } + } else { + this->mUnk_114->vfunc_0c(); + } + + this->mUnk_122 = param1; +} + +ARM bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) { + this->func_0203ddfc(); + this->vfunc_14(param1, param2); + this->mUnk_11c = 0; + return true; +} -// non-matching ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) { - unk32 uVar1; unk32 local_c; unk32 local_10; local_c = param1; local_10 = param2; - this->func_02032fa4(); - func_0203fc78(&local_c, &local_10); - this->func_02032fcc(local_c, local_10); + func_0203fc78(this->func_02032fa4(), &local_c, &local_10); + this->UnkStruct_02032f0c::vfunc_14(local_c, local_10); this->mUnk_10 = 0; return true; } -ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) {} -ARM void UnkStruct_0203dae0::func_0203ddec() {} +extern "C" u16 func_0203d318(unk32, unk32); +extern "C" void func_020298b8(unk32*, unk32, unk32, unk32, unk32); +extern "C" void func_02029830(unk32*, unk32, unk32, unk32, unk32); +extern "C" unk32 func_0203d400(u8); + +ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) { + unk32 uVar5; + + this->mUnk_50 = param1; + this->vfunc_14(this->mUnk_4a, this->mUnk_4c); + this->mUnk_11c = func_0203d318(this->mUnk_10[0x1], this->mUnk_10[0x2]); + this->func_0203dc10(1); + + if (func_0203d400(this->UnkStruct_02032f0c::func_02032fa4()) != 0x0) { + uVar5 = this->func_0203ddec(); + func_020298b8(this->mUnk_10, uVar5, this->mUnk_10[0x1], this->mUnk_10[0x2], 0x4); + } else { + uVar5 = this->func_0203ddec(); + func_02029830(this->mUnk_10, uVar5, this->mUnk_10[0x1], this->mUnk_10[0x2], 0x4); + } + + this->mUnk_28 = this->mUnk_10; + this->mUnk_2c = this->mUnk_2c; + this->mUnk_30 = param4; + this->mUnk_34 = 3; + this->vfunc_10(param3, 0); + + this->func_0203de58(param2); +} + +ARM unk32 UnkStruct_0203dae0::func_0203ddec() {} ARM void UnkStruct_0203dae0::func_0203ddfc() {} ARM void UnkStruct_0203dae0::func_0203de14() {} ARM s32 UnkStruct_0203dae0::func_0203de24() {} ARM bool UnkStruct_0203dae0::func_0203de58(s32 param1) {} -// non-matching ARM void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) { - // this->func_0203dc10(1, param2); + this->func_0203dc10(1, param2); this->mUnk_11e = param1; this->mUnk_118 = -1; - // this->func_020331c4(param1, -1); + this->UnkStruct_02032f0c::vfunc_10(param1, -1); } ARM void UnkStruct_0203dae0::vfunc_30() {} -// non-matching? ARM bool UnkStruct_0203dae0::vfunc_28() { if (this->mUnk_122 != 0) { - this->func_0203e0f8(0, 0); + this->func_0203e0f8(); this->func_0203dc10(0); return true; } @@ -79,7 +124,7 @@ ARM bool UnkStruct_0203dae0::vfunc_28() { return false; } -ARM bool UnkStruct_0203dae0::func_0203e0f8(unk32 param1, s32 param2) {} +ARM bool UnkStruct_0203dae0::func_0203e0f8() {} ARM void UnkStruct_0203dae0::vfunc_2c() {} ARM bool UnkStruct_0203dae0::func_0203e1b0(unk32 param1, unk32 param2, s32 param3) {} ARM unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) {}