From 2d57d12209e26ad09107f52e9e94e01939d6d91c Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Tue, 21 Jan 2025 00:17:29 +0100 Subject: [PATCH 01/64] work --- config/eur/arm9/delinks.txt | 3 + config/eur/arm9/symbols.txt | 14 ++-- config/usa/arm9/symbols.txt | 14 ++-- include/Message/MessageManager.hpp | 23 +++++++ src/Main/MessageManager.cpp | 102 +++++++++++++++++++++++++++++ tools/transform_dep.py | 0 6 files changed, 142 insertions(+), 14 deletions(-) create mode 100644 include/Message/MessageManager.hpp create mode 100644 src/Main/MessageManager.cpp mode change 100644 => 100755 tools/transform_dep.py diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 97a31c17..26f602ff 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -14,3 +14,6 @@ libs/cpp/src/__register_global_object.cpp: complete .text start:0x0204f8d4 end:0x0204f8f4 .bss start:0x02076da8 end:0x02076dac + +src/Main/MessageManager.cpp: + .text start:0x020371b4 end:0x020373b4 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 18cbd72b..a98893d2 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1304,7 +1304,7 @@ func_0202a8dc kind:function(arm,size=0x1cc) addr:0x202a8dc func_0202aaa8 kind:function(arm,size=0x40) addr:0x202aaa8 func_0202aae8 kind:function(thumb,size=0x10) addr:0x202aae8 func_0202aaf8 kind:function(thumb,size=0x40) addr:0x202aaf8 -func_0202ab38 kind:function(thumb,size=0x10) addr:0x202ab38 +_Z13func_0202ab38i kind:function(thumb,size=0x10) addr:0x202ab38 func_0202ab48 kind:function(thumb,size=0x4) addr:0x202ab48 func_0202ab4c kind:function(thumb,size=0x8) addr:0x202ab4c func_0202ab54 kind:function(thumb,size=0x10) addr:0x202ab54 @@ -1397,7 +1397,7 @@ func_0202d21c kind:function(thumb,size=0x20) addr:0x202d21c func_0202d23c kind:function(thumb,size=0x180) addr:0x202d23c func_0202d3bc kind:function(thumb,size=0xb8) addr:0x202d3bc func_0202d474 kind:function(thumb,size=0xdc) addr:0x202d474 -func_0202d550 kind:function(thumb,size=0x1c) addr:0x202d550 +_Z13func_0202d550iPjPciii kind:function(thumb,size=0x1c) addr:0x202d550 func_0202d56c kind:function(thumb,size=0x24) addr:0x202d56c func_0202d590 kind:function(thumb,size=0x8) addr:0x202d590 func_0202d598 kind:function(thumb,size=0x1c) addr:0x202d598 @@ -1821,11 +1821,11 @@ func_020370e8 kind:function(arm,size=0x70) addr:0x20370e8 func_02037158 kind:function(arm,size=0x20) addr:0x2037158 func_02037178 kind:function(arm,size=0x38) addr:0x2037178 func_020371b0 kind:function(arm,size=0x4) addr:0x20371b0 -func_020371b4 kind:function(thumb,size=0x14) addr:0x20371b4 -func_020371c8 kind:function(thumb,size=0x90) addr:0x20371c8 -func_02037258 kind:function(arm,size=0x34) addr:0x2037258 -func_0203728c kind:function(arm,size=0x64) addr:0x203728c -func_020372f0 kind:function(thumb,size=0xc4) addr:0x20372f0 +_Z13func_020371b4P11UnknownData kind:function(thumb,size=0x14) addr:0x20371b4 +_Z13func_020371c8P11UnknownDataPji kind:function(thumb,size=0x90) addr:0x20371c8 +_Z13func_02037258P11UnknownDatai kind:function(arm,size=0x34) addr:0x2037258 +_Z13func_0203728cP11UnknownDatai kind:function(arm,size=0x64) addr:0x203728c +_ZN14MessageManager13func_020372f0Eiii kind:function(thumb,size=0xc4) addr:0x20372f0 func_020373b4 kind:function(thumb,size=0x38) addr:0x20373b4 func_020373ec kind:function(arm,size=0x60) addr:0x20373ec func_0203744c kind:function(thumb,size=0xc) addr:0x203744c diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 64e4c14a..d597cc11 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1304,7 +1304,7 @@ func_0202a8dc kind:function(arm,size=0x1cc) addr:0x202a8dc func_0202aaa8 kind:function(arm,size=0x40) addr:0x202aaa8 func_0202aae8 kind:function(thumb,size=0x10) addr:0x202aae8 func_0202aaf8 kind:function(thumb,size=0x28) addr:0x202aaf8 -func_0202ab38 kind:function(thumb,size=0x10) addr:0x202ab20 +_Z13func_0202ab38i kind:function(thumb,size=0x10) addr:0x202ab20 func_0202ab48 kind:function(thumb,size=0x4) addr:0x202ab30 func_0202ab4c kind:function(thumb,size=0x8) addr:0x202ab34 func_0202ab54 kind:function(thumb,size=0x10) addr:0x202ab3c @@ -1397,7 +1397,7 @@ func_0202d21c kind:function(thumb,size=0x20) addr:0x202d218 func_0202d23c kind:function(thumb,size=0x180) addr:0x202d238 func_0202d3bc kind:function(thumb,size=0xb8) addr:0x202d3b8 func_0202d474 kind:function(thumb,size=0xdc) addr:0x202d470 -func_0202d550 kind:function(thumb,size=0x1c) addr:0x202d54c +_Z13func_0202d550iPjPciii kind:function(thumb,size=0x1c) addr:0x202d54c func_0202d56c kind:function(thumb,size=0x24) addr:0x202d568 func_0202d590 kind:function(thumb,size=0x8) addr:0x202d58c func_0202d598 kind:function(thumb,size=0x1c) addr:0x202d594 @@ -1821,11 +1821,11 @@ func_020370e8 kind:function(arm,size=0x70) addr:0x20370a4 func_02037158 kind:function(arm,size=0x20) addr:0x2037114 func_02037178 kind:function(arm,size=0x38) addr:0x2037134 func_020371b0 kind:function(arm,size=0x4) addr:0x203716c -func_020371b4 kind:function(thumb,size=0x14) addr:0x2037170 -func_020371c8 kind:function(thumb,size=0x90) addr:0x2037184 -func_02037258 kind:function(arm,size=0x34) addr:0x2037214 -func_0203728c kind:function(arm,size=0x64) addr:0x2037248 -func_020372f0 kind:function(thumb,size=0xc4) addr:0x20372ac +_Z13func_020371b4P11UnknownData kind:function(thumb,size=0x14) addr:0x2037170 +_Z13func_020371c8P11UnknownDataPji kind:function(thumb,size=0x90) addr:0x2037184 +_Z13func_02037258P11UnknownDatai kind:function(arm,size=0x34) addr:0x2037214 +_Z13func_0203728cP11UnknownDatai kind:function(arm,size=0x64) addr:0x2037248 +_ZN14MessageManager13func_020372f0Eiii kind:function(thumb,size=0xc4) addr:0x20372ac func_020373b4 kind:function(thumb,size=0x38) addr:0x2037370 func_020373ec kind:function(arm,size=0x60) addr:0x20373a8 func_0203744c kind:function(thumb,size=0xc) addr:0x2037408 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp new file mode 100644 index 00000000..6d61c627 --- /dev/null +++ b/include/Message/MessageManager.hpp @@ -0,0 +1,23 @@ +#pragma once + +#include "global.h" +#include "types.h" + +typedef struct UnknownData { + unk32 unk_00; + unk32 unk_04; + unk32 unk_08; + unk32 unk_0C; + unk32 unk_10; + unk32 unk_14; + unk16 unk_18; + unk16 unk_1A; +} UnknownData; + +class MessageManager { +private: + UnknownData* aUnknownData; + +public: + void func_020372f0(int index, int param_3, int param_4); +}; diff --git a/src/Main/MessageManager.cpp b/src/Main/MessageManager.cpp new file mode 100644 index 00000000..5ce577b1 --- /dev/null +++ b/src/Main/MessageManager.cpp @@ -0,0 +1,102 @@ +extern "C" { +#include +} +#include "Message/MessageManager.hpp" + +char* func_0202ab38(int lang); +u32* func_0202d550(int, u32*, char* path, int, int, int); + +extern u32 *data_027e0ce0[]; +extern u32 data_027e05f4; // language +extern u32* data_ov002_0210016c; + +THUMB void func_020371b4(UnknownData* pData) { + pData->unk_00 = 0; + pData->unk_04 = 0; + pData->unk_08 = 0; + pData->unk_0C = 0; + pData->unk_10 = 0; + pData->unk_14 = 0; + pData->unk_18 = 0; +} + +THUMB int func_020371c8(UnknownData* pData, u32* param_2, int param_3) { + /* TODO */ +} + +THUMB int func_02037258(UnknownData* pData, unk32 param_2) { + /* TODO */ +} + +THUMB unk16 func_0203728c(UnknownData* pData, unk32 param_2) { + /* TODO */ +} + +static char* sBMGFiles[] = { + "system", + "regular", + "battle", + "test", + "default", + "sea", + "kaitei", + "main_isl", + "brave", + "flame", + "wind", + "frost", + "power", + "wisdom", + "ghost", + "hidari", + "sennin", + "ship", + "collect", + "mainselect", + "field", + "wisdom_dngn", + "demo", + "battleCommon", + "bossLast1", + "bossLast3", + "torii", + "myou", + "kojima1", + "kojima2", + "kojima5", + "kojima3", + "staff", + "kaitei_F", +}; + +THUMB void MessageManager::func_020372f0(int index, int param_3, int param_4) { + char bmgPath[64]; + UnknownData local_70; + u32* uVar2; + int iVar1; + + // path to the bmg file for the current language (i.e.: "English/Message/battle.bmg") + strcpy(bmgPath, func_0202ab38(data_027e05f4)); + strcat(bmgPath, "/Message/"); + strcat(bmgPath, sBMGFiles[index]); + strcat(bmgPath, ".bmg"); + + uVar2 = data_027e0ce0[1]; + + if (param_3 != 1) { + if (param_3 != 4) { + uVar2 = data_027e0ce0[0]; + } else { + uVar2 = data_ov002_0210016c; + } + } + + uVar2 = func_0202d550(0xC4, uVar2, bmgPath, 0, 0x10, 0); + + local_70.unk_1A = 0; + func_020371b4(&local_70); + + iVar1 = func_020371c8(&local_70, uVar2, param_3); + this->aUnknownData[iVar1] = local_70; + this->aUnknownData[iVar1].unk_1A = iVar1; +} diff --git a/tools/transform_dep.py b/tools/transform_dep.py old mode 100644 new mode 100755 From 1176ff47edec871b9ccf83750e682bb9aa717fc5 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 22 Jan 2025 03:54:07 +0100 Subject: [PATCH 02/64] document most of the BMG file format --- config/eur/arm9/symbols.txt | 12 +-- config/usa/arm9/symbols.txt | 12 +-- include/Message/BMG.hpp | 89 ++++++++++++++++++++ include/Message/MessageManager.hpp | 20 ++--- src/Main/MessageManager.cpp | 127 +++++++++++++++++++++++------ 5 files changed, 212 insertions(+), 48 deletions(-) create mode 100644 include/Message/BMG.hpp diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index a98893d2..81d11530 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1304,7 +1304,7 @@ func_0202a8dc kind:function(arm,size=0x1cc) addr:0x202a8dc func_0202aaa8 kind:function(arm,size=0x40) addr:0x202aaa8 func_0202aae8 kind:function(thumb,size=0x10) addr:0x202aae8 func_0202aaf8 kind:function(thumb,size=0x40) addr:0x202aaf8 -_Z13func_0202ab38i kind:function(thumb,size=0x10) addr:0x202ab38 +_Z13func_0202ab38Pj kind:function(thumb,size=0x10) addr:0x202ab38 func_0202ab48 kind:function(thumb,size=0x4) addr:0x202ab48 func_0202ab4c kind:function(thumb,size=0x8) addr:0x202ab4c func_0202ab54 kind:function(thumb,size=0x10) addr:0x202ab54 @@ -1395,7 +1395,7 @@ func_0202d164 kind:function(thumb,size=0x60) addr:0x202d164 func_0202d1c4 kind:function(thumb,size=0x58) addr:0x202d1c4 func_0202d21c kind:function(thumb,size=0x20) addr:0x202d21c func_0202d23c kind:function(thumb,size=0x180) addr:0x202d23c -func_0202d3bc kind:function(thumb,size=0xb8) addr:0x202d3bc +_Z13func_0202d3bciPjPciibii kind:function(thumb,size=0xb8) addr:0x202d3bc func_0202d474 kind:function(thumb,size=0xdc) addr:0x202d474 _Z13func_0202d550iPjPciii kind:function(thumb,size=0x1c) addr:0x202d550 func_0202d56c kind:function(thumb,size=0x24) addr:0x202d56c @@ -1821,10 +1821,10 @@ func_020370e8 kind:function(arm,size=0x70) addr:0x20370e8 func_02037158 kind:function(arm,size=0x20) addr:0x2037158 func_02037178 kind:function(arm,size=0x38) addr:0x2037178 func_020371b0 kind:function(arm,size=0x4) addr:0x20371b0 -_Z13func_020371b4P11UnknownData kind:function(thumb,size=0x14) addr:0x20371b4 -_Z13func_020371c8P11UnknownDataPji kind:function(thumb,size=0x90) addr:0x20371c8 -_Z13func_02037258P11UnknownDatai kind:function(arm,size=0x34) addr:0x2037258 -_Z13func_0203728cP11UnknownDatai kind:function(arm,size=0x64) addr:0x203728c +_Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 +_Z13func_020371c8P11BMGFileInfoPji kind:function(thumb,size=0x90) addr:0x20371c8 +_Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037258 +_Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x203728c _ZN14MessageManager13func_020372f0Eiii kind:function(thumb,size=0xc4) addr:0x20372f0 func_020373b4 kind:function(thumb,size=0x38) addr:0x20373b4 func_020373ec kind:function(arm,size=0x60) addr:0x20373ec diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index d597cc11..1ddc3578 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1304,7 +1304,7 @@ func_0202a8dc kind:function(arm,size=0x1cc) addr:0x202a8dc func_0202aaa8 kind:function(arm,size=0x40) addr:0x202aaa8 func_0202aae8 kind:function(thumb,size=0x10) addr:0x202aae8 func_0202aaf8 kind:function(thumb,size=0x28) addr:0x202aaf8 -_Z13func_0202ab38i kind:function(thumb,size=0x10) addr:0x202ab20 +_Z13func_0202ab38Pj kind:function(thumb,size=0x10) addr:0x202ab20 func_0202ab48 kind:function(thumb,size=0x4) addr:0x202ab30 func_0202ab4c kind:function(thumb,size=0x8) addr:0x202ab34 func_0202ab54 kind:function(thumb,size=0x10) addr:0x202ab3c @@ -1395,7 +1395,7 @@ func_0202d164 kind:function(thumb,size=0x74) addr:0x202d14c func_0202d1c4 kind:function(thumb,size=0x58) addr:0x202d1c0 func_0202d21c kind:function(thumb,size=0x20) addr:0x202d218 func_0202d23c kind:function(thumb,size=0x180) addr:0x202d238 -func_0202d3bc kind:function(thumb,size=0xb8) addr:0x202d3b8 +_Z13func_0202d3bciPjPciibii kind:function(thumb,size=0xb8) addr:0x202d3b8 func_0202d474 kind:function(thumb,size=0xdc) addr:0x202d470 _Z13func_0202d550iPjPciii kind:function(thumb,size=0x1c) addr:0x202d54c func_0202d56c kind:function(thumb,size=0x24) addr:0x202d568 @@ -1821,10 +1821,10 @@ func_020370e8 kind:function(arm,size=0x70) addr:0x20370a4 func_02037158 kind:function(arm,size=0x20) addr:0x2037114 func_02037178 kind:function(arm,size=0x38) addr:0x2037134 func_020371b0 kind:function(arm,size=0x4) addr:0x203716c -_Z13func_020371b4P11UnknownData kind:function(thumb,size=0x14) addr:0x2037170 -_Z13func_020371c8P11UnknownDataPji kind:function(thumb,size=0x90) addr:0x2037184 -_Z13func_02037258P11UnknownDatai kind:function(arm,size=0x34) addr:0x2037214 -_Z13func_0203728cP11UnknownDatai kind:function(arm,size=0x64) addr:0x2037248 +_Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 +_Z13func_020371c8P11BMGFileInfoPji kind:function(thumb,size=0x90) addr:0x2037184 +_Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037214 +_Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x2037248 _ZN14MessageManager13func_020372f0Eiii kind:function(thumb,size=0xc4) addr:0x20372ac func_020373b4 kind:function(thumb,size=0x38) addr:0x2037370 func_020373ec kind:function(arm,size=0x60) addr:0x20373a8 diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp new file mode 100644 index 00000000..02bf3df2 --- /dev/null +++ b/include/Message/BMG.hpp @@ -0,0 +1,89 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#define BMG_MAGIC "MESGbmg1" +#define BMG_TAG(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) + +typedef enum BMGTag { + /* "INF1" */ BMG_TAG_INF1 = BMG_TAG('I', 'N', 'F', '1'), + /* "FLW1" */ BMG_TAG_FLW1 = BMG_TAG('F', 'L', 'W', '1'), + /* "FLI1" */ BMG_TAG_FLI1 = BMG_TAG('F', 'L', 'I', '1'), + /* "DAT1" */ BMG_TAG_DAT1 = BMG_TAG('D', 'A', 'T', '1'), +} BMGTag; + +typedef enum BMGEncoding { + /* 1 */ BMG_ENCODING_CP1252 = 1, + /* 2 */ BMG_ENCODING_UTF16_BE, + /* 3 */ BMG_ENCODING_SHIFT_JIS, + /* 4 */ BMG_ENCODING_UTF8, + /* 5 */ BMG_ENCODING_MAX +} BMGEncoding; + +typedef struct BMGSectionBase { + /* 0x00 */ char tag[4]; // "INF1", "DAT1", ... + /* 0x04 */ u32 size; // the size of the section +} BMGSectionBase; // size = 0x8 + +typedef struct BMGHeader { + /* 0x00 */ char magic[8]; // always "MESGbmg1" + /* 0x08 */ u32 fileSize; // the size of the BMG file + /* 0x0C */ u32 numSections; // the number of sections (INF1, DAT1, ...) + /* 0x10 */ u8 encoding; // see `BMGEncoding` + /* 0x11 */ u8 unk_11[0xF]; // alignment padding? + /* 0x20 */ BMGSectionBase* firstSection; // technically not part of the header but used by functions +} BMGHeader; // size = 0x24 + +typedef struct EntryINF1 { + /* 0x00 */ u32 offset; // relative to the end of the DAT1 header + /* 0x04 */ u32 unk_04; // flags? +} EntryINF1; // size = 0x8 + +typedef struct SectionINF1 { + /* 0x00 */ BMGSectionBase base; + /* 0x08 */ u16 numEntries; + /* 0x0A */ u16 entrySize; + /* 0x0C */ u16 groupId; + /* 0x0E */ u8 colorId; + /* 0x0F */ u8 unk_0F[0x1]; // alignment padding? + /* 0x10 */ EntryINF1* entries; +} SectionINF1; + +typedef struct EntryFLW1 { + /* 0x00 */ u8* data; //! TODO: find what's the format +} EntryFLW1; + +typedef struct SectionFLW1 { + /* 0x00 */ BMGSectionBase base; + /* 0x08 */ EntryFLW1* entries; +} SectionFLW1; + +typedef struct EntryFLI1 { + /* 0x00 */ u8* data; //! TODO: find what's the format +} EntryFLI1; + +typedef struct SectionFLI1 { + /* 0x00 */ BMGSectionBase base; + /* 0x08 */ EntryFLI1* entries; +} SectionFLI1; + +typedef struct EntryDAT1 { + /* 0x00 */ char* text; +} EntryDAT1; + +typedef struct SectionDAT1 { + /* 0x00 */ BMGSectionBase base; + /* 0x08 */ EntryDAT1* entries; +} SectionDAT1; + +typedef struct BMGFileInfo { + /* 0x00 */ BMGHeader* pHeader; // pointer to the file's header + /* 0x04 */ SectionINF1* pINF1; // pointer to the data informations (INF -> informations) + /* 0x08 */ SectionFLW1* pFLW1; // pointer to an unknown dataset (FLW -> ?) + /* 0x0C */ SectionFLI1* pFLI1; // pointer to an unknown dataset (FLI -> ?) + /* 0x10 */ SectionDAT1* pDAT1; // pointer to the data (DAT -> data) + /* 0x14 */ BMGHeader* unk_14; // same as unk_00 (?) + /* 0x18 */ s16 unk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose) + /* 0x1A */ s16 unk_1A; // stores result of `func_020371c8` (currently undetermined purpose) +} BMGFileInfo; // size = 0x1C diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 6d61c627..71106045 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -2,21 +2,19 @@ #include "global.h" #include "types.h" +#include "Message/BMG.hpp" -typedef struct UnknownData { - unk32 unk_00; - unk32 unk_04; - unk32 unk_08; - unk32 unk_0C; - unk32 unk_10; - unk32 unk_14; - unk16 unk_18; - unk16 unk_1A; -} UnknownData; +/** + * - pHeader + * 021ACFD0 + * 021FD7B0 + * 02204380 + * 023D98B0 + */ class MessageManager { private: - UnknownData* aUnknownData; + BMGFileInfo* aUnknownData; public: void func_020372f0(int index, int param_3, int param_4); diff --git a/src/Main/MessageManager.cpp b/src/Main/MessageManager.cpp index 5ce577b1..f66da52d 100644 --- a/src/Main/MessageManager.cpp +++ b/src/Main/MessageManager.cpp @@ -3,33 +3,108 @@ extern "C" { } #include "Message/MessageManager.hpp" -char* func_0202ab38(int lang); +char* func_0202ab38(u32* lang); u32* func_0202d550(int, u32*, char* path, int, int, int); extern u32 *data_027e0ce0[]; extern u32 data_027e05f4; // language extern u32* data_ov002_0210016c; -THUMB void func_020371b4(UnknownData* pData) { - pData->unk_00 = 0; - pData->unk_04 = 0; - pData->unk_08 = 0; - pData->unk_0C = 0; - pData->unk_10 = 0; - pData->unk_14 = 0; +THUMB void func_020371b4(BMGFileInfo* pData) { + pData->pHeader = NULL; + pData->pINF1 = NULL; + pData->pFLW1 = NULL; + pData->pFLI1 = NULL; + pData->pDAT1 = NULL; + pData->unk_14 = NULL; pData->unk_18 = 0; } -THUMB int func_020371c8(UnknownData* pData, u32* param_2, int param_3) { - /* TODO */ +THUMB int func_020371c8(BMGFileInfo* pData, u32* pFile, int param_3) { + char acVar1; + char* pacVar2; + char acVar3; + int dVar4; + u32 uVar5; + + pData->unk_14 = (BMGHeader*)pFile; + pData->unk_18 = param_3; + pData->pHeader = (BMGHeader*)pFile; + + acVar1 = BMG_TAG_FLI1; + + // acVar1 = 'FLI1'; + // pacVar2 = pHeader->firstSection; + // uVar5 = 0; + // dVar4 = 0xFFFF; + + if (pData->pFLI1 != NULL) { + // do { + // acVar3 = *pacVar2; + + if (acVar1 < acVar3) { + // if ('DAT1' < acVar3) { + // if (acVar3 == 'FLW1') { + // pData->pFLW1 = (int)pacVar2; + // } + // } else if ('DAT1' <= acVar3) { + // pData->pDAT1 = (int)(pacVar2 + 2); + // } + } else if (acVar3 < acVar1) { + // if (('MID1' < acVar3) && (acVar3 == 'INF1')) { + // pData->pINF1 = (int)pacVar2; + // dVar4 = pacVar2[3]; + // } + } else { + // pData->pFLI1 = (int)pacVar2; + } + + // uVar5 = uVar5 + 1; + // pacVar2++; + // } while (uVar5 < pData->pFLI1); + } + + return dVar4; } -THUMB int func_02037258(UnknownData* pData, unk32 param_2) { - /* TODO */ +ARM int func_02037258(BMGFileInfo* pData, unk32 param_2) { + // u32 iVar1; + + // iVar1 = pData->pINF1; + + // if (iVar1 == 0) { + // return 0; + // } + + // if (param_2 < iVar1) { + // return (iVar1 + 10) * param_2 + iVar1 + 0x10; + // } + + // return 0; } -THUMB unk16 func_0203728c(UnknownData* pData, unk32 param_2) { - /* TODO */ +ARM s64 func_0203728c(BMGFileInfo* pData, unk32 param_2) { + // u32* iVar1; + // u32 uVar2; + // u32 uVar3; + + // iVar1 = pData->unk_0C; + // if (iVar1 == 0) { + // return 0xFFFF; + // } + + // uVar2 = 0; + // if (iVar1 + 0xC + 8 != 0) { + // do { + // if (param_2 == *(int *)(iVar1 + 0x10 + uVar2 * 8)) { + // return iVar1 + 0x10 + uVar2 * 8 + 4; + // } + // uVar3 = uVar2 + 1; + // uVar2 = uVar3 & 0xFFFF; + // } while ((uVar3 & 0xFFFF) < iVar1 + 0xC + 8); + // } + + // return 0xFFFF; } static char* sBMGFiles[] = { @@ -71,32 +146,34 @@ static char* sBMGFiles[] = { THUMB void MessageManager::func_020372f0(int index, int param_3, int param_4) { char bmgPath[64]; - UnknownData local_70; - u32* uVar2; + BMGFileInfo bmgFile; + u32* pFile; int iVar1; // path to the bmg file for the current language (i.e.: "English/Message/battle.bmg") - strcpy(bmgPath, func_0202ab38(data_027e05f4)); + strcpy(bmgPath, func_0202ab38(&data_027e05f4)); strcat(bmgPath, "/Message/"); strcat(bmgPath, sBMGFiles[index]); strcat(bmgPath, ".bmg"); - uVar2 = data_027e0ce0[1]; + pFile = data_027e0ce0[1]; if (param_3 != 1) { if (param_3 != 4) { - uVar2 = data_027e0ce0[0]; + pFile = data_027e0ce0[0]; } else { - uVar2 = data_ov002_0210016c; + pFile = data_ov002_0210016c; } + } else { + // pFile = data_027e0ce0[0]; } - uVar2 = func_0202d550(0xC4, uVar2, bmgPath, 0, 0x10, 0); + pFile = func_0202d550(0xC4, pFile, bmgPath, 0, 0x10, 0); - local_70.unk_1A = 0; - func_020371b4(&local_70); + bmgFile.unk_1A = 0; + func_020371b4(&bmgFile); - iVar1 = func_020371c8(&local_70, uVar2, param_3); - this->aUnknownData[iVar1] = local_70; + iVar1 = func_020371c8(&bmgFile, pFile, param_3); + this->aUnknownData[iVar1] = bmgFile; this->aUnknownData[iVar1].unk_1A = iVar1; } From a72a9d77d2843f1e0a6d80f09b5f6978fc47c439 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:17:37 +0100 Subject: [PATCH 03/64] document flow stuff --- include/Message/BMG.hpp | 74 ++++++++++++++++++++++++++++--------- src/Main/MessageManager.cpp | 4 +- 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index 02bf3df2..cbb41527 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -21,10 +21,10 @@ typedef enum BMGEncoding { /* 5 */ BMG_ENCODING_MAX } BMGEncoding; -typedef struct BMGSectionBase { +typedef struct SectionBase { /* 0x00 */ char tag[4]; // "INF1", "DAT1", ... /* 0x04 */ u32 size; // the size of the section -} BMGSectionBase; // size = 0x8 +} SectionBase; // size = 0x8 typedef struct BMGHeader { /* 0x00 */ char magic[8]; // always "MESGbmg1" @@ -32,16 +32,16 @@ typedef struct BMGHeader { /* 0x0C */ u32 numSections; // the number of sections (INF1, DAT1, ...) /* 0x10 */ u8 encoding; // see `BMGEncoding` /* 0x11 */ u8 unk_11[0xF]; // alignment padding? - /* 0x20 */ BMGSectionBase* firstSection; // technically not part of the header but used by functions + /* 0x20 */ SectionBase* firstSection; // technically not part of the header but used by functions } BMGHeader; // size = 0x24 typedef struct EntryINF1 { /* 0x00 */ u32 offset; // relative to the end of the DAT1 header - /* 0x04 */ u32 unk_04; // flags? + /* 0x04 */ u32 unk_04; // flags/attributes? } EntryINF1; // size = 0x8 typedef struct SectionINF1 { - /* 0x00 */ BMGSectionBase base; + /* 0x00 */ SectionBase base; /* 0x08 */ u16 numEntries; /* 0x0A */ u16 entrySize; /* 0x0C */ u16 groupId; @@ -50,22 +50,62 @@ typedef struct SectionINF1 { /* 0x10 */ EntryINF1* entries; } SectionINF1; -typedef struct EntryFLW1 { - /* 0x00 */ u8* data; //! TODO: find what's the format -} EntryFLW1; +typedef enum InstrType { + /* 1 */ FLW1_TYPE_SHOW_MSG = 1, + /* 2 */ FLW1_TYPE_BRANCH = 2, + /* 3 */ FLW1_TYPE_EVENT = 3, +} InstrType; + +typedef struct InstrShowMsg { + /* 0x01 */ u8 bmgFileIndex; // index into sBMGFiles + /* 0x02 */ u16 msgIndex; // index of INF1 entry + /* 0x04 */ s16 nextIndex; // index of FLW1 entry, 0xFFFF stops the conversation + /* 0x06 */ s16 nextBMGFileIndex; // index into sBMGFiles +} InstrShowMsg; // size = 0x8 + +typedef struct InstrBranch { + /* 0x01 */ u8 unk_01; + /* 0x02 */ u16 funcIndex; // index of the query function to run + /* 0x04 */ u16 funcArg; // the argument to use in the function + /* 0x06 */ u16 flwEntry; // the index of the second section table to be used next in the conversation. +} InstrBranch; // size = 0x8 + +typedef struct InstrEvent { + /* 0x01 */ u8 funcIndex; // index of the query function to run + /* 0x02 */ u16 flwEntry; // the index of the second section table to be used next in the conversation. + /* 0x04 */ u32 funcArg; // the argument to use in the function +} InstrEvent; // size = 0x8 + +typedef struct FLW1Instr { + /* 0x00 */ u8 type; // see InstrType + /* 0x01 */ union { + InstrShowMsg showMsg; + InstrBranch branch; + InstrEvent event; + }; +} FLW1Instr; // size = 0x8 typedef struct SectionFLW1 { - /* 0x00 */ BMGSectionBase base; - /* 0x08 */ EntryFLW1* entries; + /* 0x00 */ SectionBase base; + /* 0x04 */ u16 numInstructions; + /* 0x08 */ u16 numLabels; + /* 0x0C */ u32 unk_0C; // always zero? + /* 0x10 */ FLW1Instr* instructions; + /* 0x14 */ s16* flwEntries; + /* 0x18 */ s8* bmgFileIndices; } SectionFLW1; typedef struct EntryFLI1 { - /* 0x00 */ u8* data; //! TODO: find what's the format -} EntryFLI1; + /* 0x00 */ u32 msgFlowID; + /* 0x04 */ u32 msgFlowNodeIndex; +} EntryFLI1; // size = 0x8 typedef struct SectionFLI1 { - /* 0x00 */ BMGSectionBase base; - /* 0x08 */ EntryFLI1* entries; + /* 0x00 */ SectionBase base; + /* 0x04 */ u16 numEntries; + /* 0x08 */ u16 entrySize; + /* 0x0C */ u32 unk_0C; // always zero? + /* 0x10 */ EntryFLI1* entries; } SectionFLI1; typedef struct EntryDAT1 { @@ -73,15 +113,15 @@ typedef struct EntryDAT1 { } EntryDAT1; typedef struct SectionDAT1 { - /* 0x00 */ BMGSectionBase base; + /* 0x00 */ SectionBase base; /* 0x08 */ EntryDAT1* entries; } SectionDAT1; typedef struct BMGFileInfo { /* 0x00 */ BMGHeader* pHeader; // pointer to the file's header /* 0x04 */ SectionINF1* pINF1; // pointer to the data informations (INF -> informations) - /* 0x08 */ SectionFLW1* pFLW1; // pointer to an unknown dataset (FLW -> ?) - /* 0x0C */ SectionFLI1* pFLI1; // pointer to an unknown dataset (FLI -> ?) + /* 0x08 */ SectionFLW1* pFLW1; // pointer to the message flow data (FLW -> flow) + /* 0x0C */ SectionFLI1* pFLI1; // pointer to the message flow index table (FLI -> flow index table) /* 0x10 */ SectionDAT1* pDAT1; // pointer to the data (DAT -> data) /* 0x14 */ BMGHeader* unk_14; // same as unk_00 (?) /* 0x18 */ s16 unk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose) diff --git a/src/Main/MessageManager.cpp b/src/Main/MessageManager.cpp index f66da52d..08166652 100644 --- a/src/Main/MessageManager.cpp +++ b/src/Main/MessageManager.cpp @@ -31,9 +31,7 @@ THUMB int func_020371c8(BMGFileInfo* pData, u32* pFile, int param_3) { pData->unk_18 = param_3; pData->pHeader = (BMGHeader*)pFile; - acVar1 = BMG_TAG_FLI1; - - // acVar1 = 'FLI1'; + // acVar1 = BMG_TAG_FLI1; // pacVar2 = pHeader->firstSection; // uVar5 = 0; // dVar4 = 0xFFFF; From fc19911a51de34af62c5b21df94718bad83d09c9 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 22 Jan 2025 20:56:39 +0100 Subject: [PATCH 04/64] func_020371c8: 96% --- config/eur/arm9/symbols.txt | 4 +- config/usa/arm9/symbols.txt | 4 +- include/Message/BMG.hpp | 9 +- include/Message/MessageManager.hpp | 2 +- src/Main/MessageManager.cpp | 139 +++++++++++++---------------- 5 files changed, 74 insertions(+), 84 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 81d11530..0c677bce 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1822,10 +1822,10 @@ func_02037158 kind:function(arm,size=0x20) addr:0x2037158 func_02037178 kind:function(arm,size=0x38) addr:0x2037178 func_020371b0 kind:function(arm,size=0x4) addr:0x20371b0 _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 -_Z13func_020371c8P11BMGFileInfoPji kind:function(thumb,size=0x90) addr:0x20371c8 +_Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037258 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x203728c -_ZN14MessageManager13func_020372f0Eiii kind:function(thumb,size=0xc4) addr:0x20372f0 +_ZN14MessageManager13func_020372f0Eisi kind:function(thumb,size=0xc4) addr:0x20372f0 func_020373b4 kind:function(thumb,size=0x38) addr:0x20373b4 func_020373ec kind:function(arm,size=0x60) addr:0x20373ec func_0203744c kind:function(thumb,size=0xc) addr:0x203744c diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 1ddc3578..e9affc4c 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1822,10 +1822,10 @@ func_02037158 kind:function(arm,size=0x20) addr:0x2037114 func_02037178 kind:function(arm,size=0x38) addr:0x2037134 func_020371b0 kind:function(arm,size=0x4) addr:0x203716c _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 -_Z13func_020371c8P11BMGFileInfoPji kind:function(thumb,size=0x90) addr:0x2037184 +_Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037214 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x2037248 -_ZN14MessageManager13func_020372f0Eiii kind:function(thumb,size=0xc4) addr:0x20372ac +_ZN14MessageManager13func_020372f0Eisi kind:function(thumb,size=0xc4) addr:0x20372ac func_020373b4 kind:function(thumb,size=0x38) addr:0x2037370 func_020373ec kind:function(arm,size=0x60) addr:0x20373a8 func_0203744c kind:function(thumb,size=0xc) addr:0x2037408 diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index cbb41527..fccb914d 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -4,13 +4,15 @@ #include "types.h" #define BMG_MAGIC "MESGbmg1" -#define BMG_TAG(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) +#define BMG_TAG(a, b, c, d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) typedef enum BMGTag { /* "INF1" */ BMG_TAG_INF1 = BMG_TAG('I', 'N', 'F', '1'), /* "FLW1" */ BMG_TAG_FLW1 = BMG_TAG('F', 'L', 'W', '1'), /* "FLI1" */ BMG_TAG_FLI1 = BMG_TAG('F', 'L', 'I', '1'), /* "DAT1" */ BMG_TAG_DAT1 = BMG_TAG('D', 'A', 'T', '1'), + /* "MID1" */ BMG_TAG_MID1 = BMG_TAG('M', 'I', 'D', '1'), + /* "MID1" */ BMG_TAG_STR1 = BMG_TAG('S', 'T', 'R', '1'), } BMGTag; typedef enum BMGEncoding { @@ -22,7 +24,7 @@ typedef enum BMGEncoding { } BMGEncoding; typedef struct SectionBase { - /* 0x00 */ char tag[4]; // "INF1", "DAT1", ... + /* 0x00 */ u32 tag; // "INF1", "DAT1", ... /* 0x04 */ u32 size; // the size of the section } SectionBase; // size = 0x8 @@ -32,8 +34,7 @@ typedef struct BMGHeader { /* 0x0C */ u32 numSections; // the number of sections (INF1, DAT1, ...) /* 0x10 */ u8 encoding; // see `BMGEncoding` /* 0x11 */ u8 unk_11[0xF]; // alignment padding? - /* 0x20 */ SectionBase* firstSection; // technically not part of the header but used by functions -} BMGHeader; // size = 0x24 +} BMGHeader; // size = 0x20 typedef struct EntryINF1 { /* 0x00 */ u32 offset; // relative to the end of the DAT1 header diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 71106045..e1d63cc3 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -17,5 +17,5 @@ private: BMGFileInfo* aUnknownData; public: - void func_020372f0(int index, int param_3, int param_4); + void func_020372f0(int index, s16 unk_18, int param_4); }; diff --git a/src/Main/MessageManager.cpp b/src/Main/MessageManager.cpp index 08166652..ca199d89 100644 --- a/src/Main/MessageManager.cpp +++ b/src/Main/MessageManager.cpp @@ -20,89 +20,78 @@ THUMB void func_020371b4(BMGFileInfo* pData) { pData->unk_18 = 0; } -THUMB int func_020371c8(BMGFileInfo* pData, u32* pFile, int param_3) { - char acVar1; - char* pacVar2; - char acVar3; - int dVar4; - u32 uVar5; +THUMB u16 func_020371c8(BMGFileInfo* pFileInfo, u32* pFile, s16 unk_18) { + SectionBase* pSection; + u16 groupId; + u32 i; - pData->unk_14 = (BMGHeader*)pFile; - pData->unk_18 = param_3; - pData->pHeader = (BMGHeader*)pFile; + groupId = -1; + pFileInfo->unk_14 = (BMGHeader*)pFile; + pFileInfo->pHeader = (BMGHeader*)pFile; + pFileInfo->unk_18 = unk_18; + pSection = (SectionBase*)((u8*)pFile + sizeof(BMGHeader)); - // acVar1 = BMG_TAG_FLI1; - // pacVar2 = pHeader->firstSection; - // uVar5 = 0; - // dVar4 = 0xFFFF; + for (i = 0; i < pFileInfo->pHeader->numSections; i++) { + switch (pSection->tag) { + case BMG_TAG_MID1: + // unused + break; + case BMG_TAG_STR1: + // unused + break; + case BMG_TAG_INF1: + pFileInfo->pINF1 = (SectionINF1*)pSection; + groupId = pFileInfo->pINF1->groupId; + break; + case BMG_TAG_DAT1: + //! TODO: fake? + pFileInfo->pDAT1 = (SectionDAT1*)(pSection + 1); + break; + case BMG_TAG_FLW1: + pFileInfo->pFLW1 = (SectionFLW1*)pSection; + break; + case BMG_TAG_FLI1: + pFileInfo->pFLI1 = (SectionFLI1*)pSection; + break; + } - if (pData->pFLI1 != NULL) { - // do { - // acVar3 = *pacVar2; - - if (acVar1 < acVar3) { - // if ('DAT1' < acVar3) { - // if (acVar3 == 'FLW1') { - // pData->pFLW1 = (int)pacVar2; - // } - // } else if ('DAT1' <= acVar3) { - // pData->pDAT1 = (int)(pacVar2 + 2); - // } - } else if (acVar3 < acVar1) { - // if (('MID1' < acVar3) && (acVar3 == 'INF1')) { - // pData->pINF1 = (int)pacVar2; - // dVar4 = pacVar2[3]; - // } - } else { - // pData->pFLI1 = (int)pacVar2; - } - - // uVar5 = uVar5 + 1; - // pacVar2++; - // } while (uVar5 < pData->pFLI1); + pSection = (SectionBase*)((u8*)pSection + pSection->size); } - return dVar4; + return groupId; } -ARM int func_02037258(BMGFileInfo* pData, unk32 param_2) { - // u32 iVar1; +ARM EntryINF1* func_02037258(BMGFileInfo* pFileInfo, unk32 param_2) { + SectionINF1* pINF1 = pFileInfo->pINF1; - // iVar1 = pData->pINF1; + if (pINF1 == NULL) { + return NULL; + } - // if (iVar1 == 0) { - // return 0; - // } + if (param_2 < pINF1->numEntries) { + return &pINF1->entries[pINF1->entrySize * param_2]; + } - // if (param_2 < iVar1) { - // return (iVar1 + 10) * param_2 + iVar1 + 0x10; - // } - - // return 0; + return NULL; } -ARM s64 func_0203728c(BMGFileInfo* pData, unk32 param_2) { - // u32* iVar1; - // u32 uVar2; - // u32 uVar3; +ARM u16 func_0203728c(BMGFileInfo* pFileInfo, unk32 param_2) { + SectionFLI1* pFLI1; + u16 i; - // iVar1 = pData->unk_0C; - // if (iVar1 == 0) { - // return 0xFFFF; - // } + pFLI1 = pFileInfo->pFLI1; - // uVar2 = 0; - // if (iVar1 + 0xC + 8 != 0) { - // do { - // if (param_2 == *(int *)(iVar1 + 0x10 + uVar2 * 8)) { - // return iVar1 + 0x10 + uVar2 * 8 + 4; - // } - // uVar3 = uVar2 + 1; - // uVar2 = uVar3 & 0xFFFF; - // } while ((uVar3 & 0xFFFF) < iVar1 + 0xC + 8); - // } + if (pFLI1 == NULL) { + return -1; + } - // return 0xFFFF; + for (i = 0; i < pFLI1->entrySize; i++) { + if (param_2 == pFLI1->entries[i * 8].msgFlowID) { + return pFLI1->entries[i * 8].msgFlowNodeIndex; + } + } + + return -1; } static char* sBMGFiles[] = { @@ -142,11 +131,11 @@ static char* sBMGFiles[] = { "kaitei_F", }; -THUMB void MessageManager::func_020372f0(int index, int param_3, int param_4) { +THUMB void MessageManager::func_020372f0(int index, s16 unk_18, int param_4) { char bmgPath[64]; BMGFileInfo bmgFile; u32* pFile; - int iVar1; + u16 groupId; // path to the bmg file for the current language (i.e.: "English/Message/battle.bmg") strcpy(bmgPath, func_0202ab38(&data_027e05f4)); @@ -156,8 +145,8 @@ THUMB void MessageManager::func_020372f0(int index, int param_3, int param_4) { pFile = data_027e0ce0[1]; - if (param_3 != 1) { - if (param_3 != 4) { + if (unk_18 != 1) { + if (unk_18 != 4) { pFile = data_027e0ce0[0]; } else { pFile = data_ov002_0210016c; @@ -171,7 +160,7 @@ THUMB void MessageManager::func_020372f0(int index, int param_3, int param_4) { bmgFile.unk_1A = 0; func_020371b4(&bmgFile); - iVar1 = func_020371c8(&bmgFile, pFile, param_3); - this->aUnknownData[iVar1] = bmgFile; - this->aUnknownData[iVar1].unk_1A = iVar1; + groupId = func_020371c8(&bmgFile, pFile, unk_18); + this->aUnknownData[groupId] = bmgFile; + this->aUnknownData[groupId].unk_1A = groupId; } From 969a5a7c51b6f24d13c85b5565d8c3c0aadcf7d7 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 22 Jan 2025 22:20:29 +0100 Subject: [PATCH 05/64] removed messagemanager class --- config/eur/arm9/delinks.txt | 7 +- config/eur/arm9/symbols.txt | 4 +- config/usa/arm9/symbols.txt | 4 +- include/Message/BMG.hpp | 46 +++++++++- include/Message/MessageManager.hpp | 21 ----- src/Main/{MessageManager.cpp => BMG.cpp} | 105 ++++++++++++----------- src/Main/BmgRelatedFunctions.cpp | 68 +++++++++++++++ 7 files changed, 176 insertions(+), 79 deletions(-) delete mode 100644 include/Message/MessageManager.hpp rename src/Main/{MessageManager.cpp => BMG.cpp} (57%) create mode 100644 src/Main/BmgRelatedFunctions.cpp diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 26f602ff..12508e64 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -15,5 +15,8 @@ libs/cpp/src/__register_global_object.cpp: .text start:0x0204f8d4 end:0x0204f8f4 .bss start:0x02076da8 end:0x02076dac -src/Main/MessageManager.cpp: - .text start:0x020371b4 end:0x020373b4 +src/Main/BmgRelatedFunctions.cpp: + .text start:0x0202d3bc end:0x0202d56c + +src/Main/BMG.cpp: + .text start:0x02036c50 end:0x0203744c diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 0c677bce..bb758291 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1820,12 +1820,12 @@ func_020370d0 kind:function(arm,size=0x18) addr:0x20370d0 func_020370e8 kind:function(arm,size=0x70) addr:0x20370e8 func_02037158 kind:function(arm,size=0x20) addr:0x2037158 func_02037178 kind:function(arm,size=0x38) addr:0x2037178 -func_020371b0 kind:function(arm,size=0x4) addr:0x20371b0 +_Z13func_020371b0v kind:function(arm,size=0x4) addr:0x20371b0 _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037258 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x203728c -_ZN14MessageManager13func_020372f0Eisi kind:function(thumb,size=0xc4) addr:0x20372f0 +_Z13func_020372f0P9BMGGroups12BMGFileIndexsi kind:function(thumb,size=0xc4) addr:0x20372f0 func_020373b4 kind:function(thumb,size=0x38) addr:0x20373b4 func_020373ec kind:function(arm,size=0x60) addr:0x20373ec func_0203744c kind:function(thumb,size=0xc) addr:0x203744c diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index e9affc4c..37c20980 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1820,12 +1820,12 @@ func_020370d0 kind:function(arm,size=0x18) addr:0x203708c func_020370e8 kind:function(arm,size=0x70) addr:0x20370a4 func_02037158 kind:function(arm,size=0x20) addr:0x2037114 func_02037178 kind:function(arm,size=0x38) addr:0x2037134 -func_020371b0 kind:function(arm,size=0x4) addr:0x203716c +_Z13func_020371b0v kind:function(arm,size=0x4) addr:0x203716c _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037214 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x2037248 -_ZN14MessageManager13func_020372f0Eisi kind:function(thumb,size=0xc4) addr:0x20372ac +_Z13func_020372f0P9BMGGroups12BMGFileIndexsi kind:function(thumb,size=0xc4) addr:0x20372ac func_020373b4 kind:function(thumb,size=0x38) addr:0x2037370 func_020373ec kind:function(arm,size=0x60) addr:0x20373a8 func_0203744c kind:function(thumb,size=0xc) addr:0x2037408 diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index fccb914d..d128838d 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -23,6 +23,44 @@ typedef enum BMGEncoding { /* 5 */ BMG_ENCODING_MAX } BMGEncoding; +typedef enum BMGFileIndex { + /* 0 */ BMG_FILE_INDEX_SYSTEM, + /* 1 */ BMG_FILE_INDEX_REGULAR, + /* 2 */ BMG_FILE_INDEX_BATTLE, + /* 3 */ BMG_FILE_INDEX_TEST, + /* 4 */ BMG_FILE_INDEX_DEFAULT, + /* 5 */ BMG_FILE_INDEX_SEA, + /* 6 */ BMG_FILE_INDEX_KAITEI, + /* 7 */ BMG_FILE_INDEX_MAIN_ISL, + /* 8 */ BMG_FILE_INDEX_BRAVE, + /* 9 */ BMG_FILE_INDEX_FLAME, + /* 10 */ BMG_FILE_INDEX_WIND, + /* 11 */ BMG_FILE_INDEX_FROST, + /* 12 */ BMG_FILE_INDEX_POWER, + /* 13 */ BMG_FILE_INDEX_WISDOM, + /* 14 */ BMG_FILE_INDEX_GHOST, + /* 15 */ BMG_FILE_INDEX_HIDARI, + /* 16 */ BMG_FILE_INDEX_SENNIN, + /* 17 */ BMG_FILE_INDEX_SHIP, + /* 18 */ BMG_FILE_INDEX_COLLECT, + /* 19 */ BMG_FILE_INDEX_MAINSELECT, + /* 20 */ BMG_FILE_INDEX_FIELD, + /* 21 */ BMG_FILE_INDEX_WISDOM_DNGN, + /* 22 */ BMG_FILE_INDEX_DEMO, + /* 23 */ BMG_FILE_INDEX_BATTLECOMMON, + /* 24 */ BMG_FILE_INDEX_BOSSLAST1, + /* 25 */ BMG_FILE_INDEX_BOSSLAST3, + /* 26 */ BMG_FILE_INDEX_TORII, + /* 27 */ BMG_FILE_INDEX_MYOU, + /* 28 */ BMG_FILE_INDEX_KOJIMA1, + /* 29 */ BMG_FILE_INDEX_KOJIMA2, + /* 30 */ BMG_FILE_INDEX_KOJIMA5, + /* 31 */ BMG_FILE_INDEX_KOJIMA3, + /* 32 */ BMG_FILE_INDEX_STAFF, + /* 33 */ BMG_FILE_INDEX_KAITEI_F, + /* 34 */ BMG_FILE_INDEX_MAX +} BMGFileIndex; + typedef struct SectionBase { /* 0x00 */ u32 tag; // "INF1", "DAT1", ... /* 0x04 */ u32 size; // the size of the section @@ -126,5 +164,11 @@ typedef struct BMGFileInfo { /* 0x10 */ SectionDAT1* pDAT1; // pointer to the data (DAT -> data) /* 0x14 */ BMGHeader* unk_14; // same as unk_00 (?) /* 0x18 */ s16 unk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose) - /* 0x1A */ s16 unk_1A; // stores result of `func_020371c8` (currently undetermined purpose) + /* 0x1A */ s16 groupId; // stores the group id } BMGFileInfo; // size = 0x1C + +// 0x027E0C68 + 0x14 +typedef struct BMGGroups { + /* 0x00 */ BMGFileInfo* entries; // accessed with `groupId` + /* 0x04 */ u32 numEntries; +} BMGGroups; // size = 0x8 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp deleted file mode 100644 index e1d63cc3..00000000 --- a/include/Message/MessageManager.hpp +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "global.h" -#include "types.h" -#include "Message/BMG.hpp" - -/** - * - pHeader - * 021ACFD0 - * 021FD7B0 - * 02204380 - * 023D98B0 - */ - -class MessageManager { -private: - BMGFileInfo* aUnknownData; - -public: - void func_020372f0(int index, s16 unk_18, int param_4); -}; diff --git a/src/Main/MessageManager.cpp b/src/Main/BMG.cpp similarity index 57% rename from src/Main/MessageManager.cpp rename to src/Main/BMG.cpp index ca199d89..f4f65a72 100644 --- a/src/Main/MessageManager.cpp +++ b/src/Main/BMG.cpp @@ -1,7 +1,7 @@ extern "C" { #include } -#include "Message/MessageManager.hpp" +#include "Message/BMG.hpp" char* func_0202ab38(u32* lang); u32* func_0202d550(int, u32*, char* path, int, int, int); @@ -10,14 +10,54 @@ extern u32 *data_027e0ce0[]; extern u32 data_027e05f4; // language extern u32* data_ov002_0210016c; -THUMB void func_020371b4(BMGFileInfo* pData) { - pData->pHeader = NULL; - pData->pINF1 = NULL; - pData->pFLW1 = NULL; - pData->pFLI1 = NULL; - pData->pDAT1 = NULL; - pData->unk_14 = NULL; - pData->unk_18 = 0; +static char* sBMGFiles[BMG_FILE_INDEX_MAX] = { + "system", // BMG_FILE_INDEX_SYSTEM + "regular", // BMG_FILE_INDEX_REGULAR + "battle", // BMG_FILE_INDEX_BATTLE + "test", // BMG_FILE_INDEX_TEST + "default", // BMG_FILE_INDEX_DEFAULT + "sea", // BMG_FILE_INDEX_SEA + "kaitei", // BMG_FILE_INDEX_KAITEI + "main_isl", // BMG_FILE_INDEX_MAIN_ISL + "brave", // BMG_FILE_INDEX_BRAVE + "flame", // BMG_FILE_INDEX_FLAME + "wind", // BMG_FILE_INDEX_WIND + "frost", // BMG_FILE_INDEX_FROST + "power", // BMG_FILE_INDEX_POWER + "wisdom", // BMG_FILE_INDEX_WISDOM + "ghost", // BMG_FILE_INDEX_GHOST + "hidari", // BMG_FILE_INDEX_HIDARI + "sennin", // BMG_FILE_INDEX_SENNIN + "ship", // BMG_FILE_INDEX_SHIP + "collect", // BMG_FILE_INDEX_COLLECT + "mainselect", // BMG_FILE_INDEX_MAINSELECT + "field", // BMG_FILE_INDEX_FIELD + "wisdom_dngn", // BMG_FILE_INDEX_WISDOM_DNGN + "demo", // BMG_FILE_INDEX_DEMO + "battleCommon", // BMG_FILE_INDEX_BATTLECOMMON + "bossLast1", // BMG_FILE_INDEX_BOSSLAST1 + "bossLast3", // BMG_FILE_INDEX_BOSSLAST3 + "torii", // BMG_FILE_INDEX_TORII + "myou", // BMG_FILE_INDEX_MYOU + "kojima1", // BMG_FILE_INDEX_KOJIMA1 + "kojima2", // BMG_FILE_INDEX_KOJIMA2 + "kojima5", // BMG_FILE_INDEX_KOJIMA5 + "kojima3", // BMG_FILE_INDEX_KOJIMA3 + "staff", // BMG_FILE_INDEX_STAFF + "kaitei_F", // BMG_FILE_INDEX_KAITEI_F +}; + +ARM void func_020371b0(void) { +} + +THUMB void func_020371b4(BMGFileInfo* pFileInfo) { + pFileInfo->pHeader = NULL; + pFileInfo->pINF1 = NULL; + pFileInfo->pFLW1 = NULL; + pFileInfo->pFLI1 = NULL; + pFileInfo->pDAT1 = NULL; + pFileInfo->unk_14 = NULL; + pFileInfo->unk_18 = 0; } THUMB u16 func_020371c8(BMGFileInfo* pFileInfo, u32* pFile, s16 unk_18) { @@ -94,44 +134,7 @@ ARM u16 func_0203728c(BMGFileInfo* pFileInfo, unk32 param_2) { return -1; } -static char* sBMGFiles[] = { - "system", - "regular", - "battle", - "test", - "default", - "sea", - "kaitei", - "main_isl", - "brave", - "flame", - "wind", - "frost", - "power", - "wisdom", - "ghost", - "hidari", - "sennin", - "ship", - "collect", - "mainselect", - "field", - "wisdom_dngn", - "demo", - "battleCommon", - "bossLast1", - "bossLast3", - "torii", - "myou", - "kojima1", - "kojima2", - "kojima5", - "kojima3", - "staff", - "kaitei_F", -}; - -THUMB void MessageManager::func_020372f0(int index, s16 unk_18, int param_4) { +THUMB void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18, int param_4) { char bmgPath[64]; BMGFileInfo bmgFile; u32* pFile; @@ -140,7 +143,7 @@ THUMB void MessageManager::func_020372f0(int index, s16 unk_18, int param_4) { // path to the bmg file for the current language (i.e.: "English/Message/battle.bmg") strcpy(bmgPath, func_0202ab38(&data_027e05f4)); strcat(bmgPath, "/Message/"); - strcat(bmgPath, sBMGFiles[index]); + strcat(bmgPath, sBMGFiles[eIndex]); strcat(bmgPath, ".bmg"); pFile = data_027e0ce0[1]; @@ -157,10 +160,10 @@ THUMB void MessageManager::func_020372f0(int index, s16 unk_18, int param_4) { pFile = func_0202d550(0xC4, pFile, bmgPath, 0, 0x10, 0); - bmgFile.unk_1A = 0; + bmgFile.groupId = 0; func_020371b4(&bmgFile); groupId = func_020371c8(&bmgFile, pFile, unk_18); - this->aUnknownData[groupId] = bmgFile; - this->aUnknownData[groupId].unk_1A = groupId; + pGroups->entries[groupId] = bmgFile; + pGroups->entries[groupId].groupId = groupId; } diff --git a/src/Main/BmgRelatedFunctions.cpp b/src/Main/BmgRelatedFunctions.cpp new file mode 100644 index 00000000..cc8da5b6 --- /dev/null +++ b/src/Main/BmgRelatedFunctions.cpp @@ -0,0 +1,68 @@ +extern "C" { +#include +} + +#include "global.h" +#include "types.h" + +THUMB void func_0202d3bc(int param_1, unsigned int* param_2, char* path, int param_4, int param_5, bool param_6, int param_7, int param_8) { + /* + bool bVar1; + dword dVar2; + int iVar3; + dword *pdVar4; + uint uVar5; + dword local_64; + astruct_3 aStack_60; + dword *pdStack_18; + + pdVar4 = (dword *)(uint)param_4; + *(char **)PTR_DWORD_0202d46c = path; + local_64 = DWORD_0202d470; + if (pdVar4 != (dword *)0x0) { + *pdVar4 = DWORD_0202d470; + } + pdStack_18 = pdVar4; + astruct_3(&aStack_60); + bVar1 = FUN_02041e7c(&aStack_60,path); + if (bVar1) { + uVar5 = aStack_60._40_4_ - aStack_60._36_4_; + if (uVar5 != 0) { + if (param_6) { + local_64 = FUN_0202d23c(&aStack_60,param_1,param_2,param_5,0,uVar5,pdVar4,param_7,param_8); + } + else { + if (param_7 == 0) { + dVar2 = FUN_0202d1c4(param_1,param_2,uVar5,param_5); + } + else { + dVar2 = 0; + if (uVar5 <= param_8) { + dVar2 = param_7; + } + } + if (dVar2 != 0) { + iVar3 = astruct_3::FUN_02041fa4(&aStack_60,dVar2,uVar5); + if (iVar3 == -1) { + if (param_7 == 0) { + FUN_0202d21c(dVar2); + } + } + else { + local_64 = dVar2; + if (pdVar4 != (dword *)0x0) { + *pdVar4 = uVar5; + } + } + } + } + } + astruct_3::FUN_02041ea8(&aStack_60); + } + + return local_64;*/ +} + +THUMB void func_0202d550(int param_1, unsigned int* param_2, char* path, int param_4, int param_5, bool param_6) { + func_0202d3bc(param_1, param_2, path, param_4, param_5, param_6, 0, 0); +} From c2c40b8221e2ea1ce3cd8e6257209dad892ad7e5 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:51:54 +0100 Subject: [PATCH 06/64] match func_020370d0 to func_02037178 --- config/eur/arm9/symbols.txt | 20 +++--- config/usa/arm9/symbols.txt | 20 +++--- include/Message/BMG.hpp | 79 +++++++++++++++++++++- include/global.h | 3 +- src/00_Core/Actor/ActorManager.cpp | 4 +- src/Main/BMG.cpp | 103 +++++++++++++++++++++++++++-- 6 files changed, 200 insertions(+), 29 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index bb758291..96f4d244 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1399,7 +1399,7 @@ _Z13func_0202d3bciPjPciibii kind:function(thumb,size=0xb8) addr:0x202d3bc func_0202d474 kind:function(thumb,size=0xdc) addr:0x202d474 _Z13func_0202d550iPjPciii kind:function(thumb,size=0x1c) addr:0x202d550 func_0202d56c kind:function(thumb,size=0x24) addr:0x202d56c -func_0202d590 kind:function(thumb,size=0x8) addr:0x202d590 +_Z13func_0202d590P9BMGHeader kind:function(thumb,size=0x8) addr:0x202d590 func_0202d598 kind:function(thumb,size=0x1c) addr:0x202d598 func_0202d5b4 kind:function(thumb,size=0x28) addr:0x202d5b4 func_0202d5dc kind:function(thumb,size=0x10) addr:0x202d5dc @@ -1801,33 +1801,33 @@ func_02036798 kind:function(arm,size=0x44) addr:0x2036798 func_020367dc kind:function(arm,size=0x10) addr:0x20367dc func_020367ec kind:function(arm,size=0x1c) addr:0x20367ec func_02036808 kind:function(arm,size=0x1c) addr:0x2036808 -func_02036824 kind:function(arm,size=0x2c) addr:0x2036824 -func_02036850 kind:function(arm,size=0x38) addr:0x2036850 +_Z13func_02036824v kind:function(arm,size=0x2c) addr:0x2036824 +_Z13func_02036850P15Struct_027E0C68 kind:function(arm,size=0x38) addr:0x2036850 func_02036888 kind:function(arm,size=0x6c) addr:0x2036888 func_020368f4 kind:function(arm,size=0x18) addr:0x20368f4 func_0203690c kind:function(arm,size=0x2b0) addr:0x203690c func_02036bbc kind:function(arm,size=0x94) addr:0x2036bbc func_02036c50 kind:function(arm,size=0x54) addr:0x2036c50 func_02036ca4 kind:function(arm,size=0x40) addr:0x2036ca4 -func_02036ce4 kind:function(arm,size=0x4c) addr:0x2036ce4 +_Z13func_02036ce4P15Struct_027E0C68P22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ce4 func_02036d30 kind:function(arm,size=0x1c) addr:0x2036d30 func_02036d4c kind:function(arm,size=0x20) addr:0x2036d4c func_02036d6c kind:function(arm,size=0x3c) addr:0x2036d6c func_02036da8 kind:function(arm,size=0x134) addr:0x2036da8 func_02036edc kind:function(arm,size=0x8c) addr:0x2036edc func_02036f68 kind:function(arm,size=0x168) addr:0x2036f68 -func_020370d0 kind:function(arm,size=0x18) addr:0x20370d0 -func_020370e8 kind:function(arm,size=0x70) addr:0x20370e8 -func_02037158 kind:function(arm,size=0x20) addr:0x2037158 -func_02037178 kind:function(arm,size=0x38) addr:0x2037178 +_Z13func_020370d0P15Struct_027E0C68ii kind:function(arm,size=0x18) addr:0x20370d0 +_Z13func_020370e8P15Struct_027E0C68issi kind:function(arm,size=0x70) addr:0x20370e8 +_Z13func_02037158P15Struct_027E0C68j kind:function(arm,size=0x20) addr:0x2037158 +_Z13func_02037178P15Struct_027E0C68j kind:function(arm,size=0x38) addr:0x2037178 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x20371b0 _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037258 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x203728c _Z13func_020372f0P9BMGGroups12BMGFileIndexsi kind:function(thumb,size=0xc4) addr:0x20372f0 -func_020373b4 kind:function(thumb,size=0x38) addr:0x20373b4 -func_020373ec kind:function(arm,size=0x60) addr:0x20373ec +_Z13func_020373b4P9BMGGroupss kind:function(thumb,size=0x38) addr:0x20373b4 +_Z13func_020373ecP9BMGGroupsi kind:function(arm,size=0x60) addr:0x20373ec func_0203744c kind:function(thumb,size=0xc) addr:0x203744c func_02037458 kind:function(arm,size=0x28) addr:0x2037458 func_02037480 kind:function(arm,size=0x10) addr:0x2037480 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 37c20980..30f06274 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1399,7 +1399,7 @@ _Z13func_0202d3bciPjPciibii kind:function(thumb,size=0xb8) addr:0x202d3b8 func_0202d474 kind:function(thumb,size=0xdc) addr:0x202d470 _Z13func_0202d550iPjPciii kind:function(thumb,size=0x1c) addr:0x202d54c func_0202d56c kind:function(thumb,size=0x24) addr:0x202d568 -func_0202d590 kind:function(thumb,size=0x8) addr:0x202d58c +_Z13func_0202d590P9BMGHeader kind:function(thumb,size=0x8) addr:0x202d58c func_0202d598 kind:function(thumb,size=0x1c) addr:0x202d594 func_0202d5b4 kind:function(thumb,size=0x28) addr:0x202d5b0 func_0202d5dc kind:function(thumb,size=0x10) addr:0x202d5d8 @@ -1801,33 +1801,33 @@ func_02036798 kind:function(arm,size=0x44) addr:0x2036754 func_020367dc kind:function(arm,size=0x10) addr:0x2036798 func_020367ec kind:function(arm,size=0x1c) addr:0x20367a8 func_02036808 kind:function(arm,size=0x1c) addr:0x20367c4 -func_02036824 kind:function(arm,size=0x2c) addr:0x20367e0 -func_02036850 kind:function(arm,size=0x38) addr:0x203680c +_Z13func_02036824v kind:function(arm,size=0x2c) addr:0x20367e0 +_Z13func_02036850P15Struct_027E0C68 kind:function(arm,size=0x38) addr:0x203680c func_02036888 kind:function(arm,size=0x6c) addr:0x2036844 func_020368f4 kind:function(arm,size=0x18) addr:0x20368b0 func_0203690c kind:function(arm,size=0x2b0) addr:0x20368c8 func_02036bbc kind:function(arm,size=0x94) addr:0x2036b78 func_02036c50 kind:function(arm,size=0x54) addr:0x2036c0c func_02036ca4 kind:function(arm,size=0x40) addr:0x2036c60 -func_02036ce4 kind:function(arm,size=0x4c) addr:0x2036ca0 +_Z13func_02036ce4P15Struct_027E0C68P22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ca0 func_02036d30 kind:function(arm,size=0x1c) addr:0x2036cec func_02036d4c kind:function(arm,size=0x20) addr:0x2036d08 func_02036d6c kind:function(arm,size=0x3c) addr:0x2036d28 func_02036da8 kind:function(arm,size=0x134) addr:0x2036d64 func_02036edc kind:function(arm,size=0x8c) addr:0x2036e98 func_02036f68 kind:function(arm,size=0x168) addr:0x2036f24 -func_020370d0 kind:function(arm,size=0x18) addr:0x203708c -func_020370e8 kind:function(arm,size=0x70) addr:0x20370a4 -func_02037158 kind:function(arm,size=0x20) addr:0x2037114 -func_02037178 kind:function(arm,size=0x38) addr:0x2037134 +_Z13func_020370d0P15Struct_027E0C68ii kind:function(arm,size=0x18) addr:0x203708c +_Z13func_020370e8P15Struct_027E0C68issi kind:function(arm,size=0x70) addr:0x20370a4 +_Z13func_02037158P15Struct_027E0C68j kind:function(arm,size=0x20) addr:0x2037114 +_Z13func_02037178P15Struct_027E0C68j kind:function(arm,size=0x38) addr:0x2037134 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x203716c _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037214 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x2037248 _Z13func_020372f0P9BMGGroups12BMGFileIndexsi kind:function(thumb,size=0xc4) addr:0x20372ac -func_020373b4 kind:function(thumb,size=0x38) addr:0x2037370 -func_020373ec kind:function(arm,size=0x60) addr:0x20373a8 +_Z13func_020373b4P9BMGGroupss kind:function(thumb,size=0x38) addr:0x2037370 +_Z13func_020373ecP9BMGGroupsi kind:function(arm,size=0x60) addr:0x20373a8 func_0203744c kind:function(thumb,size=0xc) addr:0x2037408 func_02037458 kind:function(arm,size=0x28) addr:0x2037414 func_02037480 kind:function(arm,size=0x10) addr:0x203743c diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index d128838d..08c7a7fa 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -170,5 +170,82 @@ typedef struct BMGFileInfo { // 0x027E0C68 + 0x14 typedef struct BMGGroups { /* 0x00 */ BMGFileInfo* entries; // accessed with `groupId` - /* 0x04 */ u32 numEntries; + /* 0x04 */ s32 numEntries; } BMGGroups; // size = 0x8 + +typedef void (*Struct_027E0C68_unk_28_unk_58)(struct Struct_027E0C68_unk_28*); + +typedef struct Struct_027E0C68_unk_28_unk_00 { + /* 0x00 */ unk32 unk_00; + /* 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 */ unk32 unk_28; + /* 0x2C */ unk32 unk_2C; + /* 0x30 */ unk32 unk_30; + /* 0x34 */ unk32 unk_34; + /* 0x38 */ unk32 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 */ Struct_027E0C68_unk_28_unk_58 unk_58; + /* 0x5C */ unk32 unk_5C; +} Struct_027E0C68_unk_28_unk_00; + +typedef struct Struct_027E0C68_unk_28 { + /* 0x00 */ Struct_027E0C68_unk_28_unk_00* unk_00; + /* 0x04 */ unk32 unk_04; + /* 0x08 */ unk32 unk_08; + /* 0x0C */ unk32 unk_0C; +} Struct_027E0C68_unk_28; + +typedef struct Struct_027E0C68_unk_18 { + /* 0x00 */ unk32 unk_00; + /* 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 */ unk32 unk_28; + /* 0x2C */ unk32 unk_2C; + /* 0x30 */ unk32 unk_30; + /* 0x34 */ unk16 unk_34; + /* 0x36 */ unk16 unk_36; + /* 0x38 */ unk32 unk_38; + /* 0x3C */ unk32 unk_3C; + /* 0x40 */ unk32 unk_40; + /* 0x44 */ unk32 unk_44; + /* 0x48 */ unk32 unk_48; +} Struct_027E0C68_unk_18; // size = 0x4C + +typedef struct Struct_027E0C68 { + /* 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 */ BMGGroups* pGroups; + /* 0x18 */ Struct_027E0C68_unk_18* unk_18; + /* 0x1C */ Struct_027E0C68_unk_18* unk_1C; + /* 0x20 */ unk32 unk_20; + /* 0x24 */ unk32 unk_24; + /* 0x28 */ Struct_027E0C68_unk_28* unk_28[6]; // 022172B0 +} Struct_027E0C68; + +Struct_027E0C68_unk_18* func_020370e8(Struct_027E0C68* param_1, unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); +Struct_027E0C68_unk_28* func_02037178(Struct_027E0C68* param_1, u32 param_2); diff --git a/include/global.h b/include/global.h index 617f672f..8d6635dd 100644 --- a/include/global.h +++ b/include/global.h @@ -7,7 +7,8 @@ #define SET_FLAG(arr, pos) ((arr)[((u32) (pos)) >> 5] |= 1 << ((pos) & 0x1f)) #define RESET_FLAG(arr, pos) ((arr)[((u32) (pos)) >> 5] &= ~(1 << ((pos) & 0x1f))) -#define ARRAY_LEN(arr) ((sizeof(arr) / sizeof(*arr))) +#define ARRAY_LEN_U(arr) (u32)((sizeof(arr) / sizeof(*arr))) +#define ARRAY_LEN(arr) (s32)(sizeof(arr) / sizeof(*arr)) // Prevent the IDE from reporting errors that the compiler/linker won't report #ifdef __INTELLISENSE__ diff --git a/src/00_Core/Actor/ActorManager.cpp b/src/00_Core/Actor/ActorManager.cpp index 73ab6bbb..7e735381 100644 --- a/src/00_Core/Actor/ActorManager.cpp +++ b/src/00_Core/Actor/ActorManager.cpp @@ -313,7 +313,7 @@ ARM s32 ActorManager::func_ov00_020c3bb0(unk32 param1, s32 *param2) { if (param2 != NULL) *param2 = 0; AABB boxes[8]; - s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN(boxes)); + s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN_U(boxes)); if (numBoxes <= 0) return 0; s32 i; @@ -350,7 +350,7 @@ ARM s32 ActorManager::func_ov00_020c3bb0(unk32 param1, s32 *param2) { ARM void ActorManager::func_ov00_020c3ce8(unk32 param1, bool param2) { AABB boxes[8]; - s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN(boxes)); + s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN_U(boxes)); if (numBoxes <= 0) return; s32 i; diff --git a/src/Main/BMG.cpp b/src/Main/BMG.cpp index f4f65a72..e6cf6808 100644 --- a/src/Main/BMG.cpp +++ b/src/Main/BMG.cpp @@ -5,12 +5,13 @@ extern "C" { char* func_0202ab38(u32* lang); u32* func_0202d550(int, u32*, char* path, int, int, int); +void func_0202d590(BMGHeader*); extern u32 *data_027e0ce0[]; extern u32 data_027e05f4; // language extern u32* data_ov002_0210016c; -static char* sBMGFiles[BMG_FILE_INDEX_MAX] = { +static char* sBMGFileNames[BMG_FILE_INDEX_MAX] = { "system", // BMG_FILE_INDEX_SYSTEM "regular", // BMG_FILE_INDEX_REGULAR "battle", // BMG_FILE_INDEX_BATTLE @@ -47,6 +48,66 @@ static char* sBMGFiles[BMG_FILE_INDEX_MAX] = { "kaitei_F", // BMG_FILE_INDEX_KAITEI_F }; +s32 func_02036824(void); +s32 func_02036850(Struct_027E0C68*); + +ARM s32 func_02036ce4(Struct_027E0C68*, Struct_027E0C68_unk_18*, unk32) { + // TODO +} + +ARM Struct_027E0C68_unk_18* func_020370d0(Struct_027E0C68* param_1, unk32 param_2, unk32 param_3) { + return func_020370e8(param_1, param_2, -1, -1, param_3); +} + +ARM Struct_027E0C68_unk_18* func_020370e8(Struct_027E0C68* param_1, unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { + Struct_027E0C68_unk_18* puVar2; + + if (func_02036824() != 0) { + puVar2 = param_1->unk_18; + } else { + if (func_02036850(param_1) != 0) { + puVar2 = param_1->unk_1C; + } else { + return NULL; + } + } + + puVar2->unk_30 = param_5; + puVar2->unk_34 = param_3; + puVar2->unk_36 = param_4; + + if (func_02036ce4(param_1, puVar2, param_2) != 0) { + return puVar2; + } + + return NULL; +} + +ARM void func_02037158(Struct_027E0C68* param_1, u32 param_2) { + Struct_027E0C68_unk_28* pSVar1; + + pSVar1 = func_02037178(param_1, param_2); + + if (pSVar1 != NULL) { + pSVar1->unk_00->unk_58(pSVar1); + } +} + +ARM Struct_027E0C68_unk_28* func_02037178(Struct_027E0C68* param_1, u32 param_2) { + Struct_027E0C68_unk_28* piVar1; + s32 iVar2; + + for (iVar2 = 0; iVar2 < ARRAY_LEN(param_1->unk_28); iVar2++) { + piVar1 = param_1->unk_28[iVar2]; + + if (piVar1 != NULL && piVar1->unk_08 == param_2) { + return piVar1; + } + } + + return NULL; +} + ARM void func_020371b0(void) { } @@ -125,9 +186,9 @@ ARM u16 func_0203728c(BMGFileInfo* pFileInfo, unk32 param_2) { return -1; } - for (i = 0; i < pFLI1->entrySize; i++) { - if (param_2 == pFLI1->entries[i * 8].msgFlowID) { - return pFLI1->entries[i * 8].msgFlowNodeIndex; + for (i = 0; i < pFLI1->numEntries; i++) { + if (param_2 == pFLI1->entries[i * 2].msgFlowID) { + return pFLI1->entries[i].msgFlowNodeIndex; } } @@ -143,7 +204,7 @@ THUMB void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18, in // path to the bmg file for the current language (i.e.: "English/Message/battle.bmg") strcpy(bmgPath, func_0202ab38(&data_027e05f4)); strcat(bmgPath, "/Message/"); - strcat(bmgPath, sBMGFiles[eIndex]); + strcat(bmgPath, sBMGFileNames[eIndex]); strcat(bmgPath, ".bmg"); pFile = data_027e0ce0[1]; @@ -158,12 +219,44 @@ THUMB void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18, in // pFile = data_027e0ce0[0]; } + // get file data pFile = func_0202d550(0xC4, pFile, bmgPath, 0, 0x10, 0); + // initialize file info bmgFile.groupId = 0; func_020371b4(&bmgFile); + // assign sections and set the file info in the groups entries groupId = func_020371c8(&bmgFile, pFile, unk_18); pGroups->entries[groupId] = bmgFile; pGroups->entries[groupId].groupId = groupId; } + +THUMB void func_020373b4(BMGGroups* pGroups, s16 unk_18) { + s32 i; + + for (i = 0; i < pGroups->numEntries; i++) { + if (pGroups->entries[i].unk_18 == unk_18) { + func_0202d590(pGroups->entries[i].unk_14); + func_020371b4(&pGroups->entries[i]); + } + } +} + +ARM u32 func_020373ec(BMGGroups* pGroups, unk32 param_2) { + u16 dVar1; + u16 uVar2; + s32 i; + + dVar1 = -1; + + for (i = 0; i < pGroups->numEntries; i++) { + uVar2 = func_0203728c(&pGroups->entries[i], param_2); + + if (uVar2 != dVar1) { + return uVar2 | i << 0x10; + } + } + + return -1; +} From 302c28edcb006510d84824c0da0291bf81507b04 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:24:03 +0100 Subject: [PATCH 07/64] more funcs + split BMG.cpp --- config/eur/arm9/delinks.txt | 9 +- config/eur/arm9/symbols.txt | 26 +-- config/usa/arm9/symbols.txt | 26 +-- include/Message/BMG.hpp | 31 +++- include/Message/MessageManager.hpp | 37 ++++ src/Main/{ => Message}/BMG.cpp | 60 ------ .../{ => Message}/BmgRelatedFunctions.cpp | 0 src/Main/Message/MessageManager.cpp | 174 ++++++++++++++++++ 8 files changed, 266 insertions(+), 97 deletions(-) create mode 100644 include/Message/MessageManager.hpp rename src/Main/{ => Message}/BMG.cpp (79%) rename src/Main/{ => Message}/BmgRelatedFunctions.cpp (100%) create mode 100644 src/Main/Message/MessageManager.cpp diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 12508e64..e4fb5113 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -15,8 +15,11 @@ libs/cpp/src/__register_global_object.cpp: .text start:0x0204f8d4 end:0x0204f8f4 .bss start:0x02076da8 end:0x02076dac -src/Main/BmgRelatedFunctions.cpp: +src/Main/Message/BmgRelatedFunctions.cpp: .text start:0x0202d3bc end:0x0202d56c -src/Main/BMG.cpp: - .text start:0x02036c50 end:0x0203744c +src/Main/Message/MessageManager.cpp: + .text start:0x02036c50 end:0x020371b0 + +src/Main/Message/BMG.cpp: + .text start:0x020371b0 end:0x0203744c diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 96f4d244..74290a74 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1305,7 +1305,7 @@ func_0202aaa8 kind:function(arm,size=0x40) addr:0x202aaa8 func_0202aae8 kind:function(thumb,size=0x10) addr:0x202aae8 func_0202aaf8 kind:function(thumb,size=0x40) addr:0x202aaf8 _Z13func_0202ab38Pj kind:function(thumb,size=0x10) addr:0x202ab38 -func_0202ab48 kind:function(thumb,size=0x4) addr:0x202ab48 +_Z13func_0202ab48v kind:function(thumb,size=0x4) addr:0x202ab48 func_0202ab4c kind:function(thumb,size=0x8) addr:0x202ab4c func_0202ab54 kind:function(thumb,size=0x10) addr:0x202ab54 func_0202ab64 kind:function(thumb,size=0x14) addr:0x202ab64 @@ -1802,24 +1802,24 @@ func_020367dc kind:function(arm,size=0x10) addr:0x20367dc func_020367ec kind:function(arm,size=0x1c) addr:0x20367ec func_02036808 kind:function(arm,size=0x1c) addr:0x2036808 _Z13func_02036824v kind:function(arm,size=0x2c) addr:0x2036824 -_Z13func_02036850P15Struct_027E0C68 kind:function(arm,size=0x38) addr:0x2036850 +_ZN18UnkStruct_027E0C6813func_02036850Ev kind:function(arm,size=0x38) addr:0x2036850 func_02036888 kind:function(arm,size=0x6c) addr:0x2036888 func_020368f4 kind:function(arm,size=0x18) addr:0x20368f4 func_0203690c kind:function(arm,size=0x2b0) addr:0x203690c func_02036bbc kind:function(arm,size=0x94) addr:0x2036bbc func_02036c50 kind:function(arm,size=0x54) addr:0x2036c50 func_02036ca4 kind:function(arm,size=0x40) addr:0x2036ca4 -_Z13func_02036ce4P15Struct_027E0C68P22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ce4 -func_02036d30 kind:function(arm,size=0x1c) addr:0x2036d30 -func_02036d4c kind:function(arm,size=0x20) addr:0x2036d4c -func_02036d6c kind:function(arm,size=0x3c) addr:0x2036d6c +_ZN18UnkStruct_027E0C6813func_02036ce4EP22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ce4 +_ZN18UnkStruct_027E0C6813func_02036d30Ei kind:function(arm,size=0x1c) addr:0x2036d30 +_ZN18UnkStruct_027E0C6813func_02036d4cEi kind:function(arm,size=0x20) addr:0x2036d4c +_ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c func_02036da8 kind:function(arm,size=0x134) addr:0x2036da8 -func_02036edc kind:function(arm,size=0x8c) addr:0x2036edc -func_02036f68 kind:function(arm,size=0x168) addr:0x2036f68 -_Z13func_020370d0P15Struct_027E0C68ii kind:function(arm,size=0x18) addr:0x20370d0 -_Z13func_020370e8P15Struct_027E0C68issi kind:function(arm,size=0x70) addr:0x20370e8 -_Z13func_02037158P15Struct_027E0C68j kind:function(arm,size=0x20) addr:0x2037158 -_Z13func_02037178P15Struct_027E0C68j kind:function(arm,size=0x38) addr:0x2037178 +_ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036edc +_ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f68 +_ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x20370d0 +_ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370e8 +_ZN18UnkStruct_027E0C6813func_02037158EP22Struct_027E0C68_unk_28 kind:function(arm,size=0x20) addr:0x2037158 +_ZN18UnkStruct_027E0C6813func_02037178EP22Struct_027E0C68_unk_28 kind:function(arm,size=0x38) addr:0x2037178 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x20371b0 _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 @@ -1878,7 +1878,7 @@ func_02038b08 kind:function(thumb,size=0x14) addr:0x2038b08 func_02038b1c kind:function(thumb,size=0xc) addr:0x2038b1c func_02038b28 kind:function(thumb,size=0xc) addr:0x2038b28 func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 -func_02038b40 kind:function(arm,size=0x34) addr:0x2038b40 +_Z13func_02038b40P22Struct_027E0C68_unk_28 kind:function(arm,size=0x34) addr:0x2038b40 func_02038b74 kind:function(arm,size=0x4) addr:0x2038b74 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b78 func_02038c34 kind:function(arm,size=0x84) addr:0x2038c34 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 30f06274..4535de5e 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1305,7 +1305,7 @@ func_0202aaa8 kind:function(arm,size=0x40) addr:0x202aaa8 func_0202aae8 kind:function(thumb,size=0x10) addr:0x202aae8 func_0202aaf8 kind:function(thumb,size=0x28) addr:0x202aaf8 _Z13func_0202ab38Pj kind:function(thumb,size=0x10) addr:0x202ab20 -func_0202ab48 kind:function(thumb,size=0x4) addr:0x202ab30 +_Z13func_0202ab48v kind:function(thumb,size=0x4) addr:0x202ab30 func_0202ab4c kind:function(thumb,size=0x8) addr:0x202ab34 func_0202ab54 kind:function(thumb,size=0x10) addr:0x202ab3c func_0202ab64 kind:function(thumb,size=0x14) addr:0x202ab4c @@ -1802,24 +1802,24 @@ func_020367dc kind:function(arm,size=0x10) addr:0x2036798 func_020367ec kind:function(arm,size=0x1c) addr:0x20367a8 func_02036808 kind:function(arm,size=0x1c) addr:0x20367c4 _Z13func_02036824v kind:function(arm,size=0x2c) addr:0x20367e0 -_Z13func_02036850P15Struct_027E0C68 kind:function(arm,size=0x38) addr:0x203680c +_ZN18UnkStruct_027E0C6813func_02036850Ev kind:function(arm,size=0x38) addr:0x203680c func_02036888 kind:function(arm,size=0x6c) addr:0x2036844 func_020368f4 kind:function(arm,size=0x18) addr:0x20368b0 func_0203690c kind:function(arm,size=0x2b0) addr:0x20368c8 func_02036bbc kind:function(arm,size=0x94) addr:0x2036b78 func_02036c50 kind:function(arm,size=0x54) addr:0x2036c0c func_02036ca4 kind:function(arm,size=0x40) addr:0x2036c60 -_Z13func_02036ce4P15Struct_027E0C68P22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ca0 -func_02036d30 kind:function(arm,size=0x1c) addr:0x2036cec -func_02036d4c kind:function(arm,size=0x20) addr:0x2036d08 -func_02036d6c kind:function(arm,size=0x3c) addr:0x2036d28 +_ZN18UnkStruct_027E0C6813func_02036ce4EP22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ca0 +_ZN18UnkStruct_027E0C6813func_02036d30Ei kind:function(arm,size=0x1c) addr:0x2036cec +_ZN18UnkStruct_027E0C6813func_02036d4cEi kind:function(arm,size=0x20) addr:0x2036d08 +_ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 func_02036da8 kind:function(arm,size=0x134) addr:0x2036d64 -func_02036edc kind:function(arm,size=0x8c) addr:0x2036e98 -func_02036f68 kind:function(arm,size=0x168) addr:0x2036f24 -_Z13func_020370d0P15Struct_027E0C68ii kind:function(arm,size=0x18) addr:0x203708c -_Z13func_020370e8P15Struct_027E0C68issi kind:function(arm,size=0x70) addr:0x20370a4 -_Z13func_02037158P15Struct_027E0C68j kind:function(arm,size=0x20) addr:0x2037114 -_Z13func_02037178P15Struct_027E0C68j kind:function(arm,size=0x38) addr:0x2037134 +_ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036e98 +_ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f24 +_ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x203708c +_ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370a4 +_ZN18UnkStruct_027E0C6813func_02037158EP22Struct_027E0C68_unk_28 kind:function(arm,size=0x20) addr:0x2037114 +_ZN18UnkStruct_027E0C6813func_02037178EP22Struct_027E0C68_unk_28 kind:function(arm,size=0x38) addr:0x2037134 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x203716c _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 @@ -1878,7 +1878,7 @@ func_02038b08 kind:function(thumb,size=0x14) addr:0x2038ac4 func_02038b1c kind:function(thumb,size=0xc) addr:0x2038ad8 func_02038b28 kind:function(thumb,size=0xc) addr:0x2038ae4 func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0 -func_02038b40 kind:function(arm,size=0x34) addr:0x2038afc +_Z13func_02038b40P22Struct_027E0C68_unk_28 kind:function(arm,size=0x34) addr:0x2038afc func_02038b74 kind:function(arm,size=0x4) addr:0x2038b30 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b34 func_02038c34 kind:function(arm,size=0x84) addr:0x2038bf0 diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index 08c7a7fa..4af7ccb7 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -173,7 +173,9 @@ typedef struct BMGGroups { /* 0x04 */ s32 numEntries; } BMGGroups; // size = 0x8 +typedef void (*Struct_027E0C68_unk_28_unk_50)(struct Struct_027E0C68_unk_28*, EntryINF1*, int, u8*); typedef void (*Struct_027E0C68_unk_28_unk_58)(struct Struct_027E0C68_unk_28*); +typedef void (*Struct_027E0C68_unk_18_unk_08)(struct Struct_027E0C68_unk_18*); typedef struct Struct_027E0C68_unk_28_unk_00 { /* 0x00 */ unk32 unk_00; @@ -196,22 +198,30 @@ typedef struct Struct_027E0C68_unk_28_unk_00 { /* 0x44 */ unk32 unk_44; /* 0x48 */ unk32 unk_48; /* 0x4C */ unk32 unk_4C; - /* 0x50 */ unk32 unk_50; + /* 0x50 */ Struct_027E0C68_unk_28_unk_50 unk_50; /* 0x54 */ unk32 unk_54; /* 0x58 */ Struct_027E0C68_unk_28_unk_58 unk_58; /* 0x5C */ unk32 unk_5C; } Struct_027E0C68_unk_28_unk_00; +//! TODO: this should be a class typedef struct Struct_027E0C68_unk_28 { /* 0x00 */ Struct_027E0C68_unk_28_unk_00* unk_00; - /* 0x04 */ unk32 unk_04; - /* 0x08 */ unk32 unk_08; + /* 0x04 */ struct Struct_027E0C68_unk_28* unk_04; + /* 0x08 */ struct Struct_027E0C68_unk_28* unk_08; /* 0x0C */ unk32 unk_0C; } Struct_027E0C68_unk_28; -typedef struct Struct_027E0C68_unk_18 { +typedef struct Struct_027E0C68_unk_18_unk_00 { /* 0x00 */ unk32 unk_00; /* 0x04 */ unk32 unk_04; + /* 0x08 */ Struct_027E0C68_unk_18_unk_08 unk_08; + /* 0x0C */ unk32 unk_0C; +} Struct_027E0C68_unk_18_unk_00; + +typedef struct Struct_027E0C68_unk_18 { + /* 0x00 */ Struct_027E0C68_unk_18_unk_00* unk_00; + /* 0x04 */ unk32 unk_04; /* 0x08 */ unk32 unk_08; /* 0x0C */ unk32 unk_0C; /* 0x10 */ unk32 unk_10; @@ -235,8 +245,10 @@ typedef struct Struct_027E0C68_unk_18 { typedef struct Struct_027E0C68 { /* 0x00 */ unk16 unk_00; /* 0x02 */ unk16 unk_02; - /* 0x04 */ unk32 unk_04; - /* 0x08 */ unk32 unk_08; + /* 0x04 */ u8 unk_04; + /* 0x05 */ u8 unk_05; + /* 0x06 */ unk16 unk_06; + /* 0x08 */ Struct_027E0C68_unk_28* unk_08; /* 0x0C */ unk32 unk_0C; /* 0x10 */ unk32 unk_10; /* 0x14 */ BMGGroups* pGroups; @@ -247,5 +259,8 @@ typedef struct Struct_027E0C68 { /* 0x28 */ Struct_027E0C68_unk_28* unk_28[6]; // 022172B0 } Struct_027E0C68; -Struct_027E0C68_unk_18* func_020370e8(Struct_027E0C68* param_1, unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); -Struct_027E0C68_unk_28* func_02037178(Struct_027E0C68* param_1, u32 param_2); +extern Struct_027E0C68_unk_28* func_02036f68(Struct_027E0C68 *param_1, u32 param_2, u8* param_3); +extern Struct_027E0C68_unk_18* func_020370e8(Struct_027E0C68* param_1, unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); +extern Struct_027E0C68_unk_28* func_02037178(Struct_027E0C68* param_1, u32 param_2); +extern EntryINF1* func_02037258(BMGFileInfo* pFileInfo, unk32 param_2); +extern u32 func_020373ec(BMGGroups* pGroups, unk32 param_2); diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp new file mode 100644 index 00000000..4151991b --- /dev/null +++ b/include/Message/MessageManager.hpp @@ -0,0 +1,37 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include "Message/BMG.hpp" + +class UnkStruct_027E0C68 { +private: + /* 0x00 */ unk16 unk_00; + /* 0x02 */ unk16 unk_02; + /* 0x04 */ u8 unk_04; + /* 0x05 */ u8 unk_05; + /* 0x06 */ unk16 unk_06; + /* 0x08 */ Struct_027E0C68_unk_28* unk_08; + /* 0x0C */ unk32 unk_0C; + /* 0x10 */ unk32 unk_10; + /* 0x14 */ BMGGroups* pGroups; + /* 0x18 */ Struct_027E0C68_unk_18* unk_18; + /* 0x1C */ Struct_027E0C68_unk_18* unk_1C; + /* 0x20 */ unk32 unk_20; + /* 0x24 */ unk32 unk_24; + /* 0x28 */ Struct_027E0C68_unk_28* unk_28[6]; // 022172B0 + +public: + s32 func_02036850(void); + s32 func_02036ce4(Struct_027E0C68_unk_18* param_2, unk32 param_3); + unk32 func_02036d30(unk32 param_2); + unk32 func_02036d4c(unk32 param_2); + void func_02036d6c(void); + void func_02036edc(u32 param_2, u8 param_3); + Struct_027E0C68_unk_28* func_02036f68(u32 param_2, u8* param_3); + Struct_027E0C68_unk_18* func_020370d0(unk32 param_2, unk32 param_3); + Struct_027E0C68_unk_18* func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); + void func_02037158(Struct_027E0C68_unk_28* param_2); + Struct_027E0C68_unk_28* func_02037178(Struct_027E0C68_unk_28* param_2); +}; diff --git a/src/Main/BMG.cpp b/src/Main/Message/BMG.cpp similarity index 79% rename from src/Main/BMG.cpp rename to src/Main/Message/BMG.cpp index e6cf6808..830fccba 100644 --- a/src/Main/BMG.cpp +++ b/src/Main/Message/BMG.cpp @@ -48,66 +48,6 @@ static char* sBMGFileNames[BMG_FILE_INDEX_MAX] = { "kaitei_F", // BMG_FILE_INDEX_KAITEI_F }; -s32 func_02036824(void); -s32 func_02036850(Struct_027E0C68*); - -ARM s32 func_02036ce4(Struct_027E0C68*, Struct_027E0C68_unk_18*, unk32) { - // TODO -} - -ARM Struct_027E0C68_unk_18* func_020370d0(Struct_027E0C68* param_1, unk32 param_2, unk32 param_3) { - return func_020370e8(param_1, param_2, -1, -1, param_3); -} - -ARM Struct_027E0C68_unk_18* func_020370e8(Struct_027E0C68* param_1, unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { - Struct_027E0C68_unk_18* puVar2; - - if (func_02036824() != 0) { - puVar2 = param_1->unk_18; - } else { - if (func_02036850(param_1) != 0) { - puVar2 = param_1->unk_1C; - } else { - return NULL; - } - } - - puVar2->unk_30 = param_5; - puVar2->unk_34 = param_3; - puVar2->unk_36 = param_4; - - if (func_02036ce4(param_1, puVar2, param_2) != 0) { - return puVar2; - } - - return NULL; -} - -ARM void func_02037158(Struct_027E0C68* param_1, u32 param_2) { - Struct_027E0C68_unk_28* pSVar1; - - pSVar1 = func_02037178(param_1, param_2); - - if (pSVar1 != NULL) { - pSVar1->unk_00->unk_58(pSVar1); - } -} - -ARM Struct_027E0C68_unk_28* func_02037178(Struct_027E0C68* param_1, u32 param_2) { - Struct_027E0C68_unk_28* piVar1; - s32 iVar2; - - for (iVar2 = 0; iVar2 < ARRAY_LEN(param_1->unk_28); iVar2++) { - piVar1 = param_1->unk_28[iVar2]; - - if (piVar1 != NULL && piVar1->unk_08 == param_2) { - return piVar1; - } - } - - return NULL; -} - ARM void func_020371b0(void) { } diff --git a/src/Main/BmgRelatedFunctions.cpp b/src/Main/Message/BmgRelatedFunctions.cpp similarity index 100% rename from src/Main/BmgRelatedFunctions.cpp rename to src/Main/Message/BmgRelatedFunctions.cpp diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp new file mode 100644 index 00000000..7413e15c --- /dev/null +++ b/src/Main/Message/MessageManager.cpp @@ -0,0 +1,174 @@ +#include "Message/MessageManager.hpp" + +s32 func_02036824(void); +unk32 func_ov000_020d7f18(u32*, unk32); +unk32 func_ov000_020d77e4(u32*, unk32); +unk32 func_02037628(u8*); +THUMB unk32 func_0202ab48(void); +ARM void func_02038b40(Struct_027E0C68_unk_28*); + +// see Actor.cpp +struct UnkStruct2 { + /* 0 */ u32 mUnk_0; + /* 4 */ u32 mUnk_4; + /* 8 */ +}; +extern UnkStruct2 data_027e077c; +extern u32 data_ov000_020eec9c[]; +extern u8 data_02056be4[]; + +ARM s32 UnkStruct_027E0C68::func_02036ce4(Struct_027E0C68_unk_18* param_2, unk32 param_3) { + if (param_3 == 0) { + return 0; + } + + if (func_020373ec(this->pGroups,param_3) != -1) { + param_2->unk_00->unk_08(param_2); + return 1; + } + + return 0; +} + +ARM unk32 UnkStruct_027E0C68::func_02036d30(unk32 param_2) { + if (this->unk_20 == 0 || this->unk_20 == param_2) { + this->unk_20 = param_2; + return 1; + } + + return 0; +} + +ARM unk32 UnkStruct_027E0C68::func_02036d4c(unk32 param_2) { + if (this->unk_20 == param_2) { + this->unk_20 = 0; + return 1; + } + + return 0; +} + +ARM void UnkStruct_027E0C68::func_02036d6c(void) { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + if (func_0202ab48() == 0 || i != 5) { + func_02038b40(this->unk_28[i]); + } + } +} + +ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { + Struct_027E0C68_unk_28 *pSVar1; + u8 auStack_28[24]; + u8 local_13; + + func_02037628(auStack_28); + local_13 = 0; + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { + local_13 = 1; + } + + auStack_28[21] = local_13; + auStack_28[20] = param_3; + pSVar1 = this->func_02036f68(param_2, auStack_28); + + if (pSVar1 != NULL) { + if (this->unk_04 == 0) { + this->unk_08 = pSVar1; + } + } +} + +ARM Struct_027E0C68_unk_28* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { + EntryINF1 *pEVar1; + Struct_027E0C68_unk_28 *pSVar2; + EntryINF1 *pEVar3; + int iVar4; + Struct_027E0C68_unk_28 *pSVar5; + BMGGroups *pBVar6; + + pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xffff); + + if (pEVar1 == NULL) { + return NULL; + } + + if (param_3[21] != 0) { + pSVar5 = this->unk_28[2]; + pSVar2 = this->unk_28[3]; + } else { + pSVar5 = this->unk_28[0]; + pSVar2 = this->unk_28[1]; + } + + pSVar5[0x16].unk_04 = pSVar2; + pSVar5[0x41].unk_08 = this->unk_28[5]; + pBVar6 = this->pGroups; + pEVar3 = func_02037258(&pBVar6->entries[param_2 >> 0x10], param_2 & 0xffff); + + pSVar5->unk_00->unk_50(pSVar5, pEVar1, (int)&((pBVar6->entries[param_2 >> 0x10].pDAT1)->base).tag + (pEVar3->offset & 0xfffffffe), param_3); + + if (func_ov000_020d7f18(data_ov000_020eec9c, 0x19) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x18) == 0 && + func_ov000_020d7f18(data_ov000_020eec9c, 0x34) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x35) == 0 && + func_ov000_020d7f18(data_ov000_020eec9c, 0x1A) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x1B) == 0 && + (param_3[12]) != 7) { + func_ov000_020d77e4(data_ov000_020eec9c, 0x1C); + } + + return pSVar5; +} + +ARM Struct_027E0C68_unk_18* UnkStruct_027E0C68::func_020370d0(unk32 param_2, unk32 param_3) { + return this->func_020370e8(param_2, -1, -1, param_3); +} + +ARM Struct_027E0C68_unk_18* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { + Struct_027E0C68_unk_18* puVar2; + + if (func_02036824() != 0) { + puVar2 = this->unk_18; + } else { + if (this->func_02036850() != 0) { + puVar2 = this->unk_1C; + } else { + return NULL; + } + } + + puVar2->unk_30 = param_5; + puVar2->unk_34 = param_3; + puVar2->unk_36 = param_4; + + if (this->func_02036ce4(puVar2, param_2) != 0) { + return puVar2; + } + + return NULL; +} + +ARM void UnkStruct_027E0C68::func_02037158(Struct_027E0C68_unk_28* param_2) { + Struct_027E0C68_unk_28* pSVar1; + + pSVar1 = this->func_02037178(param_2); + + if (pSVar1 != NULL) { + pSVar1->unk_00->unk_58(pSVar1); + } +} + +ARM Struct_027E0C68_unk_28* UnkStruct_027E0C68::func_02037178(Struct_027E0C68_unk_28* param_2) { + Struct_027E0C68_unk_28* piVar1; + s32 iVar2; + + for (iVar2 = 0; iVar2 < ARRAY_LEN(this->unk_28); iVar2++) { + piVar1 = this->unk_28[iVar2]; + + if (piVar1 != NULL && piVar1->unk_08 == param_2) { + return piVar1; + } + } + + return NULL; +} From cf97807bbc2941a50267b1de59b88ae971009488 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Thu, 23 Jan 2025 21:54:51 +0100 Subject: [PATCH 08/64] progress and add more funcs --- config/eur/arm9/delinks.txt | 2 +- config/eur/arm9/symbols.txt | 8 +-- config/usa/arm9/symbols.txt | 8 +-- include/Message/BMG.hpp | 89 -------------------------- include/Message/MessageManager.hpp | 74 ++++++++++++++++++++++ src/Main/Message/MessageManager.cpp | 96 ++++++++++++++++++++++++++--- 6 files changed, 171 insertions(+), 106 deletions(-) diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index e4fb5113..d30e76c9 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -19,7 +19,7 @@ src/Main/Message/BmgRelatedFunctions.cpp: .text start:0x0202d3bc end:0x0202d56c src/Main/Message/MessageManager.cpp: - .text start:0x02036c50 end:0x020371b0 + .text start:0x0203643c end:0x020371b0 src/Main/Message/BMG.cpp: .text start:0x020371b0 end:0x0203744c diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 74290a74..f8b618ac 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1807,13 +1807,13 @@ func_02036888 kind:function(arm,size=0x6c) addr:0x2036888 func_020368f4 kind:function(arm,size=0x18) addr:0x20368f4 func_0203690c kind:function(arm,size=0x2b0) addr:0x203690c func_02036bbc kind:function(arm,size=0x94) addr:0x2036bbc -func_02036c50 kind:function(arm,size=0x54) addr:0x2036c50 -func_02036ca4 kind:function(arm,size=0x40) addr:0x2036ca4 +_ZN18UnkStruct_027E0C6813func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c50 +_ZN18UnkStruct_027E0C6813func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036ca4 _ZN18UnkStruct_027E0C6813func_02036ce4EP22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ce4 _ZN18UnkStruct_027E0C6813func_02036d30Ei kind:function(arm,size=0x1c) addr:0x2036d30 _ZN18UnkStruct_027E0C6813func_02036d4cEi kind:function(arm,size=0x20) addr:0x2036d4c _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c -func_02036da8 kind:function(arm,size=0x134) addr:0x2036da8 +_ZN18UnkStruct_027E0C6813func_02036da8EjPi kind:function(arm,size=0x134) addr:0x2036da8 _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036edc _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f68 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x20370d0 @@ -2034,7 +2034,7 @@ func_0203dcb4 kind:function(arm,size=0x48) addr:0x203dcb4 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcfc func_0203ddec kind:function(arm,size=0x10) addr:0x203ddec func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddfc -func_0203de14 kind:function(arm,size=0x10) addr:0x203de14 +_Z13func_0203de14P22Struct_027E0C68_unk_28i kind:function(arm,size=0x10) addr:0x203de14 func_0203de24 kind:function(arm,size=0x34) addr:0x203de24 func_0203de58 kind:function(arm,size=0x208) addr:0x203de58 func_0203e060 kind:function(arm,size=0x30) addr:0x203e060 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 4535de5e..62bd2852 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1807,13 +1807,13 @@ func_02036888 kind:function(arm,size=0x6c) addr:0x2036844 func_020368f4 kind:function(arm,size=0x18) addr:0x20368b0 func_0203690c kind:function(arm,size=0x2b0) addr:0x20368c8 func_02036bbc kind:function(arm,size=0x94) addr:0x2036b78 -func_02036c50 kind:function(arm,size=0x54) addr:0x2036c0c -func_02036ca4 kind:function(arm,size=0x40) addr:0x2036c60 +_ZN18UnkStruct_027E0C6813func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c0c +_ZN18UnkStruct_027E0C6813func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036c60 _ZN18UnkStruct_027E0C6813func_02036ce4EP22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ca0 _ZN18UnkStruct_027E0C6813func_02036d30Ei kind:function(arm,size=0x1c) addr:0x2036cec _ZN18UnkStruct_027E0C6813func_02036d4cEi kind:function(arm,size=0x20) addr:0x2036d08 _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 -func_02036da8 kind:function(arm,size=0x134) addr:0x2036d64 +_ZN18UnkStruct_027E0C6813func_02036da8EjPi kind:function(arm,size=0x134) addr:0x2036d64 _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036e98 _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f24 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x203708c @@ -2034,7 +2034,7 @@ func_0203dcb4 kind:function(arm,size=0x48) addr:0x203dc70 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcb8 func_0203ddec kind:function(arm,size=0x10) addr:0x203dda8 func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddb8 -func_0203de14 kind:function(arm,size=0x10) addr:0x203ddd0 +_Z13func_0203de14P22Struct_027E0C68_unk_28i kind:function(arm,size=0x10) addr:0x203ddd0 func_0203de24 kind:function(arm,size=0x34) addr:0x203dde0 func_0203de58 kind:function(arm,size=0x208) addr:0x203de14 func_0203e060 kind:function(arm,size=0x30) addr:0x203e01c diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index 4af7ccb7..7915ced7 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -173,94 +173,5 @@ typedef struct BMGGroups { /* 0x04 */ s32 numEntries; } BMGGroups; // size = 0x8 -typedef void (*Struct_027E0C68_unk_28_unk_50)(struct Struct_027E0C68_unk_28*, EntryINF1*, int, u8*); -typedef void (*Struct_027E0C68_unk_28_unk_58)(struct Struct_027E0C68_unk_28*); -typedef void (*Struct_027E0C68_unk_18_unk_08)(struct Struct_027E0C68_unk_18*); - -typedef struct Struct_027E0C68_unk_28_unk_00 { - /* 0x00 */ unk32 unk_00; - /* 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 */ unk32 unk_28; - /* 0x2C */ unk32 unk_2C; - /* 0x30 */ unk32 unk_30; - /* 0x34 */ unk32 unk_34; - /* 0x38 */ unk32 unk_38; - /* 0x3C */ unk32 unk_3C; - /* 0x40 */ unk32 unk_40; - /* 0x44 */ unk32 unk_44; - /* 0x48 */ unk32 unk_48; - /* 0x4C */ unk32 unk_4C; - /* 0x50 */ Struct_027E0C68_unk_28_unk_50 unk_50; - /* 0x54 */ unk32 unk_54; - /* 0x58 */ Struct_027E0C68_unk_28_unk_58 unk_58; - /* 0x5C */ unk32 unk_5C; -} Struct_027E0C68_unk_28_unk_00; - -//! TODO: this should be a class -typedef struct Struct_027E0C68_unk_28 { - /* 0x00 */ Struct_027E0C68_unk_28_unk_00* unk_00; - /* 0x04 */ struct Struct_027E0C68_unk_28* unk_04; - /* 0x08 */ struct Struct_027E0C68_unk_28* unk_08; - /* 0x0C */ unk32 unk_0C; -} Struct_027E0C68_unk_28; - -typedef struct Struct_027E0C68_unk_18_unk_00 { - /* 0x00 */ unk32 unk_00; - /* 0x04 */ unk32 unk_04; - /* 0x08 */ Struct_027E0C68_unk_18_unk_08 unk_08; - /* 0x0C */ unk32 unk_0C; -} Struct_027E0C68_unk_18_unk_00; - -typedef struct Struct_027E0C68_unk_18 { - /* 0x00 */ Struct_027E0C68_unk_18_unk_00* unk_00; - /* 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 */ unk32 unk_28; - /* 0x2C */ unk32 unk_2C; - /* 0x30 */ unk32 unk_30; - /* 0x34 */ unk16 unk_34; - /* 0x36 */ unk16 unk_36; - /* 0x38 */ unk32 unk_38; - /* 0x3C */ unk32 unk_3C; - /* 0x40 */ unk32 unk_40; - /* 0x44 */ unk32 unk_44; - /* 0x48 */ unk32 unk_48; -} Struct_027E0C68_unk_18; // size = 0x4C - -typedef struct Struct_027E0C68 { - /* 0x00 */ unk16 unk_00; - /* 0x02 */ unk16 unk_02; - /* 0x04 */ u8 unk_04; - /* 0x05 */ u8 unk_05; - /* 0x06 */ unk16 unk_06; - /* 0x08 */ Struct_027E0C68_unk_28* unk_08; - /* 0x0C */ unk32 unk_0C; - /* 0x10 */ unk32 unk_10; - /* 0x14 */ BMGGroups* pGroups; - /* 0x18 */ Struct_027E0C68_unk_18* unk_18; - /* 0x1C */ Struct_027E0C68_unk_18* unk_1C; - /* 0x20 */ unk32 unk_20; - /* 0x24 */ unk32 unk_24; - /* 0x28 */ Struct_027E0C68_unk_28* unk_28[6]; // 022172B0 -} Struct_027E0C68; - -extern Struct_027E0C68_unk_28* func_02036f68(Struct_027E0C68 *param_1, u32 param_2, u8* param_3); -extern Struct_027E0C68_unk_18* func_020370e8(Struct_027E0C68* param_1, unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); -extern Struct_027E0C68_unk_28* func_02037178(Struct_027E0C68* param_1, u32 param_2); extern EntryINF1* func_02037258(BMGFileInfo* pFileInfo, unk32 param_2); extern u32 func_020373ec(BMGGroups* pGroups, unk32 param_2); diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 4151991b..00d92ace 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -5,6 +5,77 @@ #include "Message/BMG.hpp" +typedef void (*Struct_027E0C68_unk_28_unk_50)(struct Struct_027E0C68_unk_28*, EntryINF1*, int, u8*); +typedef void (*Struct_027E0C68_unk_28_unk_58)(struct Struct_027E0C68_unk_28*); +typedef void (*Struct_027E0C68_unk_18_unk_08)(void); +typedef void (*Struct_027E0C68_unk_28_unk_28)(struct Struct_027E0C68_unk_28*); +typedef void (*Struct_027E0C68_unk_28_unk_3C)(struct Struct_027E0C68_unk_28*, unk32); + +typedef struct Struct_027E0C68_unk_28_unk_00 { + /* 0x00 */ unk32 unk_00; + /* 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 */ Struct_027E0C68_unk_28_unk_28 unk_28; + /* 0x2C */ unk32 unk_2C; + /* 0x30 */ unk32 unk_30; + /* 0x34 */ unk32 unk_34; + /* 0x38 */ unk32 unk_38; + /* 0x3C */ Struct_027E0C68_unk_28_unk_3C unk_3C; + /* 0x40 */ unk32 unk_40; + /* 0x44 */ unk32 unk_44; + /* 0x48 */ unk32 unk_48; + /* 0x4C */ unk32 unk_4C; + /* 0x50 */ Struct_027E0C68_unk_28_unk_50 unk_50; + /* 0x54 */ unk32 unk_54; + /* 0x58 */ Struct_027E0C68_unk_28_unk_58 unk_58; + /* 0x5C */ unk32 unk_5C; +} Struct_027E0C68_unk_28_unk_00; + +//! TODO: this should be a class +typedef struct Struct_027E0C68_unk_28 { + /* 0x00 */ Struct_027E0C68_unk_28_unk_00* unk_00; + /* 0x04 */ struct Struct_027E0C68_unk_28* unk_04; + /* 0x08 */ struct Struct_027E0C68_unk_28* unk_08; + /* 0x0C */ unk32 unk_0C; +} Struct_027E0C68_unk_28; + +typedef struct Struct_027E0C68_unk_18_unk_00 { + /* 0x00 */ unk32 unk_00; + /* 0x04 */ unk32 unk_04; + /* 0x08 */ Struct_027E0C68_unk_18_unk_08 unk_08; + /* 0x0C */ unk32 unk_0C; +} Struct_027E0C68_unk_18_unk_00; + +typedef struct Struct_027E0C68_unk_18 { + /* 0x00 */ Struct_027E0C68_unk_18_unk_00* unk_00; + /* 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 */ unk32 unk_28; + /* 0x2C */ unk32 unk_2C; + /* 0x30 */ unk32 unk_30; + /* 0x34 */ unk16 unk_34; + /* 0x36 */ unk16 unk_36; + /* 0x38 */ unk32 unk_38; + /* 0x3C */ unk32 unk_3C; + /* 0x40 */ unk32 unk_40; + /* 0x44 */ unk32 unk_44; + /* 0x48 */ unk32 unk_48; +} Struct_027E0C68_unk_18; // size = 0x4C + class UnkStruct_027E0C68 { private: /* 0x00 */ unk16 unk_00; @@ -24,10 +95,13 @@ private: public: s32 func_02036850(void); + void func_02036c50(unk32 param_2); + void func_02036ca4(unk32 param_2); s32 func_02036ce4(Struct_027E0C68_unk_18* param_2, unk32 param_3); unk32 func_02036d30(unk32 param_2); unk32 func_02036d4c(unk32 param_2); void func_02036d6c(void); + Struct_027E0C68_unk_28* func_02036da8(u32 param_2, s32* param_3); void func_02036edc(u32 param_2, u8 param_3); Struct_027E0C68_unk_28* func_02036f68(u32 param_2, u8* param_3); Struct_027E0C68_unk_18* func_020370d0(unk32 param_2, unk32 param_3); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 7413e15c..c18ce30f 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -1,11 +1,12 @@ #include "Message/MessageManager.hpp" -s32 func_02036824(void); -unk32 func_ov000_020d7f18(u32*, unk32); -unk32 func_ov000_020d77e4(u32*, unk32); -unk32 func_02037628(u8*); -THUMB unk32 func_0202ab48(void); -ARM void func_02038b40(Struct_027E0C68_unk_28*); +extern s32 func_02036824(void); +extern unk32 func_ov000_020d7f18(u32*, unk32); +extern unk32 func_ov000_020d77e4(u32*, unk32); +extern unk32 func_02037628(u8*); +extern THUMB unk32 func_0202ab48(void); +extern ARM void func_02038b40(Struct_027E0C68_unk_28*); +extern ARM unk32 func_0203de14(Struct_027E0C68_unk_28*, unk32); // see Actor.cpp struct UnkStruct2 { @@ -17,19 +18,43 @@ extern UnkStruct2 data_027e077c; extern u32 data_ov000_020eec9c[]; extern u8 data_02056be4[]; +ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + if (this->unk_28[i] != NULL && func_0203de14(this->unk_28[i], param_2) != 0) { + this->unk_28[i]->unk_00->unk_28(this->unk_28[i]); + } + } +} + +ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + Struct_027E0C68_unk_28* pSVar1 = this->unk_28[i]; + + if (pSVar1 != NULL) { + pSVar1->unk_00->unk_3C(pSVar1, param_2); + } + } +} + +// non-matching ARM s32 UnkStruct_027E0C68::func_02036ce4(Struct_027E0C68_unk_18* param_2, unk32 param_3) { if (param_3 == 0) { return 0; } - if (func_020373ec(this->pGroups,param_3) != -1) { - param_2->unk_00->unk_08(param_2); + if (func_020373ec(this->pGroups, param_3) != -1) { + param_2->unk_00->unk_08(); return 1; } return 0; } +// non-matching ARM unk32 UnkStruct_027E0C68::func_02036d30(unk32 param_2) { if (this->unk_20 == 0 || this->unk_20 == param_2) { this->unk_20 = param_2; @@ -48,6 +73,7 @@ ARM unk32 UnkStruct_027E0C68::func_02036d4c(unk32 param_2) { return 0; } +// non-matching ARM void UnkStruct_027E0C68::func_02036d6c(void) { s32 i; @@ -58,6 +84,59 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { } } +// non-matching +ARM Struct_027E0C68_unk_28* UnkStruct_027E0C68::func_02036da8(u32 param_2, s32* param_3) { + EntryINF1 *pEVar1; + EntryINF1 *pEVar2; + u8* puVar3; + Struct_027E0C68_unk_28 *pSVar4; + BMGGroups *pBVar5; + bool bVar6; + u8 iStack_38; + int iStack_34; + int iStack_30; + u8 uStack_2c; + u8 uStack_23; + + pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xFFFF); + + if (pEVar1 == NULL) { + return NULL; + } + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { + pSVar4 = this->unk_28[4]; + func_02037628(&iStack_38); + bVar6 = (data_02056be4[data_027e077c.mUnk_0] & 1) == 0; + puVar3 = data_02056be4; + + if (bVar6) { + puVar3[0] = 1; + } + + uStack_23 = puVar3[0]; + + if (!bVar6) { + uStack_23 = 0; + } + + uStack_2c = 1; + iStack_38 = *param_3; + iStack_34 = param_3[1]; + iStack_30 = param_3[2]; + pBVar5 = this->pGroups; + pEVar2 = func_02037258(&pBVar5->entries[param_2 >> 0x10], param_2 & 0xFFFF); + + pSVar4->unk_00->unk_50(pSVar4, pEVar1, (int)&((pBVar5->entries[param_2 >> 0x10].pDAT1)->base).tag + (pEVar2->offset & 0xfffffffe), &iStack_38); + + func_ov000_020d77e4(data_ov000_020eec9c, 0x1C); + return pSVar4; + } + + return NULL; +} + +// non-matching ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { Struct_027E0C68_unk_28 *pSVar1; u8 auStack_28[24]; @@ -81,6 +160,7 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { } } +// non-matching ARM Struct_027E0C68_unk_28* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { EntryINF1 *pEVar1; Struct_027E0C68_unk_28 *pSVar2; From 3194675d0d444d3d200d8a5c85fca16ea4cb1f09 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 24 Jan 2025 02:24:14 +0100 Subject: [PATCH 09/64] more progress & cleanup structs --- config/eur/arm9/symbols.txt | 18 ++-- config/usa/arm9/symbols.txt | 18 ++-- include/Message/MessageManager.hpp | 133 ++++++++++++++++++---------- src/Main/Message/MessageManager.cpp | 122 +++++++++++++++++-------- 4 files changed, 188 insertions(+), 103 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index f8b618ac..db1ffeac 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1800,26 +1800,26 @@ func_02036770 kind:function(arm,size=0x28) addr:0x2036770 func_02036798 kind:function(arm,size=0x44) addr:0x2036798 func_020367dc kind:function(arm,size=0x10) addr:0x20367dc func_020367ec kind:function(arm,size=0x1c) addr:0x20367ec -func_02036808 kind:function(arm,size=0x1c) addr:0x2036808 -_Z13func_02036824v kind:function(arm,size=0x2c) addr:0x2036824 +_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 -func_02036888 kind:function(arm,size=0x6c) addr:0x2036888 -func_020368f4 kind:function(arm,size=0x18) addr:0x20368f4 +_ZN18UnkStruct_027E0C6813func_02036888EP31UnkStruct_027E0C68_UnkSubClass2 kind:function(arm,size=0x6c) addr:0x2036888 +_ZN18UnkStruct_027E0C6813func_020368f4Ei kind:function(arm,size=0x18) addr:0x20368f4 func_0203690c kind:function(arm,size=0x2b0) addr:0x203690c func_02036bbc 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_02036ce4EP22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ce4 -_ZN18UnkStruct_027E0C6813func_02036d30Ei kind:function(arm,size=0x1c) addr:0x2036d30 -_ZN18UnkStruct_027E0C6813func_02036d4cEi kind:function(arm,size=0x20) addr:0x2036d4c +_ZN18UnkStruct_027E0C6813func_02036ce4EP31UnkStruct_027E0C68_UnkSubClass2i kind:function(arm,size=0x4c) addr:0x2036ce4 +_ZN18UnkStruct_027E0C6813func_02036d30EPj kind:function(arm,size=0x1c) addr:0x2036d30 +_ZN18UnkStruct_027E0C6813func_02036d4cEPj kind:function(arm,size=0x20) addr:0x2036d4c _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c _ZN18UnkStruct_027E0C6813func_02036da8EjPi kind:function(arm,size=0x134) addr:0x2036da8 _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036edc _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f68 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x20370d0 _ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370e8 -_ZN18UnkStruct_027E0C6813func_02037158EP22Struct_027E0C68_unk_28 kind:function(arm,size=0x20) addr:0x2037158 -_ZN18UnkStruct_027E0C6813func_02037178EP22Struct_027E0C68_unk_28 kind:function(arm,size=0x38) addr:0x2037178 +_ZN18UnkStruct_027E0C6813func_02037158EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x20) addr:0x2037158 +_ZN18UnkStruct_027E0C6813func_02037178EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x38) addr:0x2037178 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x20371b0 _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 62bd2852..4d1f8a0a 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1800,26 +1800,26 @@ func_02036770 kind:function(arm,size=0x28) addr:0x203672c func_02036798 kind:function(arm,size=0x44) addr:0x2036754 func_020367dc kind:function(arm,size=0x10) addr:0x2036798 func_020367ec kind:function(arm,size=0x1c) addr:0x20367a8 -func_02036808 kind:function(arm,size=0x1c) addr:0x20367c4 -_Z13func_02036824v kind:function(arm,size=0x2c) addr:0x20367e0 +_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 -func_02036888 kind:function(arm,size=0x6c) addr:0x2036844 -func_020368f4 kind:function(arm,size=0x18) addr:0x20368b0 +_ZN18UnkStruct_027E0C6813func_02036888EP31UnkStruct_027E0C68_UnkSubClass2 kind:function(arm,size=0x6c) addr:0x2036844 +_ZN18UnkStruct_027E0C6813func_020368f4Ei kind:function(arm,size=0x18) addr:0x20368b0 func_0203690c kind:function(arm,size=0x2b0) addr:0x20368c8 func_02036bbc 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_02036ce4EP22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ca0 -_ZN18UnkStruct_027E0C6813func_02036d30Ei kind:function(arm,size=0x1c) addr:0x2036cec -_ZN18UnkStruct_027E0C6813func_02036d4cEi kind:function(arm,size=0x20) addr:0x2036d08 +_ZN18UnkStruct_027E0C6813func_02036ce4EP31UnkStruct_027E0C68_UnkSubClass2i kind:function(arm,size=0x4c) addr:0x2036ca0 +_ZN18UnkStruct_027E0C6813func_02036d30EPj kind:function(arm,size=0x1c) addr:0x2036cec +_ZN18UnkStruct_027E0C6813func_02036d4cEPj kind:function(arm,size=0x20) addr:0x2036d08 _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 _ZN18UnkStruct_027E0C6813func_02036da8EjPi kind:function(arm,size=0x134) addr:0x2036d64 _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036e98 _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f24 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x203708c _ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370a4 -_ZN18UnkStruct_027E0C6813func_02037158EP22Struct_027E0C68_unk_28 kind:function(arm,size=0x20) addr:0x2037114 -_ZN18UnkStruct_027E0C6813func_02037178EP22Struct_027E0C68_unk_28 kind:function(arm,size=0x38) addr:0x2037134 +_ZN18UnkStruct_027E0C6813func_02037158EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x20) addr:0x2037114 +_ZN18UnkStruct_027E0C6813func_02037178EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x38) addr:0x2037134 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x203716c _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 00d92ace..8d10c0b6 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -5,62 +5,78 @@ #include "Message/BMG.hpp" -typedef void (*Struct_027E0C68_unk_28_unk_50)(struct Struct_027E0C68_unk_28*, EntryINF1*, int, u8*); -typedef void (*Struct_027E0C68_unk_28_unk_58)(struct Struct_027E0C68_unk_28*); -typedef void (*Struct_027E0C68_unk_18_unk_08)(void); -typedef void (*Struct_027E0C68_unk_28_unk_28)(struct Struct_027E0C68_unk_28*); -typedef void (*Struct_027E0C68_unk_28_unk_3C)(struct Struct_027E0C68_unk_28*, unk32); +// temp +#define UNK_TYPE void -typedef struct Struct_027E0C68_unk_28_unk_00 { - /* 0x00 */ unk32 unk_00; - /* 0x04 */ unk32 unk_04; - /* 0x08 */ unk32 unk_08; +class UnkStruct_027E0C68_UnkSubClass1 { +public: + /* 0x00 (vtable) */ + /* 0x04 */ unk32* unk_04; + /* 0x08 */ unk32* unk_08; /* 0x0C */ unk32 unk_0C; /* 0x10 */ unk32 unk_10; - /* 0x14 */ unk32 unk_14; + /* 0x14 */ u8 unk_14; + /* 0x15 */ s16* unk_15; + /* 0x16 */ unk16 unk_16; /* 0x18 */ unk32 unk_18; /* 0x1C */ unk32 unk_1C; /* 0x20 */ unk32 unk_20; /* 0x24 */ unk32 unk_24; - /* 0x28 */ Struct_027E0C68_unk_28_unk_28 unk_28; + /* 0x28 */ unk32 unk_28; /* 0x2C */ unk32 unk_2C; /* 0x30 */ unk32 unk_30; /* 0x34 */ unk32 unk_34; /* 0x38 */ unk32 unk_38; - /* 0x3C */ Struct_027E0C68_unk_28_unk_3C unk_3C; + /* 0x3C */ unk32 unk_3C; /* 0x40 */ unk32 unk_40; /* 0x44 */ unk32 unk_44; /* 0x48 */ unk32 unk_48; /* 0x4C */ unk32 unk_4C; - /* 0x50 */ Struct_027E0C68_unk_28_unk_50 unk_50; + /* 0x50 */ unk32 unk_50; /* 0x54 */ unk32 unk_54; - /* 0x58 */ Struct_027E0C68_unk_28_unk_58 unk_58; - /* 0x5C */ unk32 unk_5C; -} Struct_027E0C68_unk_28_unk_00; + /* 0x58 */ unk32 unk_58; + /* 0x5C */ s16 unk_5C; -//! TODO: this should be a class -typedef struct Struct_027E0C68_unk_28 { - /* 0x00 */ Struct_027E0C68_unk_28_unk_00* unk_00; - /* 0x04 */ struct Struct_027E0C68_unk_28* unk_04; - /* 0x08 */ struct Struct_027E0C68_unk_28* unk_08; - /* 0x0C */ unk32 unk_0C; -} Struct_027E0C68_unk_28; + /* 0x00 */ virtual UNK_TYPE vfunc_00(void); + /* 0x04 */ virtual UNK_TYPE vfunc_04(void); + /* 0x08 */ virtual UNK_TYPE vfunc_08(void); + /* 0x0C */ virtual UNK_TYPE vfunc_0C(void); + /* 0x10 */ virtual UNK_TYPE 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 void vfunc_28(void); + /* 0x2C */ virtual UNK_TYPE vfunc_2C(void); + /* 0x30 */ virtual UNK_TYPE vfunc_30(void); + /* 0x34 */ virtual UNK_TYPE vfunc_34(void); + /* 0x38 */ virtual UNK_TYPE vfunc_38(void); + /* 0x3C */ virtual void vfunc_3C(unk32 param_2); + /* 0x40 */ virtual UNK_TYPE vfunc_40(void); + /* 0x44 */ virtual UNK_TYPE vfunc_44(void); + /* 0x48 */ virtual UNK_TYPE vfunc_48(void); + /* 0x4C */ virtual UNK_TYPE vfunc_4C(void); + /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, int param_3, u8* param_4); + /* 0x54 */ virtual UNK_TYPE vfunc_54(void); + /* 0x58 */ virtual void vfunc_58(void); + /* 0x5C */ virtual UNK_TYPE vfunc_5C(void); + /* 0x60 */ virtual UNK_TYPE vfunc_60(void); + /* 0x64 */ virtual UNK_TYPE vfunc_64(void); + /* 0x68 */ virtual UNK_TYPE vfunc_68(void); + /* 0x6C */ virtual UNK_TYPE vfunc_6C(void); + /* 0x70 */ virtual UNK_TYPE vfunc_70(void); +}; -typedef struct Struct_027E0C68_unk_18_unk_00 { - /* 0x00 */ unk32 unk_00; - /* 0x04 */ unk32 unk_04; - /* 0x08 */ Struct_027E0C68_unk_18_unk_08 unk_08; - /* 0x0C */ unk32 unk_0C; -} Struct_027E0C68_unk_18_unk_00; - -typedef struct Struct_027E0C68_unk_18 { - /* 0x00 */ Struct_027E0C68_unk_18_unk_00* unk_00; +class UnkStruct_027E0C68_UnkSubClass2 { +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; + /* 0x18 */ u32 unk_18; /* 0x1C */ unk32 unk_1C; /* 0x20 */ unk32 unk_20; /* 0x24 */ unk32 unk_24; @@ -74,7 +90,21 @@ typedef struct Struct_027E0C68_unk_18 { /* 0x40 */ unk32 unk_40; /* 0x44 */ unk32 unk_44; /* 0x48 */ unk32 unk_48; -} Struct_027E0C68_unk_18; // size = 0x4C + + /* 0x00 */ virtual UNK_TYPE vfunc_00(void); + /* 0x04 */ virtual UNK_TYPE vfunc_04(void); + /* 0x08 */ virtual void vfunc_08(void); + /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1* param_2); + /* 0x10 */ virtual void vfunc_10(void); + /* 0x14 */ virtual UNK_TYPE vfunc_14(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 */ virtual UNK_TYPE vfunc_34(void); +}; class UnkStruct_027E0C68 { private: @@ -83,29 +113,34 @@ private: /* 0x04 */ u8 unk_04; /* 0x05 */ u8 unk_05; /* 0x06 */ unk16 unk_06; - /* 0x08 */ Struct_027E0C68_unk_28* unk_08; + /* 0x08 */ UnkStruct_027E0C68_UnkSubClass1* unk_08; /* 0x0C */ unk32 unk_0C; /* 0x10 */ unk32 unk_10; /* 0x14 */ BMGGroups* pGroups; - /* 0x18 */ Struct_027E0C68_unk_18* unk_18; - /* 0x1C */ Struct_027E0C68_unk_18* unk_1C; - /* 0x20 */ unk32 unk_20; + /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18; + /* 0x1C */ UnkStruct_027E0C68_UnkSubClass2* unk_1C; + /* 0x20 */ u32* unk_20; /* 0x24 */ unk32 unk_24; - /* 0x28 */ Struct_027E0C68_unk_28* unk_28[6]; // 022172B0 + /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1* unk_28[6]; // 022172B0 public: - s32 func_02036850(void); + UnkStruct_027E0C68_UnkSubClass1* func_020366c4(void); + bool func_02036808(void); + bool func_02036824(void); + bool func_02036850(void); + void func_02036888(UnkStruct_027E0C68_UnkSubClass2* param_2); + bool func_020368f4(unk32 param_2); void func_02036c50(unk32 param_2); void func_02036ca4(unk32 param_2); - s32 func_02036ce4(Struct_027E0C68_unk_18* param_2, unk32 param_3); - unk32 func_02036d30(unk32 param_2); - unk32 func_02036d4c(unk32 param_2); + s32 func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param_2, unk32 param_3); + unk32 func_02036d30(u32* param_2); + unk32 func_02036d4c(u32* param_2); void func_02036d6c(void); - Struct_027E0C68_unk_28* func_02036da8(u32 param_2, s32* param_3); + UnkStruct_027E0C68_UnkSubClass1* func_02036da8(u32 param_2, s32* param_3); void func_02036edc(u32 param_2, u8 param_3); - Struct_027E0C68_unk_28* func_02036f68(u32 param_2, u8* param_3); - Struct_027E0C68_unk_18* func_020370d0(unk32 param_2, unk32 param_3); - Struct_027E0C68_unk_18* func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); - void func_02037158(Struct_027E0C68_unk_28* param_2); - Struct_027E0C68_unk_28* func_02037178(Struct_027E0C68_unk_28* param_2); + UnkStruct_027E0C68_UnkSubClass1* func_02036f68(u32 param_2, u8* param_3); + UnkStruct_027E0C68_UnkSubClass2* func_020370d0(unk32 param_2, unk32 param_3); + UnkStruct_027E0C68_UnkSubClass2* func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); + void func_02037158(UnkStruct_027E0C68_UnkSubClass1* param_2); + UnkStruct_027E0C68_UnkSubClass1* func_02037178(UnkStruct_027E0C68_UnkSubClass1* param_2); }; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index c18ce30f..f4ef6438 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -1,12 +1,11 @@ #include "Message/MessageManager.hpp" -extern s32 func_02036824(void); extern unk32 func_ov000_020d7f18(u32*, unk32); extern unk32 func_ov000_020d77e4(u32*, unk32); extern unk32 func_02037628(u8*); extern THUMB unk32 func_0202ab48(void); -extern ARM void func_02038b40(Struct_027E0C68_unk_28*); -extern ARM unk32 func_0203de14(Struct_027E0C68_unk_28*, unk32); +extern ARM void func_02038b40(UnkStruct_027E0C68_UnkSubClass1*); +extern ARM unk32 func_0203de14(UnkStruct_027E0C68_UnkSubClass1*, unk32); // see Actor.cpp struct UnkStruct2 { @@ -18,12 +17,64 @@ extern UnkStruct2 data_027e077c; extern u32 data_ov000_020eec9c[]; extern u8 data_02056be4[]; +ARM bool UnkStruct_027E0C68::func_02036808(void) { + return this->unk_28[2]->unk_15[0x2E] > 0; +} + +ARM bool UnkStruct_027E0C68::func_02036824(void) { + switch (data_027e077c.mUnk_0) { + case 0x01: + case 0x37: + case 0x3B: + return true; + default: + break; + } + + return false; +} + +ARM bool UnkStruct_027E0C68::func_02036850(void) { + bool ret = false; + u8 value; + u32 val = data_027e077c.mUnk_0; + + value = data_02056be4[val]; + + if (!(value & 2)) { + ret = value & 1; + } + + return ret; +} + +ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_027E0C68_UnkSubClass2* param_2) { + if ((param_2->unk_18 & 0xFFFF0000) != 0x1000000) { + UnkStruct_027E0C68_UnkSubClass1* iVar1 = this->func_020366c4(); + + if (iVar1->unk_5C <= 0) { + param_2->vfunc_10(); + } else { + param_2->vfunc_0C(this->func_020366c4()); + } + } +} + +ARM bool UnkStruct_027E0C68::func_020368f4(unk32 param_2) { + if (this->unk_24 != 0) { + return false; + } + + this->unk_24 = param_2; + return true; +} + ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { if (this->unk_28[i] != NULL && func_0203de14(this->unk_28[i], param_2) != 0) { - this->unk_28[i]->unk_00->unk_28(this->unk_28[i]); + this->unk_28[i]->vfunc_28(); } } } @@ -32,41 +83,40 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - Struct_027E0C68_unk_28* pSVar1 = this->unk_28[i]; + UnkStruct_027E0C68_UnkSubClass1* pSVar1 = this->unk_28[i]; if (pSVar1 != NULL) { - pSVar1->unk_00->unk_3C(pSVar1, param_2); + pSVar1->vfunc_3C(param_2); } } } // non-matching -ARM s32 UnkStruct_027E0C68::func_02036ce4(Struct_027E0C68_unk_18* param_2, unk32 param_3) { +ARM s32 UnkStruct_027E0C68::func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param_2, unk32 param_3) { if (param_3 == 0) { return 0; } if (func_020373ec(this->pGroups, param_3) != -1) { - param_2->unk_00->unk_08(); + param_2->vfunc_08(); return 1; } return 0; } -// non-matching -ARM unk32 UnkStruct_027E0C68::func_02036d30(unk32 param_2) { - if (this->unk_20 == 0 || this->unk_20 == param_2) { - this->unk_20 = param_2; - return 1; +ARM unk32 UnkStruct_027E0C68::func_02036d30(u32* param_2) { + if (this->unk_20 != NULL && this->unk_20 != param_2) { + return 0; } - return 0; + this->unk_20 = param_2; + return 1; } -ARM unk32 UnkStruct_027E0C68::func_02036d4c(unk32 param_2) { +ARM unk32 UnkStruct_027E0C68::func_02036d4c(u32* param_2) { if (this->unk_20 == param_2) { - this->unk_20 = 0; + this->unk_20 = NULL; return 1; } @@ -85,11 +135,11 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { } // non-matching -ARM Struct_027E0C68_unk_28* UnkStruct_027E0C68::func_02036da8(u32 param_2, s32* param_3) { +ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param_2, s32* param_3) { EntryINF1 *pEVar1; EntryINF1 *pEVar2; u8* puVar3; - Struct_027E0C68_unk_28 *pSVar4; + UnkStruct_027E0C68_UnkSubClass1 *pSVar4; BMGGroups *pBVar5; bool bVar6; u8 iStack_38; @@ -127,7 +177,7 @@ ARM Struct_027E0C68_unk_28* UnkStruct_027E0C68::func_02036da8(u32 param_2, s32* pBVar5 = this->pGroups; pEVar2 = func_02037258(&pBVar5->entries[param_2 >> 0x10], param_2 & 0xFFFF); - pSVar4->unk_00->unk_50(pSVar4, pEVar1, (int)&((pBVar5->entries[param_2 >> 0x10].pDAT1)->base).tag + (pEVar2->offset & 0xfffffffe), &iStack_38); + pSVar4->vfunc_50(pEVar1, (int)&((pBVar5->entries[param_2 >> 0x10].pDAT1)->base).tag + (pEVar2->offset & 0xfffffffe), &iStack_38); func_ov000_020d77e4(data_ov000_020eec9c, 0x1C); return pSVar4; @@ -138,7 +188,7 @@ ARM Struct_027E0C68_unk_28* UnkStruct_027E0C68::func_02036da8(u32 param_2, s32* // non-matching ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { - Struct_027E0C68_unk_28 *pSVar1; + UnkStruct_027E0C68_UnkSubClass1 *pSVar1; u8 auStack_28[24]; u8 local_13; @@ -161,12 +211,12 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { } // non-matching -ARM Struct_027E0C68_unk_28* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { +ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { EntryINF1 *pEVar1; - Struct_027E0C68_unk_28 *pSVar2; + UnkStruct_027E0C68_UnkSubClass1 *pSVar2; EntryINF1 *pEVar3; int iVar4; - Struct_027E0C68_unk_28 *pSVar5; + UnkStruct_027E0C68_UnkSubClass1 *pSVar5; BMGGroups *pBVar6; pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xffff); @@ -183,12 +233,12 @@ ARM Struct_027E0C68_unk_28* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* p pSVar2 = this->unk_28[1]; } - pSVar5[0x16].unk_04 = pSVar2; - pSVar5[0x41].unk_08 = this->unk_28[5]; + pSVar5[0x16].unk_04 = (unk32*)pSVar2; + pSVar5[0x41].unk_08 = (unk32*)this->unk_28[5]; pBVar6 = this->pGroups; pEVar3 = func_02037258(&pBVar6->entries[param_2 >> 0x10], param_2 & 0xffff); - pSVar5->unk_00->unk_50(pSVar5, pEVar1, (int)&((pBVar6->entries[param_2 >> 0x10].pDAT1)->base).tag + (pEVar3->offset & 0xfffffffe), param_3); + pSVar5->vfunc_50(pEVar1, (int)&((pBVar6->entries[param_2 >> 0x10].pDAT1)->base).tag + (pEVar3->offset & 0xfffffffe), param_3); if (func_ov000_020d7f18(data_ov000_020eec9c, 0x19) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x18) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x34) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x35) == 0 && @@ -200,14 +250,14 @@ ARM Struct_027E0C68_unk_28* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* p return pSVar5; } -ARM Struct_027E0C68_unk_18* UnkStruct_027E0C68::func_020370d0(unk32 param_2, unk32 param_3) { +ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370d0(unk32 param_2, unk32 param_3) { return this->func_020370e8(param_2, -1, -1, param_3); } -ARM Struct_027E0C68_unk_18* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { - Struct_027E0C68_unk_18* puVar2; +ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { + UnkStruct_027E0C68_UnkSubClass2* puVar2; - if (func_02036824() != 0) { + if (this->func_02036824() != 0) { puVar2 = this->unk_18; } else { if (this->func_02036850() != 0) { @@ -228,24 +278,24 @@ ARM Struct_027E0C68_unk_18* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk return NULL; } -ARM void UnkStruct_027E0C68::func_02037158(Struct_027E0C68_unk_28* param_2) { - Struct_027E0C68_unk_28* pSVar1; +ARM void UnkStruct_027E0C68::func_02037158(UnkStruct_027E0C68_UnkSubClass1* param_2) { + UnkStruct_027E0C68_UnkSubClass1* pSVar1; pSVar1 = this->func_02037178(param_2); if (pSVar1 != NULL) { - pSVar1->unk_00->unk_58(pSVar1); + pSVar1->vfunc_58(); } } -ARM Struct_027E0C68_unk_28* UnkStruct_027E0C68::func_02037178(Struct_027E0C68_unk_28* param_2) { - Struct_027E0C68_unk_28* piVar1; +ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02037178(UnkStruct_027E0C68_UnkSubClass1* param_2) { + UnkStruct_027E0C68_UnkSubClass1* piVar1; s32 iVar2; for (iVar2 = 0; iVar2 < ARRAY_LEN(this->unk_28); iVar2++) { piVar1 = this->unk_28[iVar2]; - if (piVar1 != NULL && piVar1->unk_08 == param_2) { + if (piVar1 != NULL && piVar1->unk_08 == (unk32*)param_2) { return piVar1; } } From dea4060fb5eca12980e578b820e6ee349d721c8e Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 24 Jan 2025 03:37:43 +0100 Subject: [PATCH 10/64] more progress --- config/eur/arm9/symbols.txt | 18 ++++---- config/usa/arm9/symbols.txt | 18 ++++---- include/Message/MessageManager.hpp | 14 +++++- src/Main/Message/MessageManager.cpp | 70 ++++++++++++++++++++++++++++- 4 files changed, 98 insertions(+), 22 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index db1ffeac..478f8f21 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1792,14 +1792,14 @@ func_020363c8 kind:function(arm,size=0x74) addr:0x20363c8 func_0203643c kind:function(arm,size=0x54) addr:0x203643c func_02036490 kind:function(thumb,size=0x1cc) addr:0x2036490 func_0203665c kind:function(thumb,size=0x4c) addr:0x203665c -func_020366a8 kind:function(arm,size=0x1c) addr:0x20366a8 -func_020366c4 kind:function(arm,size=0x3c) addr:0x20366c4 -func_02036700 kind:function(arm,size=0x3c) addr:0x2036700 -func_0203673c kind:function(arm,size=0x34) addr:0x203673c +_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x20366a8 +_ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x20366c4 +_ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x2036700 +_ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x203673c func_02036770 kind:function(arm,size=0x28) addr:0x2036770 -func_02036798 kind:function(arm,size=0x44) addr:0x2036798 -func_020367dc kind:function(arm,size=0x10) addr:0x20367dc -func_020367ec kind:function(arm,size=0x1c) addr:0x20367ec +_ZN18UnkStruct_027E0C6813func_02036798Ev kind:function(arm,size=0x44) addr:0x2036798 +_ZN18UnkStruct_027E0C6813func_020367dcEi kind:function(arm,size=0x10) addr:0x20367dc +_ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367ec _ZN18UnkStruct_027E0C6813func_02036808Ev kind:function(arm,size=0x1c) addr:0x2036808 _ZN18UnkStruct_027E0C6813func_02036824Ev kind:function(arm,size=0x2c) addr:0x2036824 _ZN18UnkStruct_027E0C6813func_02036850Ev kind:function(arm,size=0x38) addr:0x2036850 @@ -1878,7 +1878,7 @@ func_02038b08 kind:function(thumb,size=0x14) addr:0x2038b08 func_02038b1c kind:function(thumb,size=0xc) addr:0x2038b1c func_02038b28 kind:function(thumb,size=0xc) addr:0x2038b28 func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 -_Z13func_02038b40P22Struct_027E0C68_unk_28 kind:function(arm,size=0x34) addr:0x2038b40 +_Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x34) addr:0x2038b40 func_02038b74 kind:function(arm,size=0x4) addr:0x2038b74 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b78 func_02038c34 kind:function(arm,size=0x84) addr:0x2038c34 @@ -2034,7 +2034,7 @@ func_0203dcb4 kind:function(arm,size=0x48) addr:0x203dcb4 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcfc func_0203ddec kind:function(arm,size=0x10) addr:0x203ddec func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddfc -_Z13func_0203de14P22Struct_027E0C68_unk_28i kind:function(arm,size=0x10) addr:0x203de14 +_Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1i kind:function(arm,size=0x10) addr:0x203de14 func_0203de24 kind:function(arm,size=0x34) addr:0x203de24 func_0203de58 kind:function(arm,size=0x208) addr:0x203de58 func_0203e060 kind:function(arm,size=0x30) addr:0x203e060 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 4d1f8a0a..35ce8b88 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1792,14 +1792,14 @@ func_020363c8 kind:function(arm,size=0x74) addr:0x2036384 func_0203643c kind:function(arm,size=0x54) addr:0x20363f8 func_02036490 kind:function(thumb,size=0x1cc) addr:0x203644c func_0203665c kind:function(thumb,size=0x4c) addr:0x2036618 -func_020366a8 kind:function(arm,size=0x1c) addr:0x2036664 -func_020366c4 kind:function(arm,size=0x3c) addr:0x2036680 -func_02036700 kind:function(arm,size=0x3c) addr:0x20366bc -func_0203673c kind:function(arm,size=0x34) addr:0x20366f8 +_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x2036664 +_ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x2036680 +_ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x20366bc +_ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x20366f8 func_02036770 kind:function(arm,size=0x28) addr:0x203672c -func_02036798 kind:function(arm,size=0x44) addr:0x2036754 -func_020367dc kind:function(arm,size=0x10) addr:0x2036798 -func_020367ec kind:function(arm,size=0x1c) addr:0x20367a8 +_ZN18UnkStruct_027E0C6813func_02036798Ev kind:function(arm,size=0x44) addr:0x2036754 +_ZN18UnkStruct_027E0C6813func_020367dcEi kind:function(arm,size=0x10) addr:0x2036798 +_ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367a8 _ZN18UnkStruct_027E0C6813func_02036808Ev kind:function(arm,size=0x1c) addr:0x20367c4 _ZN18UnkStruct_027E0C6813func_02036824Ev kind:function(arm,size=0x2c) addr:0x20367e0 _ZN18UnkStruct_027E0C6813func_02036850Ev kind:function(arm,size=0x38) addr:0x203680c @@ -1878,7 +1878,7 @@ func_02038b08 kind:function(thumb,size=0x14) addr:0x2038ac4 func_02038b1c kind:function(thumb,size=0xc) addr:0x2038ad8 func_02038b28 kind:function(thumb,size=0xc) addr:0x2038ae4 func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0 -_Z13func_02038b40P22Struct_027E0C68_unk_28 kind:function(arm,size=0x34) addr:0x2038afc +_Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x34) addr:0x2038afc func_02038b74 kind:function(arm,size=0x4) addr:0x2038b30 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b34 func_02038c34 kind:function(arm,size=0x84) addr:0x2038bf0 @@ -2034,7 +2034,7 @@ func_0203dcb4 kind:function(arm,size=0x48) addr:0x203dc70 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcb8 func_0203ddec kind:function(arm,size=0x10) addr:0x203dda8 func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddb8 -_Z13func_0203de14P22Struct_027E0C68_unk_28i kind:function(arm,size=0x10) addr:0x203ddd0 +_Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1i kind:function(arm,size=0x10) addr:0x203ddd0 func_0203de24 kind:function(arm,size=0x34) addr:0x203dde0 func_0203de58 kind:function(arm,size=0x208) addr:0x203de14 func_0203e060 kind:function(arm,size=0x30) addr:0x203e01c diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 8d10c0b6..b20e846c 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -3,6 +3,7 @@ #include "global.h" #include "types.h" +#include "System/SysNew.hpp" #include "Message/BMG.hpp" // temp @@ -36,6 +37,8 @@ public: /* 0x54 */ unk32 unk_54; /* 0x58 */ unk32 unk_58; /* 0x5C */ s16 unk_5C; + /* 0x60 */ unk32 unk_60[0x3D]; + /* 0x5C */ s16 unk_15C; /* 0x00 */ virtual UNK_TYPE vfunc_00(void); /* 0x04 */ virtual UNK_TYPE vfunc_04(void); @@ -106,7 +109,7 @@ public: /* 0x34 */ virtual UNK_TYPE vfunc_34(void); }; -class UnkStruct_027E0C68 { +class UnkStruct_027E0C68 : public SysObject { private: /* 0x00 */ unk16 unk_00; /* 0x02 */ unk16 unk_02; @@ -121,10 +124,17 @@ private: /* 0x1C */ UnkStruct_027E0C68_UnkSubClass2* unk_1C; /* 0x20 */ u32* unk_20; /* 0x24 */ unk32 unk_24; - /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1* unk_28[6]; // 022172B0 + /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1* unk_28[6]; public: + UnkStruct_027E0C68(); + ~UnkStruct_027E0C68(); UnkStruct_027E0C68_UnkSubClass1* func_020366c4(void); + UnkStruct_027E0C68_UnkSubClass1* func_02036700(void); + UnkStruct_027E0C68_UnkSubClass2* func_0203673c(void); + unk32 func_02036798(void); + bool func_020367dc(int param_2); + bool UnkStruct_027E0C68::func_020367ec(void); bool func_02036808(void); bool func_02036824(void); bool func_02036850(void); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index f4ef6438..92a2f965 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -17,8 +17,72 @@ extern UnkStruct2 data_027e077c; extern u32 data_ov000_020eec9c[]; extern u8 data_02056be4[]; +// non-matching +ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() {} + +// non-matching +ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_020366c4(void) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) && ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0)) { + return this->unk_28[2]; + } + + return this->unk_28[0]; +} + +// non-matching +ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036700(void) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) && ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0)) { + return this->unk_28[0]; + } + + return this->unk_28[2]; +} + +ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_0203673c(void) { + bool iVar1 = this->func_02036824(); + bool iVar2 = this->func_02036850(); + + if (iVar1) { + return this->unk_18; + } + + if (iVar2) { + return this->unk_1C; + } + + return NULL; +} + +ARM unk32 UnkStruct_027E0C68::func_02036798(void) { + unk32 uVar2 = 1; + + if (this->unk_04 == 0) { + bool bVar1 = false; + + if (this->unk_1C != NULL && (this->unk_1C->unk_18 & 0xFFFF0000) != 0x1000000) { + bVar1 = true; + } + + if (!bVar1) { + uVar2 = 0; + } + } + + return uVar2; +} + +ARM bool UnkStruct_027E0C68::func_020367dc(int param_2) { + return param_2 == 0; +} + +ARM bool UnkStruct_027E0C68::func_020367ec(void) { + //! TODO: fake? + return this->unk_28[0]->unk_15C > 0; +} + ARM bool UnkStruct_027E0C68::func_02036808(void) { - return this->unk_28[2]->unk_15[0x2E] > 0; + //! TODO: fake? + return this->unk_28[2]->unk_15C > 0; } ARM bool UnkStruct_027E0C68::func_02036824(void) { @@ -34,6 +98,7 @@ ARM bool UnkStruct_027E0C68::func_02036824(void) { return false; } +// non-matching ARM bool UnkStruct_027E0C68::func_02036850(void) { bool ret = false; u8 value; @@ -52,7 +117,8 @@ ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_027E0C68_UnkSubClass2* para if ((param_2->unk_18 & 0xFFFF0000) != 0x1000000) { UnkStruct_027E0C68_UnkSubClass1* iVar1 = this->func_020366c4(); - if (iVar1->unk_5C <= 0) { + //! TODO: fake? + if (iVar1->unk_15C <= 0) { param_2->vfunc_10(); } else { param_2->vfunc_0C(this->func_020366c4()); From c26639a9dae5c5898d02bbf5d8cbf77ebf813fec Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 24 Jan 2025 03:46:27 +0100 Subject: [PATCH 11/64] declared data_027e0c68 --- include/Message/MessageManager.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index b20e846c..bfb4853f 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -154,3 +154,5 @@ public: void func_02037158(UnkStruct_027E0C68_UnkSubClass1* param_2); UnkStruct_027E0C68_UnkSubClass1* func_02037178(UnkStruct_027E0C68_UnkSubClass1* param_2); }; + +extern UnkStruct_027E0C68 data_027e0c68; From b4d8083acebcd9564d4cac82f51e85fb431ac1df Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 24 Jan 2025 15:16:58 +0100 Subject: [PATCH 12/64] more progress --- config/eur/arm9/symbols.txt | 10 +- config/usa/arm9/symbols.txt | 10 +- include/Message/BMG.hpp | 5 + include/Message/MessageManager.hpp | 115 +++++++++++----------- src/Main/Message/BMG.cpp | 2 +- src/Main/Message/MessageManager.cpp | 147 +++++++++++++++++++++++++--- 6 files changed, 207 insertions(+), 82 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 478f8f21..d3b09a05 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1789,14 +1789,14 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x20361d0 func_02036240 kind:function(arm,size=0x170) addr:0x2036240 func_020363b0 kind:function(arm,size=0x18) addr:0x20363b0 func_020363c8 kind:function(arm,size=0x74) addr:0x20363c8 -func_0203643c kind:function(arm,size=0x54) addr:0x203643c -func_02036490 kind:function(thumb,size=0x1cc) addr:0x2036490 -func_0203665c kind:function(thumb,size=0x4c) addr:0x203665c +_Z13func_0203643cPiP18UnkStruct_027E0C68j kind:function(arm,size=0x54) addr:0x203643c +_ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x2036490 +_ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x203665c _ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x20366a8 _ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x20366c4 _ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x2036700 _ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x203673c -func_02036770 kind:function(arm,size=0x28) addr:0x2036770 +_ZN18UnkStruct_027E0C6813func_02036770Ej kind:function(arm,size=0x28) addr:0x2036770 _ZN18UnkStruct_027E0C6813func_02036798Ev kind:function(arm,size=0x44) addr:0x2036798 _ZN18UnkStruct_027E0C6813func_020367dcEi kind:function(arm,size=0x10) addr:0x20367dc _ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367ec @@ -1825,7 +1825,7 @@ _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037258 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x203728c -_Z13func_020372f0P9BMGGroups12BMGFileIndexsi kind:function(thumb,size=0xc4) addr:0x20372f0 +_Z13func_020372f0P9BMGGroups12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372f0 _Z13func_020373b4P9BMGGroupss kind:function(thumb,size=0x38) addr:0x20373b4 _Z13func_020373ecP9BMGGroupsi kind:function(arm,size=0x60) addr:0x20373ec func_0203744c kind:function(thumb,size=0xc) addr:0x203744c diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 35ce8b88..96d68755 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1789,14 +1789,14 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x203618c func_02036240 kind:function(arm,size=0x170) addr:0x20361fc func_020363b0 kind:function(arm,size=0x18) addr:0x203636c func_020363c8 kind:function(arm,size=0x74) addr:0x2036384 -func_0203643c kind:function(arm,size=0x54) addr:0x20363f8 -func_02036490 kind:function(thumb,size=0x1cc) addr:0x203644c -func_0203665c kind:function(thumb,size=0x4c) addr:0x2036618 +_Z13func_0203643cPiP18UnkStruct_027E0C68j kind:function(arm,size=0x54) addr:0x20363f8 +_ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x203644c +_ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x2036618 _ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x2036664 _ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x2036680 _ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x20366bc _ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x20366f8 -func_02036770 kind:function(arm,size=0x28) addr:0x203672c +_ZN18UnkStruct_027E0C6813func_02036770Ej kind:function(arm,size=0x28) addr:0x203672c _ZN18UnkStruct_027E0C6813func_02036798Ev kind:function(arm,size=0x44) addr:0x2036754 _ZN18UnkStruct_027E0C6813func_020367dcEi kind:function(arm,size=0x10) addr:0x2036798 _ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367a8 @@ -1825,7 +1825,7 @@ _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037214 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x2037248 -_Z13func_020372f0P9BMGGroups12BMGFileIndexsi kind:function(thumb,size=0xc4) addr:0x20372ac +_Z13func_020372f0P9BMGGroups12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372ac _Z13func_020373b4P9BMGGroupss kind:function(thumb,size=0x38) addr:0x2037370 _Z13func_020373ecP9BMGGroupsi kind:function(arm,size=0x60) addr:0x20373a8 func_0203744c kind:function(thumb,size=0xc) addr:0x2037408 diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index 7915ced7..844da446 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -5,6 +5,9 @@ #define BMG_MAGIC "MESGbmg1" #define BMG_TAG(a, b, c, d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) +#define BMG_GET_INF1(pGroups, flags) (func_02037258(&(pGroups)->entries[(flags) >> 0x10], (flags) & 0xFFFF)) +#define BMG_GET_MSG_OFFSET(pGroups, flags) (BMG_GET_INF1((pGroups), (flags))->offset) +#define BMG_GET_MSG_ADDR(pGroups, flags) ((u32)(pGroups)->entries[(flags) >> 0x10].pDAT1 + (BMG_GET_MSG_OFFSET((pGroups), (flags)) & ~1)) typedef enum BMGTag { /* "INF1" */ BMG_TAG_INF1 = BMG_TAG('I', 'N', 'F', '1'), @@ -174,4 +177,6 @@ typedef struct BMGGroups { } BMGGroups; // size = 0x8 extern EntryINF1* func_02037258(BMGFileInfo* pFileInfo, unk32 param_2); +extern void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18); +extern void func_020373b4(BMGGroups* pGroups, s16 unk_18); extern u32 func_020373ec(BMGGroups* pGroups, unk32 param_2); diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index bfb4853f..aa0ac753 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -9,7 +9,7 @@ // temp #define UNK_TYPE void -class UnkStruct_027E0C68_UnkSubClass1 { +class UnkStruct_027E0C68_UnkSubClass1 : public SysObject { public: /* 0x00 (vtable) */ /* 0x04 */ unk32* unk_04; @@ -24,7 +24,7 @@ public: /* 0x20 */ unk32 unk_20; /* 0x24 */ unk32 unk_24; /* 0x28 */ unk32 unk_28; - /* 0x2C */ unk32 unk_2C; + /* 0x2C */ u32* unk_2C; /* 0x30 */ unk32 unk_30; /* 0x34 */ unk32 unk_34; /* 0x38 */ unk32 unk_38; @@ -40,38 +40,38 @@ public: /* 0x60 */ unk32 unk_60[0x3D]; /* 0x5C */ s16 unk_15C; - /* 0x00 */ virtual UNK_TYPE vfunc_00(void); - /* 0x04 */ virtual UNK_TYPE vfunc_04(void); - /* 0x08 */ virtual UNK_TYPE vfunc_08(void); - /* 0x0C */ virtual UNK_TYPE vfunc_0C(void); - /* 0x10 */ virtual UNK_TYPE 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 void vfunc_28(void); - /* 0x2C */ virtual UNK_TYPE vfunc_2C(void); - /* 0x30 */ virtual UNK_TYPE vfunc_30(void); - /* 0x34 */ virtual UNK_TYPE vfunc_34(void); - /* 0x38 */ virtual UNK_TYPE vfunc_38(void); - /* 0x3C */ virtual void vfunc_3C(unk32 param_2); - /* 0x40 */ virtual UNK_TYPE vfunc_40(void); - /* 0x44 */ virtual UNK_TYPE vfunc_44(void); - /* 0x48 */ virtual UNK_TYPE vfunc_48(void); - /* 0x4C */ virtual UNK_TYPE vfunc_4C(void); - /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, int param_3, u8* param_4); - /* 0x54 */ virtual UNK_TYPE vfunc_54(void); - /* 0x58 */ virtual void vfunc_58(void); - /* 0x5C */ virtual UNK_TYPE vfunc_5C(void); - /* 0x60 */ virtual UNK_TYPE vfunc_60(void); - /* 0x64 */ virtual UNK_TYPE vfunc_64(void); - /* 0x68 */ virtual UNK_TYPE vfunc_68(void); - /* 0x6C */ virtual UNK_TYPE vfunc_6C(void); - /* 0x70 */ virtual UNK_TYPE vfunc_70(void); + UnkStruct_027E0C68_UnkSubClass1(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1() override; + /* 0x08 */ virtual UNK_TYPE vfunc_08(void) override; + /* 0x0C */ virtual UNK_TYPE vfunc_0C(void) override; + /* 0x10 */ virtual UNK_TYPE 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 void vfunc_28(void) override; + /* 0x2C */ virtual UNK_TYPE vfunc_2C(void) override; + /* 0x30 */ virtual UNK_TYPE vfunc_30(void) override; + /* 0x34 */ virtual UNK_TYPE vfunc_34(void) override; + /* 0x38 */ virtual UNK_TYPE vfunc_38(void) override; + /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override; + /* 0x40 */ virtual UNK_TYPE vfunc_40(void) override; + /* 0x44 */ virtual UNK_TYPE vfunc_44(void) override; + /* 0x48 */ virtual UNK_TYPE vfunc_48(void) override; + /* 0x4C */ virtual void vfunc_4C(void) override; + /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, int param_3, u8* param_4) override; + /* 0x54 */ virtual UNK_TYPE vfunc_54(void) override; + /* 0x58 */ virtual void vfunc_58(void) override; + /* 0x5C */ virtual UNK_TYPE vfunc_5C(void) override; + /* 0x60 */ virtual UNK_TYPE vfunc_60(void) override; + /* 0x64 */ virtual UNK_TYPE vfunc_64(void) override; + /* 0x68 */ virtual UNK_TYPE vfunc_68(void) override; + /* 0x6C */ virtual UNK_TYPE vfunc_6C(void) override; + /* 0x70 */ virtual UNK_TYPE vfunc_70(void) override; }; -class UnkStruct_027E0C68_UnkSubClass2 { +class UnkStruct_027E0C68_UnkSubClass2 : public SysObject { public: /* 0x00 (vtable) */ /* 0x04 */ unk32 unk_04; @@ -88,50 +88,51 @@ public: /* 0x30 */ unk32 unk_30; /* 0x34 */ unk16 unk_34; /* 0x36 */ unk16 unk_36; - /* 0x38 */ unk32 unk_38; - /* 0x3C */ unk32 unk_3C; - /* 0x40 */ unk32 unk_40; - /* 0x44 */ unk32 unk_44; - /* 0x48 */ unk32 unk_48; + /* 0x38 */ u8 unk_38; + /* 0x39 */ u8 unk_39; + /* 0x3A */ unk16 unk_3A; - /* 0x00 */ virtual UNK_TYPE vfunc_00(void); - /* 0x04 */ virtual UNK_TYPE vfunc_04(void); - /* 0x08 */ virtual void vfunc_08(void); - /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1* param_2); - /* 0x10 */ virtual void vfunc_10(void); - /* 0x14 */ virtual UNK_TYPE vfunc_14(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 */ virtual UNK_TYPE vfunc_34(void); + UnkStruct_027E0C68_UnkSubClass2(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass2() override; + /* 0x08 */ virtual void vfunc_08(void) override; + /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1* param_2) override; + /* 0x10 */ virtual void vfunc_10(void) override; + /* 0x14 */ virtual UNK_TYPE vfunc_14(void) override; + /* 0x1C */ virtual UNK_TYPE vfunc_1C(void) override; + /* 0x20 */ virtual UNK_TYPE vfunc_20(void) override; + /* 0x24 */ virtual UNK_TYPE vfunc_24(void) override; + /* 0x28 */ virtual UNK_TYPE vfunc_28(void) override; + /* 0x2C */ virtual UNK_TYPE vfunc_2C(void) override; + /* 0x30 */ virtual UNK_TYPE vfunc_30(void) override; + /* 0x34 */ virtual UNK_TYPE vfunc_34(void) override; }; class UnkStruct_027E0C68 : public SysObject { -private: +public: /* 0x00 */ unk16 unk_00; - /* 0x02 */ unk16 unk_02; + /* 0x02 */ u8 unk_02; + /* 0x03 */ u8 unk_03; /* 0x04 */ u8 unk_04; /* 0x05 */ u8 unk_05; /* 0x06 */ unk16 unk_06; /* 0x08 */ UnkStruct_027E0C68_UnkSubClass1* unk_08; - /* 0x0C */ unk32 unk_0C; + /* 0x0C */ u8 unk_0C; + /* 0x0C */ u8 unk_0D; + /* 0x0C */ unk16 unk_0E; /* 0x10 */ unk32 unk_10; /* 0x14 */ BMGGroups* pGroups; - /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18; - /* 0x1C */ UnkStruct_027E0C68_UnkSubClass2* unk_1C; + /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18[2]; /* 0x20 */ u32* unk_20; /* 0x24 */ unk32 unk_24; /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1* unk_28[6]; -public: - UnkStruct_027E0C68(); + void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); + void func_0203665c(void); ~UnkStruct_027E0C68(); UnkStruct_027E0C68_UnkSubClass1* func_020366c4(void); UnkStruct_027E0C68_UnkSubClass1* func_02036700(void); UnkStruct_027E0C68_UnkSubClass2* func_0203673c(void); + bool func_02036770(u32 param_2); unk32 func_02036798(void); bool func_020367dc(int param_2); bool UnkStruct_027E0C68::func_020367ec(void); diff --git a/src/Main/Message/BMG.cpp b/src/Main/Message/BMG.cpp index 830fccba..db3623b8 100644 --- a/src/Main/Message/BMG.cpp +++ b/src/Main/Message/BMG.cpp @@ -135,7 +135,7 @@ ARM u16 func_0203728c(BMGFileInfo* pFileInfo, unk32 param_2) { return -1; } -THUMB void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18, int param_4) { +THUMB void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18) { char bmgPath[64]; BMGFileInfo bmgFile; u32* pFile; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 92a2f965..5a107d8d 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -6,6 +6,7 @@ extern unk32 func_02037628(u8*); extern THUMB unk32 func_0202ab48(void); extern ARM void func_02038b40(UnkStruct_027E0C68_UnkSubClass1*); extern ARM unk32 func_0203de14(UnkStruct_027E0C68_UnkSubClass1*, unk32); +extern ARM void func_0203dc74(UnkStruct_027E0C68_UnkSubClass1*, unk32, unk32); // see Actor.cpp struct UnkStruct2 { @@ -16,6 +17,126 @@ struct UnkStruct2 { extern UnkStruct2 data_027e077c; extern u32 data_ov000_020eec9c[]; extern u8 data_02056be4[]; +extern u32 data_027e0618; +extern u32** data_027e0ce0[]; +extern u32 data_02056924[]; +extern u32* data_02068e6c; +extern u32* data_02068e8c; + +ARM void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3) { + BMGGroups *pBVar2 = param_2->pGroups; + *param_1 = BMG_GET_MSG_ADDR(pBVar2, param_3); +} + +THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 param_4) { + s32 i; + + this->unk_03 = 0; + this->unk_0C = 0; + + func_020372f0(this->pGroups, BMG_FILE_INDEX_SYSTEM, 2); + + switch (data_027e0618) { + case 3: + func_020372f0(this->pGroups, BMG_FILE_INDEX_MAINSELECT, 2); + func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLE, 2); + break; + case 5: + func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLE, 2); + func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLECOMMON, 2); + break; + case 6: + func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLE, 2); + func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLECOMMON, 2); + break; + case 7: + func_020372f0(this->pGroups, BMG_FILE_INDEX_MAINSELECT, 2); + break; + default: + break; + } + + for (i = 0; i < ARRAY_LEN(this->unk_18); i++) { + if (this->unk_18[i] != NULL) { + this->unk_18[i] = NULL; + } + } + + for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + if (this->unk_28[i] != NULL) { + this->unk_28[i] = NULL; + } + } + + 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[0]->unk_39 = 0; + this->unk_18[1]->unk_39 = 1; + + // switch? + if (data_027e0618 == 2 || data_027e0618 == 3 || data_027e0618 == 6) { + for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + switch (data_02056924[i + 1]) { + case 0: + if (data_027e0618 != 2) { + this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1(); + func_0203dc74(this->unk_28[i], 0xE0, 0x40); + this->unk_28[i]->unk_2C = data_02068e6c; + this->unk_28[i]->unk_50 = i != 0; + } + break; + case 1: + this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1(); + func_0203dc74(this->unk_28[i], 0x50, 0x60); + this->unk_28[i]->unk_2C = data_02068e6c; + break; + case 2: + this->unk_28[i] = NULL; + break; + case 3: + if (func_0202ab48() == 0) { + this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1(); + func_0203dc74(this->unk_28[i], 0xC0, 0x20); + this->unk_28[i]->unk_2C = data_02068e8c; + } else { + this->unk_28[i] = NULL; + } + break; + default: + break; + } + + if (this->unk_28[i] != NULL) { + this->unk_28[i]->vfunc_4C(); + } + } + } +} + +// non-matching +THUMB void UnkStruct_027E0C68::func_0203665c(void) { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + if (this->unk_28[i] != NULL) { + delete this->unk_28[i]; + + this->unk_28[i] = NULL; + } + } + + for (i = 0; i < ARRAY_LEN(this->unk_18); i++) { + if (this->unk_18[i] != NULL) { + delete this->unk_18[i]; + + this->unk_18[i] = NULL; + } + } + + func_020373b4(this->pGroups, 2); +} // non-matching ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() {} @@ -43,23 +164,27 @@ ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_0203673c(void) { bool iVar2 = this->func_02036850(); if (iVar1) { - return this->unk_18; + return this->unk_18[0]; } if (iVar2) { - return this->unk_1C; + return this->unk_18[1]; } return NULL; } +ARM bool UnkStruct_027E0C68::func_02036770(u32 param_2) { + return (this->unk_18[param_2]->unk_18 & ~0xFFFF) == (0x100 << 0x10); +} + ARM unk32 UnkStruct_027E0C68::func_02036798(void) { unk32 uVar2 = 1; if (this->unk_04 == 0) { bool bVar1 = false; - if (this->unk_1C != NULL && (this->unk_1C->unk_18 & 0xFFFF0000) != 0x1000000) { + if (this->unk_18[1] != NULL && (this->unk_18[1]->unk_18 & 0xFFFF0000) != 0x1000000) { bVar1 = true; } @@ -241,9 +366,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param iStack_34 = param_3[1]; iStack_30 = param_3[2]; pBVar5 = this->pGroups; - pEVar2 = func_02037258(&pBVar5->entries[param_2 >> 0x10], param_2 & 0xFFFF); - - pSVar4->vfunc_50(pEVar1, (int)&((pBVar5->entries[param_2 >> 0x10].pDAT1)->base).tag + (pEVar2->offset & 0xfffffffe), &iStack_38); + pSVar4->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), &iStack_38); func_ov000_020d77e4(data_ov000_020eec9c, 0x1C); return pSVar4; @@ -283,7 +406,6 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036f68(u32 param EntryINF1 *pEVar3; int iVar4; UnkStruct_027E0C68_UnkSubClass1 *pSVar5; - BMGGroups *pBVar6; pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xffff); @@ -299,12 +421,9 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036f68(u32 param pSVar2 = this->unk_28[1]; } - pSVar5[0x16].unk_04 = (unk32*)pSVar2; + // pSVar5[0x16].unk_04 = (unk32*)pSVar2; pSVar5[0x41].unk_08 = (unk32*)this->unk_28[5]; - pBVar6 = this->pGroups; - pEVar3 = func_02037258(&pBVar6->entries[param_2 >> 0x10], param_2 & 0xffff); - - pSVar5->vfunc_50(pEVar1, (int)&((pBVar6->entries[param_2 >> 0x10].pDAT1)->base).tag + (pEVar3->offset & 0xfffffffe), param_3); + pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), param_3); if (func_ov000_020d7f18(data_ov000_020eec9c, 0x19) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x18) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x34) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x35) == 0 && @@ -324,10 +443,10 @@ ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370e8(unk32 par UnkStruct_027E0C68_UnkSubClass2* puVar2; if (this->func_02036824() != 0) { - puVar2 = this->unk_18; + puVar2 = this->unk_18[0]; } else { if (this->func_02036850() != 0) { - puVar2 = this->unk_1C; + puVar2 = this->unk_18[1]; } else { return NULL; } From 2e722d333a55861694da6f7486dc6ef056db3433 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:33:53 +0100 Subject: [PATCH 13/64] func_0203690c: 90% --- config/eur/arm9/symbols.txt | 8 +- config/usa/arm9/symbols.txt | 8 +- include/Message/MessageManager.hpp | 47 ++++++++-- src/Main/Message/MessageManager.cpp | 131 +++++++++++++++++++++++++--- 4 files changed, 164 insertions(+), 30 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index d3b09a05..1e028ee1 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1804,14 +1804,14 @@ _ZN18UnkStruct_027E0C6813func_02036808Ev kind:function(arm,size=0x1c) addr:0x203 _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_020368f4Ei kind:function(arm,size=0x18) addr:0x20368f4 -func_0203690c kind:function(arm,size=0x2b0) addr:0x203690c +_ZN18UnkStruct_027E0C6813func_020368f4EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x18) addr:0x20368f4 +_ZN18UnkStruct_027E0C6813func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x203690c func_02036bbc 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_02036d30EPj kind:function(arm,size=0x1c) addr:0x2036d30 -_ZN18UnkStruct_027E0C6813func_02036d4cEPj kind:function(arm,size=0x20) addr:0x2036d4c +_ZN18UnkStruct_027E0C6813func_02036d30EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x1c) addr:0x2036d30 +_ZN18UnkStruct_027E0C6813func_02036d4cEP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x20) addr:0x2036d4c _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c _ZN18UnkStruct_027E0C6813func_02036da8EjPi 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 96d68755..cbebf461 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1804,14 +1804,14 @@ _ZN18UnkStruct_027E0C6813func_02036808Ev kind:function(arm,size=0x1c) addr:0x203 _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_020368f4Ei kind:function(arm,size=0x18) addr:0x20368b0 -func_0203690c kind:function(arm,size=0x2b0) addr:0x20368c8 +_ZN18UnkStruct_027E0C6813func_020368f4EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x18) addr:0x20368b0 +_ZN18UnkStruct_027E0C6813func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x20368c8 func_02036bbc 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_02036d30EPj kind:function(arm,size=0x1c) addr:0x2036cec -_ZN18UnkStruct_027E0C6813func_02036d4cEPj kind:function(arm,size=0x20) addr:0x2036d08 +_ZN18UnkStruct_027E0C6813func_02036d30EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x1c) addr:0x2036cec +_ZN18UnkStruct_027E0C6813func_02036d4cEP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x20) addr:0x2036d08 _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 _ZN18UnkStruct_027E0C6813func_02036da8EjPi 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 aa0ac753..7b7155dd 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -31,7 +31,9 @@ public: /* 0x3C */ unk32 unk_3C; /* 0x40 */ unk32 unk_40; /* 0x44 */ unk32 unk_44; - /* 0x48 */ unk32 unk_48; + /* 0x48 */ u8 unk_48; + /* 0x49 */ u8 unk_49; + /* 0x4A */ unk16 unk_4A; /* 0x4C */ unk32 unk_4C; /* 0x50 */ unk32 unk_50; /* 0x54 */ unk32 unk_54; @@ -51,7 +53,7 @@ public: /* 0x20 */ virtual UNK_TYPE vfunc_20(void) override; /* 0x24 */ virtual UNK_TYPE vfunc_24(void) override; /* 0x28 */ virtual void vfunc_28(void) override; - /* 0x2C */ virtual UNK_TYPE vfunc_2C(void) override; + /* 0x2C */ virtual void vfunc_2C(void) override; /* 0x30 */ virtual UNK_TYPE vfunc_30(void) override; /* 0x34 */ virtual UNK_TYPE vfunc_34(void) override; /* 0x38 */ virtual UNK_TYPE vfunc_38(void) override; @@ -107,6 +109,32 @@ public: /* 0x34 */ virtual UNK_TYPE vfunc_34(void) override; }; +class UnkStruct_027E0C68_UnkSubClass3 : public SysObject { +public: + /* 0x00 (vtable) */ + /* 0x04 */ unk32 unk_04; + /* 0x08 */ unk32 unk_08; + /* 0x0C */ unk32 unk_0C; + /* 0x10 */ unk32 unk_10; + /* 0x14 */ unk32 unk_14; + /* 0x18 */ u32 unk_18; + + UnkStruct_027E0C68_UnkSubClass3(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass3() override; + /* 0x08 */ virtual UNK_TYPE vfunc_08(void) override; + /* 0x0C */ virtual UNK_TYPE vfunc_0C(void) override; + /* 0x10 */ virtual void vfunc_10(void) override; + /* 0x14 */ virtual UNK_TYPE vfunc_14(void) override; + /* 0x1C */ virtual UNK_TYPE vfunc_1C(void) override; + /* 0x20 */ virtual UNK_TYPE vfunc_20(void) override; + /* 0x24 */ virtual UNK_TYPE vfunc_24(void) override; + /* 0x28 */ virtual UNK_TYPE vfunc_28(void) override; + /* 0x2C */ virtual UNK_TYPE vfunc_2C(void) override; + /* 0x30 */ virtual UNK_TYPE vfunc_30(void) override; + /* 0x34 */ virtual UNK_TYPE vfunc_34(void) override; + /* 0x38 */ virtual UNK_TYPE vfunc_38(void) override; +}; + class UnkStruct_027E0C68 : public SysObject { public: /* 0x00 */ unk16 unk_00; @@ -119,12 +147,13 @@ public: /* 0x0C */ u8 unk_0C; /* 0x0C */ u8 unk_0D; /* 0x0C */ unk16 unk_0E; - /* 0x10 */ unk32 unk_10; + /* 0x10 */ unk16 unk_10; + /* 0x10 */ unk16 unk_12; /* 0x14 */ BMGGroups* pGroups; /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18[2]; - /* 0x20 */ u32* unk_20; - /* 0x24 */ unk32 unk_24; + /* 0x20 */ UnkStruct_027E0C68_UnkSubClass3* unk_20[2]; // is it actually UnkStruct_027E0C68_UnkSubClass2? /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1* unk_28[6]; + /* 0x40 */ UnkStruct_027E0C68_UnkSubClass1* unk_40[2]; // is array size 6? void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); void func_0203665c(void); @@ -140,12 +169,14 @@ public: bool func_02036824(void); bool func_02036850(void); void func_02036888(UnkStruct_027E0C68_UnkSubClass2* param_2); - bool func_020368f4(unk32 param_2); + bool func_020368f4(UnkStruct_027E0C68_UnkSubClass3* param_2); + void func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4); + void func_02036bbc(UNK_TYPE); void func_02036c50(unk32 param_2); void func_02036ca4(unk32 param_2); s32 func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param_2, unk32 param_3); - unk32 func_02036d30(u32* param_2); - unk32 func_02036d4c(u32* param_2); + bool func_02036d30(UnkStruct_027E0C68_UnkSubClass3* param_2); + bool func_02036d4c(UnkStruct_027E0C68_UnkSubClass3* param_2); void func_02036d6c(void); UnkStruct_027E0C68_UnkSubClass1* func_02036da8(u32 param_2, s32* param_3); void func_02036edc(u32 param_2, u8 param_3); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 5a107d8d..6e0cb0d8 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -1,4 +1,5 @@ #include "Message/MessageManager.hpp" +#include "Actor/ActorManager.hpp" extern unk32 func_ov000_020d7f18(u32*, unk32); extern unk32 func_ov000_020d77e4(u32*, unk32); @@ -22,6 +23,13 @@ extern u32** data_027e0ce0[]; extern u32 data_02056924[]; extern u32* data_02068e6c; extern u32* data_02068e8c; +extern u16 data_02056918[]; +extern ActorTypeId data_0205691c[]; +extern u8 data_027e0c54; + +// this should be `data_027e0ffc->func_ov000_020cec60(u16, Vec3p*, s32);` +extern u32* data_027e0ffc; +extern void func_ov000_020cec60(u32*, u16, Vec3p*, Actor*, unk32); ARM void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3) { BMGGroups *pBVar2 = param_2->pGroups; @@ -239,7 +247,7 @@ ARM bool UnkStruct_027E0C68::func_02036850(void) { } ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_027E0C68_UnkSubClass2* param_2) { - if ((param_2->unk_18 & 0xFFFF0000) != 0x1000000) { + if ((param_2->unk_18 & ~0xFFFF) != (0x100 << 0x10)) { UnkStruct_027E0C68_UnkSubClass1* iVar1 = this->func_020366c4(); //! TODO: fake? @@ -251,15 +259,110 @@ ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_027E0C68_UnkSubClass2* para } } -ARM bool UnkStruct_027E0C68::func_020368f4(unk32 param_2) { - if (this->unk_24 != 0) { +ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_027E0C68_UnkSubClass3* param_2) { + if (this->unk_20[1] != NULL) { return false; } - this->unk_24 = param_2; + this->unk_20[1] = param_2; return true; } +ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { + UnkStruct_027E0C68_UnkSubClass1* unk_28_0; + UnkStruct_027E0C68_UnkSubClass1* unk_28_2; + UnkStruct_027E0C68_UnkSubClass1 *pSVar4; + ActorRef actorRef; + Actor* pActor; + bool iVar1; + bool iVar2; + s32 i; + + if (!this->func_020367dc(param_2)) { + return; + } + + this->unk_40[1] = this->unk_40[0]; + + unk_28_0 = this->unk_28[0]; + + if (unk_28_0 != NULL && unk_28_0->unk_15C > 0) { + unk_28_2 = this->unk_28[2]; + + if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) { + this->unk_40[0] = this->func_020366c4(); + } else { + this->unk_40[0] = unk_28_2; + } + } else { + unk_28_2 = this->unk_28[2]; + + if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) { + this->unk_40[0] = unk_28_0; + } else { + this->unk_40[0] = NULL; + } + } + + iVar1 = this->func_02036824(); + iVar2 = this->func_02036850(); + + if (this->unk_20[1] != NULL && ((this->unk_20[1]->unk_18 & ~0xFFFF) != (0x100 << 0x10))) { + this->unk_20[1]->vfunc_10(); + this->unk_20[1] = NULL; + } + + if (iVar1) { + this->func_02036888(this->unk_18[0]); + } else if (iVar2) { + this->func_02036888(this->unk_18[1]); + } + + for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + if (this->unk_28[i] != NULL) { + this->unk_28[i]->vfunc_2C(); + } + } + + this->unk_04 = 0; + + if (this->unk_20[0] != NULL) { + if ((this->unk_20[0]->unk_18 & ~0xFFFF) == (0x100 << 0x10)) { + this->unk_20[0] = NULL; + } else { + this->unk_04 = 1; + } + } + + if ((this->unk_18[0] != NULL) && ((this->unk_18[0]->unk_18 & ~0xFFFF) != (0x100 << 0x10))) { + this->unk_04 = 1; + + //! TODO: fake? + pSVar4 = this->func_02037178((UnkStruct_027E0C68_UnkSubClass1*)this->unk_18[0]); + + if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->unk_48 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { + this->unk_04 = 0; + } + } + + if (this->unk_08 != NULL && this->unk_08->unk_15C > 0) { + this->unk_04 = 1; + } else { + this->unk_08 = NULL; + } + + this->func_02036bbc(); + + if (this->unk_10 != 0) { + ActorManager::FindActorByType(&actorRef, gActorManager, data_0205691c[this->unk_10]); + pActor = gActorManager->GetActor(&actorRef); + + if (pActor != NULL) { + func_ov000_020cec60(data_027e0ffc, data_02056918[this->unk_10], &pActor->mPos, pActor, 0); + } + } +} + ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { s32 i; @@ -296,22 +399,22 @@ ARM s32 UnkStruct_027E0C68::func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param return 0; } -ARM unk32 UnkStruct_027E0C68::func_02036d30(u32* param_2) { - if (this->unk_20 != NULL && this->unk_20 != param_2) { - return 0; +ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_027E0C68_UnkSubClass3* param_2) { + if (this->unk_20[0] != NULL && this->unk_20[0] != param_2) { + return false; } - this->unk_20 = param_2; - return 1; + this->unk_20[0] = param_2; + return true; } -ARM unk32 UnkStruct_027E0C68::func_02036d4c(u32* param_2) { - if (this->unk_20 == param_2) { - this->unk_20 = NULL; - return 1; +ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_027E0C68_UnkSubClass3* param_2) { + if (this->unk_20[0] == param_2) { + this->unk_20[0] = NULL; + return true; } - return 0; + return false; } // non-matching From 5b8beb79d7a44014aa0ed490a1eca726c2c3310b Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:36:33 +0100 Subject: [PATCH 14/64] make func_0203643c static --- config/eur/arm9/symbols.txt | 2 +- config/usa/arm9/symbols.txt | 2 +- include/Message/MessageManager.hpp | 1 + src/Main/Message/MessageManager.cpp | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 1e028ee1..24db99a4 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1789,7 +1789,7 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x20361d0 func_02036240 kind:function(arm,size=0x170) addr:0x2036240 func_020363b0 kind:function(arm,size=0x18) addr:0x20363b0 func_020363c8 kind:function(arm,size=0x74) addr:0x20363c8 -_Z13func_0203643cPiP18UnkStruct_027E0C68j kind:function(arm,size=0x54) addr:0x203643c +_ZN18UnkStruct_027E0C6813func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x203643c _ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x2036490 _ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x203665c _ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x20366a8 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index cbebf461..d54c59f4 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1789,7 +1789,7 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x203618c func_02036240 kind:function(arm,size=0x170) addr:0x20361fc func_020363b0 kind:function(arm,size=0x18) addr:0x203636c func_020363c8 kind:function(arm,size=0x74) addr:0x2036384 -_Z13func_0203643cPiP18UnkStruct_027E0C68j kind:function(arm,size=0x54) addr:0x20363f8 +_ZN18UnkStruct_027E0C6813func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x20363f8 _ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x203644c _ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x2036618 _ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x2036664 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 7b7155dd..596124ce 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -155,6 +155,7 @@ public: /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1* unk_28[6]; /* 0x40 */ UnkStruct_027E0C68_UnkSubClass1* unk_40[2]; // is array size 6? + static void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3); void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); void func_0203665c(void); ~UnkStruct_027E0C68(); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 6e0cb0d8..b84af893 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -31,7 +31,7 @@ extern u8 data_027e0c54; extern u32* data_027e0ffc; extern void func_ov000_020cec60(u32*, u16, Vec3p*, Actor*, unk32); -ARM void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3) { +ARM void UnkStruct_027E0C68::func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3) { BMGGroups *pBVar2 = param_2->pGroups; *param_1 = BMG_GET_MSG_ADDR(pBVar2, param_3); } From d44088642ebf495a5f40a0212cddb023d4a4f454 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 24 Jan 2025 19:21:26 +0100 Subject: [PATCH 15/64] match func_02036bbc --- config/eur/arm9/symbols.txt | 2 +- config/usa/arm9/symbols.txt | 2 +- include/Message/MessageManager.hpp | 4 ++-- src/Main/Message/MessageManager.cpp | 25 +++++++++++++++++++++++++ 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 24db99a4..738d2d1a 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1806,7 +1806,7 @@ _ZN18UnkStruct_027E0C6813func_02036850Ev kind:function(arm,size=0x38) addr:0x203 _ZN18UnkStruct_027E0C6813func_02036888EP31UnkStruct_027E0C68_UnkSubClass2 kind:function(arm,size=0x6c) addr:0x2036888 _ZN18UnkStruct_027E0C6813func_020368f4EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x18) addr:0x20368f4 _ZN18UnkStruct_027E0C6813func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x203690c -func_02036bbc kind:function(arm,size=0x94) addr:0x2036bbc +_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 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index d54c59f4..39e9cffe 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1806,7 +1806,7 @@ _ZN18UnkStruct_027E0C6813func_02036850Ev kind:function(arm,size=0x38) addr:0x203 _ZN18UnkStruct_027E0C6813func_02036888EP31UnkStruct_027E0C68_UnkSubClass2 kind:function(arm,size=0x6c) addr:0x2036844 _ZN18UnkStruct_027E0C6813func_020368f4EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x18) addr:0x20368b0 _ZN18UnkStruct_027E0C6813func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x20368c8 -func_02036bbc kind:function(arm,size=0x94) addr:0x2036b78 +_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 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 596124ce..3bf87777 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -59,7 +59,7 @@ public: /* 0x38 */ virtual UNK_TYPE vfunc_38(void) override; /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override; /* 0x40 */ virtual UNK_TYPE vfunc_40(void) override; - /* 0x44 */ virtual UNK_TYPE vfunc_44(void) override; + /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; /* 0x48 */ virtual UNK_TYPE vfunc_48(void) override; /* 0x4C */ virtual void vfunc_4C(void) override; /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, int param_3, u8* param_4) override; @@ -172,7 +172,7 @@ public: void func_02036888(UnkStruct_027E0C68_UnkSubClass2* param_2); bool func_020368f4(UnkStruct_027E0C68_UnkSubClass3* param_2); void func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4); - void func_02036bbc(UNK_TYPE); + void func_02036bbc(void); void func_02036c50(unk32 param_2); void func_02036ca4(unk32 param_2); s32 func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param_2, unk32 param_3); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index b84af893..45b6dec0 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -1,5 +1,6 @@ #include "Message/MessageManager.hpp" #include "Actor/ActorManager.hpp" +#include "Player/TouchControl.hpp" extern unk32 func_ov000_020d7f18(u32*, unk32); extern unk32 func_ov000_020d77e4(u32*, unk32); @@ -26,6 +27,8 @@ extern u32* data_02068e8c; extern u16 data_02056918[]; extern ActorTypeId data_0205691c[]; extern u8 data_027e0c54; +extern TouchControl data_027e0d78; +extern s16 data_027e0d04; // this should be `data_027e0ffc->func_ov000_020cec60(u16, Vec3p*, s32);` extern u32* data_027e0ffc; @@ -363,6 +366,28 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p } } +ARM void UnkStruct_027E0C68::func_02036bbc(void) { + UnkStruct_027E0C68_UnkSubClass1* pSVar3; + bool bVar2; + bool bVar4; + s32 i; + + if (data_027e0d04 > 0) { + return; + } + + bVar2 = this->func_02036824(); + bVar4 = this->func_02036850(); + + for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + pSVar3 = this->unk_28[i]; + + if (pSVar3 != NULL && ((bVar2 && pSVar3->unk_48 == 0) || (bVar4 && pSVar3->unk_48 != 0))) { + pSVar3->vfunc_44(data_027e0d78.mTouchLastX, data_027e0d78.mTouchLastY); + } + } +} + ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { s32 i; From 3de7041c34072cca1942d46441e5811344db6150 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 24 Jan 2025 21:16:19 +0100 Subject: [PATCH 16/64] more progress --- include/Message/MessageManager.hpp | 11 +++-- src/Main/Message/MessageManager.cpp | 75 ++++++++++++----------------- 2 files changed, 39 insertions(+), 47 deletions(-) diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 3bf87777..06caff2b 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -40,7 +40,12 @@ public: /* 0x58 */ unk32 unk_58; /* 0x5C */ s16 unk_5C; /* 0x60 */ unk32 unk_60[0x3D]; - /* 0x5C */ s16 unk_15C; + /* 0x15C */ s16 unk_15C; + /* 0x15C */ s16 unk_15E; + /* 0x160 */ unk32 unk_160; + /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1* unk_164; + /* 0x168 */ unk32 unk_168[0xAC]; + /* 0x418 */ UnkStruct_027E0C68_UnkSubClass1* unk_418; UnkStruct_027E0C68_UnkSubClass1(); /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1() override; @@ -96,7 +101,7 @@ public: UnkStruct_027E0C68_UnkSubClass2(); /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass2() override; - /* 0x08 */ virtual void vfunc_08(void) override; + /* 0x08 */ virtual void vfunc_08(u32 param_1) override; /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1* param_2) override; /* 0x10 */ virtual void vfunc_10(void) override; /* 0x14 */ virtual UNK_TYPE vfunc_14(void) override; @@ -175,7 +180,7 @@ public: void func_02036bbc(void); void func_02036c50(unk32 param_2); void func_02036ca4(unk32 param_2); - s32 func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param_2, unk32 param_3); + bool func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param_2, unk32 param_3); bool func_02036d30(UnkStruct_027E0C68_UnkSubClass3* param_2); bool func_02036d4c(UnkStruct_027E0C68_UnkSubClass3* param_2); void func_02036d6c(void); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 45b6dec0..e8026341 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -2,9 +2,9 @@ #include "Actor/ActorManager.hpp" #include "Player/TouchControl.hpp" -extern unk32 func_ov000_020d7f18(u32*, unk32); -extern unk32 func_ov000_020d77e4(u32*, unk32); -extern unk32 func_02037628(u8*); +extern ARM unk32 func_ov000_020d7f18(u32*, unk32); +extern ARM unk32 func_ov000_020d77e4(u32*, unk32); +extern ARM unk32 func_02037628(u8*); extern THUMB unk32 func_0202ab48(void); extern ARM void func_02038b40(UnkStruct_027E0C68_UnkSubClass1*); extern ARM unk32 func_0203de14(UnkStruct_027E0C68_UnkSubClass1*, unk32); @@ -17,8 +17,8 @@ struct UnkStruct2 { /* 8 */ }; extern UnkStruct2 data_027e077c; -extern u32 data_ov000_020eec9c[]; extern u8 data_02056be4[]; +extern u32 data_ov000_020eec9c[]; extern u32 data_027e0618; extern u32** data_027e0ce0[]; extern u32 data_02056924[]; @@ -126,11 +126,8 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 } } -// non-matching THUMB void UnkStruct_027E0C68::func_0203665c(void) { - s32 i; - - for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + for (s32 i = 0; i < ARRAY_LEN(this->unk_28); i++) { if (this->unk_28[i] != NULL) { delete this->unk_28[i]; @@ -138,7 +135,7 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) { } } - for (i = 0; i < ARRAY_LEN(this->unk_18); i++) { + for (s32 i = 0; i < ARRAY_LEN(this->unk_18); i++) { if (this->unk_18[i] != NULL) { delete this->unk_18[i]; @@ -154,7 +151,7 @@ ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() {} // non-matching ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_020366c4(void) { - if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) && ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0)) { + if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { return this->unk_28[2]; } @@ -163,7 +160,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_020366c4(void) { // non-matching ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036700(void) { - if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) && ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0)) { + if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { return this->unk_28[0]; } @@ -236,17 +233,7 @@ ARM bool UnkStruct_027E0C68::func_02036824(void) { // non-matching ARM bool UnkStruct_027E0C68::func_02036850(void) { - bool ret = false; - u8 value; - u32 val = data_027e077c.mUnk_0; - - value = data_02056be4[val]; - - if (!(value & 2)) { - ret = value & 1; - } - - return ret; + 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) { @@ -271,6 +258,7 @@ ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_027E0C68_UnkSubClass3* para return true; } +// non-matching ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { UnkStruct_027E0C68_UnkSubClass1* unk_28_0; UnkStruct_027E0C68_UnkSubClass1* unk_28_2; @@ -410,18 +398,21 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { } } -// non-matching -ARM s32 UnkStruct_027E0C68::func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param_2, unk32 param_3) { +ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param_2, unk32 param_3) { + u32 uVar1; + if (param_3 == 0) { - return 0; + return false; } - if (func_020373ec(this->pGroups, param_3) != -1) { - param_2->vfunc_08(); - return 1; + uVar1 = func_020373ec(this->pGroups, param_3); + + if (uVar1 != -1) { + param_2->vfunc_08(uVar1); + return true; } - return 0; + return false; } ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_027E0C68_UnkSubClass3* param_2) { @@ -442,7 +433,6 @@ ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_027E0C68_UnkSubClass3* para return false; } -// non-matching ARM void UnkStruct_027E0C68::func_02036d6c(void) { s32 i; @@ -457,7 +447,6 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param_2, s32* param_3) { EntryINF1 *pEVar1; EntryINF1 *pEVar2; - u8* puVar3; UnkStruct_027E0C68_UnkSubClass1 *pSVar4; BMGGroups *pBVar5; bool bVar6; @@ -465,7 +454,6 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param int iStack_34; int iStack_30; u8 uStack_2c; - u8 uStack_23; pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xFFFF); @@ -476,17 +464,14 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { pSVar4 = this->unk_28[4]; func_02037628(&iStack_38); + + // ??? bVar6 = (data_02056be4[data_027e077c.mUnk_0] & 1) == 0; - puVar3 = data_02056be4; - if (bVar6) { - puVar3[0] = 1; + data_02056be4[0] = 1; } - - uStack_23 = puVar3[0]; - if (!bVar6) { - uStack_23 = 0; + data_02056be4[0] = 0; } uStack_2c = 1; @@ -549,8 +534,10 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036f68(u32 param pSVar2 = this->unk_28[1]; } - // pSVar5[0x16].unk_04 = (unk32*)pSVar2; - pSVar5[0x41].unk_08 = (unk32*)this->unk_28[5]; + //! TODO: fake? + pSVar5->unk_164 = pSVar2; + pSVar5->unk_418 = this->unk_28[5]; + pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), param_3); if (func_ov000_020d7f18(data_ov000_020eec9c, 0x19) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x18) == 0 && @@ -570,10 +557,10 @@ ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370d0(unk32 par ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { UnkStruct_027E0C68_UnkSubClass2* puVar2; - if (this->func_02036824() != 0) { + if (this->func_02036824()) { puVar2 = this->unk_18[0]; } else { - if (this->func_02036850() != 0) { + if (this->func_02036850()) { puVar2 = this->unk_18[1]; } else { return NULL; @@ -584,7 +571,7 @@ ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370e8(unk32 par puVar2->unk_34 = param_3; puVar2->unk_36 = param_4; - if (this->func_02036ce4(puVar2, param_2) != 0) { + if (this->func_02036ce4(puVar2, param_2)) { return puVar2; } From 660c5e96554153dda38e8d2185db07ae70432266 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 24 Jan 2025 22:11:59 +0100 Subject: [PATCH 17/64] convert BMGGroups to a class --- config/eur/arm9/symbols.txt | 6 +++--- config/usa/arm9/symbols.txt | 6 +++--- include/Message/BMG.hpp | 18 ++++++++++++------ include/Message/MessageManager.hpp | 1 + src/Main/Message/BMG.cpp | 22 +++++++++++----------- src/Main/Message/MessageManager.cpp | 20 ++++++++++---------- 6 files changed, 40 insertions(+), 33 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 738d2d1a..140b8db1 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1825,9 +1825,9 @@ _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037258 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x203728c -_Z13func_020372f0P9BMGGroups12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372f0 -_Z13func_020373b4P9BMGGroupss kind:function(thumb,size=0x38) addr:0x20373b4 -_Z13func_020373ecP9BMGGroupsi kind:function(arm,size=0x60) addr:0x20373ec +_ZN9BMGGroups13func_020372f0E12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372f0 +_ZN9BMGGroups13func_020373b4Es kind:function(thumb,size=0x38) addr:0x20373b4 +_ZN9BMGGroups13func_020373ecEi kind:function(arm,size=0x60) addr:0x20373ec func_0203744c kind:function(thumb,size=0xc) addr:0x203744c func_02037458 kind:function(arm,size=0x28) addr:0x2037458 func_02037480 kind:function(arm,size=0x10) addr:0x2037480 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 39e9cffe..4ccd1090 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1825,9 +1825,9 @@ _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037214 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x2037248 -_Z13func_020372f0P9BMGGroups12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372ac -_Z13func_020373b4P9BMGGroupss kind:function(thumb,size=0x38) addr:0x2037370 -_Z13func_020373ecP9BMGGroupsi kind:function(arm,size=0x60) addr:0x20373a8 +_ZN9BMGGroups13func_020372f0E12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372ac +_ZN9BMGGroups13func_020373b4Es kind:function(thumb,size=0x38) addr:0x2037370 +_ZN9BMGGroups13func_020373ecEi kind:function(arm,size=0x60) addr:0x20373a8 func_0203744c kind:function(thumb,size=0xc) addr:0x2037408 func_02037458 kind:function(arm,size=0x28) addr:0x2037414 func_02037480 kind:function(arm,size=0x10) addr:0x203743c diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index 844da446..997e41f3 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -2,6 +2,7 @@ #include "global.h" #include "types.h" +#include "System/SysNew.hpp" #define BMG_MAGIC "MESGbmg1" #define BMG_TAG(a, b, c, d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) @@ -170,13 +171,18 @@ typedef struct BMGFileInfo { /* 0x1A */ s16 groupId; // stores the group id } BMGFileInfo; // size = 0x1C -// 0x027E0C68 + 0x14 -typedef struct BMGGroups { + +class BMGGroups : public SysObject { +public: /* 0x00 */ BMGFileInfo* entries; // accessed with `groupId` /* 0x04 */ s32 numEntries; -} BMGGroups; // size = 0x8 + /* 0x08 */ + + BMGGroups(); + ~BMGGroups(); + void func_020372f0(BMGFileIndex eIndex, s16 unk_18); + void func_020373b4(s16 unk_18); + u32 func_020373ec(unk32 param_2); +}; extern EntryINF1* func_02037258(BMGFileInfo* pFileInfo, unk32 param_2); -extern void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18); -extern void func_020373b4(BMGGroups* pGroups, s16 unk_18); -extern u32 func_020373ec(BMGGroups* pGroups, unk32 param_2); diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 06caff2b..d6547c2f 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -159,6 +159,7 @@ public: /* 0x20 */ UnkStruct_027E0C68_UnkSubClass3* unk_20[2]; // is it actually UnkStruct_027E0C68_UnkSubClass2? /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1* unk_28[6]; /* 0x40 */ UnkStruct_027E0C68_UnkSubClass1* unk_40[2]; // is array size 6? + /* 0x48 */ static void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3); void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); diff --git a/src/Main/Message/BMG.cpp b/src/Main/Message/BMG.cpp index db3623b8..69dae832 100644 --- a/src/Main/Message/BMG.cpp +++ b/src/Main/Message/BMG.cpp @@ -135,7 +135,7 @@ ARM u16 func_0203728c(BMGFileInfo* pFileInfo, unk32 param_2) { return -1; } -THUMB void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18) { +THUMB void BMGGroups::func_020372f0(BMGFileIndex eIndex, s16 unk_18) { char bmgPath[64]; BMGFileInfo bmgFile; u32* pFile; @@ -168,30 +168,30 @@ THUMB void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18) { // assign sections and set the file info in the groups entries groupId = func_020371c8(&bmgFile, pFile, unk_18); - pGroups->entries[groupId] = bmgFile; - pGroups->entries[groupId].groupId = groupId; + this->entries[groupId] = bmgFile; + this->entries[groupId].groupId = groupId; } -THUMB void func_020373b4(BMGGroups* pGroups, s16 unk_18) { +THUMB void BMGGroups::func_020373b4(s16 unk_18) { s32 i; - for (i = 0; i < pGroups->numEntries; i++) { - if (pGroups->entries[i].unk_18 == unk_18) { - func_0202d590(pGroups->entries[i].unk_14); - func_020371b4(&pGroups->entries[i]); + for (i = 0; i < this->numEntries; i++) { + if (this->entries[i].unk_18 == unk_18) { + func_0202d590(this->entries[i].unk_14); + func_020371b4(&this->entries[i]); } } } -ARM u32 func_020373ec(BMGGroups* pGroups, unk32 param_2) { +ARM u32 BMGGroups::func_020373ec(unk32 param_2) { u16 dVar1; u16 uVar2; s32 i; dVar1 = -1; - for (i = 0; i < pGroups->numEntries; i++) { - uVar2 = func_0203728c(&pGroups->entries[i], param_2); + for (i = 0; i < this->numEntries; i++) { + uVar2 = func_0203728c(&this->entries[i], param_2); if (uVar2 != dVar1) { return uVar2 | i << 0x10; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index e8026341..f314c86d 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -45,23 +45,23 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 this->unk_03 = 0; this->unk_0C = 0; - func_020372f0(this->pGroups, BMG_FILE_INDEX_SYSTEM, 2); + this->pGroups->func_020372f0(BMG_FILE_INDEX_SYSTEM, 2); switch (data_027e0618) { case 3: - func_020372f0(this->pGroups, BMG_FILE_INDEX_MAINSELECT, 2); - func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLE, 2); + this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2); + this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2); break; case 5: - func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLE, 2); - func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLECOMMON, 2); + this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2); + this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLECOMMON, 2); break; case 6: - func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLE, 2); - func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLECOMMON, 2); + this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2); + this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLECOMMON, 2); break; case 7: - func_020372f0(this->pGroups, BMG_FILE_INDEX_MAINSELECT, 2); + this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2); break; default: break; @@ -143,7 +143,7 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) { } } - func_020373b4(this->pGroups, 2); + this->pGroups->func_020373b4(2); } // non-matching @@ -405,7 +405,7 @@ ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* para return false; } - uVar1 = func_020373ec(this->pGroups, param_3); + uVar1 = this->pGroups->func_020373ec(param_3); if (uVar1 != -1) { param_2->vfunc_08(uVar1); From 9aaf744c3e1a7dd01c541c45bfd40ac221b83e25 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 24 Jan 2025 23:48:25 +0100 Subject: [PATCH 18/64] add missing sections to BMG.cpp delink --- config/eur/arm9/delinks.txt | 2 ++ config/eur/arm9/symbols.txt | 2 +- config/usa/arm9/symbols.txt | 2 +- include/Message/BMG.hpp | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index d30e76c9..edd1731a 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -23,3 +23,5 @@ src/Main/Message/MessageManager.cpp: src/Main/Message/BMG.cpp: .text start:0x020371b0 end:0x0203744c + .data start:0x02057b78 end:0x02057cb8 + .rodata start:0x02056958 end:0x020569e0 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 140b8db1..2d313ee3 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -2565,7 +2565,7 @@ data_02056898 kind:data(any) addr:0x2056898 data_02056918 kind:data(any) addr:0x2056918 data_0205691c kind:data(any) addr:0x205691c data_02056924 kind:data(any) addr:0x2056924 -data_02056958 kind:data(any) addr:0x2056958 +sBMGFileNames kind:data(any) addr:0x2056958 data_020569e0 kind:data(any) addr:0x20569e0 data_020569ec kind:data(any) addr:0x20569ec data_020569f0 kind:data(any) addr:0x20569f0 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 4ccd1090..7d2222ed 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -2565,7 +2565,7 @@ data_02056898 kind:data(any) addr:0x2056854 data_02056918 kind:data(any) addr:0x20568d4 data_0205691c kind:data(any) addr:0x20568d8 data_02056924 kind:data(any) addr:0x20568e0 -data_02056958 kind:data(any) addr:0x2056914 +sBMGFileNames kind:data(any) addr:0x2056914 data_020569e0 kind:data(any) addr:0x205699c data_020569ec kind:data(any) addr:0x20569a8 data_020569f0 kind:data(any) addr:0x20569ac diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index 997e41f3..9a163559 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -171,7 +171,6 @@ typedef struct BMGFileInfo { /* 0x1A */ s16 groupId; // stores the group id } BMGFileInfo; // size = 0x1C - class BMGGroups : public SysObject { public: /* 0x00 */ BMGFileInfo* entries; // accessed with `groupId` From 45f07884d2db01590e0fdcb4409349e36ab4f8fa Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sat, 25 Jan 2025 03:07:39 +0100 Subject: [PATCH 19/64] started vfuncs decomp --- config/eur/arm9/delinks.txt | 3 + config/eur/arm9/symbols.txt | 16 +- config/usa/arm9/symbols.txt | 16 +- include/Message/MessageManager.hpp | 73 +-------- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 112 +++++++++++++ src/Main/Message/MessageManager.cpp | 20 +-- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 152 ++++++++++++++++++ 7 files changed, 294 insertions(+), 98 deletions(-) create mode 100644 include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp create mode 100644 src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index edd1731a..de586ab7 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -25,3 +25,6 @@ src/Main/Message/BMG.cpp: .text start:0x020371b0 end:0x0203744c .data start:0x02057b78 end:0x02057cb8 .rodata start:0x02056958 end:0x020569e0 + +src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp: + .text start:0x02038b28 end:0x0203e0f8 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 2d313ee3..59d1fb09 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1886,7 +1886,7 @@ func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038cb8 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cf4 func_02038d10 kind:function(arm,size=0x10) addr:0x2038d10 func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038d20 -func_02038ed0 kind:function(arm,size=0x24) addr:0x2038ed0 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02038ed0Ev kind:function(arm,size=0x24) addr:0x2038ed0 func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038ef4 func_02038f40 kind:function(arm,size=0x4) addr:0x2038f40 func_02038f44 kind:function(arm,size=0x114) addr:0x2038f44 @@ -1894,23 +1894,23 @@ func_02039058 kind:function(arm,size=0x4) addr:0x2039058 func_0203905c kind:function(arm,size=0x48) addr:0x203905c func_020390a4 kind:function(arm,size=0x164) addr:0x20390a4 func_02039208 kind:function(arm,size=0x20) addr:0x2039208 -func_02039228 kind:function(arm,size=0x28) addr:0x2039228 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039228EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 func_02039250 kind:function(arm,size=0x64) addr:0x2039250 func_020392b4 kind:function(arm,size=0xe4) addr:0x20392b4 func_02039398 kind:function(arm,size=0xc) addr:0x2039398 func_020393a4 kind:function(arm,size=0x4) addr:0x20393a4 func_020393a8 kind:function(arm,size=0x28) addr:0x20393a8 -func_020393d0 kind:function(arm,size=0x70) addr:0x20393d0 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_020393d0Ei kind:function(arm,size=0x70) addr:0x20393d0 func_02039440 kind:function(arm,size=0x3c) addr:0x2039440 func_0203947c kind:function(arm,size=0x5c) addr:0x203947c -func_020394d8 kind:function(arm,size=0x44) addr:0x20394d8 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_020394d8EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 func_0203951c kind:function(arm,size=0x40) addr:0x203951c func_0203955c kind:function(arm,size=0x14) addr:0x203955c func_02039570 kind:function(arm,size=0x8) addr:0x2039570 -func_02039578 kind:function(arm,size=0x3c) addr:0x2039578 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039578Eccci kind:function(arm,size=0x3c) addr:0x2039578 func_020395b4 kind:function(thumb,size=0x244) addr:0x20395b4 func_020397f8 kind:function(thumb,size=0x244) addr:0x20397f8 -func_02039a3c kind:function(thumb,size=0x20) addr:0x2039a3c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c func_02039a5c kind:function(arm,size=0x24c) addr:0x2039a5c func_02039ca8 kind:function(arm,size=0x24) addr:0x2039ca8 func_02039ccc kind:function(arm,size=0xa8) addr:0x2039ccc @@ -1918,7 +1918,7 @@ func_02039d74 kind:function(arm,size=0x414) addr:0x2039d74 func_0203a188 kind:function(arm,size=0x138) addr:0x203a188 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a2c0 func_0203a30c kind:function(arm,size=0x1c) addr:0x203a30c -func_0203a328 kind:function(arm,size=0x34) addr:0x203a328 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a328 func_0203a35c kind:function(arm,size=0x84) addr:0x203a35c func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a3e0 func_0203a3fc kind:function(arm,size=0x2d4) addr:0x203a3fc @@ -1943,7 +1943,7 @@ func_0203c084 kind:function(arm,size=0xb8) addr:0x203c084 func_0203c13c kind:function(arm,size=0x64) addr:0x203c13c func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c1a0 func_0203c25c kind:function(arm,size=0x6c) addr:0x203c25c -func_0203c2c8 kind:function(arm,size=0x48) addr:0x203c2c8 +_ZN31UnkStruct_027E0C68_UnkSubClass1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 func_0203c310 kind:function(arm,size=0x40) addr:0x203c310 func_0203c350 kind:function(arm,size=0x8) addr:0x203c350 func_0203c358 kind:function(thumb,size=0x44) addr:0x203c358 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 7d2222ed..00f08fd2 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1886,7 +1886,7 @@ func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038c74 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cb0 func_02038d10 kind:function(arm,size=0x10) addr:0x2038ccc func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038cdc -func_02038ed0 kind:function(arm,size=0x24) addr:0x2038e8c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02038ed0Ev kind:function(arm,size=0x24) addr:0x2038e8c func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038eb0 func_02038f40 kind:function(arm,size=0x4) addr:0x2038efc func_02038f44 kind:function(arm,size=0x114) addr:0x2038f00 @@ -1894,23 +1894,23 @@ func_02039058 kind:function(arm,size=0x4) addr:0x2039014 func_0203905c kind:function(arm,size=0x48) addr:0x2039018 func_020390a4 kind:function(arm,size=0x164) addr:0x2039060 func_02039208 kind:function(arm,size=0x20) addr:0x20391c4 -func_02039228 kind:function(arm,size=0x28) addr:0x20391e4 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039228EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 func_02039250 kind:function(arm,size=0x64) addr:0x203920c func_020392b4 kind:function(arm,size=0xe4) addr:0x2039270 func_02039398 kind:function(arm,size=0xc) addr:0x2039354 func_020393a4 kind:function(arm,size=0x4) addr:0x2039360 func_020393a8 kind:function(arm,size=0x28) addr:0x2039364 -func_020393d0 kind:function(arm,size=0x70) addr:0x203938c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_020393d0Ei kind:function(arm,size=0x70) addr:0x203938c func_02039440 kind:function(arm,size=0x3c) addr:0x20393fc func_0203947c kind:function(arm,size=0x5c) addr:0x2039438 -func_020394d8 kind:function(arm,size=0x44) addr:0x2039494 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_020394d8EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 func_0203951c kind:function(arm,size=0x40) addr:0x20394d8 func_0203955c kind:function(arm,size=0x14) addr:0x2039518 func_02039570 kind:function(arm,size=0x8) addr:0x203952c -func_02039578 kind:function(arm,size=0x3c) addr:0x2039534 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039578Eccci kind:function(arm,size=0x3c) addr:0x2039534 func_020395b4 kind:function(thumb,size=0x244) addr:0x2039570 func_020397f8 kind:function(thumb,size=0x244) addr:0x20397b4 -func_02039a3c kind:function(thumb,size=0x20) addr:0x20399f8 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 func_02039a5c kind:function(arm,size=0x24c) addr:0x2039a18 func_02039ca8 kind:function(arm,size=0x24) addr:0x2039c64 func_02039ccc kind:function(arm,size=0xa8) addr:0x2039c88 @@ -1918,7 +1918,7 @@ func_02039d74 kind:function(arm,size=0x414) addr:0x2039d30 func_0203a188 kind:function(arm,size=0x138) addr:0x203a144 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a27c func_0203a30c kind:function(arm,size=0x1c) addr:0x203a2c8 -func_0203a328 kind:function(arm,size=0x34) addr:0x203a2e4 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a2e4 func_0203a35c kind:function(arm,size=0x84) addr:0x203a318 func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a39c func_0203a3fc kind:function(arm,size=0x2d4) addr:0x203a3b8 @@ -1943,7 +1943,7 @@ func_0203c084 kind:function(arm,size=0xb8) addr:0x203c040 func_0203c13c kind:function(arm,size=0x64) addr:0x203c0f8 func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c15c func_0203c25c kind:function(arm,size=0x6c) addr:0x203c218 -func_0203c2c8 kind:function(arm,size=0x48) addr:0x203c284 +_ZN31UnkStruct_027E0C68_UnkSubClass1D0Ev kind:function(arm,size=0x48) addr:0x203c284 func_0203c310 kind:function(arm,size=0x40) addr:0x203c2cc func_0203c350 kind:function(arm,size=0x8) addr:0x203c30c func_0203c358 kind:function(thumb,size=0x44) addr:0x203c314 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index d6547c2f..2ab2dcc8 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -5,78 +5,7 @@ #include "System/SysNew.hpp" #include "Message/BMG.hpp" - -// temp -#define UNK_TYPE void - -class UnkStruct_027E0C68_UnkSubClass1 : public SysObject { -public: - /* 0x00 (vtable) */ - /* 0x04 */ unk32* unk_04; - /* 0x08 */ unk32* unk_08; - /* 0x0C */ unk32 unk_0C; - /* 0x10 */ unk32 unk_10; - /* 0x14 */ u8 unk_14; - /* 0x15 */ s16* unk_15; - /* 0x16 */ unk16 unk_16; - /* 0x18 */ unk32 unk_18; - /* 0x1C */ unk32 unk_1C; - /* 0x20 */ unk32 unk_20; - /* 0x24 */ unk32 unk_24; - /* 0x28 */ unk32 unk_28; - /* 0x2C */ u32* unk_2C; - /* 0x30 */ unk32 unk_30; - /* 0x34 */ unk32 unk_34; - /* 0x38 */ unk32 unk_38; - /* 0x3C */ unk32 unk_3C; - /* 0x40 */ unk32 unk_40; - /* 0x44 */ unk32 unk_44; - /* 0x48 */ u8 unk_48; - /* 0x49 */ u8 unk_49; - /* 0x4A */ unk16 unk_4A; - /* 0x4C */ unk32 unk_4C; - /* 0x50 */ unk32 unk_50; - /* 0x54 */ unk32 unk_54; - /* 0x58 */ unk32 unk_58; - /* 0x5C */ s16 unk_5C; - /* 0x60 */ unk32 unk_60[0x3D]; - /* 0x15C */ s16 unk_15C; - /* 0x15C */ s16 unk_15E; - /* 0x160 */ unk32 unk_160; - /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1* unk_164; - /* 0x168 */ unk32 unk_168[0xAC]; - /* 0x418 */ UnkStruct_027E0C68_UnkSubClass1* unk_418; - - UnkStruct_027E0C68_UnkSubClass1(); - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1() override; - /* 0x08 */ virtual UNK_TYPE vfunc_08(void) override; - /* 0x0C */ virtual UNK_TYPE vfunc_0C(void) override; - /* 0x10 */ virtual UNK_TYPE 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 void vfunc_28(void) override; - /* 0x2C */ virtual void vfunc_2C(void) override; - /* 0x30 */ virtual UNK_TYPE vfunc_30(void) override; - /* 0x34 */ virtual UNK_TYPE vfunc_34(void) override; - /* 0x38 */ virtual UNK_TYPE vfunc_38(void) override; - /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override; - /* 0x40 */ virtual UNK_TYPE vfunc_40(void) override; - /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; - /* 0x48 */ virtual UNK_TYPE vfunc_48(void) override; - /* 0x4C */ virtual void vfunc_4C(void) override; - /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, int param_3, u8* param_4) override; - /* 0x54 */ virtual UNK_TYPE vfunc_54(void) override; - /* 0x58 */ virtual void vfunc_58(void) override; - /* 0x5C */ virtual UNK_TYPE vfunc_5C(void) override; - /* 0x60 */ virtual UNK_TYPE vfunc_60(void) override; - /* 0x64 */ virtual UNK_TYPE vfunc_64(void) override; - /* 0x68 */ virtual UNK_TYPE vfunc_68(void) override; - /* 0x6C */ virtual UNK_TYPE vfunc_6C(void) override; - /* 0x70 */ virtual UNK_TYPE vfunc_70(void) override; -}; +#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" class UnkStruct_027E0C68_UnkSubClass2 : public SysObject { public: diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp new file mode 100644 index 00000000..534b725f --- /dev/null +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -0,0 +1,112 @@ +#pragma once + +#include "System/SysNew.hpp" +#include "Message/BMG.hpp" + +// temp +#define UNK_TYPE void + +class UnkStruct_027E0C68_UnkSubClass1 : public SysObject { +public: + /* 0x000 (vtable) */ + /* 0x004 */ unk32* unk_04; + /* 0x008 */ unk32* unk_08; + /* 0x00C */ unk32* unk_0C; + /* 0x010 */ unk32* unk_10; + /* 0x014 */ unk32 unk_14; + /* 0x018 */ unk32 unk_18; + /* 0x01C */ unk32 unk_1C; + /* 0x020 */ unk32 unk_20; + /* 0x024 */ unk32* unk_24; + /* 0x028 */ unk32* unk_28; + /* 0x02C */ u32* unk_2C; + /* 0x030 */ unk32 unk_30; + /* 0x034 */ unk32 unk_34; + /* 0x038 */ unk32 unk_38; + /* 0x03C */ unk32 unk_3C; + /* 0x040 */ unk32 unk_40; + /* 0x044 */ unk32 unk_44; + /* 0x048 */ u8 unk_48; + /* 0x049 */ u8 unk_49; + /* 0x04A */ unk16 unk_4A; + /* 0x04C */ unk32 unk_4C; + /* 0x050 */ u8 unk_50; + /* 0x050 */ unk8 unk_51; + /* 0x050 */ unk16 unk_52; + /* 0x054 */ unk32 unk_54; + /* 0x058 */ unk32 unk_58; + /* 0x05C */ s16 unk_5C; + /* 0x05E */ s16 unk_5E; + /* 0x060 */ unk32 unk_60[0x2E]; + /* 0x118 */ s32 unk_118; + /* 0x11C */ unk32 unk_11C[0xD]; + /* 0x150 */ unk8 unk_150; + /* 0x151 */ unk8 unk_151; + /* 0x152 */ unk8 unk_152; + /* 0x153 */ unk8 unk_153; + /* 0x154 */ unk32 unk_154; + /* 0x158 */ unk16 unk_158; + /* 0x15A */ unk16 unk_15A; + /* 0x15C */ s16 unk_15C; + /* 0x15C */ s16 unk_15E; + /* 0x160 */ unk32 unk_160; + /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1* unk_164; + /* 0x168 */ u32 unk_168; + /* 0x16C */ u8 unk_16C[0x84]; + /* 0x1F0 */ u32 unk_1F0; + /* 0x1F4 */ u8 unk_1F4[0x84]; + /* 0x278 */ u32 unk_278; + /* 0x27C */ u8 unk_27C[0x84]; + /* 0x300 */ u32 unk_300; + /* 0x304 */ u8 unk_304[0x84]; + /* 0x388 */ u32 unk_388; + /* 0x38C */ u8 unk_38C[0x84]; + /* 0x410 */ u32 unk_410; + /* 0x414 */ unk32 unk_414; + /* 0x418 */ UnkStruct_027E0C68_UnkSubClass1* unk_418; + + UnkStruct_027E0C68_UnkSubClass1(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1() override; + /* 0x08 */ virtual UNK_TYPE vfunc_08(void) override; // func_0203c2c8 (dtor?) + /* 0x0C */ virtual void func_02039228(unk32* param_2, unk32* param_3) override; + /* 0x10 */ virtual void func_02039578(unk8 param_2, unk8 param_3, unk8 param_4, unk32 param_5) override; + /* 0x14 */ virtual UNK_TYPE func_0203e060(void) override; + /* 0x18 */ virtual UNK_TYPE func_0203dcb4(void) override; + /* 0x1C */ virtual UNK_TYPE func_0203b264(void) override; + /* 0x20 */ virtual UNK_TYPE func_0203b310(void) override; + /* 0x24 */ virtual UNK_TYPE func_0203b814(void) override; + /* 0x28 */ virtual void func_0203e0c8(void) override; + /* 0x2C */ virtual void func_02039a5c(void) override; + /* 0x30 */ virtual void func_02038ed0(void) override; + /* 0x34 */ virtual UNK_TYPE func_02038c34(void) override; + /* 0x38 */ virtual UNK_TYPE func_0203c350(void) override; + /* 0x3C */ virtual void func_02039ccc(unk32 param_2) override; + /* 0x40 */ virtual UNK_TYPE func_02039d74(void) override; + /* 0x44 */ virtual void func_0203a3fc(s32 touchLastX, s32 touchLastY) override; + /* 0x48 */ virtual void func_0203a328(void) override; + /* 0x4C */ virtual void func_02039a3c(void) override; + /* 0x50 */ virtual void func_0203a7f0(EntryINF1* param_2, int param_3, u8* param_4) override; + /* 0x54 */ virtual UNK_TYPE func_0203a988(void) override; + /* 0x58 */ virtual void func_0203af1c(void) override; + /* 0x5C */ virtual UNK_TYPE func_0203aea8(void) override; + /* 0x60 */ virtual UNK_TYPE func_0203b410(void) override; + /* 0x64 */ virtual UNK_TYPE func_0203b5d0(void) override; + /* 0x68 */ virtual unk32 func_020393d0(unk32 param_2) override; + /* 0x6C */ virtual void func_0203bdcc(unk32* param_2, unk32* param_3) override; + /* 0x70 */ virtual void func_020394d8(unk32* param_2, unk32* param_3) override; + /* 0x74 */ + + unk32 func_020337d8(unk32 param_2); + void func_02038b28(void); + void func_0203e090(void); + void func_0203dc10(unk32 param_2, unk32 param_3, unk32 param_4); + void func_0203dcfc(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); + + // not sure it belongs to this class: + void func_0203e2ac(unk32* param_2, unk32* param_3); + void func_02033190(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); + void func_02038b40(void); + void func_0203ec34(u32*); + void func_020350ac(u32*); + void func_02038b1c(void); +}; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index f314c86d..8a1255bc 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -120,7 +120,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 } if (this->unk_28[i] != NULL) { - this->unk_28[i]->vfunc_4C(); + this->unk_28[i]->func_02039a3c(); } } } @@ -311,7 +311,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { if (this->unk_28[i] != NULL) { - this->unk_28[i]->vfunc_2C(); + this->unk_28[i]->func_02039a5c(); } } @@ -331,7 +331,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p //! TODO: fake? pSVar4 = this->func_02037178((UnkStruct_027E0C68_UnkSubClass1*)this->unk_18[0]); - if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->unk_48 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { + if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { this->unk_04 = 0; } } @@ -370,8 +370,8 @@ ARM void UnkStruct_027E0C68::func_02036bbc(void) { for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { pSVar3 = this->unk_28[i]; - if (pSVar3 != NULL && ((bVar2 && pSVar3->unk_48 == 0) || (bVar4 && pSVar3->unk_48 != 0))) { - pSVar3->vfunc_44(data_027e0d78.mTouchLastX, data_027e0d78.mTouchLastY); + if (pSVar3 != NULL && ((bVar2 && pSVar3->unk_50 == 0) || (bVar4 && pSVar3->unk_50 != 0))) { + pSVar3->func_0203a3fc(data_027e0d78.mTouchLastX, data_027e0d78.mTouchLastY); } } } @@ -381,7 +381,7 @@ ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { if (this->unk_28[i] != NULL && func_0203de14(this->unk_28[i], param_2) != 0) { - this->unk_28[i]->vfunc_28(); + this->unk_28[i]->func_0203e0c8(); } } } @@ -393,7 +393,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { UnkStruct_027E0C68_UnkSubClass1* pSVar1 = this->unk_28[i]; if (pSVar1 != NULL) { - pSVar1->vfunc_3C(param_2); + pSVar1->func_02039ccc(param_2); } } } @@ -479,7 +479,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param iStack_34 = param_3[1]; iStack_30 = param_3[2]; pBVar5 = this->pGroups; - pSVar4->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), &iStack_38); + pSVar4->func_0203a7f0(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), &iStack_38); func_ov000_020d77e4(data_ov000_020eec9c, 0x1C); return pSVar4; @@ -538,7 +538,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036f68(u32 param pSVar5->unk_164 = pSVar2; pSVar5->unk_418 = this->unk_28[5]; - pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), param_3); + pSVar5->func_0203a7f0(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), param_3); if (func_ov000_020d7f18(data_ov000_020eec9c, 0x19) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x18) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x34) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x35) == 0 && @@ -584,7 +584,7 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkStruct_027E0C68_UnkSubClass1* para pSVar1 = this->func_02037178(param_2); if (pSVar1 != NULL) { - pSVar1->vfunc_58(); + pSVar1->func_0203af1c(); } } diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp new file mode 100644 index 00000000..c5227eef --- /dev/null +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -0,0 +1,152 @@ +#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_02038c34(UNK_TYPE) { + // TODO +} + +ARM void UnkStruct_027E0C68_UnkSubClass1::func_02038ed0(void) { + if (this->unk_15C > 0) { + this->func_0203e090(); + } else { + this->unk_118 = -1; + } +} + +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039228(unk32* param_2, unk32* param_3) { + int temp; + this->unk_15C = 10; + // temp = param_3[2]; + this->unk_152 = 1; + // param_3[0] = param_3[2]; + func_0203e2ac(param_2, param_3); +} + +ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_020393d0(unk32 param_2) { + switch (param_2) { + case 0: + break; + case 1: + this->unk_34 = 4; + break; + case 2: + this->unk_34 = 6; + break; + case 3: + this->unk_34 = 1; + break; + case 4: + this->unk_34 = 0; + break; + default: + break; + } + + return (this->unk_18 * 8 - this->func_020337d8(param_2)) / 2; +} + +ARM void UnkStruct_027E0C68_UnkSubClass1::func_020394d8(unk32* param_2, unk32* param_3) { + this->func_0203bdcc(param_2, param_3); + *param_2 += this->unk_158; + *param_3 += this->unk_15A; +} + +ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039578(unk8 param_2, unk8 param_3, unk8 param_4, unk32 param_5) { + this->func_0203dc10(1, param_3, param_4); + this->func_02033190(param_2, param_3, param_4, param_5); +} + +THUMB void UnkStruct_027E0C68_UnkSubClass1::func_02039a3c(void) { + this->func_02038b28(); + this->func_0203dcfc(this->unk_50, 0, 0, 2); +} + +ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039a5c(UNK_TYPE) { + // TODO +} + +ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039ccc(unk32 param_2) { + // TODO +} + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_02039d74(UNK_TYPE) { + // TODO +} + +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a328(UNK_TYPE) { + if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { + this->func_02038b40(); + } + + this->func_0203ec34(&this->unk_410); +} + +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a3fc(s32 touchLastX, s32 touchLastY) { + // TODO +} + +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a7f0(EntryINF1* param_2, int param_3, u8* param_4) { + // TODO +} + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203a988(UNK_TYPE) { + // TODO +} + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203aea8(UNK_TYPE) { + // TODO +} + +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203af1c(void) { + // TODO +} + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b264(UNK_TYPE) { + // TODO +} + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b310(UNK_TYPE) { + // TODO +} + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b410(UNK_TYPE) { + // TODO +} + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b5d0(UNK_TYPE) { + // TODO +} + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b814(UNK_TYPE) { + // TODO +} + +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203bdcc(unk32* param_2, unk32* param_3) { + // TODO +} + +ARM UnkStruct_027E0C68_UnkSubClass1::~UnkStruct_027E0C68_UnkSubClass1() { + this->func_020350ac(&this->unk_388); + this->func_020350ac(&this->unk_300); + this->func_020350ac(&this->unk_278); + this->func_020350ac(&this->unk_1F0); + this->func_020350ac(&this->unk_168); + this->func_02038b1c(); +} + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203c350(UNK_TYPE) { + // TODO +} + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203dcb4(UNK_TYPE) { + // TODO +} + +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203e060(UNK_TYPE) { + // TODO +} + +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203e0c8(UNK_TYPE) { + // TODO +} From acc3200e655c6f4cf40e1911ccf18249b78900b5 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sat, 25 Jan 2025 21:25:14 +0100 Subject: [PATCH 20/64] more vfuncs progress --- config/eur/arm9/symbols.txt | 2 +- config/usa/arm9/symbols.txt | 2 +- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 177 +++++++++++++++--- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 175 ++++++++++++++--- 4 files changed, 305 insertions(+), 51 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 59d1fb09..2fdf257f 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1944,7 +1944,7 @@ func_0203c13c kind:function(arm,size=0x64) addr:0x203c13c func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c1a0 func_0203c25c kind:function(arm,size=0x6c) addr:0x203c25c _ZN31UnkStruct_027E0C68_UnkSubClass1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 -func_0203c310 kind:function(arm,size=0x40) addr:0x203c310 +_ZN31UnkStruct_027E0C68_UnkSubClass1D1Ev kind:function(arm,size=0x40) addr:0x203c310 func_0203c350 kind:function(arm,size=0x8) addr:0x203c350 func_0203c358 kind:function(thumb,size=0x44) addr:0x203c358 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c39c diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 00f08fd2..4413339c 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1944,7 +1944,7 @@ func_0203c13c kind:function(arm,size=0x64) addr:0x203c0f8 func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c15c func_0203c25c kind:function(arm,size=0x6c) addr:0x203c218 _ZN31UnkStruct_027E0C68_UnkSubClass1D0Ev kind:function(arm,size=0x48) addr:0x203c284 -func_0203c310 kind:function(arm,size=0x40) addr:0x203c2cc +_ZN31UnkStruct_027E0C68_UnkSubClass1D1Ev kind:function(arm,size=0x40) addr:0x203c2cc func_0203c350 kind:function(arm,size=0x8) addr:0x203c30c func_0203c358 kind:function(thumb,size=0x44) addr:0x203c314 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c358 diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index 534b725f..33c8c7ef 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -6,6 +6,65 @@ // temp #define UNK_TYPE void +typedef struct UnkStruct_0203b264 { + /* 0 */ u8 mUnk_0[0x4]; + /* 4 */ u16 *mUnk_4; + /* 8 */ +} UnkStruct_0203b264; + +typedef struct UnkSubClass1_unk_154 { + u8 unk_00; + u8 unk_01; + u8 unk_02; + u8 unk_03; + u8 unk_04; + u8 unk_05; + u8 unk_06; +} UnkSubClass1_unk_154; + +typedef u32 (*UnkCallback1)(void); + +typedef struct UnkStruct1 { + /* 0x00 */ UnkCallback1 unk_00; + /* 0x04 */ UnkCallback1 unk_04; +} UnkStruct1; // size = 0x8 + +class UnkSubClass1_unk_168 { +public: + /* 0x00 */ UnkStruct1* unk_00; + /* 0x04 */ + + void func_020350b4(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5, unk32 param_6); + void func_020351b8(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); + void func_020352d8(void); + void func_020350ac(void); +}; + +class UnkSubClass1_unk_410 { +public: + /* 0x00 */ unk32 unk_00; + /* 0x04 */ + + void func_0203ec34(void); +}; + +class UnkSubClass1_unk_424 { +public: + /* 0x00 */ unk32 unk_00; + /* 0x04 */ + + void func_0203ee80(unk32); + void func_0203ef78(unk16, u16, unk8); +}; + +class UnkSubClass1_unk_124 { +public: + /* 0x00 */ unk32 unk_00; + /* 0x04 */ + + void func_0203f020(unk32, unk32); +}; + class UnkStruct_027E0C68_UnkSubClass1 : public SysObject { public: /* 0x000 (vtable) */ @@ -31,55 +90,112 @@ public: /* 0x04A */ unk16 unk_4A; /* 0x04C */ unk32 unk_4C; /* 0x050 */ u8 unk_50; - /* 0x050 */ unk8 unk_51; - /* 0x050 */ unk16 unk_52; + /* 0x051 */ unk8 unk_51; + /* 0x052 */ unk16 unk_52; /* 0x054 */ unk32 unk_54; /* 0x058 */ unk32 unk_58; /* 0x05C */ s16 unk_5C; /* 0x05E */ s16 unk_5E; /* 0x060 */ unk32 unk_60[0x2E]; /* 0x118 */ s32 unk_118; - /* 0x11C */ unk32 unk_11C[0xD]; + /* 0x11C */ unk8 unk_11C; + /* 0x11D */ unk8 unk_11D; + /* 0x11E */ u8 unk_11E; + /* 0x11F */ unk8 unk_11F; + /* 0x120 */ u8 unk_120; + /* 0x120 */ u8 unk_121; + /* 0x122 */ u8 unk_122; + /* 0x122 */ u8 unk_123; + /* 0x124 */ UnkSubClass1_unk_124* unk_124; + /* 0x128 */ unk32 unk_128; + /* 0x12C */ unk32 unk_12C; + /* 0x130 */ unk16 unk_130; + /* 0x132 */ unk16 unk_132; + /* 0x134 */ unk32 unk_134; + /* 0x138 */ unk32 unk_138; + /* 0x13C */ unk32 unk_13C; + /* 0x140 */ unk32 unk_140; + /* 0x144 */ unk32 unk_144; + /* 0x148 */ unk32 unk_148; + /* 0x14C */ unk32 unk_14C; /* 0x150 */ unk8 unk_150; /* 0x151 */ unk8 unk_151; /* 0x152 */ unk8 unk_152; /* 0x153 */ unk8 unk_153; - /* 0x154 */ unk32 unk_154; + /* 0x154 */ UnkSubClass1_unk_154* unk_154; /* 0x158 */ unk16 unk_158; /* 0x15A */ unk16 unk_15A; /* 0x15C */ s16 unk_15C; - /* 0x15C */ s16 unk_15E; + /* 0x15E */ s8 unk_15E; + /* 0x15F */ s8 unk_15F; /* 0x160 */ unk32 unk_160; /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1* unk_164; - /* 0x168 */ u32 unk_168; - /* 0x16C */ u8 unk_16C[0x84]; - /* 0x1F0 */ u32 unk_1F0; + /* 0x168 */ UnkSubClass1_unk_168 unk_168; + /* 0x16C */ u32* unk_16C; + /* 0x16C */ u32* unk_170; + /* 0x16C */ u8 unk_174[0x58]; + /* 0x1CC */ u32 unk_1CC; + /* 0x1D0 */ unk32 unk_1D0; + /* 0x1D4 */ unk32 unk_1D4; + /* 0x1D8 */ unk32 unk_1D8; + /* 0x1DC */ u32* unk_1DC; + /* 0x1E0 */ u32* unk_1E0; + /* 0x1E4 */ u32 unk_1E4; + /* 0x1E8 */ unk32 unk_1E8; + /* 0x1EC */ unk32 unk_1EC; + /* 0x1F0 */ UnkSubClass1_unk_168 unk_1F0; /* 0x1F4 */ u8 unk_1F4[0x84]; - /* 0x278 */ u32 unk_278; + /* 0x278 */ UnkSubClass1_unk_168 unk_278; /* 0x27C */ u8 unk_27C[0x84]; - /* 0x300 */ u32 unk_300; + /* 0x300 */ UnkSubClass1_unk_168 unk_300; /* 0x304 */ u8 unk_304[0x84]; - /* 0x388 */ u32 unk_388; + /* 0x388 */ UnkSubClass1_unk_168 unk_388; /* 0x38C */ u8 unk_38C[0x84]; - /* 0x410 */ u32 unk_410; + /* 0x410 */ UnkSubClass1_unk_410 unk_410; /* 0x414 */ unk32 unk_414; /* 0x418 */ UnkStruct_027E0C68_UnkSubClass1* unk_418; + /* 0x41C */ unk32 unk_41C; + /* 0x420 */ unk32 unk_420; + /* 0x424 */ UnkSubClass1_unk_424 unk_424; + /* 0x428 */ u16* unk_428; + /* 0x42C */ unk32 unk_42C; + /* 0x430 */ unk32 unk_430; + /* 0x434 */ u8 unk_434[0xF4]; + /* 0x528 */ s16* unk_528; + /* 0x52C */ u8 unk_52C[0x3C]; + /* 0x568 */ unk32 unk_568; + /* 0x56C */ unk16 unk_56C; + /* 0x56E */ unk16 unk_56E; + /* 0x570 */ unk16 unk_570; + /* 0x572 */ unk16 unk_572; + /* 0x574 */ s16 unk_574; + /* 0x576 */ u8 unk_576; + /* 0x577 */ u8 unk_577; + /* 0x578 */ u8 unk_578; + /* 0x579 */ u8 unk_579; + /* 0x57A */ u8 unk_57A; + /* 0x57B */ u8 unk_57B; + /* 0x57C */ u8 unk_57C; + /* 0x57D */ u8 unk_57D; + /* 0x57E */ u8 unk_57E; + /* 0x57F */ u8 unk_57F; + /* 0x580 */ u8 unk_580; UnkStruct_027E0C68_UnkSubClass1(); /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1() override; /* 0x08 */ virtual UNK_TYPE vfunc_08(void) override; // func_0203c2c8 (dtor?) /* 0x0C */ virtual void func_02039228(unk32* param_2, unk32* param_3) override; - /* 0x10 */ virtual void func_02039578(unk8 param_2, unk8 param_3, unk8 param_4, unk32 param_5) override; - /* 0x14 */ virtual UNK_TYPE func_0203e060(void) override; - /* 0x18 */ virtual UNK_TYPE func_0203dcb4(void) override; - /* 0x1C */ virtual UNK_TYPE func_0203b264(void) override; - /* 0x20 */ virtual UNK_TYPE func_0203b310(void) override; + /* 0x10 */ virtual void func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; + /* 0x14 */ virtual void func_0203e060(u8 param_2, u8 param_3) override; + /* 0x18 */ virtual bool func_0203dcb4(unk32 param_2, unk32 param_3) override; + /* 0x1C */ virtual unk32 func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; + /* 0x20 */ virtual unk32 func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; /* 0x24 */ virtual UNK_TYPE func_0203b814(void) override; - /* 0x28 */ virtual void func_0203e0c8(void) override; + /* 0x28 */ virtual bool func_0203e0c8(void) override; /* 0x2C */ virtual void func_02039a5c(void) override; /* 0x30 */ virtual void func_02038ed0(void) override; /* 0x34 */ virtual UNK_TYPE func_02038c34(void) override; - /* 0x38 */ virtual UNK_TYPE func_0203c350(void) override; + /* 0x38 */ virtual bool func_0203c350(void) override; /* 0x3C */ virtual void func_02039ccc(unk32 param_2) override; /* 0x40 */ virtual UNK_TYPE func_02039d74(void) override; /* 0x44 */ virtual void func_0203a3fc(s32 touchLastX, s32 touchLastY) override; @@ -88,9 +204,9 @@ public: /* 0x50 */ virtual void func_0203a7f0(EntryINF1* param_2, int param_3, u8* param_4) override; /* 0x54 */ virtual UNK_TYPE func_0203a988(void) override; /* 0x58 */ virtual void func_0203af1c(void) override; - /* 0x5C */ virtual UNK_TYPE func_0203aea8(void) override; + /* 0x5C */ virtual void func_0203aea8(void) override; /* 0x60 */ virtual UNK_TYPE func_0203b410(void) override; - /* 0x64 */ virtual UNK_TYPE func_0203b5d0(void) override; + /* 0x64 */ virtual void func_0203b5d0(unk32 param_2) override; /* 0x68 */ virtual unk32 func_020393d0(unk32 param_2) override; /* 0x6C */ virtual void func_0203bdcc(unk32* param_2, unk32* param_3) override; /* 0x70 */ virtual void func_020394d8(unk32* param_2, unk32* param_3) override; @@ -99,14 +215,29 @@ public: unk32 func_020337d8(unk32 param_2); void func_02038b28(void); void func_0203e090(void); - void func_0203dc10(unk32 param_2, unk32 param_3, unk32 param_4); void func_0203dcfc(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); + unk32 func_0203a30c(void); + unk32 func_0203905c(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); + unk32 func_0203cb5c(unk8, unk32); + void func_020393a8(unk32 param_2); + void func_0203be08(void); + unk32 func_02032fa4(void); + void func_0203e0f8(void); + + void func_0203dc10(u8 param_2, u8 param_3); + void func_0203dc10(u8 param_2); // not sure it belongs to this class: void func_0203e2ac(unk32* param_2, unk32* param_3); void func_02033190(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); void func_02038b40(void); - void func_0203ec34(u32*); void func_020350ac(u32*); void func_02038b1c(void); + unk32 func_0203951c(void); + unk32 func_0203e284(UnkStruct_0203b264*, unk32, unk32); + void func_0203f020(UnkSubClass1_unk_124*, unk32, unk32); + void func_0203947c(void); + void func_0203fc78(unk32*, unk32*); + void func_02032fcc(unk32, unk32); + void func_020331c4(unk32, unk32); }; diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index c5227eef..98bf35e2 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -1,4 +1,9 @@ #include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "Message/MessageManager.hpp" +#include "Save/AdventureFlags.hpp" + +extern unk32 func_0203c084(void); +extern s32 data_027e0db0; ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_02038c34(UNK_TYPE) { // TODO @@ -19,7 +24,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039228(unk32* param_2, unk32* p // temp = param_3[2]; this->unk_152 = 1; // param_3[0] = param_3[2]; - func_0203e2ac(param_2, param_3); + this->func_0203e2ac(param_2, param_3); } ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_020393d0(unk32 param_2) { @@ -51,8 +56,8 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_020394d8(unk32* param_2, unk32* p *param_3 += this->unk_15A; } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039578(unk8 param_2, unk8 param_3, unk8 param_4, unk32 param_5) { - this->func_0203dc10(1, param_3, param_4); +ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { + this->func_0203dc10(1, param_3); this->func_02033190(param_2, param_3, param_4, param_5); } @@ -79,7 +84,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a328(UNK_TYPE) { this->func_02038b40(); } - this->func_0203ec34(&this->unk_410); + this->unk_410.func_0203ec34(); } ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a3fc(s32 touchLastX, s32 touchLastY) { @@ -94,28 +99,123 @@ ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203a988(UNK_TYPE) { // TODO } -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203aea8(UNK_TYPE) { - // TODO +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203aea8(void) { + if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { + this->unk_1CC = this->unk_1E4; + this->unk_168.func_020352d8(); + } else { + this->unk_1CC = 0; + this->unk_168.func_020352d8(); + this->unk_168.func_020351b8(1, 0, 0, 0); + } } ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203af1c(void) { // TODO } -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b264(UNK_TYPE) { - // TODO +// non-matching (regalloc) +ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { + u16 sVar1; + u32 uVar4; + s32 unaff_r4; + bool bVar5; + + if (this->func_0203951c() == 0) { + return 1; + } + + if (this->unk_580 != 0) { + unaff_r4 = -0xC; + } else { + unaff_r4 = 0; + } + + sVar1 = param_2->mUnk_4[0]; + + if (sVar1 != 0x1A || sVar1 == 0x1A) { + bVar5 = true; + + if (sVar1 == 0x1A) { + uVar4 = (param_2->mUnk_0[3] << 0x10) | ((u16*)param_2->mUnk_0)[2]; + + if (((uVar4 == 0x0001000A || uVar4 == 0x00020000) || uVar4 == 0x00FF0000)) { + bVar5 = false; + } + } + + if (bVar5) { + this->unk_424.func_0203ee80(this->unk_130); + } + } + + return this->func_0203e284(param_2, param_3, param_4 + unaff_r4); } -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b310(UNK_TYPE) { - // TODO +// non-matching +ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { + int iVar1; + u16* psVar3; + + psVar3 = param_3->mUnk_4; + + if (psVar3[0] == 10) { + this->unk_424.func_0203ef78(this->unk_130, psVar3[0], param_4); + this->unk_574++; + + if (this->func_0203a30c() == 0) { + this->unk_153 = 1; + } + } + + if (this->unk_15E == 6) { + return 1; + } + + switch (this->unk_57A) { + case 0: + return this->func_0203905c(param_2, param_3, param_4, param_5); + case 1: + iVar1 = this->func_0203a30c(); + return this->unk_164->func_0203cb5c(param_2, (this->unk_428[this->unk_528[iVar1]] & ~0xFFFF) >> 0x10); + default: + break; + } + + return 0; } ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b410(UNK_TYPE) { // TODO } -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b5d0(UNK_TYPE) { - // TODO +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203b5d0(unk32 param_2) { + unk32 uVar2; + + if ((this->unk_50 == 0 && data_027e0db0 <= 0 && func_0203c084() != 0) || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { + uVar2 = 0x16; + } else { + uVar2 = 0; + } + + this->func_0203f020(this->unk_124, param_2, uVar2); + this->func_0203be08(); + + if (this->func_02032fa4()) { + this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); + } else { + this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); + } + + this->unk_168.func_020351b8(1, 0, 0, 0); + this->unk_1F0.func_020351b8(0, 0, 0, 0); + this->unk_278.func_020351b8(0, 0, 0, 0); + this->func_020393a8(param_2); } ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b814(UNK_TYPE) { @@ -123,30 +223,53 @@ ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b814(UNK_TYPE) { } ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203bdcc(unk32* param_2, unk32* param_3) { - // TODO + this->func_0203947c(); + *param_2 += this->unk_56E; + *param_3 += this->unk_570; } ARM UnkStruct_027E0C68_UnkSubClass1::~UnkStruct_027E0C68_UnkSubClass1() { - this->func_020350ac(&this->unk_388); - this->func_020350ac(&this->unk_300); - this->func_020350ac(&this->unk_278); - this->func_020350ac(&this->unk_1F0); - this->func_020350ac(&this->unk_168); + this->unk_388.func_020350ac(); + this->unk_300.func_020350ac(); + this->unk_278.func_020350ac(); + this->unk_1F0.func_020350ac(); + this->unk_168.func_020350ac(); this->func_02038b1c(); } -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203c350(UNK_TYPE) { - // TODO +ARM bool UnkStruct_027E0C68_UnkSubClass1::func_0203c350(void) { + return true; } -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203dcb4(UNK_TYPE) { - // TODO +// non-matching +ARM bool UnkStruct_027E0C68_UnkSubClass1::func_0203dcb4(unk32 param_2, unk32 param_3) { + unk32 uVar1; + unk32 local_c; + unk32 local_10; + + local_c = param_2; + local_10 = param_3; + + this->func_02032fa4(); + this->func_0203fc78(&local_c, &local_10); + this->func_02032fcc(local_c, local_10); + this->unk_10 = 0; + return true; } -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203e060(UNK_TYPE) { - // TODO +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203e060(u8 param_2, u8 param_3) { + this->func_0203dc10(1, param_3); + this->unk_11E = param_2; + this->unk_118 = -1; + this->func_020331c4(param_2, -1); } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203e0c8(UNK_TYPE) { - // TODO +ARM bool UnkStruct_027E0C68_UnkSubClass1::func_0203e0c8(void) { + if (this->unk_122 != 0) { + this->func_0203e0f8(); + this->func_0203dc10(0); + return true; + } + + return false; } From fb0f8b909e722d5ae6363b29d97f82aeeaf655c6 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sat, 25 Jan 2025 21:47:15 +0100 Subject: [PATCH 21/64] cleanup unk_168 to unk_388 --- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 63 ++++++++++++------- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 4 +- 2 files changed, 42 insertions(+), 25 deletions(-) diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index 33c8c7ef..5c4e61bf 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -29,10 +29,43 @@ typedef struct UnkStruct1 { /* 0x04 */ UnkCallback1 unk_04; } UnkStruct1; // size = 0x8 -class UnkSubClass1_unk_168 { +class UnkSubClass1_UnkownClass1 { public: /* 0x00 */ UnkStruct1* unk_00; - /* 0x04 */ + /* 0x04 */ u32* unk_04; + /* 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 */ unk32 unk_5C; + /* 0x60 */ unk32 unk_60; + /* 0x64 */ unk32 unk_64; + /* 0x68 */ unk32 unk_68; + /* 0x6C */ unk32 unk_6C; + /* 0x70 */ unk32 unk_70; + /* 0x74 */ u32* unk_74; + /* 0x78 */ u32* unk_78; + /* 0x7C */ unk32 unk_7C; + /* 0x80 */ unk32 unk_80; + /* 0x84 */ unk32 unk_84; + /* 0x88 */ void func_020350b4(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5, unk32 param_6); void func_020351b8(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); @@ -130,27 +163,11 @@ public: /* 0x15F */ s8 unk_15F; /* 0x160 */ unk32 unk_160; /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1* unk_164; - /* 0x168 */ UnkSubClass1_unk_168 unk_168; - /* 0x16C */ u32* unk_16C; - /* 0x16C */ u32* unk_170; - /* 0x16C */ u8 unk_174[0x58]; - /* 0x1CC */ u32 unk_1CC; - /* 0x1D0 */ unk32 unk_1D0; - /* 0x1D4 */ unk32 unk_1D4; - /* 0x1D8 */ unk32 unk_1D8; - /* 0x1DC */ u32* unk_1DC; - /* 0x1E0 */ u32* unk_1E0; - /* 0x1E4 */ u32 unk_1E4; - /* 0x1E8 */ unk32 unk_1E8; - /* 0x1EC */ unk32 unk_1EC; - /* 0x1F0 */ UnkSubClass1_unk_168 unk_1F0; - /* 0x1F4 */ u8 unk_1F4[0x84]; - /* 0x278 */ UnkSubClass1_unk_168 unk_278; - /* 0x27C */ u8 unk_27C[0x84]; - /* 0x300 */ UnkSubClass1_unk_168 unk_300; - /* 0x304 */ u8 unk_304[0x84]; - /* 0x388 */ UnkSubClass1_unk_168 unk_388; - /* 0x38C */ u8 unk_38C[0x84]; + /* 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 */ UnkStruct_027E0C68_UnkSubClass1* unk_418; diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index 98bf35e2..7164e86a 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -101,10 +101,10 @@ ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203a988(UNK_TYPE) { ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203aea8(void) { if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { - this->unk_1CC = this->unk_1E4; + this->unk_168.unk_64 = this->unk_168.unk_7C; this->unk_168.func_020352d8(); } else { - this->unk_1CC = 0; + this->unk_168.unk_64 = 0; this->unk_168.func_020352d8(); this->unk_168.func_020351b8(1, 0, 0, 0); } From dae35edc7b4bdce6debfe91f72e1150b35cc2947 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sat, 25 Jan 2025 22:02:41 +0100 Subject: [PATCH 22/64] sorted declarations --- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index 5c4e61bf..20f4b5cd 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -229,32 +229,31 @@ public: /* 0x70 */ virtual void func_020394d8(unk32* param_2, unk32* param_3) override; /* 0x74 */ + unk32 func_02032fa4(void); unk32 func_020337d8(unk32 param_2); void func_02038b28(void); - void func_0203e090(void); - void func_0203dcfc(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); - unk32 func_0203a30c(void); unk32 func_0203905c(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); - unk32 func_0203cb5c(unk8, unk32); void func_020393a8(unk32 param_2); + unk32 func_0203a30c(void); void func_0203be08(void); - unk32 func_02032fa4(void); + unk32 func_0203cb5c(unk8, unk32); + 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); + void func_0203e090(void); void func_0203e0f8(void); - void func_0203dc10(u8 param_2, u8 param_3); - void func_0203dc10(u8 param_2); - // not sure it belongs to this class: - void func_0203e2ac(unk32* param_2, unk32* param_3); + void func_02032fcc(unk32, unk32); void func_02033190(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); - void func_02038b40(void); + void func_020331c4(unk32, unk32); void func_020350ac(u32*); void func_02038b1c(void); + void func_02038b40(void); + void func_0203947c(void); unk32 func_0203951c(void); unk32 func_0203e284(UnkStruct_0203b264*, unk32, unk32); + void func_0203e2ac(unk32* param_2, unk32* param_3); void func_0203f020(UnkSubClass1_unk_124*, unk32, unk32); - void func_0203947c(void); void func_0203fc78(unk32*, unk32*); - void func_02032fcc(unk32, unk32); - void func_020331c4(unk32, unk32); }; From 8250e4aa3a9f8ada1fe76eb7c6d6214b90979cf4 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sun, 26 Jan 2025 00:12:53 +0100 Subject: [PATCH 23/64] more vfuncs progress --- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 9 ++-- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 48 +++++++++++++------ 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index 20f4b5cd..b08e7b7f 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -211,7 +211,7 @@ public: /* 0x28 */ virtual bool func_0203e0c8(void) override; /* 0x2C */ virtual void func_02039a5c(void) override; /* 0x30 */ virtual void func_02038ed0(void) override; - /* 0x34 */ virtual UNK_TYPE func_02038c34(void) override; + /* 0x34 */ virtual unk32 func_02038c34(unk32 param_2) override; /* 0x38 */ virtual bool func_0203c350(void) override; /* 0x3C */ virtual void func_02039ccc(unk32 param_2) override; /* 0x40 */ virtual UNK_TYPE func_02039d74(void) override; @@ -230,8 +230,10 @@ public: /* 0x74 */ unk32 func_02032fa4(void); + unk32 func_02032fb4(void); unk32 func_020337d8(unk32 param_2); void func_02038b28(void); + unk32 func_02038d10(void); unk32 func_0203905c(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); void func_020393a8(unk32 param_2); unk32 func_0203a30c(void); @@ -247,13 +249,12 @@ public: 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_020350ac(u32*); + unk32 func_02038cf4(void); void func_02038b1c(void); void func_02038b40(void); void func_0203947c(void); unk32 func_0203951c(void); unk32 func_0203e284(UnkStruct_0203b264*, unk32, unk32); - void func_0203e2ac(unk32* param_2, unk32* param_3); - void func_0203f020(UnkSubClass1_unk_124*, unk32, unk32); + void func_0203e2ac(unk32* param_2); void func_0203fc78(unk32*, unk32*); }; diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index 7164e86a..c221ecbe 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -2,11 +2,34 @@ #include "Message/MessageManager.hpp" #include "Save/AdventureFlags.hpp" +extern u32 func_01ff9b4c(unk32, unk32); extern unk32 func_0203c084(void); -extern s32 data_027e0db0; -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_02038c34(UNK_TYPE) { - // TODO +struct Struct_027e0db0 { + /* 0x00 */ unk32 unk_00; + /* 0x04 */ unk32 unk_04; +}; +extern Struct_027e0db0 data_027e0db0; + +ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_02038c34(unk32 param_2) { + unk32 iVar1; + unk32 iVar2; + unk32 iVar3; + unk32 uVar4; + + iVar2 = this->func_02038cf4(); + iVar3 = this->func_02038d10(); + iVar1 = ((this->unk_15A - (this->unk_18 << 3) / 2) << 0x10) >> 0x10; + + if ((param_2 < iVar2 + iVar1) || (iVar2 + iVar3 + iVar1 <= param_2)) { + return -1; + } + + iVar3 = this->unk_34; + uVar4 = this->func_02032fb4(); + iVar2 = (param_2 - iVar1) - iVar2; + + return func_01ff9b4c(iVar2 + iVar3 / 2, uVar4); } ARM void UnkStruct_027E0C68_UnkSubClass1::func_02038ed0(void) { @@ -19,12 +42,9 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_02038ed0(void) { // non-matching ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039228(unk32* param_2, unk32* param_3) { - int temp; this->unk_15C = 10; - // temp = param_3[2]; this->unk_152 = 1; - // param_3[0] = param_3[2]; - this->func_0203e2ac(param_2, param_3); + this->func_0203e2ac(param_3); } ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_020393d0(unk32 param_2) { @@ -47,7 +67,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_020393d0(unk32 param_2) { break; } - return (this->unk_18 * 8 - this->func_020337d8(param_2)) / 2; + return ((this->unk_18 << 3) - this->func_020337d8(param_2)) / 2; } ARM void UnkStruct_027E0C68_UnkSubClass1::func_020394d8(unk32* param_2, unk32* param_3) { @@ -78,8 +98,8 @@ ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_02039d74(UNK_TYPE) { // TODO } -// non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a328(UNK_TYPE) { +// non-matching (regalloc) +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a328(void) { if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { this->func_02038b40(); } @@ -177,7 +197,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_0203b310(unk8 param_2, UnkStruct return this->func_0203905c(param_2, param_3, param_4, param_5); case 1: iVar1 = this->func_0203a30c(); - return this->unk_164->func_0203cb5c(param_2, (this->unk_428[this->unk_528[iVar1]] & ~0xFFFF) >> 0x10); + return this->unk_164->func_0203cb5c(param_2, ((this->unk_428[this->unk_528[iVar1]] & ~0xFFFF)) >> 0x10); default: break; } @@ -189,17 +209,17 @@ ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b410(UNK_TYPE) { // TODO } -// non-matching +// non-matching (regalloc) ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203b5d0(unk32 param_2) { unk32 uVar2; - if ((this->unk_50 == 0 && data_027e0db0 <= 0 && func_0203c084() != 0) || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { + if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { uVar2 = 0x16; } else { uVar2 = 0; } - this->func_0203f020(this->unk_124, param_2, uVar2); + this->unk_124->func_0203f020(param_2, uVar2); this->func_0203be08(); if (this->func_02032fa4()) { From 6dd1cac92c43b179c28e9db745f681b052be6b5e Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sun, 26 Jan 2025 03:36:11 +0100 Subject: [PATCH 24/64] more vfuncs progress --- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 75 ++++++++++-- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 109 +++++++++++++++++- 2 files changed, 172 insertions(+), 12 deletions(-) diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index b08e7b7f..60320873 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -67,10 +67,11 @@ public: /* 0x84 */ unk32 unk_84; /* 0x88 */ + void func_020350ac(void); 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); - void func_020350ac(void); }; class UnkSubClass1_unk_410 { @@ -79,6 +80,7 @@ public: /* 0x04 */ void func_0203ec34(void); + void func_0203ebf8(void); }; class UnkSubClass1_unk_424 { @@ -88,21 +90,66 @@ public: void func_0203ee80(unk32); void func_0203ef78(unk16, u16, unk8); + void func_0203ef78(unk16); // overload? }; class UnkSubClass1_unk_124 { public: /* 0x00 */ unk32 unk_00; + /* 0x00 */ unk32 unk_04; + /* 0x00 */ unk32 unk_08; + /* 0x00 */ unk32 unk_0C; + /* 0x00 */ unk32 unk_10; + /* 0x00 */ unk32 unk_14; + /* 0x00 */ unk32 unk_18; + /* 0x00 */ unk32 unk_1C; + /* 0x00 */ unk32 unk_20; + /* 0x00 */ unk32 unk_24; + /* 0x00 */ unk8 unk_28; + /* 0x00 */ unk8 unk_29; + /* 0x00 */ unk8 unk_2A; + /* 0x00 */ unk8 unk_2B; + /* 0x00 */ unk32 unk_2C; /* 0x04 */ void func_0203f020(unk32, 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 */ +}; + class UnkStruct_027E0C68_UnkSubClass1 : public SysObject { public: /* 0x000 (vtable) */ /* 0x004 */ unk32* unk_04; - /* 0x008 */ unk32* unk_08; + /* 0x008 */ UnkSubClass1_02256FF8* unk_08; /* 0x00C */ unk32* unk_0C; /* 0x010 */ unk32* unk_10; /* 0x014 */ unk32 unk_14; @@ -140,8 +187,8 @@ public: /* 0x122 */ u8 unk_122; /* 0x122 */ u8 unk_123; /* 0x124 */ UnkSubClass1_unk_124* unk_124; - /* 0x128 */ unk32 unk_128; - /* 0x12C */ unk32 unk_12C; + /* 0x128 */ UnkStruct1* unk_128; + /* 0x12C */ u16* unk_12C; // pointer to the current position in the message to display /* 0x130 */ unk16 unk_130; /* 0x132 */ unk16 unk_132; /* 0x134 */ unk32 unk_134; @@ -152,7 +199,7 @@ public: /* 0x148 */ unk32 unk_148; /* 0x14C */ unk32 unk_14C; /* 0x150 */ unk8 unk_150; - /* 0x151 */ unk8 unk_151; + /* 0x151 */ u8 unk_151; /* 0x152 */ unk8 unk_152; /* 0x153 */ unk8 unk_153; /* 0x154 */ UnkSubClass1_unk_154* unk_154; @@ -184,7 +231,7 @@ public: /* 0x56C */ unk16 unk_56C; /* 0x56E */ unk16 unk_56E; /* 0x570 */ unk16 unk_570; - /* 0x572 */ unk16 unk_572; + /* 0x572 */ u16 unk_572; /* 0x574 */ s16 unk_574; /* 0x576 */ u8 unk_576; /* 0x577 */ u8 unk_577; @@ -197,6 +244,12 @@ public: /* 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; UnkStruct_027E0C68_UnkSubClass1(); /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1() override; @@ -214,7 +267,7 @@ public: /* 0x34 */ virtual unk32 func_02038c34(unk32 param_2) override; /* 0x38 */ virtual bool func_0203c350(void) override; /* 0x3C */ virtual void func_02039ccc(unk32 param_2) override; - /* 0x40 */ virtual UNK_TYPE func_02039d74(void) override; + /* 0x40 */ virtual void func_02039d74(unk32 param_2, unk32 param_3) override; /* 0x44 */ virtual void func_0203a3fc(s32 touchLastX, s32 touchLastY) override; /* 0x48 */ virtual void func_0203a328(void) override; /* 0x4C */ virtual void func_02039a3c(void) override; @@ -234,14 +287,22 @@ public: unk32 func_020337d8(unk32 param_2); void func_02038b28(void); unk32 func_02038d10(void); + void func_02038d20(void); unk32 func_0203905c(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); void func_020393a8(unk32 param_2); + unk32 func_0203a2c0(void); unk32 func_0203a30c(void); + void func_0203a35c(void); + unk32 func_0203a3e0(void); + void func_0203b0ec(unk32 param_2); + void func_0203bd8c(u16 param_2); void func_0203be08(void); + void func_0203be64(void); unk32 func_0203cb5c(unk8, unk32); 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); diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index c221ecbe..5827ae39 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -4,6 +4,8 @@ extern u32 func_01ff9b4c(unk32, unk32); extern unk32 func_0203c084(void); +extern void func_ov018_02169634(UnkStruct_027E0C68_UnkSubClass1*); +extern unk32 func_ov000_02079e04(void); struct Struct_027e0db0 { /* 0x00 */ unk32 unk_00; @@ -11,6 +13,16 @@ struct Struct_027e0db0 { }; extern Struct_027e0db0 data_027e0db0; +// see Actor.cpp +struct UnkStruct2 { + /* 0 */ u32 mUnk_0; + /* 4 */ u32 mUnk_4; + /* 8 */ +}; +extern UnkStruct2 data_027e077c; +extern u8 data_02056be4[]; +extern u8 data_027e0618[]; + ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_02038c34(unk32 param_2) { unk32 iVar1; unk32 iVar2; @@ -86,15 +98,102 @@ THUMB void UnkStruct_027E0C68_UnkSubClass1::func_02039a3c(void) { this->func_0203dcfc(this->unk_50, 0, 0, 2); } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039a5c(UNK_TYPE) { - // TODO +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039a5c(void) { + if (data_027e0618[0x101] != 0) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { + return; + } + } + + this->func_02038d20(); + + if (this->unk_56C > 0) { + this->unk_56C--; + } + + if (this->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { + this->unk_57F = 0; + } + + if (this->unk_15C > 0) { + if ((this->unk_12C == NULL || this->unk_12C[0] == 0) != 0) { + this->unk_424.func_0203ef78(this->unk_130); + } + + this->func_0203be64(); + this->func_0203a35c(); + + if (this->unk_580 != 0) { + this->unk_168.func_0203516c(); + } + + if (this->unk_584 != 0) { + this->unk_300.func_0203516c(); + } + + if (this->unk_585 != 0) { + this->unk_388.func_0203516c(); + } + + if ((this->func_0203a2c0() != 0 && this->unk_57F == 0) && this->unk_56C <= 0) { + this->unk_1F0.func_0203516c(); + } + + if (this->unk_08 != NULL) { + bool value = this->unk_08->unk_1C; + + if ((value == 1) || (value == 2)) { + this->unk_278.func_0203516c(); + } + } + + if (this->unk_15E == 6) { + func_ov018_02169634(this); + } else { + this->unk_410.func_0203ebf8(); + } + } + + if (this->unk_15C == 1) { + if (this->unk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) { + switch (this->unk_151) { + case 0: + this->func_0203b0ec(1); + break; + case 2: + case 3: + if (this->func_0203a3e0() != 0) { + this->func_0203bd8c(this->unk_572); + } else { + this->func_0203b0ec(1); + } + break; + } + } + } } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039ccc(unk32 param_2) { - // TODO +ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039ccc(unk32 param_2) { + if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { + if (this->unk_124->unk_29 != 3) { + if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { + return; + } + + if (data_027e0618[0x101] != 0) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { + return; + } + } + + this->func_02039d74(0, 0); + } + } + } -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_02039d74(UNK_TYPE) { +ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039d74(unk32 param_2, unk32 param_3) { // TODO } From 1af423e8ae2dd22a8dd77e23d5ae26c69dc343bc Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sun, 26 Jan 2025 14:19:50 +0100 Subject: [PATCH 25/64] update symbols --- config/eur/arm9/symbols.txt | 44 +++++++++---------- config/usa/arm9/symbols.txt | 44 +++++++++---------- include/Message/MessageManager.hpp | 7 +-- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 2 +- src/Main/Message/MessageManager.cpp | 23 ++++------ 5 files changed, 58 insertions(+), 62 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 2fdf257f..95119be6 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1818,8 +1818,8 @@ _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x20 _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f68 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x20370d0 _ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370e8 -_ZN18UnkStruct_027E0C6813func_02037158EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x20) addr:0x2037158 -_ZN18UnkStruct_027E0C6813func_02037178EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x38) addr:0x2037178 +_ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037158 +_ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037178 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x20371b0 _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 @@ -1881,7 +1881,7 @@ func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 _Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x34) addr:0x2038b40 func_02038b74 kind:function(arm,size=0x4) addr:0x2038b74 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b78 -func_02038c34 kind:function(arm,size=0x84) addr:0x2038c34 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02038c34Ei kind:function(arm,size=0x84) addr:0x2038c34 func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038cb8 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cf4 func_02038d10 kind:function(arm,size=0x10) addr:0x2038d10 @@ -1907,36 +1907,36 @@ _ZN31UnkStruct_027E0C68_UnkSubClass113func_020394d8EPiS0_ kind:function(arm,size func_0203951c kind:function(arm,size=0x40) addr:0x203951c func_0203955c kind:function(arm,size=0x14) addr:0x203955c func_02039570 kind:function(arm,size=0x8) addr:0x2039570 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039578Eccci kind:function(arm,size=0x3c) addr:0x2039578 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039578 func_020395b4 kind:function(thumb,size=0x244) addr:0x20395b4 func_020397f8 kind:function(thumb,size=0x244) addr:0x20397f8 _ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c -func_02039a5c kind:function(arm,size=0x24c) addr:0x2039a5c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a5c func_02039ca8 kind:function(arm,size=0x24) addr:0x2039ca8 -func_02039ccc kind:function(arm,size=0xa8) addr:0x2039ccc -func_02039d74 kind:function(arm,size=0x414) addr:0x2039d74 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039ccc +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039d74Eii kind:function(arm,size=0x414) addr:0x2039d74 func_0203a188 kind:function(arm,size=0x138) addr:0x203a188 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a2c0 func_0203a30c kind:function(arm,size=0x1c) addr:0x203a30c _ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a328 func_0203a35c kind:function(arm,size=0x84) addr:0x203a35c func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a3e0 -func_0203a3fc kind:function(arm,size=0x2d4) addr:0x203a3fc +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3fc func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a6d0 -func_0203a7f0 kind:function(arm,size=0x198) addr:0x203a7f0 -func_0203a988 kind:function(arm,size=0x520) addr:0x203a988 -func_0203aea8 kind:function(arm,size=0x74) addr:0x203aea8 -func_0203af1c kind:function(arm,size=0x1a0) addr:0x203af1c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7f0 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a988 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203aea8 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203af1cEv kind:function(arm,size=0x1a0) addr:0x203af1c func_0203b0bc kind:function(arm,size=0x30) addr:0x203b0bc func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0ec -func_0203b264 kind:function(arm,size=0xac) addr:0x203b264 -func_0203b310 kind:function(arm,size=0x100) addr:0x203b310 -func_0203b410 kind:function(arm,size=0x1c0) addr:0x203b410 -func_0203b5d0 kind:function(arm,size=0x194) addr:0x203b5d0 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b410 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b5d0 func_0203b764 kind:function(arm,size=0xb0) addr:0x203b764 -func_0203b814 kind:function(arm,size=0x578) addr:0x203b814 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b814 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd8c -func_0203bdcc kind:function(arm,size=0x3c) addr:0x203bdcc +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203bdccEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc func_0203be08 kind:function(arm,size=0x5c) addr:0x203be08 func_0203be64 kind:function(arm,size=0x220) addr:0x203be64 func_0203c084 kind:function(arm,size=0xb8) addr:0x203c084 @@ -1945,7 +1945,7 @@ func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c1a0 func_0203c25c kind:function(arm,size=0x6c) addr:0x203c25c _ZN31UnkStruct_027E0C68_UnkSubClass1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 _ZN31UnkStruct_027E0C68_UnkSubClass1D1Ev kind:function(arm,size=0x40) addr:0x203c310 -func_0203c350 kind:function(arm,size=0x8) addr:0x203c350 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c350 func_0203c358 kind:function(thumb,size=0x44) addr:0x203c358 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c39c func_0203c414 kind:function(arm,size=0x4c) addr:0x203c414 @@ -2030,16 +2030,16 @@ func_0203dba8 kind:function(thumb,size=0x38) addr:0x203dba8 func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203dbe0 func_0203dc10 kind:function(arm,size=0x64) addr:0x203dc10 func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc74 -func_0203dcb4 kind:function(arm,size=0x48) addr:0x203dcb4 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203dcb4Eii kind:function(arm,size=0x48) addr:0x203dcb4 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcfc func_0203ddec kind:function(arm,size=0x10) addr:0x203ddec func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddfc _Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1i kind:function(arm,size=0x10) addr:0x203de14 func_0203de24 kind:function(arm,size=0x34) addr:0x203de24 func_0203de58 kind:function(arm,size=0x208) addr:0x203de58 -func_0203e060 kind:function(arm,size=0x30) addr:0x203e060 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 func_0203e090 kind:function(arm,size=0x38) addr:0x203e090 -func_0203e0c8 kind:function(arm,size=0x30) addr:0x203e0c8 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e0c8Ev kind:function(arm,size=0x30) addr:0x203e0c8 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0f8 func_0203e19c kind:function(arm,size=0x14) addr:0x203e19c func_0203e1b0 kind:function(arm,size=0xd4) addr:0x203e1b0 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 4413339c..f96bbfbb 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1818,8 +1818,8 @@ _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x20 _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f24 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x203708c _ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370a4 -_ZN18UnkStruct_027E0C6813func_02037158EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x20) addr:0x2037114 -_ZN18UnkStruct_027E0C6813func_02037178EP31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x38) addr:0x2037134 +_ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037114 +_ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037134 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x203716c _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 @@ -1881,7 +1881,7 @@ func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0 _Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x34) addr:0x2038afc func_02038b74 kind:function(arm,size=0x4) addr:0x2038b30 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b34 -func_02038c34 kind:function(arm,size=0x84) addr:0x2038bf0 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02038c34Ei kind:function(arm,size=0x84) addr:0x2038bf0 func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038c74 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cb0 func_02038d10 kind:function(arm,size=0x10) addr:0x2038ccc @@ -1907,36 +1907,36 @@ _ZN31UnkStruct_027E0C68_UnkSubClass113func_020394d8EPiS0_ kind:function(arm,size func_0203951c kind:function(arm,size=0x40) addr:0x20394d8 func_0203955c kind:function(arm,size=0x14) addr:0x2039518 func_02039570 kind:function(arm,size=0x8) addr:0x203952c -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039578Eccci kind:function(arm,size=0x3c) addr:0x2039534 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039534 func_020395b4 kind:function(thumb,size=0x244) addr:0x2039570 func_020397f8 kind:function(thumb,size=0x244) addr:0x20397b4 _ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 -func_02039a5c kind:function(arm,size=0x24c) addr:0x2039a18 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a18 func_02039ca8 kind:function(arm,size=0x24) addr:0x2039c64 -func_02039ccc kind:function(arm,size=0xa8) addr:0x2039c88 -func_02039d74 kind:function(arm,size=0x414) addr:0x2039d30 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039c88 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039d74Eii kind:function(arm,size=0x414) addr:0x2039d30 func_0203a188 kind:function(arm,size=0x138) addr:0x203a144 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a27c func_0203a30c kind:function(arm,size=0x1c) addr:0x203a2c8 _ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a2e4 func_0203a35c kind:function(arm,size=0x84) addr:0x203a318 func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a39c -func_0203a3fc kind:function(arm,size=0x2d4) addr:0x203a3b8 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3b8 func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a68c -func_0203a7f0 kind:function(arm,size=0x198) addr:0x203a7ac -func_0203a988 kind:function(arm,size=0x520) addr:0x203a944 -func_0203aea8 kind:function(arm,size=0x74) addr:0x203ae64 -func_0203af1c kind:function(arm,size=0x1a0) addr:0x203aed8 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7ac +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a944 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203ae64 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203af1cEv kind:function(arm,size=0x1a0) addr:0x203aed8 func_0203b0bc kind:function(arm,size=0x30) addr:0x203b078 func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0a8 -func_0203b264 kind:function(arm,size=0xac) addr:0x203b220 -func_0203b310 kind:function(arm,size=0x100) addr:0x203b2cc -func_0203b410 kind:function(arm,size=0x1c0) addr:0x203b3cc -func_0203b5d0 kind:function(arm,size=0x194) addr:0x203b58c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b3cc +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b58c func_0203b764 kind:function(arm,size=0xb0) addr:0x203b720 -func_0203b814 kind:function(arm,size=0x578) addr:0x203b7d0 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b7d0 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd48 -func_0203bdcc kind:function(arm,size=0x3c) addr:0x203bd88 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203bdccEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88 func_0203be08 kind:function(arm,size=0x5c) addr:0x203bdc4 func_0203be64 kind:function(arm,size=0x220) addr:0x203be20 func_0203c084 kind:function(arm,size=0xb8) addr:0x203c040 @@ -1945,7 +1945,7 @@ func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c15c func_0203c25c kind:function(arm,size=0x6c) addr:0x203c218 _ZN31UnkStruct_027E0C68_UnkSubClass1D0Ev kind:function(arm,size=0x48) addr:0x203c284 _ZN31UnkStruct_027E0C68_UnkSubClass1D1Ev kind:function(arm,size=0x40) addr:0x203c2cc -func_0203c350 kind:function(arm,size=0x8) addr:0x203c30c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c30c func_0203c358 kind:function(thumb,size=0x44) addr:0x203c314 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c358 func_0203c414 kind:function(arm,size=0x4c) addr:0x203c3d0 @@ -2030,16 +2030,16 @@ func_0203dba8 kind:function(thumb,size=0x38) addr:0x203db64 func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203db9c func_0203dc10 kind:function(arm,size=0x64) addr:0x203dbcc func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc30 -func_0203dcb4 kind:function(arm,size=0x48) addr:0x203dc70 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203dcb4Eii kind:function(arm,size=0x48) addr:0x203dc70 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcb8 func_0203ddec kind:function(arm,size=0x10) addr:0x203dda8 func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddb8 _Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1i kind:function(arm,size=0x10) addr:0x203ddd0 func_0203de24 kind:function(arm,size=0x34) addr:0x203dde0 func_0203de58 kind:function(arm,size=0x208) addr:0x203de14 -func_0203e060 kind:function(arm,size=0x30) addr:0x203e01c +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c func_0203e090 kind:function(arm,size=0x38) addr:0x203e04c -func_0203e0c8 kind:function(arm,size=0x30) addr:0x203e084 +_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e0c8Ev kind:function(arm,size=0x30) addr:0x203e084 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0b4 func_0203e19c kind:function(arm,size=0x14) addr:0x203e158 func_0203e1b0 kind:function(arm,size=0xd4) addr:0x203e16c diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 2ab2dcc8..8f70ce23 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -34,13 +34,14 @@ public: /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1* param_2) override; /* 0x10 */ virtual void vfunc_10(void) override; /* 0x14 */ virtual UNK_TYPE vfunc_14(void) override; + /* 0x18 */ virtual UNK_TYPE vfunc_18(void) override; /* 0x1C */ virtual UNK_TYPE vfunc_1C(void) override; /* 0x20 */ virtual UNK_TYPE vfunc_20(void) override; /* 0x24 */ virtual UNK_TYPE vfunc_24(void) override; /* 0x28 */ virtual UNK_TYPE vfunc_28(void) override; /* 0x2C */ virtual UNK_TYPE vfunc_2C(void) override; /* 0x30 */ virtual UNK_TYPE vfunc_30(void) override; - /* 0x34 */ virtual UNK_TYPE vfunc_34(void) override; + /* 0x34 */ }; class UnkStruct_027E0C68_UnkSubClass3 : public SysObject { @@ -119,8 +120,8 @@ public: UnkStruct_027E0C68_UnkSubClass1* func_02036f68(u32 param_2, u8* param_3); UnkStruct_027E0C68_UnkSubClass2* func_020370d0(unk32 param_2, unk32 param_3); UnkStruct_027E0C68_UnkSubClass2* func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); - void func_02037158(UnkStruct_027E0C68_UnkSubClass1* param_2); - UnkStruct_027E0C68_UnkSubClass1* func_02037178(UnkStruct_027E0C68_UnkSubClass1* param_2); + void func_02037158(UnkSubClass1_02256FF8* param_2); + UnkStruct_027E0C68_UnkSubClass1* func_02037178(UnkSubClass1_02256FF8* param_2); }; extern UnkStruct_027E0C68 data_027e0c68; diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index 60320873..61c057f0 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -286,6 +286,7 @@ public: unk32 func_02032fb4(void); unk32 func_020337d8(unk32 param_2); void func_02038b28(void); + void func_02038b40(void); unk32 func_02038d10(void); void func_02038d20(void); unk32 func_0203905c(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); @@ -312,7 +313,6 @@ public: void func_020331c4(unk32, unk32); unk32 func_02038cf4(void); void func_02038b1c(void); - void func_02038b40(void); void func_0203947c(void); unk32 func_0203951c(void); unk32 func_0203e284(UnkStruct_0203b264*, unk32, unk32); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 8a1255bc..8e61f134 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -6,8 +6,6 @@ extern ARM unk32 func_ov000_020d7f18(u32*, unk32); extern ARM unk32 func_ov000_020d77e4(u32*, unk32); extern ARM unk32 func_02037628(u8*); extern THUMB unk32 func_0202ab48(void); -extern ARM void func_02038b40(UnkStruct_027E0C68_UnkSubClass1*); -extern ARM unk32 func_0203de14(UnkStruct_027E0C68_UnkSubClass1*, unk32); extern ARM void func_0203dc74(UnkStruct_027E0C68_UnkSubClass1*, unk32, unk32); // see Actor.cpp @@ -329,7 +327,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p this->unk_04 = 1; //! TODO: fake? - pSVar4 = this->func_02037178((UnkStruct_027E0C68_UnkSubClass1*)this->unk_18[0]); + pSVar4 = this->func_02037178((UnkSubClass1_02256FF8*)this->unk_18[0]); if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { this->unk_04 = 0; @@ -380,7 +378,7 @@ ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - if (this->unk_28[i] != NULL && func_0203de14(this->unk_28[i], param_2) != 0) { + if (this->unk_28[i] != NULL && this->unk_28[i]->func_0203de14(param_2) != 0) { this->unk_28[i]->func_0203e0c8(); } } @@ -438,7 +436,7 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { if (func_0202ab48() == 0 || i != 5) { - func_02038b40(this->unk_28[i]); + this->unk_28[i]->func_02038b40(); } } } @@ -578,7 +576,7 @@ ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370e8(unk32 par return NULL; } -ARM void UnkStruct_027E0C68::func_02037158(UnkStruct_027E0C68_UnkSubClass1* param_2) { +ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { UnkStruct_027E0C68_UnkSubClass1* pSVar1; pSVar1 = this->func_02037178(param_2); @@ -588,15 +586,12 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkStruct_027E0C68_UnkSubClass1* para } } -ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02037178(UnkStruct_027E0C68_UnkSubClass1* param_2) { - UnkStruct_027E0C68_UnkSubClass1* piVar1; - s32 iVar2; +ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) { + s32 i; - for (iVar2 = 0; iVar2 < ARRAY_LEN(this->unk_28); iVar2++) { - piVar1 = this->unk_28[iVar2]; - - if (piVar1 != NULL && piVar1->unk_08 == (unk32*)param_2) { - return piVar1; + for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + if (this->unk_28[i] != NULL && this->unk_28[i]->unk_08 == param_2) { + return this->unk_28[i]; } } From 2107619c79f2044cc3efff596e6d032f0d5ad99e Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sun, 26 Jan 2025 16:42:09 +0100 Subject: [PATCH 26/64] more vfuncs progress --- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 17 +- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 146 +++++++++++++++++- 2 files changed, 155 insertions(+), 8 deletions(-) diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index 61c057f0..c8ea6cc9 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -67,6 +67,8 @@ public: /* 0x84 */ unk32 unk_84; /* 0x88 */ + 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_020350ac(void); void func_020350b4(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5, unk32 param_6); void func_0203516c(void); @@ -153,7 +155,10 @@ public: /* 0x00C */ unk32* unk_0C; /* 0x010 */ unk32* unk_10; /* 0x014 */ unk32 unk_14; - /* 0x018 */ unk32 unk_18; + /* 0x018 */ u8 unk_18; + /* 0x018 */ u8 unk_19; + /* 0x018 */ u8 unk_1A; + /* 0x018 */ u8 unk_1B; /* 0x01C */ unk32 unk_1C; /* 0x020 */ unk32 unk_20; /* 0x024 */ unk32* unk_24; @@ -226,7 +231,10 @@ public: /* 0x430 */ unk32 unk_430; /* 0x434 */ u8 unk_434[0xF4]; /* 0x528 */ s16* unk_528; - /* 0x52C */ u8 unk_52C[0x3C]; + /* 0x52C */ u8 unk_52C[0x30]; + /* 0x55C */ unk32 unk_55C; + /* 0x560 */ unk32 unk_560; + /* 0x564 */ unk32 unk_564; /* 0x568 */ unk32 unk_568; /* 0x56C */ unk16 unk_56C; /* 0x56E */ unk16 unk_56E; @@ -299,7 +307,7 @@ public: void func_0203bd8c(u16 param_2); void func_0203be08(void); void func_0203be64(void); - unk32 func_0203cb5c(unk8, unk32); + 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); @@ -307,6 +315,9 @@ public: void func_0203e090(void); void func_0203e0f8(void); + void func_0203a188(unk32, unk32); + void func_0203e1b0(unk32, 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); diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index 5827ae39..4603346d 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -21,17 +21,51 @@ struct UnkStruct2 { }; extern UnkStruct2 data_027e077c; extern u8 data_02056be4[]; -extern u8 data_027e0618[]; +extern unk32 data_027e0618[]; + +class UnkClass_027e0cbc { +public: + unk32 func_0203d7e0(unk32); +}; +extern UnkClass_027e0cbc data_027e0cbc; +extern unk16 data_02056a10[]; +extern unk16 data_02056a16[]; +extern unk32 data_02056a04[]; +extern unk32 data_027e0c38[]; +extern "C" void func_0203489c(unk32, unk16, unk32*, unk32*); +extern "C" void func_020347b0(unk32, unk16, unk32*, unk32*, unk32, unk32); +extern THUMB unk32 func_0202ab48(void); +extern "C" void func_02034984(unk32, unk32, unk32, unk32, unk32); +extern "C" void func_02034698(unk32, unk32, unk32*, unk32*); + +// see Actor.cpp +typedef struct UnkStruct_01ffbe34 { + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk8 mUnk_08; + /* 09 */ unk8 mUnk_09; + /* 0a */ unk8 mUnk_0a; + /* 0b */ unk8 mUnk_0b; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk8 mUnk_14; + /* 15 */ unk8 mUnk_15; + /* 16 */ unk16 mUnk_16; + /* 18 */ unk32 mUnk_18; + /* 1c */ unk32 mUnk_1c; + /* 20 */ +} UnkStruct_01ffbe34; +extern "C" void func_01ffbe34(UnkStruct_01ffbe34 *param1); ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_02038c34(unk32 param_2) { - unk32 iVar1; + s16 iVar1; unk32 iVar2; unk32 iVar3; unk32 uVar4; iVar2 = this->func_02038cf4(); iVar3 = this->func_02038d10(); - iVar1 = ((this->unk_15A - (this->unk_18 << 3) / 2) << 0x10) >> 0x10; + iVar1 = ((this->unk_15A - (this->unk_18 << 3) / 2)); if ((param_2 < iVar2 + iVar1) || (iVar2 + iVar3 + iVar1 <= param_2)) { return -1; @@ -193,8 +227,110 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039ccc(unk32 param_2) { } +// non-matching ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039d74(unk32 param_2, unk32 param_3) { - // TODO + UnkStruct_027E0C68_UnkSubClass1* bVar1; + s8 cVar2; + unk32 iVar4; + unk32 iVar6; + unk32 iVar7; + unk32 iVar8; + unk32 uVar9; + unk32 iStack_a8; + unk32 iStack_a4; + unk32 local_a0; + unk32 local_9c; + unk32 local_98; + unk32 local_94; + unk32 local_90; + unk32 local_8c; + unk32 iVar5; + UnkStruct_01ffbe34 aStack_88; + UnkStruct_01ffbe34 aStack_68; + UnkStruct_01ffbe34 aStack_48; + + local_8c = 0; + local_90 = 0; + bVar1 = data_027e0c68.unk_28[this->unk_50]; + + this->func_0203bdcc(&local_8c, &local_90); + this->func_0203a188(local_8c + param_2, local_90 + param_3); + this->func_0203e1b0(param_2 + local_8c + (this->unk_158 - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_15A - (this->unk_18 << 3) / 2), 0); + + if (this->unk_584 != 0) { + iVar5 = this->unk_18 << 3; + + if (this->unk_580 != 0) { + iVar5 = -0xC; + } else { + iVar5 = 0; + } + + this->unk_300.func_02034a1c(param_2 + local_8c + this->unk_55C + (this->unk_158 - (this->unk_14 << 3) / 2), + iVar5 + param_3 + local_90 + this->unk_560 + ((this->unk_15A - (iVar5 / 2))), 0); + } + + if (this->unk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { + switch (data_027e0618[0]) { + case 2: + if (data_027e0cbc.func_0203d7e0(3) != 0) { + this->unk_388.func_02034b0c(0xBE, 0, 0, 0, 0); + } + break; + case 6: + if (data_027e0cbc.func_0203d7e0(0x58) != 0) { + this->unk_388.func_02034b0c(0x013B, 0, 0, 0, 0); + } + break; + } + } + + iVar5 = this->func_02032fa4(); + iVar8 = bVar1->unk_18; + uVar9 = data_02056a04[iVar8]; + func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); + iVar6 = this->unk_158 - local_94; + iVar7 = this->unk_15A - local_98; + + if ((this->unk_15E != 7) && (this->func_0203a2c0() != 0)) { + func_01ffbe34(&aStack_48); + func_020347b0(uVar9, data_02056a10[iVar8], &local_9c, &local_a0, 4, 4); + local_9c += param_2 + local_8c + iVar6; + local_a0 += param_3 + local_90 + iVar7; + + if (data_027e0c38[5] == 1) { + iVar8 = func_0202ab48(); + + if (iVar8 == 0) { + iVar8 = 0; + } else { + iVar8 = -3; + } + + local_9c = (0x108 - local_9c) + iVar8; + } + + if ((this->unk_57F == 0) && (this->unk_56C <= 0)) { + func_01ffbe34(&aStack_68); + aStack_68.mUnk_0a = 1; + this->unk_1F0.func_02034a1c(local_9c, local_a0, &aStack_68); + } else { + func_02034984(iVar5 != 0 ? 0x11F : 0x18, 0, local_9c, local_a0 + 2, 0); + } + } + + if (this->unk_08 != 0) { + if ((this->unk_08->unk_1C == 1 || this->unk_08->unk_1C == 2) == 0) { + return; + } + + func_01ffbe34(&aStack_88); + aStack_88.mUnk_0a = 1; + func_02034698(iVar5 != 0 ? 0x11F : 0x18, 2, &iStack_a4, &iStack_a8); + iStack_a4 += param_2 + local_8c + iVar6; + iStack_a8 += param_3 + local_90 + iVar7; + this->unk_278.func_02034a1c(iStack_a4, iStack_a8, &aStack_88); + } } // non-matching (regalloc) @@ -296,7 +432,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_0203b310(unk8 param_2, UnkStruct return this->func_0203905c(param_2, param_3, param_4, param_5); case 1: iVar1 = this->func_0203a30c(); - return this->unk_164->func_0203cb5c(param_2, ((this->unk_428[this->unk_528[iVar1]] & ~0xFFFF)) >> 0x10); + return this->unk_164->func_0203cb5c(param_2, ((this->unk_428[this->unk_528[iVar1]] & ~0xFFFF))); default: break; } From 1518fbfa8042ab241dc037f77739594bc11a964e Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sun, 26 Jan 2025 23:54:14 +0100 Subject: [PATCH 27/64] more vfuncs progress --- include/DTCM/UnkStruct_027e103c.hpp | 12 + include/Item/ItemManager.hpp | 3 + include/Message/MessageManager.hpp | 2 +- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 23 +- src/00_Core/Item/ItemManager.cpp | 1 - src/Main/Message/MessageManager.cpp | 21 +- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 413 +++++++++++++++++- 7 files changed, 449 insertions(+), 26 deletions(-) diff --git a/include/DTCM/UnkStruct_027e103c.hpp b/include/DTCM/UnkStruct_027e103c.hpp index c95f759a..f4a51c4a 100644 --- a/include/DTCM/UnkStruct_027e103c.hpp +++ b/include/DTCM/UnkStruct_027e103c.hpp @@ -18,6 +18,18 @@ struct UnkStruct_027e103c { /* 24 */ u8 mUnk_24; /* 25 */ unk8 mUnk_25[7]; /* 2c */ + + void func_ov000_020cf284(unk32, unk32); + + unk32 func_ov000_020cf4bc(void); + unk8* func_ov000_020cef9c(void); + void func_ov000_020cfb38(void); + unk32 func_ov000_020cf488(void); + void func_ov000_020cfa24(void); + void func_ov000_020cfe40(unk32, unk32); + void func_ov005_02104028(unk32); + unk32 func_ov000_020cf0bc(void); + void func_ov005_02103f8c(unk32*); }; extern UnkStruct_027e103c *data_027e103c; diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index ae5e8cad..35985374 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -124,6 +124,8 @@ struct UnkStruct_027e0d38 { /* 24 */ void *mUnk_24; /* 28 */ void *mUnk_28; /* 2c */ + + unk32 func_ov000_02078b40(void); }; typedef u32 ItemModelId; @@ -332,3 +334,4 @@ public: }; extern ItemManager *gItemManager; +extern UnkStruct_027e0d38 *data_027e0d38; diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 8f70ce23..9b24632b 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -115,7 +115,7 @@ public: bool func_02036d30(UnkStruct_027E0C68_UnkSubClass3* param_2); bool func_02036d4c(UnkStruct_027E0C68_UnkSubClass3* param_2); void func_02036d6c(void); - UnkStruct_027E0C68_UnkSubClass1* func_02036da8(u32 param_2, s32* param_3); + UnkStruct_027E0C68_UnkSubClass1* func_02036da8(u32 param_2, s16* param_3); void func_02036edc(u32 param_2, u8 param_3); UnkStruct_027E0C68_UnkSubClass1* func_02036f68(u32 param_2, u8* param_3); UnkStruct_027E0C68_UnkSubClass2* func_020370d0(unk32 param_2, unk32 param_3); diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index c8ea6cc9..df2e9152 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -6,6 +6,8 @@ // temp #define UNK_TYPE void +#define ESCAPE_SEQUENCE_MARKER '\x1A' + typedef struct UnkStruct_0203b264 { /* 0 */ u8 mUnk_0[0x4]; /* 4 */ u16 *mUnk_4; @@ -32,7 +34,8 @@ typedef struct UnkStruct1 { class UnkSubClass1_UnkownClass1 { public: /* 0x00 */ UnkStruct1* unk_00; - /* 0x04 */ u32* unk_04; + /* 0x04 */ unk16 unk_04; + /* 0x06 */ unk16 unk_06; /* 0x08 */ u32* unk_08; /* 0x0C */ unk32 unk_0C; /* 0x10 */ unk32 unk_10; @@ -82,6 +85,7 @@ public: /* 0x04 */ void func_0203ec34(void); + void func_0203ebe0(void); void func_0203ebf8(void); }; @@ -93,6 +97,7 @@ public: void func_0203ee80(unk32); void func_0203ef78(unk16, u16, unk8); void func_0203ef78(unk16); // overload? + void func_0203ee48(void); }; class UnkSubClass1_unk_124 { @@ -233,7 +238,8 @@ public: /* 0x528 */ s16* unk_528; /* 0x52C */ u8 unk_52C[0x30]; /* 0x55C */ unk32 unk_55C; - /* 0x560 */ unk32 unk_560; + /* 0x560 */ unk16 unk_560; + /* 0x560 */ unk16 unk_562; /* 0x564 */ unk32 unk_564; /* 0x568 */ unk32 unk_568; /* 0x56C */ unk16 unk_56C; @@ -279,8 +285,8 @@ public: /* 0x44 */ virtual void func_0203a3fc(s32 touchLastX, s32 touchLastY) override; /* 0x48 */ virtual void func_0203a328(void) override; /* 0x4C */ virtual void func_02039a3c(void) override; - /* 0x50 */ virtual void func_0203a7f0(EntryINF1* param_2, int param_3, u8* param_4) override; - /* 0x54 */ virtual UNK_TYPE func_0203a988(void) override; + /* 0x50 */ virtual void func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) override; + /* 0x54 */ virtual void func_0203a988(void) override; /* 0x58 */ virtual void func_0203af1c(void) override; /* 0x5C */ virtual void func_0203aea8(void) override; /* 0x60 */ virtual UNK_TYPE func_0203b410(void) override; @@ -314,9 +320,16 @@ public: unk32 func_0203de14(unk32); void func_0203e090(void); void func_0203e0f8(void); + void func_020392b4(void); + void func_0203b764(void); void func_0203a188(unk32, unk32); void func_0203e1b0(unk32, unk32, unk32); + unk32 func_0203a6d0(unk32, unk32); + unk32 func_0203b0bc(void); + void func_02038f44(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5, unk32 param_6); + u16* func_02037604(u16**); + void func_02039398(void); // not sure it belongs to this class: void func_02032fcc(unk32, unk32); @@ -329,4 +342,6 @@ public: unk32 func_0203e284(UnkStruct_0203b264*, unk32, unk32); void func_0203e2ac(unk32* param_2); void func_0203fc78(unk32*, unk32*); + + void func_0203cabc(unk32); }; diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 9b4a71fb..00429c9e 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -124,7 +124,6 @@ ARM ActorNavi *ItemManager::GetFairy(FairyId id) const { return mFairies[id]; } -extern UnkStruct_027e0d38 *data_027e0d38; extern unk32 gPlayerAnimHandler; extern "C" void LoadEquipItemModel(unk32 param1, ItemFlag param2); extern "C" void _ZNK11ItemManager15GetEquippedItemEv(); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 8e61f134..0c42adb2 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -442,16 +442,15 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param_2, s32* param_3) { +ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { EntryINF1 *pEVar1; EntryINF1 *pEVar2; UnkStruct_027E0C68_UnkSubClass1 *pSVar4; BMGGroups *pBVar5; bool bVar6; - u8 iStack_38; + s16 iStack_38; int iStack_34; int iStack_30; - u8 uStack_2c; pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xFFFF); @@ -461,7 +460,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { pSVar4 = this->unk_28[4]; - func_02037628(&iStack_38); + func_02037628((u8*)&iStack_38); // ??? bVar6 = (data_02056be4[data_027e077c.mUnk_0] & 1) == 0; @@ -472,12 +471,16 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param data_02056be4[0] = 0; } - uStack_2c = 1; iStack_38 = *param_3; - iStack_34 = param_3[1]; - iStack_30 = param_3[2]; + // iStack_34 = param_3[1]; + // iStack_30 = param_3[2]; pBVar5 = this->pGroups; - pSVar4->func_0203a7f0(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), &iStack_38); + // pSVar4->func_0203a7f0(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); + BMGFileInfo* entry = &(pBVar5)->entries[(param_2) >> 0x10]; + pSVar4->func_0203a7f0(pEVar1, + ((u32)entry->pDAT1 + (((func_02037258(entry, (((param_2))) & 0xFFFF))->offset) & ~1)), + // BMG_GET_MSG_ADDR(pBVar5, param_2), + (s16*)&iStack_38, 1); func_ov000_020d77e4(data_ov000_020eec9c, 0x1C); return pSVar4; @@ -536,7 +539,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036f68(u32 param pSVar5->unk_164 = pSVar2; pSVar5->unk_418 = this->unk_28[5]; - pSVar5->func_0203a7f0(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), param_3); + pSVar5->func_0203a7f0(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s16*)param_3, 0); if (func_ov000_020d7f18(data_ov000_020eec9c, 0x19) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x18) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x34) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x35) == 0 && diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index 4603346d..ddba52f8 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -1,11 +1,16 @@ +#include "global.h" #include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" #include "Message/MessageManager.hpp" #include "Save/AdventureFlags.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Player/TouchControl.hpp" +#include "Item/ItemManager.hpp" -extern u32 func_01ff9b4c(unk32, unk32); -extern unk32 func_0203c084(void); -extern void func_ov018_02169634(UnkStruct_027E0C68_UnkSubClass1*); -extern unk32 func_ov000_02079e04(void); +extern "C" u32 func_01ff9b4c(unk32, unk32); +extern "C" unk32 func_0203c084(void); +extern "C" void func_ov018_02169634(UnkStruct_027E0C68_UnkSubClass1*); +extern "C" unk32 func_ov000_02079e04(void); +extern "C" unk32 func_01ff9b88(unk32, unk32); struct Struct_027e0db0 { /* 0x00 */ unk32 unk_00; @@ -21,7 +26,7 @@ struct UnkStruct2 { }; extern UnkStruct2 data_027e077c; extern u8 data_02056be4[]; -extern unk32 data_027e0618[]; +extern u8 data_027e0618[]; class UnkClass_027e0cbc { public: @@ -37,6 +42,17 @@ extern "C" void func_020347b0(unk32, unk16, unk32*, unk32*, unk32, unk32); extern THUMB unk32 func_0202ab48(void); extern "C" void func_02034984(unk32, unk32, unk32, unk32, unk32); extern "C" void func_02034698(unk32, unk32, unk32*, unk32*); +extern TouchControl data_027e0d78; + +class UnkClass_027e0e28 { +public: + unk32 func_ov000_0207bc48(); +}; +extern UnkClass_027e0e28* data_027e0e28; +extern u8 data_027e0c54; +extern unk32* data_ov009_0211f5b4; +extern "C" unk32 func_ov003_020f3f94(unk32*); +extern unk32* data_02057ed4; // see Actor.cpp typedef struct UnkStruct_01ffbe34 { @@ -57,6 +73,16 @@ typedef struct UnkStruct_01ffbe34 { } UnkStruct_01ffbe34; extern "C" void func_01ffbe34(UnkStruct_01ffbe34 *param1); + +class UnkClass_027e1054 { +public: + unk32 unk_00; + unk32 unk_04; + + void func_ov003_020f4874(void); +}; +extern UnkClass_027e1054 data_027e1054; + ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_02038c34(unk32 param_2) { s16 iVar1; unk32 iVar2; @@ -342,16 +368,338 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a328(void) { this->unk_410.func_0203ec34(); } +// non-matching ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a3fc(s32 touchLastX, s32 touchLastY) { - // TODO + unk32 iVar2; + unk32 iVar5; + unk32 iStack_14; + unk32 iStack_18; + + if (this->unk_15C <= 0 || this->func_0203951c() == 0) { + return; + } + + iStack_14 = 0; + iStack_18 = 0; + + this->func_0203bdcc(&iStack_14, &iStack_18); + + iVar5 = touchLastX - iStack_14; + iVar2 = touchLastY - iStack_18; + + if ((data_027e103c != 0 && data_027e103c->mUnk_1c == 0x8F) || (data_027e077c.mUnk_0 != data_027e077c.mUnk_4)) { + return; + } + + if ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { + if ((data_027e0d78.mFlags & 1) != 0) { + if (this->unk_50 == 0 && data_027e0d38 != 0) { + if (func_ov000_02079e04() == 0 && data_027e0e28->func_ov000_0207bc48() == 0) { + if (data_027e0618[0x101] == 0 && data_027e103c->mUnk_24 == 0) { + return; + } + } + } + + if (this->func_0203a6d0(iVar5, iVar2) == 0 && this->func_0203a2c0() != 0) { + this->unk_57F = 1; + } + } else { + if (data_027e0d78.mTouch != 0) { + this->func_0203a6d0(iVar5, iVar2); + return; + } + + if (data_027e0d78.mTouch == 0) { + switch(this->unk_151) { + case 3: + case 4: + break; + case 5: + if (data_027e103c->mUnk_20 == 3) { + this->func_0203b0ec(1); + } + break; + case 6: + if (data_027e103c->mUnk_20 == 5) { + this->func_0203b0ec(1); + } + break; + case 7: + break; + case 2: + if (this->unk_164->unk_168.unk_06 <= 0) { + if ((data_027e0d78.mFlags & 2) != 0) { + this->unk_13C = 0; + + if (this->func_0203b0bc() != 0) { + this->func_0203b0ec(1); + } + + this->unk_1F0.unk_64 = 0; + this->unk_1F0.func_020352d8(); + } + } + break; + case 0: + case 1: + default: + if ((data_027e0d78.mFlags & 2) != 0) { + this->unk_13C = 0; + + if (this->func_0203b0bc() != 0) { + this->func_0203b0ec(1); + } + + this->unk_1F0.unk_64 = 0; + this->unk_1F0.func_020352d8(); + } + break; + } + } + } + } } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a7f0(EntryINF1* param_2, int param_3, u8* param_4) { - // TODO +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { + bool bVar5; + bool bVar2; + int iVar4; + int iVar6; + s16 temp; + + iVar6 = param_4[0]; + + if (data_027e0c54 != 0) { + UnkStruct_027E0C68_UnkSubClass1* pVar4 = data_027e0c68.func_02036700(); + + if (pVar4 != NULL && pVar4->unk_15C > 0) { + this->func_02038b40(); + } + } + + if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { + UnkStruct_027E0C68_UnkSubClass1* pVar4 = data_027e0c68.unk_28[4]; + + if (pVar4 != NULL && pVar4->unk_15C > 0) { + this->func_02038b40(); + } + } + + this->unk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; + temp = param_4[8]; + + if (temp >= 0 && param_4[9] >= 0) { + temp = param_4[10]; + } + + if (temp < 0) { + this->unk_57B = temp; + } else { + this->unk_57B = 0; + } + + this->func_02038f44(param_2, param_3, param_4, param_5, iVar6); + this->unk_574 = 0; + + if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param_4[11])) { + data_027e103c->func_ov000_020cf284(0x80, 0); + } } -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203a988(UNK_TYPE) { - // TODO +// non-matching (can't get the switch decomp...) +ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a988(void) { + short sVar1; + int iVar2; + u16* puVar3; + int iVar4; + u16 uVar5; + unk8 uVar6; + u16 *local_54 [17]; + + if ((this->unk_18 & 0x1FFFFFFF) != 8) { + this->func_0203e060(0xE0, 0x40); + + if (this->unk_154 == 0) { + iVar2 = 2; + } else { + iVar2 = (int)*(char *)(this->unk_154->unk_05); + } + + this->func_0203dcfc(this->unk_50, 0, (int)this->unk_11E, iVar2); + } + + this->unk_410.func_0203ebe0(); + this->unk_580 = 0; + this->func_020392b4(); + this->unk_57C = 0; + this->unk_164->unk_168.unk_06 = 0; + this->unk_57D = 0; + this->unk_57F = 0; + this->unk_57A = 0; + + if (this->unk_154->unk_06 < 2) { + this->unk_580 = 1; + } + + this->unk_424.func_0203ee48(); + this->unk_151 = 1; + puVar3 = this->unk_12C; + local_54[0] = puVar3; + iVar2 = 0; + + for (iVar2 = 0; func_01ff9b88(iVar2, this->unk_154->unk_06) == 0; iVar2++, puVar3 = this->func_02037604(local_54)) { + if (local_54[iVar2] != NULL) { + puVar3 = local_54[iVar2]; + } + + if (local_54[iVar2] == NULL || puVar3 == NULL) { + break; + } + + if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { + uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; + if (0x00010017 < uVar5) { + if (uVar5 == 0x00020001) { + sVar1 = this->unk_164->unk_168.unk_06; + // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; + // (param_1 + sVar1 * 2 + 0x562)[1] = 0; + } + } else { + // switch (*local_54[iVar2]) { + // case 0: + // continue; + // case 1: + // case 2: + // case 3: + // case 4: + // if (this->unk_164->unk_168.unk_06 == 0) { + // this->func_0203cabc(this->unk_164->unk_50); + // this->unk_164->unk_50 = 0x1A; // ??? + + // while (this->unk_564 < 4) { + // this->unk_564--; // ??? + // } + + // this->unk_580 = 1; + // } else { + // this->unk_151 = 4 + // } + // break; + // case 5: + // case 6: + // case 7: + // case 8: + // case 9: + // case 10: + // case 11: + // case 12: + // case 13: + // case 14: + // case 15: + // case 16: + // case 17: + // case 18: + // case 19: + // case 20: + // case 21: + // case 22: + // case 23: + // case 24: + // case 25: + // sVar1 = this->unk_164->unk_168.unk_06; + // break; + // default: + // return; + // } + } + } + + if (*local_54[iVar2] == '\n') { + continue; + } + } + +/* while(true) { + + // switch (*local_54[iVar2]) { + // case ESCAPE_SEQUENCE_MARKER: + // case '\n': + // } + + if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { + uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; + if (0x00010017 < uVar5) { + if (uVar5 == 0x00020001) { + sVar1 = this->unk_164->unk_168.unk_06; + // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; + // (param_1 + sVar1 * 2 + 0x562)[1] = 0; + } + } else { + /* WARNING: Could not recover jumptable at 0x0203aa7c. Too many branches */ + /* WARNING: Treating indirect jump as call + // if (-1 < (int)(uVar5 - 0x10000)) { + // (*(code *)((uVar5 - 0x10000) * 4 + 0x203aa84))(); + // return; + // } + } + } else if (*local_54[iVar2] == '\n') { + iVar2 = iVar2 + 1; + iVar4 = func_01ff9b88(iVar2, this->unk_154->unk_06); + + if (iVar4 == 0) { + break; + } + } + } + */ + if (this->unk_15E == '\x06') { + this->func_0203e060(0xE0, 0x30); + + if (this->unk_154 == 0) { + iVar2 = 2; + } else { + iVar2 = this->unk_154->unk_05; + } + + this->func_0203dcfc(this->unk_50,0,(int)this->unk_11E,iVar2); + } + + if (this->unk_580 != 0) { + this->func_0203e060(0xE0, 0x28); + + if (this->unk_154 == 0) { + iVar2 = 2; + } else { + iVar2 = this->unk_154->unk_05; + } + + this->func_0203dcfc(this->unk_50, 0, this->unk_11E, iVar2); + + if (this->unk_50 == 0) { + uVar6 = 1; + } else { + uVar6 = 7; + } + + // *(undefined *)((int)PTR_PTR_0203aea4->unk_28 + ((byte)param_1[0x50] - 0x28)) = uVar6; + // PTR_PTR_0203aea4[this->unk_50] = uVar6; + data_027e0c68.unk_28[this->unk_50]->unk_18 = uVar6; + this->func_0203b764(); + + if (this->unk_15F == 0 || this->unk_154->unk_06 < 3) { + this->unk_168.unk_64 = this->unk_168.unk_7C; + this->unk_168.func_020352d8(); + } else { + this->unk_168.func_020351b8(1, 0, 0, 0); + } + } + + this->unk_1F0.unk_64 = 0; + this->unk_1F0.func_020352d8(); + this->func_02039578(0, 0, 0, 0); + // (**(code **)(*(int *)param_1 + 0x10))(0); } ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203aea8(void) { @@ -365,8 +713,51 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203aea8(void) { } } +// non-matching ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203af1c(void) { - // TODO + bool bVar1; + unk8* puVar2; + int iVar3; + char *pcVar4; + + if (this->unk_160 != 0) { + if (data_027e103c != NULL) { + if (data_027e103c->func_ov000_020cf4bc() != 0) { + puVar2 = data_027e103c->func_ov000_020cef9c(); + + if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { + puVar2 = data_027e103c->func_ov000_020cef9c(); + + if ((UnkStruct_027E0C68_UnkSubClass1*)(puVar2 + 0x244) == this) { + data_027e103c->func_ov000_020cfb38(); + } + } + } + + if (this->unk_581 != 0 && data_027e103c->func_ov000_020cf488() != 0) { + data_027e103c->func_ov000_020cfa24(); + this->unk_581 = 0; + } + + if (this->unk_582 != 0) { + data_027e103c->func_ov000_020cfe40(0, 2); + this->unk_582 = 0; + } + + if (this->unk_583 != 0) { + data_027e103c->func_ov005_02104028(0); + this->unk_583 = 0; + } + } + + if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.unk_04 + 0x99) != 0 && + (data_027e077c.mUnk_0 != 0x39 || data_027e103c->func_ov000_020cf0bc())) { + data_027e1054.func_ov003_020f4874(); + data_027e103c->func_ov005_02103f8c(data_02057ed4); + } + } + + this->func_02039398(); } // non-matching (regalloc) From 097e8853e4abe1d2827c05ef83993cd08ad6e765 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Mon, 27 Jan 2025 18:17:33 +0100 Subject: [PATCH 28/64] progress --- config/eur/arm9/symbols.txt | 66 +++---- config/usa/arm9/symbols.txt | 66 +++---- include/Message/MessageManager.hpp | 19 +- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 183 ++++++++++++------ src/Main/Message/MessageManager.cpp | 65 +++---- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 183 +++++++++++++----- 6 files changed, 368 insertions(+), 214 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 95119be6..d419b1e6 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1857,7 +1857,7 @@ func_020386b8 kind:function(arm,size=0xc) addr:0x20386b8 func_020386c4 kind:function(arm,size=0x8) addr:0x20386c4 func_020386cc kind:function(arm,size=0xc) addr:0x20386cc func_020386d8 kind:function(arm,size=0x40) addr:0x20386d8 -func_02038718 kind:function(arm,size=0x40) addr:0x2038718 +_ZN31UnkStruct_027E0C68_UnkSubClass2C1Ev kind:function(arm,size=0x40) addr:0x2038718 func_02038758 kind:function(arm,size=0x18) addr:0x2038758 func_02038770 kind:function(arm,size=0x1c) addr:0x2038770 func_0203878c kind:function(arm,size=0x18) addr:0x203878c @@ -1878,15 +1878,15 @@ func_02038b08 kind:function(thumb,size=0x14) addr:0x2038b08 func_02038b1c kind:function(thumb,size=0xc) addr:0x2038b1c func_02038b28 kind:function(thumb,size=0xc) addr:0x2038b28 func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 -_Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x34) addr:0x2038b40 +_Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1_Sub1 kind:function(arm,size=0x34) addr:0x2038b40 func_02038b74 kind:function(arm,size=0x4) addr:0x2038b74 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b78 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02038c34Ei kind:function(arm,size=0x84) addr:0x2038c34 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038c34Ei kind:function(arm,size=0x84) addr:0x2038c34 func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038cb8 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cf4 func_02038d10 kind:function(arm,size=0x10) addr:0x2038d10 func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038d20 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02038ed0Ev kind:function(arm,size=0x24) addr:0x2038ed0 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038ed0Ev kind:function(arm,size=0x24) addr:0x2038ed0 func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038ef4 func_02038f40 kind:function(arm,size=0x4) addr:0x2038f40 func_02038f44 kind:function(arm,size=0x114) addr:0x2038f44 @@ -1894,58 +1894,58 @@ func_02039058 kind:function(arm,size=0x4) addr:0x2039058 func_0203905c kind:function(arm,size=0x48) addr:0x203905c func_020390a4 kind:function(arm,size=0x164) addr:0x20390a4 func_02039208 kind:function(arm,size=0x20) addr:0x2039208 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039228EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039228EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 func_02039250 kind:function(arm,size=0x64) addr:0x2039250 func_020392b4 kind:function(arm,size=0xe4) addr:0x20392b4 func_02039398 kind:function(arm,size=0xc) addr:0x2039398 func_020393a4 kind:function(arm,size=0x4) addr:0x20393a4 func_020393a8 kind:function(arm,size=0x28) addr:0x20393a8 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_020393d0Ei kind:function(arm,size=0x70) addr:0x20393d0 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020393d0Ei kind:function(arm,size=0x70) addr:0x20393d0 func_02039440 kind:function(arm,size=0x3c) addr:0x2039440 func_0203947c kind:function(arm,size=0x5c) addr:0x203947c -_ZN31UnkStruct_027E0C68_UnkSubClass113func_020394d8EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020394d8EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 func_0203951c kind:function(arm,size=0x40) addr:0x203951c func_0203955c kind:function(arm,size=0x14) addr:0x203955c func_02039570 kind:function(arm,size=0x8) addr:0x2039570 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039578 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039578 func_020395b4 kind:function(thumb,size=0x244) addr:0x20395b4 -func_020397f8 kind:function(thumb,size=0x244) addr:0x20397f8 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a5c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397f8 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a5c func_02039ca8 kind:function(arm,size=0x24) addr:0x2039ca8 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039ccc -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039d74Eii kind:function(arm,size=0x414) addr:0x2039d74 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039ccc +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039d74Eii kind:function(arm,size=0x414) addr:0x2039d74 func_0203a188 kind:function(arm,size=0x138) addr:0x203a188 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a2c0 func_0203a30c kind:function(arm,size=0x1c) addr:0x203a30c -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a328 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a328 func_0203a35c kind:function(arm,size=0x84) addr:0x203a35c func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a3e0 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3fc +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3fc func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a6d0 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7f0 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a988 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203aea8 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203af1cEv kind:function(arm,size=0x1a0) addr:0x203af1c +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7f0 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a988 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203aea8 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203af1cEv kind:function(arm,size=0x1a0) addr:0x203af1c func_0203b0bc kind:function(arm,size=0x30) addr:0x203b0bc func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0ec -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b410 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b5d0 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b410 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b5d0 func_0203b764 kind:function(arm,size=0xb0) addr:0x203b764 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b814 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b814 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd8c -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203bdccEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203bdccEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc func_0203be08 kind:function(arm,size=0x5c) addr:0x203be08 func_0203be64 kind:function(arm,size=0x220) addr:0x203be64 func_0203c084 kind:function(arm,size=0xb8) addr:0x203c084 func_0203c13c kind:function(arm,size=0x64) addr:0x203c13c func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c1a0 func_0203c25c kind:function(arm,size=0x6c) addr:0x203c25c -_ZN31UnkStruct_027E0C68_UnkSubClass1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 -_ZN31UnkStruct_027E0C68_UnkSubClass1D1Ev kind:function(arm,size=0x40) addr:0x203c310 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c350 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c310 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c350 func_0203c358 kind:function(thumb,size=0x44) addr:0x203c358 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c39c func_0203c414 kind:function(arm,size=0x4c) addr:0x203c414 @@ -1955,7 +1955,7 @@ func_0203c5c4 kind:function(arm,size=0x18) addr:0x203c5c4 func_0203c5dc kind:function(arm,size=0x120) addr:0x203c5dc func_0203c6fc kind:function(arm,size=0x1c) addr:0x203c6fc func_0203c718 kind:function(arm,size=0x14) addr:0x203c718 -func_0203c72c kind:function(arm,size=0x110) addr:0x203c72c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2C1Ev kind:function(arm,size=0x110) addr:0x203c72c func_0203c83c kind:function(arm,size=0x4) addr:0x203c83c func_0203c840 kind:function(arm,size=0x30) addr:0x203c840 func_0203c870 kind:function(arm,size=0x38) addr:0x203c870 @@ -2030,16 +2030,16 @@ func_0203dba8 kind:function(thumb,size=0x38) addr:0x203dba8 func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203dbe0 func_0203dc10 kind:function(arm,size=0x64) addr:0x203dc10 func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc74 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203dcb4Eii kind:function(arm,size=0x48) addr:0x203dcb4 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203dcb4Eii kind:function(arm,size=0x48) addr:0x203dcb4 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcfc func_0203ddec kind:function(arm,size=0x10) addr:0x203ddec func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddfc -_Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1i kind:function(arm,size=0x10) addr:0x203de14 +_Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1_Sub1i kind:function(arm,size=0x10) addr:0x203de14 func_0203de24 kind:function(arm,size=0x34) addr:0x203de24 func_0203de58 kind:function(arm,size=0x208) addr:0x203de58 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 func_0203e090 kind:function(arm,size=0x38) addr:0x203e090 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e0c8Ev kind:function(arm,size=0x30) addr:0x203e0c8 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e0c8Ev kind:function(arm,size=0x30) addr:0x203e0c8 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0f8 func_0203e19c kind:function(arm,size=0x14) addr:0x203e19c func_0203e1b0 kind:function(arm,size=0xd4) addr:0x203e1b0 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index f96bbfbb..d613283c 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1857,7 +1857,7 @@ func_020386b8 kind:function(arm,size=0xc) addr:0x2038674 func_020386c4 kind:function(arm,size=0x8) addr:0x2038680 func_020386cc kind:function(arm,size=0xc) addr:0x2038688 func_020386d8 kind:function(arm,size=0x40) addr:0x2038694 -func_02038718 kind:function(arm,size=0x40) addr:0x20386d4 +_ZN31UnkStruct_027E0C68_UnkSubClass2C1Ev kind:function(arm,size=0x40) addr:0x20386d4 func_02038758 kind:function(arm,size=0x18) addr:0x2038714 func_02038770 kind:function(arm,size=0x1c) addr:0x203872c func_0203878c kind:function(arm,size=0x18) addr:0x2038748 @@ -1878,15 +1878,15 @@ func_02038b08 kind:function(thumb,size=0x14) addr:0x2038ac4 func_02038b1c kind:function(thumb,size=0xc) addr:0x2038ad8 func_02038b28 kind:function(thumb,size=0xc) addr:0x2038ae4 func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0 -_Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1 kind:function(arm,size=0x34) addr:0x2038afc +_Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1_Sub1 kind:function(arm,size=0x34) addr:0x2038afc func_02038b74 kind:function(arm,size=0x4) addr:0x2038b30 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b34 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02038c34Ei kind:function(arm,size=0x84) addr:0x2038bf0 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038c34Ei kind:function(arm,size=0x84) addr:0x2038bf0 func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038c74 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cb0 func_02038d10 kind:function(arm,size=0x10) addr:0x2038ccc func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038cdc -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02038ed0Ev kind:function(arm,size=0x24) addr:0x2038e8c +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038ed0Ev kind:function(arm,size=0x24) addr:0x2038e8c func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038eb0 func_02038f40 kind:function(arm,size=0x4) addr:0x2038efc func_02038f44 kind:function(arm,size=0x114) addr:0x2038f00 @@ -1894,58 +1894,58 @@ func_02039058 kind:function(arm,size=0x4) addr:0x2039014 func_0203905c kind:function(arm,size=0x48) addr:0x2039018 func_020390a4 kind:function(arm,size=0x164) addr:0x2039060 func_02039208 kind:function(arm,size=0x20) addr:0x20391c4 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039228EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039228EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 func_02039250 kind:function(arm,size=0x64) addr:0x203920c func_020392b4 kind:function(arm,size=0xe4) addr:0x2039270 func_02039398 kind:function(arm,size=0xc) addr:0x2039354 func_020393a4 kind:function(arm,size=0x4) addr:0x2039360 func_020393a8 kind:function(arm,size=0x28) addr:0x2039364 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_020393d0Ei kind:function(arm,size=0x70) addr:0x203938c +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020393d0Ei kind:function(arm,size=0x70) addr:0x203938c func_02039440 kind:function(arm,size=0x3c) addr:0x20393fc func_0203947c kind:function(arm,size=0x5c) addr:0x2039438 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_020394d8EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020394d8EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 func_0203951c kind:function(arm,size=0x40) addr:0x20394d8 func_0203955c kind:function(arm,size=0x14) addr:0x2039518 func_02039570 kind:function(arm,size=0x8) addr:0x203952c -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039534 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039534 func_020395b4 kind:function(thumb,size=0x244) addr:0x2039570 -func_020397f8 kind:function(thumb,size=0x244) addr:0x20397b4 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a18 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397b4 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a18 func_02039ca8 kind:function(arm,size=0x24) addr:0x2039c64 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039c88 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_02039d74Eii kind:function(arm,size=0x414) addr:0x2039d30 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039c88 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039d74Eii kind:function(arm,size=0x414) addr:0x2039d30 func_0203a188 kind:function(arm,size=0x138) addr:0x203a144 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a27c func_0203a30c kind:function(arm,size=0x1c) addr:0x203a2c8 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a2e4 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a2e4 func_0203a35c kind:function(arm,size=0x84) addr:0x203a318 func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a39c -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3b8 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3b8 func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a68c -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7ac -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a944 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203ae64 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203af1cEv kind:function(arm,size=0x1a0) addr:0x203aed8 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7ac +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a944 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203ae64 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203af1cEv kind:function(arm,size=0x1a0) addr:0x203aed8 func_0203b0bc kind:function(arm,size=0x30) addr:0x203b078 func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0a8 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b3cc -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b58c +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b3cc +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b58c func_0203b764 kind:function(arm,size=0xb0) addr:0x203b720 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b7d0 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b7d0 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd48 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203bdccEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203bdccEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88 func_0203be08 kind:function(arm,size=0x5c) addr:0x203bdc4 func_0203be64 kind:function(arm,size=0x220) addr:0x203be20 func_0203c084 kind:function(arm,size=0xb8) addr:0x203c040 func_0203c13c kind:function(arm,size=0x64) addr:0x203c0f8 func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c15c func_0203c25c kind:function(arm,size=0x6c) addr:0x203c218 -_ZN31UnkStruct_027E0C68_UnkSubClass1D0Ev kind:function(arm,size=0x48) addr:0x203c284 -_ZN31UnkStruct_027E0C68_UnkSubClass1D1Ev kind:function(arm,size=0x40) addr:0x203c2cc -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c30c +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c284 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c2cc +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c30c func_0203c358 kind:function(thumb,size=0x44) addr:0x203c314 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c358 func_0203c414 kind:function(arm,size=0x4c) addr:0x203c3d0 @@ -1955,7 +1955,7 @@ func_0203c5c4 kind:function(arm,size=0x18) addr:0x203c580 func_0203c5dc kind:function(arm,size=0x120) addr:0x203c598 func_0203c6fc kind:function(arm,size=0x1c) addr:0x203c6b8 func_0203c718 kind:function(arm,size=0x14) addr:0x203c6d4 -func_0203c72c kind:function(arm,size=0x110) addr:0x203c6e8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2C1Ev kind:function(arm,size=0x110) addr:0x203c6e8 func_0203c83c kind:function(arm,size=0x4) addr:0x203c7f8 func_0203c840 kind:function(arm,size=0x30) addr:0x203c7fc func_0203c870 kind:function(arm,size=0x38) addr:0x203c82c @@ -2030,16 +2030,16 @@ func_0203dba8 kind:function(thumb,size=0x38) addr:0x203db64 func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203db9c func_0203dc10 kind:function(arm,size=0x64) addr:0x203dbcc func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc30 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203dcb4Eii kind:function(arm,size=0x48) addr:0x203dc70 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203dcb4Eii kind:function(arm,size=0x48) addr:0x203dc70 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcb8 func_0203ddec kind:function(arm,size=0x10) addr:0x203dda8 func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddb8 -_Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1i kind:function(arm,size=0x10) addr:0x203ddd0 +_Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1_Sub1i kind:function(arm,size=0x10) addr:0x203ddd0 func_0203de24 kind:function(arm,size=0x34) addr:0x203dde0 func_0203de58 kind:function(arm,size=0x208) addr:0x203de14 -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c func_0203e090 kind:function(arm,size=0x38) addr:0x203e04c -_ZN31UnkStruct_027E0C68_UnkSubClass113func_0203e0c8Ev kind:function(arm,size=0x30) addr:0x203e084 +_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e0c8Ev kind:function(arm,size=0x30) addr:0x203e084 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0b4 func_0203e19c kind:function(arm,size=0x14) addr:0x203e158 func_0203e1b0 kind:function(arm,size=0xd4) addr:0x203e16c diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 9b24632b..2cfe20ab 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -27,11 +27,12 @@ public: /* 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(UnkStruct_027E0C68_UnkSubClass1* param_2) override; + /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1_Sub1* 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; @@ -78,7 +79,7 @@ public: /* 0x04 */ u8 unk_04; /* 0x05 */ u8 unk_05; /* 0x06 */ unk16 unk_06; - /* 0x08 */ UnkStruct_027E0C68_UnkSubClass1* unk_08; + /* 0x08 */ UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_08; /* 0x0C */ u8 unk_0C; /* 0x0C */ u8 unk_0D; /* 0x0C */ unk16 unk_0E; @@ -87,16 +88,16 @@ public: /* 0x14 */ BMGGroups* pGroups; /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18[2]; /* 0x20 */ UnkStruct_027E0C68_UnkSubClass3* unk_20[2]; // is it actually UnkStruct_027E0C68_UnkSubClass2? - /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1* unk_28[6]; - /* 0x40 */ UnkStruct_027E0C68_UnkSubClass1* unk_40[2]; // is array size 6? + /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1_Base* unk_28[6]; + /* 0x40 */ UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_40[2]; // is array size 6? /* 0x48 */ static void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3); void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); void func_0203665c(void); ~UnkStruct_027E0C68(); - UnkStruct_027E0C68_UnkSubClass1* func_020366c4(void); - UnkStruct_027E0C68_UnkSubClass1* func_02036700(void); + UnkStruct_027E0C68_UnkSubClass1_Sub1* func_020366c4(void); + UnkStruct_027E0C68_UnkSubClass1_Sub1* func_02036700(void); UnkStruct_027E0C68_UnkSubClass2* func_0203673c(void); bool func_02036770(u32 param_2); unk32 func_02036798(void); @@ -115,13 +116,13 @@ public: bool func_02036d30(UnkStruct_027E0C68_UnkSubClass3* param_2); bool func_02036d4c(UnkStruct_027E0C68_UnkSubClass3* param_2); void func_02036d6c(void); - UnkStruct_027E0C68_UnkSubClass1* func_02036da8(u32 param_2, s16* param_3); + UnkStruct_027E0C68_UnkSubClass1_Base* func_02036da8(u32 param_2, s16* param_3); void func_02036edc(u32 param_2, u8 param_3); - UnkStruct_027E0C68_UnkSubClass1* func_02036f68(u32 param_2, u8* param_3); + UnkStruct_027E0C68_UnkSubClass1_Sub1* func_02036f68(u32 param_2, u8* param_3); UnkStruct_027E0C68_UnkSubClass2* func_020370d0(unk32 param_2, unk32 param_3); UnkStruct_027E0C68_UnkSubClass2* func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); void func_02037158(UnkSubClass1_02256FF8* param_2); - UnkStruct_027E0C68_UnkSubClass1* func_02037178(UnkSubClass1_02256FF8* param_2); + UnkStruct_027E0C68_UnkSubClass1_Base* func_02037178(UnkSubClass1_02256FF8* param_2); }; extern UnkStruct_027E0C68 data_027e0c68; diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index df2e9152..ef6350ec 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -8,6 +8,15 @@ #define ESCAPE_SEQUENCE_MARKER '\x1A' +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; @@ -152,7 +161,7 @@ public: /* 0x3C */ }; -class UnkStruct_027E0C68_UnkSubClass1 : public SysObject { +class UnkStruct_027E0C68_UnkSubClass1_Base : public SysObject { public: /* 0x000 (vtable) */ /* 0x004 */ unk32* unk_04; @@ -160,10 +169,7 @@ public: /* 0x00C */ unk32* unk_0C; /* 0x010 */ unk32* unk_10; /* 0x014 */ unk32 unk_14; - /* 0x018 */ u8 unk_18; - /* 0x018 */ u8 unk_19; - /* 0x018 */ u8 unk_1A; - /* 0x018 */ u8 unk_1B; + /* 0x018 */ s32 unk_18; /* 0x01C */ unk32 unk_1C; /* 0x020 */ unk32 unk_20; /* 0x024 */ unk32* unk_24; @@ -198,6 +204,8 @@ public: /* 0x122 */ u8 unk_123; /* 0x124 */ UnkSubClass1_unk_124* unk_124; /* 0x128 */ UnkStruct1* unk_128; + + //! TODO: confirm this is part of the base class /* 0x12C */ u16* unk_12C; // pointer to the current position in the message to display /* 0x130 */ unk16 unk_130; /* 0x132 */ unk16 unk_132; @@ -216,10 +224,93 @@ public: /* 0x158 */ unk16 unk_158; /* 0x15A */ unk16 unk_15A; /* 0x15C */ s16 unk_15C; + /* 0x15E */ + + UnkStruct_027E0C68_UnkSubClass1_Base(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base(); + /* 0x08 */ virtual UNK_TYPE vfunc_08(void); // func_0203c2c8 (dtor?) + /* 0x0C */ virtual void func_02039228(unk32* param_2, unk32* param_3); + /* 0x10 */ virtual void func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); + /* 0x14 */ virtual void func_0203e060(u8 param_2, u8 param_3); + /* 0x18 */ virtual bool func_0203dcb4(unk32 param_2, unk32 param_3); + /* 0x1C */ virtual unk32 func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4); + /* 0x20 */ virtual unk32 func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); + /* 0x24 */ virtual UNK_TYPE func_0203b814(UNK_TYPE); + /* 0x28 */ virtual bool func_0203e0c8(void); + /* 0x2C */ virtual void func_02039a5c(void); + /* 0x30 */ virtual void func_02038ed0(void); + /* 0x34 */ virtual unk32 func_02038c34(unk32 param_2); + /* 0x38 */ virtual bool func_0203c350(void); + /* 0x3C */ virtual void func_02039ccc(unk32 param_2); + /* 0x40 */ virtual void func_02039d74(unk32 param_2, unk32 param_3); + /* 0x44 */ virtual void func_0203a3fc(s32 touchLastX, s32 touchLastY); + /* 0x48 */ virtual void func_0203a328(void); + /* 0x4C */ virtual void func_02039a3c(void); + /* 0x50 */ virtual void func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5); + /* 0x54 */ virtual void func_0203a988(void); + /* 0x58 */ virtual void func_0203af1c(void); + /* 0x5C */ virtual void func_0203aea8(void); + /* 0x60 */ virtual void func_0203b410(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4); + /* 0x64 */ virtual void func_0203b5d0(unk32 param_2); + /* 0x68 */ virtual unk32 func_020393d0(unk32 param_2); + /* 0x6C */ virtual void func_0203bdcc(unk32* param_2, unk32* param_3); + /* 0x70 */ virtual void func_020394d8(unk32* param_2, unk32* param_3); + /* 0x74 */ + + unk32 func_02032fa4(void); + unk32 func_02032fb4(void); + unk32 func_020337d8(unk32 param_2); + u16* func_02037604(u16**); + void func_02038b28(void); + void func_02038b40(void); + unk32 func_02038d10(void); + void func_02038d20(void); + void func_02038f44(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5, unk32 param_6); + unk32 func_0203905c(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); + void func_020392b4(void); + void func_02039398(void); + void func_020393a8(unk32 param_2); + void func_0203a188(unk32, unk32); + unk32 func_0203a2c0(void); + unk32 func_0203a30c(void); + void func_0203a35c(void); + unk32 func_0203a3e0(void); + unk32 func_0203a6d0(unk32, unk32); + unk32 func_0203b0bc(void); + void 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_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); + + // 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_02038b1c(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*); +}; + +class UnkStruct_027E0C68_UnkSubClass1_Sub1 : public UnkStruct_027E0C68_UnkSubClass1_Base { +public: /* 0x15E */ s8 unk_15E; /* 0x15F */ s8 unk_15F; /* 0x160 */ unk32 unk_160; - /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1* unk_164; + /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1_Base* unk_164; /* 0x168 */ UnkSubClass1_UnkownClass1 unk_168; /* 0x1F0 */ UnkSubClass1_UnkownClass1 unk_1F0; /* 0x278 */ UnkSubClass1_UnkownClass1 unk_278; @@ -227,7 +318,7 @@ public: /* 0x388 */ UnkSubClass1_UnkownClass1 unk_388; /* 0x410 */ UnkSubClass1_unk_410 unk_410; /* 0x414 */ unk32 unk_414; - /* 0x418 */ UnkStruct_027E0C68_UnkSubClass1* unk_418; + /* 0x418 */ UnkStruct_027E0C68_UnkSubClass1_Base* unk_418; /* 0x41C */ unk32 unk_41C; /* 0x420 */ unk32 unk_420; /* 0x424 */ UnkSubClass1_unk_424 unk_424; @@ -264,17 +355,18 @@ public: /* 0x584 */ u8 unk_584; /* 0x585 */ u8 unk_585; /* 0x586 */ u8 unk_586; + /* 0x588 */ u8 unk_588[0x2C]; + /* 0x5B4 */ - UnkStruct_027E0C68_UnkSubClass1(); - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1() override; - /* 0x08 */ virtual UNK_TYPE vfunc_08(void) override; // func_0203c2c8 (dtor?) + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub1() override; + /* 0x08 */ virtual UNK_TYPE vfunc_08(void); // func_0203c2c8 (dtor? override) /* 0x0C */ virtual void func_02039228(unk32* param_2, unk32* param_3) override; /* 0x10 */ virtual void func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; /* 0x14 */ virtual void func_0203e060(u8 param_2, u8 param_3) override; /* 0x18 */ virtual bool func_0203dcb4(unk32 param_2, unk32 param_3) override; /* 0x1C */ virtual unk32 func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; /* 0x20 */ virtual unk32 func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; - /* 0x24 */ virtual UNK_TYPE func_0203b814(void) override; + /* 0x24 */ virtual UNK_TYPE func_0203b814(UNK_TYPE) override; /* 0x28 */ virtual bool func_0203e0c8(void) override; /* 0x2C */ virtual void func_02039a5c(void) override; /* 0x30 */ virtual void func_02038ed0(void) override; @@ -289,59 +381,30 @@ public: /* 0x54 */ virtual void func_0203a988(void) override; /* 0x58 */ virtual void func_0203af1c(void) override; /* 0x5C */ virtual void func_0203aea8(void) override; - /* 0x60 */ virtual UNK_TYPE func_0203b410(void) override; + /* 0x60 */ virtual void func_0203b410(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; /* 0x64 */ virtual void func_0203b5d0(unk32 param_2) override; /* 0x68 */ virtual unk32 func_020393d0(unk32 param_2) override; /* 0x6C */ virtual void func_0203bdcc(unk32* param_2, unk32* param_3) override; /* 0x70 */ virtual void func_020394d8(unk32* param_2, unk32* param_3) override; /* 0x74 */ - unk32 func_02032fa4(void); - unk32 func_02032fb4(void); - unk32 func_020337d8(unk32 param_2); - void func_02038b28(void); - void func_02038b40(void); - unk32 func_02038d10(void); - void func_02038d20(void); - unk32 func_0203905c(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); - void func_020393a8(unk32 param_2); - unk32 func_0203a2c0(void); - unk32 func_0203a30c(void); - void func_0203a35c(void); - unk32 func_0203a3e0(void); - void func_0203b0ec(unk32 param_2); - void func_0203bd8c(u16 param_2); - void func_0203be08(void); - void func_0203be64(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_020392b4(void); - void func_0203b764(void); - - void func_0203a188(unk32, unk32); - void func_0203e1b0(unk32, unk32, unk32); - unk32 func_0203a6d0(unk32, unk32); - unk32 func_0203b0bc(void); - void func_02038f44(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5, unk32 param_6); - u16* func_02037604(u16**); - void func_02039398(void); - - // 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_02038b1c(void); - void func_0203947c(void); - unk32 func_0203951c(void); - unk32 func_0203e284(UnkStruct_0203b264*, unk32, unk32); - void func_0203e2ac(unk32* param_2); - void func_0203fc78(unk32*, unk32*); - - void func_0203cabc(unk32); + UnkStruct_027E0C68_UnkSubClass1_Sub1(); +}; + +class UnkStruct_027E0C68_UnkSubClass1_Sub2 : public UnkStruct_027E0C68_UnkSubClass1_Base { +public: + /* 0x15E */ u8 unk_15E[0x62]; + /* 0x1C0 */ + + UnkStruct_027E0C68_UnkSubClass1_Sub2(); + virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub2(); +}; + +class UnkStruct_027E0C68_UnkSubClass1_Sub3 : public UnkStruct_027E0C68_UnkSubClass1_Base { +public: + /* 0x15E */ u8 unk_15E[0x12]; + /* 0x170 */ + + UnkStruct_027E0C68_UnkSubClass1_Sub3(); + virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub3(); }; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 0c42adb2..15573317 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -6,7 +6,7 @@ extern ARM unk32 func_ov000_020d7f18(u32*, unk32); extern ARM unk32 func_ov000_020d77e4(u32*, unk32); extern ARM unk32 func_02037628(u8*); extern THUMB unk32 func_0202ab48(void); -extern ARM void func_0203dc74(UnkStruct_027E0C68_UnkSubClass1*, unk32, unk32); +extern ARM void func_0203dc74(UnkStruct_027E0C68_UnkSubClass1_Base*, unk32, unk32); // see Actor.cpp struct UnkStruct2 { @@ -90,14 +90,14 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 switch (data_02056924[i + 1]) { case 0: if (data_027e0618 != 2) { - this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1(); + this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Sub1(); func_0203dc74(this->unk_28[i], 0xE0, 0x40); this->unk_28[i]->unk_2C = data_02068e6c; this->unk_28[i]->unk_50 = i != 0; } break; case 1: - this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1(); + this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Sub2(); func_0203dc74(this->unk_28[i], 0x50, 0x60); this->unk_28[i]->unk_2C = data_02068e6c; break; @@ -106,7 +106,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 break; case 3: if (func_0202ab48() == 0) { - this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1(); + this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Sub3(); func_0203dc74(this->unk_28[i], 0xC0, 0x20); this->unk_28[i]->unk_2C = data_02068e8c; } else { @@ -148,21 +148,21 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) { ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() {} // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_020366c4(void) { +ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_020366c4(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { - return this->unk_28[2]; + return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; } - return this->unk_28[0]; + return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036700(void) { +ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036700(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { - return this->unk_28[0]; + return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; } - return this->unk_28[2]; + return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; } ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_0203673c(void) { @@ -207,13 +207,11 @@ ARM bool UnkStruct_027E0C68::func_020367dc(int param_2) { } ARM bool UnkStruct_027E0C68::func_020367ec(void) { - //! TODO: fake? - return this->unk_28[0]->unk_15C > 0; + return ((UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0])->unk_15C > 0; } ARM bool UnkStruct_027E0C68::func_02036808(void) { - //! TODO: fake? - return this->unk_28[2]->unk_15C > 0; + return ((UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2])->unk_15C > 0; } ARM bool UnkStruct_027E0C68::func_02036824(void) { @@ -236,9 +234,8 @@ ARM bool UnkStruct_027E0C68::func_02036850(void) { ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_027E0C68_UnkSubClass2* param_2) { if ((param_2->unk_18 & ~0xFFFF) != (0x100 << 0x10)) { - UnkStruct_027E0C68_UnkSubClass1* iVar1 = this->func_020366c4(); + UnkStruct_027E0C68_UnkSubClass1_Sub1* iVar1 = this->func_020366c4(); - //! TODO: fake? if (iVar1->unk_15C <= 0) { param_2->vfunc_10(); } else { @@ -258,9 +255,9 @@ ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_027E0C68_UnkSubClass3* para // non-matching ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { - UnkStruct_027E0C68_UnkSubClass1* unk_28_0; - UnkStruct_027E0C68_UnkSubClass1* unk_28_2; - UnkStruct_027E0C68_UnkSubClass1 *pSVar4; + UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_28_0; + UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_28_2; + UnkStruct_027E0C68_UnkSubClass1_Base *pSVar4; ActorRef actorRef; Actor* pActor; bool iVar1; @@ -273,10 +270,10 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p this->unk_40[1] = this->unk_40[0]; - unk_28_0 = this->unk_28[0]; + unk_28_0 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; if (unk_28_0 != NULL && unk_28_0->unk_15C > 0) { - unk_28_2 = this->unk_28[2]; + unk_28_2 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) { this->unk_40[0] = this->func_020366c4(); @@ -284,7 +281,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p this->unk_40[0] = unk_28_2; } } else { - unk_28_2 = this->unk_28[2]; + unk_28_2 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) { this->unk_40[0] = unk_28_0; @@ -353,7 +350,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p } ARM void UnkStruct_027E0C68::func_02036bbc(void) { - UnkStruct_027E0C68_UnkSubClass1* pSVar3; + UnkStruct_027E0C68_UnkSubClass1_Base* pSVar3; bool bVar2; bool bVar4; s32 i; @@ -388,7 +385,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - UnkStruct_027E0C68_UnkSubClass1* pSVar1 = this->unk_28[i]; + UnkStruct_027E0C68_UnkSubClass1_Base* pSVar1 = this->unk_28[i]; if (pSVar1 != NULL) { pSVar1->func_02039ccc(param_2); @@ -442,10 +439,10 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { +ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { EntryINF1 *pEVar1; EntryINF1 *pEVar2; - UnkStruct_027E0C68_UnkSubClass1 *pSVar4; + UnkStruct_027E0C68_UnkSubClass1_Base *pSVar4; BMGGroups *pBVar5; bool bVar6; s16 iStack_38; @@ -491,7 +488,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param // non-matching ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { - UnkStruct_027E0C68_UnkSubClass1 *pSVar1; + UnkStruct_027E0C68_UnkSubClass1_Sub1 *pSVar1; u8 auStack_28[24]; u8 local_13; @@ -514,12 +511,12 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { +ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { EntryINF1 *pEVar1; - UnkStruct_027E0C68_UnkSubClass1 *pSVar2; + UnkStruct_027E0C68_UnkSubClass1_Base *pSVar2; EntryINF1 *pEVar3; int iVar4; - UnkStruct_027E0C68_UnkSubClass1 *pSVar5; + UnkStruct_027E0C68_UnkSubClass1_Sub1 *pSVar5; pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xffff); @@ -528,10 +525,10 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036f68(u32 param } if (param_3[21] != 0) { - pSVar5 = this->unk_28[2]; + pSVar5 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; pSVar2 = this->unk_28[3]; } else { - pSVar5 = this->unk_28[0]; + pSVar5 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; pSVar2 = this->unk_28[1]; } @@ -580,7 +577,7 @@ ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370e8(unk32 par } ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { - UnkStruct_027E0C68_UnkSubClass1* pSVar1; + UnkStruct_027E0C68_UnkSubClass1_Base* pSVar1; pSVar1 = this->func_02037178(param_2); @@ -589,7 +586,7 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { } } -ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) { +ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index ddba52f8..d36396ae 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -8,9 +8,19 @@ extern "C" u32 func_01ff9b4c(unk32, unk32); extern "C" unk32 func_0203c084(void); -extern "C" void func_ov018_02169634(UnkStruct_027E0C68_UnkSubClass1*); +extern "C" void func_ov018_02169634(UnkStruct_027E0C68_UnkSubClass1_Sub1*); extern "C" unk32 func_ov000_02079e04(void); extern "C" unk32 func_01ff9b88(unk32, unk32); +extern "C" unk32 func_02016fcc(unk32); +extern "C" void func_02032304(unk32*, char*, unk32, unk32, unk32); +extern "C" unk32 func_0202d5b4(char*, char*, unk32, unk32, unk32); +extern unk32 data_020691a0; +extern unk32* data_02068894; +extern unk32 data_02056af0; +extern unk32* data_02056a00; +extern char* data_02057f08; // "MSP" +extern char* data_02057eec; // "Menu/UI_main/opening.bin" +extern char* data_02057ed8; // "MSP:opening.nclr" struct Struct_027e0db0 { /* 0x00 */ unk32 unk_00; @@ -31,6 +41,7 @@ extern u8 data_027e0618[]; class UnkClass_027e0cbc { public: unk32 func_0203d7e0(unk32); + unk32 func_0203d77c(unk32, s32, s32); }; extern UnkClass_027e0cbc data_027e0cbc; extern unk16 data_02056a10[]; @@ -83,7 +94,7 @@ public: }; extern UnkClass_027e1054 data_027e1054; -ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_02038c34(unk32 param_2) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02038c34(unk32 param_2) { s16 iVar1; unk32 iVar2; unk32 iVar3; @@ -104,7 +115,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_02038c34(unk32 param_2) { return func_01ff9b4c(iVar2 + iVar3 / 2, uVar4); } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_02038ed0(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02038ed0(void) { if (this->unk_15C > 0) { this->func_0203e090(); } else { @@ -113,13 +124,13 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_02038ed0(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039228(unk32* param_2, unk32* param_3) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039228(unk32* param_2, unk32* param_3) { this->unk_15C = 10; this->unk_152 = 1; this->func_0203e2ac(param_3); } -ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_020393d0(unk32 param_2) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_020393d0(unk32 param_2) { switch (param_2) { case 0: break; @@ -142,24 +153,24 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_020393d0(unk32 param_2) { return ((this->unk_18 << 3) - this->func_020337d8(param_2)) / 2; } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_020394d8(unk32* param_2, unk32* param_3) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_020394d8(unk32* param_2, unk32* param_3) { this->func_0203bdcc(param_2, param_3); *param_2 += this->unk_158; *param_3 += this->unk_15A; } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { this->func_0203dc10(1, param_3); this->func_02033190(param_2, param_3, param_4, param_5); } -THUMB void UnkStruct_027E0C68_UnkSubClass1::func_02039a3c(void) { +THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a3c(void) { this->func_02038b28(); this->func_0203dcfc(this->unk_50, 0, 0, 2); } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039a5c(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a5c(void) { if (data_027e0618[0x101] != 0) { if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { return; @@ -234,7 +245,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039a5c(void) { } } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039ccc(unk32 param_2) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ccc(unk32 param_2) { if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { if (this->unk_124->unk_29 != 3) { if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { @@ -254,8 +265,8 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039ccc(unk32 param_2) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039d74(unk32 param_2, unk32 param_3) { - UnkStruct_027E0C68_UnkSubClass1* bVar1; +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039d74(unk32 param_2, unk32 param_3) { + UnkStruct_027E0C68_UnkSubClass1_Base* bVar1; s8 cVar2; unk32 iVar4; unk32 iVar6; @@ -360,7 +371,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_02039d74(unk32 param_2, unk32 par } // non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a328(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a328(void) { if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { this->func_02038b40(); } @@ -369,7 +380,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a328(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a3fc(s32 touchLastX, s32 touchLastY) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3fc(s32 touchLastX, s32 touchLastY) { unk32 iVar2; unk32 iVar5; unk32 iStack_14; @@ -428,18 +439,19 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a3fc(s32 touchLastX, s32 touc case 7: break; case 2: - if (this->unk_164->unk_168.unk_06 <= 0) { - if ((data_027e0d78.mFlags & 2) != 0) { - this->unk_13C = 0; + //! TODO: fixme + // if (this->unk_164->unk_168.unk_06 <= 0) { + // if ((data_027e0d78.mFlags & 2) != 0) { + // this->unk_13C = 0; - if (this->func_0203b0bc() != 0) { - this->func_0203b0ec(1); - } + // if (this->func_0203b0bc() != 0) { + // this->func_0203b0ec(1); + // } - this->unk_1F0.unk_64 = 0; - this->unk_1F0.func_020352d8(); - } - } + // this->unk_1F0.unk_64 = 0; + // this->unk_1F0.func_020352d8(); + // } + // } break; case 0: case 1: @@ -462,7 +474,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a3fc(s32 touchLastX, s32 touc } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { bool bVar5; bool bVar2; int iVar4; @@ -472,7 +484,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a7f0(EntryINF1* param_2, u32 iVar6 = param_4[0]; if (data_027e0c54 != 0) { - UnkStruct_027E0C68_UnkSubClass1* pVar4 = data_027e0c68.func_02036700(); + UnkStruct_027E0C68_UnkSubClass1_Sub1* pVar4 = data_027e0c68.func_02036700(); if (pVar4 != NULL && pVar4->unk_15C > 0) { this->func_02038b40(); @@ -480,7 +492,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a7f0(EntryINF1* param_2, u32 } if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { - UnkStruct_027E0C68_UnkSubClass1* pVar4 = data_027e0c68.unk_28[4]; + UnkStruct_027E0C68_UnkSubClass1_Sub1* pVar4 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)data_027e0c68.unk_28[4]; if (pVar4 != NULL && pVar4->unk_15C > 0) { this->func_02038b40(); @@ -509,7 +521,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a7f0(EntryINF1* param_2, u32 } // non-matching (can't get the switch decomp...) -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a988(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a988(void) { short sVar1; int iVar2; u16* puVar3; @@ -534,7 +546,8 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a988(void) { this->unk_580 = 0; this->func_020392b4(); this->unk_57C = 0; - this->unk_164->unk_168.unk_06 = 0; + //! TODO: fixme + // this->unk_164->unk_168.unk_06 = 0; this->unk_57D = 0; this->unk_57F = 0; this->unk_57A = 0; @@ -562,7 +575,9 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a988(void) { uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; if (0x00010017 < uVar5) { if (uVar5 == 0x00020001) { - sVar1 = this->unk_164->unk_168.unk_06; + //! TODO: fixme + // sVar1 = this->unk_164->unk_168.unk_06; + // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; // (param_1 + sVar1 * 2 + 0x562)[1] = 0; } @@ -702,7 +717,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203a988(void) { // (**(code **)(*(int *)param_1 + 0x10))(0); } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203aea8(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203aea8(void) { if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { this->unk_168.unk_64 = this->unk_168.unk_7C; this->unk_168.func_020352d8(); @@ -714,7 +729,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203aea8(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203af1c(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203af1c(void) { bool bVar1; unk8* puVar2; int iVar3; @@ -728,7 +743,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203af1c(void) { if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { puVar2 = data_027e103c->func_ov000_020cef9c(); - if ((UnkStruct_027E0C68_UnkSubClass1*)(puVar2 + 0x244) == this) { + if ((UnkStruct_027E0C68_UnkSubClass1_Sub1*)(puVar2 + 0x244) == this) { data_027e103c->func_ov000_020cfb38(); } } @@ -761,7 +776,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203af1c(void) { } // non-matching (regalloc) -ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { u16 sVar1; u32 uVar4; s32 unaff_r4; @@ -799,7 +814,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_0203b264(UnkStruct_0203b264* par } // non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { int iVar1; u16* psVar3; @@ -831,12 +846,89 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1::func_0203b310(unk8 param_2, UnkStruct return 0; } -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b410(UNK_TYPE) { - // TODO +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b410(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { + unk16 sVar1; + unk16 uVar2; + unk32 iVar3; + unk32 iVar4; + unk32 uVar5; + u32 uVar6; + + uVar6 = 0; + + if (this->func_02032fa4() == 0) { + switch(param_2->unk_0C) { + case 0: + case 1: + uVar6 = this->unk_580 != 0; + break; + case 2: + uVar6 = 2; + break; + case 3: + uVar6 = 3; + break; + case 5: + uVar6 = 4; + break; + case 6: + uVar6 = 5; + break; + default: + // why??? + switch (param_2->unk_0C) { + case 4: + uVar6 = 8; + break; + case 7: + uVar6 = 9; + break; + default: + if (this->unk_580 != 0) { + uVar6 = 7; + } else { + uVar6 = 6; + } + break; + } + break; + } + } + + // PTR_PTR_0203b5ac[(byte)param_1[0x50]] = (char)uVar6; + data_027e0c68.unk_28[this->unk_50]->unk_50 = uVar6; + + if (this->unk_15E == 7) { + uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); + func_02032304(data_02068894, data_02057ed8, data_02056af0, 1, param_4); + iVar3 = func_02016fcc(uVar5); + } else { + if (this->func_02032fa4() != 0) { + uVar5 = 0x33; + } else { + uVar5 = 0x32; + } + + data_027e0cbc.func_0203d77c(uVar5, 1, 1); + iVar3 = data_027e0cbc.func_0203d77c(data_02056a00[uVar6 * 0x18] - 2, 1, 1); + } + + if (param_2->unk_10 < 0) { + iVar3 = param_2->unk_12; + } + + if (param_2->unk_10 <= 0 && iVar3 > 0) { + uVar2 = param_2->unk_12; + this->unk_158 = param_2->unk_10; + this->unk_15A = uVar2; + } else { + this->func_0203b764(); + } } // non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203b5d0(unk32 param_2) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b5d0(unk32 param_2) { unk32 uVar2; if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { @@ -864,17 +956,18 @@ ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203b5d0(unk32 param_2) { this->func_020393a8(param_2); } -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1::func_0203b814(UNK_TYPE) { +// switch decomp issue +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b814(UNK_TYPE) { // TODO } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203bdcc(unk32* param_2, unk32* param_3) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203bdcc(unk32* param_2, unk32* param_3) { this->func_0203947c(); *param_2 += this->unk_56E; *param_3 += this->unk_570; } -ARM UnkStruct_027E0C68_UnkSubClass1::~UnkStruct_027E0C68_UnkSubClass1() { +ARM UnkStruct_027E0C68_UnkSubClass1_Sub1::~UnkStruct_027E0C68_UnkSubClass1_Sub1() { this->unk_388.func_020350ac(); this->unk_300.func_020350ac(); this->unk_278.func_020350ac(); @@ -883,12 +976,12 @@ ARM UnkStruct_027E0C68_UnkSubClass1::~UnkStruct_027E0C68_UnkSubClass1() { this->func_02038b1c(); } -ARM bool UnkStruct_027E0C68_UnkSubClass1::func_0203c350(void) { +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c350(void) { return true; } // non-matching -ARM bool UnkStruct_027E0C68_UnkSubClass1::func_0203dcb4(unk32 param_2, unk32 param_3) { +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203dcb4(unk32 param_2, unk32 param_3) { unk32 uVar1; unk32 local_c; unk32 local_10; @@ -903,14 +996,14 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1::func_0203dcb4(unk32 param_2, unk32 par return true; } -ARM void UnkStruct_027E0C68_UnkSubClass1::func_0203e060(u8 param_2, u8 param_3) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e060(u8 param_2, u8 param_3) { this->func_0203dc10(1, param_3); this->unk_11E = param_2; this->unk_118 = -1; this->func_020331c4(param_2, -1); } -ARM bool UnkStruct_027E0C68_UnkSubClass1::func_0203e0c8(void) { +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e0c8(void) { if (this->unk_122 != 0) { this->func_0203e0f8(); this->func_0203dc10(0); From 277517b3be33af77a082497b2dd367e188d2c29e Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Mon, 27 Jan 2025 20:23:50 +0100 Subject: [PATCH 29/64] improve splits --- config/eur/arm9/delinks.txt | 14 +- config/eur/arm9/symbols.txt | 2 +- config/usa/arm9/symbols.txt | 2 +- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 89 ++ .../UnkStruct_027E0C68_UnkSubClass1.cpp | 937 ------------------ src/Main/Message/func_02032f0c.cpp | 7 + src/Main/Message/func_0203744c.cpp | 7 + src/Main/Message/func_020397f8.cpp | 824 +++++++++++++++ src/Main/Message/func_0203c8a8.cpp | 40 + 9 files changed, 982 insertions(+), 940 deletions(-) create mode 100644 src/Main/Message/func_02032f0c.cpp create mode 100644 src/Main/Message/func_0203744c.cpp create mode 100644 src/Main/Message/func_020397f8.cpp create mode 100644 src/Main/Message/func_0203c8a8.cpp diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index de586ab7..533362da 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -18,6 +18,9 @@ libs/cpp/src/__register_global_object.cpp: src/Main/Message/BmgRelatedFunctions.cpp: .text start:0x0202d3bc end:0x0202d56c +src/Main/Message/func_02032f0c.cpp: + .text start:0x02032f0c end:0x0203643c + src/Main/Message/MessageManager.cpp: .text start:0x0203643c end:0x020371b0 @@ -26,5 +29,14 @@ src/Main/Message/BMG.cpp: .data start:0x02057b78 end:0x02057cb8 .rodata start:0x02056958 end:0x020569e0 +src/Main/Message/func_0203744c.cpp: + .text start:0x0203744c end:0x02038b28 + src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp: - .text start:0x02038b28 end:0x0203e0f8 + .text start:0x02038b28 end:0x020397f8 + +src/Main/Message/func_020397f8.cpp: + .text start:0x020397f8 end:0x0203c8a8 + +src/Main/Message/func_0203c8a8.cpp: + .text start:0x0203c8a8 end:0x0203e784 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index d419b1e6..94fd6b55 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1946,7 +1946,7 @@ func_0203c25c kind:function(arm,size=0x6c) addr:0x203c25c _ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 _ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c310 _ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c350 -func_0203c358 kind:function(thumb,size=0x44) addr:0x203c358 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3C1Ev kind:function(thumb,size=0x44) addr:0x203c358 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c39c func_0203c414 kind:function(arm,size=0x4c) addr:0x203c414 func_0203c460 kind:function(arm,size=0x4c) addr:0x203c460 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index d613283c..3b5e6bfe 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1946,7 +1946,7 @@ func_0203c25c kind:function(arm,size=0x6c) addr:0x203c218 _ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c284 _ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c2cc _ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c30c -func_0203c358 kind:function(thumb,size=0x44) addr:0x203c314 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3C1Ev kind:function(thumb,size=0x44) addr:0x203c314 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c358 func_0203c414 kind:function(arm,size=0x4c) addr:0x203c3d0 func_0203c460 kind:function(arm,size=0x4c) addr:0x203c41c diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index ef6350ec..447cb216 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -408,3 +408,92 @@ public: UnkStruct_027E0C68_UnkSubClass1_Sub3(); virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub3(); }; + +// TEMPORARY + +extern "C" u32 func_01ff9b4c(unk32, unk32); +extern "C" unk32 func_0203c084(void); +extern "C" void func_ov018_02169634(UnkStruct_027E0C68_UnkSubClass1_Sub1*); +extern "C" unk32 func_ov000_02079e04(void); +extern "C" unk32 func_01ff9b88(unk32, unk32); +extern "C" unk32 func_02016fcc(unk32); +extern "C" void func_02032304(unk32*, char*, unk32, unk32, unk32); +extern "C" unk32 func_0202d5b4(char*, char*, unk32, unk32, unk32); +extern unk32 data_020691a0; +extern unk32* data_02068894; +extern unk32 data_02056af0; +extern unk32* data_02056a00; +extern char* data_02057f08; // "MSP" +extern char* data_02057eec; // "Menu/UI_main/opening.bin" +extern char* data_02057ed8; // "MSP:opening.nclr" + +struct Struct_027e0db0 { + /* 0x00 */ unk32 unk_00; + /* 0x04 */ unk32 unk_04; +}; +extern Struct_027e0db0 data_027e0db0; + +// see Actor.cpp +struct UnkStruct2 { + /* 0 */ u32 mUnk_0; + /* 4 */ u32 mUnk_4; + /* 8 */ +}; +extern UnkStruct2 data_027e077c; +extern u8 data_02056be4[]; +extern u8 data_027e0618[]; + +class UnkClass_027e0cbc { +public: + unk32 func_0203d7e0(unk32); + unk32 func_0203d77c(unk32, s32, s32); +}; +extern UnkClass_027e0cbc data_027e0cbc; +extern unk16 data_02056a10[]; +extern unk16 data_02056a16[]; +extern unk32 data_02056a04[]; +extern unk32 data_027e0c38[]; +extern "C" void func_0203489c(unk32, unk16, unk32*, unk32*); +extern "C" void func_020347b0(unk32, unk16, unk32*, unk32*, unk32, unk32); +extern THUMB unk32 func_0202ab48(void); +extern "C" void func_02034984(unk32, unk32, unk32, unk32, unk32); +extern "C" void func_02034698(unk32, unk32, unk32*, unk32*); +extern struct TouchControl data_027e0d78; + +class UnkClass_027e0e28 { +public: + unk32 func_ov000_0207bc48(); +}; +extern UnkClass_027e0e28* data_027e0e28; +extern u8 data_027e0c54; +extern unk32* data_ov009_0211f5b4; +extern "C" unk32 func_ov003_020f3f94(unk32*); +extern unk32* data_02057ed4; + +// see Actor.cpp +typedef struct UnkStruct_01ffbe34 { + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk8 mUnk_08; + /* 09 */ unk8 mUnk_09; + /* 0a */ unk8 mUnk_0a; + /* 0b */ unk8 mUnk_0b; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk8 mUnk_14; + /* 15 */ unk8 mUnk_15; + /* 16 */ unk16 mUnk_16; + /* 18 */ unk32 mUnk_18; + /* 1c */ unk32 mUnk_1c; + /* 20 */ +} UnkStruct_01ffbe34; +extern "C" void func_01ffbe34(UnkStruct_01ffbe34 *param1); + +class UnkClass_027e1054 { +public: + unk32 unk_00; + unk32 unk_04; + + void func_ov003_020f4874(void); +}; +extern UnkClass_027e1054 data_027e1054; diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index d36396ae..16cb9de9 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -6,94 +6,6 @@ #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" -extern "C" u32 func_01ff9b4c(unk32, unk32); -extern "C" unk32 func_0203c084(void); -extern "C" void func_ov018_02169634(UnkStruct_027E0C68_UnkSubClass1_Sub1*); -extern "C" unk32 func_ov000_02079e04(void); -extern "C" unk32 func_01ff9b88(unk32, unk32); -extern "C" unk32 func_02016fcc(unk32); -extern "C" void func_02032304(unk32*, char*, unk32, unk32, unk32); -extern "C" unk32 func_0202d5b4(char*, char*, unk32, unk32, unk32); -extern unk32 data_020691a0; -extern unk32* data_02068894; -extern unk32 data_02056af0; -extern unk32* data_02056a00; -extern char* data_02057f08; // "MSP" -extern char* data_02057eec; // "Menu/UI_main/opening.bin" -extern char* data_02057ed8; // "MSP:opening.nclr" - -struct Struct_027e0db0 { - /* 0x00 */ unk32 unk_00; - /* 0x04 */ unk32 unk_04; -}; -extern Struct_027e0db0 data_027e0db0; - -// see Actor.cpp -struct UnkStruct2 { - /* 0 */ u32 mUnk_0; - /* 4 */ u32 mUnk_4; - /* 8 */ -}; -extern UnkStruct2 data_027e077c; -extern u8 data_02056be4[]; -extern u8 data_027e0618[]; - -class UnkClass_027e0cbc { -public: - unk32 func_0203d7e0(unk32); - unk32 func_0203d77c(unk32, s32, s32); -}; -extern UnkClass_027e0cbc data_027e0cbc; -extern unk16 data_02056a10[]; -extern unk16 data_02056a16[]; -extern unk32 data_02056a04[]; -extern unk32 data_027e0c38[]; -extern "C" void func_0203489c(unk32, unk16, unk32*, unk32*); -extern "C" void func_020347b0(unk32, unk16, unk32*, unk32*, unk32, unk32); -extern THUMB unk32 func_0202ab48(void); -extern "C" void func_02034984(unk32, unk32, unk32, unk32, unk32); -extern "C" void func_02034698(unk32, unk32, unk32*, unk32*); -extern TouchControl data_027e0d78; - -class UnkClass_027e0e28 { -public: - unk32 func_ov000_0207bc48(); -}; -extern UnkClass_027e0e28* data_027e0e28; -extern u8 data_027e0c54; -extern unk32* data_ov009_0211f5b4; -extern "C" unk32 func_ov003_020f3f94(unk32*); -extern unk32* data_02057ed4; - -// see Actor.cpp -typedef struct UnkStruct_01ffbe34 { - /* 00 */ unk32 mUnk_00; - /* 04 */ unk32 mUnk_04; - /* 08 */ unk8 mUnk_08; - /* 09 */ unk8 mUnk_09; - /* 0a */ unk8 mUnk_0a; - /* 0b */ unk8 mUnk_0b; - /* 0c */ unk32 mUnk_0c; - /* 10 */ unk32 mUnk_10; - /* 14 */ unk8 mUnk_14; - /* 15 */ unk8 mUnk_15; - /* 16 */ unk16 mUnk_16; - /* 18 */ unk32 mUnk_18; - /* 1c */ unk32 mUnk_1c; - /* 20 */ -} UnkStruct_01ffbe34; -extern "C" void func_01ffbe34(UnkStruct_01ffbe34 *param1); - - -class UnkClass_027e1054 { -public: - unk32 unk_00; - unk32 unk_04; - - void func_ov003_020f4874(void); -}; -extern UnkClass_027e1054 data_027e1054; - ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02038c34(unk32 param_2) { s16 iVar1; unk32 iVar2; @@ -163,852 +75,3 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039578(u8 param_2, u8 para this->func_0203dc10(1, param_3); this->func_02033190(param_2, param_3, param_4, param_5); } - -THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a3c(void) { - this->func_02038b28(); - this->func_0203dcfc(this->unk_50, 0, 0, 2); -} - -// non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a5c(void) { - if (data_027e0618[0x101] != 0) { - if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { - return; - } - } - - this->func_02038d20(); - - if (this->unk_56C > 0) { - this->unk_56C--; - } - - if (this->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { - this->unk_57F = 0; - } - - if (this->unk_15C > 0) { - if ((this->unk_12C == NULL || this->unk_12C[0] == 0) != 0) { - this->unk_424.func_0203ef78(this->unk_130); - } - - this->func_0203be64(); - this->func_0203a35c(); - - if (this->unk_580 != 0) { - this->unk_168.func_0203516c(); - } - - if (this->unk_584 != 0) { - this->unk_300.func_0203516c(); - } - - if (this->unk_585 != 0) { - this->unk_388.func_0203516c(); - } - - if ((this->func_0203a2c0() != 0 && this->unk_57F == 0) && this->unk_56C <= 0) { - this->unk_1F0.func_0203516c(); - } - - if (this->unk_08 != NULL) { - bool value = this->unk_08->unk_1C; - - if ((value == 1) || (value == 2)) { - this->unk_278.func_0203516c(); - } - } - - if (this->unk_15E == 6) { - func_ov018_02169634(this); - } else { - this->unk_410.func_0203ebf8(); - } - } - - if (this->unk_15C == 1) { - if (this->unk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) { - switch (this->unk_151) { - case 0: - this->func_0203b0ec(1); - break; - case 2: - case 3: - if (this->func_0203a3e0() != 0) { - this->func_0203bd8c(this->unk_572); - } else { - this->func_0203b0ec(1); - } - break; - } - } - } -} - -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ccc(unk32 param_2) { - if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { - if (this->unk_124->unk_29 != 3) { - if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { - return; - } - - if (data_027e0618[0x101] != 0) { - if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { - return; - } - } - - this->func_02039d74(0, 0); - } - } - -} - -// non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039d74(unk32 param_2, unk32 param_3) { - UnkStruct_027E0C68_UnkSubClass1_Base* bVar1; - s8 cVar2; - unk32 iVar4; - unk32 iVar6; - unk32 iVar7; - unk32 iVar8; - unk32 uVar9; - unk32 iStack_a8; - unk32 iStack_a4; - unk32 local_a0; - unk32 local_9c; - unk32 local_98; - unk32 local_94; - unk32 local_90; - unk32 local_8c; - unk32 iVar5; - UnkStruct_01ffbe34 aStack_88; - UnkStruct_01ffbe34 aStack_68; - UnkStruct_01ffbe34 aStack_48; - - local_8c = 0; - local_90 = 0; - bVar1 = data_027e0c68.unk_28[this->unk_50]; - - this->func_0203bdcc(&local_8c, &local_90); - this->func_0203a188(local_8c + param_2, local_90 + param_3); - this->func_0203e1b0(param_2 + local_8c + (this->unk_158 - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_15A - (this->unk_18 << 3) / 2), 0); - - if (this->unk_584 != 0) { - iVar5 = this->unk_18 << 3; - - if (this->unk_580 != 0) { - iVar5 = -0xC; - } else { - iVar5 = 0; - } - - this->unk_300.func_02034a1c(param_2 + local_8c + this->unk_55C + (this->unk_158 - (this->unk_14 << 3) / 2), - iVar5 + param_3 + local_90 + this->unk_560 + ((this->unk_15A - (iVar5 / 2))), 0); - } - - if (this->unk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { - switch (data_027e0618[0]) { - case 2: - if (data_027e0cbc.func_0203d7e0(3) != 0) { - this->unk_388.func_02034b0c(0xBE, 0, 0, 0, 0); - } - break; - case 6: - if (data_027e0cbc.func_0203d7e0(0x58) != 0) { - this->unk_388.func_02034b0c(0x013B, 0, 0, 0, 0); - } - break; - } - } - - iVar5 = this->func_02032fa4(); - iVar8 = bVar1->unk_18; - uVar9 = data_02056a04[iVar8]; - func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); - iVar6 = this->unk_158 - local_94; - iVar7 = this->unk_15A - local_98; - - if ((this->unk_15E != 7) && (this->func_0203a2c0() != 0)) { - func_01ffbe34(&aStack_48); - func_020347b0(uVar9, data_02056a10[iVar8], &local_9c, &local_a0, 4, 4); - local_9c += param_2 + local_8c + iVar6; - local_a0 += param_3 + local_90 + iVar7; - - if (data_027e0c38[5] == 1) { - iVar8 = func_0202ab48(); - - if (iVar8 == 0) { - iVar8 = 0; - } else { - iVar8 = -3; - } - - local_9c = (0x108 - local_9c) + iVar8; - } - - if ((this->unk_57F == 0) && (this->unk_56C <= 0)) { - func_01ffbe34(&aStack_68); - aStack_68.mUnk_0a = 1; - this->unk_1F0.func_02034a1c(local_9c, local_a0, &aStack_68); - } else { - func_02034984(iVar5 != 0 ? 0x11F : 0x18, 0, local_9c, local_a0 + 2, 0); - } - } - - if (this->unk_08 != 0) { - if ((this->unk_08->unk_1C == 1 || this->unk_08->unk_1C == 2) == 0) { - return; - } - - func_01ffbe34(&aStack_88); - aStack_88.mUnk_0a = 1; - func_02034698(iVar5 != 0 ? 0x11F : 0x18, 2, &iStack_a4, &iStack_a8); - iStack_a4 += param_2 + local_8c + iVar6; - iStack_a8 += param_3 + local_90 + iVar7; - this->unk_278.func_02034a1c(iStack_a4, iStack_a8, &aStack_88); - } -} - -// non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a328(void) { - if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { - this->func_02038b40(); - } - - this->unk_410.func_0203ec34(); -} - -// non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3fc(s32 touchLastX, s32 touchLastY) { - unk32 iVar2; - unk32 iVar5; - unk32 iStack_14; - unk32 iStack_18; - - if (this->unk_15C <= 0 || this->func_0203951c() == 0) { - return; - } - - iStack_14 = 0; - iStack_18 = 0; - - this->func_0203bdcc(&iStack_14, &iStack_18); - - iVar5 = touchLastX - iStack_14; - iVar2 = touchLastY - iStack_18; - - if ((data_027e103c != 0 && data_027e103c->mUnk_1c == 0x8F) || (data_027e077c.mUnk_0 != data_027e077c.mUnk_4)) { - return; - } - - if ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { - if ((data_027e0d78.mFlags & 1) != 0) { - if (this->unk_50 == 0 && data_027e0d38 != 0) { - if (func_ov000_02079e04() == 0 && data_027e0e28->func_ov000_0207bc48() == 0) { - if (data_027e0618[0x101] == 0 && data_027e103c->mUnk_24 == 0) { - return; - } - } - } - - if (this->func_0203a6d0(iVar5, iVar2) == 0 && this->func_0203a2c0() != 0) { - this->unk_57F = 1; - } - } else { - if (data_027e0d78.mTouch != 0) { - this->func_0203a6d0(iVar5, iVar2); - return; - } - - if (data_027e0d78.mTouch == 0) { - switch(this->unk_151) { - case 3: - case 4: - break; - case 5: - if (data_027e103c->mUnk_20 == 3) { - this->func_0203b0ec(1); - } - break; - case 6: - if (data_027e103c->mUnk_20 == 5) { - this->func_0203b0ec(1); - } - break; - case 7: - break; - case 2: - //! TODO: fixme - // if (this->unk_164->unk_168.unk_06 <= 0) { - // if ((data_027e0d78.mFlags & 2) != 0) { - // this->unk_13C = 0; - - // if (this->func_0203b0bc() != 0) { - // this->func_0203b0ec(1); - // } - - // this->unk_1F0.unk_64 = 0; - // this->unk_1F0.func_020352d8(); - // } - // } - break; - case 0: - case 1: - default: - if ((data_027e0d78.mFlags & 2) != 0) { - this->unk_13C = 0; - - if (this->func_0203b0bc() != 0) { - this->func_0203b0ec(1); - } - - this->unk_1F0.unk_64 = 0; - this->unk_1F0.func_020352d8(); - } - break; - } - } - } - } -} - -// non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { - bool bVar5; - bool bVar2; - int iVar4; - int iVar6; - s16 temp; - - iVar6 = param_4[0]; - - if (data_027e0c54 != 0) { - UnkStruct_027E0C68_UnkSubClass1_Sub1* pVar4 = data_027e0c68.func_02036700(); - - if (pVar4 != NULL && pVar4->unk_15C > 0) { - this->func_02038b40(); - } - } - - if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { - UnkStruct_027E0C68_UnkSubClass1_Sub1* pVar4 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)data_027e0c68.unk_28[4]; - - if (pVar4 != NULL && pVar4->unk_15C > 0) { - this->func_02038b40(); - } - } - - this->unk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; - temp = param_4[8]; - - if (temp >= 0 && param_4[9] >= 0) { - temp = param_4[10]; - } - - if (temp < 0) { - this->unk_57B = temp; - } else { - this->unk_57B = 0; - } - - this->func_02038f44(param_2, param_3, param_4, param_5, iVar6); - this->unk_574 = 0; - - if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param_4[11])) { - data_027e103c->func_ov000_020cf284(0x80, 0); - } -} - -// non-matching (can't get the switch decomp...) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a988(void) { - short sVar1; - int iVar2; - u16* puVar3; - int iVar4; - u16 uVar5; - unk8 uVar6; - u16 *local_54 [17]; - - if ((this->unk_18 & 0x1FFFFFFF) != 8) { - this->func_0203e060(0xE0, 0x40); - - if (this->unk_154 == 0) { - iVar2 = 2; - } else { - iVar2 = (int)*(char *)(this->unk_154->unk_05); - } - - this->func_0203dcfc(this->unk_50, 0, (int)this->unk_11E, iVar2); - } - - this->unk_410.func_0203ebe0(); - this->unk_580 = 0; - this->func_020392b4(); - this->unk_57C = 0; - //! TODO: fixme - // this->unk_164->unk_168.unk_06 = 0; - this->unk_57D = 0; - this->unk_57F = 0; - this->unk_57A = 0; - - if (this->unk_154->unk_06 < 2) { - this->unk_580 = 1; - } - - this->unk_424.func_0203ee48(); - this->unk_151 = 1; - puVar3 = this->unk_12C; - local_54[0] = puVar3; - iVar2 = 0; - - for (iVar2 = 0; func_01ff9b88(iVar2, this->unk_154->unk_06) == 0; iVar2++, puVar3 = this->func_02037604(local_54)) { - if (local_54[iVar2] != NULL) { - puVar3 = local_54[iVar2]; - } - - if (local_54[iVar2] == NULL || puVar3 == NULL) { - break; - } - - if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { - uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; - if (0x00010017 < uVar5) { - if (uVar5 == 0x00020001) { - //! TODO: fixme - // sVar1 = this->unk_164->unk_168.unk_06; - - // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; - // (param_1 + sVar1 * 2 + 0x562)[1] = 0; - } - } else { - // switch (*local_54[iVar2]) { - // case 0: - // continue; - // case 1: - // case 2: - // case 3: - // case 4: - // if (this->unk_164->unk_168.unk_06 == 0) { - // this->func_0203cabc(this->unk_164->unk_50); - // this->unk_164->unk_50 = 0x1A; // ??? - - // while (this->unk_564 < 4) { - // this->unk_564--; // ??? - // } - - // this->unk_580 = 1; - // } else { - // this->unk_151 = 4 - // } - // break; - // case 5: - // case 6: - // case 7: - // case 8: - // case 9: - // case 10: - // case 11: - // case 12: - // case 13: - // case 14: - // case 15: - // case 16: - // case 17: - // case 18: - // case 19: - // case 20: - // case 21: - // case 22: - // case 23: - // case 24: - // case 25: - // sVar1 = this->unk_164->unk_168.unk_06; - // break; - // default: - // return; - // } - } - } - - if (*local_54[iVar2] == '\n') { - continue; - } - } - -/* while(true) { - - // switch (*local_54[iVar2]) { - // case ESCAPE_SEQUENCE_MARKER: - // case '\n': - // } - - if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { - uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; - if (0x00010017 < uVar5) { - if (uVar5 == 0x00020001) { - sVar1 = this->unk_164->unk_168.unk_06; - // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; - // (param_1 + sVar1 * 2 + 0x562)[1] = 0; - } - } else { - /* WARNING: Could not recover jumptable at 0x0203aa7c. Too many branches */ - /* WARNING: Treating indirect jump as call - // if (-1 < (int)(uVar5 - 0x10000)) { - // (*(code *)((uVar5 - 0x10000) * 4 + 0x203aa84))(); - // return; - // } - } - } else if (*local_54[iVar2] == '\n') { - iVar2 = iVar2 + 1; - iVar4 = func_01ff9b88(iVar2, this->unk_154->unk_06); - - if (iVar4 == 0) { - break; - } - } - } - */ - if (this->unk_15E == '\x06') { - this->func_0203e060(0xE0, 0x30); - - if (this->unk_154 == 0) { - iVar2 = 2; - } else { - iVar2 = this->unk_154->unk_05; - } - - this->func_0203dcfc(this->unk_50,0,(int)this->unk_11E,iVar2); - } - - if (this->unk_580 != 0) { - this->func_0203e060(0xE0, 0x28); - - if (this->unk_154 == 0) { - iVar2 = 2; - } else { - iVar2 = this->unk_154->unk_05; - } - - this->func_0203dcfc(this->unk_50, 0, this->unk_11E, iVar2); - - if (this->unk_50 == 0) { - uVar6 = 1; - } else { - uVar6 = 7; - } - - // *(undefined *)((int)PTR_PTR_0203aea4->unk_28 + ((byte)param_1[0x50] - 0x28)) = uVar6; - // PTR_PTR_0203aea4[this->unk_50] = uVar6; - data_027e0c68.unk_28[this->unk_50]->unk_18 = uVar6; - this->func_0203b764(); - - if (this->unk_15F == 0 || this->unk_154->unk_06 < 3) { - this->unk_168.unk_64 = this->unk_168.unk_7C; - this->unk_168.func_020352d8(); - } else { - this->unk_168.func_020351b8(1, 0, 0, 0); - } - } - - this->unk_1F0.unk_64 = 0; - this->unk_1F0.func_020352d8(); - this->func_02039578(0, 0, 0, 0); - // (**(code **)(*(int *)param_1 + 0x10))(0); -} - -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203aea8(void) { - if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { - this->unk_168.unk_64 = this->unk_168.unk_7C; - this->unk_168.func_020352d8(); - } else { - this->unk_168.unk_64 = 0; - this->unk_168.func_020352d8(); - this->unk_168.func_020351b8(1, 0, 0, 0); - } -} - -// non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203af1c(void) { - bool bVar1; - unk8* puVar2; - int iVar3; - char *pcVar4; - - if (this->unk_160 != 0) { - if (data_027e103c != NULL) { - if (data_027e103c->func_ov000_020cf4bc() != 0) { - puVar2 = data_027e103c->func_ov000_020cef9c(); - - if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { - puVar2 = data_027e103c->func_ov000_020cef9c(); - - if ((UnkStruct_027E0C68_UnkSubClass1_Sub1*)(puVar2 + 0x244) == this) { - data_027e103c->func_ov000_020cfb38(); - } - } - } - - if (this->unk_581 != 0 && data_027e103c->func_ov000_020cf488() != 0) { - data_027e103c->func_ov000_020cfa24(); - this->unk_581 = 0; - } - - if (this->unk_582 != 0) { - data_027e103c->func_ov000_020cfe40(0, 2); - this->unk_582 = 0; - } - - if (this->unk_583 != 0) { - data_027e103c->func_ov005_02104028(0); - this->unk_583 = 0; - } - } - - if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.unk_04 + 0x99) != 0 && - (data_027e077c.mUnk_0 != 0x39 || data_027e103c->func_ov000_020cf0bc())) { - data_027e1054.func_ov003_020f4874(); - data_027e103c->func_ov005_02103f8c(data_02057ed4); - } - } - - this->func_02039398(); -} - -// non-matching (regalloc) -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { - u16 sVar1; - u32 uVar4; - s32 unaff_r4; - bool bVar5; - - if (this->func_0203951c() == 0) { - return 1; - } - - if (this->unk_580 != 0) { - unaff_r4 = -0xC; - } else { - unaff_r4 = 0; - } - - sVar1 = param_2->mUnk_4[0]; - - if (sVar1 != 0x1A || sVar1 == 0x1A) { - bVar5 = true; - - if (sVar1 == 0x1A) { - uVar4 = (param_2->mUnk_0[3] << 0x10) | ((u16*)param_2->mUnk_0)[2]; - - if (((uVar4 == 0x0001000A || uVar4 == 0x00020000) || uVar4 == 0x00FF0000)) { - bVar5 = false; - } - } - - if (bVar5) { - this->unk_424.func_0203ee80(this->unk_130); - } - } - - return this->func_0203e284(param_2, param_3, param_4 + unaff_r4); -} - -// non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { - int iVar1; - u16* psVar3; - - psVar3 = param_3->mUnk_4; - - if (psVar3[0] == 10) { - this->unk_424.func_0203ef78(this->unk_130, psVar3[0], param_4); - this->unk_574++; - - if (this->func_0203a30c() == 0) { - this->unk_153 = 1; - } - } - - if (this->unk_15E == 6) { - return 1; - } - - switch (this->unk_57A) { - case 0: - return this->func_0203905c(param_2, param_3, param_4, param_5); - case 1: - iVar1 = this->func_0203a30c(); - return this->unk_164->func_0203cb5c(param_2, ((this->unk_428[this->unk_528[iVar1]] & ~0xFFFF))); - default: - break; - } - - return 0; -} - -// non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b410(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { - unk16 sVar1; - unk16 uVar2; - unk32 iVar3; - unk32 iVar4; - unk32 uVar5; - u32 uVar6; - - uVar6 = 0; - - if (this->func_02032fa4() == 0) { - switch(param_2->unk_0C) { - case 0: - case 1: - uVar6 = this->unk_580 != 0; - break; - case 2: - uVar6 = 2; - break; - case 3: - uVar6 = 3; - break; - case 5: - uVar6 = 4; - break; - case 6: - uVar6 = 5; - break; - default: - // why??? - switch (param_2->unk_0C) { - case 4: - uVar6 = 8; - break; - case 7: - uVar6 = 9; - break; - default: - if (this->unk_580 != 0) { - uVar6 = 7; - } else { - uVar6 = 6; - } - break; - } - break; - } - } - - // PTR_PTR_0203b5ac[(byte)param_1[0x50]] = (char)uVar6; - data_027e0c68.unk_28[this->unk_50]->unk_50 = uVar6; - - if (this->unk_15E == 7) { - uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); - func_02032304(data_02068894, data_02057ed8, data_02056af0, 1, param_4); - iVar3 = func_02016fcc(uVar5); - } else { - if (this->func_02032fa4() != 0) { - uVar5 = 0x33; - } else { - uVar5 = 0x32; - } - - data_027e0cbc.func_0203d77c(uVar5, 1, 1); - iVar3 = data_027e0cbc.func_0203d77c(data_02056a00[uVar6 * 0x18] - 2, 1, 1); - } - - if (param_2->unk_10 < 0) { - iVar3 = param_2->unk_12; - } - - if (param_2->unk_10 <= 0 && iVar3 > 0) { - uVar2 = param_2->unk_12; - this->unk_158 = param_2->unk_10; - this->unk_15A = uVar2; - } else { - this->func_0203b764(); - } -} - -// non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b5d0(unk32 param_2) { - unk32 uVar2; - - if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { - uVar2 = 0x16; - } else { - uVar2 = 0; - } - - this->unk_124->func_0203f020(param_2, uVar2); - this->func_0203be08(); - - if (this->func_02032fa4()) { - this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); - } else { - this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); - } - - this->unk_168.func_020351b8(1, 0, 0, 0); - this->unk_1F0.func_020351b8(0, 0, 0, 0); - this->unk_278.func_020351b8(0, 0, 0, 0); - this->func_020393a8(param_2); -} - -// switch decomp issue -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b814(UNK_TYPE) { - // TODO -} - -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203bdcc(unk32* param_2, unk32* param_3) { - this->func_0203947c(); - *param_2 += this->unk_56E; - *param_3 += this->unk_570; -} - -ARM UnkStruct_027E0C68_UnkSubClass1_Sub1::~UnkStruct_027E0C68_UnkSubClass1_Sub1() { - this->unk_388.func_020350ac(); - this->unk_300.func_020350ac(); - this->unk_278.func_020350ac(); - this->unk_1F0.func_020350ac(); - this->unk_168.func_020350ac(); - this->func_02038b1c(); -} - -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c350(void) { - return true; -} - -// non-matching -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203dcb4(unk32 param_2, unk32 param_3) { - unk32 uVar1; - unk32 local_c; - unk32 local_10; - - local_c = param_2; - local_10 = param_3; - - this->func_02032fa4(); - this->func_0203fc78(&local_c, &local_10); - this->func_02032fcc(local_c, local_10); - this->unk_10 = 0; - return true; -} - -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e060(u8 param_2, u8 param_3) { - this->func_0203dc10(1, param_3); - this->unk_11E = param_2; - this->unk_118 = -1; - this->func_020331c4(param_2, -1); -} - -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e0c8(void) { - if (this->unk_122 != 0) { - this->func_0203e0f8(); - this->func_0203dc10(0); - return true; - } - - return false; -} diff --git a/src/Main/Message/func_02032f0c.cpp b/src/Main/Message/func_02032f0c.cpp new file mode 100644 index 00000000..49121b43 --- /dev/null +++ b/src/Main/Message/func_02032f0c.cpp @@ -0,0 +1,7 @@ +#include "global.h" +#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "Message/MessageManager.hpp" +#include "Save/AdventureFlags.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Player/TouchControl.hpp" +#include "Item/ItemManager.hpp" diff --git a/src/Main/Message/func_0203744c.cpp b/src/Main/Message/func_0203744c.cpp new file mode 100644 index 00000000..49121b43 --- /dev/null +++ b/src/Main/Message/func_0203744c.cpp @@ -0,0 +1,7 @@ +#include "global.h" +#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "Message/MessageManager.hpp" +#include "Save/AdventureFlags.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Player/TouchControl.hpp" +#include "Item/ItemManager.hpp" diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp new file mode 100644 index 00000000..1519e764 --- /dev/null +++ b/src/Main/Message/func_020397f8.cpp @@ -0,0 +1,824 @@ +#include "global.h" +#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "Message/MessageManager.hpp" +#include "Save/AdventureFlags.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Player/TouchControl.hpp" +#include "Item/ItemManager.hpp" + + +THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a3c(void) { + this->func_02038b28(); + this->func_0203dcfc(this->unk_50, 0, 0, 2); +} + +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a5c(void) { + if (data_027e0618[0x101] != 0) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { + return; + } + } + + this->func_02038d20(); + + if (this->unk_56C > 0) { + this->unk_56C--; + } + + if (this->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { + this->unk_57F = 0; + } + + if (this->unk_15C > 0) { + if ((this->unk_12C == NULL || this->unk_12C[0] == 0) != 0) { + this->unk_424.func_0203ef78(this->unk_130); + } + + this->func_0203be64(); + this->func_0203a35c(); + + if (this->unk_580 != 0) { + this->unk_168.func_0203516c(); + } + + if (this->unk_584 != 0) { + this->unk_300.func_0203516c(); + } + + if (this->unk_585 != 0) { + this->unk_388.func_0203516c(); + } + + if ((this->func_0203a2c0() != 0 && this->unk_57F == 0) && this->unk_56C <= 0) { + this->unk_1F0.func_0203516c(); + } + + if (this->unk_08 != NULL) { + bool value = this->unk_08->unk_1C; + + if ((value == 1) || (value == 2)) { + this->unk_278.func_0203516c(); + } + } + + if (this->unk_15E == 6) { + func_ov018_02169634(this); + } else { + this->unk_410.func_0203ebf8(); + } + } + + if (this->unk_15C == 1) { + if (this->unk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) { + switch (this->unk_151) { + case 0: + this->func_0203b0ec(1); + break; + case 2: + case 3: + if (this->func_0203a3e0() != 0) { + this->func_0203bd8c(this->unk_572); + } else { + this->func_0203b0ec(1); + } + break; + } + } + } +} + +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ccc(unk32 param_2) { + if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { + if (this->unk_124->unk_29 != 3) { + if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { + return; + } + + if (data_027e0618[0x101] != 0) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { + return; + } + } + + this->func_02039d74(0, 0); + } + } + +} + +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039d74(unk32 param_2, unk32 param_3) { + UnkStruct_027E0C68_UnkSubClass1_Base* bVar1; + s8 cVar2; + unk32 iVar4; + unk32 iVar6; + unk32 iVar7; + unk32 iVar8; + unk32 uVar9; + unk32 iStack_a8; + unk32 iStack_a4; + unk32 local_a0; + unk32 local_9c; + unk32 local_98; + unk32 local_94; + unk32 local_90; + unk32 local_8c; + unk32 iVar5; + UnkStruct_01ffbe34 aStack_88; + UnkStruct_01ffbe34 aStack_68; + UnkStruct_01ffbe34 aStack_48; + + local_8c = 0; + local_90 = 0; + bVar1 = data_027e0c68.unk_28[this->unk_50]; + + this->func_0203bdcc(&local_8c, &local_90); + this->func_0203a188(local_8c + param_2, local_90 + param_3); + this->func_0203e1b0(param_2 + local_8c + (this->unk_158 - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_15A - (this->unk_18 << 3) / 2), 0); + + if (this->unk_584 != 0) { + iVar5 = this->unk_18 << 3; + + if (this->unk_580 != 0) { + iVar5 = -0xC; + } else { + iVar5 = 0; + } + + this->unk_300.func_02034a1c(param_2 + local_8c + this->unk_55C + (this->unk_158 - (this->unk_14 << 3) / 2), + iVar5 + param_3 + local_90 + this->unk_560 + ((this->unk_15A - (iVar5 / 2))), 0); + } + + if (this->unk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { + switch (data_027e0618[0]) { + case 2: + if (data_027e0cbc.func_0203d7e0(3) != 0) { + this->unk_388.func_02034b0c(0xBE, 0, 0, 0, 0); + } + break; + case 6: + if (data_027e0cbc.func_0203d7e0(0x58) != 0) { + this->unk_388.func_02034b0c(0x013B, 0, 0, 0, 0); + } + break; + } + } + + iVar5 = this->func_02032fa4(); + iVar8 = bVar1->unk_18; + uVar9 = data_02056a04[iVar8]; + func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); + iVar6 = this->unk_158 - local_94; + iVar7 = this->unk_15A - local_98; + + if ((this->unk_15E != 7) && (this->func_0203a2c0() != 0)) { + func_01ffbe34(&aStack_48); + func_020347b0(uVar9, data_02056a10[iVar8], &local_9c, &local_a0, 4, 4); + local_9c += param_2 + local_8c + iVar6; + local_a0 += param_3 + local_90 + iVar7; + + if (data_027e0c38[5] == 1) { + iVar8 = func_0202ab48(); + + if (iVar8 == 0) { + iVar8 = 0; + } else { + iVar8 = -3; + } + + local_9c = (0x108 - local_9c) + iVar8; + } + + if ((this->unk_57F == 0) && (this->unk_56C <= 0)) { + func_01ffbe34(&aStack_68); + aStack_68.mUnk_0a = 1; + this->unk_1F0.func_02034a1c(local_9c, local_a0, &aStack_68); + } else { + func_02034984(iVar5 != 0 ? 0x11F : 0x18, 0, local_9c, local_a0 + 2, 0); + } + } + + if (this->unk_08 != 0) { + if ((this->unk_08->unk_1C == 1 || this->unk_08->unk_1C == 2) == 0) { + return; + } + + func_01ffbe34(&aStack_88); + aStack_88.mUnk_0a = 1; + func_02034698(iVar5 != 0 ? 0x11F : 0x18, 2, &iStack_a4, &iStack_a8); + iStack_a4 += param_2 + local_8c + iVar6; + iStack_a8 += param_3 + local_90 + iVar7; + this->unk_278.func_02034a1c(iStack_a4, iStack_a8, &aStack_88); + } +} + +// non-matching (regalloc) +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a328(void) { + if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { + this->func_02038b40(); + } + + this->unk_410.func_0203ec34(); +} + +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3fc(s32 touchLastX, s32 touchLastY) { + unk32 iVar2; + unk32 iVar5; + unk32 iStack_14; + unk32 iStack_18; + + if (this->unk_15C <= 0 || this->func_0203951c() == 0) { + return; + } + + iStack_14 = 0; + iStack_18 = 0; + + this->func_0203bdcc(&iStack_14, &iStack_18); + + iVar5 = touchLastX - iStack_14; + iVar2 = touchLastY - iStack_18; + + if ((data_027e103c != 0 && data_027e103c->mUnk_1c == 0x8F) || (data_027e077c.mUnk_0 != data_027e077c.mUnk_4)) { + return; + } + + if ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { + if ((data_027e0d78.mFlags & 1) != 0) { + if (this->unk_50 == 0 && data_027e0d38 != 0) { + if (func_ov000_02079e04() == 0 && data_027e0e28->func_ov000_0207bc48() == 0) { + if (data_027e0618[0x101] == 0 && data_027e103c->mUnk_24 == 0) { + return; + } + } + } + + if (this->func_0203a6d0(iVar5, iVar2) == 0 && this->func_0203a2c0() != 0) { + this->unk_57F = 1; + } + } else { + if (data_027e0d78.mTouch != 0) { + this->func_0203a6d0(iVar5, iVar2); + return; + } + + if (data_027e0d78.mTouch == 0) { + switch(this->unk_151) { + case 3: + case 4: + break; + case 5: + if (data_027e103c->mUnk_20 == 3) { + this->func_0203b0ec(1); + } + break; + case 6: + if (data_027e103c->mUnk_20 == 5) { + this->func_0203b0ec(1); + } + break; + case 7: + break; + case 2: + //! TODO: fixme + // if (this->unk_164->unk_168.unk_06 <= 0) { + // if ((data_027e0d78.mFlags & 2) != 0) { + // this->unk_13C = 0; + + // if (this->func_0203b0bc() != 0) { + // this->func_0203b0ec(1); + // } + + // this->unk_1F0.unk_64 = 0; + // this->unk_1F0.func_020352d8(); + // } + // } + break; + case 0: + case 1: + default: + if ((data_027e0d78.mFlags & 2) != 0) { + this->unk_13C = 0; + + if (this->func_0203b0bc() != 0) { + this->func_0203b0ec(1); + } + + this->unk_1F0.unk_64 = 0; + this->unk_1F0.func_020352d8(); + } + break; + } + } + } + } +} + +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { + bool bVar5; + bool bVar2; + int iVar4; + int iVar6; + s16 temp; + + iVar6 = param_4[0]; + + if (data_027e0c54 != 0) { + UnkStruct_027E0C68_UnkSubClass1_Sub1* pVar4 = data_027e0c68.func_02036700(); + + if (pVar4 != NULL && pVar4->unk_15C > 0) { + this->func_02038b40(); + } + } + + if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { + UnkStruct_027E0C68_UnkSubClass1_Sub1* pVar4 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)data_027e0c68.unk_28[4]; + + if (pVar4 != NULL && pVar4->unk_15C > 0) { + this->func_02038b40(); + } + } + + this->unk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; + temp = param_4[8]; + + if (temp >= 0 && param_4[9] >= 0) { + temp = param_4[10]; + } + + if (temp < 0) { + this->unk_57B = temp; + } else { + this->unk_57B = 0; + } + + this->func_02038f44(param_2, param_3, param_4, param_5, iVar6); + this->unk_574 = 0; + + if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param_4[11])) { + data_027e103c->func_ov000_020cf284(0x80, 0); + } +} + +// non-matching (can't get the switch decomp...) +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a988(void) { + short sVar1; + int iVar2; + u16* puVar3; + int iVar4; + u16 uVar5; + unk8 uVar6; + u16 *local_54 [17]; + + if ((this->unk_18 & 0x1FFFFFFF) != 8) { + this->func_0203e060(0xE0, 0x40); + + if (this->unk_154 == 0) { + iVar2 = 2; + } else { + iVar2 = (int)*(char *)(this->unk_154->unk_05); + } + + this->func_0203dcfc(this->unk_50, 0, (int)this->unk_11E, iVar2); + } + + this->unk_410.func_0203ebe0(); + this->unk_580 = 0; + this->func_020392b4(); + this->unk_57C = 0; + //! TODO: fixme + // this->unk_164->unk_168.unk_06 = 0; + this->unk_57D = 0; + this->unk_57F = 0; + this->unk_57A = 0; + + if (this->unk_154->unk_06 < 2) { + this->unk_580 = 1; + } + + this->unk_424.func_0203ee48(); + this->unk_151 = 1; + puVar3 = this->unk_12C; + local_54[0] = puVar3; + iVar2 = 0; + + for (iVar2 = 0; func_01ff9b88(iVar2, this->unk_154->unk_06) == 0; iVar2++, puVar3 = this->func_02037604(local_54)) { + if (local_54[iVar2] != NULL) { + puVar3 = local_54[iVar2]; + } + + if (local_54[iVar2] == NULL || puVar3 == NULL) { + break; + } + + if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { + uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; + if (0x00010017 < uVar5) { + if (uVar5 == 0x00020001) { + //! TODO: fixme + // sVar1 = this->unk_164->unk_168.unk_06; + + // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; + // (param_1 + sVar1 * 2 + 0x562)[1] = 0; + } + } else { + // switch (*local_54[iVar2]) { + // case 0: + // continue; + // case 1: + // case 2: + // case 3: + // case 4: + // if (this->unk_164->unk_168.unk_06 == 0) { + // this->func_0203cabc(this->unk_164->unk_50); + // this->unk_164->unk_50 = 0x1A; // ??? + + // while (this->unk_564 < 4) { + // this->unk_564--; // ??? + // } + + // this->unk_580 = 1; + // } else { + // this->unk_151 = 4 + // } + // break; + // case 5: + // case 6: + // case 7: + // case 8: + // case 9: + // case 10: + // case 11: + // case 12: + // case 13: + // case 14: + // case 15: + // case 16: + // case 17: + // case 18: + // case 19: + // case 20: + // case 21: + // case 22: + // case 23: + // case 24: + // case 25: + // sVar1 = this->unk_164->unk_168.unk_06; + // break; + // default: + // return; + // } + } + } + + if (*local_54[iVar2] == '\n') { + continue; + } + } + +/* while(true) { + + // switch (*local_54[iVar2]) { + // case ESCAPE_SEQUENCE_MARKER: + // case '\n': + // } + + if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { + uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; + if (0x00010017 < uVar5) { + if (uVar5 == 0x00020001) { + sVar1 = this->unk_164->unk_168.unk_06; + // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; + // (param_1 + sVar1 * 2 + 0x562)[1] = 0; + } + } else { + /* WARNING: Could not recover jumptable at 0x0203aa7c. Too many branches */ + /* WARNING: Treating indirect jump as call + // if (-1 < (int)(uVar5 - 0x10000)) { + // (*(code *)((uVar5 - 0x10000) * 4 + 0x203aa84))(); + // return; + // } + } + } else if (*local_54[iVar2] == '\n') { + iVar2 = iVar2 + 1; + iVar4 = func_01ff9b88(iVar2, this->unk_154->unk_06); + + if (iVar4 == 0) { + break; + } + } + } + */ + if (this->unk_15E == '\x06') { + this->func_0203e060(0xE0, 0x30); + + if (this->unk_154 == 0) { + iVar2 = 2; + } else { + iVar2 = this->unk_154->unk_05; + } + + this->func_0203dcfc(this->unk_50,0,(int)this->unk_11E,iVar2); + } + + if (this->unk_580 != 0) { + this->func_0203e060(0xE0, 0x28); + + if (this->unk_154 == 0) { + iVar2 = 2; + } else { + iVar2 = this->unk_154->unk_05; + } + + this->func_0203dcfc(this->unk_50, 0, this->unk_11E, iVar2); + + if (this->unk_50 == 0) { + uVar6 = 1; + } else { + uVar6 = 7; + } + + // *(undefined *)((int)PTR_PTR_0203aea4->unk_28 + ((byte)param_1[0x50] - 0x28)) = uVar6; + // PTR_PTR_0203aea4[this->unk_50] = uVar6; + data_027e0c68.unk_28[this->unk_50]->unk_18 = uVar6; + this->func_0203b764(); + + if (this->unk_15F == 0 || this->unk_154->unk_06 < 3) { + this->unk_168.unk_64 = this->unk_168.unk_7C; + this->unk_168.func_020352d8(); + } else { + this->unk_168.func_020351b8(1, 0, 0, 0); + } + } + + this->unk_1F0.unk_64 = 0; + this->unk_1F0.func_020352d8(); + this->func_02039578(0, 0, 0, 0); + // (**(code **)(*(int *)param_1 + 0x10))(0); +} + +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203aea8(void) { + if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { + this->unk_168.unk_64 = this->unk_168.unk_7C; + this->unk_168.func_020352d8(); + } else { + this->unk_168.unk_64 = 0; + this->unk_168.func_020352d8(); + this->unk_168.func_020351b8(1, 0, 0, 0); + } +} + +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203af1c(void) { + bool bVar1; + unk8* puVar2; + int iVar3; + char *pcVar4; + + if (this->unk_160 != 0) { + if (data_027e103c != NULL) { + if (data_027e103c->func_ov000_020cf4bc() != 0) { + puVar2 = data_027e103c->func_ov000_020cef9c(); + + if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { + puVar2 = data_027e103c->func_ov000_020cef9c(); + + if ((UnkStruct_027E0C68_UnkSubClass1_Sub1*)(puVar2 + 0x244) == this) { + data_027e103c->func_ov000_020cfb38(); + } + } + } + + if (this->unk_581 != 0 && data_027e103c->func_ov000_020cf488() != 0) { + data_027e103c->func_ov000_020cfa24(); + this->unk_581 = 0; + } + + if (this->unk_582 != 0) { + data_027e103c->func_ov000_020cfe40(0, 2); + this->unk_582 = 0; + } + + if (this->unk_583 != 0) { + data_027e103c->func_ov005_02104028(0); + this->unk_583 = 0; + } + } + + if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.unk_04 + 0x99) != 0 && + (data_027e077c.mUnk_0 != 0x39 || data_027e103c->func_ov000_020cf0bc())) { + data_027e1054.func_ov003_020f4874(); + data_027e103c->func_ov005_02103f8c(data_02057ed4); + } + } + + this->func_02039398(); +} + +// non-matching (regalloc) +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { + u16 sVar1; + u32 uVar4; + s32 unaff_r4; + bool bVar5; + + if (this->func_0203951c() == 0) { + return 1; + } + + if (this->unk_580 != 0) { + unaff_r4 = -0xC; + } else { + unaff_r4 = 0; + } + + sVar1 = param_2->mUnk_4[0]; + + if (sVar1 != 0x1A || sVar1 == 0x1A) { + bVar5 = true; + + if (sVar1 == 0x1A) { + uVar4 = (param_2->mUnk_0[3] << 0x10) | ((u16*)param_2->mUnk_0)[2]; + + if (((uVar4 == 0x0001000A || uVar4 == 0x00020000) || uVar4 == 0x00FF0000)) { + bVar5 = false; + } + } + + if (bVar5) { + this->unk_424.func_0203ee80(this->unk_130); + } + } + + return this->func_0203e284(param_2, param_3, param_4 + unaff_r4); +} + +// non-matching +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { + int iVar1; + u16* psVar3; + + psVar3 = param_3->mUnk_4; + + if (psVar3[0] == 10) { + this->unk_424.func_0203ef78(this->unk_130, psVar3[0], param_4); + this->unk_574++; + + if (this->func_0203a30c() == 0) { + this->unk_153 = 1; + } + } + + if (this->unk_15E == 6) { + return 1; + } + + switch (this->unk_57A) { + case 0: + return this->func_0203905c(param_2, param_3, param_4, param_5); + case 1: + iVar1 = this->func_0203a30c(); + return this->unk_164->func_0203cb5c(param_2, ((this->unk_428[this->unk_528[iVar1]] & ~0xFFFF))); + default: + break; + } + + return 0; +} + +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b410(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { + unk16 sVar1; + unk16 uVar2; + unk32 iVar3; + unk32 iVar4; + unk32 uVar5; + u32 uVar6; + + uVar6 = 0; + + if (this->func_02032fa4() == 0) { + switch(param_2->unk_0C) { + case 0: + case 1: + uVar6 = this->unk_580 != 0; + break; + case 2: + uVar6 = 2; + break; + case 3: + uVar6 = 3; + break; + case 5: + uVar6 = 4; + break; + case 6: + uVar6 = 5; + break; + default: + // why??? + switch (param_2->unk_0C) { + case 4: + uVar6 = 8; + break; + case 7: + uVar6 = 9; + break; + default: + if (this->unk_580 != 0) { + uVar6 = 7; + } else { + uVar6 = 6; + } + break; + } + break; + } + } + + // PTR_PTR_0203b5ac[(byte)param_1[0x50]] = (char)uVar6; + data_027e0c68.unk_28[this->unk_50]->unk_50 = uVar6; + + if (this->unk_15E == 7) { + uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); + func_02032304(data_02068894, data_02057ed8, data_02056af0, 1, param_4); + iVar3 = func_02016fcc(uVar5); + } else { + if (this->func_02032fa4() != 0) { + uVar5 = 0x33; + } else { + uVar5 = 0x32; + } + + data_027e0cbc.func_0203d77c(uVar5, 1, 1); + iVar3 = data_027e0cbc.func_0203d77c(data_02056a00[uVar6 * 0x18] - 2, 1, 1); + } + + if (param_2->unk_10 < 0) { + iVar3 = param_2->unk_12; + } + + if (param_2->unk_10 <= 0 && iVar3 > 0) { + uVar2 = param_2->unk_12; + this->unk_158 = param_2->unk_10; + this->unk_15A = uVar2; + } else { + this->func_0203b764(); + } +} + +// non-matching (regalloc) +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b5d0(unk32 param_2) { + unk32 uVar2; + + if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { + uVar2 = 0x16; + } else { + uVar2 = 0; + } + + this->unk_124->func_0203f020(param_2, uVar2); + this->func_0203be08(); + + if (this->func_02032fa4()) { + this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); + } else { + this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); + } + + this->unk_168.func_020351b8(1, 0, 0, 0); + this->unk_1F0.func_020351b8(0, 0, 0, 0); + this->unk_278.func_020351b8(0, 0, 0, 0); + this->func_020393a8(param_2); +} + +// switch decomp issue +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b814(UNK_TYPE) { + // TODO +} + +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203bdcc(unk32* param_2, unk32* param_3) { + this->func_0203947c(); + *param_2 += this->unk_56E; + *param_3 += this->unk_570; +} + +ARM UnkStruct_027E0C68_UnkSubClass1_Sub1::~UnkStruct_027E0C68_UnkSubClass1_Sub1() { + this->unk_388.func_020350ac(); + this->unk_300.func_020350ac(); + this->unk_278.func_020350ac(); + this->unk_1F0.func_020350ac(); + this->unk_168.func_020350ac(); + this->func_02038b1c(); +} + +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c350(void) { + return true; +} diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp new file mode 100644 index 00000000..53a37f9a --- /dev/null +++ b/src/Main/Message/func_0203c8a8.cpp @@ -0,0 +1,40 @@ +#include "global.h" +#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "Message/MessageManager.hpp" +#include "Save/AdventureFlags.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Player/TouchControl.hpp" +#include "Item/ItemManager.hpp" + +// non-matching +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203dcb4(unk32 param_2, unk32 param_3) { + unk32 uVar1; + unk32 local_c; + unk32 local_10; + + local_c = param_2; + local_10 = param_3; + + this->func_02032fa4(); + this->func_0203fc78(&local_c, &local_10); + this->func_02032fcc(local_c, local_10); + this->unk_10 = 0; + return true; +} + +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e060(u8 param_2, u8 param_3) { + this->func_0203dc10(1, param_3); + this->unk_11E = param_2; + this->unk_118 = -1; + this->func_020331c4(param_2, -1); +} + +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e0c8(void) { + if (this->unk_122 != 0) { + this->func_0203e0f8(); + this->func_0203dc10(0); + return true; + } + + return false; +} From 06a1f74615de91663c877fe526790b2323edcbf9 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:21:40 +0100 Subject: [PATCH 30/64] fix function names (and more) --- config/eur/arm9/symbols.txt | 58 +++--- config/usa/arm9/symbols.txt | 58 +++--- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 182 ++++++++++++------ src/Main/Message/MessageManager.cpp | 36 ++-- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 14 +- src/Main/Message/func_020397f8.cpp | 40 ++-- src/Main/Message/func_0203c8a8.cpp | 4 +- 7 files changed, 223 insertions(+), 169 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 94fd6b55..cf99695c 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1813,7 +1813,7 @@ _ZN18UnkStruct_027E0C6813func_02036ce4EP31UnkStruct_027E0C68_UnkSubClass2i kind: _ZN18UnkStruct_027E0C6813func_02036d30EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x1c) addr:0x2036d30 _ZN18UnkStruct_027E0C6813func_02036d4cEP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x20) addr:0x2036d4c _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c -_ZN18UnkStruct_027E0C6813func_02036da8EjPi kind:function(arm,size=0x134) addr:0x2036da8 +_ZN18UnkStruct_027E0C6813func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036da8 _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036edc _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f68 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x20370d0 @@ -1881,12 +1881,12 @@ func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 _Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1_Sub1 kind:function(arm,size=0x34) addr:0x2038b40 func_02038b74 kind:function(arm,size=0x4) addr:0x2038b74 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b78 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038c34Ei kind:function(arm,size=0x84) addr:0x2038c34 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038c34 func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038cb8 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cf4 func_02038d10 kind:function(arm,size=0x10) addr:0x2038d10 func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038d20 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038ed0Ev kind:function(arm,size=0x24) addr:0x2038ed0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038ed0 func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038ef4 func_02038f40 kind:function(arm,size=0x4) addr:0x2038f40 func_02038f44 kind:function(arm,size=0x114) addr:0x2038f44 @@ -1894,58 +1894,58 @@ func_02039058 kind:function(arm,size=0x4) addr:0x2039058 func_0203905c kind:function(arm,size=0x48) addr:0x203905c func_020390a4 kind:function(arm,size=0x164) addr:0x20390a4 func_02039208 kind:function(arm,size=0x20) addr:0x2039208 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039228EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 func_02039250 kind:function(arm,size=0x64) addr:0x2039250 func_020392b4 kind:function(arm,size=0xe4) addr:0x20392b4 func_02039398 kind:function(arm,size=0xc) addr:0x2039398 func_020393a4 kind:function(arm,size=0x4) addr:0x20393a4 func_020393a8 kind:function(arm,size=0x28) addr:0x20393a8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020393d0Ei kind:function(arm,size=0x70) addr:0x20393d0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_68Ei kind:function(arm,size=0x70) addr:0x20393d0 func_02039440 kind:function(arm,size=0x3c) addr:0x2039440 func_0203947c kind:function(arm,size=0x5c) addr:0x203947c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020394d8EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 func_0203951c kind:function(arm,size=0x40) addr:0x203951c func_0203955c kind:function(arm,size=0x14) addr:0x203955c func_02039570 kind:function(arm,size=0x8) addr:0x2039570 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039578 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039578 func_020395b4 kind:function(thumb,size=0x244) addr:0x20395b4 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397f8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a5c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a5c func_02039ca8 kind:function(arm,size=0x24) addr:0x2039ca8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039ccc -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039d74Eii kind:function(arm,size=0x414) addr:0x2039d74 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039ccc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d74 func_0203a188 kind:function(arm,size=0x138) addr:0x203a188 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a2c0 func_0203a30c kind:function(arm,size=0x1c) addr:0x203a30c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a328 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a328 func_0203a35c kind:function(arm,size=0x84) addr:0x203a35c func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a3e0 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3fc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3fc func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a6d0 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7f0 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a988 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203aea8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203af1cEv kind:function(arm,size=0x1a0) addr:0x203af1c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7f0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a988 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203aea8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203af1c func_0203b0bc kind:function(arm,size=0x30) addr:0x203b0bc func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0ec -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b410 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b5d0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b410 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b5d0 func_0203b764 kind:function(arm,size=0xb0) addr:0x203b764 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b814 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b814 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd8c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203bdccEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc func_0203be08 kind:function(arm,size=0x5c) addr:0x203be08 func_0203be64 kind:function(arm,size=0x220) addr:0x203be64 func_0203c084 kind:function(arm,size=0xb8) addr:0x203c084 func_0203c13c kind:function(arm,size=0x64) addr:0x203c13c func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c1a0 func_0203c25c kind:function(arm,size=0x6c) addr:0x203c25c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c310 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c350 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c310 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c350 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3C1Ev kind:function(thumb,size=0x44) addr:0x203c358 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c39c func_0203c414 kind:function(arm,size=0x4c) addr:0x203c414 @@ -2030,16 +2030,16 @@ func_0203dba8 kind:function(thumb,size=0x38) addr:0x203dba8 func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203dbe0 func_0203dc10 kind:function(arm,size=0x64) addr:0x203dc10 func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc74 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203dcb4Eii kind:function(arm,size=0x48) addr:0x203dcb4 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dcb4 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcfc func_0203ddec kind:function(arm,size=0x10) addr:0x203ddec func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddfc _Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1_Sub1i kind:function(arm,size=0x10) addr:0x203de14 func_0203de24 kind:function(arm,size=0x34) addr:0x203de24 func_0203de58 kind:function(arm,size=0x208) addr:0x203de58 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 func_0203e090 kind:function(arm,size=0x38) addr:0x203e090 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e0c8Ev kind:function(arm,size=0x30) addr:0x203e0c8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e0c8 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0f8 func_0203e19c kind:function(arm,size=0x14) addr:0x203e19c func_0203e1b0 kind:function(arm,size=0xd4) addr:0x203e1b0 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 3b5e6bfe..f7d7b31a 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1813,7 +1813,7 @@ _ZN18UnkStruct_027E0C6813func_02036ce4EP31UnkStruct_027E0C68_UnkSubClass2i kind: _ZN18UnkStruct_027E0C6813func_02036d30EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x1c) addr:0x2036cec _ZN18UnkStruct_027E0C6813func_02036d4cEP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x20) addr:0x2036d08 _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 -_ZN18UnkStruct_027E0C6813func_02036da8EjPi kind:function(arm,size=0x134) addr:0x2036d64 +_ZN18UnkStruct_027E0C6813func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036d64 _ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036e98 _ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f24 _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x203708c @@ -1881,12 +1881,12 @@ func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0 _Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1_Sub1 kind:function(arm,size=0x34) addr:0x2038afc func_02038b74 kind:function(arm,size=0x4) addr:0x2038b30 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b34 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038c34Ei kind:function(arm,size=0x84) addr:0x2038bf0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0 func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038c74 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cb0 func_02038d10 kind:function(arm,size=0x10) addr:0x2038ccc func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038cdc -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02038ed0Ev kind:function(arm,size=0x24) addr:0x2038e8c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038e8c func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038eb0 func_02038f40 kind:function(arm,size=0x4) addr:0x2038efc func_02038f44 kind:function(arm,size=0x114) addr:0x2038f00 @@ -1894,58 +1894,58 @@ func_02039058 kind:function(arm,size=0x4) addr:0x2039014 func_0203905c kind:function(arm,size=0x48) addr:0x2039018 func_020390a4 kind:function(arm,size=0x164) addr:0x2039060 func_02039208 kind:function(arm,size=0x20) addr:0x20391c4 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039228EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 func_02039250 kind:function(arm,size=0x64) addr:0x203920c func_020392b4 kind:function(arm,size=0xe4) addr:0x2039270 func_02039398 kind:function(arm,size=0xc) addr:0x2039354 func_020393a4 kind:function(arm,size=0x4) addr:0x2039360 func_020393a8 kind:function(arm,size=0x28) addr:0x2039364 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020393d0Ei kind:function(arm,size=0x70) addr:0x203938c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_68Ei kind:function(arm,size=0x70) addr:0x203938c func_02039440 kind:function(arm,size=0x3c) addr:0x20393fc func_0203947c kind:function(arm,size=0x5c) addr:0x2039438 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_020394d8EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 func_0203951c kind:function(arm,size=0x40) addr:0x20394d8 func_0203955c kind:function(arm,size=0x14) addr:0x2039518 func_02039570 kind:function(arm,size=0x8) addr:0x203952c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039578Ehhhi kind:function(arm,size=0x3c) addr:0x2039534 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039534 func_020395b4 kind:function(thumb,size=0x244) addr:0x2039570 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397b4 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a5cEv kind:function(arm,size=0x24c) addr:0x2039a18 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a18 func_02039ca8 kind:function(arm,size=0x24) addr:0x2039c64 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039cccEi kind:function(arm,size=0xa8) addr:0x2039c88 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039d74Eii kind:function(arm,size=0x414) addr:0x2039d30 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039c88 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d30 func_0203a188 kind:function(arm,size=0x138) addr:0x203a144 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a27c func_0203a30c kind:function(arm,size=0x1c) addr:0x203a2c8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a328Ev kind:function(arm,size=0x34) addr:0x203a2e4 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a2e4 func_0203a35c kind:function(arm,size=0x84) addr:0x203a318 func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a39c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a3fcEii kind:function(arm,size=0x2d4) addr:0x203a3b8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3b8 func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a68c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a7f0EP9EntryINF1iPh kind:function(arm,size=0x198) addr:0x203a7ac -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a988Ev kind:function(arm,size=0x520) addr:0x203a944 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203aea8Ev kind:function(arm,size=0x74) addr:0x203ae64 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203af1cEv kind:function(arm,size=0x1a0) addr:0x203aed8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7ac +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a944 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203ae64 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203aed8 func_0203b0bc kind:function(arm,size=0x30) addr:0x203b078 func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0a8 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b264EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b310EcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b410Ev kind:function(arm,size=0x1c0) addr:0x203b3cc -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b5d0Ei kind:function(arm,size=0x194) addr:0x203b58c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b3cc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b58c func_0203b764 kind:function(arm,size=0xb0) addr:0x203b720 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b814Ev kind:function(arm,size=0x578) addr:0x203b7d0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b7d0 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd48 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203bdccEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88 func_0203be08 kind:function(arm,size=0x5c) addr:0x203bdc4 func_0203be64 kind:function(arm,size=0x220) addr:0x203be20 func_0203c084 kind:function(arm,size=0xb8) addr:0x203c040 func_0203c13c kind:function(arm,size=0x64) addr:0x203c0f8 func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c15c func_0203c25c kind:function(arm,size=0x6c) addr:0x203c218 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c284 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c2cc -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c350Ev kind:function(arm,size=0x8) addr:0x203c30c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c284 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c2cc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c30c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3C1Ev kind:function(thumb,size=0x44) addr:0x203c314 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c358 func_0203c414 kind:function(arm,size=0x4c) addr:0x203c3d0 @@ -2030,16 +2030,16 @@ func_0203dba8 kind:function(thumb,size=0x38) addr:0x203db64 func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203db9c func_0203dc10 kind:function(arm,size=0x64) addr:0x203dbcc func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc30 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203dcb4Eii kind:function(arm,size=0x48) addr:0x203dc70 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dc70 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcb8 func_0203ddec kind:function(arm,size=0x10) addr:0x203dda8 func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddb8 _Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1_Sub1i kind:function(arm,size=0x10) addr:0x203ddd0 func_0203de24 kind:function(arm,size=0x34) addr:0x203dde0 func_0203de58 kind:function(arm,size=0x208) addr:0x203de14 -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c func_0203e090 kind:function(arm,size=0x38) addr:0x203e04c -_ZN31UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e0c8Ev kind:function(arm,size=0x30) addr:0x203e084 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e084 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0b4 func_0203e19c kind:function(arm,size=0x14) addr:0x203e158 func_0203e1b0 kind:function(arm,size=0xd4) addr:0x203e16c diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index 447cb216..e6a985f9 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -228,33 +228,33 @@ public: UnkStruct_027E0C68_UnkSubClass1_Base(); /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base(); - /* 0x08 */ virtual UNK_TYPE vfunc_08(void); // func_0203c2c8 (dtor?) - /* 0x0C */ virtual void func_02039228(unk32* param_2, unk32* param_3); - /* 0x10 */ virtual void func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); - /* 0x14 */ virtual void func_0203e060(u8 param_2, u8 param_3); - /* 0x18 */ virtual bool func_0203dcb4(unk32 param_2, unk32 param_3); - /* 0x1C */ virtual unk32 func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4); - /* 0x20 */ virtual unk32 func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); - /* 0x24 */ virtual UNK_TYPE func_0203b814(UNK_TYPE); - /* 0x28 */ virtual bool func_0203e0c8(void); - /* 0x2C */ virtual void func_02039a5c(void); - /* 0x30 */ virtual void func_02038ed0(void); - /* 0x34 */ virtual unk32 func_02038c34(unk32 param_2); - /* 0x38 */ virtual bool func_0203c350(void); - /* 0x3C */ virtual void func_02039ccc(unk32 param_2); - /* 0x40 */ virtual void func_02039d74(unk32 param_2, unk32 param_3); - /* 0x44 */ virtual void func_0203a3fc(s32 touchLastX, s32 touchLastY); - /* 0x48 */ virtual void func_0203a328(void); - /* 0x4C */ virtual void func_02039a3c(void); - /* 0x50 */ virtual void func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5); - /* 0x54 */ virtual void func_0203a988(void); - /* 0x58 */ virtual void func_0203af1c(void); - /* 0x5C */ virtual void func_0203aea8(void); - /* 0x60 */ virtual void func_0203b410(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4); - /* 0x64 */ virtual void func_0203b5d0(unk32 param_2); - /* 0x68 */ virtual unk32 func_020393d0(unk32 param_2); - /* 0x6C */ virtual void func_0203bdcc(unk32* param_2, unk32* param_3); - /* 0x70 */ virtual void func_020394d8(unk32* param_2, unk32* param_3); + /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3); + /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); + /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3); // func_0203e060? + /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3); + /* 0x18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4); + /* 0x1C */ virtual unk32 vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); + /* 0x20 */ virtual UNK_TYPE vfunc_20(UNK_TYPE); + /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE); + /* 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); // func_02039a3c? + /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 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(unk32 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_02032fa4(void); @@ -358,37 +358,41 @@ public: /* 0x588 */ u8 unk_588[0x2C]; /* 0x5B4 */ - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub1() override; - /* 0x08 */ virtual UNK_TYPE vfunc_08(void); // func_0203c2c8 (dtor? override) - /* 0x0C */ virtual void func_02039228(unk32* param_2, unk32* param_3) override; - /* 0x10 */ virtual void func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; - /* 0x14 */ virtual void func_0203e060(u8 param_2, u8 param_3) override; - /* 0x18 */ virtual bool func_0203dcb4(unk32 param_2, unk32 param_3) override; - /* 0x1C */ virtual unk32 func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; - /* 0x20 */ virtual unk32 func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; - /* 0x24 */ virtual UNK_TYPE func_0203b814(UNK_TYPE) override; - /* 0x28 */ virtual bool func_0203e0c8(void) override; - /* 0x2C */ virtual void func_02039a5c(void) override; - /* 0x30 */ virtual void func_02038ed0(void) override; - /* 0x34 */ virtual unk32 func_02038c34(unk32 param_2) override; - /* 0x38 */ virtual bool func_0203c350(void) override; - /* 0x3C */ virtual void func_02039ccc(unk32 param_2) override; - /* 0x40 */ virtual void func_02039d74(unk32 param_2, unk32 param_3) override; - /* 0x44 */ virtual void func_0203a3fc(s32 touchLastX, s32 touchLastY) override; - /* 0x48 */ virtual void func_0203a328(void) override; - /* 0x4C */ virtual void func_02039a3c(void) override; - /* 0x50 */ virtual void func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) override; - /* 0x54 */ virtual void func_0203a988(void) override; - /* 0x58 */ virtual void func_0203af1c(void) override; - /* 0x5C */ virtual void func_0203aea8(void) override; - /* 0x60 */ virtual void func_0203b410(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; - /* 0x64 */ virtual void func_0203b5d0(unk32 param_2) override; - /* 0x68 */ virtual unk32 func_020393d0(unk32 param_2) override; - /* 0x6C */ virtual void func_0203bdcc(unk32* param_2, unk32* param_3) override; - /* 0x70 */ virtual void func_020394d8(unk32* param_2, unk32* param_3) override; - /* 0x74 */ + //! TODO: remove the function declarations that are not overridden UnkStruct_027E0C68_UnkSubClass1_Sub1(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub1() override; + /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; + /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; + /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? + /* 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(unk8 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, unk32 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(unk32 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 */ + + void func_0203e060(u8 param_2, u8 param_3); + void func_02039a3c(void); }; class UnkStruct_027E0C68_UnkSubClass1_Sub2 : public UnkStruct_027E0C68_UnkSubClass1_Base { @@ -396,8 +400,39 @@ public: /* 0x15E */ u8 unk_15E[0x62]; /* 0x1C0 */ + //! TODO: remove the function declarations that are not overridden + UnkStruct_027E0C68_UnkSubClass1_Sub2(); - virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub2(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub2(); + /* 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(unk8 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, unk32 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(unk32 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 */ + }; class UnkStruct_027E0C68_UnkSubClass1_Sub3 : public UnkStruct_027E0C68_UnkSubClass1_Base { @@ -405,8 +440,39 @@ public: /* 0x15E */ u8 unk_15E[0x12]; /* 0x170 */ + //! TODO: remove the function declarations that are not overridden + UnkStruct_027E0C68_UnkSubClass1_Sub3(); - virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub3(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub3(); + /* 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(unk8 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, unk32 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(unk32 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 */ + }; // TEMPORARY diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 15573317..282ed162 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -5,27 +5,15 @@ extern ARM unk32 func_ov000_020d7f18(u32*, unk32); extern ARM unk32 func_ov000_020d77e4(u32*, unk32); extern ARM unk32 func_02037628(u8*); -extern THUMB unk32 func_0202ab48(void); extern ARM void func_0203dc74(UnkStruct_027E0C68_UnkSubClass1_Base*, unk32, unk32); -// see Actor.cpp -struct UnkStruct2 { - /* 0 */ u32 mUnk_0; - /* 4 */ u32 mUnk_4; - /* 8 */ -}; -extern UnkStruct2 data_027e077c; -extern u8 data_02056be4[]; extern u32 data_ov000_020eec9c[]; -extern u32 data_027e0618; extern u32** data_027e0ce0[]; extern u32 data_02056924[]; extern u32* data_02068e6c; extern u32* data_02068e8c; extern u16 data_02056918[]; extern ActorTypeId data_0205691c[]; -extern u8 data_027e0c54; -extern TouchControl data_027e0d78; extern s16 data_027e0d04; // this should be `data_027e0ffc->func_ov000_020cec60(u16, Vec3p*, s32);` @@ -45,7 +33,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 this->pGroups->func_020372f0(BMG_FILE_INDEX_SYSTEM, 2); - switch (data_027e0618) { + switch (*data_027e0618) { case 3: this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2); this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2); @@ -85,11 +73,11 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 this->unk_18[1]->unk_39 = 1; // switch? - if (data_027e0618 == 2 || data_027e0618 == 3 || data_027e0618 == 6) { + if (*data_027e0618 == 2 || *data_027e0618 == 3 || *data_027e0618 == 6) { for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { switch (data_02056924[i + 1]) { case 0: - if (data_027e0618 != 2) { + if (*data_027e0618 != 2) { this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Sub1(); func_0203dc74(this->unk_28[i], 0xE0, 0x40); this->unk_28[i]->unk_2C = data_02068e6c; @@ -118,7 +106,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 } if (this->unk_28[i] != NULL) { - this->unk_28[i]->func_02039a3c(); + this->unk_28[i]->vfunc_4C(); } } } @@ -306,7 +294,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { if (this->unk_28[i] != NULL) { - this->unk_28[i]->func_02039a5c(); + this->unk_28[i]->vfunc_2C(); } } @@ -366,7 +354,7 @@ ARM void UnkStruct_027E0C68::func_02036bbc(void) { pSVar3 = this->unk_28[i]; if (pSVar3 != NULL && ((bVar2 && pSVar3->unk_50 == 0) || (bVar4 && pSVar3->unk_50 != 0))) { - pSVar3->func_0203a3fc(data_027e0d78.mTouchLastX, data_027e0d78.mTouchLastY); + pSVar3->vfunc_44(data_027e0d78.mTouchLastX, data_027e0d78.mTouchLastY); } } } @@ -376,7 +364,7 @@ ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { if (this->unk_28[i] != NULL && this->unk_28[i]->func_0203de14(param_2) != 0) { - this->unk_28[i]->func_0203e0c8(); + this->unk_28[i]->vfunc_28(); } } } @@ -388,7 +376,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { UnkStruct_027E0C68_UnkSubClass1_Base* pSVar1 = this->unk_28[i]; if (pSVar1 != NULL) { - pSVar1->func_02039ccc(param_2); + pSVar1->vfunc_3C(param_2); } } } @@ -472,9 +460,9 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02036da8(u32 // iStack_34 = param_3[1]; // iStack_30 = param_3[2]; pBVar5 = this->pGroups; - // pSVar4->func_0203a7f0(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); + // pSVar4->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); BMGFileInfo* entry = &(pBVar5)->entries[(param_2) >> 0x10]; - pSVar4->func_0203a7f0(pEVar1, + pSVar4->vfunc_50(pEVar1, ((u32)entry->pDAT1 + (((func_02037258(entry, (((param_2))) & 0xFFFF))->offset) & ~1)), // BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); @@ -536,7 +524,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036f68(u32 pSVar5->unk_164 = pSVar2; pSVar5->unk_418 = this->unk_28[5]; - pSVar5->func_0203a7f0(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s16*)param_3, 0); + pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s16*)param_3, 0); if (func_ov000_020d7f18(data_ov000_020eec9c, 0x19) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x18) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x34) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x35) == 0 && @@ -582,7 +570,7 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { pSVar1 = this->func_02037178(param_2); if (pSVar1 != NULL) { - pSVar1->func_0203af1c(); + pSVar1->vfunc_58(); } } diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index 16cb9de9..3c206b20 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -6,7 +6,7 @@ #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02038c34(unk32 param_2) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_34(unk32 param_2) { s16 iVar1; unk32 iVar2; unk32 iVar3; @@ -27,7 +27,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02038c34(unk32 param_2) { return func_01ff9b4c(iVar2 + iVar3 / 2, uVar4); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02038ed0(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_30(void) { if (this->unk_15C > 0) { this->func_0203e090(); } else { @@ -36,13 +36,13 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02038ed0(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039228(unk32* param_2, unk32* param_3) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_08(unk32* param_2, unk32* param_3) { this->unk_15C = 10; this->unk_152 = 1; this->func_0203e2ac(param_3); } -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_020393d0(unk32 param_2) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_68(unk32 param_2) { switch (param_2) { case 0: break; @@ -65,13 +65,13 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_020393d0(unk32 param_2) { return ((this->unk_18 << 3) - this->func_020337d8(param_2)) / 2; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_020394d8(unk32* param_2, unk32* param_3) { - this->func_0203bdcc(param_2, param_3); +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_70(unk32* param_2, unk32* param_3) { + this->vfunc_6C(param_2, param_3); *param_2 += this->unk_158; *param_3 += this->unk_15A; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039578(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { this->func_0203dc10(1, param_3); this->func_02033190(param_2, param_3, param_4, param_5); } diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index 1519e764..96616221 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -13,7 +13,7 @@ THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a3c(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a5c(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_2C(void) { if (data_027e0618[0x101] != 0) { if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { return; @@ -88,7 +88,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a5c(void) { } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ccc(unk32 param_2) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_3C(unk32 param_2) { if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { if (this->unk_124->unk_29 != 3) { if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { @@ -101,14 +101,14 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ccc(unk32 param_2) { } } - this->func_02039d74(0, 0); + this->vfunc_40(0, 0); } } } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039d74(unk32 param_2, unk32 param_3) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 param_3) { UnkStruct_027E0C68_UnkSubClass1_Base* bVar1; s8 cVar2; unk32 iVar4; @@ -133,7 +133,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039d74(unk32 param_2, unk3 local_90 = 0; bVar1 = data_027e0c68.unk_28[this->unk_50]; - this->func_0203bdcc(&local_8c, &local_90); + this->vfunc_6C(&local_8c, &local_90); this->func_0203a188(local_8c + param_2, local_90 + param_3); this->func_0203e1b0(param_2 + local_8c + (this->unk_158 - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_15A - (this->unk_18 << 3) / 2), 0); @@ -214,7 +214,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039d74(unk32 param_2, unk3 } // non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a328(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_48(void) { if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { this->func_02038b40(); } @@ -223,7 +223,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a328(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3fc(s32 touchLastX, s32 touchLastY) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_44(s32 touchLastX, s32 touchLastY) { unk32 iVar2; unk32 iVar5; unk32 iStack_14; @@ -236,7 +236,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3fc(s32 touchLastX, s32 iStack_14 = 0; iStack_18 = 0; - this->func_0203bdcc(&iStack_14, &iStack_18); + this->vfunc_6C(&iStack_14, &iStack_18); iVar5 = touchLastX - iStack_14; iVar2 = touchLastY - iStack_18; @@ -317,7 +317,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3fc(s32 touchLastX, s32 } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a7f0(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { bool bVar5; bool bVar2; int iVar4; @@ -364,7 +364,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a7f0(EntryINF1* param_2, } // non-matching (can't get the switch decomp...) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a988(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { short sVar1; int iVar2; u16* puVar3; @@ -556,11 +556,11 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a988(void) { this->unk_1F0.unk_64 = 0; this->unk_1F0.func_020352d8(); - this->func_02039578(0, 0, 0, 0); + this->vfunc_0C(0, 0, 0, 0); // (**(code **)(*(int *)param_1 + 0x10))(0); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203aea8(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_5C(void) { if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { this->unk_168.unk_64 = this->unk_168.unk_7C; this->unk_168.func_020352d8(); @@ -572,7 +572,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203aea8(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203af1c(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_58(void) { bool bVar1; unk8* puVar2; int iVar3; @@ -619,7 +619,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203af1c(void) { } // non-matching (regalloc) -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b264(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { u16 sVar1; u32 uVar4; s32 unaff_r4; @@ -657,7 +657,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b264(UnkStruct_0203b264 } // non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b310(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { int iVar1; u16* psVar3; @@ -690,7 +690,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b310(unk8 param_2, UnkS } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b410(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { unk16 sVar1; unk16 uVar2; unk32 iVar3; @@ -771,7 +771,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b410(func_0203b410_param } // non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b5d0(unk32 param_2) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_64(unk32 param_2) { unk32 uVar2; if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { @@ -800,11 +800,11 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b5d0(unk32 param_2) { } // switch decomp issue -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b814(UNK_TYPE) { +ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_20(UNK_TYPE) { // TODO } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203bdcc(unk32* param_2, unk32* param_3) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_6C(unk32* param_2, unk32* param_3) { this->func_0203947c(); *param_2 += this->unk_56E; *param_3 += this->unk_570; @@ -819,6 +819,6 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub1::~UnkStruct_027E0C68_UnkSubClass1_Sub1( this->func_02038b1c(); } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c350(void) { +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_38(void) { return true; } diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp index 53a37f9a..90fc7dd3 100644 --- a/src/Main/Message/func_0203c8a8.cpp +++ b/src/Main/Message/func_0203c8a8.cpp @@ -7,7 +7,7 @@ #include "Item/ItemManager.hpp" // non-matching -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203dcb4(unk32 param_2, unk32 param_3) { +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_14(unk32 param_2, unk32 param_3) { unk32 uVar1; unk32 local_c; unk32 local_10; @@ -29,7 +29,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e060(u8 param_2, u8 para this->func_020331c4(param_2, -1); } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e0c8(void) { +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_28(void) { if (this->unk_122 != 0) { this->func_0203e0f8(); this->func_0203dc10(0); From f04fd8f032a61d6498a48d0b5cd7ec8884a94fee Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Tue, 28 Jan 2025 01:37:09 +0100 Subject: [PATCH 31/64] reverse ctor adventure --- config/eur/arm9/symbols.txt | 14 +- config/usa/arm9/symbols.txt | 10 +- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 302 +++++++++++++----- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 2 +- src/Main/Message/func_02032f0c.cpp | 25 ++ src/Main/Message/func_0203744c.cpp | 13 + src/Main/Message/func_020397f8.cpp | 80 ++++- src/Main/Message/func_0203c8a8.cpp | 38 +++ 8 files changed, 383 insertions(+), 101 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index cf99695c..d61f2970 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1647,7 +1647,7 @@ func_02032e44 kind:function(arm,size=0x1c) addr:0x2032e44 func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e60 func_02032e7c kind:function(arm,size=0x48) addr:0x2032e7c func_02032ec4 kind:function(arm,size=0x48) addr:0x2032ec4 -func_02032f0c kind:function(thumb,size=0x78) addr:0x2032f0c +_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_1C2Ev kind:function(thumb,size=0x78) addr:0x2032f0c func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f84 func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f88 func_02032f94 kind:function(thumb,size=0x4) addr:0x2032f94 @@ -1733,7 +1733,7 @@ func_02034fc0 kind:function(arm,size=0x14) addr:0x2034fc0 func_02034fd4 kind:function(arm,size=0x38) addr:0x2034fd4 func_0203500c kind:function(arm,size=0x10) addr:0x203500c func_0203501c kind:function(arm,size=0x48) addr:0x203501c -func_02035064 kind:function(arm,size=0x48) addr:0x2035064 +_ZN25UnkSubClass1_UnkownClass1C1Ev kind:function(arm,size=0x48) addr:0x2035064 func_020350ac kind:function(arm,size=0x4) addr:0x20350ac func_020350b0 kind:function(arm,size=0x4) addr:0x20350b0 func_020350b4 kind:function(arm,size=0xb8) addr:0x20350b4 @@ -1872,7 +1872,7 @@ func_02038888 kind:function(arm,size=0xc8) addr:0x2038888 func_02038950 kind:function(arm,size=0x130) addr:0x2038950 func_02038a80 kind:function(arm,size=0x1c) addr:0x2038a80 func_02038a9c kind:function(thumb,size=0x4) addr:0x2038a9c -func_02038aa0 kind:function(thumb,size=0x5c) addr:0x2038aa0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseC1Eic kind:function(thumb,size=0x5c) addr:0x2038aa0 func_02038afc kind:function(thumb,size=0xc) addr:0x2038afc func_02038b08 kind:function(thumb,size=0x14) addr:0x2038b08 func_02038b1c kind:function(thumb,size=0xc) addr:0x2038b1c @@ -1908,8 +1908,8 @@ func_0203951c kind:function(arm,size=0x40) addr:0x203951c func_0203955c kind:function(arm,size=0x14) addr:0x203955c func_02039570 kind:function(arm,size=0x8) addr:0x2039570 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039578 -func_020395b4 kind:function(thumb,size=0x244) addr:0x20395b4 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397f8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C2Eic kind:function(thumb,size=0x244) addr:0x20395b4 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Eic kind:function(thumb,size=0x244) addr:0x20397f8 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a5c func_02039ca8 kind:function(arm,size=0x24) addr:0x2039ca8 @@ -2024,7 +2024,7 @@ func_0203d848 kind:function(arm,size=0x8c) addr:0x203d848 func_0203d8d4 kind:function(arm,size=0x8c) addr:0x203d8d4 func_0203d960 kind:function(arm,size=0xc0) addr:0x203d960 func_0203da20 kind:function(arm,size=0xc0) addr:0x203da20 -func_0203dae0 kind:function(thumb,size=0x98) addr:0x203dae0 +_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0C2Ecii kind:function(thumb,size=0x98) addr:0x203dae0 func_0203db78 kind:function(thumb,size=0x30) addr:0x203db78 func_0203dba8 kind:function(thumb,size=0x38) addr:0x203dba8 func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203dbe0 @@ -2034,7 +2034,7 @@ _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_14Eii kind:function(arm,size=0x4 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcfc func_0203ddec kind:function(arm,size=0x10) addr:0x203ddec func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddfc -_Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1_Sub1i kind:function(arm,size=0x10) addr:0x203de14 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Base13func_0203de14Ei kind:function(arm,size=0x10) addr:0x203de14 func_0203de24 kind:function(arm,size=0x34) addr:0x203de24 func_0203de58 kind:function(arm,size=0x208) addr:0x203de58 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index f7d7b31a..764f42f0 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1647,7 +1647,7 @@ func_02032e44 kind:function(arm,size=0x1c) addr:0x2032e40 func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e5c func_02032e7c kind:function(arm,size=0x48) addr:0x2032e78 func_02032ec4 kind:function(arm,size=0x48) addr:0x2032ec0 -func_02032f0c kind:function(thumb,size=0x78) addr:0x2032f08 +_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_1C2Ev kind:function(thumb,size=0x78) addr:0x2032f08 func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f80 func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f84 func_02032f94 kind:function(thumb,size=0x4) addr:0x2032f90 @@ -1733,7 +1733,7 @@ func_02034fc0 kind:function(arm,size=0x14) addr:0x2034f7c func_02034fd4 kind:function(arm,size=0x38) addr:0x2034f90 func_0203500c kind:function(arm,size=0x10) addr:0x2034fc8 func_0203501c kind:function(arm,size=0x48) addr:0x2034fd8 -func_02035064 kind:function(arm,size=0x48) addr:0x2035020 +_ZN25UnkSubClass1_UnkownClass1C1Ev kind:function(arm,size=0x48) addr:0x2035020 func_020350ac kind:function(arm,size=0x4) addr:0x2035068 func_020350b0 kind:function(arm,size=0x4) addr:0x203506c func_020350b4 kind:function(arm,size=0xb8) addr:0x2035070 @@ -1872,7 +1872,7 @@ func_02038888 kind:function(arm,size=0xc8) addr:0x2038844 func_02038950 kind:function(arm,size=0x130) addr:0x203890c func_02038a80 kind:function(arm,size=0x1c) addr:0x2038a3c func_02038a9c kind:function(thumb,size=0x4) addr:0x2038a58 -func_02038aa0 kind:function(thumb,size=0x5c) addr:0x2038a5c +_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseC1Eic kind:function(thumb,size=0x5c) addr:0x2038a5c func_02038afc kind:function(thumb,size=0xc) addr:0x2038ab8 func_02038b08 kind:function(thumb,size=0x14) addr:0x2038ac4 func_02038b1c kind:function(thumb,size=0xc) addr:0x2038ad8 @@ -1908,7 +1908,7 @@ func_0203951c kind:function(arm,size=0x40) addr:0x20394d8 func_0203955c kind:function(arm,size=0x14) addr:0x2039518 func_02039570 kind:function(arm,size=0x8) addr:0x203952c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039534 -func_020395b4 kind:function(thumb,size=0x244) addr:0x2039570 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C2Ev kind:function(thumb,size=0x244) addr:0x2039570 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397b4 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a18 @@ -2034,7 +2034,7 @@ _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_14Eii kind:function(arm,size=0x4 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcb8 func_0203ddec kind:function(arm,size=0x10) addr:0x203dda8 func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddb8 -_Z13func_0203de14P31UnkStruct_027E0C68_UnkSubClass1_Sub1i kind:function(arm,size=0x10) addr:0x203ddd0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Base13func_0203de14Ei kind:function(arm,size=0x10) addr:0x203ddd0 func_0203de24 kind:function(arm,size=0x34) addr:0x203dde0 func_0203de58 kind:function(arm,size=0x208) addr:0x203de14 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index e6a985f9..71651f3f 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -79,6 +79,7 @@ public: /* 0x84 */ unk32 unk_84; /* 0x88 */ + 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_020350ac(void); @@ -88,9 +89,22 @@ public: void func_020352d8(void); }; +class UnknownClass2 : public SysObject { +public: + /* 0x00 (vtable) */ + /* 0x04 */ unk32* unk_04; + /* 0x08 */ + + UnknownClass2(); + /* 0x00 */ virtual ~UnknownClass2(); + /* 0x08 */ virtual UNK_TYPE vfunc_08(UNK_TYPE); + /* 0x0C */ virtual UNK_TYPE vfunc_0C(UNK_TYPE); + /* 0x10 */ +}; + class UnkSubClass1_unk_410 { public: - /* 0x00 */ unk32 unk_00; + /* 0x00 */ struct UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_00; /* 0x04 */ void func_0203ec34(void); @@ -98,9 +112,10 @@ public: void func_0203ebf8(void); }; +// same as UnkSubClass1_unk_410? class UnkSubClass1_unk_424 { public: - /* 0x00 */ unk32 unk_00; + /* 0x00 */ struct UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_00; /* 0x04 */ void func_0203ee80(unk32); @@ -111,22 +126,21 @@ public: class UnkSubClass1_unk_124 { public: - /* 0x00 */ unk32 unk_00; - /* 0x00 */ unk32 unk_04; - /* 0x00 */ unk32 unk_08; - /* 0x00 */ unk32 unk_0C; - /* 0x00 */ unk32 unk_10; - /* 0x00 */ unk32 unk_14; - /* 0x00 */ unk32 unk_18; - /* 0x00 */ unk32 unk_1C; - /* 0x00 */ unk32 unk_20; - /* 0x00 */ unk32 unk_24; - /* 0x00 */ unk8 unk_28; - /* 0x00 */ unk8 unk_29; - /* 0x00 */ unk8 unk_2A; - /* 0x00 */ unk8 unk_2B; - /* 0x00 */ unk32 unk_2C; - /* 0x04 */ + /* 0x00 */ void* unk_00; // pointer to UnkStruct_027E0C68_UnkSubClass1_Base (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(unk32, unk32); }; @@ -161,7 +175,7 @@ public: /* 0x3C */ }; -class UnkStruct_027E0C68_UnkSubClass1_Base : public SysObject { +class UnkStruct_027E0C68_UnkSubClass1_Base_1 : public SysObject { public: /* 0x000 (vtable) */ /* 0x004 */ unk32* unk_04; @@ -178,56 +192,22 @@ public: /* 0x030 */ unk32 unk_30; /* 0x034 */ unk32 unk_34; /* 0x038 */ unk32 unk_38; - /* 0x03C */ unk32 unk_3C; + /* 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 */ unk16 unk_4A; - /* 0x04C */ unk32 unk_4C; + /* 0x04C */ unk8 unk_4C; + /* 0x04C */ unk8 unk_4D; + /* 0x04C */ unk8 unk_4E; + /* 0x04C */ unk8 unk_4F; /* 0x050 */ u8 unk_50; /* 0x051 */ unk8 unk_51; - /* 0x052 */ unk16 unk_52; - /* 0x054 */ unk32 unk_54; - /* 0x058 */ unk32 unk_58; - /* 0x05C */ s16 unk_5C; - /* 0x05E */ s16 unk_5E; - /* 0x060 */ unk32 unk_60[0x2E]; - /* 0x118 */ s32 unk_118; - /* 0x11C */ unk8 unk_11C; - /* 0x11D */ unk8 unk_11D; - /* 0x11E */ u8 unk_11E; - /* 0x11F */ unk8 unk_11F; - /* 0x120 */ u8 unk_120; - /* 0x120 */ u8 unk_121; - /* 0x122 */ u8 unk_122; - /* 0x122 */ u8 unk_123; - /* 0x124 */ UnkSubClass1_unk_124* unk_124; - /* 0x128 */ UnkStruct1* unk_128; - //! TODO: confirm this is part of the base class - /* 0x12C */ u16* unk_12C; // pointer to the current position in the message to display - /* 0x130 */ unk16 unk_130; - /* 0x132 */ unk16 unk_132; - /* 0x134 */ unk32 unk_134; - /* 0x138 */ unk32 unk_138; - /* 0x13C */ unk32 unk_13C; - /* 0x140 */ unk32 unk_140; - /* 0x144 */ unk32 unk_144; - /* 0x148 */ unk32 unk_148; - /* 0x14C */ unk32 unk_14C; - /* 0x150 */ unk8 unk_150; - /* 0x151 */ u8 unk_151; - /* 0x152 */ unk8 unk_152; - /* 0x153 */ unk8 unk_153; - /* 0x154 */ UnkSubClass1_unk_154* unk_154; - /* 0x158 */ unk16 unk_158; - /* 0x15A */ unk16 unk_15A; - /* 0x15C */ s16 unk_15C; - /* 0x15E */ - - UnkStruct_027E0C68_UnkSubClass1_Base(); - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base(); + UnkStruct_027E0C68_UnkSubClass1_Base_1(); + /* 0x00*/ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_1(); /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3); /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3); // func_0203e060? @@ -256,6 +236,147 @@ public: /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3); /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3); /* 0x74 */ +}; + +class UnkStruct_027E0C68_UnkSubClass1_Base_0 : public UnkStruct_027E0C68_UnkSubClass1_Base_1 { +public: + /* 0x052 */ unk16 unk_52; + /* 0x054 */ unk32 unk_54; + /* 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; + /* 0x100 */ unk32 unk_100; + /* 0x104 */ unk32 unk_104; + /* 0x108 */ unk32 unk_108; + /* 0x10C */ unk32 unk_10C; + /* 0x110 */ unk32 unk_110; + /* 0x118 */ void* unk_114; + /* 0x118 */ s32 unk_118; + /* 0x11C */ unk8 unk_11C; + /* 0x11D */ unk8 unk_11D; + /* 0x11E */ u8 unk_11E; + /* 0x11F */ unk8 unk_11F; + /* 0x120 */ u8 unk_120; + /* 0x121 */ u8 unk_121; + /* 0x122 */ u8 unk_122; + /* 0x123 */ u8 unk_123; + /* 0x124 */ + + UnkStruct_027E0C68_UnkSubClass1_Base_0(unk8 param_2, unk32 param_3, unk32 param_4); + //! TODO: remove the function declarations that are not overridden + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_0(); + /* 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(unk8 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, unk32 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(unk32 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 */ +}; + +class UnkStruct_027E0C68_UnkSubClass1_Base : public UnkStruct_027E0C68_UnkSubClass1_Base_0 { +public: + /* 0x124 */ UnkSubClass1_unk_124* unk_124; + /* 0x128 */ UnkStruct1* unk_128; + + //! TODO: confirm this is part of the base class + /* 0x12C */ u16* unk_12C; // pointer to the current position in the message to display + /* 0x130 */ unk16 unk_130; + /* 0x132 */ unk16 unk_132; + /* 0x134 */ unk32 unk_134; + /* 0x138 */ unk32 unk_138; + /* 0x13C */ unk32 unk_13C; + /* 0x140 */ unk32 unk_140; + /* 0x144 */ unk32 unk_144; + /* 0x148 */ unk32 unk_148; + /* 0x14C */ unk32 unk_14C; + /* 0x150 */ unk8 unk_150[4]; + /* 0x154 */ UnkSubClass1_unk_154* unk_154; + /* 0x158 */ unk16 unk_158; + /* 0x15A */ unk16 unk_15A; + /* 0x15C */ s16 unk_15C; + /* 0x15E */ s8 unk_15E; + /* 0x15F */ s8 unk_15F; + /* 0x160 */ unk8 unk_160; + /* 0x160 */ unk8 unk_161; + /* 0x160 */ unk8 unk_162; + /* 0x160 */ unk8 unk_163; + /* 0x164 */ + + //! TODO: fake? + UnkStruct_027E0C68_UnkSubClass1_Base(); + + UnkStruct_027E0C68_UnkSubClass1_Base(unk32 param_2, unk8 param_3); + //! TODO: remove the function declarations that are not overridden + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base(); + /* 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(unk8 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, unk32 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(unk32 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_0203881c(UnkStruct1** param_2); + static void func_020387e0(unk8* param_2); unk32 func_02032fa4(void); unk32 func_02032fb4(void); @@ -307,9 +428,6 @@ public: class UnkStruct_027E0C68_UnkSubClass1_Sub1 : public UnkStruct_027E0C68_UnkSubClass1_Base { public: - /* 0x15E */ s8 unk_15E; - /* 0x15F */ s8 unk_15F; - /* 0x160 */ unk32 unk_160; /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1_Base* unk_164; /* 0x168 */ UnkSubClass1_UnkownClass1 unk_168; /* 0x1F0 */ UnkSubClass1_UnkownClass1 unk_1F0; @@ -319,18 +437,36 @@ public: /* 0x410 */ UnkSubClass1_unk_410 unk_410; /* 0x414 */ unk32 unk_414; /* 0x418 */ UnkStruct_027E0C68_UnkSubClass1_Base* unk_418; - /* 0x41C */ unk32 unk_41C; - /* 0x420 */ unk32 unk_420; + /* 0x41C */ unk16 unk_41C; + /* 0x41C */ unk16 unk_41E; + /* 0x420 */ unk16 unk_420; + /* 0x420 */ unk16 unk_422; /* 0x424 */ UnkSubClass1_unk_424 unk_424; /* 0x428 */ u16* unk_428; /* 0x42C */ unk32 unk_42C; /* 0x430 */ unk32 unk_430; /* 0x434 */ u8 unk_434[0xF4]; - /* 0x528 */ s16* unk_528; - /* 0x52C */ u8 unk_52C[0x30]; + /* 0x528 */ u16* unk_528; + /* 0x52C */ u8 unk_52C; + /* 0x55C */ unk32 unk_530; + /* 0x55C */ unk32 unk_534; + /* 0x55C */ unk32 unk_538; + /* 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 */ unk32 unk_548; + /* 0x55C */ unk32 unk_54C; + /* 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 */ unk16 unk_560; - /* 0x560 */ unk16 unk_562; + /* 0x560 */ unk32 unk_560; /* 0x564 */ unk32 unk_564; /* 0x568 */ unk32 unk_568; /* 0x56C */ unk16 unk_56C; @@ -338,12 +474,11 @@ public: /* 0x570 */ unk16 unk_570; /* 0x572 */ u16 unk_572; /* 0x574 */ s16 unk_574; - /* 0x576 */ u8 unk_576; - /* 0x577 */ u8 unk_577; - /* 0x578 */ u8 unk_578; - /* 0x579 */ u8 unk_579; + /* 0x576 */ unk16 unk_576; + /* 0x578 */ s16 unk_578; + // /* 0x579 */ u8 unk_579; /* 0x57A */ u8 unk_57A; - /* 0x57B */ u8 unk_57B; + /* 0x57B */ s8 unk_57B; /* 0x57C */ u8 unk_57C; /* 0x57D */ u8 unk_57D; /* 0x57E */ u8 unk_57E; @@ -355,12 +490,13 @@ public: /* 0x584 */ u8 unk_584; /* 0x585 */ u8 unk_585; /* 0x586 */ u8 unk_586; - /* 0x588 */ u8 unk_588[0x2C]; + /* 0x586 */ u8 unk_587; + /* 0x588 */ UnkSubClass1_unk_124 unk_588; /* 0x5B4 */ - //! TODO: remove the function declarations that are not overridden UnkStruct_027E0C68_UnkSubClass1_Sub1(); + //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub1() 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; @@ -393,16 +529,17 @@ public: void func_0203e060(u8 param_2, u8 param_3); void func_02039a3c(void); + + void func_02039ca8(void); }; class UnkStruct_027E0C68_UnkSubClass1_Sub2 : public UnkStruct_027E0C68_UnkSubClass1_Base { public: - /* 0x15E */ u8 unk_15E[0x62]; + /* 0x164 */ u8 unk_164[0x5C]; /* 0x1C0 */ - //! TODO: remove the function declarations that are not overridden - UnkStruct_027E0C68_UnkSubClass1_Sub2(); + //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub2(); /* 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; @@ -437,12 +574,11 @@ public: class UnkStruct_027E0C68_UnkSubClass1_Sub3 : public UnkStruct_027E0C68_UnkSubClass1_Base { public: - /* 0x15E */ u8 unk_15E[0x12]; + /* 0x164 */ u8 unk_164[0xC]; /* 0x170 */ - //! TODO: remove the function declarations that are not overridden - UnkStruct_027E0C68_UnkSubClass1_Sub3(); + //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub3(); /* 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; diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index 3c206b20..cd4c14de 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -38,7 +38,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_30(void) { // non-matching ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_08(unk32* param_2, unk32* param_3) { this->unk_15C = 10; - this->unk_152 = 1; + this->unk_150[2] = 1; this->func_0203e2ac(param_3); } diff --git a/src/Main/Message/func_02032f0c.cpp b/src/Main/Message/func_02032f0c.cpp index 49121b43..b6d77ed2 100644 --- a/src/Main/Message/func_02032f0c.cpp +++ b/src/Main/Message/func_02032f0c.cpp @@ -5,3 +5,28 @@ #include "DTCM/UnkStruct_027e103c.hpp" #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" + +extern "C" void func_020078f4(unk32, void*, unk32); +extern "C" void func_020078c0(unk32, void*, unk32); + +THUMB UnkStruct_027E0C68_UnkSubClass1_Base_1::UnkStruct_027E0C68_UnkSubClass1_Base_1() { + this->unk_04 = 0; + this->unk_08 = 0; + this->unk_0C = NULL; + this->unk_38 = 0; + this->unk_3C = 0; + this->unk_4A = 0; + this->unk_4C = 0; + this->unk_4D = 0; + this->unk_4E = 0; + this->unk_4F = 0; + this->unk_50 = 0; + this->unk_51 = 0; + func_020078f4(0, &this->unk_10, 0x18); + func_020078f4(0, &this->unk_28, 0x10); + func_020078c0(0, &this->unk_3E, 0xC); + this->unk_10 = NULL; + this->unk_2C = NULL; + this->unk_30 = 2; + this->unk_34 = 3; +} diff --git a/src/Main/Message/func_0203744c.cpp b/src/Main/Message/func_0203744c.cpp index 49121b43..42ac32d2 100644 --- a/src/Main/Message/func_0203744c.cpp +++ b/src/Main/Message/func_0203744c.cpp @@ -5,3 +5,16 @@ #include "DTCM/UnkStruct_027e103c.hpp" #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" + +THUMB UnkStruct_027E0C68_UnkSubClass1_Base::UnkStruct_027E0C68_UnkSubClass1_Base(unk32 param_2, unk8 param_3) { + this->unk_124 = 0; + this->func_0203881c(&this->unk_128); + this->func_020387e0(this->unk_150); + this->unk_154 = 0; + this->unk_15A = 0; + this->unk_15C = 0; + this->unk_15E = 0xff; + this->unk_15F = 0xff; + this->unk_160 = 1; + this->unk_11E = param_3; +} diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index 96616221..a54af5f1 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -6,6 +6,76 @@ #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" +extern "C" void func_ov000_020d0460(void*); +extern "C" void func_0203efd8(void*, void*); +extern "C" void func_0203ee48(void*); + +THUMB UnkStruct_027E0C68_UnkSubClass1_Sub1::UnkStruct_027E0C68_UnkSubClass1_Sub1() : unk_164(NULL) { + u16** ppuVar3; + + this->unk_410.unk_00 = this; + this->unk_414 = 0; + this->unk_418 = NULL; + this->unk_41C = 0; + this->unk_41E = 0; + this->unk_420 = 0; + this->unk_424.unk_00 = this; + + // ??? + ppuVar3 = &this->unk_428; + do { + *ppuVar3 = NULL; + ppuVar3 += 2; + } while (ppuVar3 < &this->unk_528); + + func_0203ee48(&this->unk_424); + func_ov000_020d0460(&this->unk_534); + this->unk_53C = 0; + this->unk_540 = ~0x7FFF; + this->unk_544 = 3; + func_ov000_020d0460(&this->unk_548); + this->unk_550 = 0; + this->unk_554 = 0x00016000; + this->unk_558 = 3; + this->unk_55C = -1; + this->unk_560 = -1; + this->unk_56C = 0; + this->unk_56E = 0; + this->unk_570 = 0; + this->unk_572 = 0; + this->unk_574 = 0; + this->unk_576 = 0; + this->unk_578 = 3; + this->unk_57A = 0; + this->unk_57B = -1; + this->unk_57C = 0; + this->unk_57D = 0; + this->unk_57E = 0; + this->unk_57F = 0; + this->unk_580 = 0; + this->unk_581 = 0; + this->unk_582 = 0; + this->unk_583 = 0; + this->unk_585 = 0; + this->unk_586 = 0; + func_0203efd8(&this->unk_588, this); + this->unk_124 = (UnkSubClass1_unk_124*)&this->unk_588; + this->func_02039ca8(); + + if (this->func_02032fa4() != 0) { + this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); + } else { + this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); + } + + this->unk_168.func_020351b8(true, false, false, false); + this->unk_1F0.func_020351b8(false, false, false, false); + this->unk_278.func_020351b8(false, false, false, false); +} THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a3c(void) { this->func_02038b28(); @@ -71,7 +141,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_2C(void) { if (this->unk_15C == 1) { if (this->unk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) { - switch (this->unk_151) { + switch (this->unk_150[1]) { case 0: this->func_0203b0ec(1); break; @@ -265,7 +335,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_44(s32 touchLastX, s32 touc } if (data_027e0d78.mTouch == 0) { - switch(this->unk_151) { + switch(this->unk_150[1]) { case 3: case 4: break; @@ -400,7 +470,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { } this->unk_424.func_0203ee48(); - this->unk_151 = 1; + this->unk_150[1] = 1; puVar3 = this->unk_12C; local_54[0] = puVar3; iVar2 = 0; @@ -442,7 +512,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { // this->unk_580 = 1; // } else { - // this->unk_151 = 4 + // this->unk_150[1] = 4 // } // break; // case 5: @@ -668,7 +738,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_1C(unk8 param_2, UnkStruct this->unk_574++; if (this->func_0203a30c() == 0) { - this->unk_153 = 1; + this->unk_150[3] = 1; } } diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp index 90fc7dd3..34042c3c 100644 --- a/src/Main/Message/func_0203c8a8.cpp +++ b/src/Main/Message/func_0203c8a8.cpp @@ -6,6 +6,44 @@ #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" +extern u32 *data_027e0ce0[]; +extern "C" void func_02007938(unk32, unk32, unk32, unk32, unk32); +extern "C" UnknownClass2* func_0203d1d0(void); +extern "C" UnknownClass2* func_0203d254(void); + +THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::UnkStruct_027E0C68_UnkSubClass1_Base_0(unk8 param_2, unk32 param_3, unk32 param_4) { + UnknownClass2 *pvVar1; + + this->unk_114 = NULL; + this->unk_118 = -1; + this->unk_11C = 0; + this->unk_11E = 0; + this->unk_11F = 0; + this->unk_120 = 1; + this->unk_121 = param_2; + this->unk_122 = 0; + + func_02007938(0, this->unk_54, 0xc0, 1, param_4); + + if (this->unk_10[this->unk_121 - 0x10] == '\0') { + // pvVar1 = new(*data_027e0ce0[0], 4) UnknownClass2(); + + if (pvVar1 != NULL) { + pvVar1 = func_0203d1d0(); + } + + this->unk_114 = pvVar1; + } else { + // pvVar1 = new(*data_027e0ce0[0], 4) UnknownClass2(); + + if (pvVar1 != NULL) { + pvVar1 = func_0203d254(); + } + + this->unk_114 = pvVar1; + } +} + // non-matching ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_14(unk32 param_2, unk32 param_3) { unk32 uVar1; From 3392c0bcb7dc3daf615b357fbc3aa7387f4f8b1f Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Tue, 28 Jan 2025 01:49:16 +0100 Subject: [PATCH 32/64] fix issues --- config/eur/arm9/symbols.txt | 4 +-- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 31 +++++++++++++++++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index d61f2970..f65917f7 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1908,8 +1908,8 @@ func_0203951c kind:function(arm,size=0x40) addr:0x203951c func_0203955c kind:function(arm,size=0x14) addr:0x203955c func_02039570 kind:function(arm,size=0x8) addr:0x2039570 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039578 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C2Eic kind:function(thumb,size=0x244) addr:0x20395b4 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Eic kind:function(thumb,size=0x244) addr:0x20397f8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C2Ev kind:function(thumb,size=0x244) addr:0x20395b4 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397f8 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a5c func_02039ca8 kind:function(arm,size=0x24) addr:0x2039ca8 diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index 71651f3f..aeea5f11 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -205,6 +205,7 @@ public: /* 0x04C */ unk8 unk_4F; /* 0x050 */ u8 unk_50; /* 0x051 */ unk8 unk_51; + /* 0x052 */ UnkStruct_027E0C68_UnkSubClass1_Base_1(); /* 0x00*/ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_1(); @@ -261,6 +262,30 @@ public: /* 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 */ unk32 unk_108; @@ -278,6 +303,9 @@ public: /* 0x123 */ u8 unk_123; /* 0x124 */ + //! TODO: fake? + UnkStruct_027E0C68_UnkSubClass1_Base_0(); + UnkStruct_027E0C68_UnkSubClass1_Base_0(unk8 param_2, unk32 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_0(); @@ -316,7 +344,7 @@ public: /* 0x124 */ UnkSubClass1_unk_124* unk_124; /* 0x128 */ UnkStruct1* unk_128; - //! TODO: confirm this is part of the base class + //! TODO: confirm this is part of this class /* 0x12C */ u16* unk_12C; // pointer to the current position in the message to display /* 0x130 */ unk16 unk_130; /* 0x132 */ unk16 unk_132; @@ -476,7 +504,6 @@ public: /* 0x574 */ s16 unk_574; /* 0x576 */ unk16 unk_576; /* 0x578 */ s16 unk_578; - // /* 0x579 */ u8 unk_579; /* 0x57A */ u8 unk_57A; /* 0x57B */ s8 unk_57B; /* 0x57C */ u8 unk_57C; From 2c350df3b4857f3864ed9a8ee7ebd6242ade7a3a Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Tue, 28 Jan 2025 02:22:36 +0100 Subject: [PATCH 33/64] more progress --- config/eur/arm9/symbols.txt | 8 +++--- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 14 ++++++----- src/Main/Message/func_020397f8.cpp | 25 +++++++++++++++++++ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index f65917f7..b19d6098 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1912,15 +1912,15 @@ _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C2Ev kind:function(thumb,size=0x244) ad _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397f8 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a5c -func_02039ca8 kind:function(arm,size=0x24) addr:0x2039ca8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039ca8Ev kind:function(arm,size=0x24) addr:0x2039ca8 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039ccc _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d74 func_0203a188 kind:function(arm,size=0x138) addr:0x203a188 -func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a2c0 -func_0203a30c kind:function(arm,size=0x1c) addr:0x203a30c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a2c0Ev kind:function(arm,size=0x4c) addr:0x203a2c0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a30cEv kind:function(arm,size=0x1c) addr:0x203a30c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a328 func_0203a35c kind:function(arm,size=0x84) addr:0x203a35c -func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a3e0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a3e0Ev kind:function(arm,size=0x1c) addr:0x203a3e0 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3fc func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a6d0 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7f0 diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index aeea5f11..c457ff32 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -355,7 +355,7 @@ public: /* 0x144 */ unk32 unk_144; /* 0x148 */ unk32 unk_148; /* 0x14C */ unk32 unk_14C; - /* 0x150 */ unk8 unk_150[4]; + /* 0x150 */ u8 unk_150[4]; /* 0x154 */ UnkSubClass1_unk_154* unk_154; /* 0x158 */ unk16 unk_158; /* 0x15A */ unk16 unk_15A; @@ -420,8 +420,6 @@ public: void func_02039398(void); void func_020393a8(unk32 param_2); void func_0203a188(unk32, unk32); - unk32 func_0203a2c0(void); - unk32 func_0203a30c(void); void func_0203a35c(void); unk32 func_0203a3e0(void); unk32 func_0203a6d0(unk32, unk32); @@ -456,7 +454,7 @@ public: class UnkStruct_027E0C68_UnkSubClass1_Sub1 : public UnkStruct_027E0C68_UnkSubClass1_Base { public: - /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1_Base* unk_164; + /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_164; /* 0x168 */ UnkSubClass1_UnkownClass1 unk_168; /* 0x1F0 */ UnkSubClass1_UnkownClass1 unk_1F0; /* 0x278 */ UnkSubClass1_UnkownClass1 unk_278; @@ -495,8 +493,7 @@ public: /* 0x55C */ unk8 unk_55B; /* 0x55C */ unk32 unk_55C; /* 0x560 */ unk32 unk_560; - /* 0x564 */ unk32 unk_564; - /* 0x568 */ unk32 unk_568; + /* 0x564 */ u16 unk_564[4]; /* 0x56C */ unk16 unk_56C; /* 0x56E */ unk16 unk_56E; /* 0x570 */ unk16 unk_570; @@ -557,7 +554,12 @@ public: void func_0203e060(u8 param_2, u8 param_3); void func_02039a3c(void); + unk32 func_02038b78(void); + unk32 func_02039250(void); void func_02039ca8(void); + bool func_0203a2c0(void); + unk32 func_0203a30c(void); + bool func_0203a3e0(void); }; class UnkStruct_027E0C68_UnkSubClass1_Sub2 : public UnkStruct_027E0C68_UnkSubClass1_Base { diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index a54af5f1..e9f32362 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -158,6 +158,27 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_2C(void) { } } +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ca8(void) { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->unk_564); i++) { + this->unk_564[i] = 0x1A; + } +} + +// non-matching +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a2c0(void) { + if ((this->unk_150[1] != 1 && this->unk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { + return true; + } + + return false; +} + +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a30c(void) { + return func_01ff9b88(this->unk_574, this->unk_154->unk_06); +} + ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_3C(unk32 param_2) { if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { if (this->unk_124->unk_29 != 3) { @@ -292,6 +313,10 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_48(void) { this->unk_410.func_0203ec34(); } +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3e0(void) { + return this->unk_164->unk_168.unk_06 > 0; +} + // non-matching ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_44(s32 touchLastX, s32 touchLastY) { unk32 iVar2; From d4e8b81dde4aaa5947b53fffb2e2ba6644e3a860 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Tue, 28 Jan 2025 18:47:44 +0100 Subject: [PATCH 34/64] more ctor/dtor progress --- config/eur/arm9/delinks.txt | 6 +- config/eur/arm9/symbols.txt | 52 ++++----- include/Message/MessageManager.hpp | 85 ++++++++------- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 100 +++++++++++------- src/Main/Message/BMG.cpp | 3 - src/Main/Message/MessageManager.cpp | 15 ++- src/Main/Message/func_02032f0c.cpp | 28 +++++ src/Main/Message/func_0203744c.cpp | 51 ++++++++- src/Main/Message/func_020397f8.cpp | 84 +++++++++++---- src/Main/Message/func_0203c8a8.cpp | 2 +- 10 files changed, 286 insertions(+), 140 deletions(-) diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 533362da..691f94db 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -19,13 +19,13 @@ src/Main/Message/BmgRelatedFunctions.cpp: .text start:0x0202d3bc end:0x0202d56c src/Main/Message/func_02032f0c.cpp: - .text start:0x02032f0c end:0x0203643c + .text start:0x02032e7c end:0x0203643c src/Main/Message/MessageManager.cpp: - .text start:0x0203643c end:0x020371b0 + .text start:0x0203643c end:0x020371b4 src/Main/Message/BMG.cpp: - .text start:0x020371b0 end:0x0203744c + .text start:0x020371b4 end:0x0203744c .data start:0x02057b78 end:0x02057cb8 .rodata start:0x02056958 end:0x020569e0 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index b19d6098..78a95ed9 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 func_0202de3c kind:function(arm,size=0x1f4) addr:0x202de3c func_0202e030 kind:function(arm,size=0x170) addr:0x202e030 -func_0202e1a0 kind:function(arm,size=0x24) addr:0x202e1a0 +_ZN30UnkSubClass1_UnkownClass1_Sub1C1Ev kind:function(arm,size=0x24) addr:0x202e1a0 func_0202e1c4 kind:function(arm,size=0x24) addr:0x202e1c4 func_0202e1e8 kind:function(arm,size=0x128) addr:0x202e1e8 func_0202e310 kind:function(arm,size=0x234) addr:0x202e310 @@ -1645,8 +1645,8 @@ func_02032d40 kind:function(thumb,size=0x28) addr:0x2032d40 func_02032d68 kind:function(arm,size=0xdc) addr:0x2032d68 func_02032e44 kind:function(arm,size=0x1c) addr:0x2032e44 func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e60 -func_02032e7c kind:function(arm,size=0x48) addr:0x2032e7c -func_02032ec4 kind:function(arm,size=0x48) addr:0x2032ec4 +_ZN31UnkSubClass1_UnkownClass2_Base1C2Ev kind:function(arm,size=0x48) addr:0x2032e7c +_ZN31UnkSubClass1_UnkownClass2_Base1C1Ev kind:function(arm,size=0x48) addr:0x2032ec4 _ZN38UnkStruct_027E0C68_UnkSubClass1_Base_1C2Ev kind:function(thumb,size=0x78) addr:0x2032f0c func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f84 func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f88 @@ -1732,10 +1732,10 @@ func_02034fac kind:function(arm,size=0x14) addr:0x2034fac func_02034fc0 kind:function(arm,size=0x14) addr:0x2034fc0 func_02034fd4 kind:function(arm,size=0x38) addr:0x2034fd4 func_0203500c kind:function(arm,size=0x10) addr:0x203500c -func_0203501c kind:function(arm,size=0x48) addr:0x203501c +_ZN25UnkSubClass1_UnkownClass1C2Ev kind:function(arm,size=0x48) addr:0x203501c _ZN25UnkSubClass1_UnkownClass1C1Ev kind:function(arm,size=0x48) addr:0x2035064 -func_020350ac kind:function(arm,size=0x4) addr:0x20350ac -func_020350b0 kind:function(arm,size=0x4) addr:0x20350b0 +_ZN25UnkSubClass1_UnkownClass1D1Ev kind:function(arm,size=0x4) addr:0x20350ac +_ZN25UnkSubClass1_UnkownClass1D2Ev kind:function(arm,size=0x4) addr:0x20350b0 func_020350b4 kind:function(arm,size=0xb8) addr:0x20350b4 func_0203516c kind:function(arm,size=0x3c) addr:0x203516c func_020351a8 kind:function(arm,size=0x8) addr:0x20351a8 @@ -1792,7 +1792,7 @@ func_020363c8 kind:function(arm,size=0x74) addr:0x20363c8 _ZN18UnkStruct_027E0C6813func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x203643c _ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x2036490 _ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x203665c -_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x20366a8 +func_020366a8 kind:function(arm,size=0x1c) addr:0x20366a8 _ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x20366c4 _ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x2036700 _ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x203673c @@ -1804,14 +1804,14 @@ _ZN18UnkStruct_027E0C6813func_02036808Ev kind:function(arm,size=0x1c) addr:0x203 _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_020368f4EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x18) addr:0x20368f4 +_ZN18UnkStruct_027E0C6813func_020368f4EP37UnkStruct_027E0C68_UnkSubClass2_Base1 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_02036d30EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x1c) addr:0x2036d30 -_ZN18UnkStruct_027E0C6813func_02036d4cEP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x20) addr:0x2036d4c +_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_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 @@ -1820,7 +1820,7 @@ _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x20 _ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370e8 _ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037158 _ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037178 -_Z13func_020371b0v kind:function(arm,size=0x4) addr:0x20371b0 +_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x4) addr:0x20371b0 _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037258 @@ -1839,10 +1839,10 @@ func_02037604 kind:function(arm,size=0x24) addr:0x2037604 func_02037628 kind:function(arm,size=0x98) addr:0x2037628 func_020376c0 kind:function(arm,size=0x64) addr:0x20376c0 func_02037724 kind:function(arm,size=0x2c) addr:0x2037724 -func_02037750 kind:function(arm,size=0x44) addr:0x2037750 -func_02037794 kind:function(arm,size=0x38) addr:0x2037794 -func_020377cc kind:function(arm,size=0x40) addr:0x20377cc -func_0203780c kind:function(arm,size=0x38) addr:0x203780c +_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1C2Eii kind:function(arm,size=0x44) addr:0x2037750 +_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1D1Ev kind:function(arm,size=0x38) addr:0x2037794 +_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1D0Ev kind:function(arm,size=0x40) addr:0x20377cc +_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1D2Ev kind:function(arm,size=0x38) addr:0x203780c func_02037844 kind:function(arm,size=0x10) addr:0x2037844 func_02037854 kind:function(arm,size=0xc4) addr:0x2037854 func_02037918 kind:function(arm,size=0x234) addr:0x2037918 @@ -1856,26 +1856,26 @@ func_020386b4 kind:function(arm,size=0x4) addr:0x20386b4 func_020386b8 kind:function(arm,size=0xc) addr:0x20386b8 func_020386c4 kind:function(arm,size=0x8) addr:0x20386c4 func_020386cc kind:function(arm,size=0xc) addr:0x20386cc -func_020386d8 kind:function(arm,size=0x40) addr:0x20386d8 +_ZN31UnkStruct_027E0C68_UnkSubClass2C2Ev kind:function(arm,size=0x40) addr:0x20386d8 _ZN31UnkStruct_027E0C68_UnkSubClass2C1Ev kind:function(arm,size=0x40) addr:0x2038718 func_02038758 kind:function(arm,size=0x18) addr:0x2038758 func_02038770 kind:function(arm,size=0x1c) addr:0x2038770 func_0203878c kind:function(arm,size=0x18) addr:0x203878c func_020387a4 kind:function(arm,size=0x28) addr:0x20387a4 -func_020387cc kind:function(arm,size=0x14) addr:0x20387cc +_ZN31UnkStruct_027E0C68_UnkSubClass2D2Ev 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 -func_0203881c kind:function(arm,size=0x3c) addr:0x203881c +_ZN25UnkSubClass1_UnkownClass2C1Ev kind:function(arm,size=0x3c) addr:0x203881c func_02038858 kind:function(arm,size=0x30) addr:0x2038858 func_02038888 kind:function(arm,size=0xc8) addr:0x2038888 func_02038950 kind:function(arm,size=0x130) addr:0x2038950 func_02038a80 kind:function(arm,size=0x1c) addr:0x2038a80 func_02038a9c kind:function(thumb,size=0x4) addr:0x2038a9c -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseC1Eic kind:function(thumb,size=0x5c) addr:0x2038aa0 -func_02038afc kind:function(thumb,size=0xc) addr:0x2038afc -func_02038b08 kind:function(thumb,size=0x14) addr:0x2038b08 -func_02038b1c kind:function(thumb,size=0xc) addr:0x2038b1c +_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseC1Eisi kind:function(thumb,size=0x5c) addr:0x2038aa0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD1Ev kind:function(thumb,size=0xc) addr:0x2038afc +_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD0Ev kind:function(thumb,size=0x14) addr:0x2038b08 +_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD2Ev kind:function(thumb,size=0xc) addr:0x2038b1c func_02038b28 kind:function(thumb,size=0xc) addr:0x2038b28 func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 _Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1_Sub1 kind:function(arm,size=0x34) addr:0x2038b40 @@ -2024,10 +2024,10 @@ func_0203d848 kind:function(arm,size=0x8c) addr:0x203d848 func_0203d8d4 kind:function(arm,size=0x8c) addr:0x203d8d4 func_0203d960 kind:function(arm,size=0xc0) addr:0x203d960 func_0203da20 kind:function(arm,size=0xc0) addr:0x203da20 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0C2Ecii kind:function(thumb,size=0x98) addr:0x203dae0 -func_0203db78 kind:function(thumb,size=0x30) addr:0x203db78 -func_0203dba8 kind:function(thumb,size=0x38) addr:0x203dba8 -func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203dbe0 +_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0C2Eiii kind:function(thumb,size=0x98) addr:0x203dae0 +_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0D1Ev kind:function(thumb,size=0x30) addr:0x203db78 +_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0D0Ev kind:function(thumb,size=0x38) addr:0x203dba8 +_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0D2Ev kind:function(thumb,size=0x30) addr:0x203dbe0 func_0203dc10 kind:function(arm,size=0x64) addr:0x203dc10 func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc74 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dcb4 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 2cfe20ab..988ec1cd 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -6,19 +6,53 @@ #include "System/SysNew.hpp" #include "Message/BMG.hpp" #include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "lib/math.h" -class UnkStruct_027E0C68_UnkSubClass2 : public SysObject { +// astruct_14 +class UnkStruct_027E0C68_UnkSubClass2_Base1 : public SysObject { public: /* 0x00 (vtable) */ - /* 0x04 */ unk32 unk_04; - /* 0x08 */ unk32 unk_08; - /* 0x0C */ unk32 unk_0C; - /* 0x10 */ unk32 unk_10; + /* 0x04 */ unk32 unk_04[4]; /* 0x14 */ unk32 unk_14; /* 0x18 */ u32 unk_18; - /* 0x1C */ unk32 unk_1C; - /* 0x20 */ unk32 unk_20; - /* 0x24 */ unk32 unk_24; + /* 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(UnkStruct_027E0C68_UnkSubClass1_Sub1* 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 +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; @@ -45,32 +79,6 @@ public: /* 0x34 */ }; -class UnkStruct_027E0C68_UnkSubClass3 : public SysObject { -public: - /* 0x00 (vtable) */ - /* 0x04 */ unk32 unk_04; - /* 0x08 */ unk32 unk_08; - /* 0x0C */ unk32 unk_0C; - /* 0x10 */ unk32 unk_10; - /* 0x14 */ unk32 unk_14; - /* 0x18 */ u32 unk_18; - - UnkStruct_027E0C68_UnkSubClass3(); - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass3() override; - /* 0x08 */ virtual UNK_TYPE vfunc_08(void) override; - /* 0x0C */ virtual UNK_TYPE vfunc_0C(void) override; - /* 0x10 */ virtual void vfunc_10(void) override; - /* 0x14 */ virtual UNK_TYPE vfunc_14(void) override; - /* 0x1C */ virtual UNK_TYPE vfunc_1C(void) override; - /* 0x20 */ virtual UNK_TYPE vfunc_20(void) override; - /* 0x24 */ virtual UNK_TYPE vfunc_24(void) override; - /* 0x28 */ virtual UNK_TYPE vfunc_28(void) override; - /* 0x2C */ virtual UNK_TYPE vfunc_2C(void) override; - /* 0x30 */ virtual UNK_TYPE vfunc_30(void) override; - /* 0x34 */ virtual UNK_TYPE vfunc_34(void) override; - /* 0x38 */ virtual UNK_TYPE vfunc_38(void) override; -}; - class UnkStruct_027E0C68 : public SysObject { public: /* 0x00 */ unk16 unk_00; @@ -87,7 +95,7 @@ public: /* 0x10 */ unk16 unk_12; /* 0x14 */ BMGGroups* pGroups; /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18[2]; - /* 0x20 */ UnkStruct_027E0C68_UnkSubClass3* unk_20[2]; // is it actually UnkStruct_027E0C68_UnkSubClass2? + /* 0x20 */ UnkStruct_027E0C68_UnkSubClass2_Base1* unk_20[2]; /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1_Base* unk_28[6]; /* 0x40 */ UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_40[2]; // is array size 6? /* 0x48 */ @@ -95,6 +103,7 @@ public: static void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3); void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); void func_0203665c(void); + UnkStruct_027E0C68(); ~UnkStruct_027E0C68(); UnkStruct_027E0C68_UnkSubClass1_Sub1* func_020366c4(void); UnkStruct_027E0C68_UnkSubClass1_Sub1* func_02036700(void); @@ -107,14 +116,14 @@ public: bool func_02036824(void); bool func_02036850(void); void func_02036888(UnkStruct_027E0C68_UnkSubClass2* param_2); - bool func_020368f4(UnkStruct_027E0C68_UnkSubClass3* param_2); + bool func_020368f4(UnkStruct_027E0C68_UnkSubClass2_Base1* 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_UnkSubClass3* param_2); - bool func_02036d4c(UnkStruct_027E0C68_UnkSubClass3* param_2); + bool func_02036d30(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2); + bool func_02036d4c(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2); void func_02036d6c(void); UnkStruct_027E0C68_UnkSubClass1_Base* func_02036da8(u32 param_2, s16* param_3); void func_02036edc(u32 param_2, u8 param_3); diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index c457ff32..0bd03ee1 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -35,14 +35,25 @@ typedef struct UnkSubClass1_unk_154 { typedef u32 (*UnkCallback1)(void); -typedef struct UnkStruct1 { - /* 0x00 */ UnkCallback1 unk_00; - /* 0x04 */ UnkCallback1 unk_04; -} UnkStruct1; // size = 0x8 +// astruct_11 +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 class UnkSubClass1_UnkownClass1 { public: - /* 0x00 */ UnkStruct1* unk_00; + /* 0x00 (vtable) */ /* 0x04 */ unk16 unk_04; /* 0x06 */ unk16 unk_06; /* 0x08 */ u32* unk_08; @@ -66,29 +77,60 @@ public: /* 0x50 */ unk32 unk_50; /* 0x54 */ unk32 unk_54; /* 0x58 */ unk32 unk_58; - /* 0x5C */ unk32 unk_5C; - /* 0x60 */ unk32 unk_60; - /* 0x64 */ unk32 unk_64; - /* 0x68 */ unk32 unk_68; - /* 0x6C */ unk32 unk_6C; - /* 0x70 */ unk32 unk_70; + /* 0x5C */ UnkSubClass1_UnkownClass1_Sub1 unk_5C; /* 0x74 */ u32* unk_74; /* 0x78 */ u32* unk_78; /* 0x7C */ unk32 unk_7C; - /* 0x80 */ unk32 unk_80; - /* 0x84 */ unk32 unk_84; + /* 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 */ + 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_020350ac(void); 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 */ +}; + +class UnkSubClass1_UnkownClass2 : public UnkSubClass1_UnkownClass2_Base1 { +public: + /* 0x14 */ unk32 unk_14; + /* 0x18 */ unk32 unk_18; + /* 0x1C */ unk32 unk_1C; + /* 0x20 */ unk32 unk_20; + /* 0x24 */ unk32 unk_24; + /* 0x2C */ + + UnkSubClass1_UnkownClass2(); + /* 0x00 */ virtual ~UnkSubClass1_UnkownClass2() override; + /* 0x08 */ +}; + class UnknownClass2 : public SysObject { public: /* 0x00 (vtable) */ @@ -303,10 +345,7 @@ public: /* 0x123 */ u8 unk_123; /* 0x124 */ - //! TODO: fake? - UnkStruct_027E0C68_UnkSubClass1_Base_0(); - - UnkStruct_027E0C68_UnkSubClass1_Base_0(unk8 param_2, unk32 param_3, unk32 param_4); + UnkStruct_027E0C68_UnkSubClass1_Base_0(unk32 param_2, unk32 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_0(); /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; @@ -339,22 +378,11 @@ public: /* 0x74 */ }; +// astruct_6 class UnkStruct_027E0C68_UnkSubClass1_Base : public UnkStruct_027E0C68_UnkSubClass1_Base_0 { public: /* 0x124 */ UnkSubClass1_unk_124* unk_124; - /* 0x128 */ UnkStruct1* unk_128; - - //! TODO: confirm this is part of this class - /* 0x12C */ u16* unk_12C; // pointer to the current position in the message to display - /* 0x130 */ unk16 unk_130; - /* 0x132 */ unk16 unk_132; - /* 0x134 */ unk32 unk_134; - /* 0x138 */ unk32 unk_138; - /* 0x13C */ unk32 unk_13C; - /* 0x140 */ unk32 unk_140; - /* 0x144 */ unk32 unk_144; - /* 0x148 */ unk32 unk_148; - /* 0x14C */ unk32 unk_14C; + /* 0x128 */ UnkSubClass1_UnkownClass2 unk_128; /* 0x150 */ u8 unk_150[4]; /* 0x154 */ UnkSubClass1_unk_154* unk_154; /* 0x158 */ unk16 unk_158; @@ -371,7 +399,7 @@ public: //! TODO: fake? UnkStruct_027E0C68_UnkSubClass1_Base(); - UnkStruct_027E0C68_UnkSubClass1_Base(unk32 param_2, unk8 param_3); + UnkStruct_027E0C68_UnkSubClass1_Base(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base(); /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; @@ -403,8 +431,7 @@ public: /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; /* 0x74 */ - static void func_0203881c(UnkStruct1** param_2); - static void func_020387e0(unk8* param_2); + static void func_020387e0(u8* param_2); unk32 func_02032fa4(void); unk32 func_02032fb4(void); @@ -443,7 +470,6 @@ public: 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_02038b1c(void); void func_0203947c(void); unk32 func_0203951c(void); void func_0203cabc(unk32); @@ -518,7 +544,6 @@ public: /* 0x588 */ UnkSubClass1_unk_124 unk_588; /* 0x5B4 */ - UnkStruct_027E0C68_UnkSubClass1_Sub1(); //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub1() override; @@ -557,6 +582,7 @@ public: unk32 func_02038b78(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); bool func_0203a3e0(void); @@ -687,7 +713,7 @@ extern unk32 data_027e0c38[]; extern "C" void func_0203489c(unk32, unk16, unk32*, unk32*); extern "C" void func_020347b0(unk32, unk16, unk32*, unk32*, unk32, unk32); extern THUMB unk32 func_0202ab48(void); -extern "C" void func_02034984(unk32, unk32, unk32, unk32, unk32); +extern "C" void func_02034984(unk32, u8, unk32, unk32); extern "C" void func_02034698(unk32, unk32, unk32*, unk32*); extern struct TouchControl data_027e0d78; diff --git a/src/Main/Message/BMG.cpp b/src/Main/Message/BMG.cpp index 69dae832..8d899b5b 100644 --- a/src/Main/Message/BMG.cpp +++ b/src/Main/Message/BMG.cpp @@ -48,9 +48,6 @@ static char* sBMGFileNames[BMG_FILE_INDEX_MAX] = { "kaitei_F", // BMG_FILE_INDEX_KAITEI_F }; -ARM void func_020371b0(void) { -} - THUMB void func_020371b4(BMGFileInfo* pFileInfo) { pFileInfo->pHeader = NULL; pFileInfo->pINF1 = NULL; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 282ed162..f0c7bc9f 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -133,7 +133,9 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) { } // non-matching -ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() {} +ARM UnkStruct_027E0C68_UnkSubClass2_Base1::~UnkStruct_027E0C68_UnkSubClass2_Base1() { + +} // non-matching ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_020366c4(void) { @@ -232,7 +234,7 @@ ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_027E0C68_UnkSubClass2* para } } -ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_027E0C68_UnkSubClass3* param_2) { +ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2) { if (this->unk_20[1] != NULL) { return false; } @@ -398,7 +400,7 @@ ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* para return false; } -ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_027E0C68_UnkSubClass3* param_2) { +ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2) { if (this->unk_20[0] != NULL && this->unk_20[0] != param_2) { return false; } @@ -407,7 +409,7 @@ ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_027E0C68_UnkSubClass3* para return true; } -ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_027E0C68_UnkSubClass3* param_2) { +ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2) { if (this->unk_20[0] == param_2) { this->unk_20[0] = NULL; return true; @@ -521,7 +523,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036f68(u32 } //! TODO: fake? - pSVar5->unk_164 = pSVar2; + pSVar5->unk_164 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)pSVar2; pSVar5->unk_418 = this->unk_28[5]; pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s16*)param_3, 0); @@ -585,3 +587,6 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02037178(UnkS return NULL; } + +ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() { +} diff --git a/src/Main/Message/func_02032f0c.cpp b/src/Main/Message/func_02032f0c.cpp index b6d77ed2..35cfbef0 100644 --- a/src/Main/Message/func_02032f0c.cpp +++ b/src/Main/Message/func_02032f0c.cpp @@ -9,6 +9,20 @@ extern "C" void func_020078f4(unk32, void*, unk32); extern "C" void func_020078c0(unk32, void*, unk32); +ARM UnkSubClass1_UnkownClass2_Base1::UnkSubClass1_UnkownClass2_Base1() { + this->unk_00 = NULL; + this->unk_08 = 0; + this->unk_0A = 0; + this->unk_0C = 0; + this->unk_0E = 0; + + if (func_0202ab48() == 0) { + this->unk_10 = 2; + } else { + this->unk_10 = 3; + } +} + THUMB UnkStruct_027E0C68_UnkSubClass1_Base_1::UnkStruct_027E0C68_UnkSubClass1_Base_1() { this->unk_04 = 0; this->unk_08 = 0; @@ -30,3 +44,17 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Base_1::UnkStruct_027E0C68_UnkSubClass1_Ba this->unk_30 = 2; this->unk_34 = 3; } + +ARM UnkSubClass1_UnkownClass1::UnkSubClass1_UnkownClass1() { + this->unk_74 = NULL; + this->unk_78 = 0; + this->unk_7C = 0; + this->unk_80 = 0; + this->unk_82 = 0; + this->unk_84 = 0; + this->unk_86 = 0; + this->unk_87 = 0; +} + +ARM UnkSubClass1_UnkownClass1::~UnkSubClass1_UnkownClass1() { +} diff --git a/src/Main/Message/func_0203744c.cpp b/src/Main/Message/func_0203744c.cpp index 42ac32d2..067e0ae4 100644 --- a/src/Main/Message/func_0203744c.cpp +++ b/src/Main/Message/func_0203744c.cpp @@ -6,15 +6,56 @@ #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" -THUMB UnkStruct_027E0C68_UnkSubClass1_Base::UnkStruct_027E0C68_UnkSubClass1_Base(unk32 param_2, unk8 param_3) { - this->unk_124 = 0; - this->func_0203881c(&this->unk_128); +ARM UnkStruct_027E0C68_UnkSubClass2_Base1::UnkStruct_027E0C68_UnkSubClass2_Base1(unk32 param_2, unk32 param_3) { + s32 i; + + this->unk_14 = param_3; + this->unk_18 = param_2; + this->unk_1C = 0; + this->unk_1D = 0xFF; + this->unk_1E = 0; + + for (i = 0; i < ARRAY_LEN(this->unk_04); i++) { + this->unk_04[i] = 0; + } +} + +ARM UnkStruct_027E0C68_UnkSubClass2_Base1::~UnkStruct_027E0C68_UnkSubClass2_Base1() { + 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) { + this->unk_20 = -1; + this->unk_24.func_020376c0(gVec3p_ZERO); +} + +ARM UnkStruct_027E0C68_UnkSubClass2::~UnkStruct_027E0C68_UnkSubClass2() { +} + +ARM UnkSubClass1_UnkownClass2::UnkSubClass1_UnkownClass2() { + this->unk_14 = 0x1000; + this->unk_18 = 0; + this->unk_1C = 0; + this->unk_20 = 0; + this->unk_24 = 0; +} + +THUMB UnkStruct_027E0C68_UnkSubClass1_Base::UnkStruct_027E0C68_UnkSubClass1_Base(unk32 param_2, unk16 param_3, unk32 param_4) + : UnkStruct_027E0C68_UnkSubClass1_Base_0(param_2, param_3, param_4), + unk_124(0) +{ this->func_020387e0(this->unk_150); this->unk_154 = 0; this->unk_15A = 0; this->unk_15C = 0; - this->unk_15E = 0xff; - this->unk_15F = 0xff; + this->unk_15E = 0xFF; + this->unk_15F = 0xFF; this->unk_160 = 1; this->unk_11E = param_3; } + +THUMB UnkStruct_027E0C68_UnkSubClass1_Base::~UnkStruct_027E0C68_UnkSubClass1_Base() { +} diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index e9f32362..a24c1b38 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -10,6 +10,9 @@ extern "C" void func_ov000_020d0460(void*); extern "C" void func_0203efd8(void*, void*); extern "C" void func_0203ee48(void*); +extern unk16 data_02056a0e[]; +extern u8 data_02056a08[]; + THUMB UnkStruct_027E0C68_UnkSubClass1_Sub1::UnkStruct_027E0C68_UnkSubClass1_Sub1() : unk_164(NULL) { u16** ppuVar3; @@ -101,8 +104,8 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_2C(void) { } if (this->unk_15C > 0) { - if ((this->unk_12C == NULL || this->unk_12C[0] == 0) != 0) { - this->unk_424.func_0203ef78(this->unk_130); + if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { + this->unk_424.func_0203ef78(this->unk_128.unk_08); } this->func_0203be64(); @@ -225,7 +228,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 par bVar1 = data_027e0c68.unk_28[this->unk_50]; this->vfunc_6C(&local_8c, &local_90); - this->func_0203a188(local_8c + param_2, local_90 + param_3); + this->func_0203a188(local_8c + param_2, local_90 + param_3, 0); this->func_0203e1b0(param_2 + local_8c + (this->unk_158 - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_15A - (this->unk_18 << 3) / 2), 0); if (this->unk_584 != 0) { @@ -259,7 +262,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 par iVar5 = this->func_02032fa4(); iVar8 = bVar1->unk_18; uVar9 = data_02056a04[iVar8]; - func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); + // func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); iVar6 = this->unk_158 - local_94; iVar7 = this->unk_15A - local_98; @@ -286,7 +289,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 par aStack_68.mUnk_0a = 1; this->unk_1F0.func_02034a1c(local_9c, local_a0, &aStack_68); } else { - func_02034984(iVar5 != 0 ? 0x11F : 0x18, 0, local_9c, local_a0 + 2, 0); + // func_02034984(iVar5 != 0 ? 0x11F : 0x18, 0, local_9c, local_a0 + 2, 0); } } @@ -304,6 +307,49 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 par } } +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4) { + unk16 sVar1; + unk16 sVar2; + unk32 iVar3; + unk32 iVar4; + unk32 uVar5; + unk32 iVar6; + unk32 iStack_54; + unk32 iStack_50; + unk32 iStack_4c; + unk32 iStack_48; + UnkStruct_01ffbe34 aStack_44; + unk32 uStack_24; + + if (this->unk_15E == 7) { + return; + } + + // (short)(ushort)*(byte *)((int)data_027e0c68.unk_28[(this->unk_50 - 0x28) * 0x18]; + + iVar6 = data_027e0c68.unk_10 + this->unk_50; + // uStack_24 = param_4; + + if (data_027e0cbc.func_0203d7e0(data_02056a00[iVar6]) != 0) { + uVar5 = data_02056a04[iVar6]; + + func_0203489c(uVar5, data_02056a16[iVar6], &iStack_48, &iStack_4c); + iVar3 = iStack_50 + (this->unk_158 - iStack_48); + + func_02034698(uVar5, data_02056a0e[iVar6], &iStack_50, &iStack_54); + iVar4 = iStack_54 + (this->unk_15A - iStack_4c); + + func_01ffbe34(&aStack_44); + aStack_44.mUnk_0a = 1; + + if (this->unk_580 != 0) { + this->unk_168.func_02034a1c(param_2 + iVar3, param_3 + iVar4, &aStack_44); + } else { + func_02034984(uVar5, data_02056a08[iVar6], param_2 + iVar3, param_3 + iVar4); + } + } +} + // non-matching (regalloc) ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_48(void) { if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { @@ -380,13 +426,13 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_44(s32 touchLastX, s32 touc //! TODO: fixme // if (this->unk_164->unk_168.unk_06 <= 0) { // if ((data_027e0d78.mFlags & 2) != 0) { - // this->unk_13C = 0; + // this->unk_128.unk_14 = 0; // if (this->func_0203b0bc() != 0) { // this->func_0203b0ec(1); // } - // this->unk_1F0.unk_64 = 0; + // this->unk_1F0.unk_5C.unk_08 = 0; // this->unk_1F0.func_020352d8(); // } // } @@ -395,13 +441,13 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_44(s32 touchLastX, s32 touc case 1: default: if ((data_027e0d78.mFlags & 2) != 0) { - this->unk_13C = 0; + this->unk_128.unk_14 = 0; if (this->func_0203b0bc() != 0) { this->func_0203b0ec(1); } - this->unk_1F0.unk_64 = 0; + this->unk_1F0.unk_5C.unk_08 = 0; this->unk_1F0.func_020352d8(); } break; @@ -496,7 +542,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { this->unk_424.func_0203ee48(); this->unk_150[1] = 1; - puVar3 = this->unk_12C; + puVar3 = this->unk_128.unk_00; local_54[0] = puVar3; iVar2 = 0; @@ -642,14 +688,14 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { this->func_0203b764(); if (this->unk_15F == 0 || this->unk_154->unk_06 < 3) { - this->unk_168.unk_64 = this->unk_168.unk_7C; + this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; this->unk_168.func_020352d8(); } else { this->unk_168.func_020351b8(1, 0, 0, 0); } } - this->unk_1F0.unk_64 = 0; + this->unk_1F0.unk_5C.unk_08 = 0; this->unk_1F0.func_020352d8(); this->vfunc_0C(0, 0, 0, 0); // (**(code **)(*(int *)param_1 + 0x10))(0); @@ -657,10 +703,10 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_5C(void) { if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { - this->unk_168.unk_64 = this->unk_168.unk_7C; + this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; this->unk_168.func_020352d8(); } else { - this->unk_168.unk_64 = 0; + this->unk_168.unk_5C.unk_08 = 0; this->unk_168.func_020352d8(); this->unk_168.func_020351b8(1, 0, 0, 0); } @@ -744,7 +790,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_18(UnkStruct_0203b264* par } if (bVar5) { - this->unk_424.func_0203ee80(this->unk_130); + this->unk_424.func_0203ee80(this->unk_128.unk_08); } } @@ -759,7 +805,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_1C(unk8 param_2, UnkStruct psVar3 = param_3->mUnk_4; if (psVar3[0] == 10) { - this->unk_424.func_0203ef78(this->unk_130, psVar3[0], param_4); + this->unk_424.func_0203ef78(this->unk_128.unk_08, psVar3[0], param_4); this->unk_574++; if (this->func_0203a30c() == 0) { @@ -906,12 +952,6 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_6C(unk32* param_2, unk32* p } ARM UnkStruct_027E0C68_UnkSubClass1_Sub1::~UnkStruct_027E0C68_UnkSubClass1_Sub1() { - this->unk_388.func_020350ac(); - this->unk_300.func_020350ac(); - this->unk_278.func_020350ac(); - this->unk_1F0.func_020350ac(); - this->unk_168.func_020350ac(); - this->func_02038b1c(); } ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_38(void) { diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp index 34042c3c..1345b7c8 100644 --- a/src/Main/Message/func_0203c8a8.cpp +++ b/src/Main/Message/func_0203c8a8.cpp @@ -11,7 +11,7 @@ extern "C" void func_02007938(unk32, unk32, unk32, unk32, unk32); extern "C" UnknownClass2* func_0203d1d0(void); extern "C" UnknownClass2* func_0203d254(void); -THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::UnkStruct_027E0C68_UnkSubClass1_Base_0(unk8 param_2, unk32 param_3, unk32 param_4) { +THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::UnkStruct_027E0C68_UnkSubClass1_Base_0(unk32 param_2, unk32 param_3, unk32 param_4) { UnknownClass2 *pvVar1; this->unk_114 = NULL; From 27e9ac2396ae3c6c3d8002c04dd258e935166caa Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:36:55 +0100 Subject: [PATCH 35/64] more progress --- config/eur/arm9/symbols.txt | 12 +-- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 90 ++++++++++++------- include/Unknown/func_ov000_020d0644.hpp | 19 ++++ src/Main/Message/MessageManager.cpp | 5 -- src/Main/Message/func_020397f8.cpp | 81 ++++++++++++++--- src/Main/Message/func_0203c8a8.cpp | 33 +++---- 6 files changed, 164 insertions(+), 76 deletions(-) create mode 100644 include/Unknown/func_ov000_020d0644.hpp diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 78a95ed9..8af38d21 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1872,13 +1872,13 @@ func_02038888 kind:function(arm,size=0xc8) addr:0x2038888 func_02038950 kind:function(arm,size=0x130) addr:0x2038950 func_02038a80 kind:function(arm,size=0x1c) addr:0x2038a80 func_02038a9c kind:function(thumb,size=0x4) addr:0x2038a9c -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseC1Eisi kind:function(thumb,size=0x5c) addr:0x2038aa0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseC2Eisi kind:function(thumb,size=0x5c) addr:0x2038aa0 _ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD1Ev kind:function(thumb,size=0xc) addr:0x2038afc _ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD0Ev kind:function(thumb,size=0x14) addr:0x2038b08 _ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD2Ev kind:function(thumb,size=0xc) addr:0x2038b1c func_02038b28 kind:function(thumb,size=0xc) addr:0x2038b28 func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 -_Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1_Sub1 kind:function(arm,size=0x34) addr:0x2038b40 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Base13func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038b40 func_02038b74 kind:function(arm,size=0x4) addr:0x2038b74 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b78 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038c34 @@ -1915,7 +1915,7 @@ _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039ca8Ev kind:function(arm,size=0x24) addr:0x2039ca8 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039ccc _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d74 -func_0203a188 kind:function(arm,size=0x138) addr:0x203a188 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a188Eiii kind:function(arm,size=0x138) addr:0x203a188 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a2c0Ev kind:function(arm,size=0x4c) addr:0x203a2c0 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a30cEv kind:function(arm,size=0x1c) addr:0x203a30c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a328 @@ -1946,7 +1946,7 @@ func_0203c25c kind:function(arm,size=0x6c) addr:0x203c25c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c310 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c350 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3C1Ev kind:function(thumb,size=0x44) addr:0x203c358 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3C1Eisi kind:function(thumb,size=0x44) addr:0x203c358 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c39c func_0203c414 kind:function(arm,size=0x4c) addr:0x203c414 func_0203c460 kind:function(arm,size=0x4c) addr:0x203c460 @@ -1955,8 +1955,8 @@ func_0203c5c4 kind:function(arm,size=0x18) addr:0x203c5c4 func_0203c5dc kind:function(arm,size=0x120) addr:0x203c5dc func_0203c6fc kind:function(arm,size=0x1c) addr:0x203c6fc func_0203c718 kind:function(arm,size=0x14) addr:0x203c718 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2C1Ev kind:function(arm,size=0x110) addr:0x203c72c -func_0203c83c kind:function(arm,size=0x4) addr:0x203c83c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2C1Eisi kind:function(arm,size=0x110) addr:0x203c72c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub213func_0203c83cEv kind:function(arm,size=0x4) addr:0x203c83c func_0203c840 kind:function(arm,size=0x30) addr:0x203c840 func_0203c870 kind:function(arm,size=0x38) addr:0x203c870 func_0203c8a8 kind:function(arm,size=0x58) addr:0x203c8a8 diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index 0bd03ee1..ffe5f92e 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -2,6 +2,7 @@ #include "System/SysNew.hpp" #include "Message/BMG.hpp" +#include "Unknown/func_ov000_020d0644.hpp" // temp #define UNK_TYPE void @@ -131,19 +132,6 @@ public: /* 0x08 */ }; -class UnknownClass2 : public SysObject { -public: - /* 0x00 (vtable) */ - /* 0x04 */ unk32* unk_04; - /* 0x08 */ - - UnknownClass2(); - /* 0x00 */ virtual ~UnknownClass2(); - /* 0x08 */ virtual UNK_TYPE vfunc_08(UNK_TYPE); - /* 0x0C */ virtual UNK_TYPE vfunc_0C(UNK_TYPE); - /* 0x10 */ -}; - class UnkSubClass1_unk_410 { public: /* 0x00 */ struct UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_00; @@ -217,13 +205,14 @@ public: /* 0x3C */ }; +// astruct_8? class UnkStruct_027E0C68_UnkSubClass1_Base_1 : public SysObject { public: /* 0x000 (vtable) */ /* 0x004 */ unk32* unk_04; /* 0x008 */ UnkSubClass1_02256FF8* unk_08; /* 0x00C */ unk32* unk_0C; - /* 0x010 */ unk32* unk_10; + /* 0x010 */ unk32 unk_10; /* 0x014 */ unk32 unk_14; /* 0x018 */ s32 unk_18; /* 0x01C */ unk32 unk_1C; @@ -281,6 +270,20 @@ public: /* 0x74 */ }; +class UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114 : public SysObject { +public: + /* 0x00 (vtable) */ + /* 0x04 */ unk32* unk_04; + /* 0x08 */ + + UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114(); + /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114() override; + /* 0x04 */ virtual UNK_TYPE vfunc_04(UNK_TYPE); + /* 0x08 */ virtual UNK_TYPE vfunc_08(UNK_TYPE); + /* 0x0C */ +}; + +// astruct_7 class UnkStruct_027E0C68_UnkSubClass1_Base_0 : public UnkStruct_027E0C68_UnkSubClass1_Base_1 { public: /* 0x052 */ unk16 unk_52; @@ -333,14 +336,13 @@ public: /* 0x108 */ unk32 unk_108; /* 0x10C */ unk32 unk_10C; /* 0x110 */ unk32 unk_110; - /* 0x118 */ void* unk_114; + /* 0x118 */ UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114* unk_114; /* 0x118 */ s32 unk_118; - /* 0x11C */ unk8 unk_11C; - /* 0x11D */ unk8 unk_11D; - /* 0x11E */ u8 unk_11E; + /* 0x11C */ unk16 unk_11C; + /* 0x11E */ unk8 unk_11E; /* 0x11F */ unk8 unk_11F; /* 0x120 */ u8 unk_120; - /* 0x121 */ u8 unk_121; + /* 0x121 */ s8 unk_121; /* 0x122 */ u8 unk_122; /* 0x123 */ u8 unk_123; /* 0x124 */ @@ -392,13 +394,9 @@ public: /* 0x15F */ s8 unk_15F; /* 0x160 */ unk8 unk_160; /* 0x160 */ unk8 unk_161; - /* 0x160 */ unk8 unk_162; - /* 0x160 */ unk8 unk_163; + /* 0x160 */ unk16 unk_162; /* 0x164 */ - //! TODO: fake? - UnkStruct_027E0C68_UnkSubClass1_Base(); - UnkStruct_027E0C68_UnkSubClass1_Base(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base(); @@ -439,6 +437,7 @@ public: u16* func_02037604(u16**); void func_02038b28(void); void func_02038b40(void); + void func_02039208(unk32 param_2); unk32 func_02038d10(void); void func_02038d20(void); void func_02038f44(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5, unk32 param_6); @@ -447,7 +446,6 @@ public: void func_02039398(void); void func_020393a8(unk32 param_2); void func_0203a188(unk32, unk32); - void func_0203a35c(void); unk32 func_0203a3e0(void); unk32 func_0203a6d0(unk32, unk32); unk32 func_0203b0bc(void); @@ -478,6 +476,14 @@ public: void func_0203fc78(unk32*, unk32*); }; +// does it host both choices? +struct UnknownMsgChoiceStruct { + /* 0x00 */ UnkStruct_0203b264* unk_00; + /* 0x04 */ unk32 unk_04; + /* 0x08 */ +}; + +// astruct_2 class UnkStruct_027E0C68_UnkSubClass1_Sub1 : public UnkStruct_027E0C68_UnkSubClass1_Base { public: /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_164; @@ -494,12 +500,8 @@ public: /* 0x420 */ unk16 unk_420; /* 0x420 */ unk16 unk_422; /* 0x424 */ UnkSubClass1_unk_424 unk_424; - /* 0x428 */ u16* unk_428; - /* 0x42C */ unk32 unk_42C; - /* 0x430 */ unk32 unk_430; - /* 0x434 */ u8 unk_434[0xF4]; - /* 0x528 */ u16* unk_528; - /* 0x52C */ u8 unk_52C; + /* 0x428 */ UnknownMsgChoiceStruct unk_428[0x20]; + /* 0x528 */ unk16 unk_528[4]; // number of choices? /* 0x55C */ unk32 unk_530; /* 0x55C */ unk32 unk_534; /* 0x55C */ unk32 unk_538; @@ -545,6 +547,7 @@ public: /* 0x5B4 */ UnkStruct_027E0C68_UnkSubClass1_Sub1(); + UnkStruct_027E0C68_UnkSubClass1_Sub1(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub1() override; /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; @@ -585,15 +588,28 @@ public: 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); }; class UnkStruct_027E0C68_UnkSubClass1_Sub2 : public UnkStruct_027E0C68_UnkSubClass1_Base { public: - /* 0x164 */ u8 unk_164[0x5C]; + /* 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 */ UnkStruct_027E0C68_UnkSubClass1_Sub2(); + UnkStruct_027E0C68_UnkSubClass1_Sub2(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub2(); /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; @@ -625,14 +641,21 @@ public: /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; /* 0x74 */ + static void func_0203c83c(void); }; class UnkStruct_027E0C68_UnkSubClass1_Sub3 : public UnkStruct_027E0C68_UnkSubClass1_Base { public: - /* 0x164 */ u8 unk_164[0xC]; + /* 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 */ UnkStruct_027E0C68_UnkSubClass1_Sub3(); + UnkStruct_027E0C68_UnkSubClass1_Sub3(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub3(); /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; @@ -672,7 +695,6 @@ extern "C" u32 func_01ff9b4c(unk32, unk32); extern "C" unk32 func_0203c084(void); extern "C" void func_ov018_02169634(UnkStruct_027E0C68_UnkSubClass1_Sub1*); extern "C" unk32 func_ov000_02079e04(void); -extern "C" unk32 func_01ff9b88(unk32, unk32); extern "C" unk32 func_02016fcc(unk32); extern "C" void func_02032304(unk32*, char*, unk32, unk32, unk32); extern "C" unk32 func_0202d5b4(char*, char*, unk32, unk32, unk32); diff --git a/include/Unknown/func_ov000_020d0644.hpp b/include/Unknown/func_ov000_020d0644.hpp new file mode 100644 index 00000000..ff03d603 --- /dev/null +++ b/include/Unknown/func_ov000_020d0644.hpp @@ -0,0 +1,19 @@ +#pragma once + +#include "global.h" +#include "System/SysNew.hpp" + +class UnkClass_func_ov000_020d0644 { +public: + /* 0x00 */ unk32 unk_00; + /* 0x04 */ unk32 unk_04; + /* 0x08 */ unk32 unk_08; + // /* 0x0C */ unk32 unk_0C; + /* 0x10 */ + + static void func_020d060c(void); + + UnkClass_func_ov000_020d0644(); + virtual ~UnkClass_func_ov000_020d0644(); + void func_ov000_020d0644(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5, unk32 param_6); +}; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index f0c7bc9f..15446045 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -132,11 +132,6 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) { this->pGroups->func_020373b4(2); } -// non-matching -ARM UnkStruct_027E0C68_UnkSubClass2_Base1::~UnkStruct_027E0C68_UnkSubClass2_Base1() { - -} - // non-matching ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_020366c4(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index a24c1b38..250b1df2 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -9,12 +9,16 @@ extern "C" void func_ov000_020d0460(void*); extern "C" void func_0203efd8(void*, void*); extern "C" void func_0203ee48(void*); +extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void*, void*); extern unk16 data_02056a0e[]; extern u8 data_02056a08[]; -THUMB UnkStruct_027E0C68_UnkSubClass1_Sub1::UnkStruct_027E0C68_UnkSubClass1_Sub1() : unk_164(NULL) { - u16** ppuVar3; +THUMB UnkStruct_027E0C68_UnkSubClass1_Sub1::UnkStruct_027E0C68_UnkSubClass1_Sub1(unk32 param_2, unk16 param_3, unk32 param_4) : + UnkStruct_027E0C68_UnkSubClass1_Base(0, 0, param_4), + unk_164(NULL) +{ + UnknownMsgChoiceStruct* puVar3; this->unk_410.unk_00 = this; this->unk_414 = 0; @@ -25,11 +29,11 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Sub1::UnkStruct_027E0C68_UnkSubClass1_Sub1 this->unk_424.unk_00 = this; // ??? - ppuVar3 = &this->unk_428; + puVar3 = this->unk_428; do { - *ppuVar3 = NULL; - ppuVar3 += 2; - } while (ppuVar3 < &this->unk_528); + puVar3->unk_00 = NULL; + puVar3 += 1; + } while ((unk32*)puVar3 < (unk32*)this->unk_528); func_0203ee48(&this->unk_424); func_ov000_020d0460(&this->unk_534); @@ -179,7 +183,7 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a2c0(void) { } ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a30c(void) { - return func_01ff9b88(this->unk_574, this->unk_154->unk_06); + return this->unk_574 / this->unk_154->unk_06; } ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_3C(unk32 param_2) { @@ -359,6 +363,22 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_48(void) { this->unk_410.func_0203ec34(); } +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a35c(void) { + if ((this->unk_57C == 1 || this->unk_150[3] != 0) || (this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { + if (this->func_0203a3e0()) { + s16 unk_56E = this->unk_56E; + s16 unk_570 = this->unk_570; + UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_164 = this->unk_164; + + unk_164->unk_168.unk_10 = unk_56E; + unk_164->unk_168.unk_14 = unk_570; + this->unk_164->func_02039208(4); + } + } else { + this->unk_164->func_02038b40(); + } +} + ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3e0(void) { return this->unk_164->unk_168.unk_06 > 0; } @@ -546,7 +566,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { local_54[0] = puVar3; iVar2 = 0; - for (iVar2 = 0; func_01ff9b88(iVar2, this->unk_154->unk_06) == 0; iVar2++, puVar3 = this->func_02037604(local_54)) { + for (iVar2 = 0; (iVar2 / this->unk_154->unk_06) == 0; iVar2++, puVar3 = this->func_02037604(local_54)) { if (local_54[iVar2] != NULL) { puVar3 = local_54[iVar2]; } @@ -645,7 +665,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { } } else if (*local_54[iVar2] == '\n') { iVar2 = iVar2 + 1; - iVar4 = func_01ff9b88(iVar2, this->unk_154->unk_06); + iVar4 = (iVar2 / this->unk_154->unk_06); if (iVar4 == 0) { break; @@ -821,8 +841,10 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_1C(unk8 param_2, UnkStruct case 0: return this->func_0203905c(param_2, param_3, param_4, param_5); case 1: - iVar1 = this->func_0203a30c(); - return this->unk_164->func_0203cb5c(param_2, ((this->unk_428[this->unk_528[iVar1]] & ~0xFFFF))); + UnknownMsgChoiceStruct* pChoiceData; + s32 i = this->func_0203a30c(); + pChoiceData = &this->unk_428[this->unk_528[i]]; + return this->unk_164->func_0203cb5c(param_2, (((pChoiceData->unk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->unk_00->mUnk_0)[2]) + ~0xFFFE)); default: break; } @@ -957,3 +979,40 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub1::~UnkStruct_027E0C68_UnkSubClass1_Sub1( ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_38(void) { return true; } + +THUMB UnkStruct_027E0C68_UnkSubClass1_Sub3::UnkStruct_027E0C68_UnkSubClass1_Sub3(unk32 param_2, unk16 param_3, unk32 param_4) : + UnkStruct_027E0C68_UnkSubClass1_Base(0, 0, param_4) +{ + this->unk_162 = 4; + this->unk_164 = 1; + this->unk_166 = 0; + this->unk_168 = -1; + this->unk_16A = 0; + this->unk_16C = 1; + this->unk_16E = 0; +} + +// non-matching +ARM UnkStruct_027E0C68_UnkSubClass1_Sub2::UnkStruct_027E0C68_UnkSubClass1_Sub2(unk32 param_2, unk16 param_3, unk32 param_4) : + UnkStruct_027E0C68_UnkSubClass1_Base(1, 0, param_4) +{ + this->unk_162 = 1; + this->unk_164 = 0x1A; + this->unk_166 = 0xA6; + this->unk_168 = 0x1D; + this->unk_16A = 0; + this->unk_16C = 1; + this->unk_170 = -1; + this->unk_172 = -1; + this->unk_174 = -1; + + func_0204f614(this->unk_180, ARRAY_LEN(this->unk_180), sizeof(UnkClass_func_ov000_020d0644), UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c); + + this->unk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0); + this->unk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0); + this->unk_180[2].func_ov000_020d0644(0x1E, 2, 0x8C, 0, 0); + this->unk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0); +} + +void UnkStruct_027E0C68_UnkSubClass1_Sub2::func_0203c83c(void) { +} diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp index 1345b7c8..fdb6d4a3 100644 --- a/src/Main/Message/func_0203c8a8.cpp +++ b/src/Main/Message/func_0203c8a8.cpp @@ -5,15 +5,13 @@ #include "DTCM/UnkStruct_027e103c.hpp" #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" +#include "System/SysNew.hpp" extern u32 *data_027e0ce0[]; -extern "C" void func_02007938(unk32, unk32, unk32, unk32, unk32); -extern "C" UnknownClass2* func_0203d1d0(void); -extern "C" UnknownClass2* func_0203d254(void); +extern "C" void func_02007938(unk32, unk32*, unk32, unk32, unk32); +// non-matching THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::UnkStruct_027E0C68_UnkSubClass1_Base_0(unk32 param_2, unk32 param_3, unk32 param_4) { - UnknownClass2 *pvVar1; - this->unk_114 = NULL; this->unk_118 = -1; this->unk_11C = 0; @@ -23,24 +21,19 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::UnkStruct_027E0C68_UnkSubClass1_Ba this->unk_121 = param_2; this->unk_122 = 0; - func_02007938(0, this->unk_54, 0xc0, 1, param_4); + func_02007938(0, &this->unk_54, 0xC0, 1, param_4); - if (this->unk_10[this->unk_121 - 0x10] == '\0') { - // pvVar1 = new(*data_027e0ce0[0], 4) UnknownClass2(); - - if (pvVar1 != NULL) { - pvVar1 = func_0203d1d0(); - } - - this->unk_114 = pvVar1; + if (this->unk_121 == 0) { + this->unk_114 = new(data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114(); } else { - // pvVar1 = new(*data_027e0ce0[0], 4) UnknownClass2(); + this->unk_114 = new(data_027e0ce0[1], 4) UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114(); + } +} - if (pvVar1 != NULL) { - pvVar1 = func_0203d254(); - } - - this->unk_114 = pvVar1; +THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::~UnkStruct_027E0C68_UnkSubClass1_Base_0() { + if (this->unk_114 != NULL) { + delete this->unk_114; + this->unk_114 = NULL; } } From 348916e3c266efd51403b9455dc1776769ec9208 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 29 Jan 2025 23:38:06 +0100 Subject: [PATCH 36/64] more progress --- config/eur/arm9/symbols.txt | 16 +- include/DTCM/UnkStruct_027e103c.hpp | 2 + include/Message/MessageManager.hpp | 3 +- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 41 +++-- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 6 +- src/Main/Message/func_0203744c.cpp | 2 +- src/Main/Message/func_020397f8.cpp | 151 ++++++++++++++++-- 7 files changed, 188 insertions(+), 33 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 8af38d21..b50959ae 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1908,8 +1908,8 @@ func_0203951c kind:function(arm,size=0x40) addr:0x203951c func_0203955c kind:function(arm,size=0x14) addr:0x203955c func_02039570 kind:function(arm,size=0x8) addr:0x2039570 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039578 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C2Ev kind:function(thumb,size=0x244) addr:0x20395b4 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397f8 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C2Eisi kind:function(thumb,size=0x244) addr:0x20395b4 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Eisi kind:function(thumb,size=0x244) addr:0x20397f8 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a5c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039ca8Ev kind:function(arm,size=0x24) addr:0x2039ca8 @@ -1919,23 +1919,23 @@ _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a188Eiii kind:function(arm,s _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a2c0Ev kind:function(arm,size=0x4c) addr:0x203a2c0 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a30cEv kind:function(arm,size=0x1c) addr:0x203a30c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a328 -func_0203a35c kind:function(arm,size=0x84) addr:0x203a35c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a35cEv kind:function(arm,size=0x84) addr:0x203a35c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a3e0Ev kind:function(arm,size=0x1c) addr:0x203a3e0 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3fc -func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a6d0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a6d0Eii kind:function(arm,size=0x120) addr:0x203a6d0 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7f0 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a988 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203aea8 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203af1c -func_0203b0bc kind:function(arm,size=0x30) addr:0x203b0bc -func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0ec +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b0bcEv kind:function(arm,size=0x30) addr:0x203b0bc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b0ecEi kind:function(arm,size=0x178) addr:0x203b0ec _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b410 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b5d0 -func_0203b764 kind:function(arm,size=0xb0) addr:0x203b764 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b764Ev kind:function(arm,size=0xb0) addr:0x203b764 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b814 -func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd8c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203bd8cEt kind:function(arm,size=0x40) addr:0x203bd8c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc func_0203be08 kind:function(arm,size=0x5c) addr:0x203be08 func_0203be64 kind:function(arm,size=0x220) addr:0x203be64 diff --git a/include/DTCM/UnkStruct_027e103c.hpp b/include/DTCM/UnkStruct_027e103c.hpp index f4a51c4a..7d3aee56 100644 --- a/include/DTCM/UnkStruct_027e103c.hpp +++ b/include/DTCM/UnkStruct_027e103c.hpp @@ -21,6 +21,8 @@ struct UnkStruct_027e103c { void func_ov000_020cf284(unk32, unk32); + void func_ov000_020cf224(unk32); + void func_ov000_020cf2a0(unk32); unk32 func_ov000_020cf4bc(void); unk8* func_ov000_020cef9c(void); void func_ov000_020cfb38(void); diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 988ec1cd..16120003 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -81,8 +81,7 @@ public: class UnkStruct_027E0C68 : public SysObject { public: - /* 0x00 */ unk16 unk_00; - /* 0x02 */ u8 unk_02; + /* 0x00 */ u8 unk_00[2]; /* 0x03 */ u8 unk_03; /* 0x04 */ u8 unk_04; /* 0x05 */ u8 unk_05; diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index ffe5f92e..a8ac1b28 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -3,6 +3,7 @@ #include "System/SysNew.hpp" #include "Message/BMG.hpp" #include "Unknown/func_ov000_020d0644.hpp" +#include "lib/math.h" // temp #define UNK_TYPE void @@ -140,6 +141,7 @@ public: void func_0203ec34(void); void func_0203ebe0(void); void func_0203ebf8(void); + void func_0203ec4c(UnkStruct_0203b264* param_2, unk32 param_3, s32 param_4, s32 param_5); }; // same as UnkSubClass1_unk_410? @@ -152,6 +154,7 @@ public: void func_0203ef78(unk16, u16, unk8); void func_0203ef78(unk16); // overload? void func_0203ee48(void); + UnkStruct_0203b264* func_0203eeb0(unk32 param_2, unk32 param_3); }; class UnkSubClass1_unk_124 { @@ -213,7 +216,7 @@ public: /* 0x008 */ UnkSubClass1_02256FF8* unk_08; /* 0x00C */ unk32* unk_0C; /* 0x010 */ unk32 unk_10; - /* 0x014 */ unk32 unk_14; + /* 0x014 */ s32 unk_14; /* 0x018 */ s32 unk_18; /* 0x01C */ unk32 unk_1C; /* 0x020 */ unk32 unk_20; @@ -287,7 +290,8 @@ public: class UnkStruct_027E0C68_UnkSubClass1_Base_0 : public UnkStruct_027E0C68_UnkSubClass1_Base_1 { public: /* 0x052 */ unk16 unk_52; - /* 0x054 */ unk32 unk_54; + /* 0x054 */ unk16 unk_54; + /* 0x054 */ unk16 unk_56; /* 0x058 */ unk32 unk_58; /* 0x05C */ s16 unk_5C; /* 0x05E */ s16 unk_5E; @@ -333,7 +337,10 @@ public: /* 0x0FC */ unk32 unk_FC; /* 0x100 */ unk32 unk_100; /* 0x104 */ unk32 unk_104; - /* 0x108 */ unk32 unk_108; + /* 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 */ UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114* unk_114; @@ -387,8 +394,7 @@ public: /* 0x128 */ UnkSubClass1_UnkownClass2 unk_128; /* 0x150 */ u8 unk_150[4]; /* 0x154 */ UnkSubClass1_unk_154* unk_154; - /* 0x158 */ unk16 unk_158; - /* 0x15A */ unk16 unk_15A; + /* 0x158 */ Vec2s unk_158; // textbox position? /* 0x15C */ s16 unk_15C; /* 0x15E */ s8 unk_15E; /* 0x15F */ s8 unk_15F; @@ -447,11 +453,6 @@ public: void func_020393a8(unk32 param_2); void func_0203a188(unk32, unk32); unk32 func_0203a3e0(void); - unk32 func_0203a6d0(unk32, unk32); - unk32 func_0203b0bc(void); - void 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_0203cb5c(unk8, s16); @@ -462,6 +463,7 @@ public: 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); @@ -590,6 +592,13 @@ public: 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); + + unk32 func_02038cb8(unk32 param_2); }; class UnkStruct_027E0C68_UnkSubClass1_Sub2 : public UnkStruct_027E0C68_UnkSubClass1_Base { @@ -776,3 +785,15 @@ public: void func_ov003_020f4874(void); }; extern UnkClass_027e1054 data_027e1054; + +class UnkClass_ov000_020eec9c { +public: + void func_ov000_020d77e4(unk32); +}; +extern UnkClass_ov000_020eec9c data_ov000_020eec9c; + +class UnkClass_ov000_027e0d04 { +public: + void func_0203fe60(unk32); +}; +extern UnkClass_ov000_027e0d04 data_027e0d04; diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index cd4c14de..8aed417b 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -14,7 +14,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_34(unk32 param_2) { iVar2 = this->func_02038cf4(); iVar3 = this->func_02038d10(); - iVar1 = ((this->unk_15A - (this->unk_18 << 3) / 2)); + iVar1 = ((this->unk_158.y - (this->unk_18 << 3) / 2)); if ((param_2 < iVar2 + iVar1) || (iVar2 + iVar3 + iVar1 <= param_2)) { return -1; @@ -67,8 +67,8 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_68(unk32 param_2) { ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_70(unk32* param_2, unk32* param_3) { this->vfunc_6C(param_2, param_3); - *param_2 += this->unk_158; - *param_3 += this->unk_15A; + *param_2 += this->unk_158.x; + *param_3 += this->unk_158.y; } ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { diff --git a/src/Main/Message/func_0203744c.cpp b/src/Main/Message/func_0203744c.cpp index 067e0ae4..2bac7b25 100644 --- a/src/Main/Message/func_0203744c.cpp +++ b/src/Main/Message/func_0203744c.cpp @@ -49,7 +49,7 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Base::UnkStruct_027E0C68_UnkSubClass1_Base { this->func_020387e0(this->unk_150); this->unk_154 = 0; - this->unk_15A = 0; + this->unk_158.y = 0; this->unk_15C = 0; this->unk_15E = 0xFF; this->unk_15F = 0xFF; diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index 250b1df2..313ae6ab 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -233,7 +233,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 par this->vfunc_6C(&local_8c, &local_90); this->func_0203a188(local_8c + param_2, local_90 + param_3, 0); - this->func_0203e1b0(param_2 + local_8c + (this->unk_158 - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_15A - (this->unk_18 << 3) / 2), 0); + this->func_0203e1b0(param_2 + local_8c + (this->unk_158.x - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_158.y - (this->unk_18 << 3) / 2), 0); if (this->unk_584 != 0) { iVar5 = this->unk_18 << 3; @@ -244,8 +244,8 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 par iVar5 = 0; } - this->unk_300.func_02034a1c(param_2 + local_8c + this->unk_55C + (this->unk_158 - (this->unk_14 << 3) / 2), - iVar5 + param_3 + local_90 + this->unk_560 + ((this->unk_15A - (iVar5 / 2))), 0); + this->unk_300.func_02034a1c(param_2 + local_8c + this->unk_55C + (this->unk_158.x - (this->unk_14 << 3) / 2), + iVar5 + param_3 + local_90 + this->unk_560 + ((this->unk_158.y - (iVar5 / 2))), 0); } if (this->unk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { @@ -267,8 +267,8 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 par iVar8 = bVar1->unk_18; uVar9 = data_02056a04[iVar8]; // func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); - iVar6 = this->unk_158 - local_94; - iVar7 = this->unk_15A - local_98; + iVar6 = this->unk_158.x - local_94; + iVar7 = this->unk_158.y - local_98; if ((this->unk_15E != 7) && (this->func_0203a2c0() != 0)) { func_01ffbe34(&aStack_48); @@ -338,10 +338,10 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a188(unk32 param_2, unk3 uVar5 = data_02056a04[iVar6]; func_0203489c(uVar5, data_02056a16[iVar6], &iStack_48, &iStack_4c); - iVar3 = iStack_50 + (this->unk_158 - iStack_48); + iVar3 = iStack_50 + (this->unk_158.x - iStack_48); func_02034698(uVar5, data_02056a0e[iVar6], &iStack_50, &iStack_54); - iVar4 = iStack_54 + (this->unk_15A - iStack_4c); + iVar4 = iStack_54 + (this->unk_158.y - iStack_4c); func_01ffbe34(&aStack_44); aStack_44.mUnk_0a = 1; @@ -477,6 +477,36 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_44(s32 touchLastX, s32 touc } } +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a6d0(unk32 param_2, unk32 param_3) { + unk32 iVar1; + unk32 uVar2; + UnkStruct_0203b264* piVar3; + + if (this->unk_164->unk_168.unk_06 > 0 && this->unk_164->unk_15C <= 0) { + return false; + } + + iVar1 = this->vfunc_34(param_3); + piVar3 = NULL; + + if (!(iVar1 < 0) && iVar1 < 4) { + piVar3 = this->unk_424.func_0203eeb0(iVar1, param_2); + } + + if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16*)piVar3->mUnk_0)[2]) == 0x00FF0002) { + uVar2 = this->func_02038cb8(iVar1); + this->unk_410.func_0203ec4c(piVar3, uVar2, + (s16)(this->unk_158.x - ((this->unk_14 << 3) / 2)) + iVar1 + this->unk_56E, + (s16)(this->unk_158.y - ((this->unk_18 << 3) / 2)) + iVar1 + this->unk_570 + ); + + this->unk_57F = 0; + return true; + } + + return false; +} + // non-matching ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { bool bVar5; @@ -779,6 +809,109 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_58(void) { this->func_02039398(); } +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b0bc(void) { + return this->unk_57F != 0 && data_027e077c.mUnk_0 == data_027e077c.mUnk_4; +} + +// non-matching +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b0ec(unk32 param_2) { + s32 iVar4; + u16 *puVar2; + u32 uVar3; + s32 unaff_r6; + bool bVar1; + + iVar4 = 0; + bVar1 = false; + + uVar3 = param_2; + + if (((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { + uVar3 = 0; + } else { + uVar3 = 1; + } + + unaff_r6 = this->unk_50 == uVar3; + + this->unk_410.func_0203ec34(); + this->unk_585 = 0; + this->unk_584 = 0; + + if (this->unk_150[3] != 0) { + iVar4 = 1; + this->unk_56C = this->unk_578; + bVar1 = true; + this->unk_15C = 0x78; + } else { + if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { + this->func_02038b40(); + + if (data_027e0d38 != 0) { + data_027e103c->func_ov000_020cf224(1); + data_027e103c->func_ov000_020cf2a0(1); + } + + if (this->unk_08 == NULL) { + this->vfunc_58(); + } + + iVar4 = 1; + } + } + + if (iVar4 != 0) { + if (bVar1) { + this->vfunc_54(); + } + + if (unaff_r6 != 0) { + data_027e0d04.func_0203fe60(0); + } + } + + if (((param_2 != 0 && iVar4 != 0) && unaff_r6 != 0) && this->unk_15E != 7) { + data_ov000_020eec9c.func_ov000_020d77e4(0x19); + } + + return iVar4; +} + +// non-matching +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b764(void) { + s32 i = data_027e0c68.unk_00[this->unk_50]; + + this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); + + switch (this->unk_57B) { + case 1: + this->unk_158.y -= 38; + break; + case 2: + switch (this->unk_154->unk_06) { + case 2: + this->unk_158.y -= 111; + break; + case 3: + this->unk_158.y -= 98; + break; + default: + break; + } + break; + default: + break; + } +} + +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203bd8c(u16 param_2) { + this->unk_576 = param_2; + + if (this->func_0203b0ec(0) != 0) { + data_ov000_020eec9c.func_ov000_020d77e4(this->unk_564[param_2]); + } +} + // non-matching (regalloc) ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { u16 sVar1; @@ -926,8 +1059,8 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_60(func_0203b410_param_2* p if (param_2->unk_10 <= 0 && iVar3 > 0) { uVar2 = param_2->unk_12; - this->unk_158 = param_2->unk_10; - this->unk_15A = uVar2; + this->unk_158.x = param_2->unk_10; + this->unk_158.y = uVar2; } else { this->func_0203b764(); } From 1ef64a530850feb22e9fb6d7250c9d5f271c7e3c Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 29 Jan 2025 23:43:03 +0100 Subject: [PATCH 37/64] fix build issues --- .../Message/UnkStruct_027E0C68_UnkSubClass1.hpp | 3 +++ src/Main/Message/MessageManager.cpp | 15 ++++++--------- src/Main/Message/func_0203c8a8.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index a8ac1b28..5b21590b 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -789,11 +789,14 @@ extern UnkClass_027e1054 data_027e1054; class UnkClass_ov000_020eec9c { public: void func_ov000_020d77e4(unk32); + unk32 func_ov000_020d7f18(unk32); }; extern UnkClass_ov000_020eec9c data_ov000_020eec9c; class UnkClass_ov000_027e0d04 { public: + /* 0x00 */ unk16 unk_00; + void func_0203fe60(unk32); }; extern UnkClass_ov000_027e0d04 data_027e0d04; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 15446045..6a9577ac 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -3,18 +3,15 @@ #include "Player/TouchControl.hpp" extern ARM unk32 func_ov000_020d7f18(u32*, unk32); -extern ARM unk32 func_ov000_020d77e4(u32*, unk32); extern ARM unk32 func_02037628(u8*); extern ARM void func_0203dc74(UnkStruct_027E0C68_UnkSubClass1_Base*, unk32, unk32); -extern u32 data_ov000_020eec9c[]; extern u32** data_027e0ce0[]; extern u32 data_02056924[]; extern u32* data_02068e6c; extern u32* data_02068e8c; extern u16 data_02056918[]; extern ActorTypeId data_0205691c[]; -extern s16 data_027e0d04; // this should be `data_027e0ffc->func_ov000_020cec60(u16, Vec3p*, s32);` extern u32* data_027e0ffc; @@ -340,7 +337,7 @@ ARM void UnkStruct_027E0C68::func_02036bbc(void) { bool bVar4; s32 i; - if (data_027e0d04 > 0) { + if (data_027e0d04.unk_00 > 0) { return; } @@ -464,7 +461,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02036da8(u32 // BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); - func_ov000_020d77e4(data_ov000_020eec9c, 0x1C); + data_ov000_020eec9c.func_ov000_020d77e4(0x1C); return pSVar4; } @@ -523,11 +520,11 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036f68(u32 pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s16*)param_3, 0); - if (func_ov000_020d7f18(data_ov000_020eec9c, 0x19) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x18) == 0 && - func_ov000_020d7f18(data_ov000_020eec9c, 0x34) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x35) == 0 && - func_ov000_020d7f18(data_ov000_020eec9c, 0x1A) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x1B) == 0 && + if (data_ov000_020eec9c.func_ov000_020d7f18(0x19) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x18) == 0 && + data_ov000_020eec9c.func_ov000_020d7f18(0x34) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x35) == 0 && + data_ov000_020eec9c.func_ov000_020d7f18(0x1A) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x1B) == 0 && (param_3[12]) != 7) { - func_ov000_020d77e4(data_ov000_020eec9c, 0x1C); + data_ov000_020eec9c.func_ov000_020d77e4(0x1C); } return pSVar5; diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp index fdb6d4a3..3d044be2 100644 --- a/src/Main/Message/func_0203c8a8.cpp +++ b/src/Main/Message/func_0203c8a8.cpp @@ -8,7 +8,7 @@ #include "System/SysNew.hpp" extern u32 *data_027e0ce0[]; -extern "C" void func_02007938(unk32, unk32*, unk32, unk32, unk32); +extern "C" void func_02007938(unk32, unk16*, unk32, unk32, unk32); // non-matching THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::UnkStruct_027E0C68_UnkSubClass1_Base_0(unk32 param_2, unk32 param_3, unk32 param_4) { From a65697ce56639332b8e8e078277d9d34bbc79bb3 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:28:49 +0100 Subject: [PATCH 38/64] more progress --- config/eur/arm9/symbols.txt | 10 +- include/DTCM/UnkStruct_027e103c.hpp | 20 +-- include/Message/MessageManager.hpp | 1 + .../UnkStruct_027E0C68_UnkSubClass1.hpp | 47 +++++-- src/Main/Message/func_020397f8.cpp | 116 +++++++++++++++++- 5 files changed, 166 insertions(+), 28 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index b50959ae..17e3f6c4 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1937,12 +1937,12 @@ _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b764Ev kind:function(arm,siz _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b814 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203bd8cEt kind:function(arm,size=0x40) addr:0x203bd8c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc -func_0203be08 kind:function(arm,size=0x5c) addr:0x203be08 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203be08Ev kind:function(arm,size=0x5c) addr:0x203be08 func_0203be64 kind:function(arm,size=0x220) addr:0x203be64 -func_0203c084 kind:function(arm,size=0xb8) addr:0x203c084 -func_0203c13c kind:function(arm,size=0x64) addr:0x203c13c -func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c1a0 -func_0203c25c kind:function(arm,size=0x6c) addr:0x203c25c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c084Ev kind:function(arm,size=0xb8) addr:0x203c084 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c13cEv kind:function(arm,size=0x64) addr:0x203c13c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c1a0Ev kind:function(arm,size=0xbc) addr:0x203c1a0 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c25cEPS_ kind:function(arm,size=0x6c) addr:0x203c25c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c310 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c350 diff --git a/include/DTCM/UnkStruct_027e103c.hpp b/include/DTCM/UnkStruct_027e103c.hpp index 7d3aee56..6da1a887 100644 --- a/include/DTCM/UnkStruct_027e103c.hpp +++ b/include/DTCM/UnkStruct_027e103c.hpp @@ -23,15 +23,21 @@ struct UnkStruct_027e103c { void func_ov000_020cf224(unk32); void func_ov000_020cf2a0(unk32); - unk32 func_ov000_020cf4bc(void); - unk8* func_ov000_020cef9c(void); - void func_ov000_020cfb38(void); - unk32 func_ov000_020cf488(void); - void func_ov000_020cfa24(void); - void func_ov000_020cfe40(unk32, unk32); - void func_ov005_02104028(unk32); + s8* func_ov000_020cef9c(void); unk32 func_ov000_020cf0bc(void); + bool func_ov000_020cf42c(void); + unk32 func_ov000_020cf488(void); + unk32 func_ov000_020cf4bc(void); + void func_ov000_020cfa24(void); + void func_ov000_020cfb38(void); + void func_ov000_020cfe40(unk32, unk32); void func_ov005_02103f8c(unk32*); + void func_ov005_02104028(unk32); + void func_ov000_020cfb58(u8*); + unk32 func_ov000_020cf8fc(unk32); + + //! TODO: find out if the type is always `UnkStruct_027E0C68_UnkSubClass1_Sub1*` + void func_ov000_020cfb20(void*); }; extern UnkStruct_027e103c *data_027e103c; diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 16120003..0ef665b9 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -82,6 +82,7 @@ public: class UnkStruct_027E0C68 : public SysObject { public: /* 0x00 */ u8 unk_00[2]; + /* 0x02 */ u8 unk_02; /* 0x03 */ u8 unk_03; /* 0x04 */ u8 unk_04; /* 0x05 */ u8 unk_05; diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index 5b21590b..d7b47039 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -119,12 +119,14 @@ public: /* 0x08 */ }; +typedef bool (*UnknownCallback)(class UnkStruct_027E0C68_UnkSubClass1_Sub1*); + class UnkSubClass1_UnkownClass2 : public UnkSubClass1_UnkownClass2_Base1 { public: /* 0x14 */ unk32 unk_14; /* 0x18 */ unk32 unk_18; - /* 0x1C */ unk32 unk_1C; - /* 0x20 */ unk32 unk_20; + /* 0x1C */ UnknownCallback unk_1C; + /* 0x20 */ class UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_20; /* 0x24 */ unk32 unk_24; /* 0x2C */ @@ -271,6 +273,8 @@ public: /* 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_02032fa4(void); }; class UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114 : public SysObject { @@ -437,7 +441,6 @@ public: static void func_020387e0(u8* param_2); - unk32 func_02032fa4(void); unk32 func_02032fb4(void); unk32 func_020337d8(unk32 param_2); u16* func_02037604(u16**); @@ -453,8 +456,6 @@ public: void func_020393a8(unk32 param_2); void func_0203a188(unk32, unk32); unk32 func_0203a3e0(void); - void func_0203be08(void); - void func_0203be64(void); unk32 func_0203cb5c(unk8, s16); void func_0203dc10(u8 param_2); void func_0203dc10(u8 param_2, u8 param_3); @@ -505,16 +506,20 @@ public: /* 0x428 */ UnknownMsgChoiceStruct unk_428[0x20]; /* 0x528 */ unk16 unk_528[4]; // number of choices? /* 0x55C */ unk32 unk_530; - /* 0x55C */ unk32 unk_534; - /* 0x55C */ unk32 unk_538; + /* 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 */ unk32 unk_548; - /* 0x55C */ unk32 unk_54C; + /* 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; @@ -581,6 +586,8 @@ public: /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; /* 0x74 */ + static bool func_0203c25c(class UnkStruct_027E0C68_UnkSubClass1_Sub1* param_1); + void func_0203e060(u8 param_2, u8 param_3); void func_02039a3c(void); @@ -597,6 +604,11 @@ public: 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); unk32 func_02038cb8(unk32 param_2); }; @@ -777,12 +789,21 @@ typedef struct UnkStruct_01ffbe34 { } UnkStruct_01ffbe34; extern "C" void func_01ffbe34(UnkStruct_01ffbe34 *param1); +struct UnkClass_027e1054_unk_00_unk00 { + /* 0x00 */ u8 unk_00[0x95]; + /* 0x95 */ u8 unk_95; +}; +struct UnkClass_027e1054_unk_00 { + /* 0x00 */ unk32 unk_04; + /* 0x00 */ UnkClass_027e1054_unk_00_unk00* unk_00; +}; class UnkClass_027e1054 { public: - unk32 unk_00; + UnkClass_027e1054_unk_00* unk_00; unk32 unk_04; void func_ov003_020f4874(void); + void func_ov003_020f4760(u8, unk32); }; extern UnkClass_027e1054 data_027e1054; @@ -800,3 +821,9 @@ public: void func_0203fe60(unk32); }; extern UnkClass_ov000_027e0d04 data_027e0d04; + +class UnkClass_data_027e0f7c { +public: + u8* func_ov000_0209d90c(s8, s8); +}; +extern UnkClass_data_027e0f7c data_027e0f7c; diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index 313ae6ab..a4e5d909 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -765,7 +765,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_5C(void) { // non-matching ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_58(void) { bool bVar1; - unk8* puVar2; + s8* puVar2; int iVar3; char *pcVar4; @@ -799,11 +799,11 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_58(void) { } } - if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.unk_04 + 0x99) != 0 && - (data_027e077c.mUnk_0 != 0x39 || data_027e103c->func_ov000_020cf0bc())) { - data_027e1054.func_ov003_020f4874(); - data_027e103c->func_ov005_02103f8c(data_02057ed4); - } + // if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.unk_04 + 0x99) != 0 && + // (data_027e077c.mUnk_0 != 0x39 || data_027e103c->func_ov000_020cf0bc())) { + // data_027e1054.func_ov003_020f4874(); + // data_027e103c->func_ov005_02103f8c(data_02057ed4); + // } } this->func_02039398(); @@ -1106,6 +1106,110 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_6C(unk32* param_2, unk32* p *param_3 += this->unk_570; } +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203be08(void) { + if (data_027e0d38 != 0) { + if (data_027e103c->func_ov000_020cf42c() != 0) { + this->unk_534 = this->unk_538; + } else { + this->unk_534 = this->unk_536; + } + + if (this->func_0203c084() != 0) { + this->unk_548 = this->unk_54C; + } + } +} + +// non-matching +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c084(void) { + unk32 uVar4; + bool bVar2; + bool bVar1; + bool bVar3; + + uVar4 = 0; + + if (this->unk_50 == 0) { + bVar2 = true; + bVar1 = true; + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0 && data_027e103c->func_ov000_020cf8fc(0x8F) == 0) { + bVar1 = false; + } + + if (!bVar1 && data_027e0618[0x101] == 0) { + if ((data_027e0d38 != NULL && data_027e0d38->mUnk_14 == 1) == 0) { + bVar2 = false; + } + } + + if (bVar2) { + uVar4 = 1; + } + } + + return uVar4; +} + +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c13c(void) { + if (this->func_02032fa4() == 0) { + data_ov000_020eec9c.func_ov000_020d77e4(6); + data_027e103c->func_ov000_020cfb20(this); + this->unk_585 = 1; + this->unk_584 = 1; + this->unk_128.unk_18 = 0x00016000; + this->unk_128.unk_1C = NULL; + this->unk_128.unk_20 = 0; + this->unk_128.unk_24 = 0; + + return true; + } + + return false; +} + +// non-matching +ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c1a0(void) { + s8* pVar1; + u8* iVar3; + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { + this->unk_584 = 1; + + pVar1 = data_027e103c->func_ov000_020cef9c(); + iVar3 = data_027e0f7c.func_ov000_0209d90c(pVar1[0x24F], 0); + data_027e1054.func_ov003_020f4760(iVar3[1], 0); + data_ov000_020eec9c.func_ov000_020d77e4(6); + data_027e103c->func_ov000_020cfb58(iVar3); + + this->unk_128.unk_18 = 0x0000A000; + this->unk_128.unk_1C = this->func_0203c25c; + this->unk_128.unk_20 = this; + this->unk_128.unk_24 = 0; + + return 0; + } + + return 0; +} + +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c25c(UnkStruct_027E0C68_UnkSubClass1_Sub1* param_1) { + if (data_027e1054.unk_00->unk_00->unk_95 != 0) { + return false; + } + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { + param_1->unk_585 = 1; + param_1->unk_128.unk_18 = 0x00016000; + param_1->unk_128.unk_1C = NULL; + param_1->unk_128.unk_20 = 0; + param_1->unk_128.unk_24 = 0; + return true; + } + + return false; +} + ARM UnkStruct_027E0C68_UnkSubClass1_Sub1::~UnkStruct_027E0C68_UnkSubClass1_Sub1() { } From 1c316549d459c898b5084c89eb3e9b9a27be65a1 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Thu, 30 Jan 2025 16:43:18 +0100 Subject: [PATCH 39/64] more progress --- config/eur/arm9/symbols.txt | 16 ++--- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 64 +++++++++++-------- src/Main/Message/func_020397f8.cpp | 64 ++++++++++++++++++- 3 files changed, 107 insertions(+), 37 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 17e3f6c4..8a7c227b 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1947,18 +1947,18 @@ _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr: _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c310 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c350 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3C1Eisi kind:function(thumb,size=0x44) addr:0x203c358 -func_0203c39c kind:function(thumb,size=0x78) addr:0x203c39c -func_0203c414 kind:function(arm,size=0x4c) addr:0x203c414 -func_0203c460 kind:function(arm,size=0x4c) addr:0x203c460 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub313func_0203c39cEii kind:function(thumb,size=0x78) addr:0x203c39c +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub38vfunc_3CEi kind:function(arm,size=0x4c) addr:0x203c414 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub38vfunc_40Eii kind:function(arm,size=0x4c) addr:0x203c460 func_0203c4ac kind:function(arm,size=0x118) addr:0x203c4ac -func_0203c5c4 kind:function(arm,size=0x18) addr:0x203c5c4 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub38vfunc_14Eii kind:function(arm,size=0x18) addr:0x203c5c4 func_0203c5dc kind:function(arm,size=0x120) addr:0x203c5dc -func_0203c6fc kind:function(arm,size=0x1c) addr:0x203c6fc -func_0203c718 kind:function(arm,size=0x14) addr:0x203c718 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3D0Ev kind:function(arm,size=0x1c) addr:0x203c6fc +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3D2Ev kind:function(arm,size=0x14) addr:0x203c718 _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2C1Eisi kind:function(arm,size=0x110) addr:0x203c72c _ZN36UnkStruct_027E0C68_UnkSubClass1_Sub213func_0203c83cEv kind:function(arm,size=0x4) addr:0x203c83c -func_0203c840 kind:function(arm,size=0x30) addr:0x203c840 -func_0203c870 kind:function(arm,size=0x38) addr:0x203c870 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2D2Ev kind:function(arm,size=0x30) addr:0x203c840 +_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2D0Ev kind:function(arm,size=0x38) addr:0x203c870 func_0203c8a8 kind:function(arm,size=0x58) addr:0x203c8a8 func_0203c900 kind:function(arm,size=0x4) addr:0x203c900 func_0203c904 kind:function(arm,size=0x11c) addr:0x203c904 diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index d7b47039..a40d5982 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -286,8 +286,10 @@ public: UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114(); /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114() override; /* 0x04 */ virtual UNK_TYPE vfunc_04(UNK_TYPE); - /* 0x08 */ virtual UNK_TYPE vfunc_08(UNK_TYPE); + /* 0x08 */ virtual unk32 vfunc_08(void*, s16); /* 0x0C */ + + unk32 func_0203d1b4(void); }; // astruct_7 @@ -477,6 +479,8 @@ public: unk32 func_0203e284(UnkStruct_0203b264*, unk32, unk32); void func_0203e2ac(unk32* param_2); void func_0203fc78(unk32*, unk32*); + s16 func_0203d318(s16, s16); + void func_02038ef4(unk32, unk32); }; // does it host both choices? @@ -679,35 +683,39 @@ public: UnkStruct_027E0C68_UnkSubClass1_Sub3(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub3(); - /* 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(unk8 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, unk32 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(unk32 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; + /* 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(unk8 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, unk32 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(unk32 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 diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index a4e5d909..bdb4432a 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -1229,6 +1229,65 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Sub3::UnkStruct_027E0C68_UnkSubClass1_Sub3 this->unk_16E = 0; } +// non-matching +THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub3::func_0203c39c(unk32 param_2, unk32 param_3) { + u16 uVar1; + unk32 uVar2; + s16 uVar3; + s32 iVar4; + s32 local_20; + s32 local_1c [2]; + + this->func_02038b28(); + uVar3 = 0; + + for (iVar4 = 0; iVar4 < 2; iVar4++) { + local_1c[0] = 0xC0; + local_20 = 0x10; + + if (iVar4 != 0) { + this->func_0203fc78(local_1c, &local_20); + } + + uVar1 = this->func_0203d318((s32)(local_1c[0] + 7 + ((u32)(local_1c[0] + 7 >> 2) >> 0x1D)) >> 3, + (s32)(local_20 + 7 + ((u32)(local_20 + 7 >> 2) >> 0x1D)) >> 3); + + if (uVar3 < uVar1) { + uVar3 = uVar1; + } + } + + if (this->unk_114->vfunc_08(this, uVar3) != 0) { + this->unk_10 = this->unk_114->func_0203d1b4(); + } +} + +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_3C(unk32 param_2) { + if (this->unk_15C > 0 && this->unk_122 != 1) { + if (this->func_0203de14(param_2) != 0) { + this->vfunc_40(0, 0); + } + } +} + +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_40(unk32 param_2, unk32 param_3) { + param_2 += this->unk_166; + param_3 += this->unk_168; + + this->func_0203c4ac(param_2 + this->unk_16A, param_3 + this->unk_16C); + this->func_02038ef4(param_2, param_3); +} + +//! TODO: solve vfunc oddities +extern "C" bool func_0203dcb4(unk32); +// non-matching +ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_14(unk32 param_2, unk32 param_3) { + return func_0203dcb4(param_2 + this->unk_162); +} + +ARM UnkStruct_027E0C68_UnkSubClass1_Sub3::~UnkStruct_027E0C68_UnkSubClass1_Sub3() { +} + // non-matching ARM UnkStruct_027E0C68_UnkSubClass1_Sub2::UnkStruct_027E0C68_UnkSubClass1_Sub2(unk32 param_2, unk16 param_3, unk32 param_4) : UnkStruct_027E0C68_UnkSubClass1_Base(1, 0, param_4) @@ -1251,5 +1310,8 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub2::UnkStruct_027E0C68_UnkSubClass1_Sub2(u this->unk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0); } -void UnkStruct_027E0C68_UnkSubClass1_Sub2::func_0203c83c(void) { +ARM void UnkStruct_027E0C68_UnkSubClass1_Sub2::func_0203c83c(void) { +} + +ARM UnkStruct_027E0C68_UnkSubClass1_Sub2::~UnkStruct_027E0C68_UnkSubClass1_Sub2() { } From 268d0822eb3eb9076e6afa7ba79f9b07867e4d8f Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Thu, 30 Jan 2025 17:36:52 +0100 Subject: [PATCH 40/64] renamed some classes --- config/eur/arm9/symbols.txt | 136 +++++++++--------- config/usa/arm9/symbols.txt | 72 +++++----- include/DTCM/UnkStruct_027e103c.hpp | 2 +- include/Message/MessageManager.hpp | 20 +-- .../UnkStruct_027E0C68_UnkSubClass1.hpp | 68 ++++----- src/Main/Message/MessageManager.cpp | 64 ++++----- .../UnkStruct_027E0C68_UnkSubClass1.cpp | 12 +- src/Main/Message/func_02032f0c.cpp | 2 +- src/Main/Message/func_0203744c.cpp | 6 +- src/Main/Message/func_020397f8.cpp | 104 +++++++------- src/Main/Message/func_0203c8a8.cpp | 14 +- 11 files changed, 250 insertions(+), 250 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 8a7c227b..3fac0e60 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1647,7 +1647,7 @@ func_02032e44 kind:function(arm,size=0x1c) addr:0x2032e44 func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e60 _ZN31UnkSubClass1_UnkownClass2_Base1C2Ev kind:function(arm,size=0x48) addr:0x2032e7c _ZN31UnkSubClass1_UnkownClass2_Base1C1Ev kind:function(arm,size=0x48) addr:0x2032ec4 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_1C2Ev kind:function(thumb,size=0x78) addr:0x2032f0c +_ZN12MsgProc_BaseC2Ev kind:function(thumb,size=0x78) addr:0x2032f0c func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f84 func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f88 func_02032f94 kind:function(thumb,size=0x4) addr:0x2032f94 @@ -1872,21 +1872,21 @@ func_02038888 kind:function(arm,size=0xc8) addr:0x2038888 func_02038950 kind:function(arm,size=0x130) addr:0x2038950 func_02038a80 kind:function(arm,size=0x1c) addr:0x2038a80 func_02038a9c kind:function(thumb,size=0x4) addr:0x2038a9c -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseC2Eisi kind:function(thumb,size=0x5c) addr:0x2038aa0 -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD1Ev kind:function(thumb,size=0xc) addr:0x2038afc -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD0Ev kind:function(thumb,size=0x14) addr:0x2038b08 -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseD2Ev kind:function(thumb,size=0xc) addr:0x2038b1c +_ZN12MsgProc_MainC2Eisi kind:function(thumb,size=0x5c) addr:0x2038aa0 +_ZN12MsgProc_MainD1Ev kind:function(thumb,size=0xc) addr:0x2038afc +_ZN12MsgProc_MainD0Ev kind:function(thumb,size=0x14) addr:0x2038b08 +_ZN12MsgProc_MainD2Ev kind:function(thumb,size=0xc) addr:0x2038b1c func_02038b28 kind:function(thumb,size=0xc) addr:0x2038b28 func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Base13func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038b40 +_ZN12MsgProc_Main13func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038b40 func_02038b74 kind:function(arm,size=0x4) addr:0x2038b74 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b78 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038c34 +_ZN13MsgProc_Type18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038c34 func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038cb8 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cf4 func_02038d10 kind:function(arm,size=0x10) addr:0x2038d10 func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038d20 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038ed0 +_ZN13MsgProc_Type18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038ed0 func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038ef4 func_02038f40 kind:function(arm,size=0x4) addr:0x2038f40 func_02038f44 kind:function(arm,size=0x114) addr:0x2038f44 @@ -1894,71 +1894,71 @@ func_02039058 kind:function(arm,size=0x4) addr:0x2039058 func_0203905c kind:function(arm,size=0x48) addr:0x203905c func_020390a4 kind:function(arm,size=0x164) addr:0x20390a4 func_02039208 kind:function(arm,size=0x20) addr:0x2039208 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 +_ZN13MsgProc_Type18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 func_02039250 kind:function(arm,size=0x64) addr:0x2039250 func_020392b4 kind:function(arm,size=0xe4) addr:0x20392b4 func_02039398 kind:function(arm,size=0xc) addr:0x2039398 func_020393a4 kind:function(arm,size=0x4) addr:0x20393a4 func_020393a8 kind:function(arm,size=0x28) addr:0x20393a8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_68Ei kind:function(arm,size=0x70) addr:0x20393d0 +_ZN13MsgProc_Type18vfunc_68Ei kind:function(arm,size=0x70) addr:0x20393d0 func_02039440 kind:function(arm,size=0x3c) addr:0x2039440 func_0203947c kind:function(arm,size=0x5c) addr:0x203947c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 +_ZN13MsgProc_Type18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 func_0203951c kind:function(arm,size=0x40) addr:0x203951c func_0203955c kind:function(arm,size=0x14) addr:0x203955c func_02039570 kind:function(arm,size=0x8) addr:0x2039570 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039578 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C2Eisi kind:function(thumb,size=0x244) addr:0x20395b4 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Eisi kind:function(thumb,size=0x244) addr:0x20397f8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a5c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039ca8Ev kind:function(arm,size=0x24) addr:0x2039ca8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039ccc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d74 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a188Eiii kind:function(arm,size=0x138) addr:0x203a188 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a2c0Ev kind:function(arm,size=0x4c) addr:0x203a2c0 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a30cEv kind:function(arm,size=0x1c) addr:0x203a30c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a328 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a35cEv kind:function(arm,size=0x84) addr:0x203a35c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a3e0Ev kind:function(arm,size=0x1c) addr:0x203a3e0 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3fc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203a6d0Eii kind:function(arm,size=0x120) addr:0x203a6d0 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7f0 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a988 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203aea8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203af1c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b0bcEv kind:function(arm,size=0x30) addr:0x203b0bc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b0ecEi kind:function(arm,size=0x178) addr:0x203b0ec -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b410 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b5d0 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203b764Ev kind:function(arm,size=0xb0) addr:0x203b764 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b814 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203bd8cEt kind:function(arm,size=0x40) addr:0x203bd8c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203be08Ev kind:function(arm,size=0x5c) addr:0x203be08 +_ZN13MsgProc_Type18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039578 +_ZN13MsgProc_Type1C2Eisi kind:function(thumb,size=0x244) addr:0x20395b4 +_ZN13MsgProc_Type1C1Eisi kind:function(thumb,size=0x244) addr:0x20397f8 +_ZN13MsgProc_Type113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c +_ZN13MsgProc_Type18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a5c +_ZN13MsgProc_Type113func_02039ca8Ev kind:function(arm,size=0x24) addr:0x2039ca8 +_ZN13MsgProc_Type18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039ccc +_ZN13MsgProc_Type18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d74 +_ZN13MsgProc_Type113func_0203a188Eiii kind:function(arm,size=0x138) addr:0x203a188 +_ZN13MsgProc_Type113func_0203a2c0Ev kind:function(arm,size=0x4c) addr:0x203a2c0 +_ZN13MsgProc_Type113func_0203a30cEv kind:function(arm,size=0x1c) addr:0x203a30c +_ZN13MsgProc_Type18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a328 +_ZN13MsgProc_Type113func_0203a35cEv kind:function(arm,size=0x84) addr:0x203a35c +_ZN13MsgProc_Type113func_0203a3e0Ev kind:function(arm,size=0x1c) addr:0x203a3e0 +_ZN13MsgProc_Type18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3fc +_ZN13MsgProc_Type113func_0203a6d0Eii kind:function(arm,size=0x120) addr:0x203a6d0 +_ZN13MsgProc_Type18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7f0 +_ZN13MsgProc_Type18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a988 +_ZN13MsgProc_Type18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203aea8 +_ZN13MsgProc_Type18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203af1c +_ZN13MsgProc_Type113func_0203b0bcEv kind:function(arm,size=0x30) addr:0x203b0bc +_ZN13MsgProc_Type113func_0203b0ecEi kind:function(arm,size=0x178) addr:0x203b0ec +_ZN13MsgProc_Type18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b264 +_ZN13MsgProc_Type18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b310 +_ZN13MsgProc_Type18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b410 +_ZN13MsgProc_Type18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b5d0 +_ZN13MsgProc_Type113func_0203b764Ev kind:function(arm,size=0xb0) addr:0x203b764 +_ZN13MsgProc_Type18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b814 +_ZN13MsgProc_Type113func_0203bd8cEt kind:function(arm,size=0x40) addr:0x203bd8c +_ZN13MsgProc_Type18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bdcc +_ZN13MsgProc_Type113func_0203be08Ev kind:function(arm,size=0x5c) addr:0x203be08 func_0203be64 kind:function(arm,size=0x220) addr:0x203be64 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c084Ev kind:function(arm,size=0xb8) addr:0x203c084 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c13cEv kind:function(arm,size=0x64) addr:0x203c13c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c1a0Ev kind:function(arm,size=0xbc) addr:0x203c1a0 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203c25cEPS_ kind:function(arm,size=0x6c) addr:0x203c25c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c310 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c350 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3C1Eisi kind:function(thumb,size=0x44) addr:0x203c358 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub313func_0203c39cEii kind:function(thumb,size=0x78) addr:0x203c39c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub38vfunc_3CEi kind:function(arm,size=0x4c) addr:0x203c414 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub38vfunc_40Eii kind:function(arm,size=0x4c) addr:0x203c460 +_ZN13MsgProc_Type113func_0203c084Ev kind:function(arm,size=0xb8) addr:0x203c084 +_ZN13MsgProc_Type113func_0203c13cEv kind:function(arm,size=0x64) addr:0x203c13c +_ZN13MsgProc_Type113func_0203c1a0Ev kind:function(arm,size=0xbc) addr:0x203c1a0 +_ZN13MsgProc_Type113func_0203c25cEPS_ kind:function(arm,size=0x6c) addr:0x203c25c +_ZN13MsgProc_Type1D0Ev kind:function(arm,size=0x48) addr:0x203c2c8 +_ZN13MsgProc_Type1D2Ev kind:function(arm,size=0x40) addr:0x203c310 +_ZN13MsgProc_Type18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c350 +_ZN13MsgProc_Type2C1Eisi kind:function(thumb,size=0x44) addr:0x203c358 +_ZN13MsgProc_Type213func_0203c39cEii kind:function(thumb,size=0x78) addr:0x203c39c +_ZN13MsgProc_Type28vfunc_3CEi kind:function(arm,size=0x4c) addr:0x203c414 +_ZN13MsgProc_Type28vfunc_40Eii kind:function(arm,size=0x4c) addr:0x203c460 func_0203c4ac kind:function(arm,size=0x118) addr:0x203c4ac -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub38vfunc_14Eii kind:function(arm,size=0x18) addr:0x203c5c4 +_ZN13MsgProc_Type28vfunc_14Eii kind:function(arm,size=0x18) addr:0x203c5c4 func_0203c5dc kind:function(arm,size=0x120) addr:0x203c5dc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3D0Ev kind:function(arm,size=0x1c) addr:0x203c6fc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3D2Ev kind:function(arm,size=0x14) addr:0x203c718 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2C1Eisi kind:function(arm,size=0x110) addr:0x203c72c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub213func_0203c83cEv kind:function(arm,size=0x4) addr:0x203c83c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2D2Ev kind:function(arm,size=0x30) addr:0x203c840 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2D0Ev kind:function(arm,size=0x38) addr:0x203c870 +_ZN13MsgProc_Type2D0Ev kind:function(arm,size=0x1c) addr:0x203c6fc +_ZN13MsgProc_Type2D2Ev kind:function(arm,size=0x14) addr:0x203c718 +_ZN13MsgProc_Type3C1Eisi kind:function(arm,size=0x110) addr:0x203c72c +_ZN13MsgProc_Type313func_0203c83cEv kind:function(arm,size=0x4) addr:0x203c83c +_ZN13MsgProc_Type3D2Ev kind:function(arm,size=0x30) addr:0x203c840 +_ZN13MsgProc_Type3D0Ev kind:function(arm,size=0x38) addr:0x203c870 func_0203c8a8 kind:function(arm,size=0x58) addr:0x203c8a8 func_0203c900 kind:function(arm,size=0x4) addr:0x203c900 func_0203c904 kind:function(arm,size=0x11c) addr:0x203c904 @@ -2024,22 +2024,22 @@ func_0203d848 kind:function(arm,size=0x8c) addr:0x203d848 func_0203d8d4 kind:function(arm,size=0x8c) addr:0x203d8d4 func_0203d960 kind:function(arm,size=0xc0) addr:0x203d960 func_0203da20 kind:function(arm,size=0xc0) addr:0x203da20 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0C2Eiii kind:function(thumb,size=0x98) addr:0x203dae0 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0D1Ev kind:function(thumb,size=0x30) addr:0x203db78 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0D0Ev kind:function(thumb,size=0x38) addr:0x203dba8 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_0D2Ev kind:function(thumb,size=0x30) addr:0x203dbe0 +_ZN13MsgProc_Base2C2Eiii kind:function(thumb,size=0x98) addr:0x203dae0 +_ZN13MsgProc_Base2D1Ev kind:function(thumb,size=0x30) addr:0x203db78 +_ZN13MsgProc_Base2D0Ev kind:function(thumb,size=0x38) addr:0x203dba8 +_ZN13MsgProc_Base2D2Ev kind:function(thumb,size=0x30) addr:0x203dbe0 func_0203dc10 kind:function(arm,size=0x64) addr:0x203dc10 func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc74 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dcb4 +_ZN13MsgProc_Type18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dcb4 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcfc func_0203ddec kind:function(arm,size=0x10) addr:0x203ddec func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddfc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Base13func_0203de14Ei kind:function(arm,size=0x10) addr:0x203de14 +_ZN12MsgProc_Main13func_0203de14Ei kind:function(arm,size=0x10) addr:0x203de14 func_0203de24 kind:function(arm,size=0x34) addr:0x203de24 func_0203de58 kind:function(arm,size=0x208) addr:0x203de58 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 +_ZN13MsgProc_Type113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 func_0203e090 kind:function(arm,size=0x38) addr:0x203e090 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e0c8 +_ZN13MsgProc_Type18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e0c8 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0f8 func_0203e19c kind:function(arm,size=0x14) addr:0x203e19c func_0203e1b0 kind:function(arm,size=0xd4) addr:0x203e1b0 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 764f42f0..124be2c6 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1647,7 +1647,7 @@ func_02032e44 kind:function(arm,size=0x1c) addr:0x2032e40 func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e5c func_02032e7c kind:function(arm,size=0x48) addr:0x2032e78 func_02032ec4 kind:function(arm,size=0x48) addr:0x2032ec0 -_ZN38UnkStruct_027E0C68_UnkSubClass1_Base_1C2Ev kind:function(thumb,size=0x78) addr:0x2032f08 +_ZN12MsgProc_BaseC2Ev kind:function(thumb,size=0x78) addr:0x2032f08 func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f80 func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f84 func_02032f94 kind:function(thumb,size=0x4) addr:0x2032f90 @@ -1872,21 +1872,21 @@ func_02038888 kind:function(arm,size=0xc8) addr:0x2038844 func_02038950 kind:function(arm,size=0x130) addr:0x203890c func_02038a80 kind:function(arm,size=0x1c) addr:0x2038a3c func_02038a9c kind:function(thumb,size=0x4) addr:0x2038a58 -_ZN36UnkStruct_027E0C68_UnkSubClass1_BaseC1Eic kind:function(thumb,size=0x5c) addr:0x2038a5c +_ZN12MsgProc_MainC1Eic kind:function(thumb,size=0x5c) addr:0x2038a5c func_02038afc kind:function(thumb,size=0xc) addr:0x2038ab8 func_02038b08 kind:function(thumb,size=0x14) addr:0x2038ac4 func_02038b1c kind:function(thumb,size=0xc) addr:0x2038ad8 func_02038b28 kind:function(thumb,size=0xc) addr:0x2038ae4 func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0 -_Z13func_02038b40P31UnkStruct_027E0C68_UnkSubClass1_Sub1 kind:function(arm,size=0x34) addr:0x2038afc +_Z13func_02038b40P31MsgProc_Type1 kind:function(arm,size=0x34) addr:0x2038afc func_02038b74 kind:function(arm,size=0x4) addr:0x2038b30 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b34 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0 +_ZN13MsgProc_Type18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0 func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038c74 func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cb0 func_02038d10 kind:function(arm,size=0x10) addr:0x2038ccc func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038cdc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038e8c +_ZN13MsgProc_Type18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038e8c func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038eb0 func_02038f40 kind:function(arm,size=0x4) addr:0x2038efc func_02038f44 kind:function(arm,size=0x114) addr:0x2038f00 @@ -1894,59 +1894,59 @@ func_02039058 kind:function(arm,size=0x4) addr:0x2039014 func_0203905c kind:function(arm,size=0x48) addr:0x2039018 func_020390a4 kind:function(arm,size=0x164) addr:0x2039060 func_02039208 kind:function(arm,size=0x20) addr:0x20391c4 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 +_ZN13MsgProc_Type18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 func_02039250 kind:function(arm,size=0x64) addr:0x203920c func_020392b4 kind:function(arm,size=0xe4) addr:0x2039270 func_02039398 kind:function(arm,size=0xc) addr:0x2039354 func_020393a4 kind:function(arm,size=0x4) addr:0x2039360 func_020393a8 kind:function(arm,size=0x28) addr:0x2039364 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_68Ei kind:function(arm,size=0x70) addr:0x203938c +_ZN13MsgProc_Type18vfunc_68Ei kind:function(arm,size=0x70) addr:0x203938c func_02039440 kind:function(arm,size=0x3c) addr:0x20393fc func_0203947c kind:function(arm,size=0x5c) addr:0x2039438 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 +_ZN13MsgProc_Type18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 func_0203951c kind:function(arm,size=0x40) addr:0x20394d8 func_0203955c kind:function(arm,size=0x14) addr:0x2039518 func_02039570 kind:function(arm,size=0x8) addr:0x203952c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039534 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C2Ev kind:function(thumb,size=0x244) addr:0x2039570 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1C1Ev kind:function(thumb,size=0x244) addr:0x20397b4 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a18 +_ZN13MsgProc_Type18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039534 +_ZN13MsgProc_Type1C2Ev kind:function(thumb,size=0x244) addr:0x2039570 +_ZN13MsgProc_Type1C1Ev kind:function(thumb,size=0x244) addr:0x20397b4 +_ZN13MsgProc_Type113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 +_ZN13MsgProc_Type18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a18 func_02039ca8 kind:function(arm,size=0x24) addr:0x2039c64 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039c88 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d30 +_ZN13MsgProc_Type18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039c88 +_ZN13MsgProc_Type18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d30 func_0203a188 kind:function(arm,size=0x138) addr:0x203a144 func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a27c func_0203a30c kind:function(arm,size=0x1c) addr:0x203a2c8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a2e4 +_ZN13MsgProc_Type18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a2e4 func_0203a35c kind:function(arm,size=0x84) addr:0x203a318 func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a39c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3b8 +_ZN13MsgProc_Type18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3b8 func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a68c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7ac -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a944 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203ae64 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203aed8 +_ZN13MsgProc_Type18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7ac +_ZN13MsgProc_Type18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a944 +_ZN13MsgProc_Type18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203ae64 +_ZN13MsgProc_Type18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203aed8 func_0203b0bc kind:function(arm,size=0x30) addr:0x203b078 func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0a8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b3cc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b58c +_ZN13MsgProc_Type18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 +_ZN13MsgProc_Type18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc +_ZN13MsgProc_Type18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b3cc +_ZN13MsgProc_Type18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b58c func_0203b764 kind:function(arm,size=0xb0) addr:0x203b720 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b7d0 +_ZN13MsgProc_Type18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b7d0 func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd48 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88 +_ZN13MsgProc_Type18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88 func_0203be08 kind:function(arm,size=0x5c) addr:0x203bdc4 func_0203be64 kind:function(arm,size=0x220) addr:0x203be20 func_0203c084 kind:function(arm,size=0xb8) addr:0x203c040 func_0203c13c kind:function(arm,size=0x64) addr:0x203c0f8 func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c15c func_0203c25c kind:function(arm,size=0x6c) addr:0x203c218 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D0Ev kind:function(arm,size=0x48) addr:0x203c284 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub1D2Ev kind:function(arm,size=0x40) addr:0x203c2cc -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c30c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub3C1Ev kind:function(thumb,size=0x44) addr:0x203c314 +_ZN13MsgProc_Type1D0Ev kind:function(arm,size=0x48) addr:0x203c284 +_ZN13MsgProc_Type1D2Ev kind:function(arm,size=0x40) addr:0x203c2cc +_ZN13MsgProc_Type18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c30c +_ZN13MsgProc_Type2C1Ev kind:function(thumb,size=0x44) addr:0x203c314 func_0203c39c kind:function(thumb,size=0x78) addr:0x203c358 func_0203c414 kind:function(arm,size=0x4c) addr:0x203c3d0 func_0203c460 kind:function(arm,size=0x4c) addr:0x203c41c @@ -1955,7 +1955,7 @@ func_0203c5c4 kind:function(arm,size=0x18) addr:0x203c580 func_0203c5dc kind:function(arm,size=0x120) addr:0x203c598 func_0203c6fc kind:function(arm,size=0x1c) addr:0x203c6b8 func_0203c718 kind:function(arm,size=0x14) addr:0x203c6d4 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub2C1Ev kind:function(arm,size=0x110) addr:0x203c6e8 +_ZN13MsgProc_Type3C1Ev kind:function(arm,size=0x110) addr:0x203c6e8 func_0203c83c kind:function(arm,size=0x4) addr:0x203c7f8 func_0203c840 kind:function(arm,size=0x30) addr:0x203c7fc func_0203c870 kind:function(arm,size=0x38) addr:0x203c82c @@ -2030,16 +2030,16 @@ func_0203dba8 kind:function(thumb,size=0x38) addr:0x203db64 func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203db9c func_0203dc10 kind:function(arm,size=0x64) addr:0x203dbcc func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc30 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dc70 +_ZN13MsgProc_Type18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dc70 func_0203dcfc kind:function(arm,size=0xf0) addr:0x203dcb8 func_0203ddec kind:function(arm,size=0x10) addr:0x203dda8 func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddb8 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Base13func_0203de14Ei kind:function(arm,size=0x10) addr:0x203ddd0 +_ZN12MsgProc_Main13func_0203de14Ei kind:function(arm,size=0x10) addr:0x203ddd0 func_0203de24 kind:function(arm,size=0x34) addr:0x203dde0 func_0203de58 kind:function(arm,size=0x208) addr:0x203de14 -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c +_ZN13MsgProc_Type113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c func_0203e090 kind:function(arm,size=0x38) addr:0x203e04c -_ZN36UnkStruct_027E0C68_UnkSubClass1_Sub18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e084 +_ZN13MsgProc_Type18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e084 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0b4 func_0203e19c kind:function(arm,size=0x14) addr:0x203e158 func_0203e1b0 kind:function(arm,size=0xd4) addr:0x203e16c diff --git a/include/DTCM/UnkStruct_027e103c.hpp b/include/DTCM/UnkStruct_027e103c.hpp index 6da1a887..5a8199ed 100644 --- a/include/DTCM/UnkStruct_027e103c.hpp +++ b/include/DTCM/UnkStruct_027e103c.hpp @@ -36,7 +36,7 @@ struct UnkStruct_027e103c { void func_ov000_020cfb58(u8*); unk32 func_ov000_020cf8fc(unk32); - //! TODO: find out if the type is always `UnkStruct_027E0C68_UnkSubClass1_Sub1*` + //! TODO: find out if the type is always `MsgProc_Type1*` void func_ov000_020cfb20(void*); }; diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 0ef665b9..db89656b 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -24,7 +24,7 @@ public: /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass2_Base1(); /* 0x08 */ virtual void vfunc_08(u32 param_1); - /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1_Sub1* param_2); + /* 0x0C */ virtual void vfunc_0C(MsgProc_Type1* param_2); /* 0x10 */ virtual void vfunc_10(void); /* 0x14 */ virtual UNK_TYPE vfunc_14(void); /* 0x18 */ virtual UNK_TYPE vfunc_18(void); @@ -66,7 +66,7 @@ public: UnkStruct_027E0C68_UnkSubClass2(); /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass2() override; /* 0x08 */ virtual void vfunc_08(u32 param_1) override; - /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1_Sub1* param_2) override; + /* 0x0C */ virtual void vfunc_0C(MsgProc_Type1* param_2) override; /* 0x10 */ virtual void vfunc_10(void) override; /* 0x14 */ virtual UNK_TYPE vfunc_14(void) override; /* 0x18 */ virtual UNK_TYPE vfunc_18(void) override; @@ -87,7 +87,7 @@ public: /* 0x04 */ u8 unk_04; /* 0x05 */ u8 unk_05; /* 0x06 */ unk16 unk_06; - /* 0x08 */ UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_08; + /* 0x08 */ MsgProc_Type1* unk_08; /* 0x0C */ u8 unk_0C; /* 0x0C */ u8 unk_0D; /* 0x0C */ unk16 unk_0E; @@ -96,8 +96,8 @@ public: /* 0x14 */ BMGGroups* pGroups; /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18[2]; /* 0x20 */ UnkStruct_027E0C68_UnkSubClass2_Base1* unk_20[2]; - /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1_Base* unk_28[6]; - /* 0x40 */ UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_40[2]; // is array size 6? + /* 0x28 */ MsgProc_Main* unk_28[6]; + /* 0x40 */ MsgProc_Type1* unk_40[2]; // is array size 6? /* 0x48 */ static void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3); @@ -105,8 +105,8 @@ public: void func_0203665c(void); UnkStruct_027E0C68(); ~UnkStruct_027E0C68(); - UnkStruct_027E0C68_UnkSubClass1_Sub1* func_020366c4(void); - UnkStruct_027E0C68_UnkSubClass1_Sub1* func_02036700(void); + MsgProc_Type1* func_020366c4(void); + MsgProc_Type1* func_02036700(void); UnkStruct_027E0C68_UnkSubClass2* func_0203673c(void); bool func_02036770(u32 param_2); unk32 func_02036798(void); @@ -125,13 +125,13 @@ public: bool func_02036d30(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2); bool func_02036d4c(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2); void func_02036d6c(void); - UnkStruct_027E0C68_UnkSubClass1_Base* func_02036da8(u32 param_2, s16* param_3); + MsgProc_Main* func_02036da8(u32 param_2, s16* param_3); void func_02036edc(u32 param_2, u8 param_3); - UnkStruct_027E0C68_UnkSubClass1_Sub1* func_02036f68(u32 param_2, u8* param_3); + MsgProc_Type1* func_02036f68(u32 param_2, u8* param_3); UnkStruct_027E0C68_UnkSubClass2* func_020370d0(unk32 param_2, unk32 param_3); UnkStruct_027E0C68_UnkSubClass2* func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); void func_02037158(UnkSubClass1_02256FF8* param_2); - UnkStruct_027E0C68_UnkSubClass1_Base* func_02037178(UnkSubClass1_02256FF8* param_2); + MsgProc_Main* func_02037178(UnkSubClass1_02256FF8* param_2); }; extern UnkStruct_027E0C68 data_027e0c68; diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp index a40d5982..3a442151 100644 --- a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp +++ b/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp @@ -119,14 +119,14 @@ public: /* 0x08 */ }; -typedef bool (*UnknownCallback)(class UnkStruct_027E0C68_UnkSubClass1_Sub1*); +typedef bool (*UnknownCallback)(class MsgProc_Type1*); class UnkSubClass1_UnkownClass2 : public UnkSubClass1_UnkownClass2_Base1 { public: /* 0x14 */ unk32 unk_14; /* 0x18 */ unk32 unk_18; /* 0x1C */ UnknownCallback unk_1C; - /* 0x20 */ class UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_20; + /* 0x20 */ class MsgProc_Type1* unk_20; /* 0x24 */ unk32 unk_24; /* 0x2C */ @@ -137,7 +137,7 @@ public: class UnkSubClass1_unk_410 { public: - /* 0x00 */ struct UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_00; + /* 0x00 */ struct MsgProc_Type1* unk_00; /* 0x04 */ void func_0203ec34(void); @@ -149,7 +149,7 @@ public: // same as UnkSubClass1_unk_410? class UnkSubClass1_unk_424 { public: - /* 0x00 */ struct UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_00; + /* 0x00 */ struct MsgProc_Type1* unk_00; /* 0x04 */ void func_0203ee80(unk32); @@ -161,7 +161,7 @@ public: class UnkSubClass1_unk_124 { public: - /* 0x00 */ void* unk_00; // pointer to UnkStruct_027E0C68_UnkSubClass1_Base (well, the first members of the base class) + /* 0x00 */ void* unk_00; // pointer to MsgProc_Main (well, the first members of the base class) /* 0x04 */ unk32 unk_04; /* 0x08 */ unk32 unk_08; /* 0x0C */ unk32 unk_0C; @@ -211,7 +211,7 @@ public: }; // astruct_8? -class UnkStruct_027E0C68_UnkSubClass1_Base_1 : public SysObject { +class MsgProc_Base : public SysObject { public: /* 0x000 (vtable) */ /* 0x004 */ unk32* unk_04; @@ -243,8 +243,8 @@ public: /* 0x051 */ unk8 unk_51; /* 0x052 */ - UnkStruct_027E0C68_UnkSubClass1_Base_1(); - /* 0x00*/ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_1(); + MsgProc_Base(); + /* 0x00*/ virtual ~MsgProc_Base(); /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3); /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3); // func_0203e060? @@ -277,14 +277,14 @@ public: unk32 func_02032fa4(void); }; -class UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114 : public SysObject { +class MsgProc_Base2_unk_114 : public SysObject { public: /* 0x00 (vtable) */ /* 0x04 */ unk32* unk_04; /* 0x08 */ - UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114(); - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114() override; + MsgProc_Base2_unk_114(); + /* 0x00 */ virtual ~MsgProc_Base2_unk_114() override; /* 0x04 */ virtual UNK_TYPE vfunc_04(UNK_TYPE); /* 0x08 */ virtual unk32 vfunc_08(void*, s16); /* 0x0C */ @@ -293,7 +293,7 @@ public: }; // astruct_7 -class UnkStruct_027E0C68_UnkSubClass1_Base_0 : public UnkStruct_027E0C68_UnkSubClass1_Base_1 { +class MsgProc_Base2 : public MsgProc_Base { public: /* 0x052 */ unk16 unk_52; /* 0x054 */ unk16 unk_54; @@ -349,7 +349,7 @@ public: /* 0x108 */ unk8 unk_10B; /* 0x10C */ unk32 unk_10C; /* 0x110 */ unk32 unk_110; - /* 0x118 */ UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114* unk_114; + /* 0x118 */ MsgProc_Base2_unk_114* unk_114; /* 0x118 */ s32 unk_118; /* 0x11C */ unk16 unk_11C; /* 0x11E */ unk8 unk_11E; @@ -360,9 +360,9 @@ public: /* 0x123 */ u8 unk_123; /* 0x124 */ - UnkStruct_027E0C68_UnkSubClass1_Base_0(unk32 param_2, unk32 param_3, unk32 param_4); + MsgProc_Base2(unk32 param_2, unk32 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base_0(); + /* 0x00 */ virtual ~MsgProc_Base2(); /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? @@ -394,7 +394,7 @@ public: }; // astruct_6 -class UnkStruct_027E0C68_UnkSubClass1_Base : public UnkStruct_027E0C68_UnkSubClass1_Base_0 { +class MsgProc_Main : public MsgProc_Base2 { public: /* 0x124 */ UnkSubClass1_unk_124* unk_124; /* 0x128 */ UnkSubClass1_UnkownClass2 unk_128; @@ -409,9 +409,9 @@ public: /* 0x160 */ unk16 unk_162; /* 0x164 */ - UnkStruct_027E0C68_UnkSubClass1_Base(unk32 param_2, unk16 param_3, unk32 param_4); + MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Base(); + /* 0x00 */ virtual ~MsgProc_Main(); /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? @@ -491,9 +491,9 @@ struct UnknownMsgChoiceStruct { }; // astruct_2 -class UnkStruct_027E0C68_UnkSubClass1_Sub1 : public UnkStruct_027E0C68_UnkSubClass1_Base { +class MsgProc_Type1 : public MsgProc_Main { public: - /* 0x164 */ UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_164; + /* 0x164 */ MsgProc_Type1* unk_164; /* 0x168 */ UnkSubClass1_UnkownClass1 unk_168; /* 0x1F0 */ UnkSubClass1_UnkownClass1 unk_1F0; /* 0x278 */ UnkSubClass1_UnkownClass1 unk_278; @@ -501,7 +501,7 @@ public: /* 0x388 */ UnkSubClass1_UnkownClass1 unk_388; /* 0x410 */ UnkSubClass1_unk_410 unk_410; /* 0x414 */ unk32 unk_414; - /* 0x418 */ UnkStruct_027E0C68_UnkSubClass1_Base* unk_418; + /* 0x418 */ MsgProc_Main* unk_418; /* 0x41C */ unk16 unk_41C; /* 0x41C */ unk16 unk_41E; /* 0x420 */ unk16 unk_420; @@ -557,10 +557,10 @@ public: /* 0x588 */ UnkSubClass1_unk_124 unk_588; /* 0x5B4 */ - UnkStruct_027E0C68_UnkSubClass1_Sub1(); - UnkStruct_027E0C68_UnkSubClass1_Sub1(unk32 param_2, unk16 param_3, unk32 param_4); + MsgProc_Type1(); + MsgProc_Type1(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub1() override; + /* 0x00 */ virtual ~MsgProc_Type1() override; /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? @@ -590,7 +590,7 @@ public: /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; /* 0x74 */ - static bool func_0203c25c(class UnkStruct_027E0C68_UnkSubClass1_Sub1* param_1); + static bool func_0203c25c(class MsgProc_Type1* param_1); void func_0203e060(u8 param_2, u8 param_3); void func_02039a3c(void); @@ -617,7 +617,7 @@ public: unk32 func_02038cb8(unk32 param_2); }; -class UnkStruct_027E0C68_UnkSubClass1_Sub2 : public UnkStruct_027E0C68_UnkSubClass1_Base { +class MsgProc_Type3 : public MsgProc_Main { public: /* 0x164 */ unk16 unk_164; /* 0x166 */ unk16 unk_166; @@ -633,10 +633,10 @@ public: /* 0x180 */ UnkClass_func_ov000_020d0644 unk_180[4]; /* 0x1C0 */ - UnkStruct_027E0C68_UnkSubClass1_Sub2(); - UnkStruct_027E0C68_UnkSubClass1_Sub2(unk32 param_2, unk16 param_3, unk32 param_4); + MsgProc_Type3(); + MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub2(); + /* 0x00 */ virtual ~MsgProc_Type3(); /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? @@ -669,7 +669,7 @@ public: static void func_0203c83c(void); }; -class UnkStruct_027E0C68_UnkSubClass1_Sub3 : public UnkStruct_027E0C68_UnkSubClass1_Base { +class MsgProc_Type2 : public MsgProc_Main { public: /* 0x164 */ unk16 unk_164; /* 0x164 */ unk16 unk_166; @@ -679,10 +679,10 @@ public: /* 0x164 */ unk16 unk_16E; /* 0x170 */ - UnkStruct_027E0C68_UnkSubClass1_Sub3(); - UnkStruct_027E0C68_UnkSubClass1_Sub3(unk32 param_2, unk16 param_3, unk32 param_4); + MsgProc_Type2(); + MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden - /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1_Sub3(); + /* 0x00 */ virtual ~MsgProc_Type2(); /* 0x08 */ /* func_02039228 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; /* 0x0C */ /* func_02039578 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; /* 0x10 */ /* func_0203e060 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? @@ -722,7 +722,7 @@ public: extern "C" u32 func_01ff9b4c(unk32, unk32); extern "C" unk32 func_0203c084(void); -extern "C" void func_ov018_02169634(UnkStruct_027E0C68_UnkSubClass1_Sub1*); +extern "C" void func_ov018_02169634(MsgProc_Type1*); extern "C" unk32 func_ov000_02079e04(void); extern "C" unk32 func_02016fcc(unk32); extern "C" void func_02032304(unk32*, char*, unk32, unk32, unk32); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 6a9577ac..9e022c8a 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -4,7 +4,7 @@ extern ARM unk32 func_ov000_020d7f18(u32*, unk32); extern ARM unk32 func_02037628(u8*); -extern ARM void func_0203dc74(UnkStruct_027E0C68_UnkSubClass1_Base*, unk32, unk32); +extern ARM void func_0203dc74(MsgProc_Main*, unk32, unk32); extern u32** data_027e0ce0[]; extern u32 data_02056924[]; @@ -75,14 +75,14 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 switch (data_02056924[i + 1]) { case 0: if (*data_027e0618 != 2) { - this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Sub1(); + this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type1(); func_0203dc74(this->unk_28[i], 0xE0, 0x40); this->unk_28[i]->unk_2C = data_02068e6c; this->unk_28[i]->unk_50 = i != 0; } break; case 1: - this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Sub2(); + this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type3(); func_0203dc74(this->unk_28[i], 0x50, 0x60); this->unk_28[i]->unk_2C = data_02068e6c; break; @@ -91,7 +91,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 break; case 3: if (func_0202ab48() == 0) { - this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Sub3(); + this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type2(); func_0203dc74(this->unk_28[i], 0xC0, 0x20); this->unk_28[i]->unk_2C = data_02068e8c; } else { @@ -130,21 +130,21 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) { } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_020366c4(void) { +ARM MsgProc_Type1* UnkStruct_027E0C68::func_020366c4(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { - return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; + return (MsgProc_Type1*)this->unk_28[2]; } - return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; + return (MsgProc_Type1*)this->unk_28[0]; } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036700(void) { +ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036700(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { - return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; + return (MsgProc_Type1*)this->unk_28[0]; } - return (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; + return (MsgProc_Type1*)this->unk_28[2]; } ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_0203673c(void) { @@ -189,11 +189,11 @@ ARM bool UnkStruct_027E0C68::func_020367dc(int param_2) { } ARM bool UnkStruct_027E0C68::func_020367ec(void) { - return ((UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0])->unk_15C > 0; + return ((MsgProc_Type1*)this->unk_28[0])->unk_15C > 0; } ARM bool UnkStruct_027E0C68::func_02036808(void) { - return ((UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2])->unk_15C > 0; + return ((MsgProc_Type1*)this->unk_28[2])->unk_15C > 0; } ARM bool UnkStruct_027E0C68::func_02036824(void) { @@ -216,7 +216,7 @@ ARM bool UnkStruct_027E0C68::func_02036850(void) { ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_027E0C68_UnkSubClass2* param_2) { if ((param_2->unk_18 & ~0xFFFF) != (0x100 << 0x10)) { - UnkStruct_027E0C68_UnkSubClass1_Sub1* iVar1 = this->func_020366c4(); + MsgProc_Type1* iVar1 = this->func_020366c4(); if (iVar1->unk_15C <= 0) { param_2->vfunc_10(); @@ -237,9 +237,9 @@ ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_027E0C68_UnkSubClass2_Base1 // non-matching ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { - UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_28_0; - UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_28_2; - UnkStruct_027E0C68_UnkSubClass1_Base *pSVar4; + MsgProc_Type1* unk_28_0; + MsgProc_Type1* unk_28_2; + MsgProc_Main *pSVar4; ActorRef actorRef; Actor* pActor; bool iVar1; @@ -252,10 +252,10 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p this->unk_40[1] = this->unk_40[0]; - unk_28_0 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; + unk_28_0 = (MsgProc_Type1*)this->unk_28[0]; if (unk_28_0 != NULL && unk_28_0->unk_15C > 0) { - unk_28_2 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; + unk_28_2 = (MsgProc_Type1*)this->unk_28[2]; if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) { this->unk_40[0] = this->func_020366c4(); @@ -263,7 +263,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p this->unk_40[0] = unk_28_2; } } else { - unk_28_2 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; + unk_28_2 = (MsgProc_Type1*)this->unk_28[2]; if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) { this->unk_40[0] = unk_28_0; @@ -332,7 +332,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p } ARM void UnkStruct_027E0C68::func_02036bbc(void) { - UnkStruct_027E0C68_UnkSubClass1_Base* pSVar3; + MsgProc_Main* pSVar3; bool bVar2; bool bVar4; s32 i; @@ -367,7 +367,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - UnkStruct_027E0C68_UnkSubClass1_Base* pSVar1 = this->unk_28[i]; + MsgProc_Main* pSVar1 = this->unk_28[i]; if (pSVar1 != NULL) { pSVar1->vfunc_3C(param_2); @@ -421,10 +421,10 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { +ARM MsgProc_Main* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { EntryINF1 *pEVar1; EntryINF1 *pEVar2; - UnkStruct_027E0C68_UnkSubClass1_Base *pSVar4; + MsgProc_Main *pSVar4; BMGGroups *pBVar5; bool bVar6; s16 iStack_38; @@ -470,7 +470,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02036da8(u32 // non-matching ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { - UnkStruct_027E0C68_UnkSubClass1_Sub1 *pSVar1; + MsgProc_Type1 *pSVar1; u8 auStack_28[24]; u8 local_13; @@ -493,12 +493,12 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { +ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { EntryINF1 *pEVar1; - UnkStruct_027E0C68_UnkSubClass1_Base *pSVar2; + MsgProc_Main *pSVar2; EntryINF1 *pEVar3; int iVar4; - UnkStruct_027E0C68_UnkSubClass1_Sub1 *pSVar5; + MsgProc_Type1 *pSVar5; pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xffff); @@ -507,15 +507,15 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub1* UnkStruct_027E0C68::func_02036f68(u32 } if (param_3[21] != 0) { - pSVar5 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[2]; + pSVar5 = (MsgProc_Type1*)this->unk_28[2]; pSVar2 = this->unk_28[3]; } else { - pSVar5 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)this->unk_28[0]; + pSVar5 = (MsgProc_Type1*)this->unk_28[0]; pSVar2 = this->unk_28[1]; } //! TODO: fake? - pSVar5->unk_164 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)pSVar2; + pSVar5->unk_164 = (MsgProc_Type1*)pSVar2; pSVar5->unk_418 = this->unk_28[5]; pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s16*)param_3, 0); @@ -559,7 +559,7 @@ ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370e8(unk32 par } ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { - UnkStruct_027E0C68_UnkSubClass1_Base* pSVar1; + MsgProc_Main* pSVar1; pSVar1 = this->func_02037178(param_2); @@ -568,7 +568,7 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { } } -ARM UnkStruct_027E0C68_UnkSubClass1_Base* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) { +ARM MsgProc_Main* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp index 8aed417b..187cde77 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp @@ -6,7 +6,7 @@ #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_34(unk32 param_2) { +ARM unk32 MsgProc_Type1::vfunc_34(unk32 param_2) { s16 iVar1; unk32 iVar2; unk32 iVar3; @@ -27,7 +27,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_34(unk32 param_2) { return func_01ff9b4c(iVar2 + iVar3 / 2, uVar4); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_30(void) { +ARM void MsgProc_Type1::vfunc_30(void) { if (this->unk_15C > 0) { this->func_0203e090(); } else { @@ -36,13 +36,13 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_30(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_08(unk32* param_2, unk32* param_3) { +ARM void MsgProc_Type1::vfunc_08(unk32* param_2, unk32* param_3) { this->unk_15C = 10; this->unk_150[2] = 1; this->func_0203e2ac(param_3); } -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_68(unk32 param_2) { +ARM unk32 MsgProc_Type1::vfunc_68(unk32 param_2) { switch (param_2) { case 0: break; @@ -65,13 +65,13 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_68(unk32 param_2) { return ((this->unk_18 << 3) - this->func_020337d8(param_2)) / 2; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_70(unk32* param_2, unk32* param_3) { +ARM void MsgProc_Type1::vfunc_70(unk32* param_2, unk32* param_3) { this->vfunc_6C(param_2, param_3); *param_2 += this->unk_158.x; *param_3 += this->unk_158.y; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { +ARM void MsgProc_Type1::vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { this->func_0203dc10(1, param_3); this->func_02033190(param_2, param_3, param_4, param_5); } diff --git a/src/Main/Message/func_02032f0c.cpp b/src/Main/Message/func_02032f0c.cpp index 35cfbef0..a9f3c196 100644 --- a/src/Main/Message/func_02032f0c.cpp +++ b/src/Main/Message/func_02032f0c.cpp @@ -23,7 +23,7 @@ ARM UnkSubClass1_UnkownClass2_Base1::UnkSubClass1_UnkownClass2_Base1() { } } -THUMB UnkStruct_027E0C68_UnkSubClass1_Base_1::UnkStruct_027E0C68_UnkSubClass1_Base_1() { +THUMB MsgProc_Base::MsgProc_Base() { this->unk_04 = 0; this->unk_08 = 0; this->unk_0C = NULL; diff --git a/src/Main/Message/func_0203744c.cpp b/src/Main/Message/func_0203744c.cpp index 2bac7b25..ab05bf4b 100644 --- a/src/Main/Message/func_0203744c.cpp +++ b/src/Main/Message/func_0203744c.cpp @@ -43,8 +43,8 @@ ARM UnkSubClass1_UnkownClass2::UnkSubClass1_UnkownClass2() { this->unk_24 = 0; } -THUMB UnkStruct_027E0C68_UnkSubClass1_Base::UnkStruct_027E0C68_UnkSubClass1_Base(unk32 param_2, unk16 param_3, unk32 param_4) - : UnkStruct_027E0C68_UnkSubClass1_Base_0(param_2, param_3, param_4), +THUMB MsgProc_Main::MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4) + : MsgProc_Base2(param_2, param_3, param_4), unk_124(0) { this->func_020387e0(this->unk_150); @@ -57,5 +57,5 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Base::UnkStruct_027E0C68_UnkSubClass1_Base this->unk_11E = param_3; } -THUMB UnkStruct_027E0C68_UnkSubClass1_Base::~UnkStruct_027E0C68_UnkSubClass1_Base() { +THUMB MsgProc_Main::~MsgProc_Main() { } diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index bdb4432a..89c9399a 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -14,8 +14,8 @@ extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void* extern unk16 data_02056a0e[]; extern u8 data_02056a08[]; -THUMB UnkStruct_027E0C68_UnkSubClass1_Sub1::UnkStruct_027E0C68_UnkSubClass1_Sub1(unk32 param_2, unk16 param_3, unk32 param_4) : - UnkStruct_027E0C68_UnkSubClass1_Base(0, 0, param_4), +THUMB MsgProc_Type1::MsgProc_Type1(unk32 param_2, unk16 param_3, unk32 param_4) : + MsgProc_Main(0, 0, param_4), unk_164(NULL) { UnknownMsgChoiceStruct* puVar3; @@ -84,13 +84,13 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Sub1::UnkStruct_027E0C68_UnkSubClass1_Sub1 this->unk_278.func_020351b8(false, false, false, false); } -THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039a3c(void) { +THUMB void MsgProc_Type1::func_02039a3c(void) { this->func_02038b28(); this->func_0203dcfc(this->unk_50, 0, 0, 2); } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_2C(void) { +ARM void MsgProc_Type1::vfunc_2C(void) { if (data_027e0618[0x101] != 0) { if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { return; @@ -165,7 +165,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_2C(void) { } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ca8(void) { +ARM void MsgProc_Type1::func_02039ca8(void) { s32 i; for (i = 0; i < ARRAY_LEN(this->unk_564); i++) { @@ -174,7 +174,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_02039ca8(void) { } // non-matching -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a2c0(void) { +ARM bool MsgProc_Type1::func_0203a2c0(void) { if ((this->unk_150[1] != 1 && this->unk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { return true; } @@ -182,11 +182,11 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a2c0(void) { return false; } -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a30c(void) { +ARM unk32 MsgProc_Type1::func_0203a30c(void) { return this->unk_574 / this->unk_154->unk_06; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_3C(unk32 param_2) { +ARM void MsgProc_Type1::vfunc_3C(unk32 param_2) { if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { if (this->unk_124->unk_29 != 3) { if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { @@ -206,8 +206,8 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_3C(unk32 param_2) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 param_3) { - UnkStruct_027E0C68_UnkSubClass1_Base* bVar1; +ARM void MsgProc_Type1::vfunc_40(unk32 param_2, unk32 param_3) { + MsgProc_Main* bVar1; s8 cVar2; unk32 iVar4; unk32 iVar6; @@ -311,7 +311,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_40(unk32 param_2, unk32 par } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4) { +ARM void MsgProc_Type1::func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4) { unk16 sVar1; unk16 sVar2; unk32 iVar3; @@ -355,7 +355,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a188(unk32 param_2, unk3 } // non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_48(void) { +ARM void MsgProc_Type1::vfunc_48(void) { if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { this->func_02038b40(); } @@ -363,12 +363,12 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_48(void) { this->unk_410.func_0203ec34(); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a35c(void) { +ARM void MsgProc_Type1::func_0203a35c(void) { if ((this->unk_57C == 1 || this->unk_150[3] != 0) || (this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { if (this->func_0203a3e0()) { s16 unk_56E = this->unk_56E; s16 unk_570 = this->unk_570; - UnkStruct_027E0C68_UnkSubClass1_Sub1* unk_164 = this->unk_164; + MsgProc_Type1* unk_164 = this->unk_164; unk_164->unk_168.unk_10 = unk_56E; unk_164->unk_168.unk_14 = unk_570; @@ -379,12 +379,12 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a35c(void) { } } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a3e0(void) { +ARM bool MsgProc_Type1::func_0203a3e0(void) { return this->unk_164->unk_168.unk_06 > 0; } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_44(s32 touchLastX, s32 touchLastY) { +ARM void MsgProc_Type1::vfunc_44(s32 touchLastX, s32 touchLastY) { unk32 iVar2; unk32 iVar5; unk32 iStack_14; @@ -477,7 +477,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_44(s32 touchLastX, s32 touc } } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a6d0(unk32 param_2, unk32 param_3) { +ARM bool MsgProc_Type1::func_0203a6d0(unk32 param_2, unk32 param_3) { unk32 iVar1; unk32 uVar2; UnkStruct_0203b264* piVar3; @@ -508,7 +508,7 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203a6d0(unk32 param_2, unk3 } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { +ARM void MsgProc_Type1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { bool bVar5; bool bVar2; int iVar4; @@ -518,7 +518,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_50(EntryINF1* param_2, u32 iVar6 = param_4[0]; if (data_027e0c54 != 0) { - UnkStruct_027E0C68_UnkSubClass1_Sub1* pVar4 = data_027e0c68.func_02036700(); + MsgProc_Type1* pVar4 = data_027e0c68.func_02036700(); if (pVar4 != NULL && pVar4->unk_15C > 0) { this->func_02038b40(); @@ -526,7 +526,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_50(EntryINF1* param_2, u32 } if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { - UnkStruct_027E0C68_UnkSubClass1_Sub1* pVar4 = (UnkStruct_027E0C68_UnkSubClass1_Sub1*)data_027e0c68.unk_28[4]; + MsgProc_Type1* pVar4 = (MsgProc_Type1*)data_027e0c68.unk_28[4]; if (pVar4 != NULL && pVar4->unk_15C > 0) { this->func_02038b40(); @@ -555,7 +555,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_50(EntryINF1* param_2, u32 } // non-matching (can't get the switch decomp...) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { +ARM void MsgProc_Type1::vfunc_54(void) { short sVar1; int iVar2; u16* puVar3; @@ -751,7 +751,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_54(void) { // (**(code **)(*(int *)param_1 + 0x10))(0); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_5C(void) { +ARM void MsgProc_Type1::vfunc_5C(void) { if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; this->unk_168.func_020352d8(); @@ -763,7 +763,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_5C(void) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_58(void) { +ARM void MsgProc_Type1::vfunc_58(void) { bool bVar1; s8* puVar2; int iVar3; @@ -777,7 +777,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_58(void) { if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { puVar2 = data_027e103c->func_ov000_020cef9c(); - if ((UnkStruct_027E0C68_UnkSubClass1_Sub1*)(puVar2 + 0x244) == this) { + if ((MsgProc_Type1*)(puVar2 + 0x244) == this) { data_027e103c->func_ov000_020cfb38(); } } @@ -809,12 +809,12 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_58(void) { this->func_02039398(); } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b0bc(void) { +ARM bool MsgProc_Type1::func_0203b0bc(void) { return this->unk_57F != 0 && data_027e077c.mUnk_0 == data_027e077c.mUnk_4; } // non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b0ec(unk32 param_2) { +ARM unk32 MsgProc_Type1::func_0203b0ec(unk32 param_2) { s32 iVar4; u16 *puVar2; u32 uVar3; @@ -878,7 +878,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b0ec(unk32 param_2) { } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b764(void) { +ARM void MsgProc_Type1::func_0203b764(void) { s32 i = data_027e0c68.unk_00[this->unk_50]; this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); @@ -904,7 +904,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203b764(void) { } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203bd8c(u16 param_2) { +ARM void MsgProc_Type1::func_0203bd8c(u16 param_2) { this->unk_576 = param_2; if (this->func_0203b0ec(0) != 0) { @@ -913,7 +913,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203bd8c(u16 param_2) { } // non-matching (regalloc) -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { +ARM unk32 MsgProc_Type1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { u16 sVar1; u32 uVar4; s32 unaff_r4; @@ -951,7 +951,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_18(UnkStruct_0203b264* par } // non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { +ARM unk32 MsgProc_Type1::vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { int iVar1; u16* psVar3; @@ -986,7 +986,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_1C(unk8 param_2, UnkStruct } // non-matching -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { +ARM void MsgProc_Type1::vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { unk16 sVar1; unk16 uVar2; unk32 iVar3; @@ -1067,7 +1067,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_60(func_0203b410_param_2* p } // non-matching (regalloc) -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_64(unk32 param_2) { +ARM void MsgProc_Type1::vfunc_64(unk32 param_2) { unk32 uVar2; if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { @@ -1096,17 +1096,17 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_64(unk32 param_2) { } // switch decomp issue -ARM UNK_TYPE UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_20(UNK_TYPE) { +ARM UNK_TYPE MsgProc_Type1::vfunc_20(UNK_TYPE) { // TODO } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_6C(unk32* param_2, unk32* param_3) { +ARM void MsgProc_Type1::vfunc_6C(unk32* param_2, unk32* param_3) { this->func_0203947c(); *param_2 += this->unk_56E; *param_3 += this->unk_570; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203be08(void) { +ARM void MsgProc_Type1::func_0203be08(void) { if (data_027e0d38 != 0) { if (data_027e103c->func_ov000_020cf42c() != 0) { this->unk_534 = this->unk_538; @@ -1121,7 +1121,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203be08(void) { } // non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c084(void) { +ARM unk32 MsgProc_Type1::func_0203c084(void) { unk32 uVar4; bool bVar2; bool bVar1; @@ -1151,7 +1151,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c084(void) { return uVar4; } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c13c(void) { +ARM bool MsgProc_Type1::func_0203c13c(void) { if (this->func_02032fa4() == 0) { data_ov000_020eec9c.func_ov000_020d77e4(6); data_027e103c->func_ov000_020cfb20(this); @@ -1169,7 +1169,7 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c13c(void) { } // non-matching -ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c1a0(void) { +ARM unk32 MsgProc_Type1::func_0203c1a0(void) { s8* pVar1; u8* iVar3; @@ -1193,7 +1193,7 @@ ARM unk32 UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c1a0(void) { return 0; } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c25c(UnkStruct_027E0C68_UnkSubClass1_Sub1* param_1) { +ARM bool MsgProc_Type1::func_0203c25c(MsgProc_Type1* param_1) { if (data_027e1054.unk_00->unk_00->unk_95 != 0) { return false; } @@ -1210,15 +1210,15 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203c25c(UnkStruct_027E0C68_ return false; } -ARM UnkStruct_027E0C68_UnkSubClass1_Sub1::~UnkStruct_027E0C68_UnkSubClass1_Sub1() { +ARM MsgProc_Type1::~MsgProc_Type1() { } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_38(void) { +ARM bool MsgProc_Type1::vfunc_38(void) { return true; } -THUMB UnkStruct_027E0C68_UnkSubClass1_Sub3::UnkStruct_027E0C68_UnkSubClass1_Sub3(unk32 param_2, unk16 param_3, unk32 param_4) : - UnkStruct_027E0C68_UnkSubClass1_Base(0, 0, param_4) +THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) : + MsgProc_Main(0, 0, param_4) { this->unk_162 = 4; this->unk_164 = 1; @@ -1230,7 +1230,7 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Sub3::UnkStruct_027E0C68_UnkSubClass1_Sub3 } // non-matching -THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub3::func_0203c39c(unk32 param_2, unk32 param_3) { +THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) { u16 uVar1; unk32 uVar2; s16 uVar3; @@ -1262,7 +1262,7 @@ THUMB void UnkStruct_027E0C68_UnkSubClass1_Sub3::func_0203c39c(unk32 param_2, un } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_3C(unk32 param_2) { +ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) { if (this->unk_15C > 0 && this->unk_122 != 1) { if (this->func_0203de14(param_2) != 0) { this->vfunc_40(0, 0); @@ -1270,7 +1270,7 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_3C(unk32 param_2) { } } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_40(unk32 param_2, unk32 param_3) { +ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) { param_2 += this->unk_166; param_3 += this->unk_168; @@ -1281,16 +1281,16 @@ ARM void UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_40(unk32 param_2, unk32 par //! TODO: solve vfunc oddities extern "C" bool func_0203dcb4(unk32); // non-matching -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub3::vfunc_14(unk32 param_2, unk32 param_3) { +ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) { return func_0203dcb4(param_2 + this->unk_162); } -ARM UnkStruct_027E0C68_UnkSubClass1_Sub3::~UnkStruct_027E0C68_UnkSubClass1_Sub3() { +ARM MsgProc_Type2::~MsgProc_Type2() { } // non-matching -ARM UnkStruct_027E0C68_UnkSubClass1_Sub2::UnkStruct_027E0C68_UnkSubClass1_Sub2(unk32 param_2, unk16 param_3, unk32 param_4) : - UnkStruct_027E0C68_UnkSubClass1_Base(1, 0, param_4) +ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) : + MsgProc_Main(1, 0, param_4) { this->unk_162 = 1; this->unk_164 = 0x1A; @@ -1310,8 +1310,8 @@ ARM UnkStruct_027E0C68_UnkSubClass1_Sub2::UnkStruct_027E0C68_UnkSubClass1_Sub2(u this->unk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0); } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub2::func_0203c83c(void) { +ARM void MsgProc_Type3::func_0203c83c(void) { } -ARM UnkStruct_027E0C68_UnkSubClass1_Sub2::~UnkStruct_027E0C68_UnkSubClass1_Sub2() { +ARM MsgProc_Type3::~MsgProc_Type3() { } diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp index 3d044be2..3f88720e 100644 --- a/src/Main/Message/func_0203c8a8.cpp +++ b/src/Main/Message/func_0203c8a8.cpp @@ -11,7 +11,7 @@ extern u32 *data_027e0ce0[]; extern "C" void func_02007938(unk32, unk16*, unk32, unk32, unk32); // non-matching -THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::UnkStruct_027E0C68_UnkSubClass1_Base_0(unk32 param_2, unk32 param_3, unk32 param_4) { +THUMB MsgProc_Base2::MsgProc_Base2(unk32 param_2, unk32 param_3, unk32 param_4) { this->unk_114 = NULL; this->unk_118 = -1; this->unk_11C = 0; @@ -24,13 +24,13 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::UnkStruct_027E0C68_UnkSubClass1_Ba func_02007938(0, &this->unk_54, 0xC0, 1, param_4); if (this->unk_121 == 0) { - this->unk_114 = new(data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114(); + this->unk_114 = new(data_027e0ce0[0], 4) MsgProc_Base2_unk_114(); } else { - this->unk_114 = new(data_027e0ce0[1], 4) UnkStruct_027E0C68_UnkSubClass1_Base_0_unk_114(); + this->unk_114 = new(data_027e0ce0[1], 4) MsgProc_Base2_unk_114(); } } -THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::~UnkStruct_027E0C68_UnkSubClass1_Base_0() { +THUMB MsgProc_Base2::~MsgProc_Base2() { if (this->unk_114 != NULL) { delete this->unk_114; this->unk_114 = NULL; @@ -38,7 +38,7 @@ THUMB UnkStruct_027E0C68_UnkSubClass1_Base_0::~UnkStruct_027E0C68_UnkSubClass1_B } // non-matching -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_14(unk32 param_2, unk32 param_3) { +ARM bool MsgProc_Type1::vfunc_14(unk32 param_2, unk32 param_3) { unk32 uVar1; unk32 local_c; unk32 local_10; @@ -53,14 +53,14 @@ ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_14(unk32 param_2, unk32 par return true; } -ARM void UnkStruct_027E0C68_UnkSubClass1_Sub1::func_0203e060(u8 param_2, u8 param_3) { +ARM void MsgProc_Type1::func_0203e060(u8 param_2, u8 param_3) { this->func_0203dc10(1, param_3); this->unk_11E = param_2; this->unk_118 = -1; this->func_020331c4(param_2, -1); } -ARM bool UnkStruct_027E0C68_UnkSubClass1_Sub1::vfunc_28(void) { +ARM bool MsgProc_Type1::vfunc_28(void) { if (this->unk_122 != 0) { this->func_0203e0f8(); this->func_0203dc10(0); From 59203c7bb91e49010d576b6fac85cdff081773a7 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Thu, 30 Jan 2025 17:54:54 +0100 Subject: [PATCH 41/64] better splits and fixed us syms --- config/eur/arm9/delinks.txt | 13 ++- config/usa/arm9/symbols.txt | 110 +++++++++--------- include/Message/MessageManager.hpp | 2 +- ..._027E0C68_UnkSubClass1.hpp => MsgProc.hpp} | 0 src/Main/Message/func_02032f0c.cpp | 2 +- src/Main/Message/func_0203744c.cpp | 19 +-- ...C68_UnkSubClass1.cpp => func_02038aa0.cpp} | 19 ++- src/Main/Message/func_020397f8.cpp | 102 +--------------- src/Main/Message/func_0203c358.cpp | 79 +++++++++++++ src/Main/Message/func_0203c72c.cpp | 38 ++++++ src/Main/Message/func_0203c8a8.cpp | 2 +- 11 files changed, 203 insertions(+), 183 deletions(-) rename include/Message/{UnkStruct_027E0C68_UnkSubClass1.hpp => MsgProc.hpp} (100%) rename src/Main/Message/{UnkStruct_027E0C68_UnkSubClass1.cpp => func_02038aa0.cpp} (81%) create mode 100644 src/Main/Message/func_0203c358.cpp create mode 100644 src/Main/Message/func_0203c72c.cpp diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 691f94db..628b146e 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -30,13 +30,16 @@ src/Main/Message/BMG.cpp: .rodata start:0x02056958 end:0x020569e0 src/Main/Message/func_0203744c.cpp: - .text start:0x0203744c end:0x02038b28 + .text start:0x0203744c end:0x02038aa0 -src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp: - .text start:0x02038b28 end:0x020397f8 +src/Main/Message/func_02038aa0.cpp: + .text start:0x02038aa0 end:0x0203c358 -src/Main/Message/func_020397f8.cpp: - .text start:0x020397f8 end:0x0203c8a8 +src/Main/Message/func_0203c358.cpp: + .text start:0x0203c358 end:0x0203c72c + +src/Main/Message/func_0203c72c.cpp: + .text start:0x0203c72c end:0x0203c8a8 src/Main/Message/func_0203c8a8.cpp: .text start:0x0203c8a8 end:0x0203e784 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 124be2c6..ee62a4e1 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1645,8 +1645,8 @@ func_02032d40 kind:function(thumb,size=0x28) addr:0x2032d3c func_02032d68 kind:function(arm,size=0xdc) addr:0x2032d64 func_02032e44 kind:function(arm,size=0x1c) addr:0x2032e40 func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e5c -func_02032e7c kind:function(arm,size=0x48) addr:0x2032e78 -func_02032ec4 kind:function(arm,size=0x48) addr:0x2032ec0 +_ZN31UnkSubClass1_UnkownClass2_Base1C2Ev kind:function(arm,size=0x48) addr:0x2032e78 +_ZN31UnkSubClass1_UnkownClass2_Base1C1Ev kind:function(arm,size=0x48) addr:0x2032ec0 _ZN12MsgProc_BaseC2Ev kind:function(thumb,size=0x78) addr:0x2032f08 func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f80 func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f84 @@ -1732,10 +1732,10 @@ func_02034fac kind:function(arm,size=0x14) addr:0x2034f68 func_02034fc0 kind:function(arm,size=0x14) addr:0x2034f7c func_02034fd4 kind:function(arm,size=0x38) addr:0x2034f90 func_0203500c kind:function(arm,size=0x10) addr:0x2034fc8 -func_0203501c kind:function(arm,size=0x48) addr:0x2034fd8 +_ZN25UnkSubClass1_UnkownClass1C2Ev kind:function(arm,size=0x48) addr:0x2034fd8 _ZN25UnkSubClass1_UnkownClass1C1Ev kind:function(arm,size=0x48) addr:0x2035020 -func_020350ac kind:function(arm,size=0x4) addr:0x2035068 -func_020350b0 kind:function(arm,size=0x4) addr:0x203506c +_ZN25UnkSubClass1_UnkownClass1D1Ev kind:function(arm,size=0x4) addr:0x2035068 +_ZN25UnkSubClass1_UnkownClass1D2Ev kind:function(arm,size=0x4) addr:0x203506c func_020350b4 kind:function(arm,size=0xb8) addr:0x2035070 func_0203516c kind:function(arm,size=0x3c) addr:0x2035128 func_020351a8 kind:function(arm,size=0x8) addr:0x2035164 @@ -1792,7 +1792,7 @@ func_020363c8 kind:function(arm,size=0x74) addr:0x2036384 _ZN18UnkStruct_027E0C6813func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x20363f8 _ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x203644c _ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x2036618 -_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x2036664 +func_020366a8 kind:function(arm,size=0x1c) addr:0x2036664 _ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x2036680 _ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x20366bc _ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x20366f8 @@ -1804,14 +1804,14 @@ _ZN18UnkStruct_027E0C6813func_02036808Ev kind:function(arm,size=0x1c) addr:0x203 _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_020368f4EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x18) addr:0x20368b0 +_ZN18UnkStruct_027E0C6813func_020368f4EP37UnkStruct_027E0C68_UnkSubClass2_Base1 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_02036d30EP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x1c) addr:0x2036cec -_ZN18UnkStruct_027E0C6813func_02036d4cEP31UnkStruct_027E0C68_UnkSubClass3 kind:function(arm,size=0x20) addr:0x2036d08 +_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_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 @@ -1820,7 +1820,7 @@ _ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x20 _ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370a4 _ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037114 _ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037134 -_Z13func_020371b0v kind:function(arm,size=0x4) addr:0x203716c +_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x4) addr:0x203716c _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037214 @@ -1839,10 +1839,10 @@ func_02037604 kind:function(arm,size=0x24) addr:0x20375c0 func_02037628 kind:function(arm,size=0x98) addr:0x20375e4 func_020376c0 kind:function(arm,size=0x64) addr:0x203767c func_02037724 kind:function(arm,size=0x2c) addr:0x20376e0 -func_02037750 kind:function(arm,size=0x44) addr:0x203770c -func_02037794 kind:function(arm,size=0x38) addr:0x2037750 -func_020377cc kind:function(arm,size=0x40) addr:0x2037788 -func_0203780c kind:function(arm,size=0x38) addr:0x20377c8 +_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1C2Eii kind:function(arm,size=0x44) addr:0x203770c +_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1D1Ev kind:function(arm,size=0x38) addr:0x2037750 +_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1D0Ev kind:function(arm,size=0x40) addr:0x2037788 +_ZN37UnkStruct_027E0C68_UnkSubClass2_Base1D2Ev kind:function(arm,size=0x38) addr:0x20377c8 func_02037844 kind:function(arm,size=0x10) addr:0x2037800 func_02037854 kind:function(arm,size=0xc4) addr:0x2037810 func_02037918 kind:function(arm,size=0x234) addr:0x20378d4 @@ -1856,29 +1856,29 @@ func_020386b4 kind:function(arm,size=0x4) addr:0x2038670 func_020386b8 kind:function(arm,size=0xc) addr:0x2038674 func_020386c4 kind:function(arm,size=0x8) addr:0x2038680 func_020386cc kind:function(arm,size=0xc) addr:0x2038688 -func_020386d8 kind:function(arm,size=0x40) addr:0x2038694 +_ZN31UnkStruct_027E0C68_UnkSubClass2C2Ev kind:function(arm,size=0x40) addr:0x2038694 _ZN31UnkStruct_027E0C68_UnkSubClass2C1Ev kind:function(arm,size=0x40) addr:0x20386d4 func_02038758 kind:function(arm,size=0x18) addr:0x2038714 func_02038770 kind:function(arm,size=0x1c) addr:0x203872c func_0203878c kind:function(arm,size=0x18) addr:0x2038748 func_020387a4 kind:function(arm,size=0x28) addr:0x2038760 -func_020387cc kind:function(arm,size=0x14) addr:0x2038788 +_ZN31UnkStruct_027E0C68_UnkSubClass2D2Ev 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 -func_0203881c kind:function(arm,size=0x3c) addr:0x20387d8 +_ZN25UnkSubClass1_UnkownClass2C1Ev kind:function(arm,size=0x3c) addr:0x20387d8 func_02038858 kind:function(arm,size=0x30) addr:0x2038814 func_02038888 kind:function(arm,size=0xc8) addr:0x2038844 func_02038950 kind:function(arm,size=0x130) addr:0x203890c func_02038a80 kind:function(arm,size=0x1c) addr:0x2038a3c func_02038a9c kind:function(thumb,size=0x4) addr:0x2038a58 -_ZN12MsgProc_MainC1Eic kind:function(thumb,size=0x5c) addr:0x2038a5c -func_02038afc kind:function(thumb,size=0xc) addr:0x2038ab8 -func_02038b08 kind:function(thumb,size=0x14) addr:0x2038ac4 -func_02038b1c kind:function(thumb,size=0xc) addr:0x2038ad8 +_ZN12MsgProc_MainC2Eisi kind:function(thumb,size=0x5c) addr:0x2038a5c +_ZN12MsgProc_MainD1Ev kind:function(thumb,size=0xc) addr:0x2038ab8 +_ZN12MsgProc_MainD0Ev kind:function(thumb,size=0x14) addr:0x2038ac4 +_ZN12MsgProc_MainD2Ev kind:function(thumb,size=0xc) addr:0x2038ad8 func_02038b28 kind:function(thumb,size=0xc) addr:0x2038ae4 func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0 -_Z13func_02038b40P31MsgProc_Type1 kind:function(arm,size=0x34) addr:0x2038afc +_ZN12MsgProc_Main13func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038afc func_02038b74 kind:function(arm,size=0x4) addr:0x2038b30 func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b34 _ZN13MsgProc_Type18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0 @@ -1908,57 +1908,57 @@ func_0203951c kind:function(arm,size=0x40) addr:0x20394d8 func_0203955c kind:function(arm,size=0x14) addr:0x2039518 func_02039570 kind:function(arm,size=0x8) addr:0x203952c _ZN13MsgProc_Type18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039534 -_ZN13MsgProc_Type1C2Ev kind:function(thumb,size=0x244) addr:0x2039570 -_ZN13MsgProc_Type1C1Ev kind:function(thumb,size=0x244) addr:0x20397b4 +_ZN13MsgProc_Type1C2Eisi kind:function(thumb,size=0x244) addr:0x2039570 +_ZN13MsgProc_Type1C1Eisi kind:function(thumb,size=0x244) addr:0x20397b4 _ZN13MsgProc_Type113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 _ZN13MsgProc_Type18vfunc_2CEv kind:function(arm,size=0x24c) addr:0x2039a18 -func_02039ca8 kind:function(arm,size=0x24) addr:0x2039c64 +_ZN13MsgProc_Type113func_02039ca8Ev kind:function(arm,size=0x24) addr:0x2039c64 _ZN13MsgProc_Type18vfunc_3CEi kind:function(arm,size=0xa8) addr:0x2039c88 _ZN13MsgProc_Type18vfunc_40Eii kind:function(arm,size=0x414) addr:0x2039d30 -func_0203a188 kind:function(arm,size=0x138) addr:0x203a144 -func_0203a2c0 kind:function(arm,size=0x4c) addr:0x203a27c -func_0203a30c kind:function(arm,size=0x1c) addr:0x203a2c8 +_ZN13MsgProc_Type113func_0203a188Eiii kind:function(arm,size=0x138) addr:0x203a144 +_ZN13MsgProc_Type113func_0203a2c0Ev kind:function(arm,size=0x4c) addr:0x203a27c +_ZN13MsgProc_Type113func_0203a30cEv kind:function(arm,size=0x1c) addr:0x203a2c8 _ZN13MsgProc_Type18vfunc_48Ev kind:function(arm,size=0x34) addr:0x203a2e4 -func_0203a35c kind:function(arm,size=0x84) addr:0x203a318 -func_0203a3e0 kind:function(arm,size=0x1c) addr:0x203a39c +_ZN13MsgProc_Type113func_0203a35cEv kind:function(arm,size=0x84) addr:0x203a318 +_ZN13MsgProc_Type113func_0203a3e0Ev kind:function(arm,size=0x1c) addr:0x203a39c _ZN13MsgProc_Type18vfunc_44Eii kind:function(arm,size=0x2d4) addr:0x203a3b8 -func_0203a6d0 kind:function(arm,size=0x120) addr:0x203a68c +_ZN13MsgProc_Type113func_0203a6d0Eii kind:function(arm,size=0x120) addr:0x203a68c _ZN13MsgProc_Type18vfunc_50EP9EntryINF1jPsi kind:function(arm,size=0x198) addr:0x203a7ac _ZN13MsgProc_Type18vfunc_54Ev kind:function(arm,size=0x520) addr:0x203a944 _ZN13MsgProc_Type18vfunc_5CEv kind:function(arm,size=0x74) addr:0x203ae64 _ZN13MsgProc_Type18vfunc_58Ev kind:function(arm,size=0x1a0) addr:0x203aed8 -func_0203b0bc kind:function(arm,size=0x30) addr:0x203b078 -func_0203b0ec kind:function(arm,size=0x178) addr:0x203b0a8 +_ZN13MsgProc_Type113func_0203b0bcEv kind:function(arm,size=0x30) addr:0x203b078 +_ZN13MsgProc_Type113func_0203b0ecEi kind:function(arm,size=0x178) addr:0x203b0a8 _ZN13MsgProc_Type18vfunc_18EP18UnkStruct_0203b264ii kind:function(arm,size=0xac) addr:0x203b220 _ZN13MsgProc_Type18vfunc_1CEcP18UnkStruct_0203b264ci kind:function(arm,size=0x100) addr:0x203b2cc _ZN13MsgProc_Type18vfunc_60EP21func_0203b410_param_2ii kind:function(arm,size=0x1c0) addr:0x203b3cc _ZN13MsgProc_Type18vfunc_64Ei kind:function(arm,size=0x194) addr:0x203b58c -func_0203b764 kind:function(arm,size=0xb0) addr:0x203b720 +_ZN13MsgProc_Type113func_0203b764Ev kind:function(arm,size=0xb0) addr:0x203b720 _ZN13MsgProc_Type18vfunc_20Ev kind:function(arm,size=0x578) addr:0x203b7d0 -func_0203bd8c kind:function(arm,size=0x40) addr:0x203bd48 +_ZN13MsgProc_Type113func_0203bd8cEt kind:function(arm,size=0x40) addr:0x203bd48 _ZN13MsgProc_Type18vfunc_6CEPiS0_ kind:function(arm,size=0x3c) addr:0x203bd88 -func_0203be08 kind:function(arm,size=0x5c) addr:0x203bdc4 +_ZN13MsgProc_Type113func_0203be08Ev kind:function(arm,size=0x5c) addr:0x203bdc4 func_0203be64 kind:function(arm,size=0x220) addr:0x203be20 -func_0203c084 kind:function(arm,size=0xb8) addr:0x203c040 -func_0203c13c kind:function(arm,size=0x64) addr:0x203c0f8 -func_0203c1a0 kind:function(arm,size=0xbc) addr:0x203c15c -func_0203c25c kind:function(arm,size=0x6c) addr:0x203c218 +_ZN13MsgProc_Type113func_0203c084Ev kind:function(arm,size=0xb8) addr:0x203c040 +_ZN13MsgProc_Type113func_0203c13cEv kind:function(arm,size=0x64) addr:0x203c0f8 +_ZN13MsgProc_Type113func_0203c1a0Ev kind:function(arm,size=0xbc) addr:0x203c15c +_ZN13MsgProc_Type113func_0203c25cEPS_ kind:function(arm,size=0x6c) addr:0x203c218 _ZN13MsgProc_Type1D0Ev kind:function(arm,size=0x48) addr:0x203c284 _ZN13MsgProc_Type1D2Ev kind:function(arm,size=0x40) addr:0x203c2cc _ZN13MsgProc_Type18vfunc_38Ev kind:function(arm,size=0x8) addr:0x203c30c -_ZN13MsgProc_Type2C1Ev kind:function(thumb,size=0x44) addr:0x203c314 -func_0203c39c kind:function(thumb,size=0x78) addr:0x203c358 -func_0203c414 kind:function(arm,size=0x4c) addr:0x203c3d0 -func_0203c460 kind:function(arm,size=0x4c) addr:0x203c41c +_ZN13MsgProc_Type2C1Eisi kind:function(thumb,size=0x44) addr:0x203c314 +_ZN13MsgProc_Type213func_0203c39cEii kind:function(thumb,size=0x78) addr:0x203c358 +_ZN13MsgProc_Type28vfunc_3CEi kind:function(arm,size=0x4c) addr:0x203c3d0 +_ZN13MsgProc_Type28vfunc_40Eii kind:function(arm,size=0x4c) addr:0x203c41c func_0203c4ac kind:function(arm,size=0x118) addr:0x203c468 -func_0203c5c4 kind:function(arm,size=0x18) addr:0x203c580 +_ZN13MsgProc_Type28vfunc_14Eii kind:function(arm,size=0x18) addr:0x203c580 func_0203c5dc kind:function(arm,size=0x120) addr:0x203c598 -func_0203c6fc kind:function(arm,size=0x1c) addr:0x203c6b8 -func_0203c718 kind:function(arm,size=0x14) addr:0x203c6d4 -_ZN13MsgProc_Type3C1Ev kind:function(arm,size=0x110) addr:0x203c6e8 -func_0203c83c kind:function(arm,size=0x4) addr:0x203c7f8 -func_0203c840 kind:function(arm,size=0x30) addr:0x203c7fc -func_0203c870 kind:function(arm,size=0x38) addr:0x203c82c +_ZN13MsgProc_Type2D0Ev kind:function(arm,size=0x1c) addr:0x203c6b8 +_ZN13MsgProc_Type2D2Ev kind:function(arm,size=0x14) addr:0x203c6d4 +_ZN13MsgProc_Type3C1Eisi kind:function(arm,size=0x110) addr:0x203c6e8 +_ZN13MsgProc_Type313func_0203c83cEv kind:function(arm,size=0x4) addr:0x203c7f8 +_ZN13MsgProc_Type3D2Ev kind:function(arm,size=0x30) addr:0x203c7fc +_ZN13MsgProc_Type3D0Ev kind:function(arm,size=0x38) addr:0x203c82c func_0203c8a8 kind:function(arm,size=0x58) addr:0x203c864 func_0203c900 kind:function(arm,size=0x4) addr:0x203c8bc func_0203c904 kind:function(arm,size=0x11c) addr:0x203c8c0 @@ -2024,10 +2024,10 @@ func_0203d848 kind:function(arm,size=0x8c) addr:0x203d804 func_0203d8d4 kind:function(arm,size=0x8c) addr:0x203d890 func_0203d960 kind:function(arm,size=0xc0) addr:0x203d91c func_0203da20 kind:function(arm,size=0xc0) addr:0x203d9dc -func_0203dae0 kind:function(thumb,size=0x98) addr:0x203da9c -func_0203db78 kind:function(thumb,size=0x30) addr:0x203db34 -func_0203dba8 kind:function(thumb,size=0x38) addr:0x203db64 -func_0203dbe0 kind:function(thumb,size=0x30) addr:0x203db9c +_ZN13MsgProc_Base2C2Eiii kind:function(thumb,size=0x98) addr:0x203da9c +_ZN13MsgProc_Base2D1Ev kind:function(thumb,size=0x30) addr:0x203db34 +_ZN13MsgProc_Base2D0Ev kind:function(thumb,size=0x38) addr:0x203db64 +_ZN13MsgProc_Base2D2Ev kind:function(thumb,size=0x30) addr:0x203db9c func_0203dc10 kind:function(arm,size=0x64) addr:0x203dbcc func_0203dc74 kind:function(arm,size=0x40) addr:0x203dc30 _ZN13MsgProc_Type18vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dc70 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index db89656b..6628e0e7 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -5,7 +5,7 @@ #include "System/SysNew.hpp" #include "Message/BMG.hpp" -#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "Message/MsgProc.hpp" #include "lib/math.h" // astruct_14 diff --git a/include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp b/include/Message/MsgProc.hpp similarity index 100% rename from include/Message/UnkStruct_027E0C68_UnkSubClass1.hpp rename to include/Message/MsgProc.hpp diff --git a/src/Main/Message/func_02032f0c.cpp b/src/Main/Message/func_02032f0c.cpp index a9f3c196..b2191dd1 100644 --- a/src/Main/Message/func_02032f0c.cpp +++ b/src/Main/Message/func_02032f0c.cpp @@ -1,5 +1,5 @@ #include "global.h" -#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "Message/MsgProc.hpp" #include "Message/MessageManager.hpp" #include "Save/AdventureFlags.hpp" #include "DTCM/UnkStruct_027e103c.hpp" diff --git a/src/Main/Message/func_0203744c.cpp b/src/Main/Message/func_0203744c.cpp index ab05bf4b..986d9e1e 100644 --- a/src/Main/Message/func_0203744c.cpp +++ b/src/Main/Message/func_0203744c.cpp @@ -1,5 +1,5 @@ #include "global.h" -#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "Message/MsgProc.hpp" #include "Message/MessageManager.hpp" #include "Save/AdventureFlags.hpp" #include "DTCM/UnkStruct_027e103c.hpp" @@ -42,20 +42,3 @@ ARM UnkSubClass1_UnkownClass2::UnkSubClass1_UnkownClass2() { this->unk_20 = 0; this->unk_24 = 0; } - -THUMB MsgProc_Main::MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4) - : MsgProc_Base2(param_2, param_3, param_4), - unk_124(0) -{ - this->func_020387e0(this->unk_150); - this->unk_154 = 0; - this->unk_158.y = 0; - this->unk_15C = 0; - this->unk_15E = 0xFF; - this->unk_15F = 0xFF; - this->unk_160 = 1; - this->unk_11E = param_3; -} - -THUMB MsgProc_Main::~MsgProc_Main() { -} diff --git a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp b/src/Main/Message/func_02038aa0.cpp similarity index 81% rename from src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp rename to src/Main/Message/func_02038aa0.cpp index 187cde77..675d1d4b 100644 --- a/src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp +++ b/src/Main/Message/func_02038aa0.cpp @@ -1,11 +1,28 @@ #include "global.h" -#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "Message/MsgProc.hpp" #include "Message/MessageManager.hpp" #include "Save/AdventureFlags.hpp" #include "DTCM/UnkStruct_027e103c.hpp" #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" +THUMB MsgProc_Main::MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4) + : MsgProc_Base2(param_2, param_3, param_4), + unk_124(0) +{ + this->func_020387e0(this->unk_150); + this->unk_154 = 0; + this->unk_158.y = 0; + this->unk_15C = 0; + this->unk_15E = 0xFF; + this->unk_15F = 0xFF; + this->unk_160 = 1; + this->unk_11E = param_3; +} + +THUMB MsgProc_Main::~MsgProc_Main() { +} + ARM unk32 MsgProc_Type1::vfunc_34(unk32 param_2) { s16 iVar1; unk32 iVar2; diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp index 89c9399a..94447ba6 100644 --- a/src/Main/Message/func_020397f8.cpp +++ b/src/Main/Message/func_020397f8.cpp @@ -1,5 +1,5 @@ #include "global.h" -#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "Message/MsgProc.hpp" #include "Message/MessageManager.hpp" #include "Save/AdventureFlags.hpp" #include "DTCM/UnkStruct_027e103c.hpp" @@ -9,7 +9,6 @@ extern "C" void func_ov000_020d0460(void*); extern "C" void func_0203efd8(void*, void*); extern "C" void func_0203ee48(void*); -extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void*, void*); extern unk16 data_02056a0e[]; extern u8 data_02056a08[]; @@ -1216,102 +1215,3 @@ ARM MsgProc_Type1::~MsgProc_Type1() { ARM bool MsgProc_Type1::vfunc_38(void) { return true; } - -THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) : - MsgProc_Main(0, 0, param_4) -{ - this->unk_162 = 4; - this->unk_164 = 1; - this->unk_166 = 0; - this->unk_168 = -1; - this->unk_16A = 0; - this->unk_16C = 1; - this->unk_16E = 0; -} - -// non-matching -THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) { - u16 uVar1; - unk32 uVar2; - s16 uVar3; - s32 iVar4; - s32 local_20; - s32 local_1c [2]; - - this->func_02038b28(); - uVar3 = 0; - - for (iVar4 = 0; iVar4 < 2; iVar4++) { - local_1c[0] = 0xC0; - local_20 = 0x10; - - if (iVar4 != 0) { - this->func_0203fc78(local_1c, &local_20); - } - - uVar1 = this->func_0203d318((s32)(local_1c[0] + 7 + ((u32)(local_1c[0] + 7 >> 2) >> 0x1D)) >> 3, - (s32)(local_20 + 7 + ((u32)(local_20 + 7 >> 2) >> 0x1D)) >> 3); - - if (uVar3 < uVar1) { - uVar3 = uVar1; - } - } - - if (this->unk_114->vfunc_08(this, uVar3) != 0) { - this->unk_10 = this->unk_114->func_0203d1b4(); - } -} - -ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) { - if (this->unk_15C > 0 && this->unk_122 != 1) { - if (this->func_0203de14(param_2) != 0) { - this->vfunc_40(0, 0); - } - } -} - -ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) { - param_2 += this->unk_166; - param_3 += this->unk_168; - - this->func_0203c4ac(param_2 + this->unk_16A, param_3 + this->unk_16C); - this->func_02038ef4(param_2, param_3); -} - -//! TODO: solve vfunc oddities -extern "C" bool func_0203dcb4(unk32); -// non-matching -ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) { - return func_0203dcb4(param_2 + this->unk_162); -} - -ARM MsgProc_Type2::~MsgProc_Type2() { -} - -// non-matching -ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) : - MsgProc_Main(1, 0, param_4) -{ - this->unk_162 = 1; - this->unk_164 = 0x1A; - this->unk_166 = 0xA6; - this->unk_168 = 0x1D; - this->unk_16A = 0; - this->unk_16C = 1; - this->unk_170 = -1; - this->unk_172 = -1; - this->unk_174 = -1; - - func_0204f614(this->unk_180, ARRAY_LEN(this->unk_180), sizeof(UnkClass_func_ov000_020d0644), UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c); - - this->unk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0); - this->unk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0); - this->unk_180[2].func_ov000_020d0644(0x1E, 2, 0x8C, 0, 0); - this->unk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0); -} - -ARM void MsgProc_Type3::func_0203c83c(void) { -} - -ARM MsgProc_Type3::~MsgProc_Type3() { -} diff --git a/src/Main/Message/func_0203c358.cpp b/src/Main/Message/func_0203c358.cpp new file mode 100644 index 00000000..0e5376f4 --- /dev/null +++ b/src/Main/Message/func_0203c358.cpp @@ -0,0 +1,79 @@ +#include "global.h" +#include "Message/MsgProc.hpp" +#include "Message/MessageManager.hpp" +#include "Save/AdventureFlags.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Player/TouchControl.hpp" +#include "Item/ItemManager.hpp" +#include "System/SysNew.hpp" + +THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) : + MsgProc_Main(0, 0, param_4) +{ + this->unk_162 = 4; + this->unk_164 = 1; + this->unk_166 = 0; + this->unk_168 = -1; + this->unk_16A = 0; + this->unk_16C = 1; + this->unk_16E = 0; +} + +// non-matching +THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) { + u16 uVar1; + unk32 uVar2; + s16 uVar3; + s32 iVar4; + s32 local_20; + s32 local_1c [2]; + + this->func_02038b28(); + uVar3 = 0; + + for (iVar4 = 0; iVar4 < 2; iVar4++) { + local_1c[0] = 0xC0; + local_20 = 0x10; + + if (iVar4 != 0) { + this->func_0203fc78(local_1c, &local_20); + } + + uVar1 = this->func_0203d318((s32)(local_1c[0] + 7 + ((u32)(local_1c[0] + 7 >> 2) >> 0x1D)) >> 3, + (s32)(local_20 + 7 + ((u32)(local_20 + 7 >> 2) >> 0x1D)) >> 3); + + if (uVar3 < uVar1) { + uVar3 = uVar1; + } + } + + if (this->unk_114->vfunc_08(this, uVar3) != 0) { + this->unk_10 = this->unk_114->func_0203d1b4(); + } +} + +ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) { + if (this->unk_15C > 0 && this->unk_122 != 1) { + if (this->func_0203de14(param_2) != 0) { + this->vfunc_40(0, 0); + } + } +} + +ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) { + param_2 += this->unk_166; + param_3 += this->unk_168; + + this->func_0203c4ac(param_2 + this->unk_16A, param_3 + this->unk_16C); + this->func_02038ef4(param_2, param_3); +} + +//! TODO: solve vfunc oddities +extern "C" bool func_0203dcb4(unk32); +// non-matching +ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) { + return func_0203dcb4(param_2 + this->unk_162); +} + +ARM MsgProc_Type2::~MsgProc_Type2() { +} diff --git a/src/Main/Message/func_0203c72c.cpp b/src/Main/Message/func_0203c72c.cpp new file mode 100644 index 00000000..5965bf8c --- /dev/null +++ b/src/Main/Message/func_0203c72c.cpp @@ -0,0 +1,38 @@ +#include "global.h" +#include "Message/MsgProc.hpp" +#include "Message/MessageManager.hpp" +#include "Save/AdventureFlags.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Player/TouchControl.hpp" +#include "Item/ItemManager.hpp" +#include "System/SysNew.hpp" + +extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void*, void*); + +// non-matching +ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) : + MsgProc_Main(1, 0, param_4) +{ + this->unk_162 = 1; + this->unk_164 = 0x1A; + this->unk_166 = 0xA6; + this->unk_168 = 0x1D; + this->unk_16A = 0; + this->unk_16C = 1; + this->unk_170 = -1; + this->unk_172 = -1; + this->unk_174 = -1; + + func_0204f614(this->unk_180, ARRAY_LEN(this->unk_180), sizeof(UnkClass_func_ov000_020d0644), UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c); + + this->unk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0); + this->unk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0); + this->unk_180[2].func_ov000_020d0644(0x1E, 2, 0x8C, 0, 0); + this->unk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0); +} + +ARM void MsgProc_Type3::func_0203c83c(void) { +} + +ARM MsgProc_Type3::~MsgProc_Type3() { +} diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp index 3f88720e..0dbb31b6 100644 --- a/src/Main/Message/func_0203c8a8.cpp +++ b/src/Main/Message/func_0203c8a8.cpp @@ -1,5 +1,5 @@ #include "global.h" -#include "Message/UnkStruct_027E0C68_UnkSubClass1.hpp" +#include "Message/MsgProc.hpp" #include "Message/MessageManager.hpp" #include "Save/AdventureFlags.hpp" #include "DTCM/UnkStruct_027e103c.hpp" From d15d9c2e036f80f06882d6e7872bbe123fd0cb37 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Thu, 30 Jan 2025 18:01:34 +0100 Subject: [PATCH 42/64] forgot to remove a file --- src/Main/Message/func_02038aa0.cpp | 1210 +++++++++++++++++++++++++++ src/Main/Message/func_020397f8.cpp | 1217 ---------------------------- 2 files changed, 1210 insertions(+), 1217 deletions(-) delete mode 100644 src/Main/Message/func_020397f8.cpp diff --git a/src/Main/Message/func_02038aa0.cpp b/src/Main/Message/func_02038aa0.cpp index 675d1d4b..cbdd8349 100644 --- a/src/Main/Message/func_02038aa0.cpp +++ b/src/Main/Message/func_02038aa0.cpp @@ -6,6 +6,13 @@ #include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" +extern "C" void func_ov000_020d0460(void*); +extern "C" void func_0203efd8(void*, void*); +extern "C" void func_0203ee48(void*); + +extern unk16 data_02056a0e[]; +extern u8 data_02056a08[]; + THUMB MsgProc_Main::MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4) : MsgProc_Base2(param_2, param_3, param_4), unk_124(0) @@ -92,3 +99,1206 @@ ARM void MsgProc_Type1::vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param this->func_0203dc10(1, param_3); this->func_02033190(param_2, param_3, param_4, param_5); } + +THUMB MsgProc_Type1::MsgProc_Type1(unk32 param_2, unk16 param_3, unk32 param_4) : + MsgProc_Main(0, 0, param_4), + unk_164(NULL) +{ + UnknownMsgChoiceStruct* puVar3; + + this->unk_410.unk_00 = this; + this->unk_414 = 0; + this->unk_418 = NULL; + this->unk_41C = 0; + this->unk_41E = 0; + this->unk_420 = 0; + this->unk_424.unk_00 = this; + + // ??? + puVar3 = this->unk_428; + do { + puVar3->unk_00 = NULL; + puVar3 += 1; + } while ((unk32*)puVar3 < (unk32*)this->unk_528); + + func_0203ee48(&this->unk_424); + func_ov000_020d0460(&this->unk_534); + this->unk_53C = 0; + this->unk_540 = ~0x7FFF; + this->unk_544 = 3; + func_ov000_020d0460(&this->unk_548); + this->unk_550 = 0; + this->unk_554 = 0x00016000; + this->unk_558 = 3; + this->unk_55C = -1; + this->unk_560 = -1; + this->unk_56C = 0; + this->unk_56E = 0; + this->unk_570 = 0; + this->unk_572 = 0; + this->unk_574 = 0; + this->unk_576 = 0; + this->unk_578 = 3; + this->unk_57A = 0; + this->unk_57B = -1; + this->unk_57C = 0; + this->unk_57D = 0; + this->unk_57E = 0; + this->unk_57F = 0; + this->unk_580 = 0; + this->unk_581 = 0; + this->unk_582 = 0; + this->unk_583 = 0; + this->unk_585 = 0; + this->unk_586 = 0; + func_0203efd8(&this->unk_588, this); + this->unk_124 = (UnkSubClass1_unk_124*)&this->unk_588; + this->func_02039ca8(); + + if (this->func_02032fa4() != 0) { + this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); + } else { + this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); + } + + this->unk_168.func_020351b8(true, false, false, false); + this->unk_1F0.func_020351b8(false, false, false, false); + this->unk_278.func_020351b8(false, false, false, false); +} + +THUMB void MsgProc_Type1::func_02039a3c(void) { + this->func_02038b28(); + this->func_0203dcfc(this->unk_50, 0, 0, 2); +} + +// non-matching +ARM void MsgProc_Type1::vfunc_2C(void) { + if (data_027e0618[0x101] != 0) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { + return; + } + } + + this->func_02038d20(); + + if (this->unk_56C > 0) { + this->unk_56C--; + } + + if (this->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { + this->unk_57F = 0; + } + + if (this->unk_15C > 0) { + if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { + this->unk_424.func_0203ef78(this->unk_128.unk_08); + } + + this->func_0203be64(); + this->func_0203a35c(); + + if (this->unk_580 != 0) { + this->unk_168.func_0203516c(); + } + + if (this->unk_584 != 0) { + this->unk_300.func_0203516c(); + } + + if (this->unk_585 != 0) { + this->unk_388.func_0203516c(); + } + + if ((this->func_0203a2c0() != 0 && this->unk_57F == 0) && this->unk_56C <= 0) { + this->unk_1F0.func_0203516c(); + } + + if (this->unk_08 != NULL) { + bool value = this->unk_08->unk_1C; + + if ((value == 1) || (value == 2)) { + this->unk_278.func_0203516c(); + } + } + + if (this->unk_15E == 6) { + func_ov018_02169634(this); + } else { + this->unk_410.func_0203ebf8(); + } + } + + if (this->unk_15C == 1) { + if (this->unk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) { + switch (this->unk_150[1]) { + case 0: + this->func_0203b0ec(1); + break; + case 2: + case 3: + if (this->func_0203a3e0() != 0) { + this->func_0203bd8c(this->unk_572); + } else { + this->func_0203b0ec(1); + } + break; + } + } + } +} + +ARM void MsgProc_Type1::func_02039ca8(void) { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->unk_564); i++) { + this->unk_564[i] = 0x1A; + } +} + +// non-matching +ARM bool MsgProc_Type1::func_0203a2c0(void) { + if ((this->unk_150[1] != 1 && this->unk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { + return true; + } + + return false; +} + +ARM unk32 MsgProc_Type1::func_0203a30c(void) { + return this->unk_574 / this->unk_154->unk_06; +} + +ARM void MsgProc_Type1::vfunc_3C(unk32 param_2) { + if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { + if (this->unk_124->unk_29 != 3) { + if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { + return; + } + + if (data_027e0618[0x101] != 0) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { + return; + } + } + + this->vfunc_40(0, 0); + } + } + +} + +// non-matching +ARM void MsgProc_Type1::vfunc_40(unk32 param_2, unk32 param_3) { + MsgProc_Main* bVar1; + s8 cVar2; + unk32 iVar4; + unk32 iVar6; + unk32 iVar7; + unk32 iVar8; + unk32 uVar9; + unk32 iStack_a8; + unk32 iStack_a4; + unk32 local_a0; + unk32 local_9c; + unk32 local_98; + unk32 local_94; + unk32 local_90; + unk32 local_8c; + unk32 iVar5; + UnkStruct_01ffbe34 aStack_88; + UnkStruct_01ffbe34 aStack_68; + UnkStruct_01ffbe34 aStack_48; + + local_8c = 0; + local_90 = 0; + bVar1 = data_027e0c68.unk_28[this->unk_50]; + + this->vfunc_6C(&local_8c, &local_90); + this->func_0203a188(local_8c + param_2, local_90 + param_3, 0); + this->func_0203e1b0(param_2 + local_8c + (this->unk_158.x - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_158.y - (this->unk_18 << 3) / 2), 0); + + if (this->unk_584 != 0) { + iVar5 = this->unk_18 << 3; + + if (this->unk_580 != 0) { + iVar5 = -0xC; + } else { + iVar5 = 0; + } + + this->unk_300.func_02034a1c(param_2 + local_8c + this->unk_55C + (this->unk_158.x - (this->unk_14 << 3) / 2), + iVar5 + param_3 + local_90 + this->unk_560 + ((this->unk_158.y - (iVar5 / 2))), 0); + } + + if (this->unk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { + switch (data_027e0618[0]) { + case 2: + if (data_027e0cbc.func_0203d7e0(3) != 0) { + this->unk_388.func_02034b0c(0xBE, 0, 0, 0, 0); + } + break; + case 6: + if (data_027e0cbc.func_0203d7e0(0x58) != 0) { + this->unk_388.func_02034b0c(0x013B, 0, 0, 0, 0); + } + break; + } + } + + iVar5 = this->func_02032fa4(); + iVar8 = bVar1->unk_18; + uVar9 = data_02056a04[iVar8]; + // func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); + iVar6 = this->unk_158.x - local_94; + iVar7 = this->unk_158.y - local_98; + + if ((this->unk_15E != 7) && (this->func_0203a2c0() != 0)) { + func_01ffbe34(&aStack_48); + func_020347b0(uVar9, data_02056a10[iVar8], &local_9c, &local_a0, 4, 4); + local_9c += param_2 + local_8c + iVar6; + local_a0 += param_3 + local_90 + iVar7; + + if (data_027e0c38[5] == 1) { + iVar8 = func_0202ab48(); + + if (iVar8 == 0) { + iVar8 = 0; + } else { + iVar8 = -3; + } + + local_9c = (0x108 - local_9c) + iVar8; + } + + if ((this->unk_57F == 0) && (this->unk_56C <= 0)) { + func_01ffbe34(&aStack_68); + aStack_68.mUnk_0a = 1; + this->unk_1F0.func_02034a1c(local_9c, local_a0, &aStack_68); + } else { + // func_02034984(iVar5 != 0 ? 0x11F : 0x18, 0, local_9c, local_a0 + 2, 0); + } + } + + if (this->unk_08 != 0) { + if ((this->unk_08->unk_1C == 1 || this->unk_08->unk_1C == 2) == 0) { + return; + } + + func_01ffbe34(&aStack_88); + aStack_88.mUnk_0a = 1; + func_02034698(iVar5 != 0 ? 0x11F : 0x18, 2, &iStack_a4, &iStack_a8); + iStack_a4 += param_2 + local_8c + iVar6; + iStack_a8 += param_3 + local_90 + iVar7; + this->unk_278.func_02034a1c(iStack_a4, iStack_a8, &aStack_88); + } +} + +ARM void MsgProc_Type1::func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4) { + unk16 sVar1; + unk16 sVar2; + unk32 iVar3; + unk32 iVar4; + unk32 uVar5; + unk32 iVar6; + unk32 iStack_54; + unk32 iStack_50; + unk32 iStack_4c; + unk32 iStack_48; + UnkStruct_01ffbe34 aStack_44; + unk32 uStack_24; + + if (this->unk_15E == 7) { + return; + } + + // (short)(ushort)*(byte *)((int)data_027e0c68.unk_28[(this->unk_50 - 0x28) * 0x18]; + + iVar6 = data_027e0c68.unk_10 + this->unk_50; + // uStack_24 = param_4; + + if (data_027e0cbc.func_0203d7e0(data_02056a00[iVar6]) != 0) { + uVar5 = data_02056a04[iVar6]; + + func_0203489c(uVar5, data_02056a16[iVar6], &iStack_48, &iStack_4c); + iVar3 = iStack_50 + (this->unk_158.x - iStack_48); + + func_02034698(uVar5, data_02056a0e[iVar6], &iStack_50, &iStack_54); + iVar4 = iStack_54 + (this->unk_158.y - iStack_4c); + + func_01ffbe34(&aStack_44); + aStack_44.mUnk_0a = 1; + + if (this->unk_580 != 0) { + this->unk_168.func_02034a1c(param_2 + iVar3, param_3 + iVar4, &aStack_44); + } else { + func_02034984(uVar5, data_02056a08[iVar6], param_2 + iVar3, param_3 + iVar4); + } + } +} + +// non-matching (regalloc) +ARM void MsgProc_Type1::vfunc_48(void) { + if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { + this->func_02038b40(); + } + + this->unk_410.func_0203ec34(); +} + +ARM void MsgProc_Type1::func_0203a35c(void) { + if ((this->unk_57C == 1 || this->unk_150[3] != 0) || (this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { + if (this->func_0203a3e0()) { + s16 unk_56E = this->unk_56E; + s16 unk_570 = this->unk_570; + MsgProc_Type1* unk_164 = this->unk_164; + + unk_164->unk_168.unk_10 = unk_56E; + unk_164->unk_168.unk_14 = unk_570; + this->unk_164->func_02039208(4); + } + } else { + this->unk_164->func_02038b40(); + } +} + +ARM bool MsgProc_Type1::func_0203a3e0(void) { + return this->unk_164->unk_168.unk_06 > 0; +} + +// non-matching +ARM void MsgProc_Type1::vfunc_44(s32 touchLastX, s32 touchLastY) { + unk32 iVar2; + unk32 iVar5; + unk32 iStack_14; + unk32 iStack_18; + + if (this->unk_15C <= 0 || this->func_0203951c() == 0) { + return; + } + + iStack_14 = 0; + iStack_18 = 0; + + this->vfunc_6C(&iStack_14, &iStack_18); + + iVar5 = touchLastX - iStack_14; + iVar2 = touchLastY - iStack_18; + + if ((data_027e103c != 0 && data_027e103c->mUnk_1c == 0x8F) || (data_027e077c.mUnk_0 != data_027e077c.mUnk_4)) { + return; + } + + if ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { + if ((data_027e0d78.mFlags & 1) != 0) { + if (this->unk_50 == 0 && data_027e0d38 != 0) { + if (func_ov000_02079e04() == 0 && data_027e0e28->func_ov000_0207bc48() == 0) { + if (data_027e0618[0x101] == 0 && data_027e103c->mUnk_24 == 0) { + return; + } + } + } + + if (this->func_0203a6d0(iVar5, iVar2) == 0 && this->func_0203a2c0() != 0) { + this->unk_57F = 1; + } + } else { + if (data_027e0d78.mTouch != 0) { + this->func_0203a6d0(iVar5, iVar2); + return; + } + + if (data_027e0d78.mTouch == 0) { + switch(this->unk_150[1]) { + case 3: + case 4: + break; + case 5: + if (data_027e103c->mUnk_20 == 3) { + this->func_0203b0ec(1); + } + break; + case 6: + if (data_027e103c->mUnk_20 == 5) { + this->func_0203b0ec(1); + } + break; + case 7: + break; + case 2: + //! TODO: fixme + // if (this->unk_164->unk_168.unk_06 <= 0) { + // if ((data_027e0d78.mFlags & 2) != 0) { + // this->unk_128.unk_14 = 0; + + // if (this->func_0203b0bc() != 0) { + // this->func_0203b0ec(1); + // } + + // this->unk_1F0.unk_5C.unk_08 = 0; + // this->unk_1F0.func_020352d8(); + // } + // } + break; + case 0: + case 1: + default: + if ((data_027e0d78.mFlags & 2) != 0) { + this->unk_128.unk_14 = 0; + + if (this->func_0203b0bc() != 0) { + this->func_0203b0ec(1); + } + + this->unk_1F0.unk_5C.unk_08 = 0; + this->unk_1F0.func_020352d8(); + } + break; + } + } + } + } +} + +ARM bool MsgProc_Type1::func_0203a6d0(unk32 param_2, unk32 param_3) { + unk32 iVar1; + unk32 uVar2; + UnkStruct_0203b264* piVar3; + + if (this->unk_164->unk_168.unk_06 > 0 && this->unk_164->unk_15C <= 0) { + return false; + } + + iVar1 = this->vfunc_34(param_3); + piVar3 = NULL; + + if (!(iVar1 < 0) && iVar1 < 4) { + piVar3 = this->unk_424.func_0203eeb0(iVar1, param_2); + } + + if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16*)piVar3->mUnk_0)[2]) == 0x00FF0002) { + uVar2 = this->func_02038cb8(iVar1); + this->unk_410.func_0203ec4c(piVar3, uVar2, + (s16)(this->unk_158.x - ((this->unk_14 << 3) / 2)) + iVar1 + this->unk_56E, + (s16)(this->unk_158.y - ((this->unk_18 << 3) / 2)) + iVar1 + this->unk_570 + ); + + this->unk_57F = 0; + return true; + } + + return false; +} + +// non-matching +ARM void MsgProc_Type1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { + bool bVar5; + bool bVar2; + int iVar4; + int iVar6; + s16 temp; + + iVar6 = param_4[0]; + + if (data_027e0c54 != 0) { + MsgProc_Type1* pVar4 = data_027e0c68.func_02036700(); + + if (pVar4 != NULL && pVar4->unk_15C > 0) { + this->func_02038b40(); + } + } + + if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { + MsgProc_Type1* pVar4 = (MsgProc_Type1*)data_027e0c68.unk_28[4]; + + if (pVar4 != NULL && pVar4->unk_15C > 0) { + this->func_02038b40(); + } + } + + this->unk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; + temp = param_4[8]; + + if (temp >= 0 && param_4[9] >= 0) { + temp = param_4[10]; + } + + if (temp < 0) { + this->unk_57B = temp; + } else { + this->unk_57B = 0; + } + + this->func_02038f44(param_2, param_3, param_4, param_5, iVar6); + this->unk_574 = 0; + + if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param_4[11])) { + data_027e103c->func_ov000_020cf284(0x80, 0); + } +} + +// non-matching (can't get the switch decomp...) +ARM void MsgProc_Type1::vfunc_54(void) { + short sVar1; + int iVar2; + u16* puVar3; + int iVar4; + u16 uVar5; + unk8 uVar6; + u16 *local_54 [17]; + + if ((this->unk_18 & 0x1FFFFFFF) != 8) { + this->func_0203e060(0xE0, 0x40); + + if (this->unk_154 == 0) { + iVar2 = 2; + } else { + iVar2 = (int)*(char *)(this->unk_154->unk_05); + } + + this->func_0203dcfc(this->unk_50, 0, (int)this->unk_11E, iVar2); + } + + this->unk_410.func_0203ebe0(); + this->unk_580 = 0; + this->func_020392b4(); + this->unk_57C = 0; + //! TODO: fixme + // this->unk_164->unk_168.unk_06 = 0; + this->unk_57D = 0; + this->unk_57F = 0; + this->unk_57A = 0; + + if (this->unk_154->unk_06 < 2) { + this->unk_580 = 1; + } + + this->unk_424.func_0203ee48(); + this->unk_150[1] = 1; + puVar3 = this->unk_128.unk_00; + local_54[0] = puVar3; + iVar2 = 0; + + for (iVar2 = 0; (iVar2 / this->unk_154->unk_06) == 0; iVar2++, puVar3 = this->func_02037604(local_54)) { + if (local_54[iVar2] != NULL) { + puVar3 = local_54[iVar2]; + } + + if (local_54[iVar2] == NULL || puVar3 == NULL) { + break; + } + + if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { + uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; + if (0x00010017 < uVar5) { + if (uVar5 == 0x00020001) { + //! TODO: fixme + // sVar1 = this->unk_164->unk_168.unk_06; + + // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; + // (param_1 + sVar1 * 2 + 0x562)[1] = 0; + } + } else { + // switch (*local_54[iVar2]) { + // case 0: + // continue; + // case 1: + // case 2: + // case 3: + // case 4: + // if (this->unk_164->unk_168.unk_06 == 0) { + // this->func_0203cabc(this->unk_164->unk_50); + // this->unk_164->unk_50 = 0x1A; // ??? + + // while (this->unk_564 < 4) { + // this->unk_564--; // ??? + // } + + // this->unk_580 = 1; + // } else { + // this->unk_150[1] = 4 + // } + // break; + // case 5: + // case 6: + // case 7: + // case 8: + // case 9: + // case 10: + // case 11: + // case 12: + // case 13: + // case 14: + // case 15: + // case 16: + // case 17: + // case 18: + // case 19: + // case 20: + // case 21: + // case 22: + // case 23: + // case 24: + // case 25: + // sVar1 = this->unk_164->unk_168.unk_06; + // break; + // default: + // return; + // } + } + } + + if (*local_54[iVar2] == '\n') { + continue; + } + } + +/* while(true) { + + // switch (*local_54[iVar2]) { + // case ESCAPE_SEQUENCE_MARKER: + // case '\n': + // } + + if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { + uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; + if (0x00010017 < uVar5) { + if (uVar5 == 0x00020001) { + sVar1 = this->unk_164->unk_168.unk_06; + // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; + // (param_1 + sVar1 * 2 + 0x562)[1] = 0; + } + } else { + /* WARNING: Could not recover jumptable at 0x0203aa7c. Too many branches */ + /* WARNING: Treating indirect jump as call + // if (-1 < (int)(uVar5 - 0x10000)) { + // (*(code *)((uVar5 - 0x10000) * 4 + 0x203aa84))(); + // return; + // } + } + } else if (*local_54[iVar2] == '\n') { + iVar2 = iVar2 + 1; + iVar4 = (iVar2 / this->unk_154->unk_06); + + if (iVar4 == 0) { + break; + } + } + } + */ + if (this->unk_15E == '\x06') { + this->func_0203e060(0xE0, 0x30); + + if (this->unk_154 == 0) { + iVar2 = 2; + } else { + iVar2 = this->unk_154->unk_05; + } + + this->func_0203dcfc(this->unk_50,0,(int)this->unk_11E,iVar2); + } + + if (this->unk_580 != 0) { + this->func_0203e060(0xE0, 0x28); + + if (this->unk_154 == 0) { + iVar2 = 2; + } else { + iVar2 = this->unk_154->unk_05; + } + + this->func_0203dcfc(this->unk_50, 0, this->unk_11E, iVar2); + + if (this->unk_50 == 0) { + uVar6 = 1; + } else { + uVar6 = 7; + } + + // *(undefined *)((int)PTR_PTR_0203aea4->unk_28 + ((byte)param_1[0x50] - 0x28)) = uVar6; + // PTR_PTR_0203aea4[this->unk_50] = uVar6; + data_027e0c68.unk_28[this->unk_50]->unk_18 = uVar6; + this->func_0203b764(); + + if (this->unk_15F == 0 || this->unk_154->unk_06 < 3) { + this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; + this->unk_168.func_020352d8(); + } else { + this->unk_168.func_020351b8(1, 0, 0, 0); + } + } + + this->unk_1F0.unk_5C.unk_08 = 0; + this->unk_1F0.func_020352d8(); + this->vfunc_0C(0, 0, 0, 0); + // (**(code **)(*(int *)param_1 + 0x10))(0); +} + +ARM void MsgProc_Type1::vfunc_5C(void) { + if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { + this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; + this->unk_168.func_020352d8(); + } else { + this->unk_168.unk_5C.unk_08 = 0; + this->unk_168.func_020352d8(); + this->unk_168.func_020351b8(1, 0, 0, 0); + } +} + +// non-matching +ARM void MsgProc_Type1::vfunc_58(void) { + bool bVar1; + s8* puVar2; + int iVar3; + char *pcVar4; + + if (this->unk_160 != 0) { + if (data_027e103c != NULL) { + if (data_027e103c->func_ov000_020cf4bc() != 0) { + puVar2 = data_027e103c->func_ov000_020cef9c(); + + if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { + puVar2 = data_027e103c->func_ov000_020cef9c(); + + if ((MsgProc_Type1*)(puVar2 + 0x244) == this) { + data_027e103c->func_ov000_020cfb38(); + } + } + } + + if (this->unk_581 != 0 && data_027e103c->func_ov000_020cf488() != 0) { + data_027e103c->func_ov000_020cfa24(); + this->unk_581 = 0; + } + + if (this->unk_582 != 0) { + data_027e103c->func_ov000_020cfe40(0, 2); + this->unk_582 = 0; + } + + if (this->unk_583 != 0) { + data_027e103c->func_ov005_02104028(0); + this->unk_583 = 0; + } + } + + // if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.unk_04 + 0x99) != 0 && + // (data_027e077c.mUnk_0 != 0x39 || data_027e103c->func_ov000_020cf0bc())) { + // data_027e1054.func_ov003_020f4874(); + // data_027e103c->func_ov005_02103f8c(data_02057ed4); + // } + } + + this->func_02039398(); +} + +ARM bool MsgProc_Type1::func_0203b0bc(void) { + return this->unk_57F != 0 && data_027e077c.mUnk_0 == data_027e077c.mUnk_4; +} + +// non-matching +ARM unk32 MsgProc_Type1::func_0203b0ec(unk32 param_2) { + s32 iVar4; + u16 *puVar2; + u32 uVar3; + s32 unaff_r6; + bool bVar1; + + iVar4 = 0; + bVar1 = false; + + uVar3 = param_2; + + if (((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { + uVar3 = 0; + } else { + uVar3 = 1; + } + + unaff_r6 = this->unk_50 == uVar3; + + this->unk_410.func_0203ec34(); + this->unk_585 = 0; + this->unk_584 = 0; + + if (this->unk_150[3] != 0) { + iVar4 = 1; + this->unk_56C = this->unk_578; + bVar1 = true; + this->unk_15C = 0x78; + } else { + if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { + this->func_02038b40(); + + if (data_027e0d38 != 0) { + data_027e103c->func_ov000_020cf224(1); + data_027e103c->func_ov000_020cf2a0(1); + } + + if (this->unk_08 == NULL) { + this->vfunc_58(); + } + + iVar4 = 1; + } + } + + if (iVar4 != 0) { + if (bVar1) { + this->vfunc_54(); + } + + if (unaff_r6 != 0) { + data_027e0d04.func_0203fe60(0); + } + } + + if (((param_2 != 0 && iVar4 != 0) && unaff_r6 != 0) && this->unk_15E != 7) { + data_ov000_020eec9c.func_ov000_020d77e4(0x19); + } + + return iVar4; +} + +// non-matching +ARM void MsgProc_Type1::func_0203b764(void) { + s32 i = data_027e0c68.unk_00[this->unk_50]; + + this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); + + switch (this->unk_57B) { + case 1: + this->unk_158.y -= 38; + break; + case 2: + switch (this->unk_154->unk_06) { + case 2: + this->unk_158.y -= 111; + break; + case 3: + this->unk_158.y -= 98; + break; + default: + break; + } + break; + default: + break; + } +} + +ARM void MsgProc_Type1::func_0203bd8c(u16 param_2) { + this->unk_576 = param_2; + + if (this->func_0203b0ec(0) != 0) { + data_ov000_020eec9c.func_ov000_020d77e4(this->unk_564[param_2]); + } +} + +// non-matching (regalloc) +ARM unk32 MsgProc_Type1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { + u16 sVar1; + u32 uVar4; + s32 unaff_r4; + bool bVar5; + + if (this->func_0203951c() == 0) { + return 1; + } + + if (this->unk_580 != 0) { + unaff_r4 = -0xC; + } else { + unaff_r4 = 0; + } + + sVar1 = param_2->mUnk_4[0]; + + if (sVar1 != 0x1A || sVar1 == 0x1A) { + bVar5 = true; + + if (sVar1 == 0x1A) { + uVar4 = (param_2->mUnk_0[3] << 0x10) | ((u16*)param_2->mUnk_0)[2]; + + if (((uVar4 == 0x0001000A || uVar4 == 0x00020000) || uVar4 == 0x00FF0000)) { + bVar5 = false; + } + } + + if (bVar5) { + this->unk_424.func_0203ee80(this->unk_128.unk_08); + } + } + + return this->func_0203e284(param_2, param_3, param_4 + unaff_r4); +} + +// non-matching +ARM unk32 MsgProc_Type1::vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { + int iVar1; + u16* psVar3; + + psVar3 = param_3->mUnk_4; + + if (psVar3[0] == 10) { + this->unk_424.func_0203ef78(this->unk_128.unk_08, psVar3[0], param_4); + this->unk_574++; + + if (this->func_0203a30c() == 0) { + this->unk_150[3] = 1; + } + } + + if (this->unk_15E == 6) { + return 1; + } + + switch (this->unk_57A) { + case 0: + return this->func_0203905c(param_2, param_3, param_4, param_5); + case 1: + UnknownMsgChoiceStruct* pChoiceData; + s32 i = this->func_0203a30c(); + pChoiceData = &this->unk_428[this->unk_528[i]]; + return this->unk_164->func_0203cb5c(param_2, (((pChoiceData->unk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->unk_00->mUnk_0)[2]) + ~0xFFFE)); + default: + break; + } + + return 0; +} + +// non-matching +ARM void MsgProc_Type1::vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { + unk16 sVar1; + unk16 uVar2; + unk32 iVar3; + unk32 iVar4; + unk32 uVar5; + u32 uVar6; + + uVar6 = 0; + + if (this->func_02032fa4() == 0) { + switch(param_2->unk_0C) { + case 0: + case 1: + uVar6 = this->unk_580 != 0; + break; + case 2: + uVar6 = 2; + break; + case 3: + uVar6 = 3; + break; + case 5: + uVar6 = 4; + break; + case 6: + uVar6 = 5; + break; + default: + // why??? + switch (param_2->unk_0C) { + case 4: + uVar6 = 8; + break; + case 7: + uVar6 = 9; + break; + default: + if (this->unk_580 != 0) { + uVar6 = 7; + } else { + uVar6 = 6; + } + break; + } + break; + } + } + + // PTR_PTR_0203b5ac[(byte)param_1[0x50]] = (char)uVar6; + data_027e0c68.unk_28[this->unk_50]->unk_50 = uVar6; + + if (this->unk_15E == 7) { + uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); + func_02032304(data_02068894, data_02057ed8, data_02056af0, 1, param_4); + iVar3 = func_02016fcc(uVar5); + } else { + if (this->func_02032fa4() != 0) { + uVar5 = 0x33; + } else { + uVar5 = 0x32; + } + + data_027e0cbc.func_0203d77c(uVar5, 1, 1); + iVar3 = data_027e0cbc.func_0203d77c(data_02056a00[uVar6 * 0x18] - 2, 1, 1); + } + + if (param_2->unk_10 < 0) { + iVar3 = param_2->unk_12; + } + + if (param_2->unk_10 <= 0 && iVar3 > 0) { + uVar2 = param_2->unk_12; + this->unk_158.x = param_2->unk_10; + this->unk_158.y = uVar2; + } else { + this->func_0203b764(); + } +} + +// non-matching (regalloc) +ARM void MsgProc_Type1::vfunc_64(unk32 param_2) { + unk32 uVar2; + + if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { + uVar2 = 0x16; + } else { + uVar2 = 0; + } + + this->unk_124->func_0203f020(param_2, uVar2); + this->func_0203be08(); + + if (this->func_02032fa4()) { + this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); + } else { + this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); + } + + this->unk_168.func_020351b8(1, 0, 0, 0); + this->unk_1F0.func_020351b8(0, 0, 0, 0); + this->unk_278.func_020351b8(0, 0, 0, 0); + this->func_020393a8(param_2); +} + +// switch decomp issue +ARM UNK_TYPE MsgProc_Type1::vfunc_20(UNK_TYPE) { + // TODO +} + +ARM void MsgProc_Type1::vfunc_6C(unk32* param_2, unk32* param_3) { + this->func_0203947c(); + *param_2 += this->unk_56E; + *param_3 += this->unk_570; +} + +ARM void MsgProc_Type1::func_0203be08(void) { + if (data_027e0d38 != 0) { + if (data_027e103c->func_ov000_020cf42c() != 0) { + this->unk_534 = this->unk_538; + } else { + this->unk_534 = this->unk_536; + } + + if (this->func_0203c084() != 0) { + this->unk_548 = this->unk_54C; + } + } +} + +// non-matching +ARM unk32 MsgProc_Type1::func_0203c084(void) { + unk32 uVar4; + bool bVar2; + bool bVar1; + bool bVar3; + + uVar4 = 0; + + if (this->unk_50 == 0) { + bVar2 = true; + bVar1 = true; + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0 && data_027e103c->func_ov000_020cf8fc(0x8F) == 0) { + bVar1 = false; + } + + if (!bVar1 && data_027e0618[0x101] == 0) { + if ((data_027e0d38 != NULL && data_027e0d38->mUnk_14 == 1) == 0) { + bVar2 = false; + } + } + + if (bVar2) { + uVar4 = 1; + } + } + + return uVar4; +} + +ARM bool MsgProc_Type1::func_0203c13c(void) { + if (this->func_02032fa4() == 0) { + data_ov000_020eec9c.func_ov000_020d77e4(6); + data_027e103c->func_ov000_020cfb20(this); + this->unk_585 = 1; + this->unk_584 = 1; + this->unk_128.unk_18 = 0x00016000; + this->unk_128.unk_1C = NULL; + this->unk_128.unk_20 = 0; + this->unk_128.unk_24 = 0; + + return true; + } + + return false; +} + +// non-matching +ARM unk32 MsgProc_Type1::func_0203c1a0(void) { + s8* pVar1; + u8* iVar3; + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { + this->unk_584 = 1; + + pVar1 = data_027e103c->func_ov000_020cef9c(); + iVar3 = data_027e0f7c.func_ov000_0209d90c(pVar1[0x24F], 0); + data_027e1054.func_ov003_020f4760(iVar3[1], 0); + data_ov000_020eec9c.func_ov000_020d77e4(6); + data_027e103c->func_ov000_020cfb58(iVar3); + + this->unk_128.unk_18 = 0x0000A000; + this->unk_128.unk_1C = this->func_0203c25c; + this->unk_128.unk_20 = this; + this->unk_128.unk_24 = 0; + + return 0; + } + + return 0; +} + +ARM bool MsgProc_Type1::func_0203c25c(MsgProc_Type1* param_1) { + if (data_027e1054.unk_00->unk_00->unk_95 != 0) { + return false; + } + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { + param_1->unk_585 = 1; + param_1->unk_128.unk_18 = 0x00016000; + param_1->unk_128.unk_1C = NULL; + param_1->unk_128.unk_20 = 0; + param_1->unk_128.unk_24 = 0; + return true; + } + + return false; +} + +ARM MsgProc_Type1::~MsgProc_Type1() { +} + +ARM bool MsgProc_Type1::vfunc_38(void) { + return true; +} diff --git a/src/Main/Message/func_020397f8.cpp b/src/Main/Message/func_020397f8.cpp deleted file mode 100644 index 94447ba6..00000000 --- a/src/Main/Message/func_020397f8.cpp +++ /dev/null @@ -1,1217 +0,0 @@ -#include "global.h" -#include "Message/MsgProc.hpp" -#include "Message/MessageManager.hpp" -#include "Save/AdventureFlags.hpp" -#include "DTCM/UnkStruct_027e103c.hpp" -#include "Player/TouchControl.hpp" -#include "Item/ItemManager.hpp" - -extern "C" void func_ov000_020d0460(void*); -extern "C" void func_0203efd8(void*, void*); -extern "C" void func_0203ee48(void*); - -extern unk16 data_02056a0e[]; -extern u8 data_02056a08[]; - -THUMB MsgProc_Type1::MsgProc_Type1(unk32 param_2, unk16 param_3, unk32 param_4) : - MsgProc_Main(0, 0, param_4), - unk_164(NULL) -{ - UnknownMsgChoiceStruct* puVar3; - - this->unk_410.unk_00 = this; - this->unk_414 = 0; - this->unk_418 = NULL; - this->unk_41C = 0; - this->unk_41E = 0; - this->unk_420 = 0; - this->unk_424.unk_00 = this; - - // ??? - puVar3 = this->unk_428; - do { - puVar3->unk_00 = NULL; - puVar3 += 1; - } while ((unk32*)puVar3 < (unk32*)this->unk_528); - - func_0203ee48(&this->unk_424); - func_ov000_020d0460(&this->unk_534); - this->unk_53C = 0; - this->unk_540 = ~0x7FFF; - this->unk_544 = 3; - func_ov000_020d0460(&this->unk_548); - this->unk_550 = 0; - this->unk_554 = 0x00016000; - this->unk_558 = 3; - this->unk_55C = -1; - this->unk_560 = -1; - this->unk_56C = 0; - this->unk_56E = 0; - this->unk_570 = 0; - this->unk_572 = 0; - this->unk_574 = 0; - this->unk_576 = 0; - this->unk_578 = 3; - this->unk_57A = 0; - this->unk_57B = -1; - this->unk_57C = 0; - this->unk_57D = 0; - this->unk_57E = 0; - this->unk_57F = 0; - this->unk_580 = 0; - this->unk_581 = 0; - this->unk_582 = 0; - this->unk_583 = 0; - this->unk_585 = 0; - this->unk_586 = 0; - func_0203efd8(&this->unk_588, this); - this->unk_124 = (UnkSubClass1_unk_124*)&this->unk_588; - this->func_02039ca8(); - - if (this->func_02032fa4() != 0) { - this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); - } else { - this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); - } - - this->unk_168.func_020351b8(true, false, false, false); - this->unk_1F0.func_020351b8(false, false, false, false); - this->unk_278.func_020351b8(false, false, false, false); -} - -THUMB void MsgProc_Type1::func_02039a3c(void) { - this->func_02038b28(); - this->func_0203dcfc(this->unk_50, 0, 0, 2); -} - -// non-matching -ARM void MsgProc_Type1::vfunc_2C(void) { - if (data_027e0618[0x101] != 0) { - if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { - return; - } - } - - this->func_02038d20(); - - if (this->unk_56C > 0) { - this->unk_56C--; - } - - if (this->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { - this->unk_57F = 0; - } - - if (this->unk_15C > 0) { - if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { - this->unk_424.func_0203ef78(this->unk_128.unk_08); - } - - this->func_0203be64(); - this->func_0203a35c(); - - if (this->unk_580 != 0) { - this->unk_168.func_0203516c(); - } - - if (this->unk_584 != 0) { - this->unk_300.func_0203516c(); - } - - if (this->unk_585 != 0) { - this->unk_388.func_0203516c(); - } - - if ((this->func_0203a2c0() != 0 && this->unk_57F == 0) && this->unk_56C <= 0) { - this->unk_1F0.func_0203516c(); - } - - if (this->unk_08 != NULL) { - bool value = this->unk_08->unk_1C; - - if ((value == 1) || (value == 2)) { - this->unk_278.func_0203516c(); - } - } - - if (this->unk_15E == 6) { - func_ov018_02169634(this); - } else { - this->unk_410.func_0203ebf8(); - } - } - - if (this->unk_15C == 1) { - if (this->unk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) { - switch (this->unk_150[1]) { - case 0: - this->func_0203b0ec(1); - break; - case 2: - case 3: - if (this->func_0203a3e0() != 0) { - this->func_0203bd8c(this->unk_572); - } else { - this->func_0203b0ec(1); - } - break; - } - } - } -} - -ARM void MsgProc_Type1::func_02039ca8(void) { - s32 i; - - for (i = 0; i < ARRAY_LEN(this->unk_564); i++) { - this->unk_564[i] = 0x1A; - } -} - -// non-matching -ARM bool MsgProc_Type1::func_0203a2c0(void) { - if ((this->unk_150[1] != 1 && this->unk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { - return true; - } - - return false; -} - -ARM unk32 MsgProc_Type1::func_0203a30c(void) { - return this->unk_574 / this->unk_154->unk_06; -} - -ARM void MsgProc_Type1::vfunc_3C(unk32 param_2) { - if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { - if (this->unk_124->unk_29 != 3) { - if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { - return; - } - - if (data_027e0618[0x101] != 0) { - if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { - return; - } - } - - this->vfunc_40(0, 0); - } - } - -} - -// non-matching -ARM void MsgProc_Type1::vfunc_40(unk32 param_2, unk32 param_3) { - MsgProc_Main* bVar1; - s8 cVar2; - unk32 iVar4; - unk32 iVar6; - unk32 iVar7; - unk32 iVar8; - unk32 uVar9; - unk32 iStack_a8; - unk32 iStack_a4; - unk32 local_a0; - unk32 local_9c; - unk32 local_98; - unk32 local_94; - unk32 local_90; - unk32 local_8c; - unk32 iVar5; - UnkStruct_01ffbe34 aStack_88; - UnkStruct_01ffbe34 aStack_68; - UnkStruct_01ffbe34 aStack_48; - - local_8c = 0; - local_90 = 0; - bVar1 = data_027e0c68.unk_28[this->unk_50]; - - this->vfunc_6C(&local_8c, &local_90); - this->func_0203a188(local_8c + param_2, local_90 + param_3, 0); - this->func_0203e1b0(param_2 + local_8c + (this->unk_158.x - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_158.y - (this->unk_18 << 3) / 2), 0); - - if (this->unk_584 != 0) { - iVar5 = this->unk_18 << 3; - - if (this->unk_580 != 0) { - iVar5 = -0xC; - } else { - iVar5 = 0; - } - - this->unk_300.func_02034a1c(param_2 + local_8c + this->unk_55C + (this->unk_158.x - (this->unk_14 << 3) / 2), - iVar5 + param_3 + local_90 + this->unk_560 + ((this->unk_158.y - (iVar5 / 2))), 0); - } - - if (this->unk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { - switch (data_027e0618[0]) { - case 2: - if (data_027e0cbc.func_0203d7e0(3) != 0) { - this->unk_388.func_02034b0c(0xBE, 0, 0, 0, 0); - } - break; - case 6: - if (data_027e0cbc.func_0203d7e0(0x58) != 0) { - this->unk_388.func_02034b0c(0x013B, 0, 0, 0, 0); - } - break; - } - } - - iVar5 = this->func_02032fa4(); - iVar8 = bVar1->unk_18; - uVar9 = data_02056a04[iVar8]; - // func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); - iVar6 = this->unk_158.x - local_94; - iVar7 = this->unk_158.y - local_98; - - if ((this->unk_15E != 7) && (this->func_0203a2c0() != 0)) { - func_01ffbe34(&aStack_48); - func_020347b0(uVar9, data_02056a10[iVar8], &local_9c, &local_a0, 4, 4); - local_9c += param_2 + local_8c + iVar6; - local_a0 += param_3 + local_90 + iVar7; - - if (data_027e0c38[5] == 1) { - iVar8 = func_0202ab48(); - - if (iVar8 == 0) { - iVar8 = 0; - } else { - iVar8 = -3; - } - - local_9c = (0x108 - local_9c) + iVar8; - } - - if ((this->unk_57F == 0) && (this->unk_56C <= 0)) { - func_01ffbe34(&aStack_68); - aStack_68.mUnk_0a = 1; - this->unk_1F0.func_02034a1c(local_9c, local_a0, &aStack_68); - } else { - // func_02034984(iVar5 != 0 ? 0x11F : 0x18, 0, local_9c, local_a0 + 2, 0); - } - } - - if (this->unk_08 != 0) { - if ((this->unk_08->unk_1C == 1 || this->unk_08->unk_1C == 2) == 0) { - return; - } - - func_01ffbe34(&aStack_88); - aStack_88.mUnk_0a = 1; - func_02034698(iVar5 != 0 ? 0x11F : 0x18, 2, &iStack_a4, &iStack_a8); - iStack_a4 += param_2 + local_8c + iVar6; - iStack_a8 += param_3 + local_90 + iVar7; - this->unk_278.func_02034a1c(iStack_a4, iStack_a8, &aStack_88); - } -} - -ARM void MsgProc_Type1::func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4) { - unk16 sVar1; - unk16 sVar2; - unk32 iVar3; - unk32 iVar4; - unk32 uVar5; - unk32 iVar6; - unk32 iStack_54; - unk32 iStack_50; - unk32 iStack_4c; - unk32 iStack_48; - UnkStruct_01ffbe34 aStack_44; - unk32 uStack_24; - - if (this->unk_15E == 7) { - return; - } - - // (short)(ushort)*(byte *)((int)data_027e0c68.unk_28[(this->unk_50 - 0x28) * 0x18]; - - iVar6 = data_027e0c68.unk_10 + this->unk_50; - // uStack_24 = param_4; - - if (data_027e0cbc.func_0203d7e0(data_02056a00[iVar6]) != 0) { - uVar5 = data_02056a04[iVar6]; - - func_0203489c(uVar5, data_02056a16[iVar6], &iStack_48, &iStack_4c); - iVar3 = iStack_50 + (this->unk_158.x - iStack_48); - - func_02034698(uVar5, data_02056a0e[iVar6], &iStack_50, &iStack_54); - iVar4 = iStack_54 + (this->unk_158.y - iStack_4c); - - func_01ffbe34(&aStack_44); - aStack_44.mUnk_0a = 1; - - if (this->unk_580 != 0) { - this->unk_168.func_02034a1c(param_2 + iVar3, param_3 + iVar4, &aStack_44); - } else { - func_02034984(uVar5, data_02056a08[iVar6], param_2 + iVar3, param_3 + iVar4); - } - } -} - -// non-matching (regalloc) -ARM void MsgProc_Type1::vfunc_48(void) { - if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { - this->func_02038b40(); - } - - this->unk_410.func_0203ec34(); -} - -ARM void MsgProc_Type1::func_0203a35c(void) { - if ((this->unk_57C == 1 || this->unk_150[3] != 0) || (this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { - if (this->func_0203a3e0()) { - s16 unk_56E = this->unk_56E; - s16 unk_570 = this->unk_570; - MsgProc_Type1* unk_164 = this->unk_164; - - unk_164->unk_168.unk_10 = unk_56E; - unk_164->unk_168.unk_14 = unk_570; - this->unk_164->func_02039208(4); - } - } else { - this->unk_164->func_02038b40(); - } -} - -ARM bool MsgProc_Type1::func_0203a3e0(void) { - return this->unk_164->unk_168.unk_06 > 0; -} - -// non-matching -ARM void MsgProc_Type1::vfunc_44(s32 touchLastX, s32 touchLastY) { - unk32 iVar2; - unk32 iVar5; - unk32 iStack_14; - unk32 iStack_18; - - if (this->unk_15C <= 0 || this->func_0203951c() == 0) { - return; - } - - iStack_14 = 0; - iStack_18 = 0; - - this->vfunc_6C(&iStack_14, &iStack_18); - - iVar5 = touchLastX - iStack_14; - iVar2 = touchLastY - iStack_18; - - if ((data_027e103c != 0 && data_027e103c->mUnk_1c == 0x8F) || (data_027e077c.mUnk_0 != data_027e077c.mUnk_4)) { - return; - } - - if ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { - if ((data_027e0d78.mFlags & 1) != 0) { - if (this->unk_50 == 0 && data_027e0d38 != 0) { - if (func_ov000_02079e04() == 0 && data_027e0e28->func_ov000_0207bc48() == 0) { - if (data_027e0618[0x101] == 0 && data_027e103c->mUnk_24 == 0) { - return; - } - } - } - - if (this->func_0203a6d0(iVar5, iVar2) == 0 && this->func_0203a2c0() != 0) { - this->unk_57F = 1; - } - } else { - if (data_027e0d78.mTouch != 0) { - this->func_0203a6d0(iVar5, iVar2); - return; - } - - if (data_027e0d78.mTouch == 0) { - switch(this->unk_150[1]) { - case 3: - case 4: - break; - case 5: - if (data_027e103c->mUnk_20 == 3) { - this->func_0203b0ec(1); - } - break; - case 6: - if (data_027e103c->mUnk_20 == 5) { - this->func_0203b0ec(1); - } - break; - case 7: - break; - case 2: - //! TODO: fixme - // if (this->unk_164->unk_168.unk_06 <= 0) { - // if ((data_027e0d78.mFlags & 2) != 0) { - // this->unk_128.unk_14 = 0; - - // if (this->func_0203b0bc() != 0) { - // this->func_0203b0ec(1); - // } - - // this->unk_1F0.unk_5C.unk_08 = 0; - // this->unk_1F0.func_020352d8(); - // } - // } - break; - case 0: - case 1: - default: - if ((data_027e0d78.mFlags & 2) != 0) { - this->unk_128.unk_14 = 0; - - if (this->func_0203b0bc() != 0) { - this->func_0203b0ec(1); - } - - this->unk_1F0.unk_5C.unk_08 = 0; - this->unk_1F0.func_020352d8(); - } - break; - } - } - } - } -} - -ARM bool MsgProc_Type1::func_0203a6d0(unk32 param_2, unk32 param_3) { - unk32 iVar1; - unk32 uVar2; - UnkStruct_0203b264* piVar3; - - if (this->unk_164->unk_168.unk_06 > 0 && this->unk_164->unk_15C <= 0) { - return false; - } - - iVar1 = this->vfunc_34(param_3); - piVar3 = NULL; - - if (!(iVar1 < 0) && iVar1 < 4) { - piVar3 = this->unk_424.func_0203eeb0(iVar1, param_2); - } - - if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16*)piVar3->mUnk_0)[2]) == 0x00FF0002) { - uVar2 = this->func_02038cb8(iVar1); - this->unk_410.func_0203ec4c(piVar3, uVar2, - (s16)(this->unk_158.x - ((this->unk_14 << 3) / 2)) + iVar1 + this->unk_56E, - (s16)(this->unk_158.y - ((this->unk_18 << 3) / 2)) + iVar1 + this->unk_570 - ); - - this->unk_57F = 0; - return true; - } - - return false; -} - -// non-matching -ARM void MsgProc_Type1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { - bool bVar5; - bool bVar2; - int iVar4; - int iVar6; - s16 temp; - - iVar6 = param_4[0]; - - if (data_027e0c54 != 0) { - MsgProc_Type1* pVar4 = data_027e0c68.func_02036700(); - - if (pVar4 != NULL && pVar4->unk_15C > 0) { - this->func_02038b40(); - } - } - - if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { - MsgProc_Type1* pVar4 = (MsgProc_Type1*)data_027e0c68.unk_28[4]; - - if (pVar4 != NULL && pVar4->unk_15C > 0) { - this->func_02038b40(); - } - } - - this->unk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; - temp = param_4[8]; - - if (temp >= 0 && param_4[9] >= 0) { - temp = param_4[10]; - } - - if (temp < 0) { - this->unk_57B = temp; - } else { - this->unk_57B = 0; - } - - this->func_02038f44(param_2, param_3, param_4, param_5, iVar6); - this->unk_574 = 0; - - if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param_4[11])) { - data_027e103c->func_ov000_020cf284(0x80, 0); - } -} - -// non-matching (can't get the switch decomp...) -ARM void MsgProc_Type1::vfunc_54(void) { - short sVar1; - int iVar2; - u16* puVar3; - int iVar4; - u16 uVar5; - unk8 uVar6; - u16 *local_54 [17]; - - if ((this->unk_18 & 0x1FFFFFFF) != 8) { - this->func_0203e060(0xE0, 0x40); - - if (this->unk_154 == 0) { - iVar2 = 2; - } else { - iVar2 = (int)*(char *)(this->unk_154->unk_05); - } - - this->func_0203dcfc(this->unk_50, 0, (int)this->unk_11E, iVar2); - } - - this->unk_410.func_0203ebe0(); - this->unk_580 = 0; - this->func_020392b4(); - this->unk_57C = 0; - //! TODO: fixme - // this->unk_164->unk_168.unk_06 = 0; - this->unk_57D = 0; - this->unk_57F = 0; - this->unk_57A = 0; - - if (this->unk_154->unk_06 < 2) { - this->unk_580 = 1; - } - - this->unk_424.func_0203ee48(); - this->unk_150[1] = 1; - puVar3 = this->unk_128.unk_00; - local_54[0] = puVar3; - iVar2 = 0; - - for (iVar2 = 0; (iVar2 / this->unk_154->unk_06) == 0; iVar2++, puVar3 = this->func_02037604(local_54)) { - if (local_54[iVar2] != NULL) { - puVar3 = local_54[iVar2]; - } - - if (local_54[iVar2] == NULL || puVar3 == NULL) { - break; - } - - if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { - uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; - if (0x00010017 < uVar5) { - if (uVar5 == 0x00020001) { - //! TODO: fixme - // sVar1 = this->unk_164->unk_168.unk_06; - - // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; - // (param_1 + sVar1 * 2 + 0x562)[1] = 0; - } - } else { - // switch (*local_54[iVar2]) { - // case 0: - // continue; - // case 1: - // case 2: - // case 3: - // case 4: - // if (this->unk_164->unk_168.unk_06 == 0) { - // this->func_0203cabc(this->unk_164->unk_50); - // this->unk_164->unk_50 = 0x1A; // ??? - - // while (this->unk_564 < 4) { - // this->unk_564--; // ??? - // } - - // this->unk_580 = 1; - // } else { - // this->unk_150[1] = 4 - // } - // break; - // case 5: - // case 6: - // case 7: - // case 8: - // case 9: - // case 10: - // case 11: - // case 12: - // case 13: - // case 14: - // case 15: - // case 16: - // case 17: - // case 18: - // case 19: - // case 20: - // case 21: - // case 22: - // case 23: - // case 24: - // case 25: - // sVar1 = this->unk_164->unk_168.unk_06; - // break; - // default: - // return; - // } - } - } - - if (*local_54[iVar2] == '\n') { - continue; - } - } - -/* while(true) { - - // switch (*local_54[iVar2]) { - // case ESCAPE_SEQUENCE_MARKER: - // case '\n': - // } - - if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { - uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; - if (0x00010017 < uVar5) { - if (uVar5 == 0x00020001) { - sVar1 = this->unk_164->unk_168.unk_06; - // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; - // (param_1 + sVar1 * 2 + 0x562)[1] = 0; - } - } else { - /* WARNING: Could not recover jumptable at 0x0203aa7c. Too many branches */ - /* WARNING: Treating indirect jump as call - // if (-1 < (int)(uVar5 - 0x10000)) { - // (*(code *)((uVar5 - 0x10000) * 4 + 0x203aa84))(); - // return; - // } - } - } else if (*local_54[iVar2] == '\n') { - iVar2 = iVar2 + 1; - iVar4 = (iVar2 / this->unk_154->unk_06); - - if (iVar4 == 0) { - break; - } - } - } - */ - if (this->unk_15E == '\x06') { - this->func_0203e060(0xE0, 0x30); - - if (this->unk_154 == 0) { - iVar2 = 2; - } else { - iVar2 = this->unk_154->unk_05; - } - - this->func_0203dcfc(this->unk_50,0,(int)this->unk_11E,iVar2); - } - - if (this->unk_580 != 0) { - this->func_0203e060(0xE0, 0x28); - - if (this->unk_154 == 0) { - iVar2 = 2; - } else { - iVar2 = this->unk_154->unk_05; - } - - this->func_0203dcfc(this->unk_50, 0, this->unk_11E, iVar2); - - if (this->unk_50 == 0) { - uVar6 = 1; - } else { - uVar6 = 7; - } - - // *(undefined *)((int)PTR_PTR_0203aea4->unk_28 + ((byte)param_1[0x50] - 0x28)) = uVar6; - // PTR_PTR_0203aea4[this->unk_50] = uVar6; - data_027e0c68.unk_28[this->unk_50]->unk_18 = uVar6; - this->func_0203b764(); - - if (this->unk_15F == 0 || this->unk_154->unk_06 < 3) { - this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; - this->unk_168.func_020352d8(); - } else { - this->unk_168.func_020351b8(1, 0, 0, 0); - } - } - - this->unk_1F0.unk_5C.unk_08 = 0; - this->unk_1F0.func_020352d8(); - this->vfunc_0C(0, 0, 0, 0); - // (**(code **)(*(int *)param_1 + 0x10))(0); -} - -ARM void MsgProc_Type1::vfunc_5C(void) { - if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { - this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; - this->unk_168.func_020352d8(); - } else { - this->unk_168.unk_5C.unk_08 = 0; - this->unk_168.func_020352d8(); - this->unk_168.func_020351b8(1, 0, 0, 0); - } -} - -// non-matching -ARM void MsgProc_Type1::vfunc_58(void) { - bool bVar1; - s8* puVar2; - int iVar3; - char *pcVar4; - - if (this->unk_160 != 0) { - if (data_027e103c != NULL) { - if (data_027e103c->func_ov000_020cf4bc() != 0) { - puVar2 = data_027e103c->func_ov000_020cef9c(); - - if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { - puVar2 = data_027e103c->func_ov000_020cef9c(); - - if ((MsgProc_Type1*)(puVar2 + 0x244) == this) { - data_027e103c->func_ov000_020cfb38(); - } - } - } - - if (this->unk_581 != 0 && data_027e103c->func_ov000_020cf488() != 0) { - data_027e103c->func_ov000_020cfa24(); - this->unk_581 = 0; - } - - if (this->unk_582 != 0) { - data_027e103c->func_ov000_020cfe40(0, 2); - this->unk_582 = 0; - } - - if (this->unk_583 != 0) { - data_027e103c->func_ov005_02104028(0); - this->unk_583 = 0; - } - } - - // if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.unk_04 + 0x99) != 0 && - // (data_027e077c.mUnk_0 != 0x39 || data_027e103c->func_ov000_020cf0bc())) { - // data_027e1054.func_ov003_020f4874(); - // data_027e103c->func_ov005_02103f8c(data_02057ed4); - // } - } - - this->func_02039398(); -} - -ARM bool MsgProc_Type1::func_0203b0bc(void) { - return this->unk_57F != 0 && data_027e077c.mUnk_0 == data_027e077c.mUnk_4; -} - -// non-matching -ARM unk32 MsgProc_Type1::func_0203b0ec(unk32 param_2) { - s32 iVar4; - u16 *puVar2; - u32 uVar3; - s32 unaff_r6; - bool bVar1; - - iVar4 = 0; - bVar1 = false; - - uVar3 = param_2; - - if (((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { - uVar3 = 0; - } else { - uVar3 = 1; - } - - unaff_r6 = this->unk_50 == uVar3; - - this->unk_410.func_0203ec34(); - this->unk_585 = 0; - this->unk_584 = 0; - - if (this->unk_150[3] != 0) { - iVar4 = 1; - this->unk_56C = this->unk_578; - bVar1 = true; - this->unk_15C = 0x78; - } else { - if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { - this->func_02038b40(); - - if (data_027e0d38 != 0) { - data_027e103c->func_ov000_020cf224(1); - data_027e103c->func_ov000_020cf2a0(1); - } - - if (this->unk_08 == NULL) { - this->vfunc_58(); - } - - iVar4 = 1; - } - } - - if (iVar4 != 0) { - if (bVar1) { - this->vfunc_54(); - } - - if (unaff_r6 != 0) { - data_027e0d04.func_0203fe60(0); - } - } - - if (((param_2 != 0 && iVar4 != 0) && unaff_r6 != 0) && this->unk_15E != 7) { - data_ov000_020eec9c.func_ov000_020d77e4(0x19); - } - - return iVar4; -} - -// non-matching -ARM void MsgProc_Type1::func_0203b764(void) { - s32 i = data_027e0c68.unk_00[this->unk_50]; - - this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); - - switch (this->unk_57B) { - case 1: - this->unk_158.y -= 38; - break; - case 2: - switch (this->unk_154->unk_06) { - case 2: - this->unk_158.y -= 111; - break; - case 3: - this->unk_158.y -= 98; - break; - default: - break; - } - break; - default: - break; - } -} - -ARM void MsgProc_Type1::func_0203bd8c(u16 param_2) { - this->unk_576 = param_2; - - if (this->func_0203b0ec(0) != 0) { - data_ov000_020eec9c.func_ov000_020d77e4(this->unk_564[param_2]); - } -} - -// non-matching (regalloc) -ARM unk32 MsgProc_Type1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { - u16 sVar1; - u32 uVar4; - s32 unaff_r4; - bool bVar5; - - if (this->func_0203951c() == 0) { - return 1; - } - - if (this->unk_580 != 0) { - unaff_r4 = -0xC; - } else { - unaff_r4 = 0; - } - - sVar1 = param_2->mUnk_4[0]; - - if (sVar1 != 0x1A || sVar1 == 0x1A) { - bVar5 = true; - - if (sVar1 == 0x1A) { - uVar4 = (param_2->mUnk_0[3] << 0x10) | ((u16*)param_2->mUnk_0)[2]; - - if (((uVar4 == 0x0001000A || uVar4 == 0x00020000) || uVar4 == 0x00FF0000)) { - bVar5 = false; - } - } - - if (bVar5) { - this->unk_424.func_0203ee80(this->unk_128.unk_08); - } - } - - return this->func_0203e284(param_2, param_3, param_4 + unaff_r4); -} - -// non-matching -ARM unk32 MsgProc_Type1::vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { - int iVar1; - u16* psVar3; - - psVar3 = param_3->mUnk_4; - - if (psVar3[0] == 10) { - this->unk_424.func_0203ef78(this->unk_128.unk_08, psVar3[0], param_4); - this->unk_574++; - - if (this->func_0203a30c() == 0) { - this->unk_150[3] = 1; - } - } - - if (this->unk_15E == 6) { - return 1; - } - - switch (this->unk_57A) { - case 0: - return this->func_0203905c(param_2, param_3, param_4, param_5); - case 1: - UnknownMsgChoiceStruct* pChoiceData; - s32 i = this->func_0203a30c(); - pChoiceData = &this->unk_428[this->unk_528[i]]; - return this->unk_164->func_0203cb5c(param_2, (((pChoiceData->unk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->unk_00->mUnk_0)[2]) + ~0xFFFE)); - default: - break; - } - - return 0; -} - -// non-matching -ARM void MsgProc_Type1::vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { - unk16 sVar1; - unk16 uVar2; - unk32 iVar3; - unk32 iVar4; - unk32 uVar5; - u32 uVar6; - - uVar6 = 0; - - if (this->func_02032fa4() == 0) { - switch(param_2->unk_0C) { - case 0: - case 1: - uVar6 = this->unk_580 != 0; - break; - case 2: - uVar6 = 2; - break; - case 3: - uVar6 = 3; - break; - case 5: - uVar6 = 4; - break; - case 6: - uVar6 = 5; - break; - default: - // why??? - switch (param_2->unk_0C) { - case 4: - uVar6 = 8; - break; - case 7: - uVar6 = 9; - break; - default: - if (this->unk_580 != 0) { - uVar6 = 7; - } else { - uVar6 = 6; - } - break; - } - break; - } - } - - // PTR_PTR_0203b5ac[(byte)param_1[0x50]] = (char)uVar6; - data_027e0c68.unk_28[this->unk_50]->unk_50 = uVar6; - - if (this->unk_15E == 7) { - uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); - func_02032304(data_02068894, data_02057ed8, data_02056af0, 1, param_4); - iVar3 = func_02016fcc(uVar5); - } else { - if (this->func_02032fa4() != 0) { - uVar5 = 0x33; - } else { - uVar5 = 0x32; - } - - data_027e0cbc.func_0203d77c(uVar5, 1, 1); - iVar3 = data_027e0cbc.func_0203d77c(data_02056a00[uVar6 * 0x18] - 2, 1, 1); - } - - if (param_2->unk_10 < 0) { - iVar3 = param_2->unk_12; - } - - if (param_2->unk_10 <= 0 && iVar3 > 0) { - uVar2 = param_2->unk_12; - this->unk_158.x = param_2->unk_10; - this->unk_158.y = uVar2; - } else { - this->func_0203b764(); - } -} - -// non-matching (regalloc) -ARM void MsgProc_Type1::vfunc_64(unk32 param_2) { - unk32 uVar2; - - if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { - uVar2 = 0x16; - } else { - uVar2 = 0; - } - - this->unk_124->func_0203f020(param_2, uVar2); - this->func_0203be08(); - - if (this->func_02032fa4()) { - this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); - } else { - this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); - } - - this->unk_168.func_020351b8(1, 0, 0, 0); - this->unk_1F0.func_020351b8(0, 0, 0, 0); - this->unk_278.func_020351b8(0, 0, 0, 0); - this->func_020393a8(param_2); -} - -// switch decomp issue -ARM UNK_TYPE MsgProc_Type1::vfunc_20(UNK_TYPE) { - // TODO -} - -ARM void MsgProc_Type1::vfunc_6C(unk32* param_2, unk32* param_3) { - this->func_0203947c(); - *param_2 += this->unk_56E; - *param_3 += this->unk_570; -} - -ARM void MsgProc_Type1::func_0203be08(void) { - if (data_027e0d38 != 0) { - if (data_027e103c->func_ov000_020cf42c() != 0) { - this->unk_534 = this->unk_538; - } else { - this->unk_534 = this->unk_536; - } - - if (this->func_0203c084() != 0) { - this->unk_548 = this->unk_54C; - } - } -} - -// non-matching -ARM unk32 MsgProc_Type1::func_0203c084(void) { - unk32 uVar4; - bool bVar2; - bool bVar1; - bool bVar3; - - uVar4 = 0; - - if (this->unk_50 == 0) { - bVar2 = true; - bVar1 = true; - - if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0 && data_027e103c->func_ov000_020cf8fc(0x8F) == 0) { - bVar1 = false; - } - - if (!bVar1 && data_027e0618[0x101] == 0) { - if ((data_027e0d38 != NULL && data_027e0d38->mUnk_14 == 1) == 0) { - bVar2 = false; - } - } - - if (bVar2) { - uVar4 = 1; - } - } - - return uVar4; -} - -ARM bool MsgProc_Type1::func_0203c13c(void) { - if (this->func_02032fa4() == 0) { - data_ov000_020eec9c.func_ov000_020d77e4(6); - data_027e103c->func_ov000_020cfb20(this); - this->unk_585 = 1; - this->unk_584 = 1; - this->unk_128.unk_18 = 0x00016000; - this->unk_128.unk_1C = NULL; - this->unk_128.unk_20 = 0; - this->unk_128.unk_24 = 0; - - return true; - } - - return false; -} - -// non-matching -ARM unk32 MsgProc_Type1::func_0203c1a0(void) { - s8* pVar1; - u8* iVar3; - - if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { - this->unk_584 = 1; - - pVar1 = data_027e103c->func_ov000_020cef9c(); - iVar3 = data_027e0f7c.func_ov000_0209d90c(pVar1[0x24F], 0); - data_027e1054.func_ov003_020f4760(iVar3[1], 0); - data_ov000_020eec9c.func_ov000_020d77e4(6); - data_027e103c->func_ov000_020cfb58(iVar3); - - this->unk_128.unk_18 = 0x0000A000; - this->unk_128.unk_1C = this->func_0203c25c; - this->unk_128.unk_20 = this; - this->unk_128.unk_24 = 0; - - return 0; - } - - return 0; -} - -ARM bool MsgProc_Type1::func_0203c25c(MsgProc_Type1* param_1) { - if (data_027e1054.unk_00->unk_00->unk_95 != 0) { - return false; - } - - if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { - param_1->unk_585 = 1; - param_1->unk_128.unk_18 = 0x00016000; - param_1->unk_128.unk_1C = NULL; - param_1->unk_128.unk_20 = 0; - param_1->unk_128.unk_24 = 0; - return true; - } - - return false; -} - -ARM MsgProc_Type1::~MsgProc_Type1() { -} - -ARM bool MsgProc_Type1::vfunc_38(void) { - return true; -} From a0c3bf4da29d19995fc73f6eeb7cc7be9c2eec7d Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Thu, 30 Jan 2025 18:59:33 +0100 Subject: [PATCH 43/64] fixed function order --- src/Main/Message/func_02038aa0.cpp | 96 +++++++++++++++--------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/src/Main/Message/func_02038aa0.cpp b/src/Main/Message/func_02038aa0.cpp index cbdd8349..1c20dcf4 100644 --- a/src/Main/Message/func_02038aa0.cpp +++ b/src/Main/Message/func_02038aa0.cpp @@ -259,19 +259,6 @@ ARM void MsgProc_Type1::func_02039ca8(void) { } } -// non-matching -ARM bool MsgProc_Type1::func_0203a2c0(void) { - if ((this->unk_150[1] != 1 && this->unk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { - return true; - } - - return false; -} - -ARM unk32 MsgProc_Type1::func_0203a30c(void) { - return this->unk_574 / this->unk_154->unk_06; -} - ARM void MsgProc_Type1::vfunc_3C(unk32 param_2) { if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { if (this->unk_124->unk_29 != 3) { @@ -440,6 +427,19 @@ ARM void MsgProc_Type1::func_0203a188(unk32 param_2, unk32 param_3, unk32 param_ } } +// non-matching +ARM bool MsgProc_Type1::func_0203a2c0(void) { + if ((this->unk_150[1] != 1 && this->unk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { + return true; + } + + return false; +} + +ARM unk32 MsgProc_Type1::func_0203a30c(void) { + return this->unk_574 / this->unk_154->unk_06; +} + // non-matching (regalloc) ARM void MsgProc_Type1::vfunc_48(void) { if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { @@ -963,41 +963,6 @@ ARM unk32 MsgProc_Type1::func_0203b0ec(unk32 param_2) { return iVar4; } -// non-matching -ARM void MsgProc_Type1::func_0203b764(void) { - s32 i = data_027e0c68.unk_00[this->unk_50]; - - this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); - - switch (this->unk_57B) { - case 1: - this->unk_158.y -= 38; - break; - case 2: - switch (this->unk_154->unk_06) { - case 2: - this->unk_158.y -= 111; - break; - case 3: - this->unk_158.y -= 98; - break; - default: - break; - } - break; - default: - break; - } -} - -ARM void MsgProc_Type1::func_0203bd8c(u16 param_2) { - this->unk_576 = param_2; - - if (this->func_0203b0ec(0) != 0) { - data_ov000_020eec9c.func_ov000_020d77e4(this->unk_564[param_2]); - } -} - // non-matching (regalloc) ARM unk32 MsgProc_Type1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { u16 sVar1; @@ -1181,11 +1146,46 @@ ARM void MsgProc_Type1::vfunc_64(unk32 param_2) { this->func_020393a8(param_2); } +// non-matching +ARM void MsgProc_Type1::func_0203b764(void) { + s32 i = data_027e0c68.unk_00[this->unk_50]; + + this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); + + switch (this->unk_57B) { + case 1: + this->unk_158.y -= 38; + break; + case 2: + switch (this->unk_154->unk_06) { + case 2: + this->unk_158.y -= 111; + break; + case 3: + this->unk_158.y -= 98; + break; + default: + break; + } + break; + default: + break; + } +} + // switch decomp issue ARM UNK_TYPE MsgProc_Type1::vfunc_20(UNK_TYPE) { // TODO } +ARM void MsgProc_Type1::func_0203bd8c(u16 param_2) { + this->unk_576 = param_2; + + if (this->func_0203b0ec(0) != 0) { + data_ov000_020eec9c.func_ov000_020d77e4(this->unk_564[param_2]); + } +} + ARM void MsgProc_Type1::vfunc_6C(unk32* param_2, unk32* param_3) { this->func_0203947c(); *param_2 += this->unk_56E; From 808b6f311c65903c5efbb80e8dd6eec8881099bc Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 31 Jan 2025 02:01:55 +0100 Subject: [PATCH 44/64] more progress --- config/eur/arm9/symbols.txt | 32 ++--- config/usa/arm9/symbols.txt | 32 ++--- include/DTCM/UnkStruct_027e103c.hpp | 1 + include/Message/BMG.hpp | 5 +- include/Message/MsgProc.hpp | 103 +++++++++------- src/Main/Message/func_02038aa0.cpp | 174 +++++++++++++++++++++++----- src/Main/Message/func_0203c8a8.cpp | 10 +- 7 files changed, 251 insertions(+), 106 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 3fac0e60..1d18c408 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1876,38 +1876,38 @@ _ZN12MsgProc_MainC2Eisi kind:function(thumb,size=0x5c) addr:0x2038aa0 _ZN12MsgProc_MainD1Ev kind:function(thumb,size=0xc) addr:0x2038afc _ZN12MsgProc_MainD0Ev kind:function(thumb,size=0x14) addr:0x2038b08 _ZN12MsgProc_MainD2Ev kind:function(thumb,size=0xc) addr:0x2038b1c -func_02038b28 kind:function(thumb,size=0xc) addr:0x2038b28 -func_02038b34 kind:function(arm,size=0xc) addr:0x2038b34 +_ZN12MsgProc_Main13func_02038b28Ev kind:function(thumb,size=0xc) addr:0x2038b28 +_ZN12MsgProc_Main13func_02038b34Ehh kind:function(arm,size=0xc) addr:0x2038b34 _ZN12MsgProc_Main13func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038b40 -func_02038b74 kind:function(arm,size=0x4) addr:0x2038b74 -func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b78 -_ZN13MsgProc_Type18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038c34 -func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038cb8 -func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cf4 -func_02038d10 kind:function(arm,size=0x10) addr:0x2038d10 +_ZN12MsgProc_Main13func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b74 +_ZN12MsgProc_Main13func_02038b78Ev kind:function(arm,size=0xbc) addr:0x2038b78 +_ZN12MsgProc_Main8vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038c34 +_ZN12MsgProc_Main13func_02038cb8Ei kind:function(arm,size=0x3c) addr:0x2038cb8 +_ZN12MsgProc_Main13func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x2038cf4 +_ZN12MsgProc_Main13func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038d10 func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038d20 -_ZN13MsgProc_Type18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038ed0 -func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038ef4 -func_02038f40 kind:function(arm,size=0x4) addr:0x2038f40 +_ZN12MsgProc_Main8vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038ed0 +_ZN12MsgProc_Main13func_02038ef4Eii kind:function(arm,size=0x4c) addr:0x2038ef4 +_ZN12MsgProc_Main13func_02038f40Ev kind:function(arm,size=0x4) addr:0x2038f40 func_02038f44 kind:function(arm,size=0x114) addr:0x2038f44 func_02039058 kind:function(arm,size=0x4) addr:0x2039058 func_0203905c kind:function(arm,size=0x48) addr:0x203905c func_020390a4 kind:function(arm,size=0x164) addr:0x20390a4 func_02039208 kind:function(arm,size=0x20) addr:0x2039208 -_ZN13MsgProc_Type18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 +_ZN12MsgProc_Main8vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x2039228 func_02039250 kind:function(arm,size=0x64) addr:0x2039250 func_020392b4 kind:function(arm,size=0xe4) addr:0x20392b4 func_02039398 kind:function(arm,size=0xc) addr:0x2039398 func_020393a4 kind:function(arm,size=0x4) addr:0x20393a4 func_020393a8 kind:function(arm,size=0x28) addr:0x20393a8 -_ZN13MsgProc_Type18vfunc_68Ei kind:function(arm,size=0x70) addr:0x20393d0 +_ZN12MsgProc_Main8vfunc_68Ei kind:function(arm,size=0x70) addr:0x20393d0 func_02039440 kind:function(arm,size=0x3c) addr:0x2039440 func_0203947c kind:function(arm,size=0x5c) addr:0x203947c -_ZN13MsgProc_Type18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 +_ZN12MsgProc_Main8vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 func_0203951c kind:function(arm,size=0x40) addr:0x203951c func_0203955c kind:function(arm,size=0x14) addr:0x203955c func_02039570 kind:function(arm,size=0x8) addr:0x2039570 -_ZN13MsgProc_Type18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039578 +_ZN12MsgProc_Main8vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039578 _ZN13MsgProc_Type1C2Eisi kind:function(thumb,size=0x244) addr:0x20395b4 _ZN13MsgProc_Type1C1Eisi kind:function(thumb,size=0x244) addr:0x20397f8 _ZN13MsgProc_Type113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x2039a3c @@ -2037,7 +2037,7 @@ func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddfc _ZN12MsgProc_Main13func_0203de14Ei kind:function(arm,size=0x10) addr:0x203de14 func_0203de24 kind:function(arm,size=0x34) addr:0x203de24 func_0203de58 kind:function(arm,size=0x208) addr:0x203de58 -_ZN13MsgProc_Type113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e060 +_ZN13MsgProc_Type113func_0203e060EP12MsgProc_Mainhh kind:function(arm,size=0x30) addr:0x203e060 func_0203e090 kind:function(arm,size=0x38) addr:0x203e090 _ZN13MsgProc_Type18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e0c8 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0f8 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index ee62a4e1..a2bf8178 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1876,38 +1876,38 @@ _ZN12MsgProc_MainC2Eisi kind:function(thumb,size=0x5c) addr:0x2038a5c _ZN12MsgProc_MainD1Ev kind:function(thumb,size=0xc) addr:0x2038ab8 _ZN12MsgProc_MainD0Ev kind:function(thumb,size=0x14) addr:0x2038ac4 _ZN12MsgProc_MainD2Ev kind:function(thumb,size=0xc) addr:0x2038ad8 -func_02038b28 kind:function(thumb,size=0xc) addr:0x2038ae4 -func_02038b34 kind:function(arm,size=0xc) addr:0x2038af0 +_ZN12MsgProc_Main13func_02038b28Ev kind:function(thumb,size=0xc) addr:0x2038ae4 +_ZN12MsgProc_Main13func_02038b34Ehh kind:function(arm,size=0xc) addr:0x2038af0 _ZN12MsgProc_Main13func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038afc -func_02038b74 kind:function(arm,size=0x4) addr:0x2038b30 -func_02038b78 kind:function(arm,size=0xbc) addr:0x2038b34 -_ZN13MsgProc_Type18vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0 -func_02038cb8 kind:function(arm,size=0x3c) addr:0x2038c74 -func_02038cf4 kind:function(arm,size=0x1c) addr:0x2038cb0 -func_02038d10 kind:function(arm,size=0x10) addr:0x2038ccc +_ZN12MsgProc_Main13func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b30 +_ZN12MsgProc_Main13func_02038b78Ev kind:function(arm,size=0xbc) addr:0x2038b34 +_ZN12MsgProc_Main8vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0 +_ZN12MsgProc_Main13func_02038cb8Ei kind:function(arm,size=0x3c) addr:0x2038c74 +_ZN12MsgProc_Main13func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x2038cb0 +_ZN12MsgProc_Main13func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038ccc func_02038d20 kind:function(arm,size=0x1b0) addr:0x2038cdc -_ZN13MsgProc_Type18vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038e8c -func_02038ef4 kind:function(arm,size=0x4c) addr:0x2038eb0 -func_02038f40 kind:function(arm,size=0x4) addr:0x2038efc +_ZN12MsgProc_Main8vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038e8c +_ZN12MsgProc_Main13func_02038ef4Eii kind:function(arm,size=0x4c) addr:0x2038eb0 +_ZN12MsgProc_Main13func_02038f40Ev kind:function(arm,size=0x4) addr:0x2038efc func_02038f44 kind:function(arm,size=0x114) addr:0x2038f00 func_02039058 kind:function(arm,size=0x4) addr:0x2039014 func_0203905c kind:function(arm,size=0x48) addr:0x2039018 func_020390a4 kind:function(arm,size=0x164) addr:0x2039060 func_02039208 kind:function(arm,size=0x20) addr:0x20391c4 -_ZN13MsgProc_Type18vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 +_ZN12MsgProc_Main8vfunc_08EPiS0_ kind:function(arm,size=0x28) addr:0x20391e4 func_02039250 kind:function(arm,size=0x64) addr:0x203920c func_020392b4 kind:function(arm,size=0xe4) addr:0x2039270 func_02039398 kind:function(arm,size=0xc) addr:0x2039354 func_020393a4 kind:function(arm,size=0x4) addr:0x2039360 func_020393a8 kind:function(arm,size=0x28) addr:0x2039364 -_ZN13MsgProc_Type18vfunc_68Ei kind:function(arm,size=0x70) addr:0x203938c +_ZN12MsgProc_Main8vfunc_68Ei kind:function(arm,size=0x70) addr:0x203938c func_02039440 kind:function(arm,size=0x3c) addr:0x20393fc func_0203947c kind:function(arm,size=0x5c) addr:0x2039438 -_ZN13MsgProc_Type18vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 +_ZN12MsgProc_Main8vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x2039494 func_0203951c kind:function(arm,size=0x40) addr:0x20394d8 func_0203955c kind:function(arm,size=0x14) addr:0x2039518 func_02039570 kind:function(arm,size=0x8) addr:0x203952c -_ZN13MsgProc_Type18vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039534 +_ZN12MsgProc_Main8vfunc_0CEhhhi kind:function(arm,size=0x3c) addr:0x2039534 _ZN13MsgProc_Type1C2Eisi kind:function(thumb,size=0x244) addr:0x2039570 _ZN13MsgProc_Type1C1Eisi kind:function(thumb,size=0x244) addr:0x20397b4 _ZN13MsgProc_Type113func_02039a3cEv kind:function(thumb,size=0x20) addr:0x20399f8 @@ -2037,7 +2037,7 @@ func_0203ddfc kind:function(arm,size=0x18) addr:0x203ddb8 _ZN12MsgProc_Main13func_0203de14Ei kind:function(arm,size=0x10) addr:0x203ddd0 func_0203de24 kind:function(arm,size=0x34) addr:0x203dde0 func_0203de58 kind:function(arm,size=0x208) addr:0x203de14 -_ZN13MsgProc_Type113func_0203e060Ehh kind:function(arm,size=0x30) addr:0x203e01c +_ZN13MsgProc_Type113func_0203e060EP12MsgProc_Mainhh kind:function(arm,size=0x30) addr:0x203e01c func_0203e090 kind:function(arm,size=0x38) addr:0x203e04c _ZN13MsgProc_Type18vfunc_28Ev kind:function(arm,size=0x30) addr:0x203e084 func_0203e0f8 kind:function(arm,size=0xa4) addr:0x203e0b4 diff --git a/include/DTCM/UnkStruct_027e103c.hpp b/include/DTCM/UnkStruct_027e103c.hpp index 5a8199ed..b1f5792f 100644 --- a/include/DTCM/UnkStruct_027e103c.hpp +++ b/include/DTCM/UnkStruct_027e103c.hpp @@ -35,6 +35,7 @@ struct UnkStruct_027e103c { void func_ov005_02104028(unk32); void func_ov000_020cfb58(u8*); unk32 func_ov000_020cf8fc(unk32); + void func_ov000_020cfc9c(unk32, unk32); //! TODO: find out if the type is always `MsgProc_Type1*` void func_ov000_020cfb20(void*); diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index 9a163559..ca855f52 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -80,7 +80,10 @@ typedef struct BMGHeader { typedef struct EntryINF1 { /* 0x00 */ u32 offset; // relative to the end of the DAT1 header - /* 0x04 */ u32 unk_04; // flags/attributes? + /* 0x04 */ u8 unk_04; // flags/attributes? (+0x04 to +0x06) + /* 0x05 */ u8 unk_05; + /* 0x06 */ u8 unk_06; + /* 0x07 */ u8 unk_07; } EntryINF1; // size = 0x8 typedef struct SectionINF1 { diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp index 3a442151..6636e984 100644 --- a/include/Message/MsgProc.hpp +++ b/include/Message/MsgProc.hpp @@ -9,6 +9,7 @@ #define UNK_TYPE void #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; @@ -25,16 +26,6 @@ typedef struct UnkStruct_0203b264 { /* 8 */ } UnkStruct_0203b264; -typedef struct UnkSubClass1_unk_154 { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u8 unk_04; - u8 unk_05; - u8 unk_06; -} UnkSubClass1_unk_154; - typedef u32 (*UnkCallback1)(void); // astruct_11 @@ -133,6 +124,8 @@ public: UnkSubClass1_UnkownClass2(); /* 0x00 */ virtual ~UnkSubClass1_UnkownClass2() override; /* 0x08 */ + + void func_02038858(unk32); }; class UnkSubClass1_unk_410 { @@ -177,7 +170,7 @@ public: /* 0x2B */ unk8 unk_2B; /* 0x2C */ - void func_0203f020(unk32, unk32); + void func_0203f020(s16*, unk32); }; class UnkSubClass1_02256FF8 { @@ -210,6 +203,17 @@ public: /* 0x3C */ }; +struct UnkStruct_MsgProc_Base_unk_2C_2 { + /* 0x00 */ unk32 unk_00; + /* 0x04 */ unk32 unk_04; + /* 0x00 */ u8* unk_08; + /* 0x04 */ +}; +struct UnkStruct_MsgProc_Base_unk_2C { + /* 0x08 */ UnkStruct_MsgProc_Base_unk_2C_2* unk_00; + /* 0x0C */ +}; + // astruct_8? class MsgProc_Base : public SysObject { public: @@ -224,7 +228,7 @@ public: /* 0x020 */ unk32 unk_20; /* 0x024 */ unk32* unk_24; /* 0x028 */ unk32* unk_28; - /* 0x02C */ u32* unk_2C; + /* 0x02C */ UnkStruct_MsgProc_Base_unk_2C* unk_2C; /* 0x030 */ unk32 unk_30; /* 0x034 */ unk32 unk_34; /* 0x038 */ unk32 unk_38; @@ -250,7 +254,7 @@ public: /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3); // func_0203e060? /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3); /* 0x18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4); - /* 0x1C */ virtual unk32 vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); + /* 0x1C */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); /* 0x20 */ virtual UNK_TYPE vfunc_20(UNK_TYPE); /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE); /* 0x28 */ virtual bool vfunc_28(void); @@ -263,18 +267,20 @@ public: /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); /* 0x48 */ virtual void vfunc_48(void); /* 0x4C */ virtual void vfunc_4C(void); // func_02039a3c? - /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5); + /* 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(unk32 param_2); + /* 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_02032fa4(void); + unk32 func_02033360(void); + unk32 func_020337d8(unk32 param_2); }; class MsgProc_Base2_unk_114 : public SysObject { @@ -368,7 +374,7 @@ public: /* 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(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) 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; @@ -381,25 +387,38 @@ public: /* 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, unk32 param_5) override; + /* 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(unk32 param_2) 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; + u8 unk_02; + u8 unk_03; + unk32 unk_04; + unk32 unk_08; + unk32 unk_0C; + unk32 unk_10; + unk8 unk_14; + u8 unk_15; +}; + // astruct_6 class MsgProc_Main : public MsgProc_Base2 { public: /* 0x124 */ UnkSubClass1_unk_124* unk_124; /* 0x128 */ UnkSubClass1_UnkownClass2 unk_128; /* 0x150 */ u8 unk_150[4]; - /* 0x154 */ UnkSubClass1_unk_154* unk_154; + /* 0x154 */ EntryINF1* pInfoEntry; /* 0x158 */ Vec2s unk_158; // textbox position? /* 0x15C */ s16 unk_15C; /* 0x15E */ s8 unk_15E; @@ -417,7 +436,7 @@ public: /* 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(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) 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; @@ -430,12 +449,12 @@ public: /* 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, unk32 param_5) override; + /* 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(unk32 param_2) 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; @@ -444,18 +463,26 @@ public: static void func_020387e0(u8* param_2); unk32 func_02032fb4(void); - unk32 func_020337d8(unk32 param_2); 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_02038f44(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5, unk32 param_6); - unk32 func_0203905c(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); void func_020392b4(void); void func_02039398(void); - void func_020393a8(unk32 param_2); + void func_020393a8(s16* param_2); void func_0203a188(unk32, unk32); unk32 func_0203a3e0(void); unk32 func_0203cb5c(unk8, s16); @@ -480,7 +507,6 @@ public: void func_0203e2ac(unk32* param_2); void func_0203fc78(unk32*, unk32*); s16 func_0203d318(s16, s16); - void func_02038ef4(unk32, unk32); }; // does it host both choices? @@ -566,7 +592,7 @@ public: /* 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(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) 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; @@ -579,23 +605,22 @@ public: /* 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, unk32 param_5) override; + /* 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(unk32 param_2) 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 bool func_0203c25c(class MsgProc_Type1* param_1); + static void func_0203e060(MsgProc_Main* param_1, u8 param_2, u8 param_3); - void func_0203e060(u8 param_2, u8 param_3); void func_02039a3c(void); - unk32 func_02038b78(void); unk32 func_02039250(void); void func_02039ca8(void); void func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4); @@ -613,8 +638,6 @@ public: unk32 func_0203c084(void); bool func_0203c13c(void); unk32 func_0203c1a0(void); - - unk32 func_02038cb8(unk32 param_2); }; class MsgProc_Type3 : public MsgProc_Main { @@ -642,7 +665,7 @@ public: /* 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(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) 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; @@ -655,12 +678,12 @@ public: /* 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, unk32 param_5) override; + /* 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(unk32 param_2) 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; @@ -688,7 +711,7 @@ public: /* 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(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) 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; @@ -701,12 +724,12 @@ public: /* 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, unk32 param_5) override; + /* 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(unk32 param_2) 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; diff --git a/src/Main/Message/func_02038aa0.cpp b/src/Main/Message/func_02038aa0.cpp index 1c20dcf4..e8144220 100644 --- a/src/Main/Message/func_02038aa0.cpp +++ b/src/Main/Message/func_02038aa0.cpp @@ -18,7 +18,7 @@ THUMB MsgProc_Main::MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4) unk_124(0) { this->func_020387e0(this->unk_150); - this->unk_154 = 0; + this->pInfoEntry = 0; this->unk_158.y = 0; this->unk_15C = 0; this->unk_15E = 0xFF; @@ -30,7 +30,44 @@ THUMB MsgProc_Main::MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4) THUMB MsgProc_Main::~MsgProc_Main() { } -ARM unk32 MsgProc_Type1::vfunc_34(unk32 param_2) { +THUMB void MsgProc_Main::func_02038b28(void) { + this->unk_114->unk_04 = NULL; +} + +ARM void MsgProc_Main::func_02038b34(u8 param_2, u8 param_3) { + MsgProc_Type1::func_0203e060(this, param_2, param_3); +} + +ARM void MsgProc_Main::func_02038b40(void) { + this->unk_15C = -1; + this->unk_128.unk_00 = NULL; + this->func_0203dc10(0); + this->vfunc_48(); +} + +ARM void MsgProc_Main::func_02038b74(void) { +} + +// non-matching +ARM bool MsgProc_Main::func_02038b78(void) { + if (data_027e0c54 == 0) { + if ((this->unk_50 != 0 && data_027e0c68.func_02036850() != 0) || (this->unk_50 == 0 && data_027e0c68.func_02036824() != 0)) { + return true; + } + + return false; + } else { + bool ret = CHECK_UNK_FLAGS(1); + + if ((this->unk_50 == 0 || ret)) { + return (this->unk_50 != 0 && ret); + } + + return false; + } +} + +ARM unk32 MsgProc_Main::vfunc_34(unk32 param_2) { s16 iVar1; unk32 iVar2; unk32 iVar3; @@ -51,7 +88,27 @@ ARM unk32 MsgProc_Type1::vfunc_34(unk32 param_2) { return func_01ff9b4c(iVar2 + iVar3 / 2, uVar4); } -ARM void MsgProc_Type1::vfunc_30(void) { +ARM unk32 MsgProc_Main::func_02038cb8(unk32 param_2) { + u8 bVar1 = this->unk_2C->unk_00->unk_08[1]; + unk32 iVar2 = this->func_02038cf4(); + unk32 iVar1 = this->func_020337d8(param_2 + 1); + return iVar2 + iVar1 - bVar1; +} + +ARM unk32 MsgProc_Main::func_02038cf4(void) { + unk32 iVar1; + unk32 iVar2; + + iVar2 = this->unk_18; + iVar1 = this->func_02038d10(); + return (iVar2 * 8 - iVar1) / 2; +} + +ARM unk32 MsgProc_Main::func_02038d10(void) { + return this->func_020337d8(this->unk_150[0]); +} + +ARM void MsgProc_Main::vfunc_30(void) { if (this->unk_15C > 0) { this->func_0203e090(); } else { @@ -59,14 +116,75 @@ ARM void MsgProc_Type1::vfunc_30(void) { } } +ARM void MsgProc_Main::func_02038ef4(unk32 param_2, unk32 param_3) { + unk32 local_14; + unk32 local_18; + + this->vfunc_70(&local_14, &local_18); + this->func_0203e1b0(local_14 + param_2, local_18 + param_3, 0); +} + +ARM void MsgProc_Main::func_02038f40(void) { +} + // non-matching -ARM void MsgProc_Type1::vfunc_08(unk32* param_2, unk32* param_3) { +ARM void MsgProc_Main::func_02038f44(EntryINF1* param_2, u32 param_3, func_02038f44_param4* param_4, UnkSubClass1_02256FF8* param_5, unk32 param_6) { + int iVar1; + + this->pInfoEntry = param_2; + this->unk_08 = param_5; + this->unk_15F = -1; + this->unk_15C = 0x78; + this->unk_15E = param_4->unk_0C; + this->func_0203dcfc(param_6, 0, this->unk_11E, 2); + this->unk_128.func_02038858(param_3); + this->unk_30 = this->unk_150[4] + 5; + + this->vfunc_54(); + // this->vfunc_60(0, 0, (unk32)param_4); + // this->vfunc_64(param_4); + + if (*(unk32*)data_027e0618 == 2) { + if (this->func_02032fa4() == 0) { + data_027e103c->func_ov000_020cfc9c(1, 0); + } else { + data_027e103c->func_ov000_020cfc9c(0, 1); + } + } + + this->vfunc_5C(); +} + +ARM void MsgProc_Main::func_02039058(void) { +} + +// non-matching +ARM unk32 MsgProc_Main::func_0203905c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { + u16 sVar1; + bool bVar5; + + sVar1 = param_2[0]; + bVar5 = (sVar1 == 0xA || sVar1 == 0x20) || sVar1 == 0x3000; + + if (bVar5 && this->unk_150[2] != 0) { + this->unk_150[2] = 1; + } else { + this->unk_150[2] = 0; + } + + // this->unk_150[2] = bVar5; + + return this->func_02033360(); +} + +// non-matching +ARM void MsgProc_Main::vfunc_08(unk32* param_2, unk32* param_3) { this->unk_15C = 10; this->unk_150[2] = 1; this->func_0203e2ac(param_3); } -ARM unk32 MsgProc_Type1::vfunc_68(unk32 param_2) { +ARM unk32 MsgProc_Main::vfunc_68(unk32 param_2) { switch (param_2) { case 0: break; @@ -89,13 +207,13 @@ ARM unk32 MsgProc_Type1::vfunc_68(unk32 param_2) { return ((this->unk_18 << 3) - this->func_020337d8(param_2)) / 2; } -ARM void MsgProc_Type1::vfunc_70(unk32* param_2, unk32* param_3) { +ARM void MsgProc_Main::vfunc_70(unk32* param_2, unk32* param_3) { this->vfunc_6C(param_2, param_3); *param_2 += this->unk_158.x; *param_3 += this->unk_158.y; } -ARM void MsgProc_Type1::vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { +ARM void MsgProc_Main::vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { this->func_0203dc10(1, param_3); this->func_02033190(param_2, param_3, param_4, param_5); } @@ -437,7 +555,7 @@ ARM bool MsgProc_Type1::func_0203a2c0(void) { } ARM unk32 MsgProc_Type1::func_0203a30c(void) { - return this->unk_574 / this->unk_154->unk_06; + return this->unk_574 / this->pInfoEntry->unk_06; } // non-matching (regalloc) @@ -594,7 +712,7 @@ ARM bool MsgProc_Type1::func_0203a6d0(unk32 param_2, unk32 param_3) { } // non-matching -ARM void MsgProc_Type1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, unk32 param_5) { +ARM void MsgProc_Type1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) { bool bVar5; bool bVar2; int iVar4; @@ -632,7 +750,7 @@ ARM void MsgProc_Type1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, this->unk_57B = 0; } - this->func_02038f44(param_2, param_3, param_4, param_5, iVar6); + // this->func_02038f44(param_2, param_3, param_4, param_5, iVar6); this->unk_574 = 0; if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param_4[11])) { @@ -651,12 +769,12 @@ ARM void MsgProc_Type1::vfunc_54(void) { u16 *local_54 [17]; if ((this->unk_18 & 0x1FFFFFFF) != 8) { - this->func_0203e060(0xE0, 0x40); + this->func_0203e060(this, 0xE0, 0x40); - if (this->unk_154 == 0) { + if (this->pInfoEntry == NULL) { iVar2 = 2; } else { - iVar2 = (int)*(char *)(this->unk_154->unk_05); + iVar2 = (int)*(char *)(this->pInfoEntry->unk_05); } this->func_0203dcfc(this->unk_50, 0, (int)this->unk_11E, iVar2); @@ -672,7 +790,7 @@ ARM void MsgProc_Type1::vfunc_54(void) { this->unk_57F = 0; this->unk_57A = 0; - if (this->unk_154->unk_06 < 2) { + if (this->pInfoEntry->unk_06 < 2) { this->unk_580 = 1; } @@ -682,7 +800,7 @@ ARM void MsgProc_Type1::vfunc_54(void) { local_54[0] = puVar3; iVar2 = 0; - for (iVar2 = 0; (iVar2 / this->unk_154->unk_06) == 0; iVar2++, puVar3 = this->func_02037604(local_54)) { + for (iVar2 = 0; (iVar2 / this->pInfoEntry->unk_06) == 0; iVar2++, puVar3 = this->func_02037604(local_54)) { if (local_54[iVar2] != NULL) { puVar3 = local_54[iVar2]; } @@ -781,7 +899,7 @@ ARM void MsgProc_Type1::vfunc_54(void) { } } else if (*local_54[iVar2] == '\n') { iVar2 = iVar2 + 1; - iVar4 = (iVar2 / this->unk_154->unk_06); + iVar4 = (iVar2 / this->pInfoEntry->unk_06); if (iVar4 == 0) { break; @@ -790,24 +908,24 @@ ARM void MsgProc_Type1::vfunc_54(void) { } */ if (this->unk_15E == '\x06') { - this->func_0203e060(0xE0, 0x30); + this->func_0203e060(this, 0xE0, 0x30); - if (this->unk_154 == 0) { + if (this->pInfoEntry == NULL) { iVar2 = 2; } else { - iVar2 = this->unk_154->unk_05; + iVar2 = this->pInfoEntry->unk_05; } this->func_0203dcfc(this->unk_50,0,(int)this->unk_11E,iVar2); } if (this->unk_580 != 0) { - this->func_0203e060(0xE0, 0x28); + this->func_0203e060(this, 0xE0, 0x28); - if (this->unk_154 == 0) { + if (this->pInfoEntry == NULL) { iVar2 = 2; } else { - iVar2 = this->unk_154->unk_05; + iVar2 = this->pInfoEntry->unk_05; } this->func_0203dcfc(this->unk_50, 0, this->unk_11E, iVar2); @@ -823,7 +941,7 @@ ARM void MsgProc_Type1::vfunc_54(void) { data_027e0c68.unk_28[this->unk_50]->unk_18 = uVar6; this->func_0203b764(); - if (this->unk_15F == 0 || this->unk_154->unk_06 < 3) { + if (this->unk_15F == 0 || this->pInfoEntry->unk_06 < 3) { this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; this->unk_168.func_020352d8(); } else { @@ -838,7 +956,7 @@ ARM void MsgProc_Type1::vfunc_54(void) { } ARM void MsgProc_Type1::vfunc_5C(void) { - if (this->unk_15F == 0 || this->unk_154->unk_06 <= 2) { + if (this->unk_15F == 0 || this->pInfoEntry->unk_06 <= 2) { this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; this->unk_168.func_020352d8(); } else { @@ -1002,7 +1120,7 @@ ARM unk32 MsgProc_Type1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, un } // non-matching -ARM unk32 MsgProc_Type1::vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { +ARM unk32 MsgProc_Type1::vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { int iVar1; u16* psVar3; @@ -1028,7 +1146,7 @@ ARM unk32 MsgProc_Type1::vfunc_1C(unk8 param_2, UnkStruct_0203b264* param_3, unk UnknownMsgChoiceStruct* pChoiceData; s32 i = this->func_0203a30c(); pChoiceData = &this->unk_428[this->unk_528[i]]; - return this->unk_164->func_0203cb5c(param_2, (((pChoiceData->unk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->unk_00->mUnk_0)[2]) + ~0xFFFE)); + return this->unk_164->func_0203cb5c(*param_2, (((pChoiceData->unk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->unk_00->mUnk_0)[2]) + ~0xFFFE)); default: break; } @@ -1118,7 +1236,7 @@ ARM void MsgProc_Type1::vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, } // non-matching (regalloc) -ARM void MsgProc_Type1::vfunc_64(unk32 param_2) { +ARM void MsgProc_Type1::vfunc_64(s16* param_2) { unk32 uVar2; if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { @@ -1157,7 +1275,7 @@ ARM void MsgProc_Type1::func_0203b764(void) { this->unk_158.y -= 38; break; case 2: - switch (this->unk_154->unk_06) { + switch (this->pInfoEntry->unk_06) { case 2: this->unk_158.y -= 111; break; diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp index 0dbb31b6..68ae5e93 100644 --- a/src/Main/Message/func_0203c8a8.cpp +++ b/src/Main/Message/func_0203c8a8.cpp @@ -53,11 +53,11 @@ ARM bool MsgProc_Type1::vfunc_14(unk32 param_2, unk32 param_3) { return true; } -ARM void MsgProc_Type1::func_0203e060(u8 param_2, u8 param_3) { - this->func_0203dc10(1, param_3); - this->unk_11E = param_2; - this->unk_118 = -1; - this->func_020331c4(param_2, -1); +ARM void MsgProc_Type1::func_0203e060(MsgProc_Main* param_1, u8 param_2, u8 param_3) { + param_1->func_0203dc10(1, param_3); + param_1->unk_11E = param_2; + param_1->unk_118 = -1; + param_1->func_020331c4(param_2, -1); } ARM bool MsgProc_Type1::vfunc_28(void) { From 91b1c854144a8e4b0c7a0e4909e9d05c5794ba2d Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sun, 2 Feb 2025 22:24:35 +0100 Subject: [PATCH 45/64] I don't like vfuncs --- config/eur/arm9/symbols.txt | 4 +- config/usa/arm9/symbols.txt | 4 +- include/Message/MsgProc.hpp | 98 +++++++++++++++-------------- src/Main/Message/MessageManager.cpp | 12 ++-- 4 files changed, 62 insertions(+), 56 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 1d18c408..f095aeb6 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1650,7 +1650,7 @@ _ZN31UnkSubClass1_UnkownClass2_Base1C1Ev kind:function(arm,size=0x48) addr:0x203 _ZN12MsgProc_BaseC2Ev kind:function(thumb,size=0x78) addr:0x2032f0c func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f84 func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f88 -func_02032f94 kind:function(thumb,size=0x4) addr:0x2032f94 +_ZN12MsgProc_BaseD2Ev kind:function(thumb,size=0x4) addr:0x2032f94 func_02032f98 kind:function(arm,size=0xc) addr:0x2032f98 func_02032fa4 kind:function(arm,size=0x10) addr:0x2032fa4 func_02032fb4 kind:function(arm,size=0x18) addr:0x2032fb4 @@ -2805,7 +2805,7 @@ data_02057f90 kind:data(any) addr:0x2057f90 data_0205800c kind:data(any) addr:0x205800c data_02058024 kind:data(any) addr:0x2058024 data_0205803c kind:data(any) addr:0x205803c -data_02058054 kind:data(any) addr:0x2058054 +_ZTV13MsgProc_Base2 kind:data(any) addr:0x2058054 data_02058088 kind:data(any) addr:0x2058088 data_02058090 kind:data(any) addr:0x2058090 data_02058094 kind:data(any) addr:0x2058094 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index a2bf8178..797dc0d4 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1650,7 +1650,7 @@ _ZN31UnkSubClass1_UnkownClass2_Base1C1Ev kind:function(arm,size=0x48) addr:0x203 _ZN12MsgProc_BaseC2Ev kind:function(thumb,size=0x78) addr:0x2032f08 func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f80 func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f84 -func_02032f94 kind:function(thumb,size=0x4) addr:0x2032f90 +_ZN12MsgProc_BaseD2Ev kind:function(thumb,size=0x4) addr:0x2032f90 func_02032f98 kind:function(arm,size=0xc) addr:0x2032f94 func_02032fa4 kind:function(arm,size=0x10) addr:0x2032fa0 func_02032fb4 kind:function(arm,size=0x18) addr:0x2032fb0 @@ -2806,7 +2806,7 @@ data_02057f90 kind:data(any) addr:0x2057f48 data_0205800c kind:data(any) addr:0x2057fc4 data_02058024 kind:data(any) addr:0x2057fdc data_0205803c kind:data(any) addr:0x2057ff4 -data_02058054 kind:data(any) addr:0x205800c +_ZTV13MsgProc_Base2 kind:data(any) addr:0x205800c data_02058088 kind:data(any) addr:0x2058040 data_02058090 kind:data(any) addr:0x2058048 data_02058094 kind:data(any) addr:0x205804c diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp index 6636e984..efb13466 100644 --- a/include/Message/MsgProc.hpp +++ b/include/Message/MsgProc.hpp @@ -214,7 +214,7 @@ struct UnkStruct_MsgProc_Base_unk_2C { /* 0x0C */ }; -// astruct_8? +// astruct_8 class MsgProc_Base : public SysObject { public: /* 0x000 (vtable) */ @@ -248,15 +248,17 @@ public: /* 0x052 */ MsgProc_Base(); - /* 0x00*/ virtual ~MsgProc_Base(); - /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3); - /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); - /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3); // func_0203e060? - /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3); - /* 0x18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4); - /* 0x1C */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); - /* 0x20 */ virtual UNK_TYPE vfunc_20(UNK_TYPE); - /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE); + /* 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(unk32 param_2, unk32 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); @@ -266,7 +268,7 @@ public: /* 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); // func_02039a3c? + /* 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); @@ -369,17 +371,19 @@ public: 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 */ 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; + /* 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 */ virtual bool vfunc_28(void) override; - /* 0x2C */ virtual void vfunc_2C(void) override; - /* 0x30 */ virtual void vfunc_30(void) 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; @@ -431,19 +435,21 @@ public: 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 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; + /* 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 */ 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; + /* 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 */ 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; + /* 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; @@ -589,31 +595,31 @@ public: /* 0x00 */ virtual ~MsgProc_Type1() override; /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; - /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? + /* 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 */ 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; + /* 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 */ virtual void vfunc_2C(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 */ 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; + /* 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); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 9e022c8a..12851d46 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -8,8 +8,8 @@ extern ARM void func_0203dc74(MsgProc_Main*, unk32, unk32); extern u32** data_027e0ce0[]; extern u32 data_02056924[]; -extern u32* data_02068e6c; -extern u32* data_02068e8c; +extern UnkStruct_MsgProc_Base_unk_2C* data_02068e6c; +extern UnkStruct_MsgProc_Base_unk_2C* data_02068e8c; extern u16 data_02056918[]; extern ActorTypeId data_0205691c[]; @@ -456,10 +456,10 @@ ARM MsgProc_Main* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { pBVar5 = this->pGroups; // pSVar4->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); BMGFileInfo* entry = &(pBVar5)->entries[(param_2) >> 0x10]; - pSVar4->vfunc_50(pEVar1, - ((u32)entry->pDAT1 + (((func_02037258(entry, (((param_2))) & 0xFFFF))->offset) & ~1)), - // BMG_GET_MSG_ADDR(pBVar5, param_2), - (s16*)&iStack_38, 1); + // pSVar4->vfunc_50(pEVar1, + // ((u32)entry->pDAT1 + (((func_02037258(entry, (((param_2))) & 0xFFFF))->offset) & ~1)), + // // BMG_GET_MSG_ADDR(pBVar5, param_2), + // (s16*)&iStack_38, 1); data_ov000_020eec9c.func_ov000_020d77e4(0x1C); return pSVar4; From 64e8537ba7e4d796079a7bacf23b3f5cdb9a7213 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Mon, 3 Feb 2025 23:59:33 +0100 Subject: [PATCH 46/64] today's progress --- config/eur/arm9/symbols.txt | 18 +++++++------- config/usa/arm9/symbols.txt | 18 +++++++------- include/Message/MsgProc.hpp | 23 +++++++++++------ src/Main/Message/func_02032f0c.cpp | 40 ++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 25 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index f095aeb6..30b64086 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1648,15 +1648,15 @@ func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e60 _ZN31UnkSubClass1_UnkownClass2_Base1C2Ev kind:function(arm,size=0x48) addr:0x2032e7c _ZN31UnkSubClass1_UnkownClass2_Base1C1Ev kind:function(arm,size=0x48) addr:0x2032ec4 _ZN12MsgProc_BaseC2Ev kind:function(thumb,size=0x78) addr:0x2032f0c -func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f84 -func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f88 +_ZN12MsgProc_BaseD1Ev kind:function(thumb,size=0x4) addr:0x2032f84 +_ZN12MsgProc_BaseD0Ev kind:function(thumb,size=0xc) addr:0x2032f88 _ZN12MsgProc_BaseD2Ev kind:function(thumb,size=0x4) addr:0x2032f94 -func_02032f98 kind:function(arm,size=0xc) addr:0x2032f98 -func_02032fa4 kind:function(arm,size=0x10) addr:0x2032fa4 -func_02032fb4 kind:function(arm,size=0x18) addr:0x2032fb4 -func_02032fcc kind:function(arm,size=0x64) addr:0x2032fcc +_ZN12MsgProc_Base13func_02032f98Ei kind:function(arm,size=0xc) addr:0x2032f98 +_ZN12MsgProc_Base13func_02032fa4Ev kind:function(arm,size=0x10) addr:0x2032fa4 +_ZN12MsgProc_Base13func_02032fb4Ev kind:function(arm,size=0x18) addr:0x2032fb4 +_ZN12MsgProc_Base8vfunc_14Eth kind:function(arm,size=0x64) addr:0x2032fcc func_02033030 kind:function(arm,size=0x160) addr:0x2033030 -func_02033190 kind:function(arm,size=0x34) addr:0x2033190 +_ZN12MsgProc_Base8vfunc_0CEhhhi kind:function(arm,size=0x34) addr:0x2033190 func_020331c4 kind:function(arm,size=0x50) addr:0x20331c4 func_02033214 kind:function(arm,size=0xd0) addr:0x2033214 func_020332e4 kind:function(arm,size=0x7c) addr:0x20332e4 @@ -1666,7 +1666,7 @@ func_020334b4 kind:function(arm,size=0x174) addr:0x20334b4 func_02033628 kind:function(arm,size=0x74) addr:0x2033628 func_0203369c kind:function(arm,size=0xe4) addr:0x203369c func_02033780 kind:function(arm,size=0x58) addr:0x2033780 -func_020337d8 kind:function(arm,size=0x24) addr:0x20337d8 +_ZN12MsgProc_Base13func_020337d8Ei kind:function(arm,size=0x24) addr:0x20337d8 func_020337fc kind:function(arm,size=0xac) addr:0x20337fc func_020338a8 kind:function(arm,size=0x28) addr:0x20338a8 func_020338d0 kind:function(arm,size=0x34) addr:0x20338d0 @@ -1745,7 +1745,7 @@ func_020352d8 kind:function(arm,size=0x98) addr:0x20352d8 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 -func_02035428 kind:function(arm,size=0x18) addr:0x2035428 +_ZN25UnkSubClass1_UnkownClass113func_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 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 797dc0d4..9ef2d272 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1648,15 +1648,15 @@ func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e5c _ZN31UnkSubClass1_UnkownClass2_Base1C2Ev kind:function(arm,size=0x48) addr:0x2032e78 _ZN31UnkSubClass1_UnkownClass2_Base1C1Ev kind:function(arm,size=0x48) addr:0x2032ec0 _ZN12MsgProc_BaseC2Ev kind:function(thumb,size=0x78) addr:0x2032f08 -func_02032f84 kind:function(thumb,size=0x4) addr:0x2032f80 -func_02032f88 kind:function(thumb,size=0xc) addr:0x2032f84 +_ZN12MsgProc_BaseD1Ev kind:function(thumb,size=0x4) addr:0x2032f80 +_ZN12MsgProc_BaseD0Ev kind:function(thumb,size=0xc) addr:0x2032f84 _ZN12MsgProc_BaseD2Ev kind:function(thumb,size=0x4) addr:0x2032f90 -func_02032f98 kind:function(arm,size=0xc) addr:0x2032f94 -func_02032fa4 kind:function(arm,size=0x10) addr:0x2032fa0 -func_02032fb4 kind:function(arm,size=0x18) addr:0x2032fb0 -func_02032fcc kind:function(arm,size=0x64) addr:0x2032fc8 +_ZN12MsgProc_Base13func_02032f98Ei kind:function(arm,size=0xc) addr:0x2032f94 +_ZN12MsgProc_Base13func_02032fa4Ev kind:function(arm,size=0x10) addr:0x2032fa0 +_ZN12MsgProc_Base13func_02032fb4Ev kind:function(arm,size=0x18) addr:0x2032fb0 +_ZN12MsgProc_Base8vfunc_14Eth kind:function(arm,size=0x64) addr:0x2032fc8 func_02033030 kind:function(arm,size=0x160) addr:0x203302c -func_02033190 kind:function(arm,size=0x34) addr:0x203318c +_ZN12MsgProc_Base8vfunc_0CEhhhi kind:function(arm,size=0x34) addr:0x203318c func_020331c4 kind:function(arm,size=0x50) addr:0x20331c0 func_02033214 kind:function(arm,size=0xd0) addr:0x2033210 func_020332e4 kind:function(arm,size=0x7c) addr:0x20332e0 @@ -1666,7 +1666,7 @@ func_020334b4 kind:function(arm,size=0x160) addr:0x2033484 func_02033628 kind:function(arm,size=0x74) addr:0x20335e4 func_0203369c kind:function(arm,size=0xe4) addr:0x2033658 func_02033780 kind:function(arm,size=0x58) addr:0x203373c -func_020337d8 kind:function(arm,size=0x24) addr:0x2033794 +_ZN12MsgProc_Base13func_020337d8Ei kind:function(arm,size=0x24) addr:0x2033794 func_020337fc kind:function(arm,size=0xac) addr:0x20337b8 func_020338a8 kind:function(arm,size=0x28) addr:0x2033864 func_020338d0 kind:function(arm,size=0x34) addr:0x203388c @@ -1745,7 +1745,7 @@ func_020352d8 kind:function(arm,size=0x98) addr:0x2035294 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 -func_02035428 kind:function(arm,size=0x18) addr:0x20353e4 +_ZN25UnkSubClass1_UnkownClass113func_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 diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp index efb13466..fb167332 100644 --- a/include/Message/MsgProc.hpp +++ b/include/Message/MsgProc.hpp @@ -85,6 +85,8 @@ public: /* 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*); @@ -204,13 +206,18 @@ public: }; struct UnkStruct_MsgProc_Base_unk_2C_2 { - /* 0x00 */ unk32 unk_00; + /* 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 { - /* 0x08 */ UnkStruct_MsgProc_Base_unk_2C_2* unk_00; + /* 0x00 */ UnkStruct_MsgProc_Base_unk_2C_2* unk_00; + /* 0x04 */ unk32 unk_04; + /* 0x08 */ unk32 unk_08; /* 0x0C */ }; @@ -220,8 +227,8 @@ public: /* 0x000 (vtable) */ /* 0x004 */ unk32* unk_04; /* 0x008 */ UnkSubClass1_02256FF8* unk_08; - /* 0x00C */ unk32* unk_0C; - /* 0x010 */ unk32 unk_10; + /* 0x00C */ unk32 unk_0C; + /* 0x010 */ unk32* unk_10; /* 0x014 */ s32 unk_14; /* 0x018 */ s32 unk_18; /* 0x01C */ unk32 unk_1C; @@ -238,8 +245,8 @@ public: /* 0x044 */ unk32 unk_44; /* 0x048 */ u8 unk_48; /* 0x049 */ u8 unk_49; - /* 0x04A */ unk16 unk_4A; - /* 0x04C */ unk8 unk_4C; + /* 0x04A */ u16 unk_4A; + /* 0x04C */ u8 unk_4C; /* 0x04C */ unk8 unk_4D; /* 0x04C */ unk8 unk_4E; /* 0x04C */ unk8 unk_4F; @@ -252,7 +259,7 @@ public: /* 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(unk32 param_2, unk32 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); @@ -280,7 +287,9 @@ public: /* 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); }; diff --git a/src/Main/Message/func_02032f0c.cpp b/src/Main/Message/func_02032f0c.cpp index b2191dd1..bd7ae4fc 100644 --- a/src/Main/Message/func_02032f0c.cpp +++ b/src/Main/Message/func_02032f0c.cpp @@ -8,6 +8,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() { this->unk_00 = NULL; @@ -45,6 +46,45 @@ THUMB MsgProc_Base::MsgProc_Base() { this->unk_34 = 3; } +THUMB MsgProc_Base::~MsgProc_Base() { +} + +ARM unk32* MsgProc_Base::func_02032f98(unk32 param_2) { + this->unk_0C = param_2; + return &this->unk_0C; +} + +ARM unk32 MsgProc_Base::func_02032fa4(void) { + return UnkSubClass1_UnkownClass1::func_02035428(this->unk_50); +} + +ARM unk32 MsgProc_Base::func_02032fb4(void) { + return this->unk_2C->unk_00->unk_01 + this->unk_34; +} + +// non-matching +ARM bool MsgProc_Base::vfunc_14(u16 param_2, u8 param_3) { + s16 iVar1; + s16 iVar2; + + iVar1 = ((param_2 + 0x7 + ((param_2 + 0x7) >> 0x1D)) ) * 0x8; + iVar2 = ((param_3 + 0x7 + ((param_3 + 0x7) >> 0x1D)) ) * 0x8; + this->unk_4A = param_2; + this->unk_4C = param_3; + this->unk_14 = (iVar1 + (iVar1 >> 0x1D)) * 0x2000 >> 0x10; + this->unk_18 = (iVar2 + (iVar2 >> 0x1D)) * 0x2000 >> 0x10; + + return true; +} + +ARM void MsgProc_Base::vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { + func_020296e0(&this->unk_10, this->unk_2C, param_2, param_3, param_5, param_4); +} + +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() { this->unk_74 = NULL; this->unk_78 = 0; 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 47/64] 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; From 7173439cd8424b562b3bc87b935e29aaaf14658e Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 5 Feb 2025 00:46:13 +0100 Subject: [PATCH 48/64] post-update cleanup: step 2 --- config/eur/arm9/delinks.txt | 19 +- config/eur/arm9/symbols.txt | 22 +- config/usa/arm9/symbols.txt | 22 +- include/Message/BMG.hpp | 18 +- include/Message/MessageManager.hpp | 30 +- include/Message/MsgProc.hpp | 44 +- include/Unknown/UnkStruct_02032f0c.hpp | 137 +-- include/Unknown/UnkStruct_02035064.hpp | 34 +- include/Unknown/UnkStruct_02037750.hpp | 4 +- include/Unknown/UnkStruct_02038aa0.hpp | 34 +- include/Unknown/UnkStruct_020397f8.hpp | 210 ++-- include/Unknown/UnkStruct_0203dae0.hpp | 142 +-- include/Unknown/func_ov000_020d0644.hpp | 8 +- src/Main/Message/BMG.cpp | 2 +- src/Main/Message/func_02032f0c.cpp | 100 -- src/Main/Message/func_0203744c.cpp | 44 - src/Main/Message/func_02038aa0.cpp | 1422 ----------------------- src/Main/Message/func_0203c358.cpp | 6 +- src/Main/Message/func_0203c72c.cpp | 2 +- src/Main/Message/func_0203c8a8.cpp | 71 -- src/Main/Unknown/UnkStruct_02032f0c.cpp | 138 ++- src/Main/Unknown/UnkStruct_02035064.cpp | 30 +- src/Main/Unknown/UnkStruct_02037750.cpp | 69 +- src/Main/Unknown/UnkStruct_02038aa0.cpp | 278 ++++- src/Main/Unknown/UnkStruct_020397f8.cpp | 1049 ++++++++++++++++- src/Main/Unknown/UnkStruct_0203dae0.cpp | 108 +- 26 files changed, 1877 insertions(+), 2166 deletions(-) delete mode 100644 src/Main/Message/func_02032f0c.cpp delete mode 100644 src/Main/Message/func_0203744c.cpp delete mode 100644 src/Main/Message/func_02038aa0.cpp delete mode 100644 src/Main/Message/func_0203c8a8.cpp diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 628b146e..374e855a 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -18,8 +18,11 @@ libs/cpp/src/__register_global_object.cpp: src/Main/Message/BmgRelatedFunctions.cpp: .text start:0x0202d3bc end:0x0202d56c -src/Main/Message/func_02032f0c.cpp: - .text start:0x02032e7c end:0x0203643c +src/Main/Unknown/UnkStruct_02032f0c.cpp: + .text start:0x02032f0c end:0x02033d40 + +src/Main/Unknown/UnkStruct_02035064.cpp: + .text start:0x02035064 end:0x02035370 src/Main/Message/MessageManager.cpp: .text start:0x0203643c end:0x020371b4 @@ -29,11 +32,11 @@ src/Main/Message/BMG.cpp: .data start:0x02057b78 end:0x02057cb8 .rodata start:0x02056958 end:0x020569e0 -src/Main/Message/func_0203744c.cpp: - .text start:0x0203744c end:0x02038aa0 +src/Main/Unknown/UnkStruct_02037750.cpp: + .text start:0x02037750 end:0x020387e0 -src/Main/Message/func_02038aa0.cpp: - .text start:0x02038aa0 end:0x0203c358 +src/Main/Unknown/UnkStruct_02038aa0.cpp: + .text start:0x0203881c end:0x02039578 src/Main/Message/func_0203c358.cpp: .text start:0x0203c358 end:0x0203c72c @@ -41,5 +44,5 @@ src/Main/Message/func_0203c358.cpp: src/Main/Message/func_0203c72c.cpp: .text start:0x0203c72c end:0x0203c8a8 -src/Main/Message/func_0203c8a8.cpp: - .text start:0x0203c8a8 end:0x0203e784 +src/Main/Unknown/UnkStruct_0203dae0.cpp: + .text start:0x0203dae0 end:0x0203e784 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index cde17c14..dac20832 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1876,36 +1876,36 @@ _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_02038b34Eji kind:function(thumb,size=0xc) addr:0x2038b28 +_ZN18UnkStruct_02038aa013func_02038b28Eji 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_02038b40Ev kind:function(arm,size=0x4) addr:0x2038b74 +_ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b74 _ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b78 -_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0x84) addr:0x2038c34 +_ZN18UnkStruct_02038aa013func_02038c34Ev kind:function(arm,size=0x84) addr:0x2038c34 _ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x3c) addr:0x2038cb8 -_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x1c) addr:0x2038cf4 -_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x10) addr:0x2038d10 -_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x1b0) addr:0x2038d20 +_ZN18UnkStruct_02038aa013func_02038cf4Ei kind:function(arm,size=0x1c) addr:0x2038cf4 +_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038d10 +_ZN18UnkStruct_02038aa013func_02038d20Ev kind:function(arm,size=0x1b0) addr:0x2038d20 _ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038ed0 _ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x4c) addr:0x2038ef4 -_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4) addr:0x2038f40 +_ZN18UnkStruct_02038aa013func_02038f40Eii kind:function(arm,size=0x4) addr:0x2038f40 _ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x114) addr:0x2038f44 _ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x4) addr:0x2039058 _ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x48) addr:0x203905c _ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x164) addr:0x20390a4 _ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x20) addr:0x2039208 -_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x28) addr:0x2039228 +_ZN18UnkStruct_02038aa013func_02039228Es kind:function(arm,size=0x28) addr:0x2039228 _ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x64) addr:0x2039250 -_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0xe4) addr:0x20392b4 +_ZN18UnkStruct_02038aa013func_020392b4Ev kind:function(arm,size=0xe4) addr:0x20392b4 _ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xc) addr:0x2039398 _ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0x4) addr:0x20393a4 _ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x28) addr:0x20393a8 _ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x70) addr:0x20393d0 _ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x3c) addr:0x2039440 -_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x5c) addr:0x203947c +_ZN18UnkStruct_02038aa013func_0203947cEii kind:function(arm,size=0x5c) addr:0x203947c _ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x44) addr:0x20394d8 _ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x40) addr:0x203951c -_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x14) addr:0x203955c +_ZN18UnkStruct_02038aa013func_0203955cEv kind:function(arm,size=0x14) addr:0x203955c _ZN18UnkStruct_02038aa08vfunc_38Ev kind:function(arm,size=0x8) addr:0x2039570 func_02039578 kind:function(arm,size=0x3c) addr:0x2039578 _ZN18UnkStruct_020397f8C2Ev kind:function(thumb,size=0x244) addr:0x20395b4 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 2f75dcff..7ba35c25 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1876,36 +1876,36 @@ _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_02038b34Eji kind:function(thumb,size=0xc) addr:0x2038ae4 +_ZN18UnkStruct_02038aa013func_02038b28Eji 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_02038b40Ev kind:function(arm,size=0x4) addr:0x2038b30 +_ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b30 _ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b34 -_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0x84) addr:0x2038bf0 +_ZN18UnkStruct_02038aa013func_02038c34Ev kind:function(arm,size=0x84) addr:0x2038bf0 _ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x3c) addr:0x2038c74 -_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x1c) addr:0x2038cb0 -_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x10) addr:0x2038ccc -_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x1b0) addr:0x2038cdc +_ZN18UnkStruct_02038aa013func_02038cf4Ei kind:function(arm,size=0x1c) addr:0x2038cb0 +_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038ccc +_ZN18UnkStruct_02038aa013func_02038d20Ev kind:function(arm,size=0x1b0) addr:0x2038cdc _ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038e8c _ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x4c) addr:0x2038eb0 -_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4) addr:0x2038efc +_ZN18UnkStruct_02038aa013func_02038f40Eii kind:function(arm,size=0x4) addr:0x2038efc _ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x114) addr:0x2038f00 _ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x4) addr:0x2039014 _ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x48) addr:0x2039018 _ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x164) addr:0x2039060 _ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x20) addr:0x20391c4 -_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x28) addr:0x20391e4 +_ZN18UnkStruct_02038aa013func_02039228Es kind:function(arm,size=0x28) addr:0x20391e4 _ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x64) addr:0x203920c -_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0xe4) addr:0x2039270 +_ZN18UnkStruct_02038aa013func_020392b4Ev kind:function(arm,size=0xe4) addr:0x2039270 _ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xc) addr:0x2039354 _ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0x4) addr:0x2039360 _ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x28) addr:0x2039364 _ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x70) addr:0x203938c _ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x3c) addr:0x20393fc -_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x5c) addr:0x2039438 +_ZN18UnkStruct_02038aa013func_0203947cEii kind:function(arm,size=0x5c) addr:0x2039438 _ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x44) addr:0x2039494 _ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x40) addr:0x20394d8 -_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x14) addr:0x2039518 +_ZN18UnkStruct_02038aa013func_0203955cEv kind:function(arm,size=0x14) addr:0x2039518 _ZN18UnkStruct_02038aa08vfunc_38Ev kind:function(arm,size=0x8) addr:0x203952c func_02039578 kind:function(arm,size=0x3c) addr:0x2039534 _ZN18UnkStruct_020397f8C2Ev kind:function(thumb,size=0x244) addr:0x2039570 diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index ca855f52..0b13b47f 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -80,10 +80,10 @@ typedef struct BMGHeader { typedef struct EntryINF1 { /* 0x00 */ u32 offset; // relative to the end of the DAT1 header - /* 0x04 */ u8 unk_04; // flags/attributes? (+0x04 to +0x06) - /* 0x05 */ u8 unk_05; - /* 0x06 */ u8 unk_06; - /* 0x07 */ u8 unk_07; + /* 0x04 */ u8 mUnk_04; // flags/attributes? (+0x04 to +0x06) + /* 0x05 */ u8 mUnk_05; + /* 0x06 */ u8 mUnk_06; + /* 0x07 */ u8 mUnk_07; } EntryINF1; // size = 0x8 typedef struct SectionINF1 { @@ -110,7 +110,7 @@ typedef struct InstrShowMsg { } InstrShowMsg; // size = 0x8 typedef struct InstrBranch { - /* 0x01 */ u8 unk_01; + /* 0x01 */ u8 mUnk_01; /* 0x02 */ u16 funcIndex; // index of the query function to run /* 0x04 */ u16 funcArg; // the argument to use in the function /* 0x06 */ u16 flwEntry; // the index of the second section table to be used next in the conversation. @@ -135,7 +135,7 @@ typedef struct SectionFLW1 { /* 0x00 */ SectionBase base; /* 0x04 */ u16 numInstructions; /* 0x08 */ u16 numLabels; - /* 0x0C */ u32 unk_0C; // always zero? + /* 0x0C */ u32 mUnk_0c; // always zero? /* 0x10 */ FLW1Instr* instructions; /* 0x14 */ s16* flwEntries; /* 0x18 */ s8* bmgFileIndices; @@ -150,7 +150,7 @@ typedef struct SectionFLI1 { /* 0x00 */ SectionBase base; /* 0x04 */ u16 numEntries; /* 0x08 */ u16 entrySize; - /* 0x0C */ u32 unk_0C; // always zero? + /* 0x0C */ u32 mUnk_0c; // always zero? /* 0x10 */ EntryFLI1* entries; } SectionFLI1; @@ -169,8 +169,8 @@ typedef struct BMGFileInfo { /* 0x08 */ SectionFLW1* pFLW1; // pointer to the message flow data (FLW -> flow) /* 0x0C */ SectionFLI1* pFLI1; // pointer to the message flow index table (FLI -> flow index table) /* 0x10 */ SectionDAT1* pDAT1; // pointer to the data (DAT -> data) - /* 0x14 */ BMGHeader* unk_14; // same as unk_00 (?) - /* 0x18 */ s16 unk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose) + /* 0x14 */ BMGHeader* mUnk_14; // same as unk_00 (?) + /* 0x18 */ s16 mUnk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose) /* 0x1A */ s16 groupId; // stores the group id } BMGFileInfo; // size = 0x1C diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index c5739430..c408caf7 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -6,27 +6,27 @@ #include "System/SysNew.hpp" #include "Message/BMG.hpp" #include "Message/MsgProc.hpp" -#include "libs/nds/include/nds/math.h" +#include "nds/math.h" #include "Unknown/UnkStruct_02037750.hpp" class UnkStruct_027E0C68 : public SysObject { public: /* 0x00 */ u8 unk_00[2]; - /* 0x02 */ u8 unk_02; - /* 0x03 */ u8 unk_03; - /* 0x04 */ u8 unk_04; - /* 0x05 */ u8 unk_05; - /* 0x06 */ unk16 unk_06; - /* 0x08 */ MsgProc_Type1* unk_08; - /* 0x0C */ u8 unk_0C; - /* 0x0C */ u8 unk_0D; - /* 0x0C */ unk16 unk_0E; - /* 0x10 */ unk16 unk_10; - /* 0x10 */ unk16 unk_12; + /* 0x02 */ u8 mUnk_02; + /* 0x03 */ u8 mUnk_03; + /* 0x04 */ u8 mUnk_04; + /* 0x05 */ u8 mUnk_05; + /* 0x06 */ unk16 mUnk_06; + /* 0x08 */ MsgProc_Type1* mUnk_08; + /* 0x0C */ u8 mUnk_0c; + /* 0x0C */ u8 mUnk_0d; + /* 0x0C */ unk16 mUnk_0e; + /* 0x10 */ unk16 mUnk_10; + /* 0x10 */ unk16 mUnk_12; /* 0x14 */ BMGGroups* pGroups; /* 0x18 */ UnkStruct_020386d8* unk_18[2]; /* 0x20 */ UnkStruct_02037750* unk_20[2]; - /* 0x28 */ MsgProc_Main* unk_28[6]; + /* 0x28 */ UnkStruct_02038aa0* unk_28[6]; /* 0x40 */ MsgProc_Type1* unk_40[2]; // is array size 6? /* 0x48 */ @@ -55,13 +55,13 @@ public: 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); + UnkStruct_02038aa0* 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_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); + UnkStruct_02038aa0* func_02037178(UnkSubClass1_02256FF8* param_2); }; extern UnkStruct_027E0C68 data_027e0c68; diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp index 50dcbc60..204f26c0 100644 --- a/include/Message/MsgProc.hpp +++ b/include/Message/MsgProc.hpp @@ -10,7 +10,7 @@ #include "Unknown/UnkStruct_020397f8.hpp" #include "Unknown/UnkStruct_02035064.hpp" #include "Unknown/UnkStruct_02037750.hpp" -#include "libs/nds/include/nds/math.h" +#include "nds/math.h" // temp #define UNK_TYPE void @@ -26,7 +26,7 @@ typedef struct UnkStruct_0203b264 { class UnkSubClass1_unk_410 { public: - /* 0x00 */ struct MsgProc_Type1* unk_00; + /* 0x00 */ struct MsgProc_Type1* mUnk_00; /* 0x04 */ void func_0203ec34(void); @@ -38,7 +38,7 @@ public: // same as UnkSubClass1_unk_410? class UnkSubClass1_unk_424 { public: - /* 0x00 */ struct MsgProc_Type1* unk_00; + /* 0x00 */ struct MsgProc_Type1* mUnk_00; /* 0x04 */ void func_0203ee80(unk32); @@ -51,7 +51,7 @@ public: class MsgProc_Base2_unk_114 : public SysObject { public: /* 0x00 (vtable) */ - /* 0x04 */ unk32* unk_04; + /* 0x04 */ unk32* mUnk_04; /* 0x08 */ MsgProc_Base2_unk_114(); @@ -64,16 +64,16 @@ public: }; struct func_02038f44_param4 { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - unk32 unk_04; - unk32 unk_08; - unk32 unk_0C; - unk32 unk_10; - unk8 unk_14; - u8 unk_15; + u8 mUnk_00; + u8 mUnk_01; + u8 mUnk_02; + u8 mUnk_03; + unk32 mUnk_04; + unk32 mUnk_08; + unk32 mUnk_0c; + unk32 mUnk_10; + unk8 mUnk_14; + u8 mUnk_15; }; // TEMPORARY @@ -94,8 +94,8 @@ extern char* data_02057eec; // "Menu/UI_main/opening.bin" extern char* data_02057ed8; // "MSP:opening.nclr" struct Struct_027e0db0 { - /* 0x00 */ unk32 unk_00; - /* 0x04 */ unk32 unk_04; + /* 0x00 */ unk32 mUnk_00; + /* 0x04 */ unk32 mUnk_04; }; extern Struct_027e0db0 data_027e0db0; @@ -157,16 +157,16 @@ extern "C" void func_01ffbe34(UnkStruct_01ffbe34 *param1); struct UnkClass_027e1054_unk_00_unk00 { /* 0x00 */ u8 unk_00[0x95]; - /* 0x95 */ u8 unk_95; + /* 0x95 */ u8 mUnk_95; }; struct UnkClass_027e1054_unk_00 { - /* 0x00 */ unk32 unk_04; - /* 0x00 */ UnkClass_027e1054_unk_00_unk00* unk_00; + /* 0x00 */ unk32 mUnk_04; + /* 0x00 */ UnkClass_027e1054_unk_00_unk00* mUnk_00; }; class UnkClass_027e1054 { public: - UnkClass_027e1054_unk_00* unk_00; - unk32 unk_04; + UnkClass_027e1054_unk_00* mUnk_00; + unk32 mUnk_04; void func_ov003_020f4874(void); void func_ov003_020f4760(u8, unk32); @@ -182,7 +182,7 @@ extern UnkClass_ov000_020eec9c data_ov000_020eec9c; class UnkClass_ov000_027e0d04 { public: - /* 0x00 */ unk16 unk_00; + /* 0x00 */ unk16 mUnk_00; void func_0203fe60(unk32); }; diff --git a/include/Unknown/UnkStruct_02032f0c.hpp b/include/Unknown/UnkStruct_02032f0c.hpp index 60e807ab..2868a897 100644 --- a/include/Unknown/UnkStruct_02032f0c.hpp +++ b/include/Unknown/UnkStruct_02032f0c.hpp @@ -23,51 +23,52 @@ public: 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 */ + /* 00 (vtable) */ + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1c */ u8 mUnk_1c; + /* 20 */ 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 */ + /* 00 */ virtual ~UnkSubClass1_02256FF8() override; + /* 08 */ virtual void vfunc_08(void) override; + /* 0c */ virtual void vfunc_0c(void) override; + /* 10 */ virtual void vfunc_10(void) override; + /* 14 */ virtual void vfunc_14(void) override; + /* 18 */ virtual void vfunc_18(void) override; + /* 1c */ virtual void vfunc_1c(void) override; + /* 20 */ virtual void vfunc_20(void) override; + /* 24 */ virtual void vfunc_24(void) override; + /* 28 */ virtual void vfunc_28(void) override; + /* 2c */ virtual void vfunc_2c(void) override; + /* 30 */ virtual void vfunc_30(void) override; + /* 34 */ virtual void vfunc_34(void) override; + /* 38 */ virtual void vfunc_38(void) override; + /* 3c */ }; 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 */ + /* 00 */ s8 mUnk_00; + /* 01 */ s8 mUnk_01; + /* 02 */ s8 mUnk_02; + /* 03 */ s8 mUnk_03; + /* 04 */ unk32 mUnk_04; + /* 08 */ u8* mUnk_08; + /* 0c */ }; struct func_0203b410_param_2 { - unk32 unk_00; - unk32 unk_04; - unk32 unk_08; - unk32 unk_0C; - unk16 unk_10; - unk16 unk_12; + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk16 mUnk_10; + /* 12 */ unk16 mUnk_12; + /* 14 */ }; // astruct_8, MsgProc_Base @@ -77,23 +78,23 @@ public: /* 04 */ unk32* mUnk_04; /* 08 */ UnkSubClass1_02256FF8* mUnk_08; /* 0c */ u16 *mUnk_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; + /* 10 */ unk32* mUnk_10; + /* 14 */ s32 mUnk_14; + /* 18 */ s32 mUnk_18; + /* 1c */ unk32 mUnk_1c; + /* 20 */ unk32 mUnk_20; + /* 24 */ unk32* mUnk_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; - /* 0x03E */ unk16 unk_3E; - /* 0x040 */ unk32 unk_40; - /* 0x044 */ unk32 unk_44; - /* 0x048 */ u8 unk_48; - /* 0x049 */ u8 unk_49; + /* 3e */ unk16 mUnk_3e; + /* 40 */ unk32 mUnk_40; + /* 44 */ unk32 mUnk_44; + /* 48 */ u8 mUnk_48; + /* 49 */ u8 mUnk_49; /* 4a */ u16 mUnk_4a; /* 4c */ u8 mUnk_4c; /* 4d */ bool mUnk_4d; @@ -124,26 +125,26 @@ public: // /* 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 */ + /* 28 */ virtual bool vfunc_28(void); + /* 2c */ virtual void vfunc_2C(void); + /* 30 */ virtual void vfunc_30(void); + /* 34 */ virtual unk32 vfunc_34(unk32 param_2); + /* 38 */ virtual bool vfunc_38(void); + /* 3c */ virtual void vfunc_3C(unk32 param_2); + /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3); + /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); + /* 48 */ virtual void vfunc_48(void); + /* 4c */ virtual void vfunc_4C(void); + /* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5); + /* 54 */ virtual void vfunc_54(void); + /* 58 */ virtual void vfunc_58(void); + /* 5c */ virtual void vfunc_5C(void); + /* 60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4); + /* 64 */ virtual void vfunc_64(s16* param_2); + /* 68 */ virtual unk32 vfunc_68(unk32 param_2); + /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3); + /* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3); + /* 74 */ UnkStruct_02032f0c(); void func_02032f94(); diff --git a/include/Unknown/UnkStruct_02035064.hpp b/include/Unknown/UnkStruct_02035064.hpp index b48f7768..122c617d 100644 --- a/include/Unknown/UnkStruct_02035064.hpp +++ b/include/Unknown/UnkStruct_02035064.hpp @@ -9,28 +9,28 @@ class UnkStruct_02035064 { public: /* 00 (vtable) */ /* 04 */ unk32 mUnk_04; - /* 0x08 */ u32* unk_08; - /* 0x0C */ unk32 unk_0C; - /* 0x10 */ unk32 unk_10; + /* 08 */ u32* mUnk_08; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk32 mUnk_10; /* 14 */ u32 mUnk_14; - /* 18 */ unk32 unk_18; + /* 18 */ unk32 mUnk_18; /* 1c */ unk32 mUnk_1c; /* 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; + /* 24 */ unk32 mUnk_24; + /* 28 */ unk32 mUnk_28; + /* 2c */ unk32 mUnk_2c; + /* 30 */ unk32 mUnk_30; + /* 34 */ u32* mUnk_34; + /* 38 */ u32* mUnk_38; + /* 3c */ unk32 mUnk_3c; + /* 40 */ unk32 mUnk_40; + /* 44 */ unk32 mUnk_44; + /* 48 */ unk32 mUnk_48; /* 4c */ s16 mUnk_4c; /* 4e */ s16 mUnk_4e; - /* 50 */ unk32 unk_50; - /* 0x54 */ unk32 unk_54; - /* 0x58 */ unk32 unk_58; + /* 50 */ unk32 mUnk_50; + /* 54 */ unk32 mUnk_54; + /* 58 */ unk32 mUnk_58; /* 5c */ UnkStruct_0202e1a0 mUnk_5c; /* 74 */ u16 *mUnk_74; /* 78 */ s32* mUnk_78; diff --git a/include/Unknown/UnkStruct_02037750.hpp b/include/Unknown/UnkStruct_02037750.hpp index 138ae201..57343813 100644 --- a/include/Unknown/UnkStruct_02037750.hpp +++ b/include/Unknown/UnkStruct_02037750.hpp @@ -41,8 +41,8 @@ public: class UnkStruct_020386d8_24 { public: - /* 0x00 */ unk32 mUnk_00; - /* 0x04 */ + /* 00 */ unk32 mUnk_00; + /* 04 */ void func_020376c0(Vec3p param_2); }; diff --git a/include/Unknown/UnkStruct_02038aa0.hpp b/include/Unknown/UnkStruct_02038aa0.hpp index 0f00c585..bec535d6 100644 --- a/include/Unknown/UnkStruct_02038aa0.hpp +++ b/include/Unknown/UnkStruct_02038aa0.hpp @@ -30,21 +30,21 @@ public: 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 */ + /* 00 */ void* mUnk_00; // pointer to MsgProc_Main (well, the first members of the base class) + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1c */ unk32 mUnk_1c; + /* 20 */ unk32 mUnk_20; + /* 24 */ unk32 mUnk_24; + /* 28 */ unk8 mUnk_28; + /* 29 */ unk8 mUnk_29; + /* 2a */ unk8 mUnk_2a; + /* 2b */ unk8 mUnk_2b; + /* 2c */ void func_0203f020(s16*, unk32); }; @@ -58,7 +58,7 @@ public: /* 128 */ UnkStruct_0203881c mUnk_128; /* 150 */ u8 unk_150[4]; /* 154 */ EntryINF1* pInfoEntry; - /* 158 */ Vec2s unk_158; // textbox position? + /* 158 */ Vec2s mUnk_158; // textbox position? /* 15c */ s16 mUnk_15c; /* 15e */ s8 mUnk_15e; /* 15f */ s8 mUnk_15f; @@ -73,7 +73,7 @@ public: /* 2c */ virtual void vfunc_2c(); /* 30 */ virtual void vfunc_30(); /* 34 */ virtual unk32 vfunc_34(s32 param1); - /* 38 */ virtual unk32 vfunc_38(); + /* 38 */ virtual bool vfunc_38(); /* 3c */ virtual void vfunc_3c() = 0; /* 40 */ virtual void vfunc_40() = 0; /* 44 */ virtual void vfunc_44(); diff --git a/include/Unknown/UnkStruct_020397f8.hpp b/include/Unknown/UnkStruct_020397f8.hpp index 6d1b6fdc..e046c518 100644 --- a/include/Unknown/UnkStruct_020397f8.hpp +++ b/include/Unknown/UnkStruct_020397f8.hpp @@ -8,9 +8,9 @@ // does it host both choices? struct UnknownMsgChoiceStruct { - /* 0x00 */ UnkStruct_0203b264* unk_00; - /* 0x04 */ unk32 unk_04; - /* 0x08 */ + /* 00 */ UnkStruct_0203b264* mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ }; // astruct_2, MsgProc_Type1 @@ -30,31 +30,31 @@ public: /* 41c */ unk16 mUnk_41c; /* 41e */ unk16 mUnk_41e; /* 420 */ unk16 mUnk_420; - /* 422 */ unk16 unk_422; + /* 422 */ unk16 mUnk_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; + /* 528 */ unk16 unk_528[4]; // number of choices? + /* 530 */ unk32 mUnk_530; + /* 534 */ unk16 mUnk_534; + /* 536 */ unk16 mUnk_536; + /* 538 */ unk16 mUnk_538; + /* 53a */ unk16 mUnk_53a; + /* 53c */ unk32 mUnk_53c; + /* 540 */ unk32 mUnk_540; + /* 544 */ unk8 mUnk_544; + /* 545 */ unk8 mUnk_545; + /* 546 */ unk8 mUnk_546; + /* 547 */ unk8 mUnk_547; + /* 548 */ unk16 mUnk_548; + /* 54a */ unk16 mUnk_54a; + /* 54c */ unk16 mUnk_54c; + /* 54e */ unk16 mUnk_54e; /* 550 */ unk32 mUnk_550; /* 554 */ unk32 mUnk_554; - /* 558 */ unk8 unk_558; - /* 0x55C */ unk8 unk_559; - /* 0x55C */ unk8 unk_55A; - /* 0x55C */ unk8 unk_55B; + /* 558 */ unk8 mUnk_558; + /* 559 */ unk8 mUnk_559; + /* 55a */ unk8 mUnk_55a; + /* 55b */ unk8 mUnk_55b; /* 55c */ unk32 mUnk_55c; /* 560 */ unk32 mUnk_560; /* 564 */ u16 unk_564[4]; @@ -117,12 +117,12 @@ public: bool func_0203c1a0(); bool func_0203c25c(); /* 00 */ virtual ~UnkStruct_020397f8(); - /* 38 */ virtual unk32 vfunc_38(); + /* 38 */ virtual bool 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); + static void func_0203e060(UnkStruct_02038aa0* param_1, u8 param_2, u8 param_3); void func_02039a3c(void); unk32 func_02039250(void); void func_02039ca8(void); @@ -138,105 +138,103 @@ public: 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 */ + /* 164 */ unk16 mUnk_164; + /* 166 */ unk16 mUnk_166; + /* 168 */ unk16 mUnk_168; + /* 16a */ unk16 mUnk_16a; + /* 16c */ unk16 mUnk_16c; + /* 16e */ unk16 mUnk_16e; + /* 170 */ unk16 mUnk_170; + /* 172 */ unk16 mUnk_172; + /* 174 */ unk16 mUnk_174; + /* 178 */ unk32 mUnk_178; + /* 17c */ unk32 mUnk_17c; + /* 180 */ UnkClass_func_ov000_020d0644 unk_180[4]; + /* 1c0 */ 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 */ + /* 00 */ virtual ~MsgProc_Type3(); + /* 08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; + /* 0c */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; + /* 10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? + /* 14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; + /* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; + /* 1c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; + /* 20 */ virtual void vfunc_20(void) override; + /* 24 */ virtual void vfunc_24(void) override; + /* 28 */ virtual bool vfunc_28(void) override; + /* 2c */ virtual void vfunc_2C(void) override; + /* 30 */ virtual void vfunc_30(void) override; + /* 34 */ virtual unk32 vfunc_34(unk32 param_2) override; + /* 38 */ virtual bool vfunc_38(void) override; + /* 3c */ virtual void vfunc_3C(unk32 param_2) override; + /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; + /* 48 */ virtual void vfunc_48(void) override; + /* 4c */ virtual void vfunc_4C(void) override; // func_02039a3c? + /* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; + /* 54 */ virtual void vfunc_54(void) override; + /* 58 */ virtual void vfunc_58(void) override; + /* 5c */ virtual void vfunc_5C(void) override; + /* 60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 64 */ virtual void vfunc_64(s16* param_2) override; + /* 68 */ virtual unk32 vfunc_68(unk32 param_2) override; + /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; + /* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; + /* 74 */ 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 */ + /* 164 */ unk16 mUnk_164; + /* 166 */ unk16 mUnk_166; + /* 168 */ unk16 mUnk_168; + /* 16a */ unk16 mUnk_16a; + /* 16c */ unk16 mUnk_16c; + /* 16e */ unk16 mUnk_16e; + /* 170 */ 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 */ + /* 00 */ virtual ~MsgProc_Type2(); + /* 08 */ /* func_02039228 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; + /* 0c */ /* func_02039578 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; + /* 10 */ /* func_0203e060 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? + /* 14 */ /* func_0203c5c4 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; + /* 18 */ /* func_0203e284 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; + /* 1c */ /* func_0203905c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; + /* 20 */ /* func_020390a4 */ virtual void vfunc_20(void) override; + /* 24 */ /* astruct_8::vfunc_24 */ virtual void vfunc_24(void) override; + /* 28 */ /* func_0203e0c8 */ virtual bool vfunc_28(void) override; + /* 2c */ /* func_02038d20 */ virtual void vfunc_2C(void) override; + /* 30 */ /* func_02038ed0 */ virtual void vfunc_30(void) override; + /* 34 */ /* func_02038c34 */ virtual unk32 vfunc_34(unk32 param_2) override; + /* 38 */ /* func_02039570 */ virtual bool vfunc_38(void) override; + /* 3c */ /* func_0203c414 */ virtual void vfunc_3C(unk32 param_2) override; + /* 40 */ /* func_0203c460 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 44 */ /* func_02038f40 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; + /* 48 */ /* func_02038b74 */ virtual void vfunc_48(void) override; + /* 4c */ /* func_0203c39c */ virtual void vfunc_4C(void) override; // func_02039a3c? + /* 50 */ /* func_02038f44 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; + /* 54 */ /* func_020392b4 */ virtual void vfunc_54(void) override; + /* 58 */ /* func_02039398 */ virtual void vfunc_58(void) override; + /* 5c */ /* func_02039058 */ virtual void vfunc_5C(void) override; + /* 60 */ /* func_020393a4 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 64 */ /* func_020393a8 */ virtual void vfunc_64(s16* param_2) override; + /* 68 */ /* func_020393d0 */ virtual unk32 vfunc_68(unk32 param_2) override; + /* 6c */ /* func_0203947c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; + /* 70 */ /* func_020394d8 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; + /* 74 */ //! TODO: vfunc_4C? void func_0203c39c(unk32 param_2, unk32 param_3); diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp index 7870c0f9..af1ba915 100644 --- a/include/Unknown/UnkStruct_0203dae0.hpp +++ b/include/Unknown/UnkStruct_0203dae0.hpp @@ -9,60 +9,60 @@ class UnkStruct_0203dae0 : public UnkStruct_02032f0c { public: /* 000 (base) */ - /* 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; + /* 052 */ unk16 mUnk_52; + /* 054 */ unk16 mUnk_54; + /* 054 */ unk16 mUnk_56; + /* 058 */ unk32 mUnk_58; + /* 05c */ s16 mUnk_5c; + /* 05e */ s16 mUnk_5e; + /* 060 */ unk32 mUnk_60; + /* 064 */ unk32 mUnk_64; + /* 068 */ unk32 mUnk_68; + /* 06c */ unk32 mUnk_6c; + /* 070 */ unk32 mUnk_70; + /* 074 */ unk32 mUnk_74; + /* 078 */ unk32 mUnk_78; + /* 07c */ unk32 mUnk_7c; + /* 080 */ unk32 mUnk_80; + /* 084 */ unk32 mUnk_84; + /* 088 */ unk32 mUnk_88; + /* 08c */ unk32 mUnk_8c; + /* 090 */ unk32 mUnk_90; + /* 094 */ unk32 mUnk_94; + /* 098 */ unk32 mUnk_98; + /* 09c */ unk32 mUnk_9c; + /* 0a0 */ unk32 mUnk_a0; + /* 0a4 */ unk32 mUnk_a4; + /* 0a8 */ unk32 mUnk_a8; + /* 0ac */ unk32 mUnk_ac; + /* 0b0 */ unk32 mUnk_b0; + /* 0b4 */ unk32 mUnk_b4; + /* 0b8 */ unk32 mUnk_b8; + /* 0bc */ unk32 mUnk_bc; + /* 0c0 */ unk32 mUnk_c0; + /* 0c4 */ unk32 mUnk_c4; + /* 0c8 */ unk32 mUnk_c8; + /* 0cc */ unk32 mUnk_cc; + /* 0d0 */ unk32 mUnk_d0; + /* 0d4 */ unk32 mUnk_d4; + /* 0d8 */ unk32 mUnk_d8; + /* 0dc */ unk32 mUnk_dc; + /* 0e0 */ unk32 mUnk_e0; + /* 0e4 */ unk32 mUnk_e4; + /* 0e8 */ unk32 mUnk_e8; + /* 0ec */ unk32 mUnk_ec; + /* 0f0 */ unk32 mUnk_f0; + /* 0f4 */ unk32 mUnk_f4; + /* 0f8 */ unk32 mUnk_f8; + /* 0fc */ unk32 mUnk_fc; + /* 100 */ unk32 mUnk_100; + /* 104 */ unk32 mUnk_104; + /* 108 */ unk8 mUnk_108; + /* 108 */ unk8 mUnk_109; + /* 108 */ unk8 mUnk_10a; + /* 108 */ unk8 mUnk_10b; + /* 10c */ unk32 mUnk_10c; + /* 110 */ unk32 mUnk_110; /* 114 */ void *mUnk_114; // MsgProc_Base2_unk_114? /* 118 */ s32 mUnk_118; /* 11c */ unk16 mUnk_11c; @@ -96,23 +96,23 @@ public: // /* 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 */ + /* 34 */ virtual unk32 vfunc_34(unk32 param_2) override; + /* 38 */ virtual bool vfunc_38(void) override; + /* 3c */ virtual void vfunc_3C(unk32 param_2) override; + /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; + /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; + /* 48 */ virtual void vfunc_48(void) override; + /* 4c */ virtual void vfunc_4C(void) override; // func_02039a3c? + /* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; + /* 54 */ virtual void vfunc_54(void) override; + /* 58 */ virtual void vfunc_58(void) override; + /* 5c */ virtual void vfunc_5C(void) override; + /* 60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 64 */ virtual void vfunc_64(s16* param_2) override; + /* 68 */ virtual unk32 vfunc_68(unk32 param_2) override; + /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; + /* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; + /* 74 */ UnkStruct_0203dae0(u8 param1); void func_0203dc10(s32 param1); diff --git a/include/Unknown/func_ov000_020d0644.hpp b/include/Unknown/func_ov000_020d0644.hpp index ff03d603..677169a4 100644 --- a/include/Unknown/func_ov000_020d0644.hpp +++ b/include/Unknown/func_ov000_020d0644.hpp @@ -5,10 +5,10 @@ class UnkClass_func_ov000_020d0644 { public: - /* 0x00 */ unk32 unk_00; - /* 0x04 */ unk32 unk_04; - /* 0x08 */ unk32 unk_08; - // /* 0x0C */ unk32 unk_0C; + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + // /* 0c */ unk32 mUnk_0c; /* 0x10 */ static void func_020d060c(void); diff --git a/src/Main/Message/BMG.cpp b/src/Main/Message/BMG.cpp index 8d899b5b..1d8c2f06 100644 --- a/src/Main/Message/BMG.cpp +++ b/src/Main/Message/BMG.cpp @@ -66,7 +66,7 @@ THUMB u16 func_020371c8(BMGFileInfo* pFileInfo, u32* pFile, s16 unk_18) { groupId = -1; pFileInfo->unk_14 = (BMGHeader*)pFile; pFileInfo->pHeader = (BMGHeader*)pFile; - pFileInfo->unk_18 = unk_18; + pFileInfo->unk_18 = mUnk_18; pSection = (SectionBase*)((u8*)pFile + sizeof(BMGHeader)); for (i = 0; i < pFileInfo->pHeader->numSections; i++) { diff --git a/src/Main/Message/func_02032f0c.cpp b/src/Main/Message/func_02032f0c.cpp deleted file mode 100644 index 75b64d70..00000000 --- a/src/Main/Message/func_02032f0c.cpp +++ /dev/null @@ -1,100 +0,0 @@ -#include "global.h" -#include "Message/MsgProc.hpp" -#include "Message/MessageManager.hpp" -#include "Save/AdventureFlags.hpp" -#include "DTCM/UnkStruct_027e103c.hpp" -#include "Player/TouchControl.hpp" -#include "Item/ItemManager.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); - -ARM UnkStruct_02032e7c::UnkStruct_02032e7c() { - this->unk_00 = NULL; - this->unk_08 = 0; - this->unk_0A = 0; - this->unk_0C = 0; - this->unk_0E = 0; - - if (func_0202ab48() == 0) { - this->unk_10 = 2; - } else { - this->unk_10 = 3; - } -} - -THUMB MsgProc_Base::MsgProc_Base() { - this->unk_04 = 0; - this->unk_08 = 0; - this->unk_0C = NULL; - this->unk_38 = 0; - this->unk_3C = 0; - this->unk_4A = 0; - this->unk_4C = 0; - this->unk_4D = 0; - this->unk_4E = 0; - this->unk_4F = 0; - this->unk_50 = 0; - this->unk_51 = 0; - func_020078f4(0, &this->unk_10, 0x18); - func_020078f4(0, &this->unk_28, 0x10); - func_020078c0(0, &this->unk_3E, 0xC); - this->unk_10 = NULL; - this->unk_2C = NULL; - this->unk_30 = 2; - this->unk_34 = 3; -} - -THUMB MsgProc_Base::~MsgProc_Base() { -} - -ARM unk32* MsgProc_Base::func_02032f98(unk32 param_2) { - this->unk_0C = param_2; - return &this->unk_0C; -} - -ARM unk32 MsgProc_Base::func_02032fa4(void) { - return UnkStruct_02035064::func_02035428(this->unk_50); -} - -ARM unk32 MsgProc_Base::func_02032fb4(void) { - return this->unk_2C->unk_00->unk_01 + this->unk_34; -} - -// non-matching -ARM bool MsgProc_Base::vfunc_14(u16 param_2, u8 param_3) { - s16 iVar1; - s16 iVar2; - - iVar1 = ((param_2 + 0x7 + ((param_2 + 0x7) >> 0x1D)) ) * 0x8; - iVar2 = ((param_3 + 0x7 + ((param_3 + 0x7) >> 0x1D)) ) * 0x8; - this->unk_4A = param_2; - this->unk_4C = param_3; - this->unk_14 = (iVar1 + (iVar1 >> 0x1D)) * 0x2000 >> 0x10; - this->unk_18 = (iVar2 + (iVar2 >> 0x1D)) * 0x2000 >> 0x10; - - return true; -} - -ARM void MsgProc_Base::vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { - func_020296e0(&this->unk_10, this->unk_2C, param_2, param_3, param_5, param_4); -} - -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 UnkStruct_02035064::UnkStruct_02035064() { - this->unk_74 = NULL; - this->unk_78 = NULL; - this->unk_7C = 0; - this->unk_80 = 0; - this->unk_82 = 0; - this->unk_84 = 0; - this->unk_86 = 0; - this->unk_87 = 0; -} - -ARM UnkStruct_02035064::~UnkStruct_02035064() { -} diff --git a/src/Main/Message/func_0203744c.cpp b/src/Main/Message/func_0203744c.cpp deleted file mode 100644 index 7ae70831..00000000 --- a/src/Main/Message/func_0203744c.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "global.h" -#include "Message/MsgProc.hpp" -#include "Message/MessageManager.hpp" -#include "Save/AdventureFlags.hpp" -#include "DTCM/UnkStruct_027e103c.hpp" -#include "Player/TouchControl.hpp" -#include "Item/ItemManager.hpp" - -ARM UnkStruct_02037750::UnkStruct_02037750(unk32 param_2, unk32 param_3) { - s32 i; - - this->unk_14 = param_3; - this->unk_18 = param_2; - this->unk_1C = 0; - this->unk_1D = 0xFF; - this->unk_1E = 0; - - for (i = 0; i < ARRAY_LEN(this->unk_04); i++) { - this->unk_04[i] = 0; - } -} - -ARM UnkStruct_02037750::~UnkStruct_02037750() { - if (data_027e0c68.unk_20[0] == this) { - data_027e0c68.func_02036d4c(this); - } -} - -// non-matching -ARM UnkStruct_020386d8::UnkStruct_020386d8() : UnkStruct_02037750(0x1000000, 0) { - this->unk_20 = -1; - this->unk_24.func_020376c0(gVec3p_ZERO); -} - -ARM UnkStruct_020386d8::~UnkStruct_020386d8() { -} - -ARM UnkStruct_0203881c::UnkStruct_0203881c() { - this->unk_14 = 0x1000; - this->unk_18 = 0; - this->unk_1C = 0; - this->unk_20 = 0; - this->unk_24 = 0; -} diff --git a/src/Main/Message/func_02038aa0.cpp b/src/Main/Message/func_02038aa0.cpp deleted file mode 100644 index e8144220..00000000 --- a/src/Main/Message/func_02038aa0.cpp +++ /dev/null @@ -1,1422 +0,0 @@ -#include "global.h" -#include "Message/MsgProc.hpp" -#include "Message/MessageManager.hpp" -#include "Save/AdventureFlags.hpp" -#include "DTCM/UnkStruct_027e103c.hpp" -#include "Player/TouchControl.hpp" -#include "Item/ItemManager.hpp" - -extern "C" void func_ov000_020d0460(void*); -extern "C" void func_0203efd8(void*, void*); -extern "C" void func_0203ee48(void*); - -extern unk16 data_02056a0e[]; -extern u8 data_02056a08[]; - -THUMB MsgProc_Main::MsgProc_Main(unk32 param_2, unk16 param_3, unk32 param_4) - : MsgProc_Base2(param_2, param_3, param_4), - unk_124(0) -{ - this->func_020387e0(this->unk_150); - this->pInfoEntry = 0; - this->unk_158.y = 0; - this->unk_15C = 0; - this->unk_15E = 0xFF; - this->unk_15F = 0xFF; - this->unk_160 = 1; - this->unk_11E = param_3; -} - -THUMB MsgProc_Main::~MsgProc_Main() { -} - -THUMB void MsgProc_Main::func_02038b28(void) { - this->unk_114->unk_04 = NULL; -} - -ARM void MsgProc_Main::func_02038b34(u8 param_2, u8 param_3) { - MsgProc_Type1::func_0203e060(this, param_2, param_3); -} - -ARM void MsgProc_Main::func_02038b40(void) { - this->unk_15C = -1; - this->unk_128.unk_00 = NULL; - this->func_0203dc10(0); - this->vfunc_48(); -} - -ARM void MsgProc_Main::func_02038b74(void) { -} - -// non-matching -ARM bool MsgProc_Main::func_02038b78(void) { - if (data_027e0c54 == 0) { - if ((this->unk_50 != 0 && data_027e0c68.func_02036850() != 0) || (this->unk_50 == 0 && data_027e0c68.func_02036824() != 0)) { - return true; - } - - return false; - } else { - bool ret = CHECK_UNK_FLAGS(1); - - if ((this->unk_50 == 0 || ret)) { - return (this->unk_50 != 0 && ret); - } - - return false; - } -} - -ARM unk32 MsgProc_Main::vfunc_34(unk32 param_2) { - s16 iVar1; - unk32 iVar2; - unk32 iVar3; - unk32 uVar4; - - iVar2 = this->func_02038cf4(); - iVar3 = this->func_02038d10(); - iVar1 = ((this->unk_158.y - (this->unk_18 << 3) / 2)); - - if ((param_2 < iVar2 + iVar1) || (iVar2 + iVar3 + iVar1 <= param_2)) { - return -1; - } - - iVar3 = this->unk_34; - uVar4 = this->func_02032fb4(); - iVar2 = (param_2 - iVar1) - iVar2; - - return func_01ff9b4c(iVar2 + iVar3 / 2, uVar4); -} - -ARM unk32 MsgProc_Main::func_02038cb8(unk32 param_2) { - u8 bVar1 = this->unk_2C->unk_00->unk_08[1]; - unk32 iVar2 = this->func_02038cf4(); - unk32 iVar1 = this->func_020337d8(param_2 + 1); - return iVar2 + iVar1 - bVar1; -} - -ARM unk32 MsgProc_Main::func_02038cf4(void) { - unk32 iVar1; - unk32 iVar2; - - iVar2 = this->unk_18; - iVar1 = this->func_02038d10(); - return (iVar2 * 8 - iVar1) / 2; -} - -ARM unk32 MsgProc_Main::func_02038d10(void) { - return this->func_020337d8(this->unk_150[0]); -} - -ARM void MsgProc_Main::vfunc_30(void) { - if (this->unk_15C > 0) { - this->func_0203e090(); - } else { - this->unk_118 = -1; - } -} - -ARM void MsgProc_Main::func_02038ef4(unk32 param_2, unk32 param_3) { - unk32 local_14; - unk32 local_18; - - this->vfunc_70(&local_14, &local_18); - this->func_0203e1b0(local_14 + param_2, local_18 + param_3, 0); -} - -ARM void MsgProc_Main::func_02038f40(void) { -} - -// non-matching -ARM void MsgProc_Main::func_02038f44(EntryINF1* param_2, u32 param_3, func_02038f44_param4* param_4, UnkSubClass1_02256FF8* param_5, unk32 param_6) { - int iVar1; - - this->pInfoEntry = param_2; - this->unk_08 = param_5; - this->unk_15F = -1; - this->unk_15C = 0x78; - this->unk_15E = param_4->unk_0C; - this->func_0203dcfc(param_6, 0, this->unk_11E, 2); - this->unk_128.func_02038858(param_3); - this->unk_30 = this->unk_150[4] + 5; - - this->vfunc_54(); - // this->vfunc_60(0, 0, (unk32)param_4); - // this->vfunc_64(param_4); - - if (*(unk32*)data_027e0618 == 2) { - if (this->func_02032fa4() == 0) { - data_027e103c->func_ov000_020cfc9c(1, 0); - } else { - data_027e103c->func_ov000_020cfc9c(0, 1); - } - } - - this->vfunc_5C(); -} - -ARM void MsgProc_Main::func_02039058(void) { -} - -// non-matching -ARM unk32 MsgProc_Main::func_0203905c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { - u16 sVar1; - bool bVar5; - - sVar1 = param_2[0]; - bVar5 = (sVar1 == 0xA || sVar1 == 0x20) || sVar1 == 0x3000; - - if (bVar5 && this->unk_150[2] != 0) { - this->unk_150[2] = 1; - } else { - this->unk_150[2] = 0; - } - - // this->unk_150[2] = bVar5; - - return this->func_02033360(); -} - -// non-matching -ARM void MsgProc_Main::vfunc_08(unk32* param_2, unk32* param_3) { - this->unk_15C = 10; - this->unk_150[2] = 1; - this->func_0203e2ac(param_3); -} - -ARM unk32 MsgProc_Main::vfunc_68(unk32 param_2) { - switch (param_2) { - case 0: - break; - case 1: - this->unk_34 = 4; - break; - case 2: - this->unk_34 = 6; - break; - case 3: - this->unk_34 = 1; - break; - case 4: - this->unk_34 = 0; - break; - default: - break; - } - - return ((this->unk_18 << 3) - this->func_020337d8(param_2)) / 2; -} - -ARM void MsgProc_Main::vfunc_70(unk32* param_2, unk32* param_3) { - this->vfunc_6C(param_2, param_3); - *param_2 += this->unk_158.x; - *param_3 += this->unk_158.y; -} - -ARM void MsgProc_Main::vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { - this->func_0203dc10(1, param_3); - this->func_02033190(param_2, param_3, param_4, param_5); -} - -THUMB MsgProc_Type1::MsgProc_Type1(unk32 param_2, unk16 param_3, unk32 param_4) : - MsgProc_Main(0, 0, param_4), - unk_164(NULL) -{ - UnknownMsgChoiceStruct* puVar3; - - this->unk_410.unk_00 = this; - this->unk_414 = 0; - this->unk_418 = NULL; - this->unk_41C = 0; - this->unk_41E = 0; - this->unk_420 = 0; - this->unk_424.unk_00 = this; - - // ??? - puVar3 = this->unk_428; - do { - puVar3->unk_00 = NULL; - puVar3 += 1; - } while ((unk32*)puVar3 < (unk32*)this->unk_528); - - func_0203ee48(&this->unk_424); - func_ov000_020d0460(&this->unk_534); - this->unk_53C = 0; - this->unk_540 = ~0x7FFF; - this->unk_544 = 3; - func_ov000_020d0460(&this->unk_548); - this->unk_550 = 0; - this->unk_554 = 0x00016000; - this->unk_558 = 3; - this->unk_55C = -1; - this->unk_560 = -1; - this->unk_56C = 0; - this->unk_56E = 0; - this->unk_570 = 0; - this->unk_572 = 0; - this->unk_574 = 0; - this->unk_576 = 0; - this->unk_578 = 3; - this->unk_57A = 0; - this->unk_57B = -1; - this->unk_57C = 0; - this->unk_57D = 0; - this->unk_57E = 0; - this->unk_57F = 0; - this->unk_580 = 0; - this->unk_581 = 0; - this->unk_582 = 0; - this->unk_583 = 0; - this->unk_585 = 0; - this->unk_586 = 0; - func_0203efd8(&this->unk_588, this); - this->unk_124 = (UnkSubClass1_unk_124*)&this->unk_588; - this->func_02039ca8(); - - if (this->func_02032fa4() != 0) { - this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); - } else { - this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); - } - - this->unk_168.func_020351b8(true, false, false, false); - this->unk_1F0.func_020351b8(false, false, false, false); - this->unk_278.func_020351b8(false, false, false, false); -} - -THUMB void MsgProc_Type1::func_02039a3c(void) { - this->func_02038b28(); - this->func_0203dcfc(this->unk_50, 0, 0, 2); -} - -// non-matching -ARM void MsgProc_Type1::vfunc_2C(void) { - if (data_027e0618[0x101] != 0) { - if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { - return; - } - } - - this->func_02038d20(); - - if (this->unk_56C > 0) { - this->unk_56C--; - } - - if (this->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { - this->unk_57F = 0; - } - - if (this->unk_15C > 0) { - if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { - this->unk_424.func_0203ef78(this->unk_128.unk_08); - } - - this->func_0203be64(); - this->func_0203a35c(); - - if (this->unk_580 != 0) { - this->unk_168.func_0203516c(); - } - - if (this->unk_584 != 0) { - this->unk_300.func_0203516c(); - } - - if (this->unk_585 != 0) { - this->unk_388.func_0203516c(); - } - - if ((this->func_0203a2c0() != 0 && this->unk_57F == 0) && this->unk_56C <= 0) { - this->unk_1F0.func_0203516c(); - } - - if (this->unk_08 != NULL) { - bool value = this->unk_08->unk_1C; - - if ((value == 1) || (value == 2)) { - this->unk_278.func_0203516c(); - } - } - - if (this->unk_15E == 6) { - func_ov018_02169634(this); - } else { - this->unk_410.func_0203ebf8(); - } - } - - if (this->unk_15C == 1) { - if (this->unk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) { - switch (this->unk_150[1]) { - case 0: - this->func_0203b0ec(1); - break; - case 2: - case 3: - if (this->func_0203a3e0() != 0) { - this->func_0203bd8c(this->unk_572); - } else { - this->func_0203b0ec(1); - } - break; - } - } - } -} - -ARM void MsgProc_Type1::func_02039ca8(void) { - s32 i; - - for (i = 0; i < ARRAY_LEN(this->unk_564); i++) { - this->unk_564[i] = 0x1A; - } -} - -ARM void MsgProc_Type1::vfunc_3C(unk32 param_2) { - if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { - if (this->unk_124->unk_29 != 3) { - if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { - return; - } - - if (data_027e0618[0x101] != 0) { - if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { - return; - } - } - - this->vfunc_40(0, 0); - } - } - -} - -// non-matching -ARM void MsgProc_Type1::vfunc_40(unk32 param_2, unk32 param_3) { - MsgProc_Main* bVar1; - s8 cVar2; - unk32 iVar4; - unk32 iVar6; - unk32 iVar7; - unk32 iVar8; - unk32 uVar9; - unk32 iStack_a8; - unk32 iStack_a4; - unk32 local_a0; - unk32 local_9c; - unk32 local_98; - unk32 local_94; - unk32 local_90; - unk32 local_8c; - unk32 iVar5; - UnkStruct_01ffbe34 aStack_88; - UnkStruct_01ffbe34 aStack_68; - UnkStruct_01ffbe34 aStack_48; - - local_8c = 0; - local_90 = 0; - bVar1 = data_027e0c68.unk_28[this->unk_50]; - - this->vfunc_6C(&local_8c, &local_90); - this->func_0203a188(local_8c + param_2, local_90 + param_3, 0); - this->func_0203e1b0(param_2 + local_8c + (this->unk_158.x - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_158.y - (this->unk_18 << 3) / 2), 0); - - if (this->unk_584 != 0) { - iVar5 = this->unk_18 << 3; - - if (this->unk_580 != 0) { - iVar5 = -0xC; - } else { - iVar5 = 0; - } - - this->unk_300.func_02034a1c(param_2 + local_8c + this->unk_55C + (this->unk_158.x - (this->unk_14 << 3) / 2), - iVar5 + param_3 + local_90 + this->unk_560 + ((this->unk_158.y - (iVar5 / 2))), 0); - } - - if (this->unk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { - switch (data_027e0618[0]) { - case 2: - if (data_027e0cbc.func_0203d7e0(3) != 0) { - this->unk_388.func_02034b0c(0xBE, 0, 0, 0, 0); - } - break; - case 6: - if (data_027e0cbc.func_0203d7e0(0x58) != 0) { - this->unk_388.func_02034b0c(0x013B, 0, 0, 0, 0); - } - break; - } - } - - iVar5 = this->func_02032fa4(); - iVar8 = bVar1->unk_18; - uVar9 = data_02056a04[iVar8]; - // func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); - iVar6 = this->unk_158.x - local_94; - iVar7 = this->unk_158.y - local_98; - - if ((this->unk_15E != 7) && (this->func_0203a2c0() != 0)) { - func_01ffbe34(&aStack_48); - func_020347b0(uVar9, data_02056a10[iVar8], &local_9c, &local_a0, 4, 4); - local_9c += param_2 + local_8c + iVar6; - local_a0 += param_3 + local_90 + iVar7; - - if (data_027e0c38[5] == 1) { - iVar8 = func_0202ab48(); - - if (iVar8 == 0) { - iVar8 = 0; - } else { - iVar8 = -3; - } - - local_9c = (0x108 - local_9c) + iVar8; - } - - if ((this->unk_57F == 0) && (this->unk_56C <= 0)) { - func_01ffbe34(&aStack_68); - aStack_68.mUnk_0a = 1; - this->unk_1F0.func_02034a1c(local_9c, local_a0, &aStack_68); - } else { - // func_02034984(iVar5 != 0 ? 0x11F : 0x18, 0, local_9c, local_a0 + 2, 0); - } - } - - if (this->unk_08 != 0) { - if ((this->unk_08->unk_1C == 1 || this->unk_08->unk_1C == 2) == 0) { - return; - } - - func_01ffbe34(&aStack_88); - aStack_88.mUnk_0a = 1; - func_02034698(iVar5 != 0 ? 0x11F : 0x18, 2, &iStack_a4, &iStack_a8); - iStack_a4 += param_2 + local_8c + iVar6; - iStack_a8 += param_3 + local_90 + iVar7; - this->unk_278.func_02034a1c(iStack_a4, iStack_a8, &aStack_88); - } -} - -ARM void MsgProc_Type1::func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4) { - unk16 sVar1; - unk16 sVar2; - unk32 iVar3; - unk32 iVar4; - unk32 uVar5; - unk32 iVar6; - unk32 iStack_54; - unk32 iStack_50; - unk32 iStack_4c; - unk32 iStack_48; - UnkStruct_01ffbe34 aStack_44; - unk32 uStack_24; - - if (this->unk_15E == 7) { - return; - } - - // (short)(ushort)*(byte *)((int)data_027e0c68.unk_28[(this->unk_50 - 0x28) * 0x18]; - - iVar6 = data_027e0c68.unk_10 + this->unk_50; - // uStack_24 = param_4; - - if (data_027e0cbc.func_0203d7e0(data_02056a00[iVar6]) != 0) { - uVar5 = data_02056a04[iVar6]; - - func_0203489c(uVar5, data_02056a16[iVar6], &iStack_48, &iStack_4c); - iVar3 = iStack_50 + (this->unk_158.x - iStack_48); - - func_02034698(uVar5, data_02056a0e[iVar6], &iStack_50, &iStack_54); - iVar4 = iStack_54 + (this->unk_158.y - iStack_4c); - - func_01ffbe34(&aStack_44); - aStack_44.mUnk_0a = 1; - - if (this->unk_580 != 0) { - this->unk_168.func_02034a1c(param_2 + iVar3, param_3 + iVar4, &aStack_44); - } else { - func_02034984(uVar5, data_02056a08[iVar6], param_2 + iVar3, param_3 + iVar4); - } - } -} - -// non-matching -ARM bool MsgProc_Type1::func_0203a2c0(void) { - if ((this->unk_150[1] != 1 && this->unk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { - return true; - } - - return false; -} - -ARM unk32 MsgProc_Type1::func_0203a30c(void) { - return this->unk_574 / this->pInfoEntry->unk_06; -} - -// non-matching (regalloc) -ARM void MsgProc_Type1::vfunc_48(void) { - if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { - this->func_02038b40(); - } - - this->unk_410.func_0203ec34(); -} - -ARM void MsgProc_Type1::func_0203a35c(void) { - if ((this->unk_57C == 1 || this->unk_150[3] != 0) || (this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { - if (this->func_0203a3e0()) { - s16 unk_56E = this->unk_56E; - s16 unk_570 = this->unk_570; - MsgProc_Type1* unk_164 = this->unk_164; - - unk_164->unk_168.unk_10 = unk_56E; - unk_164->unk_168.unk_14 = unk_570; - this->unk_164->func_02039208(4); - } - } else { - this->unk_164->func_02038b40(); - } -} - -ARM bool MsgProc_Type1::func_0203a3e0(void) { - return this->unk_164->unk_168.unk_06 > 0; -} - -// non-matching -ARM void MsgProc_Type1::vfunc_44(s32 touchLastX, s32 touchLastY) { - unk32 iVar2; - unk32 iVar5; - unk32 iStack_14; - unk32 iStack_18; - - if (this->unk_15C <= 0 || this->func_0203951c() == 0) { - return; - } - - iStack_14 = 0; - iStack_18 = 0; - - this->vfunc_6C(&iStack_14, &iStack_18); - - iVar5 = touchLastX - iStack_14; - iVar2 = touchLastY - iStack_18; - - if ((data_027e103c != 0 && data_027e103c->mUnk_1c == 0x8F) || (data_027e077c.mUnk_0 != data_027e077c.mUnk_4)) { - return; - } - - if ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { - if ((data_027e0d78.mFlags & 1) != 0) { - if (this->unk_50 == 0 && data_027e0d38 != 0) { - if (func_ov000_02079e04() == 0 && data_027e0e28->func_ov000_0207bc48() == 0) { - if (data_027e0618[0x101] == 0 && data_027e103c->mUnk_24 == 0) { - return; - } - } - } - - if (this->func_0203a6d0(iVar5, iVar2) == 0 && this->func_0203a2c0() != 0) { - this->unk_57F = 1; - } - } else { - if (data_027e0d78.mTouch != 0) { - this->func_0203a6d0(iVar5, iVar2); - return; - } - - if (data_027e0d78.mTouch == 0) { - switch(this->unk_150[1]) { - case 3: - case 4: - break; - case 5: - if (data_027e103c->mUnk_20 == 3) { - this->func_0203b0ec(1); - } - break; - case 6: - if (data_027e103c->mUnk_20 == 5) { - this->func_0203b0ec(1); - } - break; - case 7: - break; - case 2: - //! TODO: fixme - // if (this->unk_164->unk_168.unk_06 <= 0) { - // if ((data_027e0d78.mFlags & 2) != 0) { - // this->unk_128.unk_14 = 0; - - // if (this->func_0203b0bc() != 0) { - // this->func_0203b0ec(1); - // } - - // this->unk_1F0.unk_5C.unk_08 = 0; - // this->unk_1F0.func_020352d8(); - // } - // } - break; - case 0: - case 1: - default: - if ((data_027e0d78.mFlags & 2) != 0) { - this->unk_128.unk_14 = 0; - - if (this->func_0203b0bc() != 0) { - this->func_0203b0ec(1); - } - - this->unk_1F0.unk_5C.unk_08 = 0; - this->unk_1F0.func_020352d8(); - } - break; - } - } - } - } -} - -ARM bool MsgProc_Type1::func_0203a6d0(unk32 param_2, unk32 param_3) { - unk32 iVar1; - unk32 uVar2; - UnkStruct_0203b264* piVar3; - - if (this->unk_164->unk_168.unk_06 > 0 && this->unk_164->unk_15C <= 0) { - return false; - } - - iVar1 = this->vfunc_34(param_3); - piVar3 = NULL; - - if (!(iVar1 < 0) && iVar1 < 4) { - piVar3 = this->unk_424.func_0203eeb0(iVar1, param_2); - } - - if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16*)piVar3->mUnk_0)[2]) == 0x00FF0002) { - uVar2 = this->func_02038cb8(iVar1); - this->unk_410.func_0203ec4c(piVar3, uVar2, - (s16)(this->unk_158.x - ((this->unk_14 << 3) / 2)) + iVar1 + this->unk_56E, - (s16)(this->unk_158.y - ((this->unk_18 << 3) / 2)) + iVar1 + this->unk_570 - ); - - this->unk_57F = 0; - return true; - } - - return false; -} - -// non-matching -ARM void MsgProc_Type1::vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) { - bool bVar5; - bool bVar2; - int iVar4; - int iVar6; - s16 temp; - - iVar6 = param_4[0]; - - if (data_027e0c54 != 0) { - MsgProc_Type1* pVar4 = data_027e0c68.func_02036700(); - - if (pVar4 != NULL && pVar4->unk_15C > 0) { - this->func_02038b40(); - } - } - - if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { - MsgProc_Type1* pVar4 = (MsgProc_Type1*)data_027e0c68.unk_28[4]; - - if (pVar4 != NULL && pVar4->unk_15C > 0) { - this->func_02038b40(); - } - } - - this->unk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; - temp = param_4[8]; - - if (temp >= 0 && param_4[9] >= 0) { - temp = param_4[10]; - } - - if (temp < 0) { - this->unk_57B = temp; - } else { - this->unk_57B = 0; - } - - // this->func_02038f44(param_2, param_3, param_4, param_5, iVar6); - this->unk_574 = 0; - - if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param_4[11])) { - data_027e103c->func_ov000_020cf284(0x80, 0); - } -} - -// non-matching (can't get the switch decomp...) -ARM void MsgProc_Type1::vfunc_54(void) { - short sVar1; - int iVar2; - u16* puVar3; - int iVar4; - u16 uVar5; - unk8 uVar6; - u16 *local_54 [17]; - - if ((this->unk_18 & 0x1FFFFFFF) != 8) { - this->func_0203e060(this, 0xE0, 0x40); - - if (this->pInfoEntry == NULL) { - iVar2 = 2; - } else { - iVar2 = (int)*(char *)(this->pInfoEntry->unk_05); - } - - this->func_0203dcfc(this->unk_50, 0, (int)this->unk_11E, iVar2); - } - - this->unk_410.func_0203ebe0(); - this->unk_580 = 0; - this->func_020392b4(); - this->unk_57C = 0; - //! TODO: fixme - // this->unk_164->unk_168.unk_06 = 0; - this->unk_57D = 0; - this->unk_57F = 0; - this->unk_57A = 0; - - if (this->pInfoEntry->unk_06 < 2) { - this->unk_580 = 1; - } - - this->unk_424.func_0203ee48(); - this->unk_150[1] = 1; - puVar3 = this->unk_128.unk_00; - local_54[0] = puVar3; - iVar2 = 0; - - for (iVar2 = 0; (iVar2 / this->pInfoEntry->unk_06) == 0; iVar2++, puVar3 = this->func_02037604(local_54)) { - if (local_54[iVar2] != NULL) { - puVar3 = local_54[iVar2]; - } - - if (local_54[iVar2] == NULL || puVar3 == NULL) { - break; - } - - if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { - uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; - if (0x00010017 < uVar5) { - if (uVar5 == 0x00020001) { - //! TODO: fixme - // sVar1 = this->unk_164->unk_168.unk_06; - - // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; - // (param_1 + sVar1 * 2 + 0x562)[1] = 0; - } - } else { - // switch (*local_54[iVar2]) { - // case 0: - // continue; - // case 1: - // case 2: - // case 3: - // case 4: - // if (this->unk_164->unk_168.unk_06 == 0) { - // this->func_0203cabc(this->unk_164->unk_50); - // this->unk_164->unk_50 = 0x1A; // ??? - - // while (this->unk_564 < 4) { - // this->unk_564--; // ??? - // } - - // this->unk_580 = 1; - // } else { - // this->unk_150[1] = 4 - // } - // break; - // case 5: - // case 6: - // case 7: - // case 8: - // case 9: - // case 10: - // case 11: - // case 12: - // case 13: - // case 14: - // case 15: - // case 16: - // case 17: - // case 18: - // case 19: - // case 20: - // case 21: - // case 22: - // case 23: - // case 24: - // case 25: - // sVar1 = this->unk_164->unk_168.unk_06; - // break; - // default: - // return; - // } - } - } - - if (*local_54[iVar2] == '\n') { - continue; - } - } - -/* while(true) { - - // switch (*local_54[iVar2]) { - // case ESCAPE_SEQUENCE_MARKER: - // case '\n': - // } - - if (*local_54[iVar2] == ESCAPE_SEQUENCE_MARKER) { - uVar5 = (local_54[iVar2][3] << 0x10) | local_54[iVar2][2]; - if (0x00010017 < uVar5) { - if (uVar5 == 0x00020001) { - sVar1 = this->unk_164->unk_168.unk_06; - // (param_1 + sVar1 * 2 + 0x562)[0] = '\x1B'; - // (param_1 + sVar1 * 2 + 0x562)[1] = 0; - } - } else { - /* WARNING: Could not recover jumptable at 0x0203aa7c. Too many branches */ - /* WARNING: Treating indirect jump as call - // if (-1 < (int)(uVar5 - 0x10000)) { - // (*(code *)((uVar5 - 0x10000) * 4 + 0x203aa84))(); - // return; - // } - } - } else if (*local_54[iVar2] == '\n') { - iVar2 = iVar2 + 1; - iVar4 = (iVar2 / this->pInfoEntry->unk_06); - - if (iVar4 == 0) { - break; - } - } - } - */ - if (this->unk_15E == '\x06') { - this->func_0203e060(this, 0xE0, 0x30); - - if (this->pInfoEntry == NULL) { - iVar2 = 2; - } else { - iVar2 = this->pInfoEntry->unk_05; - } - - this->func_0203dcfc(this->unk_50,0,(int)this->unk_11E,iVar2); - } - - if (this->unk_580 != 0) { - this->func_0203e060(this, 0xE0, 0x28); - - if (this->pInfoEntry == NULL) { - iVar2 = 2; - } else { - iVar2 = this->pInfoEntry->unk_05; - } - - this->func_0203dcfc(this->unk_50, 0, this->unk_11E, iVar2); - - if (this->unk_50 == 0) { - uVar6 = 1; - } else { - uVar6 = 7; - } - - // *(undefined *)((int)PTR_PTR_0203aea4->unk_28 + ((byte)param_1[0x50] - 0x28)) = uVar6; - // PTR_PTR_0203aea4[this->unk_50] = uVar6; - data_027e0c68.unk_28[this->unk_50]->unk_18 = uVar6; - this->func_0203b764(); - - if (this->unk_15F == 0 || this->pInfoEntry->unk_06 < 3) { - this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; - this->unk_168.func_020352d8(); - } else { - this->unk_168.func_020351b8(1, 0, 0, 0); - } - } - - this->unk_1F0.unk_5C.unk_08 = 0; - this->unk_1F0.func_020352d8(); - this->vfunc_0C(0, 0, 0, 0); - // (**(code **)(*(int *)param_1 + 0x10))(0); -} - -ARM void MsgProc_Type1::vfunc_5C(void) { - if (this->unk_15F == 0 || this->pInfoEntry->unk_06 <= 2) { - this->unk_168.unk_5C.unk_08 = this->unk_168.unk_7C; - this->unk_168.func_020352d8(); - } else { - this->unk_168.unk_5C.unk_08 = 0; - this->unk_168.func_020352d8(); - this->unk_168.func_020351b8(1, 0, 0, 0); - } -} - -// non-matching -ARM void MsgProc_Type1::vfunc_58(void) { - bool bVar1; - s8* puVar2; - int iVar3; - char *pcVar4; - - if (this->unk_160 != 0) { - if (data_027e103c != NULL) { - if (data_027e103c->func_ov000_020cf4bc() != 0) { - puVar2 = data_027e103c->func_ov000_020cef9c(); - - if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { - puVar2 = data_027e103c->func_ov000_020cef9c(); - - if ((MsgProc_Type1*)(puVar2 + 0x244) == this) { - data_027e103c->func_ov000_020cfb38(); - } - } - } - - if (this->unk_581 != 0 && data_027e103c->func_ov000_020cf488() != 0) { - data_027e103c->func_ov000_020cfa24(); - this->unk_581 = 0; - } - - if (this->unk_582 != 0) { - data_027e103c->func_ov000_020cfe40(0, 2); - this->unk_582 = 0; - } - - if (this->unk_583 != 0) { - data_027e103c->func_ov005_02104028(0); - this->unk_583 = 0; - } - } - - // if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.unk_04 + 0x99) != 0 && - // (data_027e077c.mUnk_0 != 0x39 || data_027e103c->func_ov000_020cf0bc())) { - // data_027e1054.func_ov003_020f4874(); - // data_027e103c->func_ov005_02103f8c(data_02057ed4); - // } - } - - this->func_02039398(); -} - -ARM bool MsgProc_Type1::func_0203b0bc(void) { - return this->unk_57F != 0 && data_027e077c.mUnk_0 == data_027e077c.mUnk_4; -} - -// non-matching -ARM unk32 MsgProc_Type1::func_0203b0ec(unk32 param_2) { - s32 iVar4; - u16 *puVar2; - u32 uVar3; - s32 unaff_r6; - bool bVar1; - - iVar4 = 0; - bVar1 = false; - - uVar3 = param_2; - - if (((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { - uVar3 = 0; - } else { - uVar3 = 1; - } - - unaff_r6 = this->unk_50 == uVar3; - - this->unk_410.func_0203ec34(); - this->unk_585 = 0; - this->unk_584 = 0; - - if (this->unk_150[3] != 0) { - iVar4 = 1; - this->unk_56C = this->unk_578; - bVar1 = true; - this->unk_15C = 0x78; - } else { - if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { - this->func_02038b40(); - - if (data_027e0d38 != 0) { - data_027e103c->func_ov000_020cf224(1); - data_027e103c->func_ov000_020cf2a0(1); - } - - if (this->unk_08 == NULL) { - this->vfunc_58(); - } - - iVar4 = 1; - } - } - - if (iVar4 != 0) { - if (bVar1) { - this->vfunc_54(); - } - - if (unaff_r6 != 0) { - data_027e0d04.func_0203fe60(0); - } - } - - if (((param_2 != 0 && iVar4 != 0) && unaff_r6 != 0) && this->unk_15E != 7) { - data_ov000_020eec9c.func_ov000_020d77e4(0x19); - } - - return iVar4; -} - -// non-matching (regalloc) -ARM unk32 MsgProc_Type1::vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) { - u16 sVar1; - u32 uVar4; - s32 unaff_r4; - bool bVar5; - - if (this->func_0203951c() == 0) { - return 1; - } - - if (this->unk_580 != 0) { - unaff_r4 = -0xC; - } else { - unaff_r4 = 0; - } - - sVar1 = param_2->mUnk_4[0]; - - if (sVar1 != 0x1A || sVar1 == 0x1A) { - bVar5 = true; - - if (sVar1 == 0x1A) { - uVar4 = (param_2->mUnk_0[3] << 0x10) | ((u16*)param_2->mUnk_0)[2]; - - if (((uVar4 == 0x0001000A || uVar4 == 0x00020000) || uVar4 == 0x00FF0000)) { - bVar5 = false; - } - } - - if (bVar5) { - this->unk_424.func_0203ee80(this->unk_128.unk_08); - } - } - - return this->func_0203e284(param_2, param_3, param_4 + unaff_r4); -} - -// non-matching -ARM unk32 MsgProc_Type1::vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { - int iVar1; - u16* psVar3; - - psVar3 = param_3->mUnk_4; - - if (psVar3[0] == 10) { - this->unk_424.func_0203ef78(this->unk_128.unk_08, psVar3[0], param_4); - this->unk_574++; - - if (this->func_0203a30c() == 0) { - this->unk_150[3] = 1; - } - } - - if (this->unk_15E == 6) { - return 1; - } - - switch (this->unk_57A) { - case 0: - return this->func_0203905c(param_2, param_3, param_4, param_5); - case 1: - UnknownMsgChoiceStruct* pChoiceData; - s32 i = this->func_0203a30c(); - pChoiceData = &this->unk_428[this->unk_528[i]]; - return this->unk_164->func_0203cb5c(*param_2, (((pChoiceData->unk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->unk_00->mUnk_0)[2]) + ~0xFFFE)); - default: - break; - } - - return 0; -} - -// non-matching -ARM void MsgProc_Type1::vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) { - unk16 sVar1; - unk16 uVar2; - unk32 iVar3; - unk32 iVar4; - unk32 uVar5; - u32 uVar6; - - uVar6 = 0; - - if (this->func_02032fa4() == 0) { - switch(param_2->unk_0C) { - case 0: - case 1: - uVar6 = this->unk_580 != 0; - break; - case 2: - uVar6 = 2; - break; - case 3: - uVar6 = 3; - break; - case 5: - uVar6 = 4; - break; - case 6: - uVar6 = 5; - break; - default: - // why??? - switch (param_2->unk_0C) { - case 4: - uVar6 = 8; - break; - case 7: - uVar6 = 9; - break; - default: - if (this->unk_580 != 0) { - uVar6 = 7; - } else { - uVar6 = 6; - } - break; - } - break; - } - } - - // PTR_PTR_0203b5ac[(byte)param_1[0x50]] = (char)uVar6; - data_027e0c68.unk_28[this->unk_50]->unk_50 = uVar6; - - if (this->unk_15E == 7) { - uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); - func_02032304(data_02068894, data_02057ed8, data_02056af0, 1, param_4); - iVar3 = func_02016fcc(uVar5); - } else { - if (this->func_02032fa4() != 0) { - uVar5 = 0x33; - } else { - uVar5 = 0x32; - } - - data_027e0cbc.func_0203d77c(uVar5, 1, 1); - iVar3 = data_027e0cbc.func_0203d77c(data_02056a00[uVar6 * 0x18] - 2, 1, 1); - } - - if (param_2->unk_10 < 0) { - iVar3 = param_2->unk_12; - } - - if (param_2->unk_10 <= 0 && iVar3 > 0) { - uVar2 = param_2->unk_12; - this->unk_158.x = param_2->unk_10; - this->unk_158.y = uVar2; - } else { - this->func_0203b764(); - } -} - -// non-matching (regalloc) -ARM void MsgProc_Type1::vfunc_64(s16* param_2) { - unk32 uVar2; - - if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { - uVar2 = 0x16; - } else { - uVar2 = 0; - } - - this->unk_124->func_0203f020(param_2, uVar2); - this->func_0203be08(); - - if (this->func_02032fa4()) { - this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); - } else { - this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); - } - - this->unk_168.func_020351b8(1, 0, 0, 0); - this->unk_1F0.func_020351b8(0, 0, 0, 0); - this->unk_278.func_020351b8(0, 0, 0, 0); - this->func_020393a8(param_2); -} - -// non-matching -ARM void MsgProc_Type1::func_0203b764(void) { - s32 i = data_027e0c68.unk_00[this->unk_50]; - - this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); - - switch (this->unk_57B) { - case 1: - this->unk_158.y -= 38; - break; - case 2: - switch (this->pInfoEntry->unk_06) { - case 2: - this->unk_158.y -= 111; - break; - case 3: - this->unk_158.y -= 98; - break; - default: - break; - } - break; - default: - break; - } -} - -// switch decomp issue -ARM UNK_TYPE MsgProc_Type1::vfunc_20(UNK_TYPE) { - // TODO -} - -ARM void MsgProc_Type1::func_0203bd8c(u16 param_2) { - this->unk_576 = param_2; - - if (this->func_0203b0ec(0) != 0) { - data_ov000_020eec9c.func_ov000_020d77e4(this->unk_564[param_2]); - } -} - -ARM void MsgProc_Type1::vfunc_6C(unk32* param_2, unk32* param_3) { - this->func_0203947c(); - *param_2 += this->unk_56E; - *param_3 += this->unk_570; -} - -ARM void MsgProc_Type1::func_0203be08(void) { - if (data_027e0d38 != 0) { - if (data_027e103c->func_ov000_020cf42c() != 0) { - this->unk_534 = this->unk_538; - } else { - this->unk_534 = this->unk_536; - } - - if (this->func_0203c084() != 0) { - this->unk_548 = this->unk_54C; - } - } -} - -// non-matching -ARM unk32 MsgProc_Type1::func_0203c084(void) { - unk32 uVar4; - bool bVar2; - bool bVar1; - bool bVar3; - - uVar4 = 0; - - if (this->unk_50 == 0) { - bVar2 = true; - bVar1 = true; - - if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0 && data_027e103c->func_ov000_020cf8fc(0x8F) == 0) { - bVar1 = false; - } - - if (!bVar1 && data_027e0618[0x101] == 0) { - if ((data_027e0d38 != NULL && data_027e0d38->mUnk_14 == 1) == 0) { - bVar2 = false; - } - } - - if (bVar2) { - uVar4 = 1; - } - } - - return uVar4; -} - -ARM bool MsgProc_Type1::func_0203c13c(void) { - if (this->func_02032fa4() == 0) { - data_ov000_020eec9c.func_ov000_020d77e4(6); - data_027e103c->func_ov000_020cfb20(this); - this->unk_585 = 1; - this->unk_584 = 1; - this->unk_128.unk_18 = 0x00016000; - this->unk_128.unk_1C = NULL; - this->unk_128.unk_20 = 0; - this->unk_128.unk_24 = 0; - - return true; - } - - return false; -} - -// non-matching -ARM unk32 MsgProc_Type1::func_0203c1a0(void) { - s8* pVar1; - u8* iVar3; - - if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { - this->unk_584 = 1; - - pVar1 = data_027e103c->func_ov000_020cef9c(); - iVar3 = data_027e0f7c.func_ov000_0209d90c(pVar1[0x24F], 0); - data_027e1054.func_ov003_020f4760(iVar3[1], 0); - data_ov000_020eec9c.func_ov000_020d77e4(6); - data_027e103c->func_ov000_020cfb58(iVar3); - - this->unk_128.unk_18 = 0x0000A000; - this->unk_128.unk_1C = this->func_0203c25c; - this->unk_128.unk_20 = this; - this->unk_128.unk_24 = 0; - - return 0; - } - - return 0; -} - -ARM bool MsgProc_Type1::func_0203c25c(MsgProc_Type1* param_1) { - if (data_027e1054.unk_00->unk_00->unk_95 != 0) { - return false; - } - - if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { - param_1->unk_585 = 1; - param_1->unk_128.unk_18 = 0x00016000; - param_1->unk_128.unk_1C = NULL; - param_1->unk_128.unk_20 = 0; - param_1->unk_128.unk_24 = 0; - return true; - } - - return false; -} - -ARM MsgProc_Type1::~MsgProc_Type1() { -} - -ARM bool MsgProc_Type1::vfunc_38(void) { - return true; -} diff --git a/src/Main/Message/func_0203c358.cpp b/src/Main/Message/func_0203c358.cpp index 0e5376f4..da640dee 100644 --- a/src/Main/Message/func_0203c358.cpp +++ b/src/Main/Message/func_0203c358.cpp @@ -8,7 +8,7 @@ #include "System/SysNew.hpp" THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) : - MsgProc_Main(0, 0, param_4) + UnkStruct_02038aa0(0, 0) { this->unk_162 = 4; this->unk_164 = 1; @@ -61,8 +61,8 @@ ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) { } ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) { - param_2 += this->unk_166; - param_3 += this->unk_168; + param_2 += this->mUnk_166; + param_3 += this->mUnk_168; this->func_0203c4ac(param_2 + this->unk_16A, param_3 + this->unk_16C); this->func_02038ef4(param_2, param_3); diff --git a/src/Main/Message/func_0203c72c.cpp b/src/Main/Message/func_0203c72c.cpp index 5965bf8c..ba2a2188 100644 --- a/src/Main/Message/func_0203c72c.cpp +++ b/src/Main/Message/func_0203c72c.cpp @@ -11,7 +11,7 @@ extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void* // non-matching ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) : - MsgProc_Main(1, 0, param_4) + UnkStruct_02038aa0(1, 0) { this->unk_162 = 1; this->unk_164 = 0x1A; diff --git a/src/Main/Message/func_0203c8a8.cpp b/src/Main/Message/func_0203c8a8.cpp deleted file mode 100644 index 68ae5e93..00000000 --- a/src/Main/Message/func_0203c8a8.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include "global.h" -#include "Message/MsgProc.hpp" -#include "Message/MessageManager.hpp" -#include "Save/AdventureFlags.hpp" -#include "DTCM/UnkStruct_027e103c.hpp" -#include "Player/TouchControl.hpp" -#include "Item/ItemManager.hpp" -#include "System/SysNew.hpp" - -extern u32 *data_027e0ce0[]; -extern "C" void func_02007938(unk32, unk16*, unk32, unk32, unk32); - -// non-matching -THUMB MsgProc_Base2::MsgProc_Base2(unk32 param_2, unk32 param_3, unk32 param_4) { - this->unk_114 = NULL; - this->unk_118 = -1; - this->unk_11C = 0; - this->unk_11E = 0; - this->unk_11F = 0; - this->unk_120 = 1; - this->unk_121 = param_2; - this->unk_122 = 0; - - func_02007938(0, &this->unk_54, 0xC0, 1, param_4); - - if (this->unk_121 == 0) { - this->unk_114 = new(data_027e0ce0[0], 4) MsgProc_Base2_unk_114(); - } else { - this->unk_114 = new(data_027e0ce0[1], 4) MsgProc_Base2_unk_114(); - } -} - -THUMB MsgProc_Base2::~MsgProc_Base2() { - if (this->unk_114 != NULL) { - delete this->unk_114; - this->unk_114 = NULL; - } -} - -// non-matching -ARM bool MsgProc_Type1::vfunc_14(unk32 param_2, unk32 param_3) { - unk32 uVar1; - unk32 local_c; - unk32 local_10; - - local_c = param_2; - local_10 = param_3; - - this->func_02032fa4(); - this->func_0203fc78(&local_c, &local_10); - this->func_02032fcc(local_c, local_10); - this->unk_10 = 0; - return true; -} - -ARM void MsgProc_Type1::func_0203e060(MsgProc_Main* param_1, u8 param_2, u8 param_3) { - param_1->func_0203dc10(1, param_3); - param_1->unk_11E = param_2; - param_1->unk_118 = -1; - param_1->func_020331c4(param_2, -1); -} - -ARM bool MsgProc_Type1::vfunc_28(void) { - if (this->unk_122 != 0) { - this->func_0203e0f8(); - this->func_0203dc10(0); - return true; - } - - return false; -} diff --git a/src/Main/Unknown/UnkStruct_02032f0c.cpp b/src/Main/Unknown/UnkStruct_02032f0c.cpp index 6a03a93a..7537c3c5 100644 --- a/src/Main/Unknown/UnkStruct_02032f0c.cpp +++ b/src/Main/Unknown/UnkStruct_02032f0c.cpp @@ -1,34 +1,108 @@ #include "Unknown/UnkStruct_02032f0c.hpp" -UnkStruct_02032e7c::UnkStruct_02032e7c() {} -UnkStruct_02032f0c::UnkStruct_02032f0c() {} -UnkStruct_02032f0c::~UnkStruct_02032f0c() {} -void UnkStruct_02032f0c::func_02032f94() {} -u16 **UnkStruct_02032f0c::SetUnk_0c(u16 *value) {} -u8 UnkStruct_02032f0c::func_02032fa4() {} -s32 UnkStruct_02032f0c::func_02032fb4() {} -bool UnkStruct_02032f0c::vfunc_14(s32 param1, s32 param2) {} -void UnkStruct_02032f0c::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {} -void UnkStruct_02032f0c::vfunc_0c(unk32 param1, unk32 param2, unk32 param3, unk32 param4) {} -void UnkStruct_02032f0c::vfunc_10(u32 param1, unk32 param2) {} -void UnkStruct_02032f0c::func_02033214(unk32 param1, unk32 param2, unk32 param3, u8 param4, unk32 param5) {} -unk32 UnkStruct_02032f0c::vfunc_18(s32 param1) {} -unk32 UnkStruct_02032f0c::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {} -unk32 UnkStruct_02032f0c::vfunc_20(s32 param1, s32 *param2) {} -void UnkStruct_02032f0c::func_020334b4(u32 param1, s32 param2, s32 param3, s32 param4) {} -void UnkStruct_02032f0c::func_02033628(unk32 param1, u16 *param2) {} -u32 UnkStruct_02032f0c::func_0203369c(u16 *param1, s32 param2) {} -void UnkStruct_02032f0c::func_02033780(s32 param1) {} -s32 UnkStruct_02032f0c::func_020337d8(s32 param1) {} -s32 UnkStruct_02032f0c::func_020337fc(s16 *param1, s32 param2) {} -void UnkStruct_02032f0c::func_020338a8(s32 param1, unk32 param2) {} -void UnkStruct_02032f0c::func_020338d0(unk32 *param1, unk32 param2) {} -s32 UnkStruct_02032f0c::func_02033904(unk32 param1, unk32 param2) {} -s32 UnkStruct_02032f0c::func_02033938(unk32 param1) {} -s32 UnkStruct_02032f0c::func_0203396c(u16 *param1) {} -bool UnkStruct_02032f0c::vfunc_24(s16 **param1) {} -u16 *UnkStruct_02032f0c::func_02033b0c(s32 param1) {} -bool UnkStruct_02032f0c::func_02033c6c() {} -unk32 UnkStruct_02032f0c::func_02033c88(u32 param1) {} -s32 UnkStruct_02032f0c::func_02033cbc(s16 *param1) {} -UnkStruct_02032e7c::~UnkStruct_02032e7c() {} +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 UnkStruct_02032e7c::UnkStruct_02032e7c() { + this->unk_00 = NULL; + this->unk_08 = 0; + this->unk_0A = 0; + this->unk_0C = 0; + this->unk_0E = 0; + + if (func_0202ab48() == 0) { + this->unk_10 = 2; + } else { + this->unk_10 = 3; + } +} + +THUMB UnkStruct_02032f0c::UnkStruct_02032f0c() { + this->unk_04 = 0; + this->unk_08 = 0; + this->unk_0C = NULL; + this->unk_38 = 0; + this->unk_3C = 0; + this->unk_4A = 0; + this->unk_4C = 0; + this->unk_4D = 0; + this->unk_4E = 0; + this->unk_4F = 0; + this->unk_50 = 0; + this->unk_51 = 0; + func_020078f4(0, &this->unk_10, 0x18); + func_020078f4(0, &this->unk_28, 0x10); + func_020078c0(0, &this->unk_3E, 0xC); + this->unk_10 = NULL; + this->unk_2C = NULL; + this->unk_30 = 2; + this->unk_34 = 3; +} + +THUMB UnkStruct_02032f0c::~UnkStruct_02032f0c() { +} + +ARM void UnkStruct_02032f0c::func_02032f94() {} + +ARM u16 **UnkStruct_02032f0c::SetUnk_0c(u16 *value) { + this->unk_0C = value; + return &this->mUnk_0c; +} + +ARM u8 UnkStruct_02032f0c::func_02032fa4() { + return UnkStruct_02035064::func_02035428(this->unk_50); +} + +ARM s32 UnkStruct_02032f0c::func_02032fb4() { + return this->unk_2C[0]->unk_01 + this->mUnk_34; +} + +// non-matching +ARM bool UnkStruct_02032f0c::vfunc_14(s32 param1, s32 param2) { + s16 iVar1; + s16 iVar2; + + iVar1 = ((param1 + 0x7 + ((param1 + 0x7) >> 0x1D)) ) * 0x8; + iVar2 = ((param2 + 0x7 + ((param2 + 0x7) >> 0x1D)) ) * 0x8; + this->unk_4A = param1; + this->unk_4C = param2; + this->unk_14 = (iVar1 + (iVar1 >> 0x1D)) * 0x2000 >> 0x10; + this->unk_18 = (iVar2 + (iVar2 >> 0x1D)) * 0x2000 >> 0x10; + + return true; +} + +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->unk_10, this->unk_2C, param1, param2, param4, param3); +} + +ARM void UnkStruct_02032f0c::vfunc_10(u32 param1, unk32 param2) {} +ARM void UnkStruct_02032f0c::func_02033214(unk32 param1, unk32 param2, unk32 param3, u8 param4, unk32 param5) {} +ARM unk32 UnkStruct_02032f0c::vfunc_18(s32 param1) {} +ARM unk32 UnkStruct_02032f0c::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {} +ARM unk32 UnkStruct_02032f0c::vfunc_20(s32 param1, s32 *param2) {} +ARM void UnkStruct_02032f0c::func_020334b4(u32 param1, s32 param2, s32 param3, s32 param4) {} +ARM void UnkStruct_02032f0c::func_02033628(unk32 param1, u16 *param2) {} +ARM u32 UnkStruct_02032f0c::func_0203369c(u16 *param1, s32 param2) {} +ARM void UnkStruct_02032f0c::func_02033780(s32 param1) {} + +ARM s32 UnkStruct_02032f0c::func_020337d8(s32 param1) { + return this->unk_2C[0]->unk_08[1] * param1 + (param1 - 1) * this->mUnk_34; +} + +ARM s32 UnkStruct_02032f0c::func_020337fc(s16 *param1, s32 param2) {} +ARM void UnkStruct_02032f0c::func_020338a8(s32 param1, unk32 param2) {} +ARM void UnkStruct_02032f0c::func_020338d0(unk32 *param1, unk32 param2) {} +ARM s32 UnkStruct_02032f0c::func_02033904(unk32 param1, unk32 param2) {} +ARM s32 UnkStruct_02032f0c::func_02033938(unk32 param1) {} +ARM s32 UnkStruct_02032f0c::func_0203396c(u16 *param1) {} +ARM bool UnkStruct_02032f0c::vfunc_24(s16 **param1) {} +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() {} diff --git a/src/Main/Unknown/UnkStruct_02035064.cpp b/src/Main/Unknown/UnkStruct_02035064.cpp index 4c3562ab..8bcd308d 100644 --- a/src/Main/Unknown/UnkStruct_02035064.cpp +++ b/src/Main/Unknown/UnkStruct_02035064.cpp @@ -1,11 +1,23 @@ #include "Unknown/UnkStruct_02035064.hpp" -UnkStruct_02035064::UnkStruct_02035064() {} -UnkStruct_02035064::~UnkStruct_02035064() {} -void UnkStruct_02035064::func_020350b0() {} -void UnkStruct_02035064::func_020350b4(s32 param1, unk32 param2, unk8 param3, unk16 param4, unk16 param5) {} -void UnkStruct_02035064::func_0203516c() {} -s32 UnkStruct_02035064::vfunc_0() {} -s32 UnkStruct_02035064::vfunc_4() {} -void UnkStruct_02035064::func_020351b8(bool param1, bool param2, bool param3, bool param4) {} -void UnkStruct_02035064::func_020352d8() {} +ARM UnkStruct_02035064::UnkStruct_02035064() { + this->unk_74 = NULL; + this->unk_78 = NULL; + this->unk_7C = 0; + this->unk_80 = 0; + this->unk_82 = 0; + this->unk_84 = 0; + this->unk_86 = 0; + this->unk_87 = 0; +} + +ARM UnkStruct_02035064::~UnkStruct_02035064() { +} + +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 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 cefbb0cc..73fc89b6 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -1,25 +1,50 @@ #include "Unknown/UnkStruct_02037750.hpp" -UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) {} -UnkStruct_02037750::~UnkStruct_02037750() {} -void UnkStruct_02037750::vfunc_08(unk32 param1) {} -void UnkStruct_02037750::vfunc_0c(s32 param1) {} -void UnkStruct_02037750::vfunc_10() {} -void UnkStruct_02037750::vfunc_24(unk32 param1) {} -void UnkStruct_02037750::vfunc_28(s32 param1) {} -unk32 UnkStruct_02037750::vfunc_2c(s32 param1) {} -LinkStateInteract *UnkStruct_02037750::GetLinkStateInteract() {} -unk32 UnkStruct_02037750::vfunc_30() {} -void UnkStruct_02037750::func_020385d0(s32 param1, unk32 *param2) {} -void UnkStruct_02037750::vfunc_14() {} -void UnkStruct_02037750::vfunc_18() {} -unk32 UnkStruct_02037750::vfunc_1c() {} -void UnkStruct_02037750::vfunc_20() {} +UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { + s32 i; -UnkStruct_020386d8::UnkStruct_020386d8() : - UnkStruct_02037750(0x1000000, 0) {} -void UnkStruct_020386d8::vfunc_08(unk32 param1) {} -void UnkStruct_020386d8::vfunc_24(unk32 param1) {} -void UnkStruct_020386d8::vfunc_28() {} -unk32 UnkStruct_020386d8::vfunc_30() {} -UnkStruct_020386d8::~UnkStruct_020386d8() {} + this->unk_14 = param_3; + this->unk_18 = param_2; + this->unk_1C = 0; + this->unk_1D = 0xFF; + this->unk_1E = 0; + + for (i = 0; i < ARRAY_LEN(this->unk_04); i++) { + this->unk_04[i] = 0; + } +} + +ARM UnkStruct_02037750::~UnkStruct_02037750() { + if (data_027e0c68.unk_20[0] == this) { + data_027e0c68.func_02036d4c(this); + } +} + +ARM void UnkStruct_02037750::vfunc_08(unk32 param1) {} +ARM void UnkStruct_02037750::vfunc_0c(s32 param1) {} +ARM void UnkStruct_02037750::vfunc_10() {} +ARM void UnkStruct_02037750::vfunc_24(unk32 param1) {} +ARM void UnkStruct_02037750::vfunc_28(s32 param1) {} +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_18() {} +ARM unk32 UnkStruct_02037750::vfunc_1c() {} +ARM void UnkStruct_02037750::vfunc_20() {} + +// non-matching +ARM UnkStruct_020386d8::UnkStruct_020386d8() : + UnkStruct_02037750(0x1000000, 0) { + this->unk_20 = -1; + this->unk_24.func_020376c0(gVec3p_ZERO); +} + +ARM void UnkStruct_020386d8::vfunc_08(unk32 param1) {} +ARM void UnkStruct_020386d8::vfunc_24(unk32 param1) {} +ARM void UnkStruct_020386d8::vfunc_28() {} +ARM unk32 UnkStruct_020386d8::vfunc_30() {} + +ARM UnkStruct_020386d8::~UnkStruct_020386d8() { +} diff --git a/src/Main/Unknown/UnkStruct_02038aa0.cpp b/src/Main/Unknown/UnkStruct_02038aa0.cpp index 371c886a..227a4370 100644 --- a/src/Main/Unknown/UnkStruct_02038aa0.cpp +++ b/src/Main/Unknown/UnkStruct_02038aa0.cpp @@ -1,43 +1,241 @@ #include "Unknown/UnkStruct_02038aa0.hpp" -UnkStruct_0203881c::UnkStruct_0203881c() {} -void UnkStruct_0203881c::func_02038858(unk32 param1) {} -void UnkStruct_0203881c::func_02038888() {} -void UnkStruct_0203881c::func_02038950(UnkStruct_02038aa0 *param1, s32 param2) {} -void UnkStruct_0203881c::func_02038a80(s32 param1) {} -UnkStruct_0203881c::~UnkStruct_0203881c() {} +ARM UnkStruct_0203881c::UnkStruct_0203881c() { + this->unk_14 = 0x1000; + this->unk_18 = 0; + this->unk_1C = 0; + this->unk_20 = 0; + this->unk_24 = 0; +} -UnkStruct_02038aa0::UnkStruct_02038aa0(u8 param1, u8 param2) : - UnkStruct_0203dae0(param1) {} -UnkStruct_02038aa0::~UnkStruct_02038aa0() {} -void UnkStruct_02038aa0::func_02038b34(u32 param1, unk32 param2) {} -void UnkStruct_02038aa0::vfunc_4c() {} -void UnkStruct_02038aa0::vfunc_10(unk32 param1) {} -void UnkStruct_02038aa0::func_02038b40() {} -void UnkStruct_02038aa0::vfunc_48() {} -bool UnkStruct_02038aa0::func_02038b78() {} -unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) {} -s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) {} -s32 UnkStruct_02038aa0::func_02038cf4() {} -s32 UnkStruct_02038aa0::func_02038d10() {} -void UnkStruct_02038aa0::vfunc_2c() {} -void UnkStruct_02038aa0::vfunc_30() {} -bool UnkStruct_02038aa0::func_02038ef4(s32 param1, s32 param2) {} -void UnkStruct_02038aa0::vfunc_44() {} -void UnkStruct_02038aa0::vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4) {} -void UnkStruct_02038aa0::vfunc_5c() {} -unk32 UnkStruct_02038aa0::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {} -unk32 UnkStruct_02038aa0::vfunc_20(s32 param1, s32 *param2) {} -void UnkStruct_02038aa0::func_02039208(unk16 param1) {} -void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {} -unk32 UnkStruct_02038aa0::func_02039250() {} -void UnkStruct_02038aa0::vfunc_54() {} -void UnkStruct_02038aa0::vfunc_58() {} -void UnkStruct_02038aa0::vfunc_60() {} -void UnkStruct_02038aa0::vfunc_64() {} -s32 UnkStruct_02038aa0::vfunc_68(unk32 param1) {} -void UnkStruct_02038aa0::func_02039440(unk32 param1, unk32 param2) {} -void UnkStruct_02038aa0::vfunc_6c(s32 *param1, s32 *param2) {} -void UnkStruct_02038aa0::vfunc_70(s32 *param1, s32 *param2) {} -bool UnkStruct_02038aa0::func_0203951c() {} -unk32 UnkStruct_02038aa0::vfunc_38() {} +ARM void UnkStruct_0203881c::func_02038858(unk32 param1) {} +ARM void UnkStruct_0203881c::func_02038888() {} +ARM void UnkStruct_0203881c::func_02038950(UnkStruct_02038aa0 *param1, s32 param2) {} +ARM void UnkStruct_0203881c::func_02038a80(s32 param1) {} +ARM UnkStruct_0203881c::~UnkStruct_0203881c() {} + +THUMB UnkStruct_02038aa0::UnkStruct_02038aa0(u8 param1, u8 param2) : + UnkStruct_0203dae0(param1), mUnk_124(0) { + this->func_020387e0(this->unk_150); + this->pInfoEntry = 0; + this->unk_158.y = 0; + this->unk_15C = 0; + this->unk_15E = 0xFF; + this->unk_15F = 0xFF; + this->unk_160 = 1; + this->unk_11E = param2; +} + +THUMB UnkStruct_02038aa0::~UnkStruct_02038aa0() { +} + +THUMB void UnkStruct_02038aa0::func_02038b28(void) { + this->unk_114->unk_04 = NULL; +} + +ARM void UnkStruct_02038aa0::func_02038b34(u32 param1, unk32 param2) { + MsgProc_Type1::func_0203e060(this, param1, param2); +} + +ARM void UnkStruct_02038aa0::vfunc_4c() {} +ARM void UnkStruct_02038aa0::vfunc_10(unk32 param1) {} + +ARM void UnkStruct_02038aa0::func_02038b40() { + this->unk_15C = -1; + this->unk_128.unk_00 = NULL; + this->func_0203dc10(0); + this->vfunc_48(); +} + +ARM void UnkStruct_02038aa0::vfunc_48() {} + +ARM void UnkStruct_02038aa0::func_02038b74(void) { +} + +// non-matching +ARM bool UnkStruct_02038aa0::func_02038b78() { + if (data_027e0c54 == 0) { + if ((this->unk_50 != 0 && data_027e0c68.func_02036850() != 0) || (this->unk_50 == 0 && data_027e0c68.func_02036824() != 0)) { + return true; + } + + return false; + } else { + bool ret = CHECK_UNK_FLAGS(1); + + if ((this->unk_50 == 0 || ret)) { + return (this->unk_50 != 0 && ret); + } + + return false; + } +} + +ARM unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) { + s16 iVar1; + unk32 iVar2; + unk32 iVar3; + unk32 uVar4; + + iVar2 = this->func_02038cf4(); + iVar3 = this->func_02038d10(); + iVar1 = ((this->unk_158.y - (this->unk_18 << 3) / 2)); + + if ((param1 < iVar2 + iVar1) || (iVar2 + iVar3 + iVar1 <= param1)) { + return -1; + } + + iVar3 = this->mUnk_34; + uVar4 = this->func_02032fb4(); + iVar2 = (param1 - iVar1) - iVar2; + + return func_01ff9b4c(iVar2 + iVar3 / 2, uVar4); +} + +ARM s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) { + u8 bVar1 = this->unk_2C[0]->unk_08[1]; + unk32 iVar2 = this->func_02038cf4(); + unk32 iVar1 = this->func_020337d8(param1 + 1); + return iVar2 + iVar1 - bVar1; +} + +ARM s32 UnkStruct_02038aa0::func_02038cf4() { + unk32 iVar1; + unk32 iVar2; + + iVar2 = this->mUnk_18; + iVar1 = this->func_02038d10(); + return (iVar2 * 8 - iVar1) / 2; +} + +ARM s32 UnkStruct_02038aa0::func_02038d10() { + return this->func_020337d8(this->unk_150[0]); +} + +ARM void UnkStruct_02038aa0::vfunc_2c() {} + +ARM void UnkStruct_02038aa0::vfunc_30() { + if (this->unk_15C > 0) { + this->func_0203e090(); + } else { + this->unk_118 = -1; + } +} + +ARM bool UnkStruct_02038aa0::func_02038ef4(s32 param1, s32 param2) { + unk32 local_14; + unk32 local_18; + + this->vfunc_70(&local_14, &local_18); + this->func_0203e1b0(local_14 + param1, local_18 + param2, 0); +} + +ARM void UnkStruct_02038aa0::func_02038f40(void) { +} + +// non-matching +ARM void UnkStruct_02038aa0::vfunc_44() { + int iVar1; + + this->pInfoEntry = param_2; + this->unk_08 = param_5; + this->unk_15F = -1; + this->unk_15C = 0x78; + this->unk_15E = param_4->mUnk_0c; + this->func_0203dcfc(param_6, 0, this->unk_11E, 2); + this->unk_128.func_02038858(param_3); + this->unk_30 = this->unk_150[4] + 5; + + this->vfunc_54(); + // this->vfunc_60(0, 0, (unk32)param_4); + // this->vfunc_64(param_4); + + if (*(unk32*)data_027e0618 == 2) { + if (this->func_02032fa4() == 0) { + data_027e103c->func_ov000_020cfc9c(1, 0); + } else { + data_027e103c->func_ov000_020cfc9c(0, 1); + } + } + + this->vfunc_5C(); +} + +ARM void UnkStruct_02038aa0::vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4) { +} + +// non-matching +ARM void UnkStruct_02038aa0::vfunc_5c() { + u16 sVar1; + bool bVar5; + + sVar1 = param_2[0]; + bVar5 = (sVar1 == 0xA || sVar1 == 0x20) || sVar1 == 0x3000; + + if (bVar5 && this->unk_150[2] != 0) { + this->unk_150[2] = 1; + } else { + this->unk_150[2] = 0; + } + + // this->unk_150[2] = bVar5; + + return this->func_02033360(); +} + +ARM unk32 UnkStruct_02038aa0::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {} +ARM unk32 UnkStruct_02038aa0::vfunc_20(s32 param1, s32 *param2) {} +ARM void UnkStruct_02038aa0::func_02039208(unk16 param1) {} + +// non-matching +ARM void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) { + this->unk_15C = 10; + this->unk_150[2] = 1; + this->func_0203e2ac(param2); +} + +ARM unk32 UnkStruct_02038aa0::func_02039250() {} +ARM void UnkStruct_02038aa0::vfunc_54() {} +ARM void UnkStruct_02038aa0::vfunc_58() {} +ARM void UnkStruct_02038aa0::vfunc_60() {} +ARM void UnkStruct_02038aa0::vfunc_64() {} + +ARM s32 UnkStruct_02038aa0::vfunc_68(unk32 param1) { + switch (param_2) { + case 0: + break; + case 1: + this->unk_34 = 4; + break; + case 2: + this->unk_34 = 6; + break; + case 3: + this->unk_34 = 1; + break; + case 4: + this->unk_34 = 0; + break; + default: + break; + } + + return ((this->unk_18 << 3) - this->func_020337d8(param1)) / 2; +} + +ARM void UnkStruct_02038aa0::func_02039440(unk32 param1, unk32 param2) {} +ARM void UnkStruct_02038aa0::vfunc_6c(s32 *param1, s32 *param2) {} + +ARM void UnkStruct_02038aa0::vfunc_70(s32 *param1, s32 *param2) { + this->vfunc_6C(param1, param2); + *param1 += this->unk_158.x; + *param2 += this->unk_158.y; +} + +ARM bool UnkStruct_02038aa0::func_0203951c() {} +ARM unk32 UnkStruct_02038aa0::vfunc_38() {} + +ARM void UnkStruct_02038aa0::vfunc_0c(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { + this->func_0203dc10(1, param_3); + this->func_02033190(param_2, param_3, param_4, param_5); +} diff --git a/src/Main/Unknown/UnkStruct_020397f8.cpp b/src/Main/Unknown/UnkStruct_020397f8.cpp index 3bd676db..d7bf6f59 100644 --- a/src/Main/Unknown/UnkStruct_020397f8.cpp +++ b/src/Main/Unknown/UnkStruct_020397f8.cpp @@ -1,39 +1,1014 @@ #include "Unknown/UnkStruct_020397f8.hpp" -UnkStruct_020397f8::UnkStruct_020397f8() : - UnkStruct_02038aa0(0, 0) {} -void UnkStruct_020397f8::vfunc_4c() {} -void UnkStruct_020397f8::vfunc_2c() {} -void UnkStruct_020397f8::func_02039ca8() {} -void UnkStruct_020397f8::vfunc_3c() {} -void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) {} -void UnkStruct_020397f8::func_0203a188(s32 param1, s32 param2) {} -bool UnkStruct_020397f8::func_0203a2c0() {} -unk32 UnkStruct_020397f8::func_0203a30c() {} -void UnkStruct_020397f8::vfunc_48() {} -void UnkStruct_020397f8::func_0203a35c() {} -bool UnkStruct_020397f8::func_0203a3e0() {} -void UnkStruct_020397f8::vfunc_44(s32 param1, s32 param2) {} -bool UnkStruct_020397f8::func_0203a6d0(unk32 param1) {} -void UnkStruct_020397f8::vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4) {} -void UnkStruct_020397f8::vfunc_54() {} -void UnkStruct_020397f8::vfunc_5c() {} -void UnkStruct_020397f8::vfunc_58() {} -bool UnkStruct_020397f8::func_0203b0bc() {} -s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) {} -unk32 UnkStruct_020397f8::vfunc_18(s32 param1) {} -unk32 UnkStruct_020397f8::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {} -void UnkStruct_020397f8::vfunc_60(s32 param1) {} -void UnkStruct_020397f8::vfunc_64(unk32 param1) {} -void UnkStruct_020397f8::func_0203b764() {} -unk32 UnkStruct_020397f8::vfunc_20(s32 param1, s32 *param2) {} -void UnkStruct_020397f8::func_0203bd8c(s32 param1) {} -void UnkStruct_020397f8::vfunc_6c(s32 *param1, s32 *param2) {} -void UnkStruct_020397f8::func_0203be08() {} -void UnkStruct_020397f8::func_0203be64() {} -bool UnkStruct_020397f8::func_0203c084() {} -bool UnkStruct_020397f8::func_0203c13c() {} -bool UnkStruct_020397f8::func_0203c1a0() {} -bool UnkStruct_020397f8::func_0203c25c() {} -UnkStruct_020397f8::~UnkStruct_020397f8() {} -unk32 UnkStruct_020397f8::vfunc_38() {} +extern "C" void func_ov000_020d0460(void*); +extern "C" void func_0203efd8(void*, void*); +extern "C" void func_0203ee48(void*); + +extern unk16 data_02056a0e[]; +extern u8 data_02056a08[]; + +THUMB UnkStruct_020397f8::UnkStruct_020397f8() : + UnkStruct_02038aa0(0, 0), mUnk_164(NULL) { + UnknownMsgChoiceStruct* puVar3; + + this->unk_410.unk_00 = this; + this->unk_414 = 0; + this->unk_418 = NULL; + this->unk_41C = 0; + this->unk_41E = 0; + this->unk_420 = 0; + this->unk_424.unk_00 = this; + + // ??? + puVar3 = this->mUnk_428; + do { + puVar3->unk_00 = NULL; + puVar3 += 1; + } while ((unk32*)puVar3 < (unk32*)this->unk_528); + + func_0203ee48(&this->unk_424); + func_ov000_020d0460(&this->unk_534); + this->unk_53C = 0; + this->unk_540 = ~0x7FFF; + this->unk_544 = 3; + func_ov000_020d0460(&this->unk_548); + this->unk_550 = 0; + this->unk_554 = 0x00016000; + this->unk_558 = 3; + this->unk_55C = -1; + this->unk_560 = -1; + this->unk_56C = 0; + this->unk_56E = 0; + this->unk_570 = 0; + this->unk_572 = 0; + this->unk_574 = 0; + this->unk_576 = 0; + this->unk_578 = 3; + this->unk_57A = 0; + this->unk_57B = -1; + this->unk_57C = 0; + this->unk_57D = 0; + this->unk_57E = 0; + this->unk_57F = 0; + this->unk_580 = 0; + this->unk_581 = 0; + this->unk_582 = 0; + this->unk_583 = 0; + this->unk_585 = 0; + this->unk_586 = 0; + func_0203efd8(&this->unk_588, this); + this->unk_124 = (UnkSubClass1_unk_124*)&this->mUnk_588; + this->func_02039ca8(); + + if (this->func_02032fa4() != 0) { + this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); + } else { + this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); + } + + this->unk_168.func_020351b8(true, false, false, false); + this->unk_1F0.func_020351b8(false, false, false, false); + this->unk_278.func_020351b8(false, false, false, false); +} + +THUMB void UnkStruct_020397f8::vfunc_4c() { + this->func_02038b28(); + this->func_0203dcfc(this->unk_50, 0, 0, 2); +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_2c() { + if (data_027e0618[0x101] != 0) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { + return; + } + } + + this->func_02038d20(); + + if (this->unk_56C > 0) { + this->unk_56C--; + } + + if (this->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { + this->unk_57F = 0; + } + + if (this->unk_15C > 0) { + if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { + this->unk_424.func_0203ef78(this->unk_128.unk_08); + } + + this->func_0203be64(); + this->func_0203a35c(); + + if (this->unk_580 != 0) { + this->unk_168.func_0203516c(); + } + + if (this->unk_584 != 0) { + this->unk_300.func_0203516c(); + } + + if (this->unk_585 != 0) { + this->unk_388.func_0203516c(); + } + + if ((this->func_0203a2c0() != 0 && this->unk_57F == 0) && this->unk_56C <= 0) { + this->unk_1F0.func_0203516c(); + } + + if (this->unk_08 != NULL) { + bool value = this->unk_08->mUnk_1c; + + if ((value == 1) || (value == 2)) { + this->unk_278.func_0203516c(); + } + } + + if (this->unk_15E == 6) { + func_ov018_02169634(this); + } else { + this->unk_410.func_0203ebf8(); + } + } + + if (this->unk_15C == 1) { + if (this->unk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) { + switch (this->unk_150[1]) { + case 0: + this->func_0203b0ec(1); + break; + case 2: + case 3: + if (this->func_0203a3e0() != 0) { + this->func_0203bd8c(this->unk_572); + } else { + this->func_0203b0ec(1); + } + break; + } + } + } +} + +ARM void UnkStruct_020397f8::func_02039ca8() { + s32 i; + + for (i = 0; i < ARRAY_LEN(this->unk_564); i++) { + this->unk_564[i] = 0x1A; + } +} + +ARM void UnkStruct_020397f8::vfunc_3c() { + if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { + if (this->unk_124->unk_29 != 3) { + if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { + return; + } + + if (data_027e0618[0x101] != 0) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { + return; + } + } + + this->vfunc_40(0, 0); + } + } +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { + MsgProc_Main* bVar1; + s8 cVar2; + unk32 iVar4; + unk32 iVar6; + unk32 iVar7; + unk32 iVar8; + unk32 uVar9; + unk32 iStack_a8; + unk32 iStack_a4; + unk32 local_a0; + unk32 local_9c; + unk32 local_98; + unk32 local_94; + unk32 local_90; + unk32 local_8c; + unk32 iVar5; + UnkStruct_01ffbe34 aStack_88; + UnkStruct_01ffbe34 aStack_68; + UnkStruct_01ffbe34 aStack_48; + + local_8c = 0; + local_90 = 0; + bVar1 = data_027e0c68.unk_28[this->unk_50]; + + this->vfunc_6C(&local_8c, &local_90); + this->func_0203a188(local_8c + param_2, local_90 + param_3, 0); + this->func_0203e1b0(param_2 + local_8c + (this->unk_158.x - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_158.y - (this->unk_18 << 3) / 2), 0); + + if (this->unk_584 != 0) { + iVar5 = this->unk_18 << 3; + + if (this->unk_580 != 0) { + iVar5 = -0xC; + } else { + iVar5 = 0; + } + + this->unk_300.func_02034a1c(param_2 + local_8c + this->unk_55C + (this->unk_158.x - (this->unk_14 << 3) / 2), + iVar5 + param_3 + local_90 + this->unk_560 + ((this->unk_158.y - (iVar5 / 2))), 0); + } + + if (this->unk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { + switch (data_027e0618[0]) { + case 2: + if (data_027e0cbc.func_0203d7e0(3) != 0) { + this->unk_388.func_02034b0c(0xBE, 0, 0, 0, 0); + } + break; + case 6: + if (data_027e0cbc.func_0203d7e0(0x58) != 0) { + this->unk_388.func_02034b0c(0x013B, 0, 0, 0, 0); + } + break; + } + } + + iVar5 = this->func_02032fa4(); + iVar8 = bVar1->mUnk_18; + uVar9 = data_02056a04[iVar8]; + // func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); + iVar6 = this->unk_158.x - local_94; + iVar7 = this->unk_158.y - local_98; + + if ((this->unk_15E != 7) && (this->func_0203a2c0() != 0)) { + func_01ffbe34(&aStack_48); + func_020347b0(uVar9, data_02056a10[iVar8], &local_9c, &local_a0, 4, 4); + local_9c += param_2 + local_8c + iVar6; + local_a0 += param_3 + local_90 + iVar7; + + if (data_027e0c38[5] == 1) { + iVar8 = func_0202ab48(); + + if (iVar8 == 0) { + iVar8 = 0; + } else { + iVar8 = -3; + } + + local_9c = (0x108 - local_9c) + iVar8; + } + + if ((this->unk_57F == 0) && (this->unk_56C <= 0)) { + func_01ffbe34(&aStack_68); + aStack_68.mUnk_0a = 1; + this->unk_1F0.func_02034a1c(local_9c, local_a0, &aStack_68); + } else { + // func_02034984(iVar5 != 0 ? 0x11F : 0x18, 0, local_9c, local_a0 + 2, 0); + } + } + + if (this->unk_08 != 0) { + if ((this->unk_08->unk_1C == 1 || this->unk_08->unk_1C == 2) == 0) { + return; + } + + func_01ffbe34(&aStack_88); + aStack_88.mUnk_0a = 1; + func_02034698(iVar5 != 0 ? 0x11F : 0x18, 2, &iStack_a4, &iStack_a8); + iStack_a4 += param_2 + local_8c + iVar6; + iStack_a8 += param_3 + local_90 + iVar7; + this->unk_278.func_02034a1c(iStack_a4, iStack_a8, &aStack_88); + } +} + +ARM void UnkStruct_020397f8::func_0203a188(s32 param1, s32 param2) { + unk16 sVar1; + unk16 sVar2; + unk32 iVar3; + unk32 iVar4; + unk32 uVar5; + unk32 iVar6; + unk32 iStack_54; + unk32 iStack_50; + unk32 iStack_4c; + unk32 iStack_48; + UnkStruct_01ffbe34 aStack_44; + unk32 uStack_24; + + if (this->unk_15E == 7) { + return; + } + + // (short)(ushort)*(byte *)((int)data_027e0c68.unk_28[(this->unk_50 - 0x28) * 0x18]; + + iVar6 = data_027e0c68.unk_10 + this->mUnk_50; + // uStack_24 = param_4; + + if (data_027e0cbc.func_0203d7e0(data_02056a00[iVar6]) != 0) { + uVar5 = data_02056a04[iVar6]; + + func_0203489c(uVar5, data_02056a16[iVar6], &iStack_48, &iStack_4c); + iVar3 = iStack_50 + (this->unk_158.x - iStack_48); + + func_02034698(uVar5, data_02056a0e[iVar6], &iStack_50, &iStack_54); + iVar4 = iStack_54 + (this->unk_158.y - iStack_4c); + + func_01ffbe34(&aStack_44); + aStack_44.mUnk_0a = 1; + + if (this->unk_580 != 0) { + this->unk_168.func_02034a1c(param_2 + iVar3, param_3 + iVar4, &aStack_44); + } else { + func_02034984(uVar5, data_02056a08[iVar6], param_2 + iVar3, param_3 + iVar4); + } + } +} + +// non-matching +ARM bool UnkStruct_020397f8::func_0203a2c0() { + if ((this->unk_150[1] != 1 && this->unk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { + return true; + } + + return false; +} + +ARM unk32 UnkStruct_020397f8::func_0203a30c() { + return this->unk_574 / this->pInfoEntry->mUnk_06; +} + +// non-matching (regalloc) +ARM void UnkStruct_020397f8::vfunc_48() { + if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { + this->func_02038b40(); + } + + this->unk_410.func_0203ec34(); +} + +ARM void UnkStruct_020397f8::func_0203a35c() { + if ((this->unk_57C == 1 || this->unk_150[3] != 0) || (this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { + if (this->func_0203a3e0()) { + s16 unk_56E = this->mUnk_56e; + s16 unk_570 = this->mUnk_570; + MsgProc_Type1* unk_164 = this->mUnk_164; + + unk_164->unk_168.unk_10 = mUnk_56e; + unk_164->unk_168.unk_14 = mUnk_570; + this->unk_164->func_02039208(4); + } + } else { + this->unk_164->func_02038b40(); + } +} + +ARM bool UnkStruct_020397f8::func_0203a3e0() { + return this->unk_164->unk_168.unk_06 > 0; +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_44(s32 param1, s32 param2) { + unk32 iVar2; + unk32 iVar5; + unk32 iStack_14; + unk32 iStack_18; + + if (this->unk_15C <= 0 || this->func_0203951c() == 0) { + return; + } + + iStack_14 = 0; + iStack_18 = 0; + + this->vfunc_6C(&iStack_14, &iStack_18); + + iVar5 = touchLastX - iStack_14; + iVar2 = touchLastY - iStack_18; + + if ((data_027e103c != 0 && data_027e103c->mUnk_1c == 0x8F) || (data_027e077c.mUnk_0 != data_027e077c.mUnk_4)) { + return; + } + + if ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { + if ((data_027e0d78.mFlags & 1) != 0) { + if (this->unk_50 == 0 && data_027e0d38 != 0) { + if (func_ov000_02079e04() == 0 && data_027e0e28->func_ov000_0207bc48() == 0) { + if (data_027e0618[0x101] == 0 && data_027e103c->mUnk_24 == 0) { + return; + } + } + } + + if (this->func_0203a6d0(iVar5, iVar2) == 0 && this->func_0203a2c0() != 0) { + this->unk_57F = 1; + } + } else { + if (data_027e0d78.mTouch != 0) { + this->func_0203a6d0(iVar5, iVar2); + return; + } + + if (data_027e0d78.mTouch == 0) { + switch(this->unk_150[1]) { + case 3: + case 4: + break; + case 5: + if (data_027e103c->mUnk_20 == 3) { + this->func_0203b0ec(1); + } + break; + case 6: + if (data_027e103c->mUnk_20 == 5) { + this->func_0203b0ec(1); + } + break; + case 7: + break; + case 2: + //! TODO: fixme + // if (this->unk_164->unk_168.unk_06 <= 0) { + // if ((data_027e0d78.mFlags & 2) != 0) { + // this->unk_128.unk_14 = 0; + + // if (this->func_0203b0bc() != 0) { + // this->func_0203b0ec(1); + // } + + // this->unk_1F0.unk_5C.unk_08 = 0; + // this->unk_1F0.func_020352d8(); + // } + // } + break; + case 0: + case 1: + default: + if ((data_027e0d78.mFlags & 2) != 0) { + this->unk_128.unk_14 = 0; + + if (this->func_0203b0bc() != 0) { + this->func_0203b0ec(1); + } + + this->unk_1F0.unk_5C.unk_08 = 0; + this->unk_1F0.func_020352d8(); + } + break; + } + } + } + } +} + +ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1) { + unk32 iVar1; + unk32 uVar2; + UnkStruct_0203b264* piVar3; + + if (this->unk_164->unk_168.unk_06 > 0 && this->unk_164->unk_15C <= 0) { + return false; + } + + iVar1 = this->vfunc_34(param_3); + piVar3 = NULL; + + if (!(iVar1 < 0) && iVar1 < 4) { + piVar3 = this->unk_424.func_0203eeb0(iVar1, param_2); + } + + if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16*)piVar3->mUnk_0)[2]) == 0x00FF0002) { + uVar2 = this->func_02038cb8(iVar1); + this->unk_410.func_0203ec4c(piVar3, uVar2, + (s16)(this->unk_158.x - ((this->unk_14 << 3) / 2)) + iVar1 + this->unk_56E, + (s16)(this->unk_158.y - ((this->unk_18 << 3) / 2)) + iVar1 + this->unk_570 + ); + + this->unk_57F = 0; + return true; + } + + return false; +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4) { + bool bVar5; + bool bVar2; + int iVar4; + int iVar6; + s16 temp; + + iVar6 = param_4[0]; + + if (data_027e0c54 != 0) { + MsgProc_Type1* pVar4 = data_027e0c68.func_02036700(); + + if (pVar4 != NULL && pVar4->unk_15C > 0) { + this->func_02038b40(); + } + } + + if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { + MsgProc_Type1* pVar4 = (MsgProc_Type1*)data_027e0c68.unk_28[4]; + + if (pVar4 != NULL && pVar4->unk_15C > 0) { + this->func_02038b40(); + } + } + + this->unk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; + temp = param_4[8]; + + if (temp >= 0 && param_4[9] >= 0) { + temp = param_4[10]; + } + + if (temp < 0) { + this->unk_57B = temp; + } else { + this->unk_57B = 0; + } + + // this->func_02038f44(param_2, param_3, param_4, param_5, iVar6); + this->unk_574 = 0; + + if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param_4[11])) { + data_027e103c->func_ov000_020cf284(0x80, 0); + } +} + +// switch decomp issue +ARM void UnkStruct_020397f8::vfunc_54() {} + +ARM void UnkStruct_020397f8::vfunc_5c() { + if (this->unk_15F == 0 || this->pInfoEntry->unk_06 <= 2) { + this->unk_168.unk_5C.unk_08 = this->unk_168.mUnk_7c; + this->unk_168.func_020352d8(); + } else { + this->unk_168.unk_5C.unk_08 = 0; + this->unk_168.func_020352d8(); + this->unk_168.func_020351b8(1, 0, 0, 0); + } +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_58() { + bool bVar1; + s8* puVar2; + int iVar3; + char *pcVar4; + + if (this->unk_160 != 0) { + if (data_027e103c != NULL) { + if (data_027e103c->func_ov000_020cf4bc() != 0) { + puVar2 = data_027e103c->func_ov000_020cef9c(); + + if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { + puVar2 = data_027e103c->func_ov000_020cef9c(); + + if ((MsgProc_Type1*)(puVar2 + 0x244) == this) { + data_027e103c->func_ov000_020cfb38(); + } + } + } + + if (this->unk_581 != 0 && data_027e103c->func_ov000_020cf488() != 0) { + data_027e103c->func_ov000_020cfa24(); + this->unk_581 = 0; + } + + if (this->unk_582 != 0) { + data_027e103c->func_ov000_020cfe40(0, 2); + this->unk_582 = 0; + } + + if (this->unk_583 != 0) { + data_027e103c->func_ov005_02104028(0); + this->unk_583 = 0; + } + } + + // if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.unk_04 + 0x99) != 0 && + // (data_027e077c.mUnk_0 != 0x39 || data_027e103c->func_ov000_020cf0bc())) { + // data_027e1054.func_ov003_020f4874(); + // data_027e103c->func_ov005_02103f8c(data_02057ed4); + // } + } + + this->func_02039398(); +} + +ARM bool UnkStruct_020397f8::func_0203b0bc() { + return this->unk_57F != 0 && data_027e077c.mUnk_0 == data_027e077c.mUnk_4; +} + +// non-matching +ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) { + s32 iVar4; + u16 *puVar2; + u32 uVar3; + s32 unaff_r6; + bool bVar1; + + iVar4 = 0; + bVar1 = false; + + uVar3 = param_2; + + if (((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { + uVar3 = 0; + } else { + uVar3 = 1; + } + + unaff_r6 = this->unk_50 == uVar3; + + this->unk_410.func_0203ec34(); + this->unk_585 = 0; + this->unk_584 = 0; + + if (this->unk_150[3] != 0) { + iVar4 = 1; + this->unk_56C = this->mUnk_578; + bVar1 = true; + this->unk_15C = 0x78; + } else { + if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { + this->func_02038b40(); + + if (data_027e0d38 != 0) { + data_027e103c->func_ov000_020cf224(1); + data_027e103c->func_ov000_020cf2a0(1); + } + + if (this->unk_08 == NULL) { + this->vfunc_58(); + } + + iVar4 = 1; + } + } + + if (iVar4 != 0) { + if (bVar1) { + this->vfunc_54(); + } + + if (unaff_r6 != 0) { + data_027e0d04.func_0203fe60(0); + } + } + + if (((param_2 != 0 && iVar4 != 0) && unaff_r6 != 0) && this->unk_15E != 7) { + data_ov000_020eec9c.func_ov000_020d77e4(0x19); + } + + return iVar4; +} + +// non-matching (regalloc) +ARM unk32 UnkStruct_020397f8::vfunc_18(s32 param1) { + u16 sVar1; + u32 uVar4; + s32 unaff_r4; + bool bVar5; + + if (this->func_0203951c() == 0) { + return 1; + } + + if (this->unk_580 != 0) { + unaff_r4 = -0xC; + } else { + unaff_r4 = 0; + } + + sVar1 = param_2->mUnk_4[0]; + + if (sVar1 != 0x1A || sVar1 == 0x1A) { + bVar5 = true; + + if (sVar1 == 0x1A) { + uVar4 = (param_2->mUnk_0[3] << 0x10) | ((u16*)param_2->mUnk_0)[2]; + + if (((uVar4 == 0x0001000A || uVar4 == 0x00020000) || uVar4 == 0x00FF0000)) { + bVar5 = false; + } + } + + if (bVar5) { + this->unk_424.func_0203ee80(this->unk_128.unk_08); + } + } + + return this->func_0203e284(param_2, param_3, param_4 + unaff_r4); +} + +// non-matching +ARM unk32 UnkStruct_020397f8::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) { + int iVar1; + u16* psVar3; + + psVar3 = param_3->mUnk_4; + + if (psVar3[0] == 10) { + this->unk_424.func_0203ef78(this->unk_128.unk_08, psVar3[0], param_4); + this->unk_574++; + + if (this->func_0203a30c() == 0) { + this->unk_150[3] = 1; + } + } + + if (this->unk_15E == 6) { + return 1; + } + + switch (this->unk_57A) { + case 0: + return this->func_0203905c(param_2, param_3, param_4, param_5); + case 1: + UnknownMsgChoiceStruct* pChoiceData; + s32 i = this->func_0203a30c(); + pChoiceData = &this->unk_428[this->unk_528[i]]; + return this->unk_164->func_0203cb5c(*param_2, (((pChoiceData->unk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->unk_00->mUnk_0)[2]) + ~0xFFFE)); + default: + break; + } + + return 0; +} + +// non-matching +ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { + unk16 sVar1; + unk16 uVar2; + unk32 iVar3; + unk32 iVar4; + unk32 uVar5; + u32 uVar6; + + uVar6 = 0; + + if (this->func_02032fa4() == 0) { + switch(param_2->unk_0C) { + case 0: + case 1: + uVar6 = this->unk_580 != 0; + break; + case 2: + uVar6 = 2; + break; + case 3: + uVar6 = 3; + break; + case 5: + uVar6 = 4; + break; + case 6: + uVar6 = 5; + break; + default: + // why??? + switch (param_2->unk_0C) { + case 4: + uVar6 = 8; + break; + case 7: + uVar6 = 9; + break; + default: + if (this->unk_580 != 0) { + uVar6 = 7; + } else { + uVar6 = 6; + } + break; + } + break; + } + } + + // PTR_PTR_0203b5ac[(byte)param_1[0x50]] = (char)uVar6; + data_027e0c68.unk_28[this->unk_50]->unk_50 = uVar6; + + if (this->unk_15E == 7) { + uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); + func_02032304(data_02068894, data_02057ed8, data_02056af0, 1, param_4); + iVar3 = func_02016fcc(uVar5); + } else { + if (this->func_02032fa4() != 0) { + uVar5 = 0x33; + } else { + uVar5 = 0x32; + } + + data_027e0cbc.func_0203d77c(uVar5, 1, 1); + iVar3 = data_027e0cbc.func_0203d77c(data_02056a00[uVar6 * 0x18] - 2, 1, 1); + } + + if (param_2->unk_10 < 0) { + iVar3 = param_2->mUnk_12; + } + + if (param_2->unk_10 <= 0 && iVar3 > 0) { + uVar2 = param_2->mUnk_12; + this->unk_158.x = param_2->mUnk_10; + this->unk_158.y = uVar2; + } else { + this->func_0203b764(); + } +} + +// non-matching (regalloc) +ARM void UnkStruct_020397f8::vfunc_64(unk32 param1) { + unk32 uVar2; + + if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { + uVar2 = 0x16; + } else { + uVar2 = 0; + } + + this->unk_124->func_0203f020(param_2, uVar2); + this->func_0203be08(); + + if (this->func_02032fa4()) { + this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); + } else { + this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); + this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); + this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); + } + + this->unk_168.func_020351b8(1, 0, 0, 0); + this->unk_1F0.func_020351b8(0, 0, 0, 0); + this->unk_278.func_020351b8(0, 0, 0, 0); + this->func_020393a8(param_2); +} + +// non-matching +ARM void UnkStruct_020397f8::func_0203b764() { + s32 i = data_027e0c68.unk_00[this->unk_50]; + + this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); + + switch (this->unk_57B) { + case 1: + this->unk_158.y -= 38; + break; + case 2: + switch (this->pInfoEntry->unk_06) { + case 2: + this->unk_158.y -= 111; + break; + case 3: + this->unk_158.y -= 98; + break; + default: + break; + } + break; + default: + break; + } +} + +// switch decomp issue +ARM unk32 UnkStruct_020397f8::vfunc_20(s32 param1, s32 *param2) {} + +ARM void UnkStruct_020397f8::func_0203bd8c(s32 param1) { + this->unk_576 = param_2; + + if (this->func_0203b0ec(0) != 0) { + data_ov000_020eec9c.func_ov000_020d77e4(this->unk_564[param_2]); + } +} + +ARM void UnkStruct_020397f8::vfunc_6c(s32 *param1, s32 *param2) { + this->func_0203947c(); + *param_2 += this->mUnk_56e; + *param_3 += this->mUnk_570; +} + +ARM void UnkStruct_020397f8::func_0203be08() { + if (data_027e0d38 != 0) { + if (data_027e103c->func_ov000_020cf42c() != 0) { + this->unk_534 = this->mUnk_538; + } else { + this->unk_534 = this->mUnk_536; + } + + if (this->func_0203c084() != 0) { + this->unk_548 = this->mUnk_54c; + } + } +} + +ARM void UnkStruct_020397f8::func_0203be64() {} + +// non-matching +ARM bool UnkStruct_020397f8::func_0203c084() { + unk32 uVar4; + bool bVar2; + bool bVar1; + bool bVar3; + + uVar4 = 0; + + if (this->unk_50 == 0) { + bVar2 = true; + bVar1 = true; + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0 && data_027e103c->func_ov000_020cf8fc(0x8F) == 0) { + bVar1 = false; + } + + if (!bVar1 && data_027e0618[0x101] == 0) { + if ((data_027e0d38 != NULL && data_027e0d38->mUnk_14 == 1) == 0) { + bVar2 = false; + } + } + + if (bVar2) { + uVar4 = 1; + } + } + + return uVar4; +} + +ARM bool UnkStruct_020397f8::func_0203c13c() { + if (this->func_02032fa4() == 0) { + data_ov000_020eec9c.func_ov000_020d77e4(6); + data_027e103c->func_ov000_020cfb20(this); + this->unk_585 = 1; + this->unk_584 = 1; + this->unk_128.unk_18 = 0x00016000; + this->unk_128.unk_1C = NULL; + this->unk_128.unk_20 = 0; + this->unk_128.unk_24 = 0; + + return true; + } + + return false; +} + +// non-matching +ARM bool UnkStruct_020397f8::func_0203c1a0() { + s8* pVar1; + u8* iVar3; + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { + this->unk_584 = 1; + + pVar1 = data_027e103c->func_ov000_020cef9c(); + iVar3 = data_027e0f7c.func_ov000_0209d90c(pVar1[0x24F], 0); + data_027e1054.func_ov003_020f4760(iVar3[1], 0); + data_ov000_020eec9c.func_ov000_020d77e4(6); + data_027e103c->func_ov000_020cfb58(iVar3); + + this->unk_128.unk_18 = 0x0000A000; + this->unk_128.unk_1C = this->func_0203c25c; + this->unk_128.unk_20 = this; + this->unk_128.unk_24 = 0; + + return 0; + } + + return 0; +} + +ARM bool UnkStruct_020397f8::func_0203c25c() { + if (data_027e1054.unk_00->unk_00->unk_95 != 0) { + return false; + } + + if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { + param_1->unk_585 = 1; + param_1->unk_128.unk_18 = 0x00016000; + param_1->unk_128.unk_1C = NULL; + param_1->unk_128.unk_20 = 0; + param_1->unk_128.unk_24 = 0; + return true; + } + + return false; +} + +ARM UnkStruct_020397f8::~UnkStruct_020397f8() { +} + +ARM unk32 UnkStruct_020397f8::vfunc_38() { + return true; +} diff --git a/src/Main/Unknown/UnkStruct_0203dae0.cpp b/src/Main/Unknown/UnkStruct_0203dae0.cpp index 5d19b0b3..40192b2a 100644 --- a/src/Main/Unknown/UnkStruct_0203dae0.cpp +++ b/src/Main/Unknown/UnkStruct_0203dae0.cpp @@ -1,25 +1,87 @@ #include "Unknown/UnkStruct_0203dae0.hpp" +#include "System/SysNew.hpp" -UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) {} -UnkStruct_0203dae0::~UnkStruct_0203dae0() {} -void UnkStruct_0203dae0::func_0203dc10(s32 param1) {} -bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) {} -bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) {} -void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) {} -void UnkStruct_0203dae0::func_0203ddec() {} -void UnkStruct_0203dae0::func_0203ddfc() {} -void UnkStruct_0203dae0::func_0203de14() {} -s32 UnkStruct_0203dae0::func_0203de24() {} -bool UnkStruct_0203dae0::func_0203de58(s32 param1) {} -void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) {} -void UnkStruct_0203dae0::vfunc_30() {} -bool UnkStruct_0203dae0::vfunc_28() {} -bool UnkStruct_0203dae0::func_0203e0f8(unk32 param1, s32 param2) {} -void UnkStruct_0203dae0::vfunc_2c() {} -bool UnkStruct_0203dae0::func_0203e1b0(unk32 param1, unk32 param2, s32 param3) {} -unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) {} -void UnkStruct_0203dae0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {} -void UnkStruct_0203dae0::func_0203e2e8(s32 param1, s32 param2, unk32 param3, u32 param4) {} -void UnkStruct_0203dae0::func_0203e510(s32 *param1, s32 param2, s32 param3) {} -void UnkStruct_0203dae0::func_0203e62c(s32 *param1, s32 param2) {} -bool UnkStruct_0203dae0::func_0203e6e4(u32 param1, u32 param2, s32 param3) {} +extern u32 *data_027e0ce0[]; +extern "C" void func_02007938(unk32, unk16*, unk32, unk32, unk32); + +// non-matching +THUMB UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) { + this->unk_114 = NULL; + this->unk_118 = -1; + this->unk_11C = 0; + this->unk_11E = 0; + this->unk_11F = 0; + this->unk_120 = 1; + this->unk_121 = param_2; + this->unk_122 = 0; + + func_02007938(0, &this->unk_54, 0xC0, 1, param_4); + + if (this->unk_121 == 0) { + this->unk_114 = new(data_027e0ce0[0], 4) MsgProc_Base2_unk_114(); + } else { + this->unk_114 = new(data_027e0ce0[1], 4) MsgProc_Base2_unk_114(); + } +} + +THUMB UnkStruct_0203dae0::~UnkStruct_0203dae0() { + if (this->unk_114 != NULL) { + delete this->mUnk_114; + this->unk_114 = NULL; + } +} + +ARM void UnkStruct_0203dae0::func_0203dc10(s32 param1) {} +ARM bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) {} + +// non-matching +ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) { + unk32 uVar1; + unk32 local_c; + unk32 local_10; + + local_c = param_2; + local_10 = param_3; + + this->func_02032fa4(); + this->func_0203fc78(&local_c, &local_10); + this->func_02032fcc(local_c, local_10); + this->unk_10 = 0; + return true; +} + +ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) {} +ARM void 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) {} + +ARM void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) { + param_1->func_0203dc10(1, param_3); + param_1->unk_11E = param_2; + param_1->unk_118 = -1; + param_1->func_020331c4(param_2, -1); +} + +ARM void UnkStruct_0203dae0::vfunc_30() {} + +ARM bool UnkStruct_0203dae0::vfunc_28() { + if (this->unk_122 != 0) { + this->func_0203e0f8(); + this->func_0203dc10(0); + return true; + } + + return false; +} + +ARM bool UnkStruct_0203dae0::func_0203e0f8(unk32 param1, s32 param2) {} +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) {} +ARM void UnkStruct_0203dae0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {} +ARM void UnkStruct_0203dae0::func_0203e2e8(s32 param1, s32 param2, unk32 param3, u32 param4) {} +ARM void UnkStruct_0203dae0::func_0203e510(s32 *param1, s32 param2, s32 param3) {} +ARM void UnkStruct_0203dae0::func_0203e62c(s32 *param1, s32 param2) {} +ARM bool UnkStruct_0203dae0::func_0203e6e4(u32 param1, u32 param2, s32 param3) {} From 5bd0f31b8bb36f54578a109a6dc6a24a2d6e4631 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 5 Feb 2025 01:47:40 +0100 Subject: [PATCH 49/64] post-update cleanup: step 3 (1/2) --- include/DTCM/UnkStruct_027e103c.hpp | 2 +- include/Message/BMG.hpp | 2 +- include/Message/MessageManager.hpp | 16 +- include/Message/MsgProc.hpp | 20 +- include/Unknown/UnkStruct_02032f0c.hpp | 5 +- include/Unknown/UnkStruct_02035064.hpp | 5 +- include/Unknown/UnkStruct_02037750.hpp | 4 +- include/Unknown/UnkStruct_02038aa0.hpp | 23 +- include/Unknown/UnkStruct_020397f8.hpp | 31 +- include/Unknown/UnkStruct_0203dae0.hpp | 3 +- src/Main/Actor/ActorType.cpp | 6 +- src/Main/Message/BMG.cpp | 12 +- src/Main/Message/MessageManager.cpp | 271 +++++++------- src/Main/Message/func_0203c358.cpp | 24 +- src/Main/Message/func_0203c72c.cpp | 28 +- src/Main/Unknown/UnkStruct_02032f0c.cpp | 73 ++-- src/Main/Unknown/UnkStruct_02035064.cpp | 16 +- src/Main/Unknown/UnkStruct_02037750.cpp | 18 +- src/Main/Unknown/UnkStruct_02038aa0.cpp | 114 +++--- src/Main/Unknown/UnkStruct_020397f8.cpp | 470 ++++++++++++------------ src/Main/Unknown/UnkStruct_0203dae0.cpp | 51 +-- 21 files changed, 611 insertions(+), 583 deletions(-) diff --git a/include/DTCM/UnkStruct_027e103c.hpp b/include/DTCM/UnkStruct_027e103c.hpp index e133e876..96d7ec21 100644 --- a/include/DTCM/UnkStruct_027e103c.hpp +++ b/include/DTCM/UnkStruct_027e103c.hpp @@ -81,7 +81,7 @@ struct UnkStruct_027e103c { void func_ov000_020cfabc(s32 param1, s32 param2); void func_ov000_020cfae8(s32 param1, s32 param2); - //! TODO: find out if the type is always `MsgProc_Type1*` + //! TODO: find out if the type is always `UnkStruct_020397f8*` void func_ov000_020cfb20(void*); void func_ov000_020cfb38(); diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index 0b13b47f..53a418ea 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -169,7 +169,7 @@ typedef struct BMGFileInfo { /* 0x08 */ SectionFLW1* pFLW1; // pointer to the message flow data (FLW -> flow) /* 0x0C */ SectionFLI1* pFLI1; // pointer to the message flow index table (FLI -> flow index table) /* 0x10 */ SectionDAT1* pDAT1; // pointer to the data (DAT -> data) - /* 0x14 */ BMGHeader* mUnk_14; // same as unk_00 (?) + /* 0x14 */ BMGHeader* mUnk_14; // same as pHeader (?) /* 0x18 */ s16 mUnk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose) /* 0x1A */ s16 groupId; // stores the group id } BMGFileInfo; // size = 0x1C diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index c408caf7..17d8e0b2 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -17,17 +17,17 @@ public: /* 0x04 */ u8 mUnk_04; /* 0x05 */ u8 mUnk_05; /* 0x06 */ unk16 mUnk_06; - /* 0x08 */ MsgProc_Type1* mUnk_08; + /* 0x08 */ UnkStruct_020397f8* mUnk_08; /* 0x0C */ u8 mUnk_0c; /* 0x0C */ u8 mUnk_0d; /* 0x0C */ unk16 mUnk_0e; /* 0x10 */ unk16 mUnk_10; /* 0x10 */ unk16 mUnk_12; /* 0x14 */ BMGGroups* pGroups; - /* 0x18 */ UnkStruct_020386d8* unk_18[2]; - /* 0x20 */ UnkStruct_02037750* unk_20[2]; - /* 0x28 */ UnkStruct_02038aa0* unk_28[6]; - /* 0x40 */ MsgProc_Type1* unk_40[2]; // is array size 6? + /* 0x18 */ UnkStruct_020386d8* mUnk_18[2]; + /* 0x20 */ UnkStruct_02037750* mUnk_20[2]; + /* 0x28 */ UnkStruct_02038aa0* mUnk_28[6]; + /* 0x40 */ UnkStruct_020397f8* mUnk_40[2]; // is array size 6? /* 0x48 */ static void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3); @@ -35,8 +35,8 @@ public: void func_0203665c(void); UnkStruct_027E0C68(); ~UnkStruct_027E0C68(); - MsgProc_Type1* func_020366c4(void); - MsgProc_Type1* func_02036700(void); + UnkStruct_020397f8* func_020366c4(void); + UnkStruct_020397f8* func_02036700(void); UnkStruct_020386d8* func_0203673c(void); bool func_02036770(u32 param_2); unk32 func_02036798(void); @@ -57,7 +57,7 @@ public: void func_02036d6c(void); UnkStruct_02038aa0* 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_020397f8* func_02036f68(u32 param_2, u8* param_3); 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); diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp index 204f26c0..2874fd99 100644 --- a/include/Message/MsgProc.hpp +++ b/include/Message/MsgProc.hpp @@ -24,9 +24,9 @@ typedef struct UnkStruct_0203b264 { /* 8 */ } UnkStruct_0203b264; -class UnkSubClass1_unk_410 { +class UnkStruct_020397f8_410 { public: - /* 0x00 */ struct MsgProc_Type1* mUnk_00; + /* 0x00 */ struct UnkStruct_020397f8* mUnk_00; /* 0x04 */ void func_0203ec34(void); @@ -35,10 +35,10 @@ public: void func_0203ec4c(UnkStruct_0203b264* param_2, unk32 param_3, s32 param_4, s32 param_5); }; -// same as UnkSubClass1_unk_410? -class UnkSubClass1_unk_424 { +// same as UnkStruct_020397f8_410? +class UnkStruct_020397f8_424 { public: - /* 0x00 */ struct MsgProc_Type1* mUnk_00; + /* 0x00 */ struct UnkStruct_020397f8* mUnk_00; /* 0x04 */ void func_0203ee80(unk32); @@ -48,19 +48,19 @@ public: UnkStruct_0203b264* func_0203eeb0(unk32 param_2, unk32 param_3); }; -class MsgProc_Base2_unk_114 : public SysObject { +class UnkStruct_0203dae0_114 : public SysObject { public: /* 0x00 (vtable) */ /* 0x04 */ unk32* mUnk_04; /* 0x08 */ - MsgProc_Base2_unk_114(); - /* 0x00 */ virtual ~MsgProc_Base2_unk_114() override; + UnkStruct_0203dae0_114(); + /* 0x00 */ virtual ~UnkStruct_0203dae0_114() override; /* 0x04 */ virtual UNK_TYPE vfunc_04(UNK_TYPE); /* 0x08 */ virtual unk32 vfunc_08(void*, s16); /* 0x0C */ - unk32 func_0203d1b4(void); + unk32* func_0203d1b4(void); }; struct func_02038f44_param4 { @@ -80,7 +80,7 @@ struct func_02038f44_param4 { extern "C" u32 func_01ff9b4c(unk32, unk32); extern "C" unk32 func_0203c084(void); -extern "C" void func_ov018_02169634(MsgProc_Type1*); +extern "C" void func_ov018_02169634(UnkStruct_020397f8*); extern "C" unk32 func_ov000_02079e04(void); extern "C" unk32 func_02016fcc(unk32); extern "C" void func_02032304(unk32*, char*, unk32, unk32, unk32); diff --git a/include/Unknown/UnkStruct_02032f0c.hpp b/include/Unknown/UnkStruct_02032f0c.hpp index 2868a897..247f8dc8 100644 --- a/include/Unknown/UnkStruct_02032f0c.hpp +++ b/include/Unknown/UnkStruct_02032f0c.hpp @@ -2,7 +2,9 @@ #include "global.h" #include "types.h" + #include "Message/BMG.hpp" +#include "System/SysNew.hpp" class UnkStruct_02032e7c { public: @@ -72,7 +74,7 @@ struct func_0203b410_param_2 { }; // astruct_8, MsgProc_Base -class UnkStruct_02032f0c { +class UnkStruct_02032f0c : public SysObject { public: /* 00 (vtable) */ /* 04 */ unk32* mUnk_04; @@ -152,6 +154,7 @@ public: u16 **SetUnk_0c(u16 *value); u8 func_02032fa4(); s32 func_02032fb4(); + void func_02032fcc(unk32, unk32); 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); diff --git a/include/Unknown/UnkStruct_02035064.hpp b/include/Unknown/UnkStruct_02035064.hpp index 122c617d..b2443949 100644 --- a/include/Unknown/UnkStruct_02035064.hpp +++ b/include/Unknown/UnkStruct_02035064.hpp @@ -8,7 +8,8 @@ class UnkStruct_02035064 { public: /* 00 (vtable) */ - /* 04 */ unk32 mUnk_04; + /* 04 */ unk16 mUnk_04; + /* 04 */ unk16 mUnk_06; /* 08 */ u32* mUnk_08; /* 0c */ unk32 mUnk_0c; /* 10 */ unk32 mUnk_10; @@ -49,6 +50,8 @@ public: UnkStruct_02035064(); ~UnkStruct_02035064(); + static u8 func_02035428(u8 param1); + 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(); diff --git a/include/Unknown/UnkStruct_02037750.hpp b/include/Unknown/UnkStruct_02037750.hpp index 57343813..fe1a9740 100644 --- a/include/Unknown/UnkStruct_02037750.hpp +++ b/include/Unknown/UnkStruct_02037750.hpp @@ -6,7 +6,7 @@ #include "Player/LinkStateInteract.hpp" #include "System/SysNew.hpp" -class MsgProc_Type1; +class UnkStruct_020397f8; // astruct_14 class UnkStruct_02037750 : public SysObject { @@ -22,7 +22,7 @@ public: /* 00 */ virtual ~UnkStruct_02037750(); /* 08 */ virtual void vfunc_08(u32 param1); - /* 0c */ virtual void vfunc_0c(class MsgProc_Type1* param1); + /* 0c */ virtual void vfunc_0c(class UnkStruct_020397f8* param1); /* 10 */ virtual void vfunc_10(); /* 14 */ virtual void vfunc_14(); /* 18 */ virtual void vfunc_18(); diff --git a/include/Unknown/UnkStruct_02038aa0.hpp b/include/Unknown/UnkStruct_02038aa0.hpp index bec535d6..9969f89c 100644 --- a/include/Unknown/UnkStruct_02038aa0.hpp +++ b/include/Unknown/UnkStruct_02038aa0.hpp @@ -4,9 +4,10 @@ #include "types.h" #include "Unknown/UnkStruct_0203dae0.hpp" +#include "System/SysNew.hpp" class UnkStruct_02038aa0; -typedef bool (*UnknownCallback)(class MsgProc_Type1*); +typedef bool (*UnknownCallback)(class UnkStruct_020397f8*); class UnkStruct_0203881c : public UnkStruct_02032e7c { public: @@ -14,7 +15,7 @@ public: /* 14 */ unk32 mUnk_14; /* 18 */ unk32 mUnk_18; /* 1c */ UnknownCallback mUnk_1c; - /* 20 */ class MsgProc_Type1* mUnk_20; + /* 20 */ class UnkStruct_020397f8* mUnk_20; /* 24 */ unk32 mUnk_24; /* 28 */ @@ -56,7 +57,7 @@ public: /* 123 */ unk8 mUnk_123; /* 124 */ UnkSubClass1_unk_124* mUnk_124; /* 128 */ UnkStruct_0203881c mUnk_128; - /* 150 */ u8 unk_150[4]; + /* 150 */ u8 mUnk_150[4]; /* 154 */ EntryINF1* pInfoEntry; /* 158 */ Vec2s mUnk_158; // textbox position? /* 15c */ s16 mUnk_15c; @@ -66,7 +67,8 @@ public: /* 161 */ /* 00 */ virtual ~UnkStruct_02038aa0(); - /* 08 */ virtual void vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4); + /* 08 */ virtual void vfunc_08(s32 param1, unk32* param2, s16 *param3, unk32 param4); + /* 0c */ virtual void vfunc_0c(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); /* 10 */ virtual void vfunc_10(unk32 param1); /* 1c */ virtual unk32 vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4); /* 20 */ virtual unk32 vfunc_20(s32 param1, s32 *param2); @@ -74,15 +76,15 @@ public: /* 30 */ virtual void vfunc_30(); /* 34 */ virtual unk32 vfunc_34(s32 param1); /* 38 */ virtual bool vfunc_38(); - /* 3c */ virtual void vfunc_3c() = 0; - /* 40 */ virtual void vfunc_40() = 0; - /* 44 */ virtual void vfunc_44(); + /* 3c */ virtual void vfunc_3c(); + /* 40 */ virtual void vfunc_40(); + /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); /* 48 */ virtual void vfunc_48(); /* 4c */ virtual void vfunc_4c(); - /* 50 */ virtual void vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4); + /* 50 */ virtual void vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4); /* 54 */ virtual void vfunc_54(); /* 58 */ virtual void vfunc_58(); - /* 5c */ virtual void vfunc_5c(); + /* 5c */ virtual void vfunc_5c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); /* 60 */ virtual void vfunc_60(); /* 64 */ virtual void vfunc_64(); /* 68 */ virtual s32 vfunc_68(unk32 param1); @@ -145,13 +147,12 @@ public: 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 e046c518..dcbcac24 100644 --- a/include/Unknown/UnkStruct_020397f8.hpp +++ b/include/Unknown/UnkStruct_020397f8.hpp @@ -5,6 +5,7 @@ #include "Unknown/UnkStruct_02035064.hpp" #include "Unknown/UnkStruct_02038aa0.hpp" +#include "System/SysNew.hpp" // does it host both choices? struct UnknownMsgChoiceStruct { @@ -13,27 +14,29 @@ struct UnknownMsgChoiceStruct { /* 08 */ }; -// astruct_2, MsgProc_Type1 +class UnkStruct_020397f8_410; + +// astruct_2, UnkStruct_020397f8 class UnkStruct_020397f8 : public UnkStruct_02038aa0 { public: /* 000 (base) */ /* 161 */ unk8 mUnk_161[0x3]; - /* 164 */ MsgProc_Type1* mUnk_164; + /* 164 */ UnkStruct_020397f8* 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; // UnkSubClass1_unk_410? + /* 410 */ UnkStruct_020397f8_410 mUnk_410; /* 414 */ unk32 mUnk_414; /* 418 */ UnkStruct_02038aa0* mUnk_418; /* 41c */ unk16 mUnk_41c; /* 41e */ unk16 mUnk_41e; /* 420 */ unk16 mUnk_420; /* 422 */ unk16 mUnk_422; - /* 424 */ unk32 *mUnk_424; // UnkSubClass1_unk_424? - /* 428 */ UnknownMsgChoiceStruct unk_428[0x20]; - /* 528 */ unk16 unk_528[4]; // number of choices? + /* 424 */ UnkStruct_020397f8_424 mUnk_424; + /* 428 */ UnknownMsgChoiceStruct mUnk_428[0x20]; + /* 528 */ unk16 mUnk_528[4]; // number of choices? /* 530 */ unk32 mUnk_530; /* 534 */ unk16 mUnk_534; /* 536 */ unk16 mUnk_536; @@ -57,7 +60,7 @@ public: /* 55b */ unk8 mUnk_55b; /* 55c */ unk32 mUnk_55c; /* 560 */ unk32 mUnk_560; - /* 564 */ u16 unk_564[4]; + /* 564 */ u16 mUnk_564[4]; /* 56c */ unk16 mUnk_56c; /* 56e */ unk16 mUnk_56e; /* 570 */ unk16 mUnk_570; @@ -94,9 +97,9 @@ public: /* 48 */ virtual void vfunc_48(); void func_0203a35c(); bool func_0203a3e0(); - /* 44 */ virtual void vfunc_44(s32 param1, s32 param2); + /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); bool func_0203a6d0(unk32 param1); - /* 50 */ virtual void vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4); + /* 50 */ virtual void vfunc_50(EntryINF1* param1, unk32 param2, s32 param3, unk32 param4); /* 54 */ virtual void vfunc_54(); /* 5c */ virtual void vfunc_5c(); /* 58 */ virtual void vfunc_58(); @@ -121,7 +124,7 @@ public: /* 74 */ //! TODO: check if this is really here - static bool func_0203c25c(class MsgProc_Type1* param_1); + static bool func_0203c25c(class UnkStruct_020397f8* param_1); static void func_0203e060(UnkStruct_02038aa0* param_1, u8 param_2, u8 param_3); void func_02039a3c(void); unk32 func_02039250(void); @@ -143,6 +146,9 @@ public: class MsgProc_Type3 : public UnkStruct_02038aa0 { public: + /* 000 (base) */ + /* 161 */ unk8 mUnk_161; + /* 162 */ unk16 mUnk_162; /* 164 */ unk16 mUnk_164; /* 166 */ unk16 mUnk_166; /* 168 */ unk16 mUnk_168; @@ -154,7 +160,7 @@ public: /* 174 */ unk16 mUnk_174; /* 178 */ unk32 mUnk_178; /* 17c */ unk32 mUnk_17c; - /* 180 */ UnkClass_func_ov000_020d0644 unk_180[4]; + /* 180 */ UnkClass_func_ov000_020d0644 mUnk_180[4]; /* 1c0 */ MsgProc_Type3(); @@ -195,6 +201,9 @@ public: class MsgProc_Type2 : public UnkStruct_02038aa0 { public: + /* 000 (base) */ + /* 161 */ unk8 mUnk_161; + /* 162 */ unk16 mUnk_162; /* 164 */ unk16 mUnk_164; /* 166 */ unk16 mUnk_166; /* 168 */ unk16 mUnk_168; diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp index af1ba915..6d6e25ae 100644 --- a/include/Unknown/UnkStruct_0203dae0.hpp +++ b/include/Unknown/UnkStruct_0203dae0.hpp @@ -4,6 +4,7 @@ #include "types.h" #include "Unknown/UnkStruct_02032f0c.hpp" +#include "Message/MsgProc.hpp" // astruct_7, MsgProc_Base2 class UnkStruct_0203dae0 : public UnkStruct_02032f0c { @@ -63,7 +64,7 @@ public: /* 108 */ unk8 mUnk_10b; /* 10c */ unk32 mUnk_10c; /* 110 */ unk32 mUnk_110; - /* 114 */ void *mUnk_114; // MsgProc_Base2_unk_114? + /* 114 */ UnkStruct_0203dae0_114 *mUnk_114; /* 118 */ s32 mUnk_118; /* 11c */ unk16 mUnk_11c; /* 11e */ u8 mUnk_11e; diff --git a/src/Main/Actor/ActorType.cpp b/src/Main/Actor/ActorType.cpp index ec5f564f..742aa86a 100644 --- a/src/Main/Actor/ActorType.cpp +++ b/src/Main/Actor/ActorType.cpp @@ -5,8 +5,8 @@ ActorTypeList sActorTypeList; ARM ActorType::ActorType(ActorTypeId id, ActorCreateFunc create, unk32 (*unk_08)()) { this->id = id; this->create = create; - this->unk_08 = unk_08; - this->unk_0c = 0; + this->mUnk_08 = unk_08; + this->mUnk_0c = 0; this->next = NULL; this->Register(); sActorTypeList.tail = this; @@ -17,7 +17,7 @@ ARM ActorType::~ActorType() { } ARM unk32 ActorType::func_0203e7c8() { - if (this->unk_08 == NULL) { + if (this->mUnk_08 == NULL) { return 0; } return (*unk_08)(); diff --git a/src/Main/Message/BMG.cpp b/src/Main/Message/BMG.cpp index 1d8c2f06..edf2f9f5 100644 --- a/src/Main/Message/BMG.cpp +++ b/src/Main/Message/BMG.cpp @@ -54,8 +54,8 @@ THUMB void func_020371b4(BMGFileInfo* pFileInfo) { pFileInfo->pFLW1 = NULL; pFileInfo->pFLI1 = NULL; pFileInfo->pDAT1 = NULL; - pFileInfo->unk_14 = NULL; - pFileInfo->unk_18 = 0; + pFileInfo->mUnk_14 = NULL; + pFileInfo->mUnk_18 = 0; } THUMB u16 func_020371c8(BMGFileInfo* pFileInfo, u32* pFile, s16 unk_18) { @@ -64,9 +64,9 @@ THUMB u16 func_020371c8(BMGFileInfo* pFileInfo, u32* pFile, s16 unk_18) { u32 i; groupId = -1; - pFileInfo->unk_14 = (BMGHeader*)pFile; + pFileInfo->mUnk_14 = (BMGHeader*)pFile; pFileInfo->pHeader = (BMGHeader*)pFile; - pFileInfo->unk_18 = mUnk_18; + pFileInfo->mUnk_18 = unk_18; pSection = (SectionBase*)((u8*)pFile + sizeof(BMGHeader)); for (i = 0; i < pFileInfo->pHeader->numSections; i++) { @@ -173,8 +173,8 @@ THUMB void BMGGroups::func_020373b4(s16 unk_18) { s32 i; for (i = 0; i < this->numEntries; i++) { - if (this->entries[i].unk_18 == unk_18) { - func_0202d590(this->entries[i].unk_14); + if (this->entries[i].mUnk_18 == unk_18) { + func_0202d590(this->entries[i].mUnk_14); func_020371b4(&this->entries[i]); } } diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 70caaf7b..e78a9e64 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -1,10 +1,11 @@ #include "Message/MessageManager.hpp" #include "Actor/ActorManager.hpp" #include "Player/TouchControl.hpp" +#include "System/SysNew.hpp" extern ARM unk32 func_ov000_020d7f18(u32*, unk32); extern ARM unk32 func_02037628(u8*); -extern ARM void func_0203dc74(MsgProc_Main*, unk32, unk32); +extern ARM void func_0203dc74(UnkStruct_02038aa0*, unk32, unk32); extern u32** data_027e0ce0[]; extern u32 data_02056924[]; @@ -25,8 +26,8 @@ ARM void UnkStruct_027E0C68::func_0203643c(int *param_1, UnkStruct_027E0C68* par THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 param_4) { s32 i; - this->unk_03 = 0; - this->unk_0C = 0; + this->mUnk_03 = 0; + this->mUnk_0c = 0; this->pGroups->func_020372f0(BMG_FILE_INDEX_SYSTEM, 2); @@ -50,79 +51,79 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 break; } - for (i = 0; i < ARRAY_LEN(this->unk_18); i++) { - if (this->unk_18[i] != NULL) { - this->unk_18[i] = NULL; + for (i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { + if (this->mUnk_18[i] != NULL) { + this->mUnk_18[i] = NULL; } } - for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - if (this->unk_28[i] != NULL) { - this->unk_28[i] = NULL; + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + if (this->mUnk_28[i] != NULL) { + this->mUnk_28[i] = NULL; } } - for (i = 0; i < ARRAY_LEN(this->unk_18); i++) { - this->unk_18[i] = new(*data_027e0ce0[0], 4) UnkStruct_020386d8(); + for (i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { + this->mUnk_18[i] = new(*data_027e0ce0[0], 4) UnkStruct_020386d8(); } - this->unk_18[0]->unk_39 = 0; - this->unk_18[1]->unk_39 = 1; + this->mUnk_18[0]->mUnk_39 = 0; + this->mUnk_18[1]->mUnk_39 = 1; // switch? if (*data_027e0618 == 2 || *data_027e0618 == 3 || *data_027e0618 == 6) { - for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { switch (data_02056924[i + 1]) { case 0: if (*data_027e0618 != 2) { - this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type1(); - func_0203dc74(this->unk_28[i], 0xE0, 0x40); - this->unk_28[i]->unk_2C = data_02068e6c; - this->unk_28[i]->unk_50 = i != 0; + this->mUnk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_020397f8(); + func_0203dc74(this->mUnk_28[i], 0xE0, 0x40); + this->mUnk_28[i]->mUnk_2c = &data_02068e6c; + this->mUnk_28[i]->mUnk_50 = i != 0; } break; case 1: - this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type3(); - func_0203dc74(this->unk_28[i], 0x50, 0x60); - this->unk_28[i]->unk_2C = data_02068e6c; + this->mUnk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type3(); + func_0203dc74(this->mUnk_28[i], 0x50, 0x60); + this->mUnk_28[i]->mUnk_2c = &data_02068e6c; break; case 2: - this->unk_28[i] = NULL; + this->mUnk_28[i] = NULL; break; case 3: if (func_0202ab48() == 0) { - this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type2(); - func_0203dc74(this->unk_28[i], 0xC0, 0x20); - this->unk_28[i]->unk_2C = data_02068e8c; + this->mUnk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type2(); + func_0203dc74(this->mUnk_28[i], 0xC0, 0x20); + this->mUnk_28[i]->mUnk_2c = &data_02068e8c; } else { - this->unk_28[i] = NULL; + this->mUnk_28[i] = NULL; } break; default: break; } - if (this->unk_28[i] != NULL) { - this->unk_28[i]->vfunc_4C(); + if (this->mUnk_28[i] != NULL) { + this->mUnk_28[i]->vfunc_4C(); } } } } THUMB void UnkStruct_027E0C68::func_0203665c(void) { - for (s32 i = 0; i < ARRAY_LEN(this->unk_28); i++) { - if (this->unk_28[i] != NULL) { - delete this->unk_28[i]; + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + if (this->mUnk_28[i] != NULL) { + delete this->mUnk_28[i]; - this->unk_28[i] = NULL; + this->mUnk_28[i] = NULL; } } - for (s32 i = 0; i < ARRAY_LEN(this->unk_18); i++) { - if (this->unk_18[i] != NULL) { - delete this->unk_18[i]; + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { + if (this->mUnk_18[i] != NULL) { + delete this->mUnk_18[i]; - this->unk_18[i] = NULL; + this->mUnk_18[i] = NULL; } } @@ -130,21 +131,21 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) { } // non-matching -ARM MsgProc_Type1* UnkStruct_027E0C68::func_020366c4(void) { +ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_020366c4(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { - return (MsgProc_Type1*)this->unk_28[2]; + return (UnkStruct_020397f8*)this->mUnk_28[2]; } - return (MsgProc_Type1*)this->unk_28[0]; + return (UnkStruct_020397f8*)this->mUnk_28[0]; } // non-matching -ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036700(void) { +ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036700(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { - return (MsgProc_Type1*)this->unk_28[0]; + return (UnkStruct_020397f8*)this->mUnk_28[0]; } - return (MsgProc_Type1*)this->unk_28[2]; + return (UnkStruct_020397f8*)this->mUnk_28[2]; } ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_0203673c(void) { @@ -152,27 +153,27 @@ ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_0203673c(void) { bool iVar2 = this->func_02036850(); if (iVar1) { - return this->unk_18[0]; + return this->mUnk_18[0]; } if (iVar2) { - return this->unk_18[1]; + return this->mUnk_18[1]; } return NULL; } ARM bool UnkStruct_027E0C68::func_02036770(u32 param_2) { - return (this->unk_18[param_2]->unk_18 & ~0xFFFF) == (0x100 << 0x10); + return (this->mUnk_18[param_2]->mUnk_18 & ~0xFFFF) == (0x100 << 0x10); } ARM unk32 UnkStruct_027E0C68::func_02036798(void) { unk32 uVar2 = 1; - if (this->unk_04 == 0) { + if (this->mUnk_04 == 0) { bool bVar1 = false; - if (this->unk_18[1] != NULL && (this->unk_18[1]->unk_18 & 0xFFFF0000) != 0x1000000) { + if (this->mUnk_18[1] != NULL && (this->mUnk_18[1]->mUnk_18 & 0xFFFF0000) != 0x1000000) { bVar1 = true; } @@ -189,11 +190,11 @@ ARM bool UnkStruct_027E0C68::func_020367dc(int param_2) { } ARM bool UnkStruct_027E0C68::func_020367ec(void) { - return ((MsgProc_Type1*)this->unk_28[0])->unk_15C > 0; + return ((UnkStruct_020397f8*)this->mUnk_28[0])->mUnk_15c > 0; } ARM bool UnkStruct_027E0C68::func_02036808(void) { - return ((MsgProc_Type1*)this->unk_28[2])->unk_15C > 0; + return ((UnkStruct_020397f8*)this->mUnk_28[2])->mUnk_15c > 0; } ARM bool UnkStruct_027E0C68::func_02036824(void) { @@ -215,31 +216,31 @@ ARM bool UnkStruct_027E0C68::func_02036850(void) { } ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8* param_2) { - if ((param_2->unk_18 & ~0xFFFF) != (0x100 << 0x10)) { - MsgProc_Type1* iVar1 = this->func_020366c4(); + if ((param_2->mUnk_18 & ~0xFFFF) != (0x100 << 0x10)) { + UnkStruct_020397f8* iVar1 = this->func_020366c4(); - if (iVar1->unk_15C <= 0) { + if (iVar1->mUnk_15c <= 0) { param_2->vfunc_10(); } else { - param_2->vfunc_0C(this->func_020366c4()); + param_2->vfunc_0c(this->func_020366c4()); } } } ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750* param_2) { - if (this->unk_20[1] != NULL) { + if (this->mUnk_20[1] != NULL) { return false; } - this->unk_20[1] = param_2; + this->mUnk_20[1] = param_2; return true; } // non-matching ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { - MsgProc_Type1* unk_28_0; - MsgProc_Type1* unk_28_2; - MsgProc_Main *pSVar4; + UnkStruct_020397f8* unk_28_0; + UnkStruct_020397f8* unk_28_2; + UnkStruct_02038aa0 *pSVar4; ActorRef actorRef; Actor* pActor; bool iVar1; @@ -250,104 +251,104 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p return; } - this->unk_40[1] = this->unk_40[0]; + this->mUnk_40[1] = this->mUnk_40[0]; - unk_28_0 = (MsgProc_Type1*)this->unk_28[0]; + unk_28_0 = (UnkStruct_020397f8*)this->mUnk_28[0]; - if (unk_28_0 != NULL && unk_28_0->unk_15C > 0) { - unk_28_2 = (MsgProc_Type1*)this->unk_28[2]; + if (unk_28_0 != NULL && unk_28_0->mUnk_15c > 0) { + unk_28_2 = (UnkStruct_020397f8*)this->mUnk_28[2]; - if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) { - this->unk_40[0] = this->func_020366c4(); + if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) { + this->mUnk_40[0] = this->func_020366c4(); } else { - this->unk_40[0] = unk_28_2; + this->mUnk_40[0] = unk_28_2; } } else { - unk_28_2 = (MsgProc_Type1*)this->unk_28[2]; + unk_28_2 = (UnkStruct_020397f8*)this->mUnk_28[2]; - if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) { - this->unk_40[0] = unk_28_0; + if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) { + this->mUnk_40[0] = unk_28_0; } else { - this->unk_40[0] = NULL; + this->mUnk_40[0] = NULL; } } iVar1 = this->func_02036824(); iVar2 = this->func_02036850(); - if (this->unk_20[1] != NULL && ((this->unk_20[1]->unk_18 & ~0xFFFF) != (0x100 << 0x10))) { - this->unk_20[1]->vfunc_10(); - this->unk_20[1] = NULL; + if (this->mUnk_20[1] != NULL && ((this->mUnk_20[1]->mUnk_18 & ~0xFFFF) != (0x100 << 0x10))) { + this->mUnk_20[1]->vfunc_10(); + this->mUnk_20[1] = NULL; } if (iVar1) { - this->func_02036888(this->unk_18[0]); + this->func_02036888(this->mUnk_18[0]); } else if (iVar2) { - this->func_02036888(this->unk_18[1]); + this->func_02036888(this->mUnk_18[1]); } - for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - if (this->unk_28[i] != NULL) { - this->unk_28[i]->vfunc_2C(); + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + if (this->mUnk_28[i] != NULL) { + this->mUnk_28[i]->vfunc_2C(); } } - this->unk_04 = 0; + this->mUnk_04 = 0; - if (this->unk_20[0] != NULL) { - if ((this->unk_20[0]->unk_18 & ~0xFFFF) == (0x100 << 0x10)) { - this->unk_20[0] = NULL; + if (this->mUnk_20[0] != NULL) { + if ((this->mUnk_20[0]->mUnk_18 & ~0xFFFF) == (0x100 << 0x10)) { + this->mUnk_20[0] = NULL; } else { - this->unk_04 = 1; + this->mUnk_04 = 1; } } - if ((this->unk_18[0] != NULL) && ((this->unk_18[0]->unk_18 & ~0xFFFF) != (0x100 << 0x10))) { - this->unk_04 = 1; + if ((this->mUnk_18[0] != NULL) && ((this->mUnk_18[0]->mUnk_18 & ~0xFFFF) != (0x100 << 0x10))) { + this->mUnk_04 = 1; //! TODO: fake? - pSVar4 = this->func_02037178((UnkSubClass1_02256FF8*)this->unk_18[0]); + pSVar4 = this->func_02037178((UnkSubClass1_02256FF8*)this->mUnk_18[0]); - if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { - this->unk_04 = 0; + if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->mUnk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { + this->mUnk_04 = 0; } } - if (this->unk_08 != NULL && this->unk_08->unk_15C > 0) { - this->unk_04 = 1; + if (this->mUnk_08 != NULL && this->mUnk_08->mUnk_15c > 0) { + this->mUnk_04 = 1; } else { - this->unk_08 = NULL; + this->mUnk_08 = NULL; } this->func_02036bbc(); - if (this->unk_10 != 0) { - ActorManager::FindActorByType(&actorRef, gActorManager, data_0205691c[this->unk_10]); + if (this->mUnk_10 != 0) { + ActorManager::FindActorByType(&actorRef, gActorManager, data_0205691c[this->mUnk_10]); pActor = gActorManager->GetActor(&actorRef); if (pActor != NULL) { - func_ov000_020cec60(data_027e0ffc, data_02056918[this->unk_10], &pActor->mPos, pActor, 0); + func_ov000_020cec60(data_027e0ffc, data_02056918[this->mUnk_10], &pActor->mPos, pActor, 0); } } } ARM void UnkStruct_027E0C68::func_02036bbc(void) { - MsgProc_Main* pSVar3; + UnkStruct_02038aa0* pSVar3; bool bVar2; bool bVar4; s32 i; - if (data_027e0d04.unk_00 > 0) { + if (data_027e0d04.mUnk_00 > 0) { return; } bVar2 = this->func_02036824(); bVar4 = this->func_02036850(); - for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - pSVar3 = this->unk_28[i]; + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + pSVar3 = this->mUnk_28[i]; - if (pSVar3 != NULL && ((bVar2 && pSVar3->unk_50 == 0) || (bVar4 && pSVar3->unk_50 != 0))) { + if (pSVar3 != NULL && ((bVar2 && pSVar3->mUnk_50 == 0) || (bVar4 && pSVar3->mUnk_50 != 0))) { pSVar3->vfunc_44(data_027e0d78.mTouchLastX, data_027e0d78.mTouchLastY); } } @@ -356,9 +357,9 @@ ARM void UnkStruct_027E0C68::func_02036bbc(void) { ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { s32 i; - for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - if (this->unk_28[i] != NULL && this->unk_28[i]->func_0203de14(param_2) != 0) { - this->unk_28[i]->vfunc_28(); + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + if (this->mUnk_28[i] != NULL && this->mUnk_28[i]->func_0203de14(param_2) != 0) { + this->mUnk_28[i]->vfunc_28(); } } } @@ -366,8 +367,8 @@ ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { s32 i; - for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - MsgProc_Main* pSVar1 = this->unk_28[i]; + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + UnkStruct_02038aa0* pSVar1 = this->mUnk_28[i]; if (pSVar1 != NULL) { pSVar1->vfunc_3C(param_2); @@ -393,17 +394,17 @@ ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8* param_2, unk32 pa } ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750* param_2) { - if (this->unk_20[0] != NULL && this->unk_20[0] != param_2) { + if (this->mUnk_20[0] != NULL && this->mUnk_20[0] != param_2) { return false; } - this->unk_20[0] = param_2; + this->mUnk_20[0] = param_2; return true; } ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750* param_2) { - if (this->unk_20[0] == param_2) { - this->unk_20[0] = NULL; + if (this->mUnk_20[0] == param_2) { + this->mUnk_20[0] = NULL; return true; } @@ -413,18 +414,18 @@ ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750* param_2) { ARM void UnkStruct_027E0C68::func_02036d6c(void) { s32 i; - for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { if (func_0202ab48() == 0 || i != 5) { - this->unk_28[i]->func_02038b40(); + this->mUnk_28[i]->func_02038b40(); } } } // non-matching -ARM MsgProc_Main* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { +ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { EntryINF1 *pEVar1; EntryINF1 *pEVar2; - MsgProc_Main *pSVar4; + UnkStruct_02038aa0 *pSVar4; BMGGroups *pBVar5; bool bVar6; s16 iStack_38; @@ -438,7 +439,7 @@ ARM MsgProc_Main* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { } if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { - pSVar4 = this->unk_28[4]; + pSVar4 = this->mUnk_28[4]; func_02037628((u8*)&iStack_38); // ??? @@ -470,7 +471,7 @@ ARM MsgProc_Main* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { // non-matching ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { - MsgProc_Type1 *pSVar1; + UnkStruct_020397f8 *pSVar1; u8 auStack_28[24]; u8 local_13; @@ -486,19 +487,19 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { pSVar1 = this->func_02036f68(param_2, auStack_28); if (pSVar1 != NULL) { - if (this->unk_04 == 0) { - this->unk_08 = pSVar1; + if (this->mUnk_04 == 0) { + this->mUnk_08 = pSVar1; } } } // non-matching -ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { +ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { EntryINF1 *pEVar1; - MsgProc_Main *pSVar2; + UnkStruct_02038aa0 *pSVar2; EntryINF1 *pEVar3; int iVar4; - MsgProc_Type1 *pSVar5; + UnkStruct_020397f8 *pSVar5; pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xffff); @@ -507,18 +508,18 @@ ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { } if (param_3[21] != 0) { - pSVar5 = (MsgProc_Type1*)this->unk_28[2]; - pSVar2 = this->unk_28[3]; + pSVar5 = (UnkStruct_020397f8*)this->mUnk_28[2]; + pSVar2 = this->mUnk_28[3]; } else { - pSVar5 = (MsgProc_Type1*)this->unk_28[0]; - pSVar2 = this->unk_28[1]; + pSVar5 = (UnkStruct_020397f8*)this->mUnk_28[0]; + pSVar2 = this->mUnk_28[1]; } //! TODO: fake? - pSVar5->unk_164 = (MsgProc_Type1*)pSVar2; - pSVar5->unk_418 = this->unk_28[5]; + pSVar5->mUnk_164 = (UnkStruct_020397f8*)pSVar2; + pSVar5->mUnk_418 = this->mUnk_28[5]; - pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s16*)param_3, 0); + pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s32)param_3, 0); if (data_ov000_020eec9c.func_ov000_020d7f18(0x19) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x18) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x34) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x35) == 0 && @@ -538,18 +539,18 @@ ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 p UnkStruct_020386d8* puVar2; if (this->func_02036824()) { - puVar2 = this->unk_18[0]; + puVar2 = this->mUnk_18[0]; } else { if (this->func_02036850()) { - puVar2 = this->unk_18[1]; + puVar2 = this->mUnk_18[1]; } else { return NULL; } } - puVar2->unk_30 = param_5; - puVar2->unk_34 = param_3; - puVar2->unk_36 = param_4; + puVar2->mUnk_30 = param_5; + puVar2->mUnk_34 = param_3; + puVar2->mUnk_36 = param_4; if (this->func_02036ce4(puVar2, param_2)) { return puVar2; @@ -559,7 +560,7 @@ ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 p } ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { - MsgProc_Main* pSVar1; + UnkStruct_02038aa0* pSVar1; pSVar1 = this->func_02037178(param_2); @@ -568,12 +569,12 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { } } -ARM MsgProc_Main* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) { +ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) { s32 i; - for (i = 0; i < ARRAY_LEN(this->unk_28); i++) { - if (this->unk_28[i] != NULL && this->unk_28[i]->unk_08 == param_2) { - return this->unk_28[i]; + for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + if (this->mUnk_28[i] != NULL && this->mUnk_28[i]->mUnk_08 == param_2) { + return this->mUnk_28[i]; } } diff --git a/src/Main/Message/func_0203c358.cpp b/src/Main/Message/func_0203c358.cpp index da640dee..b7dce41b 100644 --- a/src/Main/Message/func_0203c358.cpp +++ b/src/Main/Message/func_0203c358.cpp @@ -10,13 +10,13 @@ THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) : UnkStruct_02038aa0(0, 0) { - this->unk_162 = 4; - this->unk_164 = 1; - this->unk_166 = 0; - this->unk_168 = -1; - this->unk_16A = 0; - this->unk_16C = 1; - this->unk_16E = 0; + this->mUnk_162 = 4; + this->mUnk_164 = 1; + this->mUnk_166 = 0; + this->mUnk_168 = -1; + this->mUnk_16a = 0; + this->mUnk_16c = 1; + this->mUnk_16e = 0; } // non-matching @@ -47,13 +47,13 @@ THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) { } } - if (this->unk_114->vfunc_08(this, uVar3) != 0) { - this->unk_10 = this->unk_114->func_0203d1b4(); + if (this->mUnk_114->vfunc_08(this, uVar3) != 0) { + this->mUnk_10 = this->mUnk_114->func_0203d1b4(); } } ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) { - if (this->unk_15C > 0 && this->unk_122 != 1) { + if (this->mUnk_15c > 0 && this->mUnk_122 != 1) { if (this->func_0203de14(param_2) != 0) { this->vfunc_40(0, 0); } @@ -64,7 +64,7 @@ ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) { param_2 += this->mUnk_166; param_3 += this->mUnk_168; - this->func_0203c4ac(param_2 + this->unk_16A, param_3 + this->unk_16C); + this->func_0203c4ac(param_2 + this->mUnk_16a, param_3 + this->mUnk_16c); this->func_02038ef4(param_2, param_3); } @@ -72,7 +72,7 @@ ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) { extern "C" bool func_0203dcb4(unk32); // non-matching ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) { - return func_0203dcb4(param_2 + this->unk_162); + return func_0203dcb4(param_2 + this->mUnk_162); } ARM MsgProc_Type2::~MsgProc_Type2() { diff --git a/src/Main/Message/func_0203c72c.cpp b/src/Main/Message/func_0203c72c.cpp index ba2a2188..9c5282f1 100644 --- a/src/Main/Message/func_0203c72c.cpp +++ b/src/Main/Message/func_0203c72c.cpp @@ -13,22 +13,22 @@ extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void* ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) : UnkStruct_02038aa0(1, 0) { - this->unk_162 = 1; - this->unk_164 = 0x1A; - this->unk_166 = 0xA6; - this->unk_168 = 0x1D; - this->unk_16A = 0; - this->unk_16C = 1; - this->unk_170 = -1; - this->unk_172 = -1; - this->unk_174 = -1; + this->mUnk_162 = 1; + this->mUnk_164 = 0x1A; + this->mUnk_166 = 0xA6; + this->mUnk_168 = 0x1D; + this->mUnk_16a = 0; + this->mUnk_16c = 1; + this->mUnk_170 = -1; + this->mUnk_172 = -1; + this->mUnk_174 = -1; - func_0204f614(this->unk_180, ARRAY_LEN(this->unk_180), sizeof(UnkClass_func_ov000_020d0644), UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c); + func_0204f614(this->mUnk_180, ARRAY_LEN(this->mUnk_180), sizeof(UnkClass_func_ov000_020d0644), UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c); - this->unk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0); - this->unk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0); - this->unk_180[2].func_ov000_020d0644(0x1E, 2, 0x8C, 0, 0); - this->unk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0); + this->mUnk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0); + this->mUnk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0); + this->mUnk_180[2].func_ov000_020d0644(0x1E, 2, 0x8C, 0, 0); + this->mUnk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0); } ARM void MsgProc_Type3::func_0203c83c(void) { diff --git a/src/Main/Unknown/UnkStruct_02032f0c.cpp b/src/Main/Unknown/UnkStruct_02032f0c.cpp index 7537c3c5..dc4dda7f 100644 --- a/src/Main/Unknown/UnkStruct_02032f0c.cpp +++ b/src/Main/Unknown/UnkStruct_02032f0c.cpp @@ -1,44 +1,45 @@ #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 THUMB unk32 func_0202ab48(void); ARM UnkStruct_02032e7c::UnkStruct_02032e7c() { - this->unk_00 = NULL; - this->unk_08 = 0; - this->unk_0A = 0; - this->unk_0C = 0; - this->unk_0E = 0; + this->mUnk_04 = NULL; + this->mUnk_08 = 0; + this->mUnk_0a = 0; + this->mUnk_0c = 0; + this->mUnk_0e = 0; if (func_0202ab48() == 0) { - this->unk_10 = 2; + this->mUnk_10 = 2; } else { - this->unk_10 = 3; + this->mUnk_10 = 3; } } THUMB UnkStruct_02032f0c::UnkStruct_02032f0c() { - this->unk_04 = 0; - this->unk_08 = 0; - this->unk_0C = NULL; - this->unk_38 = 0; - this->unk_3C = 0; - this->unk_4A = 0; - this->unk_4C = 0; - this->unk_4D = 0; - this->unk_4E = 0; - this->unk_4F = 0; - this->unk_50 = 0; - this->unk_51 = 0; - func_020078f4(0, &this->unk_10, 0x18); - func_020078f4(0, &this->unk_28, 0x10); - func_020078c0(0, &this->unk_3E, 0xC); - this->unk_10 = NULL; - this->unk_2C = NULL; - this->unk_30 = 2; - this->unk_34 = 3; + this->mUnk_04 = 0; + this->mUnk_08 = 0; + this->mUnk_0c = NULL; + this->mUnk_38 = 0; + this->mUnk_3c = 0; + this->mUnk_4a = 0; + this->mUnk_4c = 0; + this->mUnk_4d = 0; + this->mUnk_4e = 0; + 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); + this->mUnk_10 = NULL; + this->mUnk_2c = NULL; + this->mUnk_30 = 2; + this->mUnk_34 = 3; } THUMB UnkStruct_02032f0c::~UnkStruct_02032f0c() { @@ -47,16 +48,16 @@ THUMB UnkStruct_02032f0c::~UnkStruct_02032f0c() { ARM void UnkStruct_02032f0c::func_02032f94() {} ARM u16 **UnkStruct_02032f0c::SetUnk_0c(u16 *value) { - this->unk_0C = value; + this->mUnk_0c = value; return &this->mUnk_0c; } ARM u8 UnkStruct_02032f0c::func_02032fa4() { - return UnkStruct_02035064::func_02035428(this->unk_50); + return UnkStruct_02035064::func_02035428(this->mUnk_50); } ARM s32 UnkStruct_02032f0c::func_02032fb4() { - return this->unk_2C[0]->unk_01 + this->mUnk_34; + return this->mUnk_2c[0]->mUnk_01 + this->mUnk_34; } // non-matching @@ -66,10 +67,10 @@ ARM bool UnkStruct_02032f0c::vfunc_14(s32 param1, s32 param2) { iVar1 = ((param1 + 0x7 + ((param1 + 0x7) >> 0x1D)) ) * 0x8; iVar2 = ((param2 + 0x7 + ((param2 + 0x7) >> 0x1D)) ) * 0x8; - this->unk_4A = param1; - this->unk_4C = param2; - this->unk_14 = (iVar1 + (iVar1 >> 0x1D)) * 0x2000 >> 0x10; - this->unk_18 = (iVar2 + (iVar2 >> 0x1D)) * 0x2000 >> 0x10; + this->mUnk_4a = param1; + this->mUnk_4c = param2; + this->mUnk_14 = (iVar1 + (iVar1 >> 0x1D)) * 0x2000 >> 0x10; + this->mUnk_18 = (iVar2 + (iVar2 >> 0x1D)) * 0x2000 >> 0x10; return true; } @@ -77,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->unk_10, this->unk_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) {} @@ -91,7 +92,7 @@ ARM u32 UnkStruct_02032f0c::func_0203369c(u16 *param1, s32 param2) {} ARM void UnkStruct_02032f0c::func_02033780(s32 param1) {} ARM s32 UnkStruct_02032f0c::func_020337d8(s32 param1) { - return this->unk_2C[0]->unk_08[1] * param1 + (param1 - 1) * this->mUnk_34; + return this->mUnk_2c[0]->mUnk_08[1] * param1 + (param1 - 1) * this->mUnk_34; } ARM s32 UnkStruct_02032f0c::func_020337fc(s16 *param1, s32 param2) {} diff --git a/src/Main/Unknown/UnkStruct_02035064.cpp b/src/Main/Unknown/UnkStruct_02035064.cpp index 8bcd308d..01aaa47c 100644 --- a/src/Main/Unknown/UnkStruct_02035064.cpp +++ b/src/Main/Unknown/UnkStruct_02035064.cpp @@ -1,14 +1,14 @@ #include "Unknown/UnkStruct_02035064.hpp" ARM UnkStruct_02035064::UnkStruct_02035064() { - this->unk_74 = NULL; - this->unk_78 = NULL; - this->unk_7C = 0; - this->unk_80 = 0; - this->unk_82 = 0; - this->unk_84 = 0; - this->unk_86 = 0; - this->unk_87 = 0; + this->mUnk_74 = NULL; + this->mUnk_78 = NULL; + this->mUnk_7c = 0; + this->mUnk_80 = 0; + this->mUnk_82 = 0; + this->mUnk_84 = 0; + this->mUnk_86 = 0; + this->mUnk_87 = 0; } ARM UnkStruct_02035064::~UnkStruct_02035064() { diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp index 73fc89b6..9d6a1995 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -3,14 +3,14 @@ UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { s32 i; - this->unk_14 = param_3; - this->unk_18 = param_2; - this->unk_1C = 0; - this->unk_1D = 0xFF; - this->unk_1E = 0; + this->mUnk_14 = param_3; + this->mUnk_18 = param_2; + this->mUnk_1c = 0; + this->mUnk_1d = 0xFF; + this->mUnk_1e = 0; - for (i = 0; i < ARRAY_LEN(this->unk_04); i++) { - this->unk_04[i] = 0; + for (i = 0; i < ARRAY_LEN(this->mUnk_04); i++) { + this->mUnk_04[i] = 0; } } @@ -37,8 +37,8 @@ ARM void UnkStruct_02037750::vfunc_20() {} // non-matching ARM UnkStruct_020386d8::UnkStruct_020386d8() : UnkStruct_02037750(0x1000000, 0) { - this->unk_20 = -1; - this->unk_24.func_020376c0(gVec3p_ZERO); + this->mUnk_20 = -1; + this->mUnk_24.func_020376c0(gVec3p_ZERO); } ARM void UnkStruct_020386d8::vfunc_08(unk32 param1) {} diff --git a/src/Main/Unknown/UnkStruct_02038aa0.cpp b/src/Main/Unknown/UnkStruct_02038aa0.cpp index 227a4370..899d77f3 100644 --- a/src/Main/Unknown/UnkStruct_02038aa0.cpp +++ b/src/Main/Unknown/UnkStruct_02038aa0.cpp @@ -1,11 +1,13 @@ #include "Unknown/UnkStruct_02038aa0.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Message/MessageManager.hpp" ARM UnkStruct_0203881c::UnkStruct_0203881c() { - this->unk_14 = 0x1000; - this->unk_18 = 0; - this->unk_1C = 0; - this->unk_20 = 0; - this->unk_24 = 0; + this->mUnk_14 = 0x1000; + this->mUnk_18 = 0; + this->mUnk_1c = 0; + this->mUnk_20 = 0; + this->mUnk_24 = 0; } ARM void UnkStruct_0203881c::func_02038858(unk32 param1) {} @@ -16,33 +18,33 @@ ARM UnkStruct_0203881c::~UnkStruct_0203881c() {} THUMB UnkStruct_02038aa0::UnkStruct_02038aa0(u8 param1, u8 param2) : UnkStruct_0203dae0(param1), mUnk_124(0) { - this->func_020387e0(this->unk_150); + this->func_020387e0(this->mUnk_150); this->pInfoEntry = 0; - this->unk_158.y = 0; - this->unk_15C = 0; - this->unk_15E = 0xFF; - this->unk_15F = 0xFF; - this->unk_160 = 1; - this->unk_11E = param2; + this->mUnk_158.y = 0; + this->mUnk_15c = 0; + this->mUnk_15e = 0xFF; + this->mUnk_15f = 0xFF; + this->mUnk_160 = 1; + this->mUnk_11e = param2; } THUMB UnkStruct_02038aa0::~UnkStruct_02038aa0() { } THUMB void UnkStruct_02038aa0::func_02038b28(void) { - this->unk_114->unk_04 = NULL; + this->mUnk_114->mUnk_04 = NULL; } ARM void UnkStruct_02038aa0::func_02038b34(u32 param1, unk32 param2) { - MsgProc_Type1::func_0203e060(this, param1, param2); + UnkStruct_020397f8::func_0203e060(this, param1, param2); } ARM void UnkStruct_02038aa0::vfunc_4c() {} ARM void UnkStruct_02038aa0::vfunc_10(unk32 param1) {} ARM void UnkStruct_02038aa0::func_02038b40() { - this->unk_15C = -1; - this->unk_128.unk_00 = NULL; + this->mUnk_15c = -1; + this->mUnk_128.mUnk_04 = NULL; this->func_0203dc10(0); this->vfunc_48(); } @@ -55,7 +57,7 @@ ARM void UnkStruct_02038aa0::func_02038b74(void) { // non-matching ARM bool UnkStruct_02038aa0::func_02038b78() { if (data_027e0c54 == 0) { - if ((this->unk_50 != 0 && data_027e0c68.func_02036850() != 0) || (this->unk_50 == 0 && data_027e0c68.func_02036824() != 0)) { + if ((this->mUnk_50 != 0 && data_027e0c68.func_02036850() != 0) || (this->mUnk_50 == 0 && data_027e0c68.func_02036824() != 0)) { return true; } @@ -63,8 +65,8 @@ ARM bool UnkStruct_02038aa0::func_02038b78() { } else { bool ret = CHECK_UNK_FLAGS(1); - if ((this->unk_50 == 0 || ret)) { - return (this->unk_50 != 0 && ret); + if ((this->mUnk_50 == 0 || ret)) { + return (this->mUnk_50 != 0 && ret); } return false; @@ -79,7 +81,7 @@ ARM unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) { iVar2 = this->func_02038cf4(); iVar3 = this->func_02038d10(); - iVar1 = ((this->unk_158.y - (this->unk_18 << 3) / 2)); + iVar1 = ((this->mUnk_158.y - (this->mUnk_18 << 3) / 2)); if ((param1 < iVar2 + iVar1) || (iVar2 + iVar3 + iVar1 <= param1)) { return -1; @@ -93,7 +95,7 @@ ARM unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) { } ARM s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) { - u8 bVar1 = this->unk_2C[0]->unk_08[1]; + u8 bVar1 = this->mUnk_2c[0]->mUnk_08[1]; unk32 iVar2 = this->func_02038cf4(); unk32 iVar1 = this->func_020337d8(param1 + 1); return iVar2 + iVar1 - bVar1; @@ -109,16 +111,16 @@ ARM s32 UnkStruct_02038aa0::func_02038cf4() { } ARM s32 UnkStruct_02038aa0::func_02038d10() { - return this->func_020337d8(this->unk_150[0]); + return this->func_020337d8(this->mUnk_150[0]); } ARM void UnkStruct_02038aa0::vfunc_2c() {} ARM void UnkStruct_02038aa0::vfunc_30() { - if (this->unk_15C > 0) { + if (this->mUnk_15c > 0) { this->func_0203e090(); } else { - this->unk_118 = -1; + this->mUnk_118 = -1; } } @@ -133,22 +135,24 @@ ARM bool UnkStruct_02038aa0::func_02038ef4(s32 param1, s32 param2) { ARM void UnkStruct_02038aa0::func_02038f40(void) { } +ARM void UnkStruct_02038aa0::vfunc_44(s32 touchLastX, s32 touchLastY) {} + // non-matching -ARM void UnkStruct_02038aa0::vfunc_44() { +ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4) { int iVar1; - this->pInfoEntry = param_2; - this->unk_08 = param_5; - this->unk_15F = -1; - this->unk_15C = 0x78; - this->unk_15E = param_4->mUnk_0c; - this->func_0203dcfc(param_6, 0, this->unk_11E, 2); - this->unk_128.func_02038858(param_3); - this->unk_30 = this->unk_150[4] + 5; + this->pInfoEntry = param1; + this->mUnk_08 = param4; + this->mUnk_15f = -1; + this->mUnk_15c = 0x78; + this->mUnk_15e = param4->mUnk_0c; + this->func_0203dcfc(0, 0, this->mUnk_11e, 2); + this->mUnk_128.func_02038858(param2); + this->mUnk_30 = this->mUnk_150[4] + 5; this->vfunc_54(); - // this->vfunc_60(0, 0, (unk32)param_4); - // this->vfunc_64(param_4); + // this->vfunc_60(0, 0, (unk32)param3); + // this->vfunc_64(param3); if (*(unk32*)data_027e0618 == 2) { if (this->func_02032fa4() == 0) { @@ -161,26 +165,24 @@ ARM void UnkStruct_02038aa0::vfunc_44() { this->vfunc_5C(); } -ARM void UnkStruct_02038aa0::vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4) { -} - // non-matching -ARM void UnkStruct_02038aa0::vfunc_5c() { +ARM void UnkStruct_02038aa0::vfunc_5c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { u16 sVar1; bool bVar5; sVar1 = param_2[0]; bVar5 = (sVar1 == 0xA || sVar1 == 0x20) || sVar1 == 0x3000; - if (bVar5 && this->unk_150[2] != 0) { - this->unk_150[2] = 1; + if (bVar5 && this->mUnk_150[2] != 0) { + this->mUnk_150[2] = 1; } else { - this->unk_150[2] = 0; + this->mUnk_150[2] = 0; } - // this->unk_150[2] = bVar5; + // this->mUnk_150[2] = bVar5; - return this->func_02033360(); + // return? + this->func_02033360(); } ARM unk32 UnkStruct_02038aa0::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {} @@ -188,9 +190,9 @@ ARM unk32 UnkStruct_02038aa0::vfunc_20(s32 param1, s32 *param2) {} ARM void UnkStruct_02038aa0::func_02039208(unk16 param1) {} // non-matching -ARM void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) { - this->unk_15C = 10; - this->unk_150[2] = 1; +ARM void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32* param2, s16 *param3, unk32 param4) { + this->mUnk_15c = 10; + this->mUnk_150[2] = 1; this->func_0203e2ac(param2); } @@ -201,26 +203,26 @@ ARM void UnkStruct_02038aa0::vfunc_60() {} ARM void UnkStruct_02038aa0::vfunc_64() {} ARM s32 UnkStruct_02038aa0::vfunc_68(unk32 param1) { - switch (param_2) { + switch (param1) { case 0: break; case 1: - this->unk_34 = 4; + this->mUnk_34 = 4; break; case 2: - this->unk_34 = 6; + this->mUnk_34 = 6; break; case 3: - this->unk_34 = 1; + this->mUnk_34 = 1; break; case 4: - this->unk_34 = 0; + this->mUnk_34 = 0; break; default: break; } - return ((this->unk_18 << 3) - this->func_020337d8(param1)) / 2; + return ((this->mUnk_18 << 3) - this->func_020337d8(param1)) / 2; } ARM void UnkStruct_02038aa0::func_02039440(unk32 param1, unk32 param2) {} @@ -228,12 +230,12 @@ ARM void UnkStruct_02038aa0::vfunc_6c(s32 *param1, s32 *param2) {} ARM void UnkStruct_02038aa0::vfunc_70(s32 *param1, s32 *param2) { this->vfunc_6C(param1, param2); - *param1 += this->unk_158.x; - *param2 += this->unk_158.y; + *param1 += this->mUnk_158.x; + *param2 += this->mUnk_158.y; } ARM bool UnkStruct_02038aa0::func_0203951c() {} -ARM unk32 UnkStruct_02038aa0::vfunc_38() {} +ARM bool UnkStruct_02038aa0::vfunc_38() {} ARM void UnkStruct_02038aa0::vfunc_0c(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) { this->func_0203dc10(1, param_3); diff --git a/src/Main/Unknown/UnkStruct_020397f8.cpp b/src/Main/Unknown/UnkStruct_020397f8.cpp index d7bf6f59..08ca79d0 100644 --- a/src/Main/Unknown/UnkStruct_020397f8.cpp +++ b/src/Main/Unknown/UnkStruct_020397f8.cpp @@ -1,4 +1,8 @@ +#include "Message/MsgProc.hpp" +#include "Message/MessageManager.hpp" #include "Unknown/UnkStruct_020397f8.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Player/TouchControl.hpp" extern "C" void func_ov000_020d0460(void*); extern "C" void func_0203efd8(void*, void*); @@ -11,142 +15,142 @@ THUMB UnkStruct_020397f8::UnkStruct_020397f8() : UnkStruct_02038aa0(0, 0), mUnk_164(NULL) { UnknownMsgChoiceStruct* puVar3; - this->unk_410.unk_00 = this; - this->unk_414 = 0; - this->unk_418 = NULL; - this->unk_41C = 0; - this->unk_41E = 0; - this->unk_420 = 0; - this->unk_424.unk_00 = this; + this->mUnk_410.mUnk_00 = this; + this->mUnk_414 = 0; + this->mUnk_418 = NULL; + this->mUnk_41c = 0; + this->mUnk_41e = 0; + this->mUnk_420 = 0; + this->mUnk_424.mUnk_00 = this; // ??? puVar3 = this->mUnk_428; do { - puVar3->unk_00 = NULL; + puVar3->mUnk_00 = NULL; puVar3 += 1; - } while ((unk32*)puVar3 < (unk32*)this->unk_528); + } while ((unk32*)puVar3 < (unk32*)this->mUnk_528); - func_0203ee48(&this->unk_424); - func_ov000_020d0460(&this->unk_534); - this->unk_53C = 0; - this->unk_540 = ~0x7FFF; - this->unk_544 = 3; - func_ov000_020d0460(&this->unk_548); - this->unk_550 = 0; - this->unk_554 = 0x00016000; - this->unk_558 = 3; - this->unk_55C = -1; - this->unk_560 = -1; - this->unk_56C = 0; - this->unk_56E = 0; - this->unk_570 = 0; - this->unk_572 = 0; - this->unk_574 = 0; - this->unk_576 = 0; - this->unk_578 = 3; - this->unk_57A = 0; - this->unk_57B = -1; - this->unk_57C = 0; - this->unk_57D = 0; - this->unk_57E = 0; - this->unk_57F = 0; - this->unk_580 = 0; - this->unk_581 = 0; - this->unk_582 = 0; - this->unk_583 = 0; - this->unk_585 = 0; - this->unk_586 = 0; - func_0203efd8(&this->unk_588, this); - this->unk_124 = (UnkSubClass1_unk_124*)&this->mUnk_588; + func_0203ee48(&this->mUnk_424); + func_ov000_020d0460(&this->mUnk_534); + this->mUnk_53c = 0; + this->mUnk_540 = ~0x7FFF; + this->mUnk_544 = 3; + func_ov000_020d0460(&this->mUnk_548); + this->mUnk_550 = 0; + this->mUnk_554 = 0x00016000; + this->mUnk_558 = 3; + this->mUnk_55c = -1; + this->mUnk_560 = -1; + this->mUnk_56c = 0; + this->mUnk_56e = 0; + this->mUnk_570 = 0; + this->mUnk_572 = 0; + this->mUnk_574 = 0; + this->mUnk_576 = 0; + this->mUnk_578 = 3; + this->mUnk_57a = 0; + this->mUnk_57b = -1; + this->mUnk_57c = 0; + this->mUnk_57d = 0; + this->mUnk_57e = 0; + this->mUnk_57f = 0; + this->mUnk_580 = 0; + this->mUnk_581 = 0; + this->mUnk_582 = 0; + this->mUnk_583 = 0; + this->mUnk_585 = 0; + this->mUnk_586 = 0; + func_0203efd8(&this->mUnk_588, this); + this->mUnk_124 = (UnkSubClass1_unk_124*)&this->mUnk_588; this->func_02039ca8(); if (this->func_02032fa4() != 0) { - this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); + this->mUnk_168.func_020350b4(0x39, 0, 2, 0, 0); + this->mUnk_1f0.func_020350b4(0x33, 0, 2, 0, 0); + this->mUnk_278.func_020350b4(0x33, 1, 2, 0, 0); } else { - this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); + this->mUnk_168.func_020350b4(0x34, 0, 2, 0, 0); + this->mUnk_1f0.func_020350b4(0x32, 0, 2, 0, 0); + this->mUnk_278.func_020350b4(0x32, 1, 2, 0, 0); } - this->unk_168.func_020351b8(true, false, false, false); - this->unk_1F0.func_020351b8(false, false, false, false); - this->unk_278.func_020351b8(false, false, false, false); + this->mUnk_168.func_020351b8(true, false, false, false); + this->mUnk_1f0.func_020351b8(false, false, false, false); + this->mUnk_278.func_020351b8(false, false, false, false); } THUMB void UnkStruct_020397f8::vfunc_4c() { this->func_02038b28(); - this->func_0203dcfc(this->unk_50, 0, 0, 2); + this->func_0203dcfc(this->mUnk_50, 0, 0, 2); } // non-matching ARM void UnkStruct_020397f8::vfunc_2c() { if (data_027e0618[0x101] != 0) { - if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->mUnk_50) { return; } } this->func_02038d20(); - if (this->unk_56C > 0) { - this->unk_56C--; + if (this->mUnk_56c > 0) { + this->mUnk_56c--; } - if (this->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { - this->unk_57F = 0; + if (this->mUnk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { + this->mUnk_57f = 0; } - if (this->unk_15C > 0) { - if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { - this->unk_424.func_0203ef78(this->unk_128.unk_08); + if (this->mUnk_15c > 0) { + if ((this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0) { + this->mUnk_424.func_0203ef78(this->mUnk_128.mUnk_08); } this->func_0203be64(); this->func_0203a35c(); - if (this->unk_580 != 0) { - this->unk_168.func_0203516c(); + if (this->mUnk_580 != 0) { + this->mUnk_168.func_0203516c(); } - if (this->unk_584 != 0) { - this->unk_300.func_0203516c(); + if (this->mUnk_584 != 0) { + this->mUnk_300.func_0203516c(); } - if (this->unk_585 != 0) { - this->unk_388.func_0203516c(); + if (this->mUnk_585 != 0) { + this->mUnk_388.func_0203516c(); } - if ((this->func_0203a2c0() != 0 && this->unk_57F == 0) && this->unk_56C <= 0) { - this->unk_1F0.func_0203516c(); + if ((this->func_0203a2c0() != 0 && this->mUnk_57f == 0) && this->mUnk_56c <= 0) { + this->mUnk_1f0.func_0203516c(); } - if (this->unk_08 != NULL) { - bool value = this->unk_08->mUnk_1c; + if (this->mUnk_08 != NULL) { + bool value = this->mUnk_08->mUnk_1c; if ((value == 1) || (value == 2)) { - this->unk_278.func_0203516c(); + this->mUnk_278.func_0203516c(); } } - if (this->unk_15E == 6) { + if (this->mUnk_15e == 6) { func_ov018_02169634(this); } else { - this->unk_410.func_0203ebf8(); + this->mUnk_410.func_0203ebf8(); } } - if (this->unk_15C == 1) { - if (this->unk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) { - switch (this->unk_150[1]) { + if (this->mUnk_15c == 1) { + if (this->mUnk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) { + switch (this->mUnk_150[1]) { case 0: this->func_0203b0ec(1); break; case 2: case 3: if (this->func_0203a3e0() != 0) { - this->func_0203bd8c(this->unk_572); + this->func_0203bd8c(this->mUnk_572); } else { this->func_0203b0ec(1); } @@ -159,20 +163,20 @@ ARM void UnkStruct_020397f8::vfunc_2c() { ARM void UnkStruct_020397f8::func_02039ca8() { s32 i; - for (i = 0; i < ARRAY_LEN(this->unk_564); i++) { - this->unk_564[i] = 0x1A; + for (i = 0; i < ARRAY_LEN(this->mUnk_564); i++) { + this->mUnk_564[i] = 0x1A; } } ARM void UnkStruct_020397f8::vfunc_3c() { - if (this->unk_15C > 0 && this->func_0203de14(param_2) != 0) { - if (this->unk_124->unk_29 != 3) { - if ((this->unk_50 == 0) && func_ov000_02079e04() != 0) { + if (this->mUnk_15c > 0 && this->func_0203de14(param_2) != 0) { + if (this->mUnk_124->mUnk_29 != 3) { + if ((this->mUnk_50 == 0) && func_ov000_02079e04() != 0) { return; } if (data_027e0618[0x101] != 0) { - if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->unk_50) { + if (((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) != this->mUnk_50) { return; } } @@ -184,7 +188,7 @@ ARM void UnkStruct_020397f8::vfunc_3c() { // non-matching ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { - MsgProc_Main* bVar1; + UnkStruct_02038aa0* bVar1; s8 cVar2; unk32 iVar4; unk32 iVar6; @@ -206,35 +210,35 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { local_8c = 0; local_90 = 0; - bVar1 = data_027e0c68.unk_28[this->unk_50]; + bVar1 = data_027e0c68.mUnk_28[this->mUnk_50]; this->vfunc_6C(&local_8c, &local_90); this->func_0203a188(local_8c + param_2, local_90 + param_3, 0); - this->func_0203e1b0(param_2 + local_8c + (this->unk_158.x - (this->unk_14 << 3) / 2), param_3 + local_90 + (this->unk_158.y - (this->unk_18 << 3) / 2), 0); + this->func_0203e1b0(param_2 + local_8c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), param_3 + local_90 + (this->mUnk_158.y - (this->mUnk_18 << 3) / 2), 0); - if (this->unk_584 != 0) { - iVar5 = this->unk_18 << 3; + if (this->mUnk_584 != 0) { + iVar5 = this->mUnk_18 << 3; - if (this->unk_580 != 0) { + if (this->mUnk_580 != 0) { iVar5 = -0xC; } else { iVar5 = 0; } - this->unk_300.func_02034a1c(param_2 + local_8c + this->unk_55C + (this->unk_158.x - (this->unk_14 << 3) / 2), - iVar5 + param_3 + local_90 + this->unk_560 + ((this->unk_158.y - (iVar5 / 2))), 0); + this->mUnk_300.func_02034a1c(param_2 + local_8c + this->mUnk_55c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), + iVar5 + param_3 + local_90 + this->mUnk_560 + ((this->mUnk_158.y - (iVar5 / 2))), 0); } - if (this->unk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { + if (this->mUnk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { switch (data_027e0618[0]) { case 2: if (data_027e0cbc.func_0203d7e0(3) != 0) { - this->unk_388.func_02034b0c(0xBE, 0, 0, 0, 0); + this->mUnk_388.func_02034b0c(0xBE, 0, 0, 0, 0); } break; case 6: if (data_027e0cbc.func_0203d7e0(0x58) != 0) { - this->unk_388.func_02034b0c(0x013B, 0, 0, 0, 0); + this->mUnk_388.func_02034b0c(0x013B, 0, 0, 0, 0); } break; } @@ -244,10 +248,10 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { iVar8 = bVar1->mUnk_18; uVar9 = data_02056a04[iVar8]; // func_0203489c(uVar9, data_02056a16[iVar8], &local_94, &local_98); - iVar6 = this->unk_158.x - local_94; - iVar7 = this->unk_158.y - local_98; + iVar6 = this->mUnk_158.x - local_94; + iVar7 = this->mUnk_158.y - local_98; - if ((this->unk_15E != 7) && (this->func_0203a2c0() != 0)) { + if ((this->mUnk_15e != 7) && (this->func_0203a2c0() != 0)) { func_01ffbe34(&aStack_48); func_020347b0(uVar9, data_02056a10[iVar8], &local_9c, &local_a0, 4, 4); local_9c += param_2 + local_8c + iVar6; @@ -265,17 +269,17 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { local_9c = (0x108 - local_9c) + iVar8; } - if ((this->unk_57F == 0) && (this->unk_56C <= 0)) { + if ((this->mUnk_57f == 0) && (this->mUnk_56c <= 0)) { func_01ffbe34(&aStack_68); aStack_68.mUnk_0a = 1; - this->unk_1F0.func_02034a1c(local_9c, local_a0, &aStack_68); + this->mUnk_1f0.func_02034a1c(local_9c, local_a0, &aStack_68); } else { // func_02034984(iVar5 != 0 ? 0x11F : 0x18, 0, local_9c, local_a0 + 2, 0); } } - if (this->unk_08 != 0) { - if ((this->unk_08->unk_1C == 1 || this->unk_08->unk_1C == 2) == 0) { + if (this->mUnk_08 != 0) { + if ((this->mUnk_08->mUnk_1c == 1 || this->mUnk_08->mUnk_1c == 2) == 0) { return; } @@ -284,7 +288,7 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { func_02034698(iVar5 != 0 ? 0x11F : 0x18, 2, &iStack_a4, &iStack_a8); iStack_a4 += param_2 + local_8c + iVar6; iStack_a8 += param_3 + local_90 + iVar7; - this->unk_278.func_02034a1c(iStack_a4, iStack_a8, &aStack_88); + this->mUnk_278.func_02034a1c(iStack_a4, iStack_a8, &aStack_88); } } @@ -302,29 +306,29 @@ ARM void UnkStruct_020397f8::func_0203a188(s32 param1, s32 param2) { UnkStruct_01ffbe34 aStack_44; unk32 uStack_24; - if (this->unk_15E == 7) { + if (this->mUnk_15e == 7) { return; } - // (short)(ushort)*(byte *)((int)data_027e0c68.unk_28[(this->unk_50 - 0x28) * 0x18]; + // (short)(ushort)*(byte *)((int)data_027e0c68.mUnk_28[(this->mUnk_50 - 0x28) * 0x18]; - iVar6 = data_027e0c68.unk_10 + this->mUnk_50; + iVar6 = data_027e0c68.mUnk_10 + this->mUnk_50; // uStack_24 = param_4; if (data_027e0cbc.func_0203d7e0(data_02056a00[iVar6]) != 0) { uVar5 = data_02056a04[iVar6]; func_0203489c(uVar5, data_02056a16[iVar6], &iStack_48, &iStack_4c); - iVar3 = iStack_50 + (this->unk_158.x - iStack_48); + iVar3 = iStack_50 + (this->mUnk_158.x - iStack_48); func_02034698(uVar5, data_02056a0e[iVar6], &iStack_50, &iStack_54); - iVar4 = iStack_54 + (this->unk_158.y - iStack_4c); + iVar4 = iStack_54 + (this->mUnk_158.y - iStack_4c); func_01ffbe34(&aStack_44); aStack_44.mUnk_0a = 1; - if (this->unk_580 != 0) { - this->unk_168.func_02034a1c(param_2 + iVar3, param_3 + iVar4, &aStack_44); + if (this->mUnk_580 != 0) { + this->mUnk_168.func_02034a1c(param_2 + iVar3, param_3 + iVar4, &aStack_44); } else { func_02034984(uVar5, data_02056a08[iVar6], param_2 + iVar3, param_3 + iVar4); } @@ -333,7 +337,7 @@ ARM void UnkStruct_020397f8::func_0203a188(s32 param1, s32 param2) { // non-matching ARM bool UnkStruct_020397f8::func_0203a2c0() { - if ((this->unk_150[1] != 1 && this->unk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { + if ((this->mUnk_150[1] != 1 && this->mUnk_150[1] != 2) && (this->func_02039250() != 0 && this->func_02038b78() != 0)) { return true; } @@ -341,46 +345,46 @@ ARM bool UnkStruct_020397f8::func_0203a2c0() { } ARM unk32 UnkStruct_020397f8::func_0203a30c() { - return this->unk_574 / this->pInfoEntry->mUnk_06; + return this->mUnk_574 / this->pInfoEntry->mUnk_06; } // non-matching (regalloc) ARM void UnkStruct_020397f8::vfunc_48() { - if (this->unk_164 != NULL && this->unk_164->unk_15C > 0) { + if (this->mUnk_164 != NULL && this->mUnk_164->mUnk_15c > 0) { this->func_02038b40(); } - this->unk_410.func_0203ec34(); + this->mUnk_410.func_0203ec34(); } ARM void UnkStruct_020397f8::func_0203a35c() { - if ((this->unk_57C == 1 || this->unk_150[3] != 0) || (this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { + if ((this->mUnk_57c == 1 || this->mUnk_150[3] != 0) || (this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0) { if (this->func_0203a3e0()) { - s16 unk_56E = this->mUnk_56e; - s16 unk_570 = this->mUnk_570; - MsgProc_Type1* unk_164 = this->mUnk_164; + s16 mUnk_56e = this->mUnk_56e; + s16 mUnk_570 = this->mUnk_570; + UnkStruct_020397f8* mUnk_164 = this->mUnk_164; - unk_164->unk_168.unk_10 = mUnk_56e; - unk_164->unk_168.unk_14 = mUnk_570; - this->unk_164->func_02039208(4); + mUnk_164->mUnk_168.mUnk_10 = mUnk_56e; + mUnk_164->mUnk_168.mUnk_14 = mUnk_570; + this->mUnk_164->func_02039208(4); } } else { - this->unk_164->func_02038b40(); + this->mUnk_164->func_02038b40(); } } ARM bool UnkStruct_020397f8::func_0203a3e0() { - return this->unk_164->unk_168.unk_06 > 0; + return this->mUnk_164->mUnk_168.mUnk_06 > 0; } // non-matching -ARM void UnkStruct_020397f8::vfunc_44(s32 param1, s32 param2) { +ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) { unk32 iVar2; unk32 iVar5; unk32 iStack_14; unk32 iStack_18; - if (this->unk_15C <= 0 || this->func_0203951c() == 0) { + if (this->mUnk_15c <= 0 || this->func_0203951c() == 0) { return; } @@ -398,7 +402,7 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 param1, s32 param2) { if ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { if ((data_027e0d78.mFlags & 1) != 0) { - if (this->unk_50 == 0 && data_027e0d38 != 0) { + if (this->mUnk_50 == 0 && data_027e0d38 != 0) { if (func_ov000_02079e04() == 0 && data_027e0e28->func_ov000_0207bc48() == 0) { if (data_027e0618[0x101] == 0 && data_027e103c->mUnk_24 == 0) { return; @@ -407,7 +411,7 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 param1, s32 param2) { } if (this->func_0203a6d0(iVar5, iVar2) == 0 && this->func_0203a2c0() != 0) { - this->unk_57F = 1; + this->mUnk_57f = 1; } } else { if (data_027e0d78.mTouch != 0) { @@ -416,7 +420,7 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 param1, s32 param2) { } if (data_027e0d78.mTouch == 0) { - switch(this->unk_150[1]) { + switch(this->mUnk_150[1]) { case 3: case 4: break; @@ -434,16 +438,16 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 param1, s32 param2) { break; case 2: //! TODO: fixme - // if (this->unk_164->unk_168.unk_06 <= 0) { + // if (this->mUnk_164->mUnk_168.mUnk_06 <= 0) { // if ((data_027e0d78.mFlags & 2) != 0) { - // this->unk_128.unk_14 = 0; + // this->mUnk_128.mUnk_14 = 0; // if (this->func_0203b0bc() != 0) { // this->func_0203b0ec(1); // } - // this->unk_1F0.unk_5C.unk_08 = 0; - // this->unk_1F0.func_020352d8(); + // this->mUnk_1f0.mUnk_5c.mUnk_08 = 0; + // this->mUnk_1f0.func_020352d8(); // } // } break; @@ -451,14 +455,14 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 param1, s32 param2) { case 1: default: if ((data_027e0d78.mFlags & 2) != 0) { - this->unk_128.unk_14 = 0; + this->mUnk_128.mUnk_14 = 0; if (this->func_0203b0bc() != 0) { this->func_0203b0ec(1); } - this->unk_1F0.unk_5C.unk_08 = 0; - this->unk_1F0.func_020352d8(); + this->mUnk_1f0.mUnk_5c.mUnk_08 = 0; + this->mUnk_1f0.func_020352d8(); } break; } @@ -472,7 +476,7 @@ ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1) { unk32 uVar2; UnkStruct_0203b264* piVar3; - if (this->unk_164->unk_168.unk_06 > 0 && this->unk_164->unk_15C <= 0) { + if (this->mUnk_164->mUnk_168.mUnk_06 > 0 && this->mUnk_164->mUnk_15c <= 0) { return false; } @@ -480,17 +484,17 @@ ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1) { piVar3 = NULL; if (!(iVar1 < 0) && iVar1 < 4) { - piVar3 = this->unk_424.func_0203eeb0(iVar1, param_2); + piVar3 = this->mUnk_424.func_0203eeb0(iVar1, param_2); } if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16*)piVar3->mUnk_0)[2]) == 0x00FF0002) { uVar2 = this->func_02038cb8(iVar1); - this->unk_410.func_0203ec4c(piVar3, uVar2, - (s16)(this->unk_158.x - ((this->unk_14 << 3) / 2)) + iVar1 + this->unk_56E, - (s16)(this->unk_158.y - ((this->unk_18 << 3) / 2)) + iVar1 + this->unk_570 + this->mUnk_410.func_0203ec4c(piVar3, uVar2, + (s16)(this->mUnk_158.x - ((this->mUnk_14 << 3) / 2)) + iVar1 + this->mUnk_56e, + (s16)(this->mUnk_158.y - ((this->mUnk_18 << 3) / 2)) + iVar1 + this->mUnk_570 ); - this->unk_57F = 0; + this->mUnk_57f = 0; return true; } @@ -508,22 +512,22 @@ ARM void UnkStruct_020397f8::vfunc_50(unk32 param1, unk32 param2, s32 param3, un iVar6 = param_4[0]; if (data_027e0c54 != 0) { - MsgProc_Type1* pVar4 = data_027e0c68.func_02036700(); + UnkStruct_020397f8* pVar4 = data_027e0c68.func_02036700(); - if (pVar4 != NULL && pVar4->unk_15C > 0) { + if (pVar4 != NULL && pVar4->mUnk_15c > 0) { this->func_02038b40(); } } if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { - MsgProc_Type1* pVar4 = (MsgProc_Type1*)data_027e0c68.unk_28[4]; + UnkStruct_020397f8* pVar4 = (UnkStruct_020397f8*)data_027e0c68.mUnk_28[4]; - if (pVar4 != NULL && pVar4->unk_15C > 0) { + if (pVar4 != NULL && pVar4->mUnk_15c > 0) { this->func_02038b40(); } } - this->unk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; + this->mUnk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; temp = param_4[8]; if (temp >= 0 && param_4[9] >= 0) { @@ -531,13 +535,13 @@ ARM void UnkStruct_020397f8::vfunc_50(unk32 param1, unk32 param2, s32 param3, un } if (temp < 0) { - this->unk_57B = temp; + this->mUnk_57b = temp; } else { - this->unk_57B = 0; + this->mUnk_57b = 0; } // this->func_02038f44(param_2, param_3, param_4, param_5, iVar6); - this->unk_574 = 0; + this->mUnk_574 = 0; if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param_4[11])) { data_027e103c->func_ov000_020cf284(0x80, 0); @@ -548,13 +552,13 @@ ARM void UnkStruct_020397f8::vfunc_50(unk32 param1, unk32 param2, s32 param3, un ARM void UnkStruct_020397f8::vfunc_54() {} ARM void UnkStruct_020397f8::vfunc_5c() { - if (this->unk_15F == 0 || this->pInfoEntry->unk_06 <= 2) { - this->unk_168.unk_5C.unk_08 = this->unk_168.mUnk_7c; - this->unk_168.func_020352d8(); + if (this->mUnk_15f == 0 || this->pInfoEntry->mUnk_06 <= 2) { + this->mUnk_168.mUnk_5c.mUnk_08 = this->mUnk_168.mUnk_7c; + this->mUnk_168.func_020352d8(); } else { - this->unk_168.unk_5C.unk_08 = 0; - this->unk_168.func_020352d8(); - this->unk_168.func_020351b8(1, 0, 0, 0); + this->mUnk_168.mUnk_5c.mUnk_08 = 0; + this->mUnk_168.func_020352d8(); + this->mUnk_168.func_020351b8(1, 0, 0, 0); } } @@ -565,7 +569,7 @@ ARM void UnkStruct_020397f8::vfunc_58() { int iVar3; char *pcVar4; - if (this->unk_160 != 0) { + if (this->mUnk_160 != 0) { if (data_027e103c != NULL) { if (data_027e103c->func_ov000_020cf4bc() != 0) { puVar2 = data_027e103c->func_ov000_020cef9c(); @@ -573,29 +577,29 @@ ARM void UnkStruct_020397f8::vfunc_58() { if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { puVar2 = data_027e103c->func_ov000_020cef9c(); - if ((MsgProc_Type1*)(puVar2 + 0x244) == this) { + if ((UnkStruct_020397f8*)(puVar2 + 0x244) == this) { data_027e103c->func_ov000_020cfb38(); } } } - if (this->unk_581 != 0 && data_027e103c->func_ov000_020cf488() != 0) { + if (this->mUnk_581 != 0 && data_027e103c->func_ov000_020cf488() != 0) { data_027e103c->func_ov000_020cfa24(); - this->unk_581 = 0; + this->mUnk_581 = 0; } - if (this->unk_582 != 0) { + if (this->mUnk_582 != 0) { data_027e103c->func_ov000_020cfe40(0, 2); - this->unk_582 = 0; + this->mUnk_582 = 0; } - if (this->unk_583 != 0) { + if (this->mUnk_583 != 0) { data_027e103c->func_ov005_02104028(0); - this->unk_583 = 0; + this->mUnk_583 = 0; } } - // if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.unk_04 + 0x99) != 0 && + // if (data_027e0618[0] == 2 && func_ov000_02079e04() && (data_027e1054.mUnk_04 + 0x99) != 0 && // (data_027e077c.mUnk_0 != 0x39 || data_027e103c->func_ov000_020cf0bc())) { // data_027e1054.func_ov003_020f4874(); // data_027e103c->func_ov005_02103f8c(data_02057ed4); @@ -606,7 +610,7 @@ ARM void UnkStruct_020397f8::vfunc_58() { } ARM bool UnkStruct_020397f8::func_0203b0bc() { - return this->unk_57F != 0 && data_027e077c.mUnk_0 == data_027e077c.mUnk_4; + return this->mUnk_57f != 0 && data_027e077c.mUnk_0 == data_027e077c.mUnk_4; } // non-matching @@ -620,7 +624,7 @@ ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) { iVar4 = 0; bVar1 = false; - uVar3 = param_2; + uVar3 = param1; if (((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { uVar3 = 0; @@ -628,19 +632,19 @@ ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) { uVar3 = 1; } - unaff_r6 = this->unk_50 == uVar3; + unaff_r6 = this->mUnk_50 == uVar3; - this->unk_410.func_0203ec34(); - this->unk_585 = 0; - this->unk_584 = 0; + this->mUnk_410.func_0203ec34(); + this->mUnk_585 = 0; + this->mUnk_584 = 0; - if (this->unk_150[3] != 0) { + if (this->mUnk_150[3] != 0) { iVar4 = 1; - this->unk_56C = this->mUnk_578; + this->mUnk_56c = this->mUnk_578; bVar1 = true; - this->unk_15C = 0x78; + this->mUnk_15c = 0x78; } else { - if ((this->unk_128.unk_00 == NULL || this->unk_128.unk_00[0] == 0) != 0) { + if ((this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0) { this->func_02038b40(); if (data_027e0d38 != 0) { @@ -648,7 +652,7 @@ ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) { data_027e103c->func_ov000_020cf2a0(1); } - if (this->unk_08 == NULL) { + if (this->mUnk_08 == NULL) { this->vfunc_58(); } @@ -666,7 +670,7 @@ ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) { } } - if (((param_2 != 0 && iVar4 != 0) && unaff_r6 != 0) && this->unk_15E != 7) { + if (((param1 != 0 && iVar4 != 0) && unaff_r6 != 0) && this->mUnk_15e != 7) { data_ov000_020eec9c.func_ov000_020d77e4(0x19); } @@ -684,7 +688,7 @@ ARM unk32 UnkStruct_020397f8::vfunc_18(s32 param1) { return 1; } - if (this->unk_580 != 0) { + if (this->mUnk_580 != 0) { unaff_r4 = -0xC; } else { unaff_r4 = 0; @@ -704,7 +708,7 @@ ARM unk32 UnkStruct_020397f8::vfunc_18(s32 param1) { } if (bVar5) { - this->unk_424.func_0203ee80(this->unk_128.unk_08); + this->mUnk_424.func_0203ee80(this->mUnk_128.mUnk_08); } } @@ -719,26 +723,26 @@ ARM unk32 UnkStruct_020397f8::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, psVar3 = param_3->mUnk_4; if (psVar3[0] == 10) { - this->unk_424.func_0203ef78(this->unk_128.unk_08, psVar3[0], param_4); - this->unk_574++; + this->mUnk_424.func_0203ef78(this->mUnk_128.mUnk_08, psVar3[0], param_4); + this->mUnk_574++; if (this->func_0203a30c() == 0) { - this->unk_150[3] = 1; + this->mUnk_150[3] = 1; } } - if (this->unk_15E == 6) { + if (this->mUnk_15e == 6) { return 1; } - switch (this->unk_57A) { + switch (this->mUnk_57a) { case 0: return this->func_0203905c(param_2, param_3, param_4, param_5); case 1: UnknownMsgChoiceStruct* pChoiceData; s32 i = this->func_0203a30c(); - pChoiceData = &this->unk_428[this->unk_528[i]]; - return this->unk_164->func_0203cb5c(*param_2, (((pChoiceData->unk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->unk_00->mUnk_0)[2]) + ~0xFFFE)); + pChoiceData = &this->mUnk_428[this->mUnk_528[i]]; + return this->mUnk_164->func_0203cb5c(*param_2, (((pChoiceData->mUnk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->mUnk_00->mUnk_0)[2]) + ~0xFFFE)); default: break; } @@ -758,10 +762,10 @@ ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { uVar6 = 0; if (this->func_02032fa4() == 0) { - switch(param_2->unk_0C) { + switch(param_2->mUnk_0c) { case 0: case 1: - uVar6 = this->unk_580 != 0; + uVar6 = this->mUnk_580 != 0; break; case 2: uVar6 = 2; @@ -777,7 +781,7 @@ ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { break; default: // why??? - switch (param_2->unk_0C) { + switch (param_2->mUnk_0c) { case 4: uVar6 = 8; break; @@ -785,7 +789,7 @@ ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { uVar6 = 9; break; default: - if (this->unk_580 != 0) { + if (this->mUnk_580 != 0) { uVar6 = 7; } else { uVar6 = 6; @@ -797,9 +801,9 @@ ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { } // PTR_PTR_0203b5ac[(byte)param_1[0x50]] = (char)uVar6; - data_027e0c68.unk_28[this->unk_50]->unk_50 = uVar6; + data_027e0c68.mUnk_28[this->mUnk_50]->mUnk_50 = uVar6; - if (this->unk_15E == 7) { + if (this->mUnk_15e == 7) { uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); func_02032304(data_02068894, data_02057ed8, data_02056af0, 1, param_4); iVar3 = func_02016fcc(uVar5); @@ -814,14 +818,14 @@ ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { iVar3 = data_027e0cbc.func_0203d77c(data_02056a00[uVar6 * 0x18] - 2, 1, 1); } - if (param_2->unk_10 < 0) { + if (param_2->mUnk_10 < 0) { iVar3 = param_2->mUnk_12; } - if (param_2->unk_10 <= 0 && iVar3 > 0) { + if (param_2->mUnk_10 <= 0 && iVar3 > 0) { uVar2 = param_2->mUnk_12; - this->unk_158.x = param_2->mUnk_10; - this->unk_158.y = uVar2; + this->mUnk_158.x = param_2->mUnk_10; + this->mUnk_158.y = uVar2; } else { this->func_0203b764(); } @@ -831,48 +835,48 @@ ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { ARM void UnkStruct_020397f8::vfunc_64(unk32 param1) { unk32 uVar2; - if (this->unk_50 != 0 || data_027e0db0.unk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { + if (this->mUnk_50 != 0 || data_027e0db0.mUnk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { uVar2 = 0x16; } else { uVar2 = 0; } - this->unk_124->func_0203f020(param_2, uVar2); + this->mUnk_124->func_0203f020(param_2, uVar2); this->func_0203be08(); if (this->func_02032fa4()) { - this->unk_168.func_020350b4(0x39, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x33, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x33, 1, 2, 0, 0); + this->mUnk_168.func_020350b4(0x39, 0, 2, 0, 0); + this->mUnk_1f0.func_020350b4(0x33, 0, 2, 0, 0); + this->mUnk_278.func_020350b4(0x33, 1, 2, 0, 0); } else { - this->unk_168.func_020350b4(0x34, 0, 2, 0, 0); - this->unk_1F0.func_020350b4(0x32, 0, 2, 0, 0); - this->unk_278.func_020350b4(0x32, 1, 2, 0, 0); + this->mUnk_168.func_020350b4(0x34, 0, 2, 0, 0); + this->mUnk_1f0.func_020350b4(0x32, 0, 2, 0, 0); + this->mUnk_278.func_020350b4(0x32, 1, 2, 0, 0); } - this->unk_168.func_020351b8(1, 0, 0, 0); - this->unk_1F0.func_020351b8(0, 0, 0, 0); - this->unk_278.func_020351b8(0, 0, 0, 0); + this->mUnk_168.func_020351b8(1, 0, 0, 0); + this->mUnk_1f0.func_020351b8(0, 0, 0, 0); + this->mUnk_278.func_020351b8(0, 0, 0, 0); this->func_020393a8(param_2); } // non-matching ARM void UnkStruct_020397f8::func_0203b764() { - s32 i = data_027e0c68.unk_00[this->unk_50]; + s32 i = data_027e0c68.mUnk_00[this->mUnk_50]; this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); - switch (this->unk_57B) { + switch (this->mUnk_57b) { case 1: - this->unk_158.y -= 38; + this->mUnk_158.y -= 38; break; case 2: - switch (this->pInfoEntry->unk_06) { + switch (this->pInfoEntry->mUnk_06) { case 2: - this->unk_158.y -= 111; + this->mUnk_158.y -= 111; break; case 3: - this->unk_158.y -= 98; + this->mUnk_158.y -= 98; break; default: break; @@ -887,10 +891,10 @@ ARM void UnkStruct_020397f8::func_0203b764() { ARM unk32 UnkStruct_020397f8::vfunc_20(s32 param1, s32 *param2) {} ARM void UnkStruct_020397f8::func_0203bd8c(s32 param1) { - this->unk_576 = param_2; + this->mUnk_576 = param_2; if (this->func_0203b0ec(0) != 0) { - data_ov000_020eec9c.func_ov000_020d77e4(this->unk_564[param_2]); + data_ov000_020eec9c.func_ov000_020d77e4(this->mUnk_564[param_2]); } } @@ -903,13 +907,13 @@ ARM void UnkStruct_020397f8::vfunc_6c(s32 *param1, s32 *param2) { ARM void UnkStruct_020397f8::func_0203be08() { if (data_027e0d38 != 0) { if (data_027e103c->func_ov000_020cf42c() != 0) { - this->unk_534 = this->mUnk_538; + this->mUnk_534 = this->mUnk_538; } else { - this->unk_534 = this->mUnk_536; + this->mUnk_534 = this->mUnk_536; } if (this->func_0203c084() != 0) { - this->unk_548 = this->mUnk_54c; + this->mUnk_548 = this->mUnk_54c; } } } @@ -925,7 +929,7 @@ ARM bool UnkStruct_020397f8::func_0203c084() { uVar4 = 0; - if (this->unk_50 == 0) { + if (this->mUnk_50 == 0) { bVar2 = true; bVar1 = true; @@ -951,12 +955,12 @@ ARM bool UnkStruct_020397f8::func_0203c13c() { if (this->func_02032fa4() == 0) { data_ov000_020eec9c.func_ov000_020d77e4(6); data_027e103c->func_ov000_020cfb20(this); - this->unk_585 = 1; - this->unk_584 = 1; - this->unk_128.unk_18 = 0x00016000; - this->unk_128.unk_1C = NULL; - this->unk_128.unk_20 = 0; - this->unk_128.unk_24 = 0; + this->mUnk_585 = 1; + this->mUnk_584 = 1; + this->mUnk_128.mUnk_18 = 0x00016000; + this->mUnk_128.mUnk_1c = NULL; + this->mUnk_128.mUnk_20 = 0; + this->mUnk_128.mUnk_24 = 0; return true; } @@ -970,7 +974,7 @@ ARM bool UnkStruct_020397f8::func_0203c1a0() { u8* iVar3; if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { - this->unk_584 = 1; + this->mUnk_584 = 1; pVar1 = data_027e103c->func_ov000_020cef9c(); iVar3 = data_027e0f7c.func_ov000_0209d90c(pVar1[0x24F], 0); @@ -978,10 +982,10 @@ ARM bool UnkStruct_020397f8::func_0203c1a0() { data_ov000_020eec9c.func_ov000_020d77e4(6); data_027e103c->func_ov000_020cfb58(iVar3); - this->unk_128.unk_18 = 0x0000A000; - this->unk_128.unk_1C = this->func_0203c25c; - this->unk_128.unk_20 = this; - this->unk_128.unk_24 = 0; + this->mUnk_128.mUnk_18 = 0x0000A000; + this->mUnk_128.mUnk_1c = this->func_0203c25c; + this->mUnk_128.mUnk_20 = this; + this->mUnk_128.mUnk_24 = 0; return 0; } @@ -990,16 +994,16 @@ ARM bool UnkStruct_020397f8::func_0203c1a0() { } ARM bool UnkStruct_020397f8::func_0203c25c() { - if (data_027e1054.unk_00->unk_00->unk_95 != 0) { + if (data_027e1054.mUnk_00->mUnk_00->mUnk_95 != 0) { return false; } if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { - param_1->unk_585 = 1; - param_1->unk_128.unk_18 = 0x00016000; - param_1->unk_128.unk_1C = NULL; - param_1->unk_128.unk_20 = 0; - param_1->unk_128.unk_24 = 0; + param_1->mUnk_585 = 1; + param_1->mUnk_128.mUnk_18 = 0x00016000; + param_1->mUnk_128.mUnk_1c = NULL; + param_1->mUnk_128.mUnk_20 = 0; + param_1->mUnk_128.mUnk_24 = 0; return true; } diff --git a/src/Main/Unknown/UnkStruct_0203dae0.cpp b/src/Main/Unknown/UnkStruct_0203dae0.cpp index 40192b2a..8e39ed05 100644 --- a/src/Main/Unknown/UnkStruct_0203dae0.cpp +++ b/src/Main/Unknown/UnkStruct_0203dae0.cpp @@ -3,31 +3,32 @@ extern u32 *data_027e0ce0[]; extern "C" void func_02007938(unk32, unk16*, unk32, unk32, unk32); +extern "C" void func_0203fc78(unk32*, unk32*); // non-matching THUMB UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) { - this->unk_114 = NULL; - this->unk_118 = -1; - this->unk_11C = 0; - this->unk_11E = 0; - this->unk_11F = 0; - this->unk_120 = 1; - this->unk_121 = param_2; - this->unk_122 = 0; + this->mUnk_114 = NULL; + this->mUnk_118 = -1; + this->mUnk_11c = 0; + this->mUnk_11e = 0; + this->mUnk_11f = 0; + this->mUnk_120 = 1; + this->mUnk_121 = param1; + this->mUnk_122 = 0; - func_02007938(0, &this->unk_54, 0xC0, 1, param_4); + // func_02007938(0, &this->mUnk_54, 0xC0, 1, param_4); - if (this->unk_121 == 0) { - this->unk_114 = new(data_027e0ce0[0], 4) MsgProc_Base2_unk_114(); + if (this->mUnk_121 == 0) { + this->mUnk_114 = new(data_027e0ce0[0], 4) UnkStruct_0203dae0_114(); } else { - this->unk_114 = new(data_027e0ce0[1], 4) MsgProc_Base2_unk_114(); + this->mUnk_114 = new(data_027e0ce0[1], 4) UnkStruct_0203dae0_114(); } } THUMB UnkStruct_0203dae0::~UnkStruct_0203dae0() { - if (this->unk_114 != NULL) { + if (this->mUnk_114 != NULL) { delete this->mUnk_114; - this->unk_114 = NULL; + this->mUnk_114 = NULL; } } @@ -40,13 +41,13 @@ ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) { unk32 local_c; unk32 local_10; - local_c = param_2; - local_10 = param_3; + local_c = param1; + local_10 = param2; this->func_02032fa4(); - this->func_0203fc78(&local_c, &local_10); + func_0203fc78(&local_c, &local_10); this->func_02032fcc(local_c, local_10); - this->unk_10 = 0; + this->mUnk_10 = 0; return true; } @@ -57,18 +58,20 @@ 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) { - param_1->func_0203dc10(1, param_3); - param_1->unk_11E = param_2; - param_1->unk_118 = -1; - param_1->func_020331c4(param_2, -1); + // this->func_0203dc10(1, param2); + this->mUnk_11e = param1; + this->mUnk_118 = -1; + // this->func_020331c4(param1, -1); } ARM void UnkStruct_0203dae0::vfunc_30() {} +// non-matching? ARM bool UnkStruct_0203dae0::vfunc_28() { - if (this->unk_122 != 0) { - this->func_0203e0f8(); + if (this->mUnk_122 != 0) { + this->func_0203e0f8(0, 0); this->func_0203dc10(0); return true; } From 4928bc4660791fa40233c5a37256fa7b3d8e8a01 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 5 Feb 2025 12:28:21 +0100 Subject: [PATCH 50/64] post-update cleanup: step 3 (2/2) --- include/Message/MessageManager.hpp | 2 +- include/Message/MsgProc.hpp | 2 +- include/Unknown/UnkStruct_02032f0c.hpp | 4 +- include/Unknown/UnkStruct_020397f8.hpp | 23 +++-- include/Unknown/UnkStruct_0203dae0.hpp | 2 +- src/Main/Message/MessageManager.cpp | 2 +- src/Main/Message/func_0203c358.cpp | 4 +- src/Main/Unknown/UnkStruct_02037750.cpp | 13 +-- src/Main/Unknown/UnkStruct_020397f8.cpp | 119 ++++++++++++------------ 9 files changed, 87 insertions(+), 84 deletions(-) diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 17d8e0b2..53c500b1 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -11,7 +11,7 @@ class UnkStruct_027E0C68 : public SysObject { public: - /* 0x00 */ u8 unk_00[2]; + /* 0x00 */ u8 mUnk_00[2]; /* 0x02 */ u8 mUnk_02; /* 0x03 */ u8 mUnk_03; /* 0x04 */ u8 mUnk_04; diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp index 2874fd99..851a01a5 100644 --- a/include/Message/MsgProc.hpp +++ b/include/Message/MsgProc.hpp @@ -156,7 +156,7 @@ typedef struct UnkStruct_01ffbe34 { extern "C" void func_01ffbe34(UnkStruct_01ffbe34 *param1); struct UnkClass_027e1054_unk_00_unk00 { - /* 0x00 */ u8 unk_00[0x95]; + /* 0x00 */ u8 mUnk_00[0x95]; /* 0x95 */ u8 mUnk_95; }; struct UnkClass_027e1054_unk_00 { diff --git a/include/Unknown/UnkStruct_02032f0c.hpp b/include/Unknown/UnkStruct_02032f0c.hpp index 247f8dc8..84fb93f0 100644 --- a/include/Unknown/UnkStruct_02032f0c.hpp +++ b/include/Unknown/UnkStruct_02032f0c.hpp @@ -63,7 +63,7 @@ struct UnkStruct_MsgProc_Base_unk_2C { /* 0c */ }; -struct func_0203b410_param_2 { +struct func_0203b410_param1 { /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; @@ -141,7 +141,7 @@ public: /* 54 */ virtual void vfunc_54(void); /* 58 */ virtual void vfunc_58(void); /* 5c */ virtual void vfunc_5C(void); - /* 60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4); + /* 60 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4); /* 64 */ virtual void vfunc_64(s16* param_2); /* 68 */ virtual unk32 vfunc_68(unk32 param_2); /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3); diff --git a/include/Unknown/UnkStruct_020397f8.hpp b/include/Unknown/UnkStruct_020397f8.hpp index dcbcac24..9520d681 100644 --- a/include/Unknown/UnkStruct_020397f8.hpp +++ b/include/Unknown/UnkStruct_020397f8.hpp @@ -16,7 +16,7 @@ struct UnknownMsgChoiceStruct { class UnkStruct_020397f8_410; -// astruct_2, UnkStruct_020397f8 +// astruct_2, MsgProc_Type1 class UnkStruct_020397f8 : public UnkStruct_02038aa0 { public: /* 000 (base) */ @@ -89,7 +89,7 @@ public: /* 4c */ virtual void vfunc_4c(); /* 2c */ virtual void vfunc_2c(); void func_02039ca8(); - /* 3c */ virtual void vfunc_3c(); + /* 3c */ virtual void vfunc_3c(unk32 param1); /* 40 */ virtual void vfunc_40(s32 param1, s32 param2); void func_0203a188(s32 param1, s32 param2); bool func_0203a2c0(); @@ -98,17 +98,17 @@ public: void func_0203a35c(); bool func_0203a3e0(); /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); - bool func_0203a6d0(unk32 param1); - /* 50 */ virtual void vfunc_50(EntryINF1* param1, unk32 param2, s32 param3, unk32 param4); + bool func_0203a6d0(unk32 param1, unk32 param2); + /* 50 */ virtual void vfunc_50(EntryINF1* param1, unk32 param2, s32* param3, unk32 param4); /* 54 */ virtual void vfunc_54(); /* 5c */ virtual void vfunc_5c(); /* 58 */ virtual void vfunc_58(); bool func_0203b0bc(); s32 func_0203b0ec(u32 param1); - /* 18 */ virtual unk32 vfunc_18(s32 param1); - /* 1c */ virtual unk32 vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4); - /* 60 */ virtual void vfunc_60(s32 param1); - /* 64 */ virtual void vfunc_64(unk32 param1); + /* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param1, unk32 param2, unk32 param3); + /* 1c */ virtual unk32 vfunc_1c(u16 *param1, UnkStruct_0203b264 *param2, unk8 param3, unk32 param4); + /* 60 */ virtual void vfunc_60(func_0203b410_param1* param1, unk32 param2, unk32 param3); + /* 64 */ virtual void vfunc_64(s16* param1); void func_0203b764(); /* 20 */ virtual unk32 vfunc_20(s32 param1, s32 *param2); void func_0203bd8c(s32 param1); @@ -118,13 +118,12 @@ public: bool func_0203c084(); bool func_0203c13c(); bool func_0203c1a0(); - bool func_0203c25c(); + static bool func_0203c25c(class UnkStruct_020397f8* param1); /* 00 */ virtual ~UnkStruct_020397f8(); /* 38 */ virtual bool vfunc_38(); /* 74 */ //! TODO: check if this is really here - static bool func_0203c25c(class UnkStruct_020397f8* param_1); static void func_0203e060(UnkStruct_02038aa0* param_1, u8 param_2, u8 param_3); void func_02039a3c(void); unk32 func_02039250(void); @@ -189,7 +188,7 @@ public: /* 54 */ virtual void vfunc_54(void) override; /* 58 */ virtual void vfunc_58(void) override; /* 5c */ virtual void vfunc_5C(void) override; - /* 60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 60 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4) override; /* 64 */ virtual void vfunc_64(s16* param_2) override; /* 68 */ virtual unk32 vfunc_68(unk32 param_2) override; /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; @@ -238,7 +237,7 @@ public: /* 54 */ /* func_020392b4 */ virtual void vfunc_54(void) override; /* 58 */ /* func_02039398 */ virtual void vfunc_58(void) override; /* 5c */ /* func_02039058 */ virtual void vfunc_5C(void) override; - /* 60 */ /* func_020393a4 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 60 */ /* func_020393a4 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4) override; /* 64 */ /* func_020393a8 */ virtual void vfunc_64(s16* param_2) override; /* 68 */ /* func_020393d0 */ virtual unk32 vfunc_68(unk32 param_2) override; /* 6c */ /* func_0203947c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp index 6d6e25ae..86655e55 100644 --- a/include/Unknown/UnkStruct_0203dae0.hpp +++ b/include/Unknown/UnkStruct_0203dae0.hpp @@ -108,7 +108,7 @@ public: /* 54 */ virtual void vfunc_54(void) override; /* 58 */ virtual void vfunc_58(void) override; /* 5c */ virtual void vfunc_5C(void) override; - /* 60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override; + /* 60 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4) override; /* 64 */ virtual void vfunc_64(s16* param_2) override; /* 68 */ virtual unk32 vfunc_68(unk32 param_2) override; /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index e78a9e64..c43aa5d1 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -519,7 +519,7 @@ ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param pSVar5->mUnk_164 = (UnkStruct_020397f8*)pSVar2; pSVar5->mUnk_418 = this->mUnk_28[5]; - pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s32)param_3, 0); + pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s32*)param_3, 0); if (data_ov000_020eec9c.func_ov000_020d7f18(0x19) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x18) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x34) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x35) == 0 && diff --git a/src/Main/Message/func_0203c358.cpp b/src/Main/Message/func_0203c358.cpp index b7dce41b..caadf096 100644 --- a/src/Main/Message/func_0203c358.cpp +++ b/src/Main/Message/func_0203c358.cpp @@ -7,6 +7,8 @@ #include "Item/ItemManager.hpp" #include "System/SysNew.hpp" +extern "C" void func_0203fc78(unk32*, unk32*); + THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) : UnkStruct_02038aa0(0, 0) { @@ -36,7 +38,7 @@ THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) { local_20 = 0x10; if (iVar4 != 0) { - this->func_0203fc78(local_1c, &local_20); + func_0203fc78(local_1c, &local_20); } uVar1 = this->func_0203d318((s32)(local_1c[0] + 7 + ((u32)(local_1c[0] + 7 >> 2) >> 0x1D)) >> 3, diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp index 9d6a1995..5f09ff3f 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -1,10 +1,11 @@ #include "Unknown/UnkStruct_02037750.hpp" +#include "Message/MessageManager.hpp" UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { s32 i; - this->mUnk_14 = param_3; - this->mUnk_18 = param_2; + this->mUnk_14 = param2; + this->mUnk_18 = param1; this->mUnk_1c = 0; this->mUnk_1d = 0xFF; this->mUnk_1e = 0; @@ -15,13 +16,13 @@ UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { } ARM UnkStruct_02037750::~UnkStruct_02037750() { - if (data_027e0c68.unk_20[0] == this) { + if (data_027e0c68.mUnk_20[0] == this) { data_027e0c68.func_02036d4c(this); } } -ARM void UnkStruct_02037750::vfunc_08(unk32 param1) {} -ARM void UnkStruct_02037750::vfunc_0c(s32 param1) {} +ARM void UnkStruct_02037750::vfunc_08(u32 param1) {} +ARM void UnkStruct_02037750::vfunc_0c(UnkStruct_020397f8* param1) {} ARM void UnkStruct_02037750::vfunc_10() {} ARM void UnkStruct_02037750::vfunc_24(unk32 param1) {} ARM void UnkStruct_02037750::vfunc_28(s32 param1) {} @@ -41,7 +42,7 @@ ARM UnkStruct_020386d8::UnkStruct_020386d8() : this->mUnk_24.func_020376c0(gVec3p_ZERO); } -ARM void UnkStruct_020386d8::vfunc_08(unk32 param1) {} +ARM void UnkStruct_020386d8::vfunc_08(u32 param1) {} ARM void UnkStruct_020386d8::vfunc_24(unk32 param1) {} ARM void UnkStruct_020386d8::vfunc_28() {} ARM unk32 UnkStruct_020386d8::vfunc_30() {} diff --git a/src/Main/Unknown/UnkStruct_020397f8.cpp b/src/Main/Unknown/UnkStruct_020397f8.cpp index 08ca79d0..cfac4ac1 100644 --- a/src/Main/Unknown/UnkStruct_020397f8.cpp +++ b/src/Main/Unknown/UnkStruct_020397f8.cpp @@ -3,6 +3,7 @@ #include "Unknown/UnkStruct_020397f8.hpp" #include "DTCM/UnkStruct_027e103c.hpp" #include "Player/TouchControl.hpp" +#include "Save/AdventureFlags.hpp" extern "C" void func_ov000_020d0460(void*); extern "C" void func_0203efd8(void*, void*); @@ -168,8 +169,8 @@ ARM void UnkStruct_020397f8::func_02039ca8() { } } -ARM void UnkStruct_020397f8::vfunc_3c() { - if (this->mUnk_15c > 0 && this->func_0203de14(param_2) != 0) { +ARM void UnkStruct_020397f8::vfunc_3c(unk32 param1) { + if (this->mUnk_15c > 0 && this->func_0203de14(param1) != 0) { if (this->mUnk_124->mUnk_29 != 3) { if ((this->mUnk_50 == 0) && func_ov000_02079e04() != 0) { return; @@ -213,8 +214,8 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { bVar1 = data_027e0c68.mUnk_28[this->mUnk_50]; this->vfunc_6C(&local_8c, &local_90); - this->func_0203a188(local_8c + param_2, local_90 + param_3, 0); - this->func_0203e1b0(param_2 + local_8c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), param_3 + local_90 + (this->mUnk_158.y - (this->mUnk_18 << 3) / 2), 0); + this->func_0203a188(local_8c + param1, local_90 + param2, 0); + this->func_0203e1b0(param1 + local_8c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), param2 + local_90 + (this->mUnk_158.y - (this->mUnk_18 << 3) / 2), 0); if (this->mUnk_584 != 0) { iVar5 = this->mUnk_18 << 3; @@ -225,8 +226,8 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { iVar5 = 0; } - this->mUnk_300.func_02034a1c(param_2 + local_8c + this->mUnk_55c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), - iVar5 + param_3 + local_90 + this->mUnk_560 + ((this->mUnk_158.y - (iVar5 / 2))), 0); + this->mUnk_300.func_02034a1c(param1 + local_8c + this->mUnk_55c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), + iVar5 + param2 + local_90 + this->mUnk_560 + ((this->mUnk_158.y - (iVar5 / 2))), 0); } if (this->mUnk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { @@ -254,8 +255,8 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { if ((this->mUnk_15e != 7) && (this->func_0203a2c0() != 0)) { func_01ffbe34(&aStack_48); func_020347b0(uVar9, data_02056a10[iVar8], &local_9c, &local_a0, 4, 4); - local_9c += param_2 + local_8c + iVar6; - local_a0 += param_3 + local_90 + iVar7; + local_9c += param1 + local_8c + iVar6; + local_a0 += param2 + local_90 + iVar7; if (data_027e0c38[5] == 1) { iVar8 = func_0202ab48(); @@ -286,8 +287,8 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { func_01ffbe34(&aStack_88); aStack_88.mUnk_0a = 1; func_02034698(iVar5 != 0 ? 0x11F : 0x18, 2, &iStack_a4, &iStack_a8); - iStack_a4 += param_2 + local_8c + iVar6; - iStack_a8 += param_3 + local_90 + iVar7; + iStack_a4 += param1 + local_8c + iVar6; + iStack_a8 += param2 + local_90 + iVar7; this->mUnk_278.func_02034a1c(iStack_a4, iStack_a8, &aStack_88); } } @@ -328,9 +329,9 @@ ARM void UnkStruct_020397f8::func_0203a188(s32 param1, s32 param2) { aStack_44.mUnk_0a = 1; if (this->mUnk_580 != 0) { - this->mUnk_168.func_02034a1c(param_2 + iVar3, param_3 + iVar4, &aStack_44); + this->mUnk_168.func_02034a1c(param1 + iVar3, param2 + iVar4, &aStack_44); } else { - func_02034984(uVar5, data_02056a08[iVar6], param_2 + iVar3, param_3 + iVar4); + func_02034984(uVar5, data_02056a08[iVar6], param1 + iVar3, param2 + iVar4); } } } @@ -471,7 +472,7 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) { } } -ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1) { +ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1, unk32 param2) { unk32 iVar1; unk32 uVar2; UnkStruct_0203b264* piVar3; @@ -480,11 +481,11 @@ ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1) { return false; } - iVar1 = this->vfunc_34(param_3); + iVar1 = this->vfunc_34(param2); piVar3 = NULL; if (!(iVar1 < 0) && iVar1 < 4) { - piVar3 = this->mUnk_424.func_0203eeb0(iVar1, param_2); + piVar3 = this->mUnk_424.func_0203eeb0(iVar1, param1); } if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16*)piVar3->mUnk_0)[2]) == 0x00FF0002) { @@ -502,14 +503,14 @@ ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1) { } // non-matching -ARM void UnkStruct_020397f8::vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4) { +ARM void UnkStruct_020397f8::vfunc_50(EntryINF1* param1, unk32 param2, s32* param3, unk32 param4) { bool bVar5; bool bVar2; int iVar4; int iVar6; s16 temp; - iVar6 = param_4[0]; + iVar6 = param3[0]; if (data_027e0c54 != 0) { UnkStruct_020397f8* pVar4 = data_027e0c68.func_02036700(); @@ -528,10 +529,10 @@ ARM void UnkStruct_020397f8::vfunc_50(unk32 param1, unk32 param2, s32 param3, un } this->mUnk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; - temp = param_4[8]; + temp = param3[8]; - if (temp >= 0 && param_4[9] >= 0) { - temp = param_4[10]; + if (temp >= 0 && param3[9] >= 0) { + temp = param3[10]; } if (temp < 0) { @@ -540,10 +541,10 @@ ARM void UnkStruct_020397f8::vfunc_50(unk32 param1, unk32 param2, s32 param3, un this->mUnk_57b = 0; } - // this->func_02038f44(param_2, param_3, param_4, param_5, iVar6); + // this->func_02038f44(param1, param2, param3, param4, iVar6); this->mUnk_574 = 0; - if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param_4[11])) { + if (data_027e0d38 != 0 && (data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (param3[11])) { data_027e103c->func_ov000_020cf284(0x80, 0); } } @@ -572,10 +573,10 @@ ARM void UnkStruct_020397f8::vfunc_58() { if (this->mUnk_160 != 0) { if (data_027e103c != NULL) { if (data_027e103c->func_ov000_020cf4bc() != 0) { - puVar2 = data_027e103c->func_ov000_020cef9c(); + puVar2 = (s8*)data_027e103c->func_ov000_020cef9c(); if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { - puVar2 = data_027e103c->func_ov000_020cef9c(); + puVar2 = (s8*)data_027e103c->func_ov000_020cef9c(); if ((UnkStruct_020397f8*)(puVar2 + 0x244) == this) { data_027e103c->func_ov000_020cfb38(); @@ -584,7 +585,7 @@ ARM void UnkStruct_020397f8::vfunc_58() { } if (this->mUnk_581 != 0 && data_027e103c->func_ov000_020cf488() != 0) { - data_027e103c->func_ov000_020cfa24(); + data_027e103c->func_ov000_020cfa24(0, 0); this->mUnk_581 = 0; } @@ -678,7 +679,7 @@ ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) { } // non-matching (regalloc) -ARM unk32 UnkStruct_020397f8::vfunc_18(s32 param1) { +ARM unk32 UnkStruct_020397f8::vfunc_18(UnkStruct_0203b264* param1, unk32 param2, unk32 param3) { u16 sVar1; u32 uVar4; s32 unaff_r4; @@ -694,13 +695,13 @@ ARM unk32 UnkStruct_020397f8::vfunc_18(s32 param1) { unaff_r4 = 0; } - sVar1 = param_2->mUnk_4[0]; + sVar1 = param1->mUnk_4[0]; if (sVar1 != 0x1A || sVar1 == 0x1A) { bVar5 = true; if (sVar1 == 0x1A) { - uVar4 = (param_2->mUnk_0[3] << 0x10) | ((u16*)param_2->mUnk_0)[2]; + uVar4 = (param1->mUnk_0[3] << 0x10) | ((u16*)param1->mUnk_0)[2]; if (((uVar4 == 0x0001000A || uVar4 == 0x00020000) || uVar4 == 0x00FF0000)) { bVar5 = false; @@ -712,18 +713,18 @@ ARM unk32 UnkStruct_020397f8::vfunc_18(s32 param1) { } } - return this->func_0203e284(param_2, param_3, param_4 + unaff_r4); + return this->func_0203e284(param1, param2, param3 + unaff_r4); } // non-matching -ARM unk32 UnkStruct_020397f8::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) { +ARM unk32 UnkStruct_020397f8::vfunc_1c(u16 *param1, UnkStruct_0203b264 *param2, unk8 param3, unk32 param4) { int iVar1; u16* psVar3; - psVar3 = param_3->mUnk_4; + psVar3 = param2->mUnk_4; if (psVar3[0] == 10) { - this->mUnk_424.func_0203ef78(this->mUnk_128.mUnk_08, psVar3[0], param_4); + this->mUnk_424.func_0203ef78(this->mUnk_128.mUnk_08, psVar3[0], param3); this->mUnk_574++; if (this->func_0203a30c() == 0) { @@ -737,12 +738,12 @@ ARM unk32 UnkStruct_020397f8::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, switch (this->mUnk_57a) { case 0: - return this->func_0203905c(param_2, param_3, param_4, param_5); + return this->func_0203905c(param1, param2, param3, param4); case 1: UnknownMsgChoiceStruct* pChoiceData; s32 i = this->func_0203a30c(); pChoiceData = &this->mUnk_428[this->mUnk_528[i]]; - return this->mUnk_164->func_0203cb5c(*param_2, (((pChoiceData->mUnk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->mUnk_00->mUnk_0)[2]) + ~0xFFFE)); + return this->mUnk_164->func_0203cb5c(*param1, (((pChoiceData->mUnk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->mUnk_00->mUnk_0)[2]) + ~0xFFFE)); default: break; } @@ -751,7 +752,7 @@ ARM unk32 UnkStruct_020397f8::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, } // non-matching -ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { +ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1* param1, unk32 param2, unk32 param3) { unk16 sVar1; unk16 uVar2; unk32 iVar3; @@ -762,7 +763,7 @@ ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { uVar6 = 0; if (this->func_02032fa4() == 0) { - switch(param_2->mUnk_0c) { + switch(param1->mUnk_0c) { case 0: case 1: uVar6 = this->mUnk_580 != 0; @@ -781,7 +782,7 @@ ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { break; default: // why??? - switch (param_2->mUnk_0c) { + switch (param1->mUnk_0c) { case 4: uVar6 = 8; break; @@ -805,7 +806,7 @@ ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { if (this->mUnk_15e == 7) { uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); - func_02032304(data_02068894, data_02057ed8, data_02056af0, 1, param_4); + func_02032304(data_02068894, data_02057ed8, data_02056af0, 1, param3); iVar3 = func_02016fcc(uVar5); } else { if (this->func_02032fa4() != 0) { @@ -818,13 +819,13 @@ ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { iVar3 = data_027e0cbc.func_0203d77c(data_02056a00[uVar6 * 0x18] - 2, 1, 1); } - if (param_2->mUnk_10 < 0) { - iVar3 = param_2->mUnk_12; + if (param1->mUnk_10 < 0) { + iVar3 = param1->mUnk_12; } - if (param_2->mUnk_10 <= 0 && iVar3 > 0) { - uVar2 = param_2->mUnk_12; - this->mUnk_158.x = param_2->mUnk_10; + if (param1->mUnk_10 <= 0 && iVar3 > 0) { + uVar2 = param1->mUnk_12; + this->mUnk_158.x = param1->mUnk_10; this->mUnk_158.y = uVar2; } else { this->func_0203b764(); @@ -832,7 +833,7 @@ ARM void UnkStruct_020397f8::vfunc_60(s32 param1) { } // non-matching (regalloc) -ARM void UnkStruct_020397f8::vfunc_64(unk32 param1) { +ARM void UnkStruct_020397f8::vfunc_64(s16* param1) { unk32 uVar2; if (this->mUnk_50 != 0 || data_027e0db0.mUnk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { @@ -841,7 +842,7 @@ ARM void UnkStruct_020397f8::vfunc_64(unk32 param1) { uVar2 = 0; } - this->mUnk_124->func_0203f020(param_2, uVar2); + this->mUnk_124->func_0203f020(param1, uVar2); this->func_0203be08(); if (this->func_02032fa4()) { @@ -857,7 +858,7 @@ ARM void UnkStruct_020397f8::vfunc_64(unk32 param1) { this->mUnk_168.func_020351b8(1, 0, 0, 0); this->mUnk_1f0.func_020351b8(0, 0, 0, 0); this->mUnk_278.func_020351b8(0, 0, 0, 0); - this->func_020393a8(param_2); + this->func_020393a8(param1); } // non-matching @@ -891,17 +892,17 @@ ARM void UnkStruct_020397f8::func_0203b764() { ARM unk32 UnkStruct_020397f8::vfunc_20(s32 param1, s32 *param2) {} ARM void UnkStruct_020397f8::func_0203bd8c(s32 param1) { - this->mUnk_576 = param_2; + this->mUnk_576 = param1; if (this->func_0203b0ec(0) != 0) { - data_ov000_020eec9c.func_ov000_020d77e4(this->mUnk_564[param_2]); + data_ov000_020eec9c.func_ov000_020d77e4(this->mUnk_564[param1]); } } ARM void UnkStruct_020397f8::vfunc_6c(s32 *param1, s32 *param2) { this->func_0203947c(); - *param_2 += this->mUnk_56e; - *param_3 += this->mUnk_570; + *param1 += this->mUnk_56e; + *param2 += this->mUnk_570; } ARM void UnkStruct_020397f8::func_0203be08() { @@ -976,11 +977,11 @@ ARM bool UnkStruct_020397f8::func_0203c1a0() { if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { this->mUnk_584 = 1; - pVar1 = data_027e103c->func_ov000_020cef9c(); + pVar1 = (s8*)data_027e103c->func_ov000_020cef9c(); iVar3 = data_027e0f7c.func_ov000_0209d90c(pVar1[0x24F], 0); data_027e1054.func_ov003_020f4760(iVar3[1], 0); data_ov000_020eec9c.func_ov000_020d77e4(6); - data_027e103c->func_ov000_020cfb58(iVar3); + data_027e103c->func_ov000_020cfb58(); this->mUnk_128.mUnk_18 = 0x0000A000; this->mUnk_128.mUnk_1c = this->func_0203c25c; @@ -993,17 +994,17 @@ ARM bool UnkStruct_020397f8::func_0203c1a0() { return 0; } -ARM bool UnkStruct_020397f8::func_0203c25c() { +ARM bool UnkStruct_020397f8::func_0203c25c(UnkStruct_020397f8* param1) { if (data_027e1054.mUnk_00->mUnk_00->mUnk_95 != 0) { return false; } if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { - param_1->mUnk_585 = 1; - param_1->mUnk_128.mUnk_18 = 0x00016000; - param_1->mUnk_128.mUnk_1c = NULL; - param_1->mUnk_128.mUnk_20 = 0; - param_1->mUnk_128.mUnk_24 = 0; + param1->mUnk_585 = 1; + param1->mUnk_128.mUnk_18 = 0x00016000; + param1->mUnk_128.mUnk_1c = NULL; + param1->mUnk_128.mUnk_20 = 0; + param1->mUnk_128.mUnk_24 = 0; return true; } @@ -1013,6 +1014,6 @@ ARM bool UnkStruct_020397f8::func_0203c25c() { ARM UnkStruct_020397f8::~UnkStruct_020397f8() { } -ARM unk32 UnkStruct_020397f8::vfunc_38() { +ARM bool UnkStruct_020397f8::vfunc_38() { return true; } From 1f7c5be909e0dccc28b90587d12ccf5c9ab180bf Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 5 Feb 2025 12:43:34 +0100 Subject: [PATCH 51/64] post-update cleanup: step 4 (builds properly) --- include/Item/ItemManager.hpp | 1 + include/Message/MessageManager.hpp | 7 +++++++ include/Message/MsgProc.hpp | 7 ------- include/Unknown/UnkStruct_02038aa0.hpp | 9 +++++++-- include/Unknown/UnkStruct_020397f8.hpp | 19 +++---------------- include/Unknown/UnkStruct_0203dae0.hpp | 2 ++ include/Unknown/UnkStruct_ov000_020e2f04.hpp | 2 +- src/00_Core/DTCM/UnkStruct_027e103c.cpp | 4 ++-- src/Main/Actor/ActorType.cpp | 6 +++--- src/Main/Unknown/UnkStruct_020397f8.cpp | 2 +- 10 files changed, 27 insertions(+), 32 deletions(-) diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 5a5c8d3d..e0dbbaf2 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -15,6 +15,7 @@ extern "C" { #include "Save/SaveItemManager.hpp" #include "Sound/Sfx.hpp" #include "System/SysNew.hpp" +#include "DTCM/UnkStruct_027e0d38.hpp" #define MAX_HOURGLASS_SECONDS 1500 // 25 minutes #define MAX_AMMO_UPGRADE 2 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 53c500b1..ddb1df59 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -7,6 +7,13 @@ #include "Message/BMG.hpp" #include "Message/MsgProc.hpp" #include "nds/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" class UnkStruct_027E0C68 : public SysObject { diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp index 851a01a5..f7e4608b 100644 --- a/include/Message/MsgProc.hpp +++ b/include/Message/MsgProc.hpp @@ -3,13 +3,6 @@ #include "System/SysNew.hpp" #include "Message/BMG.hpp" #include "Unknown/func_ov000_020d0644.hpp" -#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 "nds/math.h" // temp diff --git a/include/Unknown/UnkStruct_02038aa0.hpp b/include/Unknown/UnkStruct_02038aa0.hpp index 9969f89c..9ace8473 100644 --- a/include/Unknown/UnkStruct_02038aa0.hpp +++ b/include/Unknown/UnkStruct_02038aa0.hpp @@ -5,6 +5,8 @@ #include "Unknown/UnkStruct_0203dae0.hpp" #include "System/SysNew.hpp" +#include "nds/math.h" +#include "Message/MsgProc.hpp" class UnkStruct_02038aa0; typedef bool (*UnknownCallback)(class UnkStruct_020397f8*); @@ -50,6 +52,9 @@ public: void func_0203f020(s16*, unk32); }; +struct UnkStruct_0203b264; +struct func_02038f44_param4; + // astruct_6, MsgProc_Main class UnkStruct_02038aa0 : public UnkStruct_0203dae0 { public: @@ -84,7 +89,7 @@ public: /* 50 */ virtual void vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4); /* 54 */ virtual void vfunc_54(); /* 58 */ virtual void vfunc_58(); - /* 5c */ virtual void vfunc_5c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); + /* 5c */ virtual void vfunc_5c(u16* param_2, struct UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); /* 60 */ virtual void vfunc_60(); /* 64 */ virtual void vfunc_64(); /* 68 */ virtual s32 vfunc_68(unk32 param1); @@ -126,7 +131,7 @@ public: 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_02038f44(EntryINF1* param_2, u32 param_3, struct 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); diff --git a/include/Unknown/UnkStruct_020397f8.hpp b/include/Unknown/UnkStruct_020397f8.hpp index 9520d681..0c199b1a 100644 --- a/include/Unknown/UnkStruct_020397f8.hpp +++ b/include/Unknown/UnkStruct_020397f8.hpp @@ -6,6 +6,7 @@ #include "Unknown/UnkStruct_02035064.hpp" #include "Unknown/UnkStruct_02038aa0.hpp" #include "System/SysNew.hpp" +#include "Message/MsgProc.hpp" // does it host both choices? struct UnknownMsgChoiceStruct { @@ -91,7 +92,7 @@ public: void func_02039ca8(); /* 3c */ virtual void vfunc_3c(unk32 param1); /* 40 */ virtual void vfunc_40(s32 param1, s32 param2); - void func_0203a188(s32 param1, s32 param2); + void func_0203a188(s32 param1, s32 param2); // void func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4); bool func_0203a2c0(); unk32 func_0203a30c(); /* 48 */ virtual void vfunc_48(); @@ -111,7 +112,7 @@ public: /* 64 */ virtual void vfunc_64(s16* param1); void func_0203b764(); /* 20 */ virtual unk32 vfunc_20(s32 param1, s32 *param2); - void func_0203bd8c(s32 param1); + void func_0203bd8c(s32 param1); // void func_0203bd8c(u16 param_2); /* 6c */ virtual void vfunc_6c(s32 *param1, s32 *param2); void func_0203be08(); void func_0203be64(); @@ -127,20 +128,6 @@ public: static void func_0203e060(UnkStruct_02038aa0* 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); - bool func_0203c13c(void); }; class MsgProc_Type3 : public UnkStruct_02038aa0 { diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp index 86655e55..054c8900 100644 --- a/include/Unknown/UnkStruct_0203dae0.hpp +++ b/include/Unknown/UnkStruct_0203dae0.hpp @@ -6,6 +6,8 @@ #include "Unknown/UnkStruct_02032f0c.hpp" #include "Message/MsgProc.hpp" +class UnkStruct_0203dae0_114; + // astruct_7, MsgProc_Base2 class UnkStruct_0203dae0 : public UnkStruct_02032f0c { public: diff --git a/include/Unknown/UnkStruct_ov000_020e2f04.hpp b/include/Unknown/UnkStruct_ov000_020e2f04.hpp index 74739291..b62ae550 100644 --- a/include/Unknown/UnkStruct_ov000_020e2f04.hpp +++ b/include/Unknown/UnkStruct_ov000_020e2f04.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "Physics/AABB.hpp" #include "global.h" diff --git a/src/00_Core/DTCM/UnkStruct_027e103c.cpp b/src/00_Core/DTCM/UnkStruct_027e103c.cpp index 53f72d35..98df9114 100644 --- a/src/00_Core/DTCM/UnkStruct_027e103c.cpp +++ b/src/00_Core/DTCM/UnkStruct_027e103c.cpp @@ -36,7 +36,7 @@ void UnkStruct_027e103c::func_ov000_020cf3dc() {} void UnkStruct_027e103c::func_ov000_020cf3f0() {} void UnkStruct_027e103c::func_ov000_020cf404() {} void UnkStruct_027e103c::func_ov000_020cf414() {} -void UnkStruct_027e103c::func_ov000_020cf42c() {} +bool UnkStruct_027e103c::func_ov000_020cf42c() {} bool UnkStruct_027e103c::func_ov000_020cf444() {} bool UnkStruct_027e103c::func_ov000_020cf488() {} bool UnkStruct_027e103c::func_ov000_020cf4bc() {} @@ -59,7 +59,7 @@ void UnkStruct_027e103c::func_ov000_020cfa70(s32 param1, s32 param2) {} unk8 UnkStruct_027e103c::func_ov000_020cfab0() {} void UnkStruct_027e103c::func_ov000_020cfabc(s32 param1, s32 param2) {} void UnkStruct_027e103c::func_ov000_020cfae8(s32 param1, s32 param2) {} -void UnkStruct_027e103c::func_ov000_020cfb20(unk32 param1) {} +void UnkStruct_027e103c::func_ov000_020cfb20(void* param1) {} void UnkStruct_027e103c::func_ov000_020cfb38() {} void UnkStruct_027e103c::func_ov000_020cfb48() {} void UnkStruct_027e103c::func_ov000_020cfb58() {} diff --git a/src/Main/Actor/ActorType.cpp b/src/Main/Actor/ActorType.cpp index 742aa86a..ec5f564f 100644 --- a/src/Main/Actor/ActorType.cpp +++ b/src/Main/Actor/ActorType.cpp @@ -5,8 +5,8 @@ ActorTypeList sActorTypeList; ARM ActorType::ActorType(ActorTypeId id, ActorCreateFunc create, unk32 (*unk_08)()) { this->id = id; this->create = create; - this->mUnk_08 = unk_08; - this->mUnk_0c = 0; + this->unk_08 = unk_08; + this->unk_0c = 0; this->next = NULL; this->Register(); sActorTypeList.tail = this; @@ -17,7 +17,7 @@ ARM ActorType::~ActorType() { } ARM unk32 ActorType::func_0203e7c8() { - if (this->mUnk_08 == NULL) { + if (this->unk_08 == NULL) { return 0; } return (*unk_08)(); diff --git a/src/Main/Unknown/UnkStruct_020397f8.cpp b/src/Main/Unknown/UnkStruct_020397f8.cpp index cfac4ac1..61c6a44e 100644 --- a/src/Main/Unknown/UnkStruct_020397f8.cpp +++ b/src/Main/Unknown/UnkStruct_020397f8.cpp @@ -214,7 +214,7 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { bVar1 = data_027e0c68.mUnk_28[this->mUnk_50]; this->vfunc_6C(&local_8c, &local_90); - this->func_0203a188(local_8c + param1, local_90 + param2, 0); + this->func_0203a188(local_8c + param1, local_90 + param2); this->func_0203e1b0(param1 + local_8c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), param2 + local_90 + (this->mUnk_158.y - (this->mUnk_18 << 3) / 2), 0); if (this->mUnk_584 != 0) { 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 52/64] 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) {} From 795cd8a2f9e0ae79e2c6e34042a7c2423c2286eb Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 5 Feb 2025 18:19:34 +0100 Subject: [PATCH 53/64] more progress --- include/Unknown/UnkStruct_0203dae0.hpp | 2 +- src/Main/Message/func_0203c358.cpp | 2 +- src/Main/Unknown/UnkStruct_0203dae0.cpp | 48 +++++++++++++++++-------- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp index b3447c9a..864320ef 100644 --- a/include/Unknown/UnkStruct_0203dae0.hpp +++ b/include/Unknown/UnkStruct_0203dae0.hpp @@ -122,7 +122,7 @@ public: 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); - unk32 func_0203ddec(); + unk32* func_0203ddec(); void func_0203ddfc(); void func_0203de14(); s32 func_0203de24(); diff --git a/src/Main/Message/func_0203c358.cpp b/src/Main/Message/func_0203c358.cpp index caadf096..717849ee 100644 --- a/src/Main/Message/func_0203c358.cpp +++ b/src/Main/Message/func_0203c358.cpp @@ -49,7 +49,7 @@ THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) { } } - if (this->mUnk_114->vfunc_08(this, uVar3) != 0) { + if (this->mUnk_114->vfunc_08(this) != 0) { this->mUnk_10 = this->mUnk_114->func_0203d1b4(); } } diff --git a/src/Main/Unknown/UnkStruct_0203dae0.cpp b/src/Main/Unknown/UnkStruct_0203dae0.cpp index 59221042..34549800 100644 --- a/src/Main/Unknown/UnkStruct_0203dae0.cpp +++ b/src/Main/Unknown/UnkStruct_0203dae0.cpp @@ -4,6 +4,11 @@ extern u32 *data_027e0ce0[]; extern "C" void Fill256(unk32, unk16*, unk32, unk32); extern "C" void func_0203fc78(u8, unk32*, unk32*); +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); +extern "C" void func_02035440(u8); // non-matching THUMB UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) { @@ -69,13 +74,9 @@ ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) { return true; } -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); - +// non-matching ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) { - unk32 uVar5; + unk32* uVar5; this->mUnk_50 = param1; this->vfunc_14(this->mUnk_4a, this->mUnk_4c); @@ -84,25 +85,44 @@ ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3 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); + 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); + 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_2c = this->mUnk_2c; // this->mUnk_2c = &(UnkStruct_MsgProc_Base_unk_2C*)this->mUnk_10; this->mUnk_30 = param4; this->mUnk_34 = 3; - this->vfunc_10(param3, 0); + this->vfunc_10(param3, 3); 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 unk32* UnkStruct_0203dae0::func_0203ddec() { + return this->mUnk_114->func_0203d1b4(); +} + +ARM void UnkStruct_0203dae0::func_0203ddfc() { + this->mUnk_114->mUnk_04 = 0; + this->mUnk_11c = 0; +} + +ARM void UnkStruct_0203dae0::func_0203de14() { + //! TODO: class? + func_02035440(this->mUnk_50); +} + +// non-matching +ARM s32 UnkStruct_0203dae0::func_0203de24() { + if (func_0203d400(this->UnkStruct_02032f0c::func_02032fa4()) == 0x0) { + return this->mUnk_10[5] * this->mUnk_10[6] * 0x20; + } + + return this->mUnk_10[6] << 0xa; +} + ARM bool UnkStruct_0203dae0::func_0203de58(s32 param1) {} ARM void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) { From 2bd5011ae92329608e6853d3679c6829fc7f4b8c Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:57:28 +0100 Subject: [PATCH 54/64] more progress --- config/eur/arm9/symbols.txt | 8 ++--- config/usa/arm9/symbols.txt | 8 ++--- src/Main/Unknown/UnkStruct_0203dae0.cpp | 45 ++++++++++++++++++++++--- 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index e3053d8b..6034f1ca 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1843,8 +1843,8 @@ _ZN18UnkStruct_02037750C2Eii kind:function(arm,size=0x44) addr:0x2037750 _ZN18UnkStruct_02037750D1Ev kind:function(arm,size=0x38) addr:0x2037794 _ZN18UnkStruct_02037750D0Ev kind:function(arm,size=0x40) addr:0x20377cc _ZN18UnkStruct_02037750D2Ev kind:function(arm,size=0x38) addr:0x203780c -_ZN18UnkStruct_020377508vfunc_08Ei kind:function(arm,size=0x10) addr:0x2037844 -_ZN18UnkStruct_020377508vfunc_0cEi kind:function(arm,size=0xc4) addr:0x2037854 +_ZN18UnkStruct_020377508vfunc_08Ej kind:function(arm,size=0x10) addr:0x2037844 +_ZN18UnkStruct_020377508vfunc_0cEP18UnkStruct_020397f8 kind:function(arm,size=0xc4) addr:0x2037854 _ZN18UnkStruct_020377508vfunc_10Ev kind:function(arm,size=0x234) addr:0x2037918 _ZN18UnkStruct_020377508vfunc_24Ei kind:function(arm,size=0x3c) addr:0x2037b4c _ZN18UnkStruct_020377508vfunc_28Ei kind:function(arm,size=0x3d0) addr:0x2037b88 @@ -1858,7 +1858,7 @@ _ZN18UnkStruct_020377508vfunc_1cEv kind:function(arm,size=0x8) addr:0x20386c4 _ZN18UnkStruct_020377508vfunc_20Ev kind:function(arm,size=0xc) addr:0x20386cc _ZN18UnkStruct_020386d8C2Ev kind:function(arm,size=0x40) addr:0x20386d8 _ZN18UnkStruct_020386d8C1Ev kind:function(arm,size=0x40) addr:0x2038718 -_ZN18UnkStruct_020386d88vfunc_08Ei kind:function(arm,size=0x18) addr:0x2038758 +_ZN18UnkStruct_020386d88vfunc_08Ej 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 @@ -1883,7 +1883,7 @@ _ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038 _ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b78 _ZN18UnkStruct_02038aa013func_02038c34Ev kind:function(arm,size=0x84) addr:0x2038c34 _ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x3c) addr:0x2038cb8 -_ZN18UnkStruct_02038aa013func_02038cf4Ei kind:function(arm,size=0x1c) addr:0x2038cf4 +_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x2038cf4 _ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038d10 _ZN18UnkStruct_02038aa013func_02038d20Ev kind:function(arm,size=0x1b0) addr:0x2038d20 _ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038ed0 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index a4051d56..5adcbf77 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1843,8 +1843,8 @@ _ZN18UnkStruct_02037750C2Eii kind:function(arm,size=0x44) addr:0x203770c _ZN18UnkStruct_02037750D1Ev kind:function(arm,size=0x38) addr:0x2037750 _ZN18UnkStruct_02037750D0Ev kind:function(arm,size=0x40) addr:0x2037788 _ZN18UnkStruct_02037750D2Ev kind:function(arm,size=0x38) addr:0x20377c8 -_ZN18UnkStruct_020377508vfunc_08Ei kind:function(arm,size=0x10) addr:0x2037800 -_ZN18UnkStruct_020377508vfunc_0cEi kind:function(arm,size=0xc4) addr:0x2037810 +_ZN18UnkStruct_020377508vfunc_08Ej kind:function(arm,size=0x10) addr:0x2037800 +_ZN18UnkStruct_020377508vfunc_0cEP18UnkStruct_020397f8 kind:function(arm,size=0xc4) addr:0x2037810 _ZN18UnkStruct_020377508vfunc_10Ev kind:function(arm,size=0x234) addr:0x20378d4 _ZN18UnkStruct_020377508vfunc_24Ei kind:function(arm,size=0x3c) addr:0x2037b08 _ZN18UnkStruct_020377508vfunc_28Ei kind:function(arm,size=0x3d0) addr:0x2037b44 @@ -1858,7 +1858,7 @@ _ZN18UnkStruct_020377508vfunc_1cEv kind:function(arm,size=0x8) addr:0x2038680 _ZN18UnkStruct_020377508vfunc_20Ev kind:function(arm,size=0xc) addr:0x2038688 _ZN18UnkStruct_020386d8C2Ev kind:function(arm,size=0x40) addr:0x2038694 _ZN18UnkStruct_020386d8C1Ev kind:function(arm,size=0x40) addr:0x20386d4 -_ZN18UnkStruct_020386d88vfunc_08Ei kind:function(arm,size=0x18) addr:0x2038714 +_ZN18UnkStruct_020386d88vfunc_08Ej 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 @@ -1883,7 +1883,7 @@ _ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038 _ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b34 _ZN18UnkStruct_02038aa013func_02038c34Ev kind:function(arm,size=0x84) addr:0x2038bf0 _ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x3c) addr:0x2038c74 -_ZN18UnkStruct_02038aa013func_02038cf4Ei kind:function(arm,size=0x1c) addr:0x2038cb0 +_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x2038cb0 _ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038ccc _ZN18UnkStruct_02038aa013func_02038d20Ev kind:function(arm,size=0x1b0) addr:0x2038cdc _ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038e8c diff --git a/src/Main/Unknown/UnkStruct_0203dae0.cpp b/src/Main/Unknown/UnkStruct_0203dae0.cpp index 34549800..67fe821e 100644 --- a/src/Main/Unknown/UnkStruct_0203dae0.cpp +++ b/src/Main/Unknown/UnkStruct_0203dae0.cpp @@ -10,6 +10,12 @@ extern "C" void func_02029830(unk32*, unk32, unk32, unk32, unk32); extern "C" unk32 func_0203d400(u8); extern "C" void func_02035440(u8); +class UnkStruct_02075dac { +public: + unk32 func_0203f9b8(void*); +}; +extern UnkStruct_02075dac data_02075dac; + // non-matching THUMB UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) { this->mUnk_114 = NULL; @@ -132,7 +138,18 @@ ARM void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) { this->UnkStruct_02032f0c::vfunc_10(param1, -1); } -ARM void UnkStruct_0203dae0::vfunc_30() {} +ARM void UnkStruct_0203dae0::vfunc_30() { + unk32 iVar2; + + iVar2 = this->mUnk_118; + this->mUnk_118 = data_02075dac.func_0203f9b8(this); + + if (this->mUnk_118 == iVar2) { + return; + } + + this->func_0203dc10(1); +} ARM bool UnkStruct_0203dae0::vfunc_28() { if (this->mUnk_122 != 0) { @@ -145,10 +162,30 @@ ARM bool UnkStruct_0203dae0::vfunc_28() { } ARM bool UnkStruct_0203dae0::func_0203e0f8() {} -ARM void UnkStruct_0203dae0::vfunc_2c() {} + +ARM void UnkStruct_0203dae0::vfunc_2c() { + this->vfunc_30(); +} + ARM bool UnkStruct_0203dae0::func_0203e1b0(unk32 param1, unk32 param2, s32 param3) {} -ARM unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) {} -ARM void UnkStruct_0203dae0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {} + +ARM unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) { + unk32 iVar1; + + iVar1 = this->UnkStruct_02032f0c::vfunc_18(param1); + + if (iVar1 != 0) { + this->func_0203dc10(1); + } + + return iVar1; +} + +ARM void UnkStruct_0203dae0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) { + this->func_0203dc10(1); + this->UnkStruct_02032f0c::vfunc_08(param1, param2, param3, param4); +} + ARM void UnkStruct_0203dae0::func_0203e2e8(s32 param1, s32 param2, unk32 param3, u32 param4) {} ARM void UnkStruct_0203dae0::func_0203e510(s32 *param1, s32 param2, s32 param3) {} ARM void UnkStruct_0203dae0::func_0203e62c(s32 *param1, s32 param2) {} From d29bbff21fe81aac1fa6dc382ab3c6b1d085708f Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 5 Feb 2025 20:53:32 +0100 Subject: [PATCH 55/64] more progress --- config/eur/arm9/symbols.txt | 6 +-- config/usa/arm9/symbols.txt | 6 +-- include/Player/LinkStateCutscene.hpp | 2 +- include/Unknown/UnkStruct_02037750.hpp | 29 +++++----- src/05/Player/LinkStateCutscene.cpp | 2 +- src/Main/Message/MessageManager.cpp | 2 +- src/Main/Unknown/UnkStruct_02037750.cpp | 72 +++++++++++++++++++------ 7 files changed, 83 insertions(+), 36 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 6034f1ca..03d95b82 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1851,16 +1851,16 @@ _ZN18UnkStruct_020377508vfunc_28Ei kind:function(arm,size=0x3d0) addr:0x2037b88 _ZN18UnkStruct_020377508vfunc_2cEi kind:function(arm,size=0x660) addr:0x2037f58 _ZN18UnkStruct_0203775020GetLinkStateInteractEv kind:function(arm,size=0x10) addr:0x20385b8 _ZN18UnkStruct_020377508vfunc_30Ev kind:function(arm,size=0x8) addr:0x20385c8 -_ZN18UnkStruct_0203775013func_020385d0EiPi kind:function(arm,size=0xe4) addr:0x20385d0 +_ZN18UnkStruct_0203775013func_020385d0EiPh kind:function(arm,size=0xe4) addr:0x20385d0 _ZN18UnkStruct_020377508vfunc_14Ev kind:function(arm,size=0x4) addr:0x20386b4 -_ZN18UnkStruct_020377508vfunc_18Ev kind:function(arm,size=0xc) addr:0x20386b8 +_ZN18UnkStruct_020377508vfunc_18EPi kind:function(arm,size=0xc) addr:0x20386b8 _ZN18UnkStruct_020377508vfunc_1cEv kind:function(arm,size=0x8) addr:0x20386c4 _ZN18UnkStruct_020377508vfunc_20Ev kind:function(arm,size=0xc) addr:0x20386cc _ZN18UnkStruct_020386d8C2Ev kind:function(arm,size=0x40) addr:0x20386d8 _ZN18UnkStruct_020386d8C1Ev kind:function(arm,size=0x40) addr:0x2038718 _ZN18UnkStruct_020386d88vfunc_08Ej 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_28Ei kind:function(arm,size=0x18) addr:0x203878c _ZN18UnkStruct_020386d88vfunc_30Ev kind:function(arm,size=0x28) addr:0x20387a4 _ZN18UnkStruct_020386d8D2Ev kind:function(arm,size=0x14) addr:0x20387cc func_020387e0 kind:function(thumb,size=0xc) addr:0x20387e0 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 5adcbf77..6d96c0ba 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1851,16 +1851,16 @@ _ZN18UnkStruct_020377508vfunc_28Ei kind:function(arm,size=0x3d0) addr:0x2037b44 _ZN18UnkStruct_020377508vfunc_2cEi kind:function(arm,size=0x660) addr:0x2037f14 _ZN18UnkStruct_0203775020GetLinkStateInteractEv kind:function(arm,size=0x10) addr:0x2038574 _ZN18UnkStruct_020377508vfunc_30Ev kind:function(arm,size=0x8) addr:0x2038584 -_ZN18UnkStruct_0203775013func_020385d0EiPi kind:function(arm,size=0xe4) addr:0x203858c +_ZN18UnkStruct_0203775013func_020385d0EiPh kind:function(arm,size=0xe4) addr:0x203858c _ZN18UnkStruct_020377508vfunc_14Ev kind:function(arm,size=0x4) addr:0x2038670 -_ZN18UnkStruct_020377508vfunc_18Ev kind:function(arm,size=0xc) addr:0x2038674 +_ZN18UnkStruct_020377508vfunc_18EPi kind:function(arm,size=0xc) addr:0x2038674 _ZN18UnkStruct_020377508vfunc_1cEv kind:function(arm,size=0x8) addr:0x2038680 _ZN18UnkStruct_020377508vfunc_20Ev kind:function(arm,size=0xc) addr:0x2038688 _ZN18UnkStruct_020386d8C2Ev kind:function(arm,size=0x40) addr:0x2038694 _ZN18UnkStruct_020386d8C1Ev kind:function(arm,size=0x40) addr:0x20386d4 _ZN18UnkStruct_020386d88vfunc_08Ej 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_28Ei kind:function(arm,size=0x18) addr:0x2038748 _ZN18UnkStruct_020386d88vfunc_30Ev kind:function(arm,size=0x28) addr:0x2038760 _ZN18UnkStruct_020386d8D2Ev kind:function(arm,size=0x14) addr:0x2038788 func_020387e0 kind:function(thumb,size=0xc) addr:0x203879c diff --git a/include/Player/LinkStateCutscene.hpp b/include/Player/LinkStateCutscene.hpp index 224350fd..750f1b8a 100644 --- a/include/Player/LinkStateCutscene.hpp +++ b/include/Player/LinkStateCutscene.hpp @@ -16,7 +16,7 @@ public: /* 00 */ virtual ~UnkStruct_ov004_0210abb8() override; /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 24 */ virtual void vfunc_24(unk32 param1) override; + /* 24 */ virtual bool vfunc_24(unk32 param1) override; /* 2c */ virtual unk32 vfunc_2c(s32 param1) override; /* 34 */ }; diff --git a/include/Unknown/UnkStruct_02037750.hpp b/include/Unknown/UnkStruct_02037750.hpp index fe1a9740..bb3d2662 100644 --- a/include/Unknown/UnkStruct_02037750.hpp +++ b/include/Unknown/UnkStruct_02037750.hpp @@ -25,26 +25,29 @@ public: /* 0c */ virtual void vfunc_0c(class UnkStruct_020397f8* param1); /* 10 */ virtual void vfunc_10(); /* 14 */ virtual void vfunc_14(); - /* 18 */ virtual void vfunc_18(); - /* 1c */ virtual unk32 vfunc_1c(); + /* 18 */ virtual void vfunc_18(unk32* param1); + /* 1c */ virtual bool vfunc_1c(); /* 20 */ virtual void vfunc_20(); - /* 24 */ virtual void vfunc_24(unk32 param1); - /* 28 */ virtual void vfunc_28(s32 param1); + /* 24 */ virtual bool vfunc_24(unk32 param1); + /* 28 */ virtual unk8 vfunc_28(s32 param1); /* 2c */ virtual unk32 vfunc_2c(s32 param1); - /* 30 */ virtual unk32 vfunc_30(); + /* 30 */ virtual bool vfunc_30(); /* 34 */ UnkStruct_02037750(unk32 param1, unk32 param2); LinkStateInteract *GetLinkStateInteract(); - void func_020385d0(s32 param1, unk32 *param2); + unk32 func_020385d0(s32 param1, u8 *param2); }; class UnkStruct_020386d8_24 { public: - /* 00 */ unk32 mUnk_00; + /* 00 */ u8 mUnk_00; + /* 00 */ u8 mUnk_01; + /* 00 */ u8 mUnk_02; + /* 00 */ u8 mUnk_03; /* 04 */ - void func_020376c0(Vec3p param_2); + void func_020376c0(const Vec3p* param_2); }; // astruct_15 @@ -52,7 +55,9 @@ class UnkStruct_020386d8 : public UnkStruct_02037750 { public: /* 00 (base) */ /* 20 */ unk8 mUnk_20; - /* 21 */ unk8 mUnk_21[0x3]; + /* 21 */ unk8 mUnk_21; + /* 21 */ unk8 mUnk_22; + /* 21 */ unk8 mUnk_23; /* 24 */ UnkStruct_020386d8_24 mUnk_24; /* 28 */ unk32 mUnk_28; /* 2C */ unk32 mUnk_2C; @@ -67,8 +72,8 @@ public: UnkStruct_020386d8(); /* 00 */ virtual ~UnkStruct_020386d8(); /* 08 */ virtual void vfunc_08(u32 param1); - /* 24 */ virtual void vfunc_24(unk32 param1); - /* 28 */ virtual void vfunc_28(); - /* 30 */ virtual unk32 vfunc_30(); + /* 24 */ virtual bool vfunc_24(unk32 param1); + /* 28 */ virtual unk8 vfunc_28(s32 param1); + /* 30 */ virtual bool vfunc_30(); /* 34 */ }; diff --git a/src/05/Player/LinkStateCutscene.cpp b/src/05/Player/LinkStateCutscene.cpp index 7eaf872c..6875d229 100644 --- a/src/05/Player/LinkStateCutscene.cpp +++ b/src/05/Player/LinkStateCutscene.cpp @@ -1,7 +1,7 @@ #include "Player/LinkStateCutscene.hpp" unk32 UnkStruct_ov004_0210abb8::vfunc_2c(s32 param1) {} -void UnkStruct_ov004_0210abb8::vfunc_24(unk32 param1) {} +bool UnkStruct_ov004_0210abb8::vfunc_24(unk32 param1) {} void LinkStateCutscene::func_ov005_021089c0() {} void LinkStateCutscene::func_ov005_021089f4() {} void LinkStateCutscene::func_ov005_02108d08() {} diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index c43aa5d1..923c21b3 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -173,7 +173,7 @@ ARM unk32 UnkStruct_027E0C68::func_02036798(void) { if (this->mUnk_04 == 0) { bool bVar1 = false; - if (this->mUnk_18[1] != NULL && (this->mUnk_18[1]->mUnk_18 & 0xFFFF0000) != 0x1000000) { + if (this->mUnk_18[1] != NULL && (this->mUnk_18[1]->mUnk_18 & 0xFFFF0000) != (1 << 24)) { bVar1 = true; } diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp index b6db048e..b7342c49 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -1,6 +1,8 @@ #include "Unknown/UnkStruct_02037750.hpp" #include "Message/MessageManager.hpp" +extern "C" ARM unk32 func_02037628(u8*); + ARM UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { s32 i; @@ -21,34 +23,74 @@ ARM UnkStruct_02037750::~UnkStruct_02037750() { } } -ARM void UnkStruct_02037750::vfunc_08(u32 param1) {} +ARM void UnkStruct_02037750::vfunc_08(u32 param1) { + this->mUnk_18 = param1; + this->mUnk_1c = 0; +} + ARM void UnkStruct_02037750::vfunc_0c(UnkStruct_020397f8* param1) {} ARM void UnkStruct_02037750::vfunc_10() {} -ARM void UnkStruct_02037750::vfunc_24(unk32 param1) {} -ARM void UnkStruct_02037750::vfunc_28(s32 param1) {} + +ARM bool UnkStruct_02037750::vfunc_24(unk32 param1) { + u8 auStack_28[0x18]; + + func_02037628(auStack_28); + return this->func_020385d0(param1, auStack_28) != 0; +} + +ARM unk8 UnkStruct_02037750::vfunc_28(s32 param1) {} 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 LinkStateInteract *UnkStruct_02037750::GetLinkStateInteract() { + return (LinkStateInteract*)GetLinkState(2); +} + +ARM bool UnkStruct_02037750::vfunc_30() { + return true; +} + +ARM unk32 UnkStruct_02037750::func_020385d0(s32 param1, u8* param2) {} ARM void UnkStruct_02037750::vfunc_14() { } -ARM void UnkStruct_02037750::vfunc_18() {} -ARM unk32 UnkStruct_02037750::vfunc_1c() {} -ARM void UnkStruct_02037750::vfunc_20() {} +// non-matching +ARM void UnkStruct_02037750::vfunc_18(unk32* param1) { + param1[0] = 0; +} + +ARM bool UnkStruct_02037750::vfunc_1c() { + return false; +} + +ARM void UnkStruct_02037750::vfunc_20() { + this->mUnk_18 = 1 << 24; +} // non-matching ARM UnkStruct_020386d8::UnkStruct_020386d8() : - UnkStruct_02037750(0x1000000, 0) { + UnkStruct_02037750(1 << 24, 0) { this->mUnk_20 = -1; - this->mUnk_24.func_020376c0(gVec3p_ZERO); + this->mUnk_24.func_020376c0(&gVec3p_ZERO); } -ARM void UnkStruct_020386d8::vfunc_08(u32 param1) {} -ARM void UnkStruct_020386d8::vfunc_24(unk32 param1) {} -ARM void UnkStruct_020386d8::vfunc_28() {} -ARM unk32 UnkStruct_020386d8::vfunc_30() {} +ARM void UnkStruct_020386d8::vfunc_08(u32 param1) { + this->UnkStruct_02037750::vfunc_08(param1); + this->mUnk_20 = 0xff; +} + +ARM bool UnkStruct_020386d8::vfunc_24(unk32 param1) { + return this->func_020385d0(param1, &this->mUnk_24.mUnk_00) != 0; +} + +ARM unk8 UnkStruct_020386d8::vfunc_28(s32 param1) { + this->mUnk_20 = this->UnkStruct_02037750::vfunc_28(param1); + return this->mUnk_20; +} + +ARM bool UnkStruct_020386d8::vfunc_30() { + return data_027e0c68.func_020366c4()->mUnk_15c <= 0; +} ARM UnkStruct_020386d8::~UnkStruct_020386d8() { } From 514887962c31df98b4d934af61a4d43fd60b2458 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 5 Feb 2025 23:17:42 +0100 Subject: [PATCH 56/64] "progress" --- config/eur/arm9/delinks.txt | 2 + config/eur/arm9/symbols.txt | 4 +- config/usa/arm9/symbols.txt | 4 +- include/Item/ItemManager.hpp | 3 + include/Unknown/UnkStruct_02035064.hpp | 4 +- include/Unknown/UnkStruct_02037750.hpp | 7 +- src/Main/Unknown/UnkStruct_02035064.cpp | 16 ++- src/Main/Unknown/UnkStruct_02037750.cpp | 145 +++++++++++++++++++++++- 8 files changed, 171 insertions(+), 14 deletions(-) diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 374e855a..4dcb343a 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -23,6 +23,7 @@ src/Main/Unknown/UnkStruct_02032f0c.cpp: src/Main/Unknown/UnkStruct_02035064.cpp: .text start:0x02035064 end:0x02035370 + .data start:0x02057b28 end:0x02057b30 src/Main/Message/MessageManager.cpp: .text start:0x0203643c end:0x020371b4 @@ -34,6 +35,7 @@ src/Main/Message/BMG.cpp: src/Main/Unknown/UnkStruct_02037750.cpp: .text start:0x02037750 end:0x020387e0 + .data start:0x02057d00 end:0x02057d70 src/Main/Unknown/UnkStruct_02038aa0.cpp: .text start:0x0203881c end:0x02039578 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 03d95b82..7736304d 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1738,8 +1738,8 @@ _ZN18UnkStruct_02035064D1Ev kind:function(arm,size=0x4) addr:0x20350ac _ZN18UnkStruct_0203506413func_020350b0Ev kind:function(arm,size=0x4) addr:0x20350b0 _ZN18UnkStruct_0203506413func_020350b4Eiicss kind:function(arm,size=0xb8) addr:0x20350b4 _ZN18UnkStruct_0203506413func_0203516cEv kind:function(arm,size=0x3c) addr:0x203516c -_ZN18UnkStruct_020350647vfunc_0Ev kind:function(arm,size=0x8) addr:0x20351a8 -_ZN18UnkStruct_020350647vfunc_4Ev kind:function(arm,size=0x8) addr:0x20351b0 +_ZN18UnkStruct_020350648vfunc_00Ev kind:function(arm,size=0x8) addr:0x20351a8 +_ZN18UnkStruct_020350648vfunc_04Ev kind:function(arm,size=0x8) addr:0x20351b0 _ZN18UnkStruct_0203506413func_020351b8Ebbbb kind:function(arm,size=0x120) addr:0x20351b8 _ZN18UnkStruct_0203506413func_020352d8Ev kind:function(arm,size=0x98) addr:0x20352d8 func_02035370 kind:function(arm,size=0x18) addr:0x2035370 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 6d96c0ba..667b34f9 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1738,8 +1738,8 @@ _ZN18UnkStruct_02035064D1Ev kind:function(arm,size=0x4) addr:0x2035068 _ZN18UnkStruct_0203506413func_020350b0Ev kind:function(arm,size=0x4) addr:0x203506c _ZN18UnkStruct_0203506413func_020350b4Eiicss kind:function(arm,size=0xb8) addr:0x2035070 _ZN18UnkStruct_0203506413func_0203516cEv kind:function(arm,size=0x3c) addr:0x2035128 -_ZN18UnkStruct_020350647vfunc_0Ev kind:function(arm,size=0x8) addr:0x2035164 -_ZN18UnkStruct_020350647vfunc_4Ev kind:function(arm,size=0x8) addr:0x203516c +_ZN18UnkStruct_020350648vfunc_00Ev kind:function(arm,size=0x8) addr:0x2035164 +_ZN18UnkStruct_020350648vfunc_04Ev kind:function(arm,size=0x8) addr:0x203516c _ZN18UnkStruct_0203506413func_020351b8Ebbbb kind:function(arm,size=0x120) addr:0x2035174 _ZN18UnkStruct_0203506413func_020352d8Ev kind:function(arm,size=0x98) addr:0x2035294 func_02035370 kind:function(arm,size=0x18) addr:0x203532c diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index e0dbbaf2..87259d74 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -197,6 +197,9 @@ public: // Rupees s32 GetMaxRupees() const; void GiveRupees(s32 amount, bool param2); + inline u16 GetNumRupees(void) { + return this->mNumRupees; + } // Potion void SetPotion(u32 index, Potion potion); diff --git a/include/Unknown/UnkStruct_02035064.hpp b/include/Unknown/UnkStruct_02035064.hpp index b2443949..36f831de 100644 --- a/include/Unknown/UnkStruct_02035064.hpp +++ b/include/Unknown/UnkStruct_02035064.hpp @@ -43,8 +43,8 @@ public: /* 87 */ unk8 mUnk_87; /* 88 */ - /* 0 */ virtual s32 vfunc_0(); // func_020351a8 - /* 4 */ virtual s32 vfunc_4(); // func_020351b0 + /* 0 */ virtual s32 vfunc_00(); // func_020351a8 + /* 4 */ virtual s32 vfunc_04(); // func_020351b0 /* 8 */ UnkStruct_02035064(); diff --git a/include/Unknown/UnkStruct_02037750.hpp b/include/Unknown/UnkStruct_02037750.hpp index bb3d2662..89877998 100644 --- a/include/Unknown/UnkStruct_02037750.hpp +++ b/include/Unknown/UnkStruct_02037750.hpp @@ -7,12 +7,13 @@ #include "System/SysNew.hpp" class UnkStruct_020397f8; +typedef unk32 (*UnkStruct_02037750_Callback1)(unk32); // astruct_14 class UnkStruct_02037750 : public SysObject { public: /* 00 (vtable) */ - /* 04 */ unk32 mUnk_04[0x4]; + /* 04 */ UnkStruct_02037750_Callback1 mUnk_04[0x4]; /* 14 */ unk32 mUnk_14; /* 18 */ u32 mUnk_18; /* 1c */ u8 mUnk_1c; @@ -29,7 +30,7 @@ public: /* 1c */ virtual bool vfunc_1c(); /* 20 */ virtual void vfunc_20(); /* 24 */ virtual bool vfunc_24(unk32 param1); - /* 28 */ virtual unk8 vfunc_28(s32 param1); + /* 28 */ virtual unk32 vfunc_28(s32 param1); /* 2c */ virtual unk32 vfunc_2c(s32 param1); /* 30 */ virtual bool vfunc_30(); /* 34 */ @@ -73,7 +74,7 @@ public: /* 00 */ virtual ~UnkStruct_020386d8(); /* 08 */ virtual void vfunc_08(u32 param1); /* 24 */ virtual bool vfunc_24(unk32 param1); - /* 28 */ virtual unk8 vfunc_28(s32 param1); + /* 28 */ virtual unk32 vfunc_28(s32 param1); /* 30 */ virtual bool vfunc_30(); /* 34 */ }; diff --git a/src/Main/Unknown/UnkStruct_02035064.cpp b/src/Main/Unknown/UnkStruct_02035064.cpp index 6841fdc0..151cdf8c 100644 --- a/src/Main/Unknown/UnkStruct_02035064.cpp +++ b/src/Main/Unknown/UnkStruct_02035064.cpp @@ -18,13 +18,23 @@ 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 void UnkStruct_02035064::func_0203516c() { + if (this->mUnk_78 != 0x0) { + if (this->mUnk_86 == false) { + this->mUnk_5c.func_0202e1e8(); + this->func_020352d8(); + } else { + this->mUnk_86 = false; + } + } +} + +ARM s32 UnkStruct_02035064::vfunc_00() { return this->mUnk_4c; } -ARM s32 UnkStruct_02035064::vfunc_4() { +ARM s32 UnkStruct_02035064::vfunc_04() { return this->mUnk_4e; } diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp index b7342c49..9abe3745 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -1,7 +1,13 @@ #include "Unknown/UnkStruct_02037750.hpp" #include "Message/MessageManager.hpp" +#include "System/Random.hpp" +#include "Save/AdventureFlags.hpp" +#include "Actor/ActorManager.hpp" +#include "Item/ItemManager.hpp" extern "C" ARM unk32 func_02037628(u8*); +extern u8* data_027e0d54; +extern unk32* data_027e0cb4; ARM UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { s32 i; @@ -38,7 +44,142 @@ ARM bool UnkStruct_02037750::vfunc_24(unk32 param1) { return this->func_020385d0(param1, auStack_28) != 0; } -ARM unk8 UnkStruct_02037750::vfunc_28(s32 param1) {} +// non-matching +ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { + u16 uVar1; + s64 lVar2; + Random *pRVar3; + char cVar4; + u16 uVar5; + int iVar6; + u32 uVar7; + UnkStruct_02037750_Callback1 pcVar8; + int iVar9; + u32 uVar10; + u32 uVar11; + bool bVar12; + + pRVar3 = gRandom; + uVar7 = (u32)*(u16 *)(param1 + 0x2); + + if (uVar7 >= 0xF && uVar7 <= 0x2E) { + pcVar8 = this->mUnk_04[((uVar7 - 0xF) << 0x1E) >> 0x1C]; + iVar9 = 0; + + if (pcVar8 != NULL) { + iVar9 = pcVar8(this->mUnk_14); + } + + return iVar9; + } + + if ((s32)uVar7 <= 0) { + switch(uVar7) { + case 0x0: + case 0x2f: + break; + case 0x7: + if (data_027e0d54[0xd] != 0) { + return -0x1; + } + + return (data_027e0d54[0xf] != 0); + case 0x1: + case 0x2: + case 0x3: + UnkStruct_020397f8* ret_3 = data_027e0c68.func_020366c4(); + + if (0x0 < ret_3->mUnk_15c) { + return -0x1; + } + + uVar7 = (param1 + 0x1); + + if (ret_3->mUnk_576 < uVar7) { + return ret_3->mUnk_576; + } + + if (uVar7 == 0x0) { + uVar10 = 0x0; + } else { + lVar2 = gRandom->mRandomValue * gRandom->mFactor; + uVar10 = gRandom->Next(lVar2); + // uVar10 = *(int *)((int)&gRandom->mAddend + 0x4) + + // *(int *)((int)&gRandom->mFactor + 0x4) * + // *(uint *)&gRandom->mRandomValue + *(uint *)&gRandom->mFactor * + // *(int *)((int)&gRandom->mRandomValue + 0x4) + + // (lVar2 >> 0x20) + (gRandom->mAddend << uVar11); // CARRY4 + + // part of the inline? + // *(uint *)&gRandom->mRandomValue = *(uint *)&gRandom->mAddend + uVar11; + // *(uint *)((int)&gRandom->mRandomValue + 0x4) = uVar10; + + if (uVar7 != 0x0) { + uVar10 = (uVar7 * uVar10 >> 0x20); + } + } + + return uVar10; + case 0x4: + return gAdventureFlags->Get(param1 + 0x4) != false; + case 0x5: + return gActorManager->func_ov00_020c3b2c(NULL) != 0; + case 0x6: + break; + case 0x8: + return (((data_027e0cb4[(param1 + 0x4) >> 5]) & 1) << ((param1 + 0x4) & 0x1f)) == 0x0; + case 0x9: + break; + case 0xa: + break; + case 0xb: + lVar2 = gRandom->mRandomValue * gRandom->mFactor; + uVar7 = lVar2; + uVar10 = gRandom->Next(uVar7); + + return (int)(uVar10 * 0x64 >> 0x20) < (param1 + 0x4); + case 0xc: + uVar7 = (param1 + 0x1); + if (uVar7 == 0x0) { + uVar10 = 0x0; + } else { + lVar2 = gRandom->mRandomValue * gRandom->mFactor; + uVar11 = lVar2; + uVar10 = gRandom->Next(uVar11); + + if (uVar7 != 0x0) { + uVar10 = (uVar7 * uVar10 >> 0x20); + } + } + return (int)(char)uVar10; + case 0xd: + return gItemManager->GetNumRupees() != 0; + case 0xe: + return gItemManager->HasItem(param1 + 0x4) != 0; + default: + if (uVar7 == 0x2f) { + return gItemManager->HasItem((param1 + 0x4) + 0x60) != 0; + } + break; + } + } + + uVar7 = (param1 + 0x1); + if (uVar7 == 0x0) { + uVar10 = 0x0; + } else { + lVar2 = gRandom->mRandomValue * gRandom->mFactor; + uVar11 = lVar2; + uVar10 = gRandom->Next(uVar11); + + if (uVar7 != 0x0) { + uVar10 = (uVar7 * uVar10 >> 0x20); + } + } + + return (int)(char)uVar10; +} + ARM unk32 UnkStruct_02037750::vfunc_2c(s32 param1) {} ARM LinkStateInteract *UnkStruct_02037750::GetLinkStateInteract() { @@ -83,7 +224,7 @@ ARM bool UnkStruct_020386d8::vfunc_24(unk32 param1) { return this->func_020385d0(param1, &this->mUnk_24.mUnk_00) != 0; } -ARM unk8 UnkStruct_020386d8::vfunc_28(s32 param1) { +ARM unk32 UnkStruct_020386d8::vfunc_28(s32 param1) { this->mUnk_20 = this->UnkStruct_02037750::vfunc_28(param1); return this->mUnk_20; } From 308b9c2340f52fe99b18b42a2f9c324331ff4ba9 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:12:09 +0100 Subject: [PATCH 57/64] bmg improvements --- config/eur/arm9/symbols.txt | 8 +- config/usa/arm9/symbols.txt | 8 +- include/Message/BMG.hpp | 212 +++++++++++++++------------- src/Main/Message/BMG.cpp | 88 +++++++----- src/Main/Message/MessageManager.cpp | 6 +- 5 files changed, 178 insertions(+), 144 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index ac98082e..273b726b 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1821,10 +1821,10 @@ _ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x _ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037158 _ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037178 _ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x4) addr:0x20371b0 -_Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 -_Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 -_Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037258 -_Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x203728c +_ZN11BMGFileInfo13func_020371b4Ev kind:function(thumb,size=0x14) addr:0x20371b4 +_ZN11BMGFileInfo13func_020371c8EPjs kind:function(thumb,size=0x90) addr:0x20371c8 +_ZN11BMGFileInfo13func_02037258Et kind:function(arm,size=0x34) addr:0x2037258 +_ZN11BMGFileInfo13func_0203728cEi kind:function(arm,size=0x64) addr:0x203728c _ZN9BMGGroups13func_020372f0E12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372f0 _ZN9BMGGroups13func_020373b4Es kind:function(thumb,size=0x38) addr:0x20373b4 _ZN9BMGGroups13func_020373ecEi kind:function(arm,size=0x60) addr:0x20373ec diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 125495a0..de3d48e3 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1821,10 +1821,10 @@ _ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x _ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037114 _ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037134 _ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x4) addr:0x203716c -_Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 -_Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 -_Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037214 -_Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x2037248 +_ZN11BMGFileInfo13func_020371b4Ev kind:function(thumb,size=0x14) addr:0x2037170 +_ZN11BMGFileInfo13func_020371c8EPjs kind:function(thumb,size=0x90) addr:0x2037184 +_ZN11BMGFileInfo13func_02037258Et kind:function(arm,size=0x34) addr:0x2037214 +_ZN11BMGFileInfo13func_0203728cEi kind:function(arm,size=0x64) addr:0x2037248 _ZN9BMGGroups13func_020372f0E12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372ac _ZN9BMGGroups13func_020373b4Es kind:function(thumb,size=0x38) addr:0x2037370 _ZN9BMGGroups13func_020373ecEi kind:function(arm,size=0x60) addr:0x20373a8 diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index 53a418ea..1fd03974 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -6,26 +6,26 @@ #define BMG_MAGIC "MESGbmg1" #define BMG_TAG(a, b, c, d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) -#define BMG_GET_INF1(pGroups, flags) (func_02037258(&(pGroups)->entries[(flags) >> 0x10], (flags) & 0xFFFF)) +#define BMG_GET_INF1(pGroups, flags) ((pGroups)->entries[(flags) >> 0x10].func_02037258((flags) & 0xFFFF)) #define BMG_GET_MSG_OFFSET(pGroups, flags) (BMG_GET_INF1((pGroups), (flags))->offset) #define BMG_GET_MSG_ADDR(pGroups, flags) ((u32)(pGroups)->entries[(flags) >> 0x10].pDAT1 + (BMG_GET_MSG_OFFSET((pGroups), (flags)) & ~1)) -typedef enum BMGTag { +enum BMGTag { /* "INF1" */ BMG_TAG_INF1 = BMG_TAG('I', 'N', 'F', '1'), /* "FLW1" */ BMG_TAG_FLW1 = BMG_TAG('F', 'L', 'W', '1'), /* "FLI1" */ BMG_TAG_FLI1 = BMG_TAG('F', 'L', 'I', '1'), /* "DAT1" */ BMG_TAG_DAT1 = BMG_TAG('D', 'A', 'T', '1'), /* "MID1" */ BMG_TAG_MID1 = BMG_TAG('M', 'I', 'D', '1'), /* "MID1" */ BMG_TAG_STR1 = BMG_TAG('S', 'T', 'R', '1'), -} BMGTag; +}; -typedef enum BMGEncoding { +enum BMGEncoding { /* 1 */ BMG_ENCODING_CP1252 = 1, /* 2 */ BMG_ENCODING_UTF16_BE, /* 3 */ BMG_ENCODING_SHIFT_JIS, /* 4 */ BMG_ENCODING_UTF8, /* 5 */ BMG_ENCODING_MAX -} BMGEncoding; +}; typedef enum BMGFileIndex { /* 0 */ BMG_FILE_INDEX_SYSTEM, @@ -65,120 +65,140 @@ typedef enum BMGFileIndex { /* 34 */ BMG_FILE_INDEX_MAX } BMGFileIndex; -typedef struct SectionBase { - /* 0x00 */ u32 tag; // "INF1", "DAT1", ... - /* 0x04 */ u32 size; // the size of the section -} SectionBase; // size = 0x8 +struct SectionBase { + /* 00 */ u32 tag; // "INF1", "DAT1", ... + /* 04 */ u32 size; // the size of the section + /* 08 */ +}; -typedef struct BMGHeader { - /* 0x00 */ char magic[8]; // always "MESGbmg1" - /* 0x08 */ u32 fileSize; // the size of the BMG file - /* 0x0C */ u32 numSections; // the number of sections (INF1, DAT1, ...) - /* 0x10 */ u8 encoding; // see `BMGEncoding` - /* 0x11 */ u8 unk_11[0xF]; // alignment padding? -} BMGHeader; // size = 0x20 +struct BMGHeader { + /* 00 */ char magic[8]; // always "MESGbmg1" + /* 08 */ u32 fileSize; // the size of the BMG file + /* 0c */ u32 numSections; // the number of sections (INF1, DAT1, ...) + /* 10 */ u8 encoding; // see `BMGEncoding` + /* 11 */ u8 unk_11[0xF]; // alignment padding? + /* 20 */ +}; -typedef struct EntryINF1 { - /* 0x00 */ u32 offset; // relative to the end of the DAT1 header - /* 0x04 */ u8 mUnk_04; // flags/attributes? (+0x04 to +0x06) - /* 0x05 */ u8 mUnk_05; - /* 0x06 */ u8 mUnk_06; - /* 0x07 */ u8 mUnk_07; -} EntryINF1; // size = 0x8 +struct EntryINF1 { + /* 00 */ u32 offset; // relative to the end of the DAT1 header + /* 04 */ u8 mUnk_04; // flags/attributes? (+0x04 to +0x06) + /* 05 */ u8 mUnk_05; + /* 06 */ u8 mUnk_06; + /* 07 */ u8 mUnk_07; + /* 08 */ +}; -typedef struct SectionINF1 { - /* 0x00 */ SectionBase base; - /* 0x08 */ u16 numEntries; - /* 0x0A */ u16 entrySize; - /* 0x0C */ u16 groupId; - /* 0x0E */ u8 colorId; - /* 0x0F */ u8 unk_0F[0x1]; // alignment padding? - /* 0x10 */ EntryINF1* entries; -} SectionINF1; +struct SectionINF1 { + /* 00 */ SectionBase base; + /* 08 */ u16 numEntries; + /* 0a */ u16 entrySize; + /* 0c */ u16 groupId; + /* 0e */ u8 colorId; + /* 0f */ u8 mUnk_0F[0x1]; // alignment padding? + /* 10 */ EntryINF1* entries; + /* 14 */ +}; -typedef enum InstrType { +enum InstrType { /* 1 */ FLW1_TYPE_SHOW_MSG = 1, /* 2 */ FLW1_TYPE_BRANCH = 2, /* 3 */ FLW1_TYPE_EVENT = 3, -} InstrType; + /* 4 */ +}; -typedef struct InstrShowMsg { - /* 0x01 */ u8 bmgFileIndex; // index into sBMGFiles - /* 0x02 */ u16 msgIndex; // index of INF1 entry - /* 0x04 */ s16 nextIndex; // index of FLW1 entry, 0xFFFF stops the conversation - /* 0x06 */ s16 nextBMGFileIndex; // index into sBMGFiles -} InstrShowMsg; // size = 0x8 +struct InstrShowMsg { + /* 01 */ u8 bmgFileIndex; // index into sBMGFiles + /* 02 */ u16 msgIndex; // index of INF1 entry + /* 04 */ s16 nextIndex; // index of FLW1 entry, 0xFFFF stops the conversation + /* 06 */ s16 nextBMGFileIndex; // index into sBMGFiles + /* 08 */ +}; -typedef struct InstrBranch { - /* 0x01 */ u8 mUnk_01; - /* 0x02 */ u16 funcIndex; // index of the query function to run - /* 0x04 */ u16 funcArg; // the argument to use in the function - /* 0x06 */ u16 flwEntry; // the index of the second section table to be used next in the conversation. -} InstrBranch; // size = 0x8 +struct InstrBranch { + /* 01 */ u8 mUnk_01; + /* 02 */ u16 funcIndex; // index of the query function to run + /* 04 */ u16 funcArg; // the argument to use in the function + /* 06 */ u16 flwEntry; // the index of the second section table to be used next in the conversation. + /* 08 */ +}; -typedef struct InstrEvent { - /* 0x01 */ u8 funcIndex; // index of the query function to run - /* 0x02 */ u16 flwEntry; // the index of the second section table to be used next in the conversation. - /* 0x04 */ u32 funcArg; // the argument to use in the function -} InstrEvent; // size = 0x8 +struct InstrEvent { + /* 01 */ u8 funcIndex; // index of the query function to run + /* 02 */ u16 flwEntry; // the index of the second section table to be used next in the conversation. + /* 04 */ u32 funcArg; // the argument to use in the function + /* 08 */ +}; -typedef struct FLW1Instr { - /* 0x00 */ u8 type; // see InstrType - /* 0x01 */ union { +struct FLW1Instr { + /* 00 */ u8 type; // see InstrType + /* 01 */ union { InstrShowMsg showMsg; InstrBranch branch; InstrEvent event; }; -} FLW1Instr; // size = 0x8 + /* 09 */ +}; -typedef struct SectionFLW1 { - /* 0x00 */ SectionBase base; - /* 0x04 */ u16 numInstructions; - /* 0x08 */ u16 numLabels; - /* 0x0C */ u32 mUnk_0c; // always zero? - /* 0x10 */ FLW1Instr* instructions; - /* 0x14 */ s16* flwEntries; - /* 0x18 */ s8* bmgFileIndices; -} SectionFLW1; +struct SectionFLW1 { + /* 00 */ SectionBase base; + /* 04 */ u16 numInstructions; + /* 08 */ u16 numLabels; + /* 0c */ u32 mUnk_0c; // always zero? + /* 10 */ FLW1Instr* instructions; + /* 14 */ s16* flwEntries; + /* 18 */ s8* bmgFileIndices; + /* 1c */ +}; -typedef struct EntryFLI1 { - /* 0x00 */ u32 msgFlowID; - /* 0x04 */ u32 msgFlowNodeIndex; -} EntryFLI1; // size = 0x8 +struct EntryFLI1 { + /* 00 */ u32 msgFlowID; + /* 04 */ u32 msgFlowNodeIndex; + /* 08 */ +}; -typedef struct SectionFLI1 { - /* 0x00 */ SectionBase base; - /* 0x04 */ u16 numEntries; - /* 0x08 */ u16 entrySize; - /* 0x0C */ u32 mUnk_0c; // always zero? - /* 0x10 */ EntryFLI1* entries; -} SectionFLI1; +struct SectionFLI1 { + /* 00 */ SectionBase base; + /* 04 */ u16 numEntries; + /* 08 */ u16 entrySize; + /* 0c */ u32 mUnk_0c; // always zero? + /* 10 */ EntryFLI1* entries; + /* 14 */ +}; -typedef struct EntryDAT1 { - /* 0x00 */ char* text; -} EntryDAT1; +struct EntryDAT1 { + /* 00 */ char* text; + /* 04 */ +}; -typedef struct SectionDAT1 { - /* 0x00 */ SectionBase base; - /* 0x08 */ EntryDAT1* entries; -} SectionDAT1; +struct SectionDAT1 { + /* 00 */ SectionBase base; + /* 08 */ EntryDAT1* entries; + /* 0c */ +}; -typedef struct BMGFileInfo { - /* 0x00 */ BMGHeader* pHeader; // pointer to the file's header - /* 0x04 */ SectionINF1* pINF1; // pointer to the data informations (INF -> informations) - /* 0x08 */ SectionFLW1* pFLW1; // pointer to the message flow data (FLW -> flow) - /* 0x0C */ SectionFLI1* pFLI1; // pointer to the message flow index table (FLI -> flow index table) - /* 0x10 */ SectionDAT1* pDAT1; // pointer to the data (DAT -> data) - /* 0x14 */ BMGHeader* mUnk_14; // same as pHeader (?) - /* 0x18 */ s16 mUnk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose) - /* 0x1A */ s16 groupId; // stores the group id -} BMGFileInfo; // size = 0x1C +struct BMGFileInfo { + /* 00 */ BMGHeader* pHeader; // pointer to the file's header + /* 04 */ SectionINF1* pINF1; // pointer to the data informations (INF -> informations) + /* 08 */ SectionFLW1* pFLW1; // pointer to the message flow data (FLW -> flow) + /* 0c */ SectionFLI1* pFLI1; // pointer to the message flow index table (FLI -> flow index table) + /* 10 */ SectionDAT1* pDAT1; // pointer to the data (DAT -> data) + /* 14 */ BMGHeader* mUnk_14; // same as pHeader (?) + /* 18 */ s16 mUnk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose) + /* 1a */ s16 groupId; // stores the group id + /* 1c */ + + void func_020371b4(); + u16 func_020371c8(u32* pFile, s16 unk_18); + EntryINF1* func_02037258(u16 param_2); + u16 func_0203728c(unk32 param_2); +}; class BMGGroups : public SysObject { public: - /* 0x00 */ BMGFileInfo* entries; // accessed with `groupId` - /* 0x04 */ s32 numEntries; - /* 0x08 */ + /* 00 */ BMGFileInfo* entries; // accessed with `groupId` + /* 04 */ s32 numEntries; + /* 08 */ BMGGroups(); ~BMGGroups(); @@ -186,5 +206,3 @@ public: void func_020373b4(s16 unk_18); u32 func_020373ec(unk32 param_2); }; - -extern EntryINF1* func_02037258(BMGFileInfo* pFileInfo, unk32 param_2); diff --git a/src/Main/Message/BMG.cpp b/src/Main/Message/BMG.cpp index edf2f9f5..15fab32a 100644 --- a/src/Main/Message/BMG.cpp +++ b/src/Main/Message/BMG.cpp @@ -48,28 +48,30 @@ static char* sBMGFileNames[BMG_FILE_INDEX_MAX] = { "kaitei_F", // BMG_FILE_INDEX_KAITEI_F }; -THUMB void func_020371b4(BMGFileInfo* pFileInfo) { - pFileInfo->pHeader = NULL; - pFileInfo->pINF1 = NULL; - pFileInfo->pFLW1 = NULL; - pFileInfo->pFLI1 = NULL; - pFileInfo->pDAT1 = NULL; - pFileInfo->mUnk_14 = NULL; - pFileInfo->mUnk_18 = 0; +THUMB void BMGFileInfo::func_020371b4() { + this->pHeader = NULL; + this->pINF1 = NULL; + this->pFLW1 = NULL; + this->pFLI1 = NULL; + this->pDAT1 = NULL; + this->mUnk_14 = NULL; + this->mUnk_18 = 0; } -THUMB u16 func_020371c8(BMGFileInfo* pFileInfo, u32* pFile, s16 unk_18) { +// non-matching (equivalent) +THUMB u16 BMGFileInfo::func_020371c8(u32* pFile, s16 unk_18) { SectionBase* pSection; u16 groupId; u32 i; + BMGHeader* pHeader = (BMGHeader*)pFile; groupId = -1; - pFileInfo->mUnk_14 = (BMGHeader*)pFile; - pFileInfo->pHeader = (BMGHeader*)pFile; - pFileInfo->mUnk_18 = unk_18; + this->mUnk_14 = pHeader; + this->mUnk_18 = unk_18; + this->pHeader = pHeader; pSection = (SectionBase*)((u8*)pFile + sizeof(BMGHeader)); - for (i = 0; i < pFileInfo->pHeader->numSections; i++) { + for (i = 0; i < this->mUnk_14->numSections; i++) { switch (pSection->tag) { case BMG_TAG_MID1: // unused @@ -78,18 +80,18 @@ THUMB u16 func_020371c8(BMGFileInfo* pFileInfo, u32* pFile, s16 unk_18) { // unused break; case BMG_TAG_INF1: - pFileInfo->pINF1 = (SectionINF1*)pSection; - groupId = pFileInfo->pINF1->groupId; + this->pINF1 = (SectionINF1*)pSection; + groupId = this->pINF1->groupId; break; case BMG_TAG_DAT1: //! TODO: fake? - pFileInfo->pDAT1 = (SectionDAT1*)(pSection + 1); + this->pDAT1 = (SectionDAT1*)(pSection + 1); break; case BMG_TAG_FLW1: - pFileInfo->pFLW1 = (SectionFLW1*)pSection; + this->pFLW1 = (SectionFLW1*)pSection; break; case BMG_TAG_FLI1: - pFileInfo->pFLI1 = (SectionFLI1*)pSection; + this->pFLI1 = (SectionFLI1*)pSection; break; } @@ -99,35 +101,49 @@ THUMB u16 func_020371c8(BMGFileInfo* pFileInfo, u32* pFile, s16 unk_18) { return groupId; } -ARM EntryINF1* func_02037258(BMGFileInfo* pFileInfo, unk32 param_2) { - SectionINF1* pINF1 = pFileInfo->pINF1; +ARM EntryINF1* BMGFileInfo::func_02037258(u16 param_2) { + if (this->pINF1 != NULL) { + if (param_2 < this->pINF1->numEntries) { + return (EntryINF1*)((u32)&this->pINF1->entries + this->pINF1->entrySize * param_2); + } - if (pINF1 == NULL) { return NULL; } - if (param_2 < pINF1->numEntries) { - return &pINF1->entries[pINF1->entrySize * param_2]; - } - return NULL; } -ARM u16 func_0203728c(BMGFileInfo* pFileInfo, unk32 param_2) { +// non-matching +ARM u16 BMGFileInfo::func_0203728c(unk32 param_2) { SectionFLI1* pFLI1; - u16 i; + EntryFLI1* entry; + u32 i; + u16 j; - pFLI1 = pFileInfo->pFLI1; + pFLI1 = this->pFLI1; if (pFLI1 == NULL) { return -1; } - for (i = 0; i < pFLI1->numEntries; i++) { - if (param_2 == pFLI1->entries[i * 2].msgFlowID) { - return pFLI1->entries[i].msgFlowNodeIndex; + i = 0; + do { + entry = &pFLI1->entries[i]; + + if (param_2 > entry->msgFlowID) { + return entry->msgFlowNodeIndex; } - } + + // i++; + j = i + 1; + i = j & 0xFFFF; + } while (j < pFLI1->numEntries); + + // for (i = 0; (u16)i < pFLI1->numEntries; i++) { + // if (param_2 == pFLI1->entries[i].msgFlowID) { + // return pFLI1->entries[i].msgFlowNodeIndex; + // } + // } return -1; } @@ -161,10 +177,10 @@ THUMB void BMGGroups::func_020372f0(BMGFileIndex eIndex, s16 unk_18) { // initialize file info bmgFile.groupId = 0; - func_020371b4(&bmgFile); + bmgFile.func_020371b4(); // assign sections and set the file info in the groups entries - groupId = func_020371c8(&bmgFile, pFile, unk_18); + groupId = bmgFile.func_020371c8(pFile, unk_18); this->entries[groupId] = bmgFile; this->entries[groupId].groupId = groupId; } @@ -175,7 +191,7 @@ THUMB void BMGGroups::func_020373b4(s16 unk_18) { for (i = 0; i < this->numEntries; i++) { if (this->entries[i].mUnk_18 == unk_18) { func_0202d590(this->entries[i].mUnk_14); - func_020371b4(&this->entries[i]); + this->entries[i].func_020371b4(); } } } @@ -188,7 +204,7 @@ ARM u32 BMGGroups::func_020373ec(unk32 param_2) { dVar1 = -1; for (i = 0; i < this->numEntries; i++) { - uVar2 = func_0203728c(&this->entries[i], param_2); + uVar2 = this->entries[i].func_0203728c(param_2); if (uVar2 != dVar1) { return uVar2 | i << 0x10; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 923c21b3..7a1e0726 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -432,7 +432,7 @@ ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* para int iStack_34; int iStack_30; - pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xFFFF); + pEVar1 = this->pGroups->entries[param_2 >> 0x10].func_02037258(param_2 & 0xFFFF); if (pEVar1 == NULL) { return NULL; @@ -458,7 +458,7 @@ ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* para // pSVar4->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); BMGFileInfo* entry = &(pBVar5)->entries[(param_2) >> 0x10]; // pSVar4->vfunc_50(pEVar1, - // ((u32)entry->pDAT1 + (((func_02037258(entry, (((param_2))) & 0xFFFF))->offset) & ~1)), + // ((u32)entry->pDAT1 + (((entry.func_02037258((((param_2))) & 0xFFFF))->offset) & ~1)), // // BMG_GET_MSG_ADDR(pBVar5, param_2), // (s16*)&iStack_38, 1); @@ -501,7 +501,7 @@ ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param int iVar4; UnkStruct_020397f8 *pSVar5; - pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xffff); + pEVar1 = this->pGroups->entries[param_2 >> 0x10].func_02037258(param_2 & 0xffff); if (pEVar1 == NULL) { return NULL; From e109eeadba44994bee4749c40c2d85cb5288ac0e Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Thu, 6 Feb 2025 22:45:45 +0100 Subject: [PATCH 58/64] more progress --- config/eur/arm9/symbols.txt | 16 +++---- config/usa/arm9/symbols.txt | 16 +++---- include/Message/MessageManager.hpp | 4 +- include/Message/MsgProc.hpp | 4 +- include/Unknown/UnkStruct_02038aa0.hpp | 4 +- include/Unknown/UnkStruct_020397f8.hpp | 25 ----------- src/Main/Message/MessageManager.cpp | 58 ++++++++++++------------- src/Main/Message/func_0203c358.cpp | 7 +-- src/Main/Unknown/UnkStruct_02038aa0.cpp | 6 ++- src/Main/Unknown/UnkStruct_020397f8.cpp | 12 ++--- 10 files changed, 62 insertions(+), 90 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 273b726b..5de9a047 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1803,14 +1803,14 @@ _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_020386d8 kind:function(arm,size=0x6c) addr:0x2036888 -_ZN18UnkStruct_027E0C6813func_020368f4EP37UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368f4 +_ZN18UnkStruct_027E0C6813func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036888 +_ZN18UnkStruct_027E0C6813func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368f4 _ZN18UnkStruct_027E0C6813func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x203690c _ZN18UnkStruct_027E0C6813func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036bbc _ZN18UnkStruct_027E0C6813func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c50 _ZN18UnkStruct_027E0C6813func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036ca4 -_ZN18UnkStruct_027E0C6813func_02036ce4EP31UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ce4 -_ZN18UnkStruct_027E0C6813func_02036d30EP37UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036d30 +_ZN18UnkStruct_027E0C6813func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ce4 +_ZN18UnkStruct_027E0C6813func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036d30 _ZN18UnkStruct_027E0C6813func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d4c _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c _ZN18UnkStruct_027E0C6813func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036da8 @@ -1887,7 +1887,7 @@ _ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x203 _ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038d10 _ZN18UnkStruct_02038aa013func_02038d20Ev kind:function(arm,size=0x1b0) addr:0x2038d20 _ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038ed0 -_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x4c) addr:0x2038ef4 +_ZN18UnkStruct_02038aa08vfunc_30Eii kind:function(arm,size=0x4c) addr:0x2038ef4 _ZN18UnkStruct_02038aa013func_02038f40Eii kind:function(arm,size=0x4) addr:0x2038f40 _ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x114) addr:0x2038f44 _ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x4) addr:0x2039058 @@ -1950,7 +1950,7 @@ _ZN13MsgProc_Type2C1Eisi kind:function(thumb,size=0x44) addr:0x203c358 _ZN13MsgProc_Type213func_0203c39cEii kind:function(thumb,size=0x78) addr:0x203c39c _ZN13MsgProc_Type28vfunc_3CEi kind:function(arm,size=0x4c) addr:0x203c414 _ZN13MsgProc_Type28vfunc_40Eii kind:function(arm,size=0x4c) addr:0x203c460 -func_0203c4ac kind:function(arm,size=0x118) addr:0x203c4ac +_ZN13MsgProc_Type213func_0203c4acEii kind:function(arm,size=0x118) addr:0x203c4ac _ZN13MsgProc_Type28vfunc_14Eii kind:function(arm,size=0x18) addr:0x203c5c4 func_0203c5dc kind:function(arm,size=0x120) addr:0x203c5dc _ZN13MsgProc_Type2D0Ev kind:function(arm,size=0x1c) addr:0x203c6fc @@ -2034,7 +2034,7 @@ _ZN18UnkStruct_0203dae08vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dcb4 _ZN18UnkStruct_0203dae013func_0203dcfcEhiii kind:function(arm,size=0xf0) addr:0x203dcfc _ZN18UnkStruct_0203dae013func_0203ddecEv kind:function(arm,size=0x10) addr:0x203ddec _ZN18UnkStruct_0203dae013func_0203ddfcEv kind:function(arm,size=0x18) addr:0x203ddfc -_ZN18UnkStruct_0203dae013func_0203de14Ev kind:function(arm,size=0x10) addr:0x203de14 +_ZN18UnkStruct_02038aa013func_0203de14Ei kind:function(arm,size=0x10) addr:0x203de14 _ZN18UnkStruct_0203dae013func_0203de24Ev kind:function(arm,size=0x34) addr:0x203de24 _ZN18UnkStruct_0203dae013func_0203de58Ei kind:function(arm,size=0x208) addr:0x203de58 _ZN18UnkStruct_0203dae08vfunc_10Eji kind:function(arm,size=0x30) addr:0x203e060 @@ -2800,7 +2800,7 @@ data_02057ed4 kind:data(any) addr:0x2057ed4 data_02057ed8 kind:data(any) addr:0x2057ed8 data_02057eec kind:data(any) addr:0x2057eec data_02057f08 kind:data(any) addr:0x2057f08 -data_02057f14 kind:data(any) addr:0x2057f14 +_ZTV13MsgProc_Type2 kind:data(any) addr:0x2057f14 data_02057f90 kind:data(any) addr:0x2057f90 data_0205800c kind:data(any) addr:0x205800c data_02058024 kind:data(any) addr:0x2058024 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index de3d48e3..177c5404 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1803,14 +1803,14 @@ _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_020386d8 kind:function(arm,size=0x6c) addr:0x2036844 -_ZN18UnkStruct_027E0C6813func_020368f4EP37UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368b0 +_ZN18UnkStruct_027E0C6813func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036844 +_ZN18UnkStruct_027E0C6813func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368b0 _ZN18UnkStruct_027E0C6813func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x20368c8 _ZN18UnkStruct_027E0C6813func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036b78 _ZN18UnkStruct_027E0C6813func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c0c _ZN18UnkStruct_027E0C6813func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036c60 -_ZN18UnkStruct_027E0C6813func_02036ce4EP31UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ca0 -_ZN18UnkStruct_027E0C6813func_02036d30EP37UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036cec +_ZN18UnkStruct_027E0C6813func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ca0 +_ZN18UnkStruct_027E0C6813func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036cec _ZN18UnkStruct_027E0C6813func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d08 _ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 _ZN18UnkStruct_027E0C6813func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036d64 @@ -1887,7 +1887,7 @@ _ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x203 _ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038ccc _ZN18UnkStruct_02038aa013func_02038d20Ev kind:function(arm,size=0x1b0) addr:0x2038cdc _ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038e8c -_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x4c) addr:0x2038eb0 +_ZN18UnkStruct_02038aa08vfunc_30Eii kind:function(arm,size=0x4c) addr:0x2038eb0 _ZN18UnkStruct_02038aa013func_02038f40Eii kind:function(arm,size=0x4) addr:0x2038efc _ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x114) addr:0x2038f00 _ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x4) addr:0x2039014 @@ -1950,7 +1950,7 @@ _ZN13MsgProc_Type2C1Eisi kind:function(thumb,size=0x44) addr:0x203c314 _ZN13MsgProc_Type213func_0203c39cEii kind:function(thumb,size=0x78) addr:0x203c358 _ZN13MsgProc_Type28vfunc_3CEi kind:function(arm,size=0x4c) addr:0x203c3d0 _ZN13MsgProc_Type28vfunc_40Eii kind:function(arm,size=0x4c) addr:0x203c41c -func_0203c4ac kind:function(arm,size=0x118) addr:0x203c468 +_ZN13MsgProc_Type213func_0203c4acEii kind:function(arm,size=0x118) addr:0x203c468 _ZN13MsgProc_Type28vfunc_14Eii kind:function(arm,size=0x18) addr:0x203c580 func_0203c5dc kind:function(arm,size=0x120) addr:0x203c598 _ZN13MsgProc_Type2D0Ev kind:function(arm,size=0x1c) addr:0x203c6b8 @@ -2034,7 +2034,7 @@ _ZN18UnkStruct_0203dae08vfunc_14Eii kind:function(arm,size=0x48) addr:0x203dc70 _ZN18UnkStruct_0203dae013func_0203dcfcEhiii kind:function(arm,size=0xf0) addr:0x203dcb8 _ZN18UnkStruct_0203dae013func_0203ddecEv kind:function(arm,size=0x10) addr:0x203dda8 _ZN18UnkStruct_0203dae013func_0203ddfcEv kind:function(arm,size=0x18) addr:0x203ddb8 -_ZN18UnkStruct_0203dae013func_0203de14Ev kind:function(arm,size=0x10) addr:0x203ddd0 +_ZN18UnkStruct_02038aa013func_0203de14Ei kind:function(arm,size=0x10) addr:0x203ddd0 _ZN18UnkStruct_0203dae013func_0203de24Ev kind:function(arm,size=0x34) addr:0x203dde0 _ZN18UnkStruct_0203dae013func_0203de58Ei kind:function(arm,size=0x208) addr:0x203de14 _ZN18UnkStruct_0203dae08vfunc_10Eji kind:function(arm,size=0x30) addr:0x203e01c @@ -2801,7 +2801,7 @@ data_02057ed4 kind:data(any) addr:0x2057e8c data_02057ed8 kind:data(any) addr:0x2057e90 data_02057eec kind:data(any) addr:0x2057ea4 data_02057f08 kind:data(any) addr:0x2057ec0 -data_02057f14 kind:data(any) addr:0x2057ecc +_ZTV13MsgProc_Type2 kind:data(any) addr:0x2057ecc data_02057f90 kind:data(any) addr:0x2057f48 data_0205800c kind:data(any) addr:0x2057fc4 data_02058024 kind:data(any) addr:0x2057fdc diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index ddb1df59..76a6bc87 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -33,11 +33,11 @@ public: /* 0x14 */ BMGGroups* pGroups; /* 0x18 */ UnkStruct_020386d8* mUnk_18[2]; /* 0x20 */ UnkStruct_02037750* mUnk_20[2]; - /* 0x28 */ UnkStruct_02038aa0* mUnk_28[6]; + /* 0x28 */ UnkStruct_02038aa0* mUnk_28[6]; //! TODO: is it the right type? /* 0x40 */ UnkStruct_020397f8* mUnk_40[2]; // is array size 6? /* 0x48 */ - static void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3); + static void func_0203643c(u32 *param_1, UnkStruct_027E0C68* param_2, u32 param_3); void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); void func_0203665c(void); UnkStruct_027E0C68(); diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp index fecdd18c..efe42b56 100644 --- a/include/Message/MsgProc.hpp +++ b/include/Message/MsgProc.hpp @@ -73,7 +73,6 @@ struct func_02038f44_param4 { extern "C" u32 func_01ff9b4c(unk32, unk32); extern "C" unk32 func_0203c084(void); -extern "C" void func_ov018_02169634(UnkStruct_020397f8*); extern "C" unk32 func_ov000_02079e04(void); extern "C" unk32 func_02016fcc(unk32); extern "C" void func_02032304(unk32*, char*, unk32, unk32, unk32); @@ -100,7 +99,6 @@ struct UnkStruct2 { }; extern UnkStruct2 data_027e077c; extern u8 data_02056be4[]; -extern u8 data_027e0618[]; class UnkClass_027e0cbc { public: @@ -117,7 +115,7 @@ extern "C" void func_020347b0(unk32, unk16, unk32*, unk32*, unk32, unk32); extern THUMB unk32 func_0202ab48(void); extern "C" void func_02034984(unk32, u8, unk32, unk32); extern "C" void func_02034698(unk32, unk32, unk32*, unk32*); -extern struct TouchControl data_027e0d78; +extern struct TouchControl gTouchControl; class UnkClass_027e0e28 { public: diff --git a/include/Unknown/UnkStruct_02038aa0.hpp b/include/Unknown/UnkStruct_02038aa0.hpp index f9904674..6b53dde3 100644 --- a/include/Unknown/UnkStruct_02038aa0.hpp +++ b/include/Unknown/UnkStruct_02038aa0.hpp @@ -74,11 +74,11 @@ public: /* 00 */ virtual ~UnkStruct_02038aa0(); /* 08 */ virtual void vfunc_08(s32 param1, unk32* param2, s16 *param3, unk32 param4); /* 0c */ virtual void vfunc_0c(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); - /* 10 */ virtual void vfunc_10(unk32 param1); + /* 10 */ virtual void vfunc_10(); /* 1c */ virtual unk32 vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4); /* 20 */ virtual unk32 vfunc_20(s32 param1, s32 *param2); /* 2c */ virtual void vfunc_2c(); - /* 30 */ virtual void vfunc_30(); + /* 30 */ virtual void vfunc_30(unk32 param_2, unk32 param_3); /* 34 */ virtual unk32 vfunc_34(s32 param1); /* 38 */ virtual bool vfunc_38(); /* 3c */ virtual void vfunc_3c(); diff --git a/include/Unknown/UnkStruct_020397f8.hpp b/include/Unknown/UnkStruct_020397f8.hpp index ca626fec..ee969e08 100644 --- a/include/Unknown/UnkStruct_020397f8.hpp +++ b/include/Unknown/UnkStruct_020397f8.hpp @@ -199,36 +199,11 @@ public: MsgProc_Type2(); MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4); - //! TODO: remove the function declarations that are not overridden /* 00 */ virtual ~MsgProc_Type2(); - /* 08 */ /* func_02039228 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; - /* 0c */ /* func_02039578 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; - /* 10 */ /* func_0203e060 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? /* 14 */ /* func_0203c5c4 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; - /* 18 */ /* func_0203e284 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; - /* 1c */ /* func_0203905c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; - /* 20 */ /* func_020390a4 */ virtual void vfunc_20(void) override; - /* 24 */ /* astruct_8::vfunc_24 */ virtual void vfunc_24(void) override; - /* 28 */ /* func_0203e0c8 */ virtual bool vfunc_28(void) override; - /* 2c */ /* func_02038d20 */ virtual void vfunc_2C(void) override; - /* 30 */ /* func_02038ed0 */ virtual void vfunc_30(void) override; - /* 34 */ /* func_02038c34 */ virtual unk32 vfunc_34(unk32 param_2) override; - /* 38 */ /* func_02039570 */ virtual bool vfunc_38(void) override; /* 3c */ /* func_0203c414 */ virtual void vfunc_3C(unk32 param_2) override; /* 40 */ /* func_0203c460 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override; - /* 44 */ /* func_02038f40 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; - /* 48 */ /* func_02038b74 */ virtual void vfunc_48(void) override; /* 4c */ /* func_0203c39c */ virtual void vfunc_4C(void) override; // func_02039a3c? - /* 50 */ /* func_02038f44 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; - /* 54 */ /* func_020392b4 */ virtual void vfunc_54(void) override; - /* 58 */ /* func_02039398 */ virtual void vfunc_58(void) override; - /* 5c */ /* func_02039058 */ virtual void vfunc_5C(void) override; - /* 60 */ /* func_020393a4 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4) override; - /* 64 */ /* func_020393a8 */ virtual void vfunc_64(s16* param_2) override; - /* 68 */ /* func_020393d0 */ virtual unk32 vfunc_68(unk32 param_2) override; - /* 6c */ /* func_0203947c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; - /* 70 */ /* func_020394d8 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; - /* 74 */ //! TODO: vfunc_4C? void func_0203c39c(unk32 param_2, unk32 param_3); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 7a1e0726..f663ad59 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -5,27 +5,30 @@ extern ARM unk32 func_ov000_020d7f18(u32*, unk32); extern ARM unk32 func_02037628(u8*); -extern ARM void func_0203dc74(UnkStruct_02038aa0*, unk32, unk32); -extern u32** data_027e0ce0[]; +extern u32* data_027e0ce0[]; extern u32 data_02056924[]; extern UnkStruct_MsgProc_Base_unk_2C* data_02068e6c; extern UnkStruct_MsgProc_Base_unk_2C* data_02068e8c; extern u16 data_02056918[]; extern ActorTypeId data_0205691c[]; -// this should be `data_027e0ffc->func_ov000_020cec60(u16, Vec3p*, s32);` -extern u32* data_027e0ffc; -extern void func_ov000_020cec60(u32*, u16, Vec3p*, Actor*, unk32); +struct UnkStruct_027e0ffc { + void func_ov000_020cec60(u16, Vec3p*, Actor*, unk32); +}; +extern UnkStruct_027e0ffc* data_027e0ffc; -ARM void UnkStruct_027E0C68::func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3) { +extern u32 data_027e0618[]; + +// non-matching +ARM void UnkStruct_027E0C68::func_0203643c(u32 *param_1, UnkStruct_027E0C68* param_2, u32 param_3) { BMGGroups *pBVar2 = param_2->pGroups; - *param_1 = BMG_GET_MSG_ADDR(pBVar2, param_3); + + *param_1 = ((u32)pBVar2->entries[param_3 >> 0x10].pDAT1 + (pBVar2->entries[param_3 >> 0x10].func_02037258(param_3 & 0xFFFF)->offset & ~1)); } +// non-matching THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 param_4) { - s32 i; - this->mUnk_03 = 0; this->mUnk_0c = 0; @@ -51,40 +54,35 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 break; } - for (i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { - if (this->mUnk_18[i] != NULL) { - this->mUnk_18[i] = NULL; - } + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { + this->mUnk_18[i] = NULL; } - for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { - if (this->mUnk_28[i] != NULL) { - this->mUnk_28[i] = NULL; - } + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + this->mUnk_28[i] = NULL; } - for (i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { - this->mUnk_18[i] = new(*data_027e0ce0[0], 4) UnkStruct_020386d8(); + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { + this->mUnk_18[i] = new(data_027e0ce0[1], 4) UnkStruct_020386d8(); } this->mUnk_18[0]->mUnk_39 = 0; this->mUnk_18[1]->mUnk_39 = 1; - // switch? if (*data_027e0618 == 2 || *data_027e0618 == 3 || *data_027e0618 == 6) { - for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { switch (data_02056924[i + 1]) { case 0: if (*data_027e0618 != 2) { - this->mUnk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_020397f8(); - func_0203dc74(this->mUnk_28[i], 0xE0, 0x40); + this->mUnk_28[i] = new(data_027e0ce0[1], 4) UnkStruct_020397f8(); + this->mUnk_28[i]->func_0203dc74(0xE0, 0x40); this->mUnk_28[i]->mUnk_2c = &data_02068e6c; this->mUnk_28[i]->mUnk_50 = i != 0; } break; case 1: - this->mUnk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type3(); - func_0203dc74(this->mUnk_28[i], 0x50, 0x60); + this->mUnk_28[i] = new(data_027e0ce0[1], 4) MsgProc_Type3(); + this->mUnk_28[i]->func_0203dc74(0x50, 0x60); this->mUnk_28[i]->mUnk_2c = &data_02068e6c; break; case 2: @@ -92,8 +90,8 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 break; case 3: if (func_0202ab48() == 0) { - this->mUnk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type2(); - func_0203dc74(this->mUnk_28[i], 0xC0, 0x20); + this->mUnk_28[i] = new(data_027e0ce0[1], 4) MsgProc_Type2(); + this->mUnk_28[i]->func_0203dc74(0xC0, 0x20); this->mUnk_28[i]->mUnk_2c = &data_02068e8c; } else { this->mUnk_28[i] = NULL; @@ -327,7 +325,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p pActor = gActorManager->GetActor(&actorRef); if (pActor != NULL) { - func_ov000_020cec60(data_027e0ffc, data_02056918[this->mUnk_10], &pActor->mPos, pActor, 0); + data_027e0ffc->func_ov000_020cec60(data_02056918[this->mUnk_10], &pActor->mPos, pActor, 0); } } } @@ -349,7 +347,7 @@ ARM void UnkStruct_027E0C68::func_02036bbc(void) { pSVar3 = this->mUnk_28[i]; if (pSVar3 != NULL && ((bVar2 && pSVar3->mUnk_50 == 0) || (bVar4 && pSVar3->mUnk_50 != 0))) { - pSVar3->vfunc_44(data_027e0d78.mTouchLastX, data_027e0d78.mTouchLastY); + pSVar3->vfunc_44(gTouchControl.mTouchLastX, gTouchControl.mTouchLastY); } } } @@ -416,7 +414,7 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { if (func_0202ab48() == 0 || i != 5) { - this->mUnk_28[i]->func_02038b40(); + this->mUnk_28[i]->UnkStruct_02038aa0::vfunc_10(); } } } diff --git a/src/Main/Message/func_0203c358.cpp b/src/Main/Message/func_0203c358.cpp index 717849ee..329c08fd 100644 --- a/src/Main/Message/func_0203c358.cpp +++ b/src/Main/Message/func_0203c358.cpp @@ -67,14 +67,11 @@ ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) { param_3 += this->mUnk_168; this->func_0203c4ac(param_2 + this->mUnk_16a, param_3 + this->mUnk_16c); - this->func_02038ef4(param_2, param_3); + this->UnkStruct_02038aa0::vfunc_30(param_2, param_3); } -//! TODO: solve vfunc oddities -extern "C" bool func_0203dcb4(unk32); -// non-matching ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) { - return func_0203dcb4(param_2 + this->mUnk_162); + return this->UnkStruct_0203dae0::vfunc_14(param_2 + this->mUnk_162, param_3); } ARM MsgProc_Type2::~MsgProc_Type2() { diff --git a/src/Main/Unknown/UnkStruct_02038aa0.cpp b/src/Main/Unknown/UnkStruct_02038aa0.cpp index 55f0af77..94d37f4c 100644 --- a/src/Main/Unknown/UnkStruct_02038aa0.cpp +++ b/src/Main/Unknown/UnkStruct_02038aa0.cpp @@ -2,6 +2,8 @@ #include "DTCM/UnkStruct_027e103c.hpp" #include "Message/MessageManager.hpp" +extern u32 data_027e0618[]; + ARM UnkStruct_0203881c::UnkStruct_0203881c() { this->mUnk_14 = 0x1000; this->mUnk_18 = 0; @@ -39,7 +41,7 @@ ARM void UnkStruct_02038aa0::vfunc_4c(u32 param1, unk32 param2) { this->UnkStruct_0203dae0::vfunc_10(param1, param2); } -ARM void UnkStruct_02038aa0::vfunc_10(unk32 param1) {} +ARM void UnkStruct_02038aa0::vfunc_10() {} ARM void UnkStruct_02038aa0::func_02038b40() { this->mUnk_15c = -1; @@ -115,7 +117,7 @@ ARM s32 UnkStruct_02038aa0::func_02038d10() { ARM void UnkStruct_02038aa0::vfunc_2c() {} -ARM void UnkStruct_02038aa0::vfunc_30() { +ARM void UnkStruct_02038aa0::vfunc_30(unk32 param_2, unk32 param_3) { if (this->mUnk_15c > 0) { this->func_0203e090(); } else { diff --git a/src/Main/Unknown/UnkStruct_020397f8.cpp b/src/Main/Unknown/UnkStruct_020397f8.cpp index 61c6a44e..3ecaaf6f 100644 --- a/src/Main/Unknown/UnkStruct_020397f8.cpp +++ b/src/Main/Unknown/UnkStruct_020397f8.cpp @@ -8,9 +8,11 @@ extern "C" void func_ov000_020d0460(void*); extern "C" void func_0203efd8(void*, void*); extern "C" void func_0203ee48(void*); +extern "C" void func_ov018_02169634(UnkStruct_020397f8*); extern unk16 data_02056a0e[]; extern u8 data_02056a08[]; +extern u32 data_027e0618[]; THUMB UnkStruct_020397f8::UnkStruct_020397f8() : UnkStruct_02038aa0(0, 0), mUnk_164(NULL) { @@ -402,7 +404,7 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) { } if ((data_02056be4[data_027e077c.mUnk_0] & 2) == 0) { - if ((data_027e0d78.mFlags & 1) != 0) { + if ((gTouchControl.mFlags & 1) != 0) { if (this->mUnk_50 == 0 && data_027e0d38 != 0) { if (func_ov000_02079e04() == 0 && data_027e0e28->func_ov000_0207bc48() == 0) { if (data_027e0618[0x101] == 0 && data_027e103c->mUnk_24 == 0) { @@ -415,12 +417,12 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) { this->mUnk_57f = 1; } } else { - if (data_027e0d78.mTouch != 0) { + if (gTouchControl.mTouch != 0) { this->func_0203a6d0(iVar5, iVar2); return; } - if (data_027e0d78.mTouch == 0) { + if (gTouchControl.mTouch == 0) { switch(this->mUnk_150[1]) { case 3: case 4: @@ -440,7 +442,7 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) { case 2: //! TODO: fixme // if (this->mUnk_164->mUnk_168.mUnk_06 <= 0) { - // if ((data_027e0d78.mFlags & 2) != 0) { + // if ((gTouchControl.mFlags & 2) != 0) { // this->mUnk_128.mUnk_14 = 0; // if (this->func_0203b0bc() != 0) { @@ -455,7 +457,7 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) { case 0: case 1: default: - if ((data_027e0d78.mFlags & 2) != 0) { + if ((gTouchControl.mFlags & 2) != 0) { this->mUnk_128.mUnk_14 = 0; if (this->func_0203b0bc() != 0) { From 30bd3562ab974bc479d75d7dcf6f9cb9845ba724 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Wed, 12 Feb 2025 20:20:34 +0100 Subject: [PATCH 59/64] format --- include/DTCM/UnkStruct_027e103c.hpp | 2 +- include/Item/ItemManager.hpp | 2 +- include/Message/BMG.hpp | 41 ++--- include/Message/MessageManager.hpp | 50 +++--- include/Message/MsgProc.hpp | 50 +++--- include/Unknown/UnkStruct_02032f0c.hpp | 29 ++-- include/Unknown/UnkStruct_02035064.hpp | 12 +- include/Unknown/UnkStruct_02037750.hpp | 6 +- include/Unknown/UnkStruct_02038aa0.hpp | 44 ++--- include/Unknown/UnkStruct_020397f8.hpp | 36 ++-- include/Unknown/UnkStruct_0203dae0.hpp | 17 +- include/Unknown/func_ov000_020d0644.hpp | 2 +- src/00_Core/DTCM/UnkStruct_027e103c.cpp | 2 +- src/Main/Message/BMG.cpp | 58 +++---- src/Main/Message/BmgRelatedFunctions.cpp | 93 +++++----- src/Main/Message/MessageManager.cpp | 133 +++++++------- src/Main/Message/func_0203c358.cpp | 28 ++- src/Main/Message/func_0203c72c.cpp | 24 ++- src/Main/Unknown/UnkStruct_02032f0c.cpp | 18 +- src/Main/Unknown/UnkStruct_02035064.cpp | 6 +- src/Main/Unknown/UnkStruct_02037750.cpp | 81 ++++----- src/Main/Unknown/UnkStruct_02038aa0.cpp | 76 ++++---- src/Main/Unknown/UnkStruct_020397f8.cpp | 211 ++++++++++------------- src/Main/Unknown/UnkStruct_0203dae0.cpp | 24 +-- 24 files changed, 495 insertions(+), 550 deletions(-) diff --git a/include/DTCM/UnkStruct_027e103c.hpp b/include/DTCM/UnkStruct_027e103c.hpp index 96d7ec21..02f58f4c 100644 --- a/include/DTCM/UnkStruct_027e103c.hpp +++ b/include/DTCM/UnkStruct_027e103c.hpp @@ -82,7 +82,7 @@ struct UnkStruct_027e103c { void func_ov000_020cfae8(s32 param1, s32 param2); //! TODO: find out if the type is always `UnkStruct_020397f8*` - void func_ov000_020cfb20(void*); + void func_ov000_020cfb20(void *); void func_ov000_020cfb38(); void func_ov000_020cfb48(); diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 87259d74..58d98e5a 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -9,13 +9,13 @@ extern "C" { #include "types.h" #include "Actor/Navi/ActorNavi.hpp" +#include "DTCM/UnkStruct_027e0d38.hpp" #include "Item/Item.hpp" #include "Player/EquipItem.hpp" #include "Render/ModelRender.hpp" #include "Save/SaveItemManager.hpp" #include "Sound/Sfx.hpp" #include "System/SysNew.hpp" -#include "DTCM/UnkStruct_027e0d38.hpp" #define MAX_HOURGLASS_SECONDS 1500 // 25 minutes #define MAX_AMMO_UPGRADE 2 diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index 1fd03974..b438a0da 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -1,14 +1,15 @@ #pragma once +#include "System/SysNew.hpp" #include "global.h" #include "types.h" -#include "System/SysNew.hpp" #define BMG_MAGIC "MESGbmg1" #define BMG_TAG(a, b, c, d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) #define BMG_GET_INF1(pGroups, flags) ((pGroups)->entries[(flags) >> 0x10].func_02037258((flags) & 0xFFFF)) #define BMG_GET_MSG_OFFSET(pGroups, flags) (BMG_GET_INF1((pGroups), (flags))->offset) -#define BMG_GET_MSG_ADDR(pGroups, flags) ((u32)(pGroups)->entries[(flags) >> 0x10].pDAT1 + (BMG_GET_MSG_OFFSET((pGroups), (flags)) & ~1)) +#define BMG_GET_MSG_ADDR(pGroups, flags) \ + ((u32) (pGroups)->entries[(flags) >> 0x10].pDAT1 + (BMG_GET_MSG_OFFSET((pGroups), (flags)) & ~1)) enum BMGTag { /* "INF1" */ BMG_TAG_INF1 = BMG_TAG('I', 'N', 'F', '1'), @@ -96,14 +97,14 @@ struct SectionINF1 { /* 0c */ u16 groupId; /* 0e */ u8 colorId; /* 0f */ u8 mUnk_0F[0x1]; // alignment padding? - /* 10 */ EntryINF1* entries; + /* 10 */ EntryINF1 *entries; /* 14 */ }; enum InstrType { /* 1 */ FLW1_TYPE_SHOW_MSG = 1, - /* 2 */ FLW1_TYPE_BRANCH = 2, - /* 3 */ FLW1_TYPE_EVENT = 3, + /* 2 */ FLW1_TYPE_BRANCH = 2, + /* 3 */ FLW1_TYPE_EVENT = 3, /* 4 */ }; @@ -145,9 +146,9 @@ struct SectionFLW1 { /* 04 */ u16 numInstructions; /* 08 */ u16 numLabels; /* 0c */ u32 mUnk_0c; // always zero? - /* 10 */ FLW1Instr* instructions; - /* 14 */ s16* flwEntries; - /* 18 */ s8* bmgFileIndices; + /* 10 */ FLW1Instr *instructions; + /* 14 */ s16 *flwEntries; + /* 18 */ s8 *bmgFileIndices; /* 1c */ }; @@ -162,41 +163,41 @@ struct SectionFLI1 { /* 04 */ u16 numEntries; /* 08 */ u16 entrySize; /* 0c */ u32 mUnk_0c; // always zero? - /* 10 */ EntryFLI1* entries; + /* 10 */ EntryFLI1 *entries; /* 14 */ }; struct EntryDAT1 { - /* 00 */ char* text; + /* 00 */ char *text; /* 04 */ }; struct SectionDAT1 { /* 00 */ SectionBase base; - /* 08 */ EntryDAT1* entries; + /* 08 */ EntryDAT1 *entries; /* 0c */ }; struct BMGFileInfo { - /* 00 */ BMGHeader* pHeader; // pointer to the file's header - /* 04 */ SectionINF1* pINF1; // pointer to the data informations (INF -> informations) - /* 08 */ SectionFLW1* pFLW1; // pointer to the message flow data (FLW -> flow) - /* 0c */ SectionFLI1* pFLI1; // pointer to the message flow index table (FLI -> flow index table) - /* 10 */ SectionDAT1* pDAT1; // pointer to the data (DAT -> data) - /* 14 */ BMGHeader* mUnk_14; // same as pHeader (?) + /* 00 */ BMGHeader *pHeader; // pointer to the file's header + /* 04 */ SectionINF1 *pINF1; // pointer to the data informations (INF -> informations) + /* 08 */ SectionFLW1 *pFLW1; // pointer to the message flow data (FLW -> flow) + /* 0c */ SectionFLI1 *pFLI1; // pointer to the message flow index table (FLI -> flow index table) + /* 10 */ SectionDAT1 *pDAT1; // pointer to the data (DAT -> data) + /* 14 */ BMGHeader *mUnk_14; // same as pHeader (?) /* 18 */ s16 mUnk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose) /* 1a */ s16 groupId; // stores the group id /* 1c */ void func_020371b4(); - u16 func_020371c8(u32* pFile, s16 unk_18); - EntryINF1* func_02037258(u16 param_2); + u16 func_020371c8(u32 *pFile, s16 unk_18); + EntryINF1 *func_02037258(u16 param_2); u16 func_0203728c(unk32 param_2); }; class BMGGroups : public SysObject { public: - /* 00 */ BMGFileInfo* entries; // accessed with `groupId` + /* 00 */ BMGFileInfo *entries; // accessed with `groupId` /* 04 */ s32 numEntries; /* 08 */ diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 76a6bc87..28537830 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -3,18 +3,18 @@ #include "global.h" #include "types.h" -#include "System/SysNew.hpp" #include "Message/BMG.hpp" #include "Message/MsgProc.hpp" +#include "System/SysNew.hpp" #include "nds/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 "Unknown/UnkStruct_02038aa0.hpp" +#include "Unknown/UnkStruct_020397f8.hpp" +#include "Unknown/UnkStruct_0203dae0.hpp" class UnkStruct_027E0C68 : public SysObject { public: @@ -24,27 +24,27 @@ public: /* 0x04 */ u8 mUnk_04; /* 0x05 */ u8 mUnk_05; /* 0x06 */ unk16 mUnk_06; - /* 0x08 */ UnkStruct_020397f8* mUnk_08; + /* 0x08 */ UnkStruct_020397f8 *mUnk_08; /* 0x0C */ u8 mUnk_0c; /* 0x0C */ u8 mUnk_0d; /* 0x0C */ unk16 mUnk_0e; /* 0x10 */ unk16 mUnk_10; /* 0x10 */ unk16 mUnk_12; - /* 0x14 */ BMGGroups* pGroups; - /* 0x18 */ UnkStruct_020386d8* mUnk_18[2]; - /* 0x20 */ UnkStruct_02037750* mUnk_20[2]; - /* 0x28 */ UnkStruct_02038aa0* mUnk_28[6]; //! TODO: is it the right type? - /* 0x40 */ UnkStruct_020397f8* mUnk_40[2]; // is array size 6? + /* 0x14 */ BMGGroups *pGroups; + /* 0x18 */ UnkStruct_020386d8 *mUnk_18[2]; + /* 0x20 */ UnkStruct_02037750 *mUnk_20[2]; + /* 0x28 */ UnkStruct_02038aa0 *mUnk_28[6]; //! TODO: is it the right type? + /* 0x40 */ UnkStruct_020397f8 *mUnk_40[2]; // is array size 6? /* 0x48 */ - static void func_0203643c(u32 *param_1, UnkStruct_027E0C68* param_2, u32 param_3); + static void func_0203643c(u32 *param_1, UnkStruct_027E0C68 *param_2, u32 param_3); void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); void func_0203665c(void); UnkStruct_027E0C68(); ~UnkStruct_027E0C68(); - UnkStruct_020397f8* func_020366c4(void); - UnkStruct_020397f8* func_02036700(void); - UnkStruct_020386d8* func_0203673c(void); + UnkStruct_020397f8 *func_020366c4(void); + UnkStruct_020397f8 *func_02036700(void); + UnkStruct_020386d8 *func_0203673c(void); bool func_02036770(u32 param_2); unk32 func_02036798(void); bool func_020367dc(int param_2); @@ -52,23 +52,23 @@ public: bool func_02036808(void); bool func_02036824(void); bool func_02036850(void); - void func_02036888(UnkStruct_020386d8* param_2); - bool func_020368f4(UnkStruct_02037750* 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_020386d8* param_2, unk32 param_3); - bool func_02036d30(UnkStruct_02037750* param_2); - bool func_02036d4c(UnkStruct_02037750* 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); - UnkStruct_02038aa0* func_02036da8(u32 param_2, s16* param_3); + UnkStruct_02038aa0 *func_02036da8(u32 param_2, s16 *param_3); void func_02036edc(u32 param_2, u8 param_3); - UnkStruct_020397f8* func_02036f68(u32 param_2, u8* param_3); - 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); - UnkStruct_02038aa0* func_02037178(UnkSubClass1_02256FF8* param_2); + UnkStruct_020397f8 *func_02036f68(u32 param_2, u8 *param_3); + 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); + UnkStruct_02038aa0 *func_02037178(UnkSubClass1_02256FF8 *param_2); }; extern UnkStruct_027E0C68 data_027e0c68; diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp index efe42b56..bfdbc86b 100644 --- a/include/Message/MsgProc.hpp +++ b/include/Message/MsgProc.hpp @@ -1,7 +1,7 @@ #pragma once -#include "System/SysNew.hpp" #include "Message/BMG.hpp" +#include "System/SysNew.hpp" #include "Unknown/func_ov000_020d0644.hpp" #include "nds/math.h" @@ -19,41 +19,41 @@ typedef struct UnkStruct_0203b264 { class UnkStruct_020397f8_410 { public: - /* 0x00 */ struct UnkStruct_020397f8* mUnk_00; + /* 0x00 */ struct UnkStruct_020397f8 *mUnk_00; /* 0x04 */ void func_0203ec34(void); void func_0203ebe0(void); void func_0203ebf8(void); - void func_0203ec4c(UnkStruct_0203b264* param_2, unk32 param_3, s32 param_4, s32 param_5); + void func_0203ec4c(UnkStruct_0203b264 *param_2, unk32 param_3, s32 param_4, s32 param_5); }; // same as UnkStruct_020397f8_410? class UnkStruct_020397f8_424 { public: - /* 0x00 */ struct UnkStruct_020397f8* mUnk_00; + /* 0x00 */ struct UnkStruct_020397f8 *mUnk_00; /* 0x04 */ void func_0203ee80(unk32); void func_0203ef78(unk16, u16, unk8); void func_0203ef78(unk16); // overload? void func_0203ee48(void); - UnkStruct_0203b264* func_0203eeb0(unk32 param_2, unk32 param_3); + UnkStruct_0203b264 *func_0203eeb0(unk32 param_2, unk32 param_3); }; class UnkStruct_0203dae0_114 : public SysObject { public: /* 0x00 (vtable) */ - /* 0x04 */ unk32* mUnk_04; + /* 0x04 */ unk32 *mUnk_04; /* 0x08 */ UnkStruct_0203dae0_114(); /* 0x00 */ virtual ~UnkStruct_0203dae0_114() override; - /* 0x08 */ virtual unk32 vfunc_08(void*); + /* 0x08 */ virtual unk32 vfunc_08(void *); /* 0x08 */ virtual unk32 vfunc_0c(void); /* 0x0C */ - unk32* func_0203d1b4(void); + unk32 *func_0203d1b4(void); }; struct func_02038f44_param4 { @@ -75,15 +75,15 @@ extern "C" u32 func_01ff9b4c(unk32, unk32); extern "C" unk32 func_0203c084(void); extern "C" unk32 func_ov000_02079e04(void); extern "C" unk32 func_02016fcc(unk32); -extern "C" void func_02032304(unk32*, char*, unk32, unk32, unk32); -extern "C" unk32 func_0202d5b4(char*, char*, unk32, unk32, unk32); +extern "C" void func_02032304(unk32 *, char *, unk32, unk32, unk32); +extern "C" unk32 func_0202d5b4(char *, char *, unk32, unk32, unk32); extern unk32 data_020691a0; -extern unk32* data_02068894; +extern unk32 *data_02068894; extern unk32 data_02056af0; -extern unk32* data_02056a00; -extern char* data_02057f08; // "MSP" -extern char* data_02057eec; // "Menu/UI_main/opening.bin" -extern char* data_02057ed8; // "MSP:opening.nclr" +extern unk32 *data_02056a00; +extern char *data_02057f08; // "MSP" +extern char *data_02057eec; // "Menu/UI_main/opening.bin" +extern char *data_02057ed8; // "MSP:opening.nclr" struct Struct_027e0db0 { /* 0x00 */ unk32 mUnk_00; @@ -110,22 +110,22 @@ extern unk16 data_02056a10[]; extern unk16 data_02056a16[]; extern unk32 data_02056a04[]; extern unk32 data_027e0c38[]; -extern "C" void func_0203489c(unk32, unk16, unk32*, unk32*); -extern "C" void func_020347b0(unk32, unk16, unk32*, unk32*, unk32, unk32); +extern "C" void func_0203489c(unk32, unk16, unk32 *, unk32 *); +extern "C" void func_020347b0(unk32, unk16, unk32 *, unk32 *, unk32, unk32); extern THUMB unk32 func_0202ab48(void); extern "C" void func_02034984(unk32, u8, unk32, unk32); -extern "C" void func_02034698(unk32, unk32, unk32*, unk32*); +extern "C" void func_02034698(unk32, unk32, unk32 *, unk32 *); extern struct TouchControl gTouchControl; class UnkClass_027e0e28 { public: unk32 func_ov000_0207bc48(); }; -extern UnkClass_027e0e28* data_027e0e28; +extern UnkClass_027e0e28 *data_027e0e28; extern u8 data_027e0c54; -extern unk32* data_ov009_0211f5b4; -extern "C" unk32 func_ov003_020f3f94(unk32*); -extern unk32* data_02057ed4; +extern unk32 *data_ov009_0211f5b4; +extern "C" unk32 func_ov003_020f3f94(unk32 *); +extern unk32 *data_02057ed4; // see Actor.cpp typedef struct UnkStruct_01ffbe34 { @@ -152,11 +152,11 @@ struct UnkClass_027e1054_unk_00_unk00 { }; struct UnkClass_027e1054_unk_00 { /* 0x00 */ unk32 mUnk_04; - /* 0x00 */ UnkClass_027e1054_unk_00_unk00* mUnk_00; + /* 0x00 */ UnkClass_027e1054_unk_00_unk00 *mUnk_00; }; class UnkClass_027e1054 { public: - UnkClass_027e1054_unk_00* mUnk_00; + UnkClass_027e1054_unk_00 *mUnk_00; unk32 mUnk_04; void func_ov003_020f4874(void); @@ -181,6 +181,6 @@ extern UnkClass_ov000_027e0d04 data_027e0d04; class UnkClass_data_027e0f7c { public: - u8* func_ov000_0209d90c(s8, s8); + u8 *func_ov000_0209d90c(s8, s8); }; extern UnkClass_data_027e0f7c data_027e0f7c; diff --git a/include/Unknown/UnkStruct_02032f0c.hpp b/include/Unknown/UnkStruct_02032f0c.hpp index 67be855a..ec589e51 100644 --- a/include/Unknown/UnkStruct_02032f0c.hpp +++ b/include/Unknown/UnkStruct_02032f0c.hpp @@ -9,7 +9,7 @@ class UnkStruct_02032e7c : public SysObject { public: /* 00 (vtable) */ - /* 04 */ u16* mUnk_04; // pointer to the current position in the message to display + /* 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; @@ -59,7 +59,7 @@ struct UnkStruct_MsgProc_Base_unk_2C { /* 02 */ s8 mUnk_02; /* 03 */ s8 mUnk_03; /* 04 */ unk32 mUnk_04; - /* 08 */ u8* mUnk_08; + /* 08 */ u8 *mUnk_08; /* 0c */ }; @@ -77,16 +77,16 @@ struct func_0203b410_param1 { class UnkStruct_02032f0c : public SysObject { public: /* 00 (vtable) */ - /* 04 */ unk32* mUnk_04; - /* 08 */ UnkSubClass1_02256FF8* mUnk_08; + /* 04 */ unk32 *mUnk_04; + /* 08 */ UnkSubClass1_02256FF8 *mUnk_08; /* 0c */ u16 *mUnk_0c; - /* 10 */ unk32* mUnk_10; + /* 10 */ unk32 *mUnk_10; /* 14 */ s32 mUnk_14; /* 18 */ s32 mUnk_18; /* 1c */ unk32 mUnk_1c; /* 20 */ unk32 mUnk_20; - /* 24 */ unk32* mUnk_24; - /* 28 */ unk32* mUnk_28; + /* 24 */ unk32 *mUnk_24; + /* 28 */ unk32 *mUnk_28; /* 2c */ UnkStruct_MsgProc_Base_unk_2C **mUnk_2c; /* 30 */ s32 mUnk_30; /* 34 */ s32 mUnk_34; @@ -122,7 +122,8 @@ public: // /* 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); + // /* 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); @@ -137,20 +138,20 @@ public: /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); /* 48 */ virtual void vfunc_48(void); /* 4c */ virtual void vfunc_4C(void); - /* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5); + /* 50 */ virtual void vfunc_50(EntryINF1 *param_2, u32 param_3, s16 *param_4, UnkSubClass1_02256FF8 *param_5); /* 54 */ virtual void vfunc_54(void); /* 58 */ virtual void vfunc_58(void); /* 5c */ virtual void vfunc_5C(void); - /* 60 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4); - /* 64 */ virtual void vfunc_64(s16* param_2); + /* 60 */ virtual void vfunc_60(func_0203b410_param1 *param_2, unk32 param_3, unk32 param_4); + /* 64 */ virtual void vfunc_64(s16 *param_2); /* 68 */ virtual unk32 vfunc_68(unk32 param_2); - /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3); - /* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3); + /* 6c */ virtual void vfunc_6C(unk32 *param_2, unk32 *param_3); + /* 70 */ virtual void vfunc_70(unk32 *param_2, unk32 *param_3); /* 74 */ UnkStruct_02032f0c(); void func_02032f94(); - unk32* func_02032f98(unk32 param_2); + unk32 *func_02032f98(unk32 param_2); u16 **SetUnk_0c(u16 *value); u8 func_02032fa4(); s32 func_02032fb4(); diff --git a/include/Unknown/UnkStruct_02035064.hpp b/include/Unknown/UnkStruct_02035064.hpp index 36f831de..a55b8808 100644 --- a/include/Unknown/UnkStruct_02035064.hpp +++ b/include/Unknown/UnkStruct_02035064.hpp @@ -10,19 +10,19 @@ public: /* 00 (vtable) */ /* 04 */ unk16 mUnk_04; /* 04 */ unk16 mUnk_06; - /* 08 */ u32* mUnk_08; + /* 08 */ u32 *mUnk_08; /* 0c */ unk32 mUnk_0c; /* 10 */ unk32 mUnk_10; /* 14 */ u32 mUnk_14; /* 18 */ unk32 mUnk_18; /* 1c */ unk32 mUnk_1c; - /* 20 */ u32* mUnk_20; + /* 20 */ u32 *mUnk_20; /* 24 */ unk32 mUnk_24; /* 28 */ unk32 mUnk_28; /* 2c */ unk32 mUnk_2c; /* 30 */ unk32 mUnk_30; - /* 34 */ u32* mUnk_34; - /* 38 */ u32* mUnk_38; + /* 34 */ u32 *mUnk_34; + /* 38 */ u32 *mUnk_38; /* 3c */ unk32 mUnk_3c; /* 40 */ unk32 mUnk_40; /* 44 */ unk32 mUnk_44; @@ -34,7 +34,7 @@ public: /* 58 */ unk32 mUnk_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; @@ -52,7 +52,7 @@ public: static u8 func_02035428(u8 param1); - void func_02034a1c(unk32, unk32, struct UnkStruct_01ffbe34*); + 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); diff --git a/include/Unknown/UnkStruct_02037750.hpp b/include/Unknown/UnkStruct_02037750.hpp index 89877998..56cd123e 100644 --- a/include/Unknown/UnkStruct_02037750.hpp +++ b/include/Unknown/UnkStruct_02037750.hpp @@ -23,10 +23,10 @@ public: /* 00 */ virtual ~UnkStruct_02037750(); /* 08 */ virtual void vfunc_08(u32 param1); - /* 0c */ virtual void vfunc_0c(class UnkStruct_020397f8* param1); + /* 0c */ virtual void vfunc_0c(class UnkStruct_020397f8 *param1); /* 10 */ virtual void vfunc_10(); /* 14 */ virtual void vfunc_14(); - /* 18 */ virtual void vfunc_18(unk32* param1); + /* 18 */ virtual void vfunc_18(unk32 *param1); /* 1c */ virtual bool vfunc_1c(); /* 20 */ virtual void vfunc_20(); /* 24 */ virtual bool vfunc_24(unk32 param1); @@ -48,7 +48,7 @@ public: /* 00 */ u8 mUnk_03; /* 04 */ - void func_020376c0(const Vec3p* param_2); + void func_020376c0(const Vec3p *param_2); }; // astruct_15 diff --git a/include/Unknown/UnkStruct_02038aa0.hpp b/include/Unknown/UnkStruct_02038aa0.hpp index 6b53dde3..c0f31f16 100644 --- a/include/Unknown/UnkStruct_02038aa0.hpp +++ b/include/Unknown/UnkStruct_02038aa0.hpp @@ -3,13 +3,13 @@ #include "global.h" #include "types.h" -#include "Unknown/UnkStruct_0203dae0.hpp" -#include "System/SysNew.hpp" -#include "nds/math.h" #include "Message/MsgProc.hpp" +#include "System/SysNew.hpp" +#include "Unknown/UnkStruct_0203dae0.hpp" +#include "nds/math.h" class UnkStruct_02038aa0; -typedef bool (*UnknownCallback)(class UnkStruct_020397f8*); +typedef bool (*UnknownCallback)(class UnkStruct_020397f8 *); class UnkStruct_0203881c : public UnkStruct_02032e7c { public: @@ -17,7 +17,7 @@ public: /* 14 */ unk32 mUnk_14; /* 18 */ unk32 mUnk_18; /* 1c */ UnknownCallback mUnk_1c; - /* 20 */ class UnkStruct_020397f8* mUnk_20; + /* 20 */ class UnkStruct_020397f8 *mUnk_20; /* 24 */ unk32 mUnk_24; /* 28 */ @@ -33,7 +33,7 @@ public: class UnkSubClass1_unk_124 { public: - /* 00 */ void* mUnk_00; // pointer to MsgProc_Main (well, the first members of the base class) + /* 00 */ void *mUnk_00; // pointer to MsgProc_Main (well, the first members of the base class) /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; /* 0c */ unk32 mUnk_0c; @@ -49,7 +49,7 @@ public: /* 2b */ unk8 mUnk_2b; /* 2c */ - void func_0203f020(s16*, unk32); + void func_0203f020(s16 *, unk32); }; struct UnkStruct_0203b264; @@ -60,10 +60,10 @@ class UnkStruct_02038aa0 : public UnkStruct_0203dae0 { public: /* 000 (base) */ /* 123 */ unk8 mUnk_123; - /* 124 */ UnkSubClass1_unk_124* mUnk_124; + /* 124 */ UnkSubClass1_unk_124 *mUnk_124; /* 128 */ UnkStruct_0203881c mUnk_128; /* 150 */ u8 mUnk_150[4]; - /* 154 */ EntryINF1* pInfoEntry; + /* 154 */ EntryINF1 *pInfoEntry; /* 158 */ Vec2s mUnk_158; // textbox position? /* 15c */ s16 mUnk_15c; /* 15e */ s8 mUnk_15e; @@ -72,7 +72,7 @@ public: /* 161 */ /* 00 */ virtual ~UnkStruct_02038aa0(); - /* 08 */ virtual void vfunc_08(s32 param1, unk32* param2, s16 *param3, unk32 param4); + /* 08 */ virtual void vfunc_08(s32 param1, unk32 *param2, s16 *param3, unk32 param4); /* 0c */ virtual void vfunc_0c(u8 param_2, u8 param_3, u8 param_4, unk32 param_5); /* 10 */ virtual void vfunc_10(); /* 1c */ virtual unk32 vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4); @@ -86,10 +86,10 @@ public: /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); /* 48 */ virtual void vfunc_48(); /* 4c */ virtual void vfunc_4c(u32 param1, unk32 param2); - /* 50 */ virtual void vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4); + /* 50 */ virtual void vfunc_50(EntryINF1 *param1, u32 param2, s16 *param3, UnkSubClass1_02256FF8 *param4); /* 54 */ virtual void vfunc_54(); /* 58 */ virtual void vfunc_58(); - /* 5c */ virtual void vfunc_5c(u16* param_2, struct UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5); + /* 5c */ virtual void vfunc_5c(u16 *param_2, struct UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5); /* 60 */ virtual void vfunc_60(); /* 64 */ virtual void vfunc_64(); /* 68 */ virtual s32 vfunc_68(unk32 param1); @@ -102,7 +102,8 @@ public: // /* 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; + // /* 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; @@ -123,20 +124,21 @@ public: void func_02039440(unk32 param1, unk32 param2); bool func_0203951c(); - static void func_020387e0(u8* param_2); + static void func_020387e0(u8 *param_2); unk32 func_02032fb4(void); - u16* func_02037604(u16**); + 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, struct func_02038f44_param4* param_4, UnkSubClass1_02256FF8* param_5, unk32 param_6); + void func_02038f44(EntryINF1 *param_2, u32 param_3, struct 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); + 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_020393a8(s16 *param_2); void func_0203a188(unk32, unk32); unk32 func_0203a3e0(void); unk32 func_0203cb5c(unk8, s16); @@ -147,12 +149,12 @@ public: void func_0203e1b0(unk32, unk32, unk32); //! TODO: not sure it belongs to this class: - + 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); + unk32 func_0203e284(UnkStruct_0203b264 *, unk32, unk32); + void func_0203e2ac(unk32 *param_2); s16 func_0203d318(s16, s16); }; diff --git a/include/Unknown/UnkStruct_020397f8.hpp b/include/Unknown/UnkStruct_020397f8.hpp index ee969e08..668f1922 100644 --- a/include/Unknown/UnkStruct_020397f8.hpp +++ b/include/Unknown/UnkStruct_020397f8.hpp @@ -3,14 +3,14 @@ #include "global.h" #include "types.h" +#include "Message/MsgProc.hpp" +#include "System/SysNew.hpp" #include "Unknown/UnkStruct_02035064.hpp" #include "Unknown/UnkStruct_02038aa0.hpp" -#include "System/SysNew.hpp" -#include "Message/MsgProc.hpp" // does it host both choices? struct UnknownMsgChoiceStruct { - /* 00 */ UnkStruct_0203b264* mUnk_00; + /* 00 */ UnkStruct_0203b264 *mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ }; @@ -22,7 +22,7 @@ class UnkStruct_020397f8 : public UnkStruct_02038aa0 { public: /* 000 (base) */ /* 161 */ unk8 mUnk_161[0x3]; - /* 164 */ UnkStruct_020397f8* mUnk_164; + /* 164 */ UnkStruct_020397f8 *mUnk_164; /* 168 */ UnkStruct_02035064 mUnk_168; /* 1f0 */ UnkStruct_02035064 mUnk_1f0; /* 278 */ UnkStruct_02035064 mUnk_278; @@ -30,7 +30,7 @@ public: /* 388 */ UnkStruct_02035064 mUnk_388; /* 410 */ UnkStruct_020397f8_410 mUnk_410; /* 414 */ unk32 mUnk_414; - /* 418 */ UnkStruct_02038aa0* mUnk_418; + /* 418 */ UnkStruct_02038aa0 *mUnk_418; /* 41c */ unk16 mUnk_41c; /* 41e */ unk16 mUnk_41e; /* 420 */ unk16 mUnk_420; @@ -100,16 +100,16 @@ public: bool func_0203a3e0(); /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); bool func_0203a6d0(unk32 param1, unk32 param2); - /* 50 */ virtual void vfunc_50(EntryINF1* param1, unk32 param2, s32* param3, unk32 param4); + /* 50 */ virtual void vfunc_50(EntryINF1 *param1, unk32 param2, s32 *param3, unk32 param4); /* 54 */ virtual void vfunc_54(); /* 5c */ virtual void vfunc_5c(); /* 58 */ virtual void vfunc_58(); bool func_0203b0bc(); s32 func_0203b0ec(u32 param1); - /* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param1, unk32 param2, unk32 param3); + /* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264 *param1, unk32 param2, unk32 param3); /* 1c */ virtual unk32 vfunc_1c(u16 *param1, UnkStruct_0203b264 *param2, unk8 param3, unk32 param4); - /* 60 */ virtual void vfunc_60(func_0203b410_param1* param1, unk32 param2, unk32 param3); - /* 64 */ virtual void vfunc_64(s16* param1); + /* 60 */ virtual void vfunc_60(func_0203b410_param1 *param1, unk32 param2, unk32 param3); + /* 64 */ virtual void vfunc_64(s16 *param1); void func_0203b764(); /* 20 */ virtual unk32 vfunc_20(s32 param1, s32 *param2); void func_0203bd8c(s32 param1); // void func_0203bd8c(u16 param_2); @@ -119,7 +119,7 @@ public: bool func_0203c084(); bool func_0203c13c(); bool func_0203c1a0(); - static bool func_0203c25c(class UnkStruct_020397f8* param1); + static bool func_0203c25c(class UnkStruct_020397f8 *param1); /* 00 */ virtual ~UnkStruct_020397f8(); /* 38 */ virtual bool vfunc_38(); /* 74 */ @@ -152,12 +152,12 @@ public: MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4); //! TODO: remove the function declarations that are not overridden /* 00 */ virtual ~MsgProc_Type3(); - /* 08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override; + /* 08 */ virtual void vfunc_08(unk32 *param_2, unk32 *param_3) override; /* 0c */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override; /* 10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060? /* 14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override; - /* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override; - /* 1c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override; + /* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264 *param_2, unk32 param_3, unk32 param_4) override; + /* 1c */ virtual unk32 vfunc_1C(u16 *param_2, UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5) override; /* 20 */ virtual void vfunc_20(void) override; /* 24 */ virtual void vfunc_24(void) override; /* 28 */ virtual bool vfunc_28(void) override; @@ -170,15 +170,15 @@ public: /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; /* 48 */ virtual void vfunc_48(void) override; /* 4c */ virtual void vfunc_4C(void) override; // func_02039a3c? - /* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; + /* 50 */ virtual void vfunc_50(EntryINF1 *param_2, u32 param_3, s16 *param_4, UnkSubClass1_02256FF8 *param_5) override; /* 54 */ virtual void vfunc_54(void) override; /* 58 */ virtual void vfunc_58(void) override; /* 5c */ virtual void vfunc_5C(void) override; - /* 60 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4) override; - /* 64 */ virtual void vfunc_64(s16* param_2) override; + /* 60 */ virtual void vfunc_60(func_0203b410_param1 *param_2, unk32 param_3, unk32 param_4) override; + /* 64 */ virtual void vfunc_64(s16 *param_2) override; /* 68 */ virtual unk32 vfunc_68(unk32 param_2) override; - /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; - /* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; + /* 6c */ virtual void vfunc_6C(unk32 *param_2, unk32 *param_3) override; + /* 70 */ virtual void vfunc_70(unk32 *param_2, unk32 *param_3) override; /* 74 */ static void func_0203c83c(void); diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp index 864320ef..5315c958 100644 --- a/include/Unknown/UnkStruct_0203dae0.hpp +++ b/include/Unknown/UnkStruct_0203dae0.hpp @@ -3,8 +3,8 @@ #include "global.h" #include "types.h" -#include "Unknown/UnkStruct_02032f0c.hpp" #include "Message/MsgProc.hpp" +#include "Unknown/UnkStruct_02032f0c.hpp" class UnkStruct_0203dae0_114; @@ -90,7 +90,8 @@ public: // /* 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; + // /* 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; @@ -106,15 +107,15 @@ public: /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override; /* 48 */ virtual void vfunc_48(void) override; /* 4c */ virtual void vfunc_4C(void) override; // func_02039a3c? - /* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override; + /* 50 */ virtual void vfunc_50(EntryINF1 *param_2, u32 param_3, s16 *param_4, UnkSubClass1_02256FF8 *param_5) override; /* 54 */ virtual void vfunc_54(void) override; /* 58 */ virtual void vfunc_58(void) override; /* 5c */ virtual void vfunc_5C(void) override; - /* 60 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4) override; - /* 64 */ virtual void vfunc_64(s16* param_2) override; + /* 60 */ virtual void vfunc_60(func_0203b410_param1 *param_2, unk32 param_3, unk32 param_4) override; + /* 64 */ virtual void vfunc_64(s16 *param_2) override; /* 68 */ virtual unk32 vfunc_68(unk32 param_2) override; - /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override; - /* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override; + /* 6c */ virtual void vfunc_6C(unk32 *param_2, unk32 *param_3) override; + /* 70 */ virtual void vfunc_70(unk32 *param_2, unk32 *param_3) override; /* 74 */ UnkStruct_0203dae0(u8 param1); @@ -122,7 +123,7 @@ public: 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); - unk32* func_0203ddec(); + unk32 *func_0203ddec(); void func_0203ddfc(); void func_0203de14(); s32 func_0203de24(); diff --git a/include/Unknown/func_ov000_020d0644.hpp b/include/Unknown/func_ov000_020d0644.hpp index 677169a4..74b88be3 100644 --- a/include/Unknown/func_ov000_020d0644.hpp +++ b/include/Unknown/func_ov000_020d0644.hpp @@ -1,7 +1,7 @@ #pragma once -#include "global.h" #include "System/SysNew.hpp" +#include "global.h" class UnkClass_func_ov000_020d0644 { public: diff --git a/src/00_Core/DTCM/UnkStruct_027e103c.cpp b/src/00_Core/DTCM/UnkStruct_027e103c.cpp index 98df9114..e455c9c9 100644 --- a/src/00_Core/DTCM/UnkStruct_027e103c.cpp +++ b/src/00_Core/DTCM/UnkStruct_027e103c.cpp @@ -59,7 +59,7 @@ void UnkStruct_027e103c::func_ov000_020cfa70(s32 param1, s32 param2) {} unk8 UnkStruct_027e103c::func_ov000_020cfab0() {} void UnkStruct_027e103c::func_ov000_020cfabc(s32 param1, s32 param2) {} void UnkStruct_027e103c::func_ov000_020cfae8(s32 param1, s32 param2) {} -void UnkStruct_027e103c::func_ov000_020cfb20(void* param1) {} +void UnkStruct_027e103c::func_ov000_020cfb20(void *param1) {} void UnkStruct_027e103c::func_ov000_020cfb38() {} void UnkStruct_027e103c::func_ov000_020cfb48() {} void UnkStruct_027e103c::func_ov000_020cfb58() {} diff --git a/src/Main/Message/BMG.cpp b/src/Main/Message/BMG.cpp index 15fab32a..cb9deac8 100644 --- a/src/Main/Message/BMG.cpp +++ b/src/Main/Message/BMG.cpp @@ -3,15 +3,15 @@ extern "C" { } #include "Message/BMG.hpp" -char* func_0202ab38(u32* lang); -u32* func_0202d550(int, u32*, char* path, int, int, int); -void func_0202d590(BMGHeader*); +char *func_0202ab38(u32 *lang); +u32 *func_0202d550(int, u32 *, char *path, int, int, int); +void func_0202d590(BMGHeader *); extern u32 *data_027e0ce0[]; extern u32 data_027e05f4; // language -extern u32* data_ov002_0210016c; +extern u32 *data_ov002_0210016c; -static char* sBMGFileNames[BMG_FILE_INDEX_MAX] = { +static char *sBMGFileNames[BMG_FILE_INDEX_MAX] = { "system", // BMG_FILE_INDEX_SYSTEM "regular", // BMG_FILE_INDEX_REGULAR "battle", // BMG_FILE_INDEX_BATTLE @@ -50,26 +50,26 @@ static char* sBMGFileNames[BMG_FILE_INDEX_MAX] = { THUMB void BMGFileInfo::func_020371b4() { this->pHeader = NULL; - this->pINF1 = NULL; - this->pFLW1 = NULL; - this->pFLI1 = NULL; - this->pDAT1 = NULL; + this->pINF1 = NULL; + this->pFLW1 = NULL; + this->pFLI1 = NULL; + this->pDAT1 = NULL; this->mUnk_14 = NULL; this->mUnk_18 = 0; } // non-matching (equivalent) -THUMB u16 BMGFileInfo::func_020371c8(u32* pFile, s16 unk_18) { - SectionBase* pSection; +THUMB u16 BMGFileInfo::func_020371c8(u32 *pFile, s16 unk_18) { + SectionBase *pSection; u16 groupId; u32 i; - BMGHeader* pHeader = (BMGHeader*)pFile; + BMGHeader *pHeader = (BMGHeader *) pFile; - groupId = -1; + groupId = -1; this->mUnk_14 = pHeader; this->mUnk_18 = unk_18; this->pHeader = pHeader; - pSection = (SectionBase*)((u8*)pFile + sizeof(BMGHeader)); + pSection = (SectionBase *) ((u8 *) pFile + sizeof(BMGHeader)); for (i = 0; i < this->mUnk_14->numSections; i++) { switch (pSection->tag) { @@ -80,31 +80,27 @@ THUMB u16 BMGFileInfo::func_020371c8(u32* pFile, s16 unk_18) { // unused break; case BMG_TAG_INF1: - this->pINF1 = (SectionINF1*)pSection; - groupId = this->pINF1->groupId; + this->pINF1 = (SectionINF1 *) pSection; + groupId = this->pINF1->groupId; break; case BMG_TAG_DAT1: //! TODO: fake? - this->pDAT1 = (SectionDAT1*)(pSection + 1); - break; - case BMG_TAG_FLW1: - this->pFLW1 = (SectionFLW1*)pSection; - break; - case BMG_TAG_FLI1: - this->pFLI1 = (SectionFLI1*)pSection; + this->pDAT1 = (SectionDAT1 *) (pSection + 1); break; + case BMG_TAG_FLW1: this->pFLW1 = (SectionFLW1 *) pSection; break; + case BMG_TAG_FLI1: this->pFLI1 = (SectionFLI1 *) pSection; break; } - pSection = (SectionBase*)((u8*)pSection + pSection->size); + pSection = (SectionBase *) ((u8 *) pSection + pSection->size); } return groupId; } -ARM EntryINF1* BMGFileInfo::func_02037258(u16 param_2) { +ARM EntryINF1 *BMGFileInfo::func_02037258(u16 param_2) { if (this->pINF1 != NULL) { if (param_2 < this->pINF1->numEntries) { - return (EntryINF1*)((u32)&this->pINF1->entries + this->pINF1->entrySize * param_2); + return (EntryINF1 *) ((u32) & this->pINF1->entries + this->pINF1->entrySize * param_2); } return NULL; @@ -115,8 +111,8 @@ ARM EntryINF1* BMGFileInfo::func_02037258(u16 param_2) { // non-matching ARM u16 BMGFileInfo::func_0203728c(unk32 param_2) { - SectionFLI1* pFLI1; - EntryFLI1* entry; + SectionFLI1 *pFLI1; + EntryFLI1 *entry; u32 i; u16 j; @@ -151,7 +147,7 @@ ARM u16 BMGFileInfo::func_0203728c(unk32 param_2) { THUMB void BMGGroups::func_020372f0(BMGFileIndex eIndex, s16 unk_18) { char bmgPath[64]; BMGFileInfo bmgFile; - u32* pFile; + u32 *pFile; u16 groupId; // path to the bmg file for the current language (i.e.: "English/Message/battle.bmg") @@ -180,8 +176,8 @@ THUMB void BMGGroups::func_020372f0(BMGFileIndex eIndex, s16 unk_18) { bmgFile.func_020371b4(); // assign sections and set the file info in the groups entries - groupId = bmgFile.func_020371c8(pFile, unk_18); - this->entries[groupId] = bmgFile; + groupId = bmgFile.func_020371c8(pFile, unk_18); + this->entries[groupId] = bmgFile; this->entries[groupId].groupId = groupId; } diff --git a/src/Main/Message/BmgRelatedFunctions.cpp b/src/Main/Message/BmgRelatedFunctions.cpp index cc8da5b6..579d5fe9 100644 --- a/src/Main/Message/BmgRelatedFunctions.cpp +++ b/src/Main/Message/BmgRelatedFunctions.cpp @@ -5,64 +5,65 @@ extern "C" { #include "global.h" #include "types.h" -THUMB void func_0202d3bc(int param_1, unsigned int* param_2, char* path, int param_4, int param_5, bool param_6, int param_7, int param_8) { +THUMB void func_0202d3bc(int param_1, unsigned int *param_2, char *path, int param_4, int param_5, bool param_6, int param_7, + int param_8) { /* - bool bVar1; - dword dVar2; - int iVar3; - dword *pdVar4; - uint uVar5; - dword local_64; - astruct_3 aStack_60; - dword *pdStack_18; - - pdVar4 = (dword *)(uint)param_4; - *(char **)PTR_DWORD_0202d46c = path; - local_64 = DWORD_0202d470; - if (pdVar4 != (dword *)0x0) { - *pdVar4 = DWORD_0202d470; - } - pdStack_18 = pdVar4; - astruct_3(&aStack_60); - bVar1 = FUN_02041e7c(&aStack_60,path); - if (bVar1) { - uVar5 = aStack_60._40_4_ - aStack_60._36_4_; - if (uVar5 != 0) { - if (param_6) { - local_64 = FUN_0202d23c(&aStack_60,param_1,param_2,param_5,0,uVar5,pdVar4,param_7,param_8); - } - else { - if (param_7 == 0) { - dVar2 = FUN_0202d1c4(param_1,param_2,uVar5,param_5); + bool bVar1; + dword dVar2; + int iVar3; + dword *pdVar4; + uint uVar5; + dword local_64; + astruct_3 aStack_60; + dword *pdStack_18; + + pdVar4 = (dword *)(uint)param_4; + *(char **)PTR_DWORD_0202d46c = path; + local_64 = DWORD_0202d470; + if (pdVar4 != (dword *)0x0) { + *pdVar4 = DWORD_0202d470; + } + pdStack_18 = pdVar4; + astruct_3(&aStack_60); + bVar1 = FUN_02041e7c(&aStack_60,path); + if (bVar1) { + uVar5 = aStack_60._40_4_ - aStack_60._36_4_; + if (uVar5 != 0) { + if (param_6) { + local_64 = FUN_0202d23c(&aStack_60,param_1,param_2,param_5,0,uVar5,pdVar4,param_7,param_8); } else { - dVar2 = 0; - if (uVar5 <= param_8) { - dVar2 = param_7; - } - } - if (dVar2 != 0) { - iVar3 = astruct_3::FUN_02041fa4(&aStack_60,dVar2,uVar5); - if (iVar3 == -1) { - if (param_7 == 0) { - FUN_0202d21c(dVar2); - } + if (param_7 == 0) { + dVar2 = FUN_0202d1c4(param_1,param_2,uVar5,param_5); } else { - local_64 = dVar2; - if (pdVar4 != (dword *)0x0) { - *pdVar4 = uVar5; + dVar2 = 0; + if (uVar5 <= param_8) { + dVar2 = param_7; + } + } + if (dVar2 != 0) { + iVar3 = astruct_3::FUN_02041fa4(&aStack_60,dVar2,uVar5); + if (iVar3 == -1) { + if (param_7 == 0) { + FUN_0202d21c(dVar2); + } + } + else { + local_64 = dVar2; + if (pdVar4 != (dword *)0x0) { + *pdVar4 = uVar5; + } } } } } + astruct_3::FUN_02041ea8(&aStack_60); } - astruct_3::FUN_02041ea8(&aStack_60); - } - return local_64;*/ + return local_64;*/ } -THUMB void func_0202d550(int param_1, unsigned int* param_2, char* path, int param_4, int param_5, bool param_6) { +THUMB void func_0202d550(int param_1, unsigned int *param_2, char *path, int param_4, int param_5, bool param_6) { func_0202d3bc(param_1, param_2, path, param_4, param_5, param_6, 0, 0); } diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index f663ad59..a1a5da09 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -3,28 +3,29 @@ #include "Player/TouchControl.hpp" #include "System/SysNew.hpp" -extern ARM unk32 func_ov000_020d7f18(u32*, unk32); -extern ARM unk32 func_02037628(u8*); +extern ARM unk32 func_ov000_020d7f18(u32 *, unk32); +extern ARM unk32 func_02037628(u8 *); -extern u32* data_027e0ce0[]; +extern u32 *data_027e0ce0[]; extern u32 data_02056924[]; -extern UnkStruct_MsgProc_Base_unk_2C* data_02068e6c; -extern UnkStruct_MsgProc_Base_unk_2C* data_02068e8c; +extern UnkStruct_MsgProc_Base_unk_2C *data_02068e6c; +extern UnkStruct_MsgProc_Base_unk_2C *data_02068e8c; extern u16 data_02056918[]; extern ActorTypeId data_0205691c[]; struct UnkStruct_027e0ffc { - void func_ov000_020cec60(u16, Vec3p*, Actor*, unk32); + void func_ov000_020cec60(u16, Vec3p *, Actor *, unk32); }; -extern UnkStruct_027e0ffc* data_027e0ffc; +extern UnkStruct_027e0ffc *data_027e0ffc; extern u32 data_027e0618[]; // non-matching -ARM void UnkStruct_027E0C68::func_0203643c(u32 *param_1, UnkStruct_027E0C68* param_2, u32 param_3) { +ARM void UnkStruct_027E0C68::func_0203643c(u32 *param_1, UnkStruct_027E0C68 *param_2, u32 param_3) { BMGGroups *pBVar2 = param_2->pGroups; - *param_1 = ((u32)pBVar2->entries[param_3 >> 0x10].pDAT1 + (pBVar2->entries[param_3 >> 0x10].func_02037258(param_3 & 0xFFFF)->offset & ~1)); + *param_1 = ((u32) pBVar2->entries[param_3 >> 0x10].pDAT1 + + (pBVar2->entries[param_3 >> 0x10].func_02037258(param_3 & 0xFFFF)->offset & ~1)); } // non-matching @@ -47,11 +48,8 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2); this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLECOMMON, 2); break; - case 7: - this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2); - break; - default: - break; + case 7: this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2); break; + default: break; } for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { @@ -85,9 +83,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 this->mUnk_28[i]->func_0203dc74(0x50, 0x60); this->mUnk_28[i]->mUnk_2c = &data_02068e6c; break; - case 2: - this->mUnk_28[i] = NULL; - break; + case 2: this->mUnk_28[i] = NULL; break; case 3: if (func_0202ab48() == 0) { this->mUnk_28[i] = new(data_027e0ce0[1], 4) MsgProc_Type2(); @@ -97,8 +93,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 this->mUnk_28[i] = NULL; } break; - default: - break; + default: break; } if (this->mUnk_28[i] != NULL) { @@ -129,30 +124,30 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) { } // non-matching -ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_020366c4(void) { +ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_020366c4(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { - return (UnkStruct_020397f8*)this->mUnk_28[2]; + return (UnkStruct_020397f8 *) this->mUnk_28[2]; } - return (UnkStruct_020397f8*)this->mUnk_28[0]; + return (UnkStruct_020397f8 *) this->mUnk_28[0]; } // non-matching -ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036700(void) { +ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036700(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { - return (UnkStruct_020397f8*)this->mUnk_28[0]; + return (UnkStruct_020397f8 *) this->mUnk_28[0]; } - return (UnkStruct_020397f8*)this->mUnk_28[2]; + return (UnkStruct_020397f8 *) this->mUnk_28[2]; } -ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_0203673c(void) { +ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_0203673c(void) { bool iVar1 = this->func_02036824(); bool iVar2 = this->func_02036850(); if (iVar1) { return this->mUnk_18[0]; - } + } if (iVar2) { return this->mUnk_18[1]; @@ -188,21 +183,19 @@ ARM bool UnkStruct_027E0C68::func_020367dc(int param_2) { } ARM bool UnkStruct_027E0C68::func_020367ec(void) { - return ((UnkStruct_020397f8*)this->mUnk_28[0])->mUnk_15c > 0; + return ((UnkStruct_020397f8 *) this->mUnk_28[0])->mUnk_15c > 0; } ARM bool UnkStruct_027E0C68::func_02036808(void) { - return ((UnkStruct_020397f8*)this->mUnk_28[2])->mUnk_15c > 0; + return ((UnkStruct_020397f8 *) this->mUnk_28[2])->mUnk_15c > 0; } ARM bool UnkStruct_027E0C68::func_02036824(void) { switch (data_027e077c.mUnk_0) { case 0x01: case 0x37: - case 0x3B: - return true; - default: - break; + case 0x3B: return true; + default: break; } return false; @@ -213,9 +206,9 @@ 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_020386d8* param_2) { +ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8 *param_2) { if ((param_2->mUnk_18 & ~0xFFFF) != (0x100 << 0x10)) { - UnkStruct_020397f8* iVar1 = this->func_020366c4(); + UnkStruct_020397f8 *iVar1 = this->func_020366c4(); if (iVar1->mUnk_15c <= 0) { param_2->vfunc_10(); @@ -225,7 +218,7 @@ ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8* param_2) { } } -ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750* param_2) { +ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750 *param_2) { if (this->mUnk_20[1] != NULL) { return false; } @@ -236,11 +229,11 @@ ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750* param_2) { // non-matching ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { - UnkStruct_020397f8* unk_28_0; - UnkStruct_020397f8* unk_28_2; + UnkStruct_020397f8 *unk_28_0; + UnkStruct_020397f8 *unk_28_2; UnkStruct_02038aa0 *pSVar4; ActorRef actorRef; - Actor* pActor; + Actor *pActor; bool iVar1; bool iVar2; s32 i; @@ -251,10 +244,10 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p this->mUnk_40[1] = this->mUnk_40[0]; - unk_28_0 = (UnkStruct_020397f8*)this->mUnk_28[0]; + unk_28_0 = (UnkStruct_020397f8 *) this->mUnk_28[0]; if (unk_28_0 != NULL && unk_28_0->mUnk_15c > 0) { - unk_28_2 = (UnkStruct_020397f8*)this->mUnk_28[2]; + unk_28_2 = (UnkStruct_020397f8 *) this->mUnk_28[2]; if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) { this->mUnk_40[0] = this->func_020366c4(); @@ -262,7 +255,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p this->mUnk_40[0] = unk_28_2; } } else { - unk_28_2 = (UnkStruct_020397f8*)this->mUnk_28[2]; + unk_28_2 = (UnkStruct_020397f8 *) this->mUnk_28[2]; if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) { this->mUnk_40[0] = unk_28_0; @@ -305,7 +298,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p this->mUnk_04 = 1; //! TODO: fake? - pSVar4 = this->func_02037178((UnkSubClass1_02256FF8*)this->mUnk_18[0]); + pSVar4 = this->func_02037178((UnkSubClass1_02256FF8 *) this->mUnk_18[0]); if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->mUnk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { this->mUnk_04 = 0; @@ -331,7 +324,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p } ARM void UnkStruct_027E0C68::func_02036bbc(void) { - UnkStruct_02038aa0* pSVar3; + UnkStruct_02038aa0 *pSVar3; bool bVar2; bool bVar4; s32 i; @@ -366,7 +359,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { - UnkStruct_02038aa0* pSVar1 = this->mUnk_28[i]; + UnkStruct_02038aa0 *pSVar1 = this->mUnk_28[i]; if (pSVar1 != NULL) { pSVar1->vfunc_3C(param_2); @@ -374,7 +367,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { } } -ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8* param_2, unk32 param_3) { +ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8 *param_2, unk32 param_3) { u32 uVar1; if (param_3 == 0) { @@ -391,7 +384,7 @@ ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8* param_2, unk32 pa return false; } -ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750* param_2) { +ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750 *param_2) { if (this->mUnk_20[0] != NULL && this->mUnk_20[0] != param_2) { return false; } @@ -400,7 +393,7 @@ ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750* param_2) { return true; } -ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750* param_2) { +ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750 *param_2) { if (this->mUnk_20[0] == param_2) { this->mUnk_20[0] = NULL; return true; @@ -420,7 +413,7 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { } // non-matching -ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) { +ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02036da8(u32 param_2, s16 *param_3) { EntryINF1 *pEVar1; EntryINF1 *pEVar2; UnkStruct_02038aa0 *pSVar4; @@ -429,7 +422,7 @@ ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* para s16 iStack_38; int iStack_34; int iStack_30; - + pEVar1 = this->pGroups->entries[param_2 >> 0x10].func_02037258(param_2 & 0xFFFF); if (pEVar1 == NULL) { @@ -438,7 +431,7 @@ ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* para if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { pSVar4 = this->mUnk_28[4]; - func_02037628((u8*)&iStack_38); + func_02037628((u8 *) &iStack_38); // ??? bVar6 = (data_02056be4[data_027e077c.mUnk_0] & 1) == 0; @@ -454,10 +447,10 @@ ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* para // iStack_30 = param_3[2]; pBVar5 = this->pGroups; // pSVar4->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1); - BMGFileInfo* entry = &(pBVar5)->entries[(param_2) >> 0x10]; - // pSVar4->vfunc_50(pEVar1, + BMGFileInfo *entry = &(pBVar5)->entries[(param_2) >> 0x10]; + // pSVar4->vfunc_50(pEVar1, // ((u32)entry->pDAT1 + (((entry.func_02037258((((param_2))) & 0xFFFF))->offset) & ~1)), - // // BMG_GET_MSG_ADDR(pBVar5, param_2), + // // BMG_GET_MSG_ADDR(pBVar5, param_2), // (s16*)&iStack_38, 1); data_ov000_020eec9c.func_ov000_020d77e4(0x1C); @@ -482,7 +475,7 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { auStack_28[21] = local_13; auStack_28[20] = param_3; - pSVar1 = this->func_02036f68(param_2, auStack_28); + pSVar1 = this->func_02036f68(param_2, auStack_28); if (pSVar1 != NULL) { if (this->mUnk_04 == 0) { @@ -492,13 +485,13 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { } // non-matching -ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) { +ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036f68(u32 param_2, u8 *param_3) { EntryINF1 *pEVar1; UnkStruct_02038aa0 *pSVar2; EntryINF1 *pEVar3; int iVar4; UnkStruct_020397f8 *pSVar5; - + pEVar1 = this->pGroups->entries[param_2 >> 0x10].func_02037258(param_2 & 0xffff); if (pEVar1 == NULL) { @@ -506,35 +499,36 @@ ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param } if (param_3[21] != 0) { - pSVar5 = (UnkStruct_020397f8*)this->mUnk_28[2]; + pSVar5 = (UnkStruct_020397f8 *) this->mUnk_28[2]; pSVar2 = this->mUnk_28[3]; } else { - pSVar5 = (UnkStruct_020397f8*)this->mUnk_28[0]; + pSVar5 = (UnkStruct_020397f8 *) this->mUnk_28[0]; pSVar2 = this->mUnk_28[1]; } //! TODO: fake? - pSVar5->mUnk_164 = (UnkStruct_020397f8*)pSVar2; + pSVar5->mUnk_164 = (UnkStruct_020397f8 *) pSVar2; pSVar5->mUnk_418 = this->mUnk_28[5]; - pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s32*)param_3, 0); + pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s32 *) param_3, 0); if (data_ov000_020eec9c.func_ov000_020d7f18(0x19) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x18) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x34) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x35) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x1A) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x1B) == 0 && - (param_3[12]) != 7) { + (param_3[12]) != 7) + { data_ov000_020eec9c.func_ov000_020d77e4(0x1C); } return pSVar5; } -ARM UnkStruct_020386d8* 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_020386d8* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { - UnkStruct_020386d8* 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->mUnk_18[0]; @@ -557,8 +551,8 @@ ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 p return NULL; } -ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { - UnkStruct_02038aa0* pSVar1; +ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8 *param_2) { + UnkStruct_02038aa0 *pSVar1; pSVar1 = this->func_02037178(param_2); @@ -567,7 +561,7 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) { } } -ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) { +ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8 *param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { @@ -579,5 +573,4 @@ ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* return NULL; } -ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() { -} +ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() {} diff --git a/src/Main/Message/func_0203c358.cpp b/src/Main/Message/func_0203c358.cpp index 329c08fd..ee80f15e 100644 --- a/src/Main/Message/func_0203c358.cpp +++ b/src/Main/Message/func_0203c358.cpp @@ -1,17 +1,16 @@ -#include "global.h" -#include "Message/MsgProc.hpp" -#include "Message/MessageManager.hpp" -#include "Save/AdventureFlags.hpp" #include "DTCM/UnkStruct_027e103c.hpp" -#include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" +#include "Message/MessageManager.hpp" +#include "Message/MsgProc.hpp" +#include "Player/TouchControl.hpp" +#include "Save/AdventureFlags.hpp" #include "System/SysNew.hpp" +#include "global.h" -extern "C" void func_0203fc78(unk32*, unk32*); +extern "C" void func_0203fc78(unk32 *, unk32 *); THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) : - UnkStruct_02038aa0(0, 0) -{ + UnkStruct_02038aa0(0, 0) { this->mUnk_162 = 4; this->mUnk_164 = 1; this->mUnk_166 = 0; @@ -28,21 +27,21 @@ THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) { s16 uVar3; s32 iVar4; s32 local_20; - s32 local_1c [2]; - + s32 local_1c[2]; + this->func_02038b28(); uVar3 = 0; for (iVar4 = 0; iVar4 < 2; iVar4++) { local_1c[0] = 0xC0; - local_20 = 0x10; + local_20 = 0x10; if (iVar4 != 0) { func_0203fc78(local_1c, &local_20); } - uVar1 = this->func_0203d318((s32)(local_1c[0] + 7 + ((u32)(local_1c[0] + 7 >> 2) >> 0x1D)) >> 3, - (s32)(local_20 + 7 + ((u32)(local_20 + 7 >> 2) >> 0x1D)) >> 3); + uVar1 = this->func_0203d318((s32) (local_1c[0] + 7 + ((u32) (local_1c[0] + 7 >> 2) >> 0x1D)) >> 3, + (s32) (local_20 + 7 + ((u32) (local_20 + 7 >> 2) >> 0x1D)) >> 3); if (uVar3 < uVar1) { uVar3 = uVar1; @@ -74,5 +73,4 @@ ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) { return this->UnkStruct_0203dae0::vfunc_14(param_2 + this->mUnk_162, param_3); } -ARM MsgProc_Type2::~MsgProc_Type2() { -} +ARM MsgProc_Type2::~MsgProc_Type2() {} diff --git a/src/Main/Message/func_0203c72c.cpp b/src/Main/Message/func_0203c72c.cpp index 9c5282f1..b61c35be 100644 --- a/src/Main/Message/func_0203c72c.cpp +++ b/src/Main/Message/func_0203c72c.cpp @@ -1,18 +1,17 @@ -#include "global.h" -#include "Message/MsgProc.hpp" -#include "Message/MessageManager.hpp" -#include "Save/AdventureFlags.hpp" #include "DTCM/UnkStruct_027e103c.hpp" -#include "Player/TouchControl.hpp" #include "Item/ItemManager.hpp" +#include "Message/MessageManager.hpp" +#include "Message/MsgProc.hpp" +#include "Player/TouchControl.hpp" +#include "Save/AdventureFlags.hpp" #include "System/SysNew.hpp" +#include "global.h" -extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void*, void*); +extern "C" void func_0204f614(UnkClass_func_ov000_020d0644 *, unk32, unk32, void *, void *); // non-matching ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) : - UnkStruct_02038aa0(1, 0) -{ + UnkStruct_02038aa0(1, 0) { this->mUnk_162 = 1; this->mUnk_164 = 0x1A; this->mUnk_166 = 0xA6; @@ -23,7 +22,8 @@ ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) : this->mUnk_172 = -1; this->mUnk_174 = -1; - func_0204f614(this->mUnk_180, ARRAY_LEN(this->mUnk_180), sizeof(UnkClass_func_ov000_020d0644), UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c); + func_0204f614(this->mUnk_180, ARRAY_LEN(this->mUnk_180), sizeof(UnkClass_func_ov000_020d0644), + UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c); this->mUnk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0); this->mUnk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0); @@ -31,8 +31,6 @@ ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) : this->mUnk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0); } -ARM void MsgProc_Type3::func_0203c83c(void) { -} +ARM void MsgProc_Type3::func_0203c83c(void) {} -ARM MsgProc_Type3::~MsgProc_Type3() { -} +ARM MsgProc_Type3::~MsgProc_Type3() {} diff --git a/src/Main/Unknown/UnkStruct_02032f0c.cpp b/src/Main/Unknown/UnkStruct_02032f0c.cpp index f95b7df3..16e22b29 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 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 "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() { @@ -42,8 +42,7 @@ THUMB UnkStruct_02032f0c::UnkStruct_02032f0c() { this->mUnk_34 = 3; } -THUMB UnkStruct_02032f0c::~UnkStruct_02032f0c() { -} +THUMB UnkStruct_02032f0c::~UnkStruct_02032f0c() {} ARM void UnkStruct_02032f0c::func_02032f94() {} @@ -64,9 +63,9 @@ ARM s32 UnkStruct_02032f0c::func_02032fb4() { ARM bool UnkStruct_02032f0c::vfunc_14(s32 param1, s32 param2) { s16 iVar1; s16 iVar2; - - iVar1 = ((param1 + 0x7 + ((param1 + 0x7) >> 0x1D)) ) * 0x8; - iVar2 = ((param2 + 0x7 + ((param2 + 0x7) >> 0x1D)) ) * 0x8; + + iVar1 = ((param1 + 0x7 + ((param1 + 0x7) >> 0x1D))) * 0x8; + iVar2 = ((param2 + 0x7 + ((param2 + 0x7) >> 0x1D))) * 0x8; this->mUnk_4a = param1; this->mUnk_4c = param2; this->mUnk_14 = (iVar1 + (iVar1 >> 0x1D)) * 0x2000 >> 0x10; @@ -107,5 +106,4 @@ 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 151cdf8c..7a9646f4 100644 --- a/src/Main/Unknown/UnkStruct_02035064.cpp +++ b/src/Main/Unknown/UnkStruct_02035064.cpp @@ -11,11 +11,9 @@ ARM UnkStruct_02035064::UnkStruct_02035064() { this->mUnk_87 = 0; } -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) {} diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp index 9abe3745..f6e739b5 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -1,13 +1,13 @@ #include "Unknown/UnkStruct_02037750.hpp" -#include "Message/MessageManager.hpp" -#include "System/Random.hpp" -#include "Save/AdventureFlags.hpp" #include "Actor/ActorManager.hpp" #include "Item/ItemManager.hpp" +#include "Message/MessageManager.hpp" +#include "Save/AdventureFlags.hpp" +#include "System/Random.hpp" -extern "C" ARM unk32 func_02037628(u8*); -extern u8* data_027e0d54; -extern unk32* data_027e0cb4; +extern "C" ARM unk32 func_02037628(u8 *); +extern u8 *data_027e0d54; +extern unk32 *data_027e0cb4; ARM UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { s32 i; @@ -34,7 +34,7 @@ ARM void UnkStruct_02037750::vfunc_08(u32 param1) { this->mUnk_1c = 0; } -ARM void UnkStruct_02037750::vfunc_0c(UnkStruct_020397f8* param1) {} +ARM void UnkStruct_02037750::vfunc_0c(UnkStruct_020397f8 *param1) {} ARM void UnkStruct_02037750::vfunc_10() {} ARM bool UnkStruct_02037750::vfunc_24(unk32 param1) { @@ -58,13 +58,13 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { u32 uVar10; u32 uVar11; bool bVar12; - + pRVar3 = gRandom; - uVar7 = (u32)*(u16 *)(param1 + 0x2); + uVar7 = (u32) * (u16 *) (param1 + 0x2); if (uVar7 >= 0xF && uVar7 <= 0x2E) { pcVar8 = this->mUnk_04[((uVar7 - 0xF) << 0x1E) >> 0x1C]; - iVar9 = 0; + iVar9 = 0; if (pcVar8 != NULL) { iVar9 = pcVar8(this->mUnk_14); @@ -73,11 +73,10 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { return iVar9; } - if ((s32)uVar7 <= 0) { - switch(uVar7) { + if ((s32) uVar7 <= 0) { + switch (uVar7) { case 0x0: - case 0x2f: - break; + case 0x2f: break; case 0x7: if (data_027e0d54[0xd] != 0) { return -0x1; @@ -87,7 +86,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { case 0x1: case 0x2: case 0x3: - UnkStruct_020397f8* ret_3 = data_027e0c68.func_020366c4(); + UnkStruct_020397f8 *ret_3 = data_027e0c68.func_020366c4(); if (0x0 < ret_3->mUnk_15c) { return -0x1; @@ -102,7 +101,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { if (uVar7 == 0x0) { uVar10 = 0x0; } else { - lVar2 = gRandom->mRandomValue * gRandom->mFactor; + lVar2 = gRandom->mRandomValue * gRandom->mFactor; uVar10 = gRandom->Next(lVar2); // uVar10 = *(int *)((int)&gRandom->mAddend + 0x4) + // *(int *)((int)&gRandom->mFactor + 0x4) * @@ -120,30 +119,24 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { } return uVar10; - case 0x4: - return gAdventureFlags->Get(param1 + 0x4) != false; - case 0x5: - return gActorManager->func_ov00_020c3b2c(NULL) != 0; - case 0x6: - break; - case 0x8: - return (((data_027e0cb4[(param1 + 0x4) >> 5]) & 1) << ((param1 + 0x4) & 0x1f)) == 0x0; - case 0x9: - break; - case 0xa: - break; + case 0x4: return gAdventureFlags->Get(param1 + 0x4) != false; + case 0x5: return gActorManager->func_ov00_020c3b2c(NULL) != 0; + case 0x6: break; + case 0x8: return (((data_027e0cb4[(param1 + 0x4) >> 5]) & 1) << ((param1 + 0x4) & 0x1f)) == 0x0; + case 0x9: break; + case 0xa: break; case 0xb: - lVar2 = gRandom->mRandomValue * gRandom->mFactor; - uVar7 = lVar2; + lVar2 = gRandom->mRandomValue * gRandom->mFactor; + uVar7 = lVar2; uVar10 = gRandom->Next(uVar7); - return (int)(uVar10 * 0x64 >> 0x20) < (param1 + 0x4); + return (int) (uVar10 * 0x64 >> 0x20) < (param1 + 0x4); case 0xc: uVar7 = (param1 + 0x1); if (uVar7 == 0x0) { uVar10 = 0x0; } else { - lVar2 = gRandom->mRandomValue * gRandom->mFactor; + lVar2 = gRandom->mRandomValue * gRandom->mFactor; uVar11 = lVar2; uVar10 = gRandom->Next(uVar11); @@ -151,11 +144,9 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { uVar10 = (uVar7 * uVar10 >> 0x20); } } - return (int)(char)uVar10; - case 0xd: - return gItemManager->GetNumRupees() != 0; - case 0xe: - return gItemManager->HasItem(param1 + 0x4) != 0; + return (int) (char) uVar10; + case 0xd: return gItemManager->GetNumRupees() != 0; + case 0xe: return gItemManager->HasItem(param1 + 0x4) != 0; default: if (uVar7 == 0x2f) { return gItemManager->HasItem((param1 + 0x4) + 0x60) != 0; @@ -168,7 +159,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { if (uVar7 == 0x0) { uVar10 = 0x0; } else { - lVar2 = gRandom->mRandomValue * gRandom->mFactor; + lVar2 = gRandom->mRandomValue * gRandom->mFactor; uVar11 = lVar2; uVar10 = gRandom->Next(uVar11); @@ -177,26 +168,25 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { } } - return (int)(char)uVar10; + return (int) (char) uVar10; } ARM unk32 UnkStruct_02037750::vfunc_2c(s32 param1) {} ARM LinkStateInteract *UnkStruct_02037750::GetLinkStateInteract() { - return (LinkStateInteract*)GetLinkState(2); + return (LinkStateInteract *) GetLinkState(2); } ARM bool UnkStruct_02037750::vfunc_30() { return true; } -ARM unk32 UnkStruct_02037750::func_020385d0(s32 param1, u8* param2) {} +ARM unk32 UnkStruct_02037750::func_020385d0(s32 param1, u8 *param2) {} -ARM void UnkStruct_02037750::vfunc_14() { -} +ARM void UnkStruct_02037750::vfunc_14() {} // non-matching -ARM void UnkStruct_02037750::vfunc_18(unk32* param1) { +ARM void UnkStruct_02037750::vfunc_18(unk32 *param1) { param1[0] = 0; } @@ -233,5 +223,4 @@ ARM bool UnkStruct_020386d8::vfunc_30() { return data_027e0c68.func_020366c4()->mUnk_15c <= 0; } -ARM UnkStruct_020386d8::~UnkStruct_020386d8() { -} +ARM UnkStruct_020386d8::~UnkStruct_020386d8() {} diff --git a/src/Main/Unknown/UnkStruct_02038aa0.cpp b/src/Main/Unknown/UnkStruct_02038aa0.cpp index 94d37f4c..31256b1c 100644 --- a/src/Main/Unknown/UnkStruct_02038aa0.cpp +++ b/src/Main/Unknown/UnkStruct_02038aa0.cpp @@ -19,19 +19,19 @@ ARM void UnkStruct_0203881c::func_02038a80(s32 param1) {} ARM UnkStruct_0203881c::~UnkStruct_0203881c() {} THUMB UnkStruct_02038aa0::UnkStruct_02038aa0(u8 param1, u8 param2) : - UnkStruct_0203dae0(param1), mUnk_124(0) { + UnkStruct_0203dae0(param1), + mUnk_124(0) { this->func_020387e0(this->mUnk_150); this->pInfoEntry = 0; this->mUnk_158.y = 0; - this->mUnk_15c = 0; - this->mUnk_15e = 0xFF; - this->mUnk_15f = 0xFF; - this->mUnk_160 = 1; - this->mUnk_11e = param2; + this->mUnk_15c = 0; + this->mUnk_15e = 0xFF; + this->mUnk_15f = 0xFF; + this->mUnk_160 = 1; + this->mUnk_11e = param2; } -THUMB UnkStruct_02038aa0::~UnkStruct_02038aa0() { -} +THUMB UnkStruct_02038aa0::~UnkStruct_02038aa0() {} THUMB void UnkStruct_02038aa0::func_02038b28(void) { this->mUnk_114->mUnk_04 = NULL; @@ -44,7 +44,7 @@ ARM void UnkStruct_02038aa0::vfunc_4c(u32 param1, unk32 param2) { ARM void UnkStruct_02038aa0::vfunc_10() {} ARM void UnkStruct_02038aa0::func_02038b40() { - this->mUnk_15c = -1; + this->mUnk_15c = -1; this->mUnk_128.mUnk_04 = NULL; this->func_0203dc10(0); this->vfunc_48(); @@ -52,13 +52,14 @@ ARM void UnkStruct_02038aa0::func_02038b40() { ARM void UnkStruct_02038aa0::vfunc_48() {} -ARM void UnkStruct_02038aa0::func_02038b74(void) { -} +ARM void UnkStruct_02038aa0::func_02038b74(void) {} // non-matching ARM bool UnkStruct_02038aa0::func_02038b78() { if (data_027e0c54 == 0) { - if ((this->mUnk_50 != 0 && data_027e0c68.func_02036850() != 0) || (this->mUnk_50 == 0 && data_027e0c68.func_02036824() != 0)) { + if ((this->mUnk_50 != 0 && data_027e0c68.func_02036850() != 0) || + (this->mUnk_50 == 0 && data_027e0c68.func_02036824() != 0)) + { return true; } @@ -96,7 +97,7 @@ ARM unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) { } ARM s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) { - u8 bVar1 = this->mUnk_2c[0]->mUnk_08[1]; + u8 bVar1 = this->mUnk_2c[0]->mUnk_08[1]; unk32 iVar2 = this->func_02038cf4(); unk32 iVar1 = this->func_020337d8(param1 + 1); return iVar2 + iVar1 - bVar1; @@ -105,7 +106,7 @@ ARM s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) { ARM s32 UnkStruct_02038aa0::func_02038cf4() { unk32 iVar1; unk32 iVar2; - + iVar2 = this->mUnk_18; iVar1 = this->func_02038d10(); return (iVar2 * 8 - iVar1) / 2; @@ -133,20 +134,19 @@ ARM bool UnkStruct_02038aa0::func_02038ef4(s32 param1, s32 param2) { this->func_0203e1b0(local_14 + param1, local_18 + param2, 0); } -ARM void UnkStruct_02038aa0::func_02038f40(void) { -} +ARM void UnkStruct_02038aa0::func_02038f40(void) {} ARM void UnkStruct_02038aa0::vfunc_44(s32 touchLastX, s32 touchLastY) {} // non-matching -ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4) { +ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1 *param1, u32 param2, s16 *param3, UnkSubClass1_02256FF8 *param4) { int iVar1; - + this->pInfoEntry = param1; - this->mUnk_08 = param4; - this->mUnk_15f = -1; - this->mUnk_15c = 0x78; - this->mUnk_15e = param4->mUnk_0c; + this->mUnk_08 = param4; + this->mUnk_15f = -1; + this->mUnk_15c = 0x78; + this->mUnk_15e = param4->mUnk_0c; this->func_0203dcfc(0, 0, this->mUnk_11e, 2); this->mUnk_128.func_02038858(param2); this->mUnk_30 = this->mUnk_150[4] + 5; @@ -155,7 +155,7 @@ ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1* param1, u32 param2, s16* param3 // this->vfunc_60(0, 0, (unk32)param3); // this->vfunc_64(param3); - if (*(unk32*)data_027e0618 == 2) { + if (*(unk32 *) data_027e0618 == 2) { if (this->func_02032fa4() == 0) { data_027e103c->func_ov000_020cfc9c(1, 0); } else { @@ -167,10 +167,10 @@ ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1* param1, u32 param2, s16* param3 } // non-matching -ARM void UnkStruct_02038aa0::vfunc_5c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) { +ARM void UnkStruct_02038aa0::vfunc_5c(u16 *param_2, UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5) { u16 sVar1; bool bVar5; - + sVar1 = param_2[0]; bVar5 = (sVar1 == 0xA || sVar1 == 0x20) || sVar1 == 0x3000; @@ -191,8 +191,8 @@ ARM unk32 UnkStruct_02038aa0::vfunc_20(s32 param1, s32 *param2) {} ARM void UnkStruct_02038aa0::func_02039208(unk16 param1) {} // non-matching -ARM void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32* param2, s16 *param3, unk32 param4) { - this->mUnk_15c = 10; +ARM void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32 *param2, s16 *param3, unk32 param4) { + this->mUnk_15c = 10; this->mUnk_150[2] = 1; this->func_0203e2ac(param2); } @@ -205,22 +205,12 @@ ARM void UnkStruct_02038aa0::vfunc_64() {} ARM s32 UnkStruct_02038aa0::vfunc_68(unk32 param1) { switch (param1) { - case 0: - break; - case 1: - this->mUnk_34 = 4; - break; - case 2: - this->mUnk_34 = 6; - break; - case 3: - this->mUnk_34 = 1; - break; - case 4: - this->mUnk_34 = 0; - break; - default: - break; + case 0: break; + case 1: this->mUnk_34 = 4; break; + case 2: this->mUnk_34 = 6; break; + case 3: this->mUnk_34 = 1; break; + case 4: this->mUnk_34 = 0; break; + default: break; } return ((this->mUnk_18 << 3) - this->func_020337d8(param1)) / 2; diff --git a/src/Main/Unknown/UnkStruct_020397f8.cpp b/src/Main/Unknown/UnkStruct_020397f8.cpp index 3ecaaf6f..25fdc1bf 100644 --- a/src/Main/Unknown/UnkStruct_020397f8.cpp +++ b/src/Main/Unknown/UnkStruct_020397f8.cpp @@ -1,29 +1,30 @@ -#include "Message/MsgProc.hpp" -#include "Message/MessageManager.hpp" #include "Unknown/UnkStruct_020397f8.hpp" #include "DTCM/UnkStruct_027e103c.hpp" +#include "Message/MessageManager.hpp" +#include "Message/MsgProc.hpp" #include "Player/TouchControl.hpp" #include "Save/AdventureFlags.hpp" -extern "C" void func_ov000_020d0460(void*); -extern "C" void func_0203efd8(void*, void*); -extern "C" void func_0203ee48(void*); -extern "C" void func_ov018_02169634(UnkStruct_020397f8*); +extern "C" void func_ov000_020d0460(void *); +extern "C" void func_0203efd8(void *, void *); +extern "C" void func_0203ee48(void *); +extern "C" void func_ov018_02169634(UnkStruct_020397f8 *); extern unk16 data_02056a0e[]; extern u8 data_02056a08[]; extern u32 data_027e0618[]; THUMB UnkStruct_020397f8::UnkStruct_020397f8() : - UnkStruct_02038aa0(0, 0), mUnk_164(NULL) { - UnknownMsgChoiceStruct* puVar3; + UnkStruct_02038aa0(0, 0), + mUnk_164(NULL) { + UnknownMsgChoiceStruct *puVar3; this->mUnk_410.mUnk_00 = this; - this->mUnk_414 = 0; - this->mUnk_418 = NULL; - this->mUnk_41c = 0; - this->mUnk_41e = 0; - this->mUnk_420 = 0; + this->mUnk_414 = 0; + this->mUnk_418 = NULL; + this->mUnk_41c = 0; + this->mUnk_41e = 0; + this->mUnk_420 = 0; this->mUnk_424.mUnk_00 = this; // ??? @@ -31,7 +32,7 @@ THUMB UnkStruct_020397f8::UnkStruct_020397f8() : do { puVar3->mUnk_00 = NULL; puVar3 += 1; - } while ((unk32*)puVar3 < (unk32*)this->mUnk_528); + } while ((unk32 *) puVar3 < (unk32 *) this->mUnk_528); func_0203ee48(&this->mUnk_424); func_ov000_020d0460(&this->mUnk_534); @@ -64,7 +65,7 @@ THUMB UnkStruct_020397f8::UnkStruct_020397f8() : this->mUnk_585 = 0; this->mUnk_586 = 0; func_0203efd8(&this->mUnk_588, this); - this->mUnk_124 = (UnkSubClass1_unk_124*)&this->mUnk_588; + this->mUnk_124 = (UnkSubClass1_unk_124 *) &this->mUnk_588; this->func_02039ca8(); if (this->func_02032fa4() != 0) { @@ -112,7 +113,7 @@ ARM void UnkStruct_020397f8::vfunc_2c() { this->func_0203be64(); this->func_0203a35c(); - + if (this->mUnk_580 != 0) { this->mUnk_168.func_0203516c(); } @@ -120,11 +121,11 @@ ARM void UnkStruct_020397f8::vfunc_2c() { if (this->mUnk_584 != 0) { this->mUnk_300.func_0203516c(); } - + if (this->mUnk_585 != 0) { this->mUnk_388.func_0203516c(); } - + if ((this->func_0203a2c0() != 0 && this->mUnk_57f == 0) && this->mUnk_56c <= 0) { this->mUnk_1f0.func_0203516c(); } @@ -145,11 +146,9 @@ ARM void UnkStruct_020397f8::vfunc_2c() { } if (this->mUnk_15c == 1) { - if (this->mUnk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) { + if (this->mUnk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) { switch (this->mUnk_150[1]) { - case 0: - this->func_0203b0ec(1); - break; + case 0: this->func_0203b0ec(1); break; case 2: case 3: if (this->func_0203a3e0() != 0) { @@ -191,7 +190,7 @@ ARM void UnkStruct_020397f8::vfunc_3c(unk32 param1) { // non-matching ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { - UnkStruct_02038aa0* bVar1; + UnkStruct_02038aa0 *bVar1; s8 cVar2; unk32 iVar4; unk32 iVar6; @@ -213,23 +212,24 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { local_8c = 0; local_90 = 0; - bVar1 = data_027e0c68.mUnk_28[this->mUnk_50]; + bVar1 = data_027e0c68.mUnk_28[this->mUnk_50]; this->vfunc_6C(&local_8c, &local_90); this->func_0203a188(local_8c + param1, local_90 + param2); - this->func_0203e1b0(param1 + local_8c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), param2 + local_90 + (this->mUnk_158.y - (this->mUnk_18 << 3) / 2), 0); + this->func_0203e1b0(param1 + local_8c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), + param2 + local_90 + (this->mUnk_158.y - (this->mUnk_18 << 3) / 2), 0); if (this->mUnk_584 != 0) { iVar5 = this->mUnk_18 << 3; if (this->mUnk_580 != 0) { iVar5 = -0xC; - } else { + } else { iVar5 = 0; } this->mUnk_300.func_02034a1c(param1 + local_8c + this->mUnk_55c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), - iVar5 + param2 + local_90 + this->mUnk_560 + ((this->mUnk_158.y - (iVar5 / 2))), 0); + iVar5 + param2 + local_90 + this->mUnk_560 + ((this->mUnk_158.y - (iVar5 / 2))), 0); } if (this->mUnk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) { @@ -361,11 +361,13 @@ ARM void UnkStruct_020397f8::vfunc_48() { } ARM void UnkStruct_020397f8::func_0203a35c() { - if ((this->mUnk_57c == 1 || this->mUnk_150[3] != 0) || (this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0) { + if ((this->mUnk_57c == 1 || this->mUnk_150[3] != 0) || + (this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0) + { if (this->func_0203a3e0()) { - s16 mUnk_56e = this->mUnk_56e; - s16 mUnk_570 = this->mUnk_570; - UnkStruct_020397f8* mUnk_164 = this->mUnk_164; + s16 mUnk_56e = this->mUnk_56e; + s16 mUnk_570 = this->mUnk_570; + UnkStruct_020397f8 *mUnk_164 = this->mUnk_164; mUnk_164->mUnk_168.mUnk_10 = mUnk_56e; mUnk_164->mUnk_168.mUnk_14 = mUnk_570; @@ -423,10 +425,9 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) { } if (gTouchControl.mTouch == 0) { - switch(this->mUnk_150[1]) { + switch (this->mUnk_150[1]) { case 3: - case 4: - break; + case 4: break; case 5: if (data_027e103c->mUnk_20 == 3) { this->func_0203b0ec(1); @@ -437,8 +438,7 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) { this->func_0203b0ec(1); } break; - case 7: - break; + case 7: break; case 2: //! TODO: fixme // if (this->mUnk_164->mUnk_168.mUnk_06 <= 0) { @@ -477,25 +477,24 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) { ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1, unk32 param2) { unk32 iVar1; unk32 uVar2; - UnkStruct_0203b264* piVar3; - + UnkStruct_0203b264 *piVar3; + if (this->mUnk_164->mUnk_168.mUnk_06 > 0 && this->mUnk_164->mUnk_15c <= 0) { return false; } - iVar1 = this->vfunc_34(param2); + iVar1 = this->vfunc_34(param2); piVar3 = NULL; if (!(iVar1 < 0) && iVar1 < 4) { piVar3 = this->mUnk_424.func_0203eeb0(iVar1, param1); } - if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16*)piVar3->mUnk_0)[2]) == 0x00FF0002) { + if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16 *) piVar3->mUnk_0)[2]) == 0x00FF0002) { uVar2 = this->func_02038cb8(iVar1); - this->mUnk_410.func_0203ec4c(piVar3, uVar2, - (s16)(this->mUnk_158.x - ((this->mUnk_14 << 3) / 2)) + iVar1 + this->mUnk_56e, - (s16)(this->mUnk_158.y - ((this->mUnk_18 << 3) / 2)) + iVar1 + this->mUnk_570 - ); + this->mUnk_410.func_0203ec4c(piVar3, uVar2, + (s16) (this->mUnk_158.x - ((this->mUnk_14 << 3) / 2)) + iVar1 + this->mUnk_56e, + (s16) (this->mUnk_158.y - ((this->mUnk_18 << 3) / 2)) + iVar1 + this->mUnk_570); this->mUnk_57f = 0; return true; @@ -505,7 +504,7 @@ ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1, unk32 param2) { } // non-matching -ARM void UnkStruct_020397f8::vfunc_50(EntryINF1* param1, unk32 param2, s32* param3, unk32 param4) { +ARM void UnkStruct_020397f8::vfunc_50(EntryINF1 *param1, unk32 param2, s32 *param3, unk32 param4) { bool bVar5; bool bVar2; int iVar4; @@ -515,15 +514,17 @@ ARM void UnkStruct_020397f8::vfunc_50(EntryINF1* param1, unk32 param2, s32* para iVar6 = param3[0]; if (data_027e0c54 != 0) { - UnkStruct_020397f8* pVar4 = data_027e0c68.func_02036700(); + UnkStruct_020397f8 *pVar4 = data_027e0c68.func_02036700(); if (pVar4 != NULL && pVar4->mUnk_15c > 0) { this->func_02038b40(); } } - if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { - UnkStruct_020397f8* pVar4 = (UnkStruct_020397f8*)data_027e0c68.mUnk_28[4]; + if (*((s32 *) data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && + func_ov003_020f3f94(data_ov009_0211f5b4) == 0) + { + UnkStruct_020397f8 *pVar4 = (UnkStruct_020397f8 *) data_027e0c68.mUnk_28[4]; if (pVar4 != NULL && pVar4->mUnk_15c > 0) { this->func_02038b40(); @@ -531,7 +532,7 @@ ARM void UnkStruct_020397f8::vfunc_50(EntryINF1* param1, unk32 param2, s32* para } this->mUnk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0; - temp = param3[8]; + temp = param3[8]; if (temp >= 0 && param3[9] >= 0) { temp = param3[10]; @@ -568,19 +569,19 @@ ARM void UnkStruct_020397f8::vfunc_5c() { // non-matching ARM void UnkStruct_020397f8::vfunc_58() { bool bVar1; - s8* puVar2; + s8 *puVar2; int iVar3; char *pcVar4; - + if (this->mUnk_160 != 0) { if (data_027e103c != NULL) { if (data_027e103c->func_ov000_020cf4bc() != 0) { - puVar2 = (s8*)data_027e103c->func_ov000_020cef9c(); + puVar2 = (s8 *) data_027e103c->func_ov000_020cef9c(); if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) { - puVar2 = (s8*)data_027e103c->func_ov000_020cef9c(); + puVar2 = (s8 *) data_027e103c->func_ov000_020cef9c(); - if ((UnkStruct_020397f8*)(puVar2 + 0x244) == this) { + if ((UnkStruct_020397f8 *) (puVar2 + 0x244) == this) { data_027e103c->func_ov000_020cfb38(); } } @@ -623,7 +624,7 @@ ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) { u32 uVar3; s32 unaff_r6; bool bVar1; - + iVar4 = 0; bVar1 = false; @@ -642,9 +643,9 @@ ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) { this->mUnk_584 = 0; if (this->mUnk_150[3] != 0) { - iVar4 = 1; + iVar4 = 1; this->mUnk_56c = this->mUnk_578; - bVar1 = true; + bVar1 = true; this->mUnk_15c = 0x78; } else { if ((this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0) { @@ -681,7 +682,7 @@ ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) { } // non-matching (regalloc) -ARM unk32 UnkStruct_020397f8::vfunc_18(UnkStruct_0203b264* param1, unk32 param2, unk32 param3) { +ARM unk32 UnkStruct_020397f8::vfunc_18(UnkStruct_0203b264 *param1, unk32 param2, unk32 param3) { u16 sVar1; u32 uVar4; s32 unaff_r4; @@ -703,7 +704,7 @@ ARM unk32 UnkStruct_020397f8::vfunc_18(UnkStruct_0203b264* param1, unk32 param2, bVar5 = true; if (sVar1 == 0x1A) { - uVar4 = (param1->mUnk_0[3] << 0x10) | ((u16*)param1->mUnk_0)[2]; + uVar4 = (param1->mUnk_0[3] << 0x10) | ((u16 *) param1->mUnk_0)[2]; if (((uVar4 == 0x0001000A || uVar4 == 0x00020000) || uVar4 == 0x00FF0000)) { bVar5 = false; @@ -721,7 +722,7 @@ ARM unk32 UnkStruct_020397f8::vfunc_18(UnkStruct_0203b264* param1, unk32 param2, // non-matching ARM unk32 UnkStruct_020397f8::vfunc_1c(u16 *param1, UnkStruct_0203b264 *param2, unk8 param3, unk32 param4) { int iVar1; - u16* psVar3; + u16 *psVar3; psVar3 = param2->mUnk_4; @@ -739,58 +740,43 @@ ARM unk32 UnkStruct_020397f8::vfunc_1c(u16 *param1, UnkStruct_0203b264 *param2, } switch (this->mUnk_57a) { - case 0: - return this->func_0203905c(param1, param2, param3, param4); + case 0: return this->func_0203905c(param1, param2, param3, param4); case 1: - UnknownMsgChoiceStruct* pChoiceData; - s32 i = this->func_0203a30c(); + UnknownMsgChoiceStruct *pChoiceData; + s32 i = this->func_0203a30c(); pChoiceData = &this->mUnk_428[this->mUnk_528[i]]; - return this->mUnk_164->func_0203cb5c(*param1, (((pChoiceData->mUnk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->mUnk_00->mUnk_0)[2]) + ~0xFFFE)); - default: - break; + return this->mUnk_164->func_0203cb5c( + *param1, (((pChoiceData->mUnk_00->mUnk_0[3] << 0x10) | ((u16 *) pChoiceData->mUnk_00->mUnk_0)[2]) + ~0xFFFE)); + default: break; } return 0; } // non-matching -ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1* param1, unk32 param2, unk32 param3) { +ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1 *param1, unk32 param2, unk32 param3) { unk16 sVar1; unk16 uVar2; unk32 iVar3; unk32 iVar4; unk32 uVar5; u32 uVar6; - + uVar6 = 0; if (this->func_02032fa4() == 0) { - switch(param1->mUnk_0c) { + switch (param1->mUnk_0c) { case 0: - case 1: - uVar6 = this->mUnk_580 != 0; - break; - case 2: - uVar6 = 2; - break; - case 3: - uVar6 = 3; - break; - case 5: - uVar6 = 4; - break; - case 6: - uVar6 = 5; - break; + case 1: uVar6 = this->mUnk_580 != 0; break; + case 2: uVar6 = 2; break; + case 3: uVar6 = 3; break; + case 5: uVar6 = 4; break; + case 6: uVar6 = 5; break; default: // why??? switch (param1->mUnk_0c) { - case 4: - uVar6 = 8; - break; - case 7: - uVar6 = 9; - break; + case 4: uVar6 = 8; break; + case 7: uVar6 = 9; break; default: if (this->mUnk_580 != 0) { uVar6 = 7; @@ -826,7 +812,7 @@ ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1* param1, unk32 param2 } if (param1->mUnk_10 <= 0 && iVar3 > 0) { - uVar2 = param1->mUnk_12; + uVar2 = param1->mUnk_12; this->mUnk_158.x = param1->mUnk_10; this->mUnk_158.y = uVar2; } else { @@ -835,10 +821,12 @@ ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1* param1, unk32 param2 } // non-matching (regalloc) -ARM void UnkStruct_020397f8::vfunc_64(s16* param1) { +ARM void UnkStruct_020397f8::vfunc_64(s16 *param1) { unk32 uVar2; - if (this->mUnk_50 != 0 || data_027e0db0.mUnk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) { + if (this->mUnk_50 != 0 || data_027e0db0.mUnk_04 > 0 || func_0203c084() != 0 || + (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) + { uVar2 = 0x16; } else { uVar2 = 0; @@ -870,23 +858,15 @@ ARM void UnkStruct_020397f8::func_0203b764() { this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); switch (this->mUnk_57b) { - case 1: - this->mUnk_158.y -= 38; - break; + case 1: this->mUnk_158.y -= 38; break; case 2: switch (this->pInfoEntry->mUnk_06) { - case 2: - this->mUnk_158.y -= 111; - break; - case 3: - this->mUnk_158.y -= 98; - break; - default: - break; + case 2: this->mUnk_158.y -= 111; break; + case 3: this->mUnk_158.y -= 98; break; + default: break; } break; - default: - break; + default: break; } } @@ -958,8 +938,8 @@ ARM bool UnkStruct_020397f8::func_0203c13c() { if (this->func_02032fa4() == 0) { data_ov000_020eec9c.func_ov000_020d77e4(6); data_027e103c->func_ov000_020cfb20(this); - this->mUnk_585 = 1; - this->mUnk_584 = 1; + this->mUnk_585 = 1; + this->mUnk_584 = 1; this->mUnk_128.mUnk_18 = 0x00016000; this->mUnk_128.mUnk_1c = NULL; this->mUnk_128.mUnk_20 = 0; @@ -973,13 +953,13 @@ ARM bool UnkStruct_020397f8::func_0203c13c() { // non-matching ARM bool UnkStruct_020397f8::func_0203c1a0() { - s8* pVar1; - u8* iVar3; + s8 *pVar1; + u8 *iVar3; if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { this->mUnk_584 = 1; - pVar1 = (s8*)data_027e103c->func_ov000_020cef9c(); + pVar1 = (s8 *) data_027e103c->func_ov000_020cef9c(); iVar3 = data_027e0f7c.func_ov000_0209d90c(pVar1[0x24F], 0); data_027e1054.func_ov003_020f4760(iVar3[1], 0); data_ov000_020eec9c.func_ov000_020d77e4(6); @@ -996,13 +976,13 @@ ARM bool UnkStruct_020397f8::func_0203c1a0() { return 0; } -ARM bool UnkStruct_020397f8::func_0203c25c(UnkStruct_020397f8* param1) { +ARM bool UnkStruct_020397f8::func_0203c25c(UnkStruct_020397f8 *param1) { if (data_027e1054.mUnk_00->mUnk_00->mUnk_95 != 0) { return false; } if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) { - param1->mUnk_585 = 1; + param1->mUnk_585 = 1; param1->mUnk_128.mUnk_18 = 0x00016000; param1->mUnk_128.mUnk_1c = NULL; param1->mUnk_128.mUnk_20 = 0; @@ -1013,8 +993,7 @@ ARM bool UnkStruct_020397f8::func_0203c25c(UnkStruct_020397f8* param1) { return false; } -ARM UnkStruct_020397f8::~UnkStruct_020397f8() { -} +ARM UnkStruct_020397f8::~UnkStruct_020397f8() {} ARM bool UnkStruct_020397f8::vfunc_38() { return true; diff --git a/src/Main/Unknown/UnkStruct_0203dae0.cpp b/src/Main/Unknown/UnkStruct_0203dae0.cpp index 67fe821e..880511ae 100644 --- a/src/Main/Unknown/UnkStruct_0203dae0.cpp +++ b/src/Main/Unknown/UnkStruct_0203dae0.cpp @@ -2,17 +2,17 @@ #include "System/SysNew.hpp" extern u32 *data_027e0ce0[]; -extern "C" void Fill256(unk32, unk16*, unk32, unk32); -extern "C" void func_0203fc78(u8, unk32*, unk32*); +extern "C" void Fill256(unk32, unk16 *, unk32, unk32); +extern "C" void func_0203fc78(u8, unk32 *, unk32 *); 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" void func_020298b8(unk32 *, unk32, unk32, unk32, unk32); +extern "C" void func_02029830(unk32 *, unk32, unk32, unk32, unk32); extern "C" unk32 func_0203d400(u8); extern "C" void func_02035440(u8); class UnkStruct_02075dac { public: - unk32 func_0203f9b8(void*); + unk32 func_0203f9b8(void *); }; extern UnkStruct_02075dac data_02075dac; @@ -71,7 +71,7 @@ ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) { unk32 local_c; unk32 local_10; - local_c = param1; + local_c = param1; local_10 = param2; func_0203fc78(this->func_02032fa4(), &local_c, &local_10); @@ -82,8 +82,8 @@ ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) { // non-matching ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) { - unk32* uVar5; - + 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]); @@ -106,13 +106,13 @@ ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3 this->func_0203de58(param2); } -ARM unk32* UnkStruct_0203dae0::func_0203ddec() { +ARM unk32 *UnkStruct_0203dae0::func_0203ddec() { return this->mUnk_114->func_0203d1b4(); } ARM void UnkStruct_0203dae0::func_0203ddfc() { this->mUnk_114->mUnk_04 = 0; - this->mUnk_11c = 0; + this->mUnk_11c = 0; } ARM void UnkStruct_0203dae0::func_0203de14() { @@ -141,7 +141,7 @@ ARM void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) { ARM void UnkStruct_0203dae0::vfunc_30() { unk32 iVar2; - iVar2 = this->mUnk_118; + iVar2 = this->mUnk_118; this->mUnk_118 = data_02075dac.func_0203f9b8(this); if (this->mUnk_118 == iVar2) { @@ -171,7 +171,7 @@ ARM bool UnkStruct_0203dae0::func_0203e1b0(unk32 param1, unk32 param2, s32 param ARM unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) { unk32 iVar1; - + iVar1 = this->UnkStruct_02032f0c::vfunc_18(param1); if (iVar1 != 0) { From f8e7f9a17dd50694fbf7f318c99116bad76ae7b4 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:01:41 +0100 Subject: [PATCH 60/64] rename UnkStruct_027E0C68 --- config/eur/arm9/dtcm/symbols.txt | 2 +- config/eur/arm9/symbols.txt | 62 ++++++++++++------------- config/usa/arm9/dtcm/symbols.txt | 2 +- config/usa/arm9/symbols.txt | 62 ++++++++++++------------- include/Message/MessageManager.hpp | 20 ++++---- include/Unknown/UnkStruct_0203dae0.hpp | 7 ++- src/Main/Message/MessageManager.cpp | 62 ++++++++++++------------- src/Main/Unknown/UnkStruct_02037750.cpp | 8 ++-- src/Main/Unknown/UnkStruct_02038aa0.cpp | 4 +- src/Main/Unknown/UnkStruct_020397f8.cpp | 14 +++--- 10 files changed, 126 insertions(+), 117 deletions(-) diff --git a/config/eur/arm9/dtcm/symbols.txt b/config/eur/arm9/dtcm/symbols.txt index 62eea4b0..2bb4c8fb 100644 --- a/config/eur/arm9/dtcm/symbols.txt +++ b/config/eur/arm9/dtcm/symbols.txt @@ -85,7 +85,7 @@ data_027e0c38 kind:bss addr:0x27e0c38 data_027e0c50 kind:bss addr:0x27e0c50 data_027e0c54 kind:bss addr:0x27e0c54 data_027e0c5c kind:bss addr:0x27e0c5c -data_027e0c68 kind:bss addr:0x27e0c68 +gMessageManager kind:bss addr:0x27e0c68 data_027e0cb4 kind:bss addr:0x27e0cb4 data_027e0cbc kind:bss addr:0x27e0cbc data_027e0ce0 kind:bss addr:0x27e0ce0 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 5de9a047..3caaf962 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1789,38 +1789,38 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x20361d0 func_02036240 kind:function(arm,size=0x170) addr:0x2036240 func_020363b0 kind:function(arm,size=0x18) addr:0x20363b0 func_020363c8 kind:function(arm,size=0x74) addr:0x20363c8 -_ZN18UnkStruct_027E0C6813func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x203643c -_ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x2036490 -_ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x203665c +_ZN14MessageManager13func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x203643c +_ZN14MessageManager13func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x2036490 +_ZN14MessageManager13func_0203665cEv kind:function(thumb,size=0x4c) addr:0x203665c func_020366a8 kind:function(arm,size=0x1c) addr:0x20366a8 -_ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x20366c4 -_ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x2036700 -_ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x203673c -_ZN18UnkStruct_027E0C6813func_02036770Ej kind:function(arm,size=0x28) addr:0x2036770 -_ZN18UnkStruct_027E0C6813func_02036798Ev kind:function(arm,size=0x44) addr:0x2036798 -_ZN18UnkStruct_027E0C6813func_020367dcEi kind:function(arm,size=0x10) addr:0x20367dc -_ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367ec -_ZN18UnkStruct_027E0C6813func_02036808Ev kind:function(arm,size=0x1c) addr:0x2036808 -_ZN18UnkStruct_027E0C6813func_02036824Ev kind:function(arm,size=0x2c) addr:0x2036824 -_ZN18UnkStruct_027E0C6813func_02036850Ev kind:function(arm,size=0x38) addr:0x2036850 -_ZN18UnkStruct_027E0C6813func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036888 -_ZN18UnkStruct_027E0C6813func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368f4 -_ZN18UnkStruct_027E0C6813func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x203690c -_ZN18UnkStruct_027E0C6813func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036bbc -_ZN18UnkStruct_027E0C6813func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c50 -_ZN18UnkStruct_027E0C6813func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036ca4 -_ZN18UnkStruct_027E0C6813func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ce4 -_ZN18UnkStruct_027E0C6813func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036d30 -_ZN18UnkStruct_027E0C6813func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d4c -_ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c -_ZN18UnkStruct_027E0C6813func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036da8 -_ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036edc -_ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f68 -_ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x20370d0 -_ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370e8 -_ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037158 -_ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037178 -_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x4) addr:0x20371b0 +_ZN14MessageManager13func_020366c4Ev kind:function(arm,size=0x3c) addr:0x20366c4 +_ZN14MessageManager13func_02036700Ev kind:function(arm,size=0x3c) addr:0x2036700 +_ZN14MessageManager13func_0203673cEv kind:function(arm,size=0x34) addr:0x203673c +_ZN14MessageManager13func_02036770Ej kind:function(arm,size=0x28) addr:0x2036770 +_ZN14MessageManager13func_02036798Ev kind:function(arm,size=0x44) addr:0x2036798 +_ZN14MessageManager13func_020367dcEi kind:function(arm,size=0x10) addr:0x20367dc +_ZN14MessageManager13func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367ec +_ZN14MessageManager13func_02036808Ev kind:function(arm,size=0x1c) addr:0x2036808 +_ZN14MessageManager13func_02036824Ev kind:function(arm,size=0x2c) addr:0x2036824 +_ZN14MessageManager13func_02036850Ev kind:function(arm,size=0x38) addr:0x2036850 +_ZN14MessageManager13func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036888 +_ZN14MessageManager13func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368f4 +_ZN14MessageManager13func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x203690c +_ZN14MessageManager13func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036bbc +_ZN14MessageManager13func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c50 +_ZN14MessageManager13func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036ca4 +_ZN14MessageManager13func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ce4 +_ZN14MessageManager13func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036d30 +_ZN14MessageManager13func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d4c +_ZN14MessageManager13func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d6c +_ZN14MessageManager13func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036da8 +_ZN14MessageManager13func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036edc +_ZN14MessageManager13func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f68 +_ZN14MessageManager13func_020370d0Eii kind:function(arm,size=0x18) addr:0x20370d0 +_ZN14MessageManager13func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370e8 +_ZN14MessageManager13func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037158 +_ZN14MessageManager13func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037178 +_ZN14MessageManagerD2Ev kind:function(arm,size=0x4) addr:0x20371b0 _ZN11BMGFileInfo13func_020371b4Ev kind:function(thumb,size=0x14) addr:0x20371b4 _ZN11BMGFileInfo13func_020371c8EPjs kind:function(thumb,size=0x90) addr:0x20371c8 _ZN11BMGFileInfo13func_02037258Et kind:function(arm,size=0x34) addr:0x2037258 diff --git a/config/usa/arm9/dtcm/symbols.txt b/config/usa/arm9/dtcm/symbols.txt index 62eea4b0..2bb4c8fb 100644 --- a/config/usa/arm9/dtcm/symbols.txt +++ b/config/usa/arm9/dtcm/symbols.txt @@ -85,7 +85,7 @@ data_027e0c38 kind:bss addr:0x27e0c38 data_027e0c50 kind:bss addr:0x27e0c50 data_027e0c54 kind:bss addr:0x27e0c54 data_027e0c5c kind:bss addr:0x27e0c5c -data_027e0c68 kind:bss addr:0x27e0c68 +gMessageManager kind:bss addr:0x27e0c68 data_027e0cb4 kind:bss addr:0x27e0cb4 data_027e0cbc kind:bss addr:0x27e0cbc data_027e0ce0 kind:bss addr:0x27e0ce0 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 177c5404..b19fdb53 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1789,38 +1789,38 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x203618c func_02036240 kind:function(arm,size=0x170) addr:0x20361fc func_020363b0 kind:function(arm,size=0x18) addr:0x203636c func_020363c8 kind:function(arm,size=0x74) addr:0x2036384 -_ZN18UnkStruct_027E0C6813func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x20363f8 -_ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x203644c -_ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x2036618 +_ZN14MessageManager13func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x20363f8 +_ZN14MessageManager13func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x203644c +_ZN14MessageManager13func_0203665cEv kind:function(thumb,size=0x4c) addr:0x2036618 func_020366a8 kind:function(arm,size=0x1c) addr:0x2036664 -_ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x2036680 -_ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x20366bc -_ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x20366f8 -_ZN18UnkStruct_027E0C6813func_02036770Ej kind:function(arm,size=0x28) addr:0x203672c -_ZN18UnkStruct_027E0C6813func_02036798Ev kind:function(arm,size=0x44) addr:0x2036754 -_ZN18UnkStruct_027E0C6813func_020367dcEi kind:function(arm,size=0x10) addr:0x2036798 -_ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367a8 -_ZN18UnkStruct_027E0C6813func_02036808Ev kind:function(arm,size=0x1c) addr:0x20367c4 -_ZN18UnkStruct_027E0C6813func_02036824Ev kind:function(arm,size=0x2c) addr:0x20367e0 -_ZN18UnkStruct_027E0C6813func_02036850Ev kind:function(arm,size=0x38) addr:0x203680c -_ZN18UnkStruct_027E0C6813func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036844 -_ZN18UnkStruct_027E0C6813func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368b0 -_ZN18UnkStruct_027E0C6813func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x20368c8 -_ZN18UnkStruct_027E0C6813func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036b78 -_ZN18UnkStruct_027E0C6813func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c0c -_ZN18UnkStruct_027E0C6813func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036c60 -_ZN18UnkStruct_027E0C6813func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ca0 -_ZN18UnkStruct_027E0C6813func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036cec -_ZN18UnkStruct_027E0C6813func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d08 -_ZN18UnkStruct_027E0C6813func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 -_ZN18UnkStruct_027E0C6813func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036d64 -_ZN18UnkStruct_027E0C6813func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036e98 -_ZN18UnkStruct_027E0C6813func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f24 -_ZN18UnkStruct_027E0C6813func_020370d0Eii kind:function(arm,size=0x18) addr:0x203708c -_ZN18UnkStruct_027E0C6813func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370a4 -_ZN18UnkStruct_027E0C6813func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037114 -_ZN18UnkStruct_027E0C6813func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037134 -_ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x4) addr:0x203716c +_ZN14MessageManager13func_020366c4Ev kind:function(arm,size=0x3c) addr:0x2036680 +_ZN14MessageManager13func_02036700Ev kind:function(arm,size=0x3c) addr:0x20366bc +_ZN14MessageManager13func_0203673cEv kind:function(arm,size=0x34) addr:0x20366f8 +_ZN14MessageManager13func_02036770Ej kind:function(arm,size=0x28) addr:0x203672c +_ZN14MessageManager13func_02036798Ev kind:function(arm,size=0x44) addr:0x2036754 +_ZN14MessageManager13func_020367dcEi kind:function(arm,size=0x10) addr:0x2036798 +_ZN14MessageManager13func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367a8 +_ZN14MessageManager13func_02036808Ev kind:function(arm,size=0x1c) addr:0x20367c4 +_ZN14MessageManager13func_02036824Ev kind:function(arm,size=0x2c) addr:0x20367e0 +_ZN14MessageManager13func_02036850Ev kind:function(arm,size=0x38) addr:0x203680c +_ZN14MessageManager13func_02036888EP18UnkStruct_020386d8 kind:function(arm,size=0x6c) addr:0x2036844 +_ZN14MessageManager13func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=0x18) addr:0x20368b0 +_ZN14MessageManager13func_0203690cEiii kind:function(arm,size=0x2b0) addr:0x20368c8 +_ZN14MessageManager13func_02036bbcEv kind:function(arm,size=0x94) addr:0x2036b78 +_ZN14MessageManager13func_02036c50Ei kind:function(arm,size=0x54) addr:0x2036c0c +_ZN14MessageManager13func_02036ca4Ei kind:function(arm,size=0x40) addr:0x2036c60 +_ZN14MessageManager13func_02036ce4EP18UnkStruct_020386d8i kind:function(arm,size=0x4c) addr:0x2036ca0 +_ZN14MessageManager13func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x2036cec +_ZN14MessageManager13func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x2036d08 +_ZN14MessageManager13func_02036d6cEv kind:function(arm,size=0x3c) addr:0x2036d28 +_ZN14MessageManager13func_02036da8EjPs kind:function(arm,size=0x134) addr:0x2036d64 +_ZN14MessageManager13func_02036edcEjh kind:function(arm,size=0x8c) addr:0x2036e98 +_ZN14MessageManager13func_02036f68EjPh kind:function(arm,size=0x168) addr:0x2036f24 +_ZN14MessageManager13func_020370d0Eii kind:function(arm,size=0x18) addr:0x203708c +_ZN14MessageManager13func_020370e8Eissi kind:function(arm,size=0x70) addr:0x20370a4 +_ZN14MessageManager13func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x2037114 +_ZN14MessageManager13func_02037178EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x38) addr:0x2037134 +_ZN14MessageManagerD2Ev kind:function(arm,size=0x4) addr:0x203716c _ZN11BMGFileInfo13func_020371b4Ev kind:function(thumb,size=0x14) addr:0x2037170 _ZN11BMGFileInfo13func_020371c8EPjs kind:function(thumb,size=0x90) addr:0x2037184 _ZN11BMGFileInfo13func_02037258Et kind:function(arm,size=0x34) addr:0x2037214 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 28537830..28e4764e 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -7,6 +7,7 @@ #include "Message/MsgProc.hpp" #include "System/SysNew.hpp" #include "nds/math.h" +#include "Debug/DebugHierarchy.hpp" #include "Unknown/UnkStruct_0202e1a0.hpp" #include "Unknown/UnkStruct_02032f0c.hpp" @@ -16,12 +17,12 @@ #include "Unknown/UnkStruct_020397f8.hpp" #include "Unknown/UnkStruct_0203dae0.hpp" -class UnkStruct_027E0C68 : public SysObject { +class MessageManager : public SysObject { public: /* 0x00 */ u8 mUnk_00[2]; /* 0x02 */ u8 mUnk_02; /* 0x03 */ u8 mUnk_03; - /* 0x04 */ u8 mUnk_04; + /* 0x04 */ u8 mUnk_04; // halts actors and hides the item menu /* 0x05 */ u8 mUnk_05; /* 0x06 */ unk16 mUnk_06; /* 0x08 */ UnkStruct_020397f8 *mUnk_08; @@ -35,20 +36,21 @@ public: /* 0x20 */ UnkStruct_02037750 *mUnk_20[2]; /* 0x28 */ UnkStruct_02038aa0 *mUnk_28[6]; //! TODO: is it the right type? /* 0x40 */ UnkStruct_020397f8 *mUnk_40[2]; // is array size 6? - /* 0x48 */ + /* 0x48 */ DebugHierarchy* mDebug; + /* 0x4C */ - static void func_0203643c(u32 *param_1, UnkStruct_027E0C68 *param_2, u32 param_3); + static void func_0203643c(u32 *param_1, MessageManager *param_2, u32 param_3); void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); void func_0203665c(void); - UnkStruct_027E0C68(); - ~UnkStruct_027E0C68(); + MessageManager(); + ~MessageManager(); UnkStruct_020397f8 *func_020366c4(void); UnkStruct_020397f8 *func_02036700(void); UnkStruct_020386d8 *func_0203673c(void); bool func_02036770(u32 param_2); unk32 func_02036798(void); bool func_020367dc(int param_2); - bool UnkStruct_027E0C68::func_020367ec(void); + bool MessageManager::func_020367ec(void); bool func_02036808(void); bool func_02036824(void); bool func_02036850(void); @@ -69,6 +71,8 @@ public: UnkStruct_020386d8 *func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); void func_02037158(UnkSubClass1_02256FF8 *param_2); UnkStruct_02038aa0 *func_02037178(UnkSubClass1_02256FF8 *param_2); + + void func_ov004_021069c4(void); }; -extern UnkStruct_027E0C68 data_027e0c68; +extern MessageManager gMessageManager; diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp index 5315c958..7cb67a00 100644 --- a/include/Unknown/UnkStruct_0203dae0.hpp +++ b/include/Unknown/UnkStruct_0203dae0.hpp @@ -52,7 +52,10 @@ public: /* 0dc */ unk32 mUnk_dc; /* 0e0 */ unk32 mUnk_e0; /* 0e4 */ unk32 mUnk_e4; - /* 0e8 */ unk32 mUnk_e8; + /* 0e8 */ unk8 mUnk_e8; + /* 0e8 */ unk8 mUnk_e9; + /* 0e8 */ unk8 mUnk_ea; + /* 0e8 */ unk8 mUnk_eb; /* 0ec */ unk32 mUnk_ec; /* 0f0 */ unk32 mUnk_f0; /* 0f4 */ unk32 mUnk_f4; @@ -134,4 +137,6 @@ public: void func_0203e510(s32 *param1, s32 param2, s32 param3); void func_0203e62c(s32 *param1, s32 param2); bool func_0203e6e4(u32 param1, u32 param2, s32 param3); + + void func_ov003_020f13b0(unk32 param1); }; diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index a1a5da09..812a9b2a 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -21,7 +21,7 @@ extern UnkStruct_027e0ffc *data_027e0ffc; extern u32 data_027e0618[]; // non-matching -ARM void UnkStruct_027E0C68::func_0203643c(u32 *param_1, UnkStruct_027E0C68 *param_2, u32 param_3) { +ARM void MessageManager::func_0203643c(u32 *param_1, MessageManager *param_2, u32 param_3) { BMGGroups *pBVar2 = param_2->pGroups; *param_1 = ((u32) pBVar2->entries[param_3 >> 0x10].pDAT1 + @@ -29,7 +29,7 @@ ARM void UnkStruct_027E0C68::func_0203643c(u32 *param_1, UnkStruct_027E0C68 *par } // non-matching -THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 param_4) { +THUMB void MessageManager::func_02036490(unk32 param_2, unk32 param_3, unk32 param_4) { this->mUnk_03 = 0; this->mUnk_0c = 0; @@ -103,7 +103,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 } } -THUMB void UnkStruct_027E0C68::func_0203665c(void) { +THUMB void MessageManager::func_0203665c(void) { for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { if (this->mUnk_28[i] != NULL) { delete this->mUnk_28[i]; @@ -124,7 +124,7 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) { } // non-matching -ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_020366c4(void) { +ARM UnkStruct_020397f8 *MessageManager::func_020366c4(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { return (UnkStruct_020397f8 *) this->mUnk_28[2]; } @@ -133,7 +133,7 @@ ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_020366c4(void) { } // non-matching -ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036700(void) { +ARM UnkStruct_020397f8 *MessageManager::func_02036700(void) { if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) { return (UnkStruct_020397f8 *) this->mUnk_28[0]; } @@ -141,7 +141,7 @@ ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036700(void) { return (UnkStruct_020397f8 *) this->mUnk_28[2]; } -ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_0203673c(void) { +ARM UnkStruct_020386d8 *MessageManager::func_0203673c(void) { bool iVar1 = this->func_02036824(); bool iVar2 = this->func_02036850(); @@ -156,11 +156,11 @@ ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_0203673c(void) { return NULL; } -ARM bool UnkStruct_027E0C68::func_02036770(u32 param_2) { +ARM bool MessageManager::func_02036770(u32 param_2) { return (this->mUnk_18[param_2]->mUnk_18 & ~0xFFFF) == (0x100 << 0x10); } -ARM unk32 UnkStruct_027E0C68::func_02036798(void) { +ARM unk32 MessageManager::func_02036798(void) { unk32 uVar2 = 1; if (this->mUnk_04 == 0) { @@ -178,19 +178,19 @@ ARM unk32 UnkStruct_027E0C68::func_02036798(void) { return uVar2; } -ARM bool UnkStruct_027E0C68::func_020367dc(int param_2) { +ARM bool MessageManager::func_020367dc(int param_2) { return param_2 == 0; } -ARM bool UnkStruct_027E0C68::func_020367ec(void) { +ARM bool MessageManager::func_020367ec(void) { return ((UnkStruct_020397f8 *) this->mUnk_28[0])->mUnk_15c > 0; } -ARM bool UnkStruct_027E0C68::func_02036808(void) { +ARM bool MessageManager::func_02036808(void) { return ((UnkStruct_020397f8 *) this->mUnk_28[2])->mUnk_15c > 0; } -ARM bool UnkStruct_027E0C68::func_02036824(void) { +ARM bool MessageManager::func_02036824(void) { switch (data_027e077c.mUnk_0) { case 0x01: case 0x37: @@ -202,11 +202,11 @@ ARM bool UnkStruct_027E0C68::func_02036824(void) { } // non-matching -ARM bool UnkStruct_027E0C68::func_02036850(void) { +ARM bool MessageManager::func_02036850(void) { return !(data_02056be4[data_027e077c.mUnk_0] & 2) && (data_02056be4[data_027e077c.mUnk_0] & 1); } -ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8 *param_2) { +ARM void MessageManager::func_02036888(UnkStruct_020386d8 *param_2) { if ((param_2->mUnk_18 & ~0xFFFF) != (0x100 << 0x10)) { UnkStruct_020397f8 *iVar1 = this->func_020366c4(); @@ -218,7 +218,7 @@ ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8 *param_2) { } } -ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750 *param_2) { +ARM bool MessageManager::func_020368f4(UnkStruct_02037750 *param_2) { if (this->mUnk_20[1] != NULL) { return false; } @@ -228,7 +228,7 @@ ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750 *param_2) { } // non-matching -ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { +ARM void MessageManager::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) { UnkStruct_020397f8 *unk_28_0; UnkStruct_020397f8 *unk_28_2; UnkStruct_02038aa0 *pSVar4; @@ -323,7 +323,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p } } -ARM void UnkStruct_027E0C68::func_02036bbc(void) { +ARM void MessageManager::func_02036bbc(void) { UnkStruct_02038aa0 *pSVar3; bool bVar2; bool bVar4; @@ -345,7 +345,7 @@ ARM void UnkStruct_027E0C68::func_02036bbc(void) { } } -ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { +ARM void MessageManager::func_02036c50(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { @@ -355,7 +355,7 @@ ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) { } } -ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { +ARM void MessageManager::func_02036ca4(unk32 param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { @@ -367,7 +367,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) { } } -ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8 *param_2, unk32 param_3) { +ARM bool MessageManager::func_02036ce4(UnkStruct_020386d8 *param_2, unk32 param_3) { u32 uVar1; if (param_3 == 0) { @@ -384,7 +384,7 @@ ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8 *param_2, unk32 pa return false; } -ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750 *param_2) { +ARM bool MessageManager::func_02036d30(UnkStruct_02037750 *param_2) { if (this->mUnk_20[0] != NULL && this->mUnk_20[0] != param_2) { return false; } @@ -393,7 +393,7 @@ ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750 *param_2) { return true; } -ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750 *param_2) { +ARM bool MessageManager::func_02036d4c(UnkStruct_02037750 *param_2) { if (this->mUnk_20[0] == param_2) { this->mUnk_20[0] = NULL; return true; @@ -402,7 +402,7 @@ ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750 *param_2) { return false; } -ARM void UnkStruct_027E0C68::func_02036d6c(void) { +ARM void MessageManager::func_02036d6c(void) { s32 i; for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { @@ -413,7 +413,7 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) { } // non-matching -ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02036da8(u32 param_2, s16 *param_3) { +ARM UnkStruct_02038aa0 *MessageManager::func_02036da8(u32 param_2, s16 *param_3) { EntryINF1 *pEVar1; EntryINF1 *pEVar2; UnkStruct_02038aa0 *pSVar4; @@ -461,7 +461,7 @@ ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02036da8(u32 param_2, s16 *para } // non-matching -ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { +ARM void MessageManager::func_02036edc(u32 param_2, u8 param_3) { UnkStruct_020397f8 *pSVar1; u8 auStack_28[24]; u8 local_13; @@ -485,7 +485,7 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) { } // non-matching -ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036f68(u32 param_2, u8 *param_3) { +ARM UnkStruct_020397f8 *MessageManager::func_02036f68(u32 param_2, u8 *param_3) { EntryINF1 *pEVar1; UnkStruct_02038aa0 *pSVar2; EntryINF1 *pEVar3; @@ -523,11 +523,11 @@ ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036f68(u32 param_2, u8 *param return pSVar5; } -ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_020370d0(unk32 param_2, unk32 param_3) { +ARM UnkStruct_020386d8 *MessageManager::func_020370d0(unk32 param_2, unk32 param_3) { return this->func_020370e8(param_2, -1, -1, param_3); } -ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { +ARM UnkStruct_020386d8 *MessageManager::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { UnkStruct_020386d8 *puVar2; if (this->func_02036824()) { @@ -551,7 +551,7 @@ ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 p return NULL; } -ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8 *param_2) { +ARM void MessageManager::func_02037158(UnkSubClass1_02256FF8 *param_2) { UnkStruct_02038aa0 *pSVar1; pSVar1 = this->func_02037178(param_2); @@ -561,7 +561,7 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8 *param_2) { } } -ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8 *param_2) { +ARM UnkStruct_02038aa0 *MessageManager::func_02037178(UnkSubClass1_02256FF8 *param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { @@ -573,4 +573,4 @@ ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8 return NULL; } -ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() {} +ARM MessageManager::~MessageManager() {} diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp index f6e739b5..489c4534 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -24,8 +24,8 @@ ARM UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) { } ARM UnkStruct_02037750::~UnkStruct_02037750() { - if (data_027e0c68.mUnk_20[0] == this) { - data_027e0c68.func_02036d4c(this); + if (gMessageManager.mUnk_20[0] == this) { + gMessageManager.func_02036d4c(this); } } @@ -86,7 +86,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { case 0x1: case 0x2: case 0x3: - UnkStruct_020397f8 *ret_3 = data_027e0c68.func_020366c4(); + UnkStruct_020397f8 *ret_3 = gMessageManager.func_020366c4(); if (0x0 < ret_3->mUnk_15c) { return -0x1; @@ -220,7 +220,7 @@ ARM unk32 UnkStruct_020386d8::vfunc_28(s32 param1) { } ARM bool UnkStruct_020386d8::vfunc_30() { - return data_027e0c68.func_020366c4()->mUnk_15c <= 0; + return gMessageManager.func_020366c4()->mUnk_15c <= 0; } ARM UnkStruct_020386d8::~UnkStruct_020386d8() {} diff --git a/src/Main/Unknown/UnkStruct_02038aa0.cpp b/src/Main/Unknown/UnkStruct_02038aa0.cpp index 31256b1c..038d25b6 100644 --- a/src/Main/Unknown/UnkStruct_02038aa0.cpp +++ b/src/Main/Unknown/UnkStruct_02038aa0.cpp @@ -57,8 +57,8 @@ ARM void UnkStruct_02038aa0::func_02038b74(void) {} // non-matching ARM bool UnkStruct_02038aa0::func_02038b78() { if (data_027e0c54 == 0) { - if ((this->mUnk_50 != 0 && data_027e0c68.func_02036850() != 0) || - (this->mUnk_50 == 0 && data_027e0c68.func_02036824() != 0)) + if ((this->mUnk_50 != 0 && gMessageManager.func_02036850() != 0) || + (this->mUnk_50 == 0 && gMessageManager.func_02036824() != 0)) { return true; } diff --git a/src/Main/Unknown/UnkStruct_020397f8.cpp b/src/Main/Unknown/UnkStruct_020397f8.cpp index 25fdc1bf..dba982d6 100644 --- a/src/Main/Unknown/UnkStruct_020397f8.cpp +++ b/src/Main/Unknown/UnkStruct_020397f8.cpp @@ -212,7 +212,7 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) { local_8c = 0; local_90 = 0; - bVar1 = data_027e0c68.mUnk_28[this->mUnk_50]; + bVar1 = gMessageManager.mUnk_28[this->mUnk_50]; this->vfunc_6C(&local_8c, &local_90); this->func_0203a188(local_8c + param1, local_90 + param2); @@ -313,9 +313,9 @@ ARM void UnkStruct_020397f8::func_0203a188(s32 param1, s32 param2) { return; } - // (short)(ushort)*(byte *)((int)data_027e0c68.mUnk_28[(this->mUnk_50 - 0x28) * 0x18]; + // (short)(ushort)*(byte *)((int)gMessageManager.mUnk_28[(this->mUnk_50 - 0x28) * 0x18]; - iVar6 = data_027e0c68.mUnk_10 + this->mUnk_50; + iVar6 = gMessageManager.mUnk_10 + this->mUnk_50; // uStack_24 = param_4; if (data_027e0cbc.func_0203d7e0(data_02056a00[iVar6]) != 0) { @@ -514,7 +514,7 @@ ARM void UnkStruct_020397f8::vfunc_50(EntryINF1 *param1, unk32 param2, s32 *para iVar6 = param3[0]; if (data_027e0c54 != 0) { - UnkStruct_020397f8 *pVar4 = data_027e0c68.func_02036700(); + UnkStruct_020397f8 *pVar4 = gMessageManager.func_02036700(); if (pVar4 != NULL && pVar4->mUnk_15c > 0) { this->func_02038b40(); @@ -524,7 +524,7 @@ ARM void UnkStruct_020397f8::vfunc_50(EntryINF1 *param1, unk32 param2, s32 *para if (*((s32 *) data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) { - UnkStruct_020397f8 *pVar4 = (UnkStruct_020397f8 *) data_027e0c68.mUnk_28[4]; + UnkStruct_020397f8 *pVar4 = (UnkStruct_020397f8 *) gMessageManager.mUnk_28[4]; if (pVar4 != NULL && pVar4->mUnk_15c > 0) { this->func_02038b40(); @@ -790,7 +790,7 @@ ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1 *param1, unk32 param2 } // PTR_PTR_0203b5ac[(byte)param_1[0x50]] = (char)uVar6; - data_027e0c68.mUnk_28[this->mUnk_50]->mUnk_50 = uVar6; + gMessageManager.mUnk_28[this->mUnk_50]->mUnk_50 = uVar6; if (this->mUnk_15e == 7) { uVar5 = func_0202d5b4(data_02057f08, data_02057eec, data_020691a0, 0xCC00, 1); @@ -853,7 +853,7 @@ ARM void UnkStruct_020397f8::vfunc_64(s16 *param1) { // non-matching ARM void UnkStruct_020397f8::func_0203b764() { - s32 i = data_027e0c68.mUnk_00[this->mUnk_50]; + s32 i = gMessageManager.mUnk_00[this->mUnk_50]; this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]); From 8003089294daef5ccb9b3a73eac8a4496457f178 Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 1 Jul 2025 00:01:30 +0200 Subject: [PATCH 61/64] Fix match --- config/eur/arm9/delinks.txt | 2 +- include/Item/ItemManager.hpp | 1 - include/Message/BMG.hpp | 13 +++++----- include/Unknown/UnkStruct_02037750.hpp | 2 +- src/Main/Unknown/UnkStruct_02037750.cpp | 34 ++++++++++++------------- 5 files changed, 24 insertions(+), 28 deletions(-) diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index c71693b4..99db48e3 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -38,7 +38,7 @@ src/Main/Message/BMG.cpp: src/Main/Unknown/UnkStruct_02037750.cpp: .text start:0x02037750 end:0x020387e0 - .data start:0x02057d00 end:0x02057d70 + .data start:0x02057cb8 end:0x02057d70 src/Main/Unknown/UnkStruct_02038aa0.cpp: .text start:0x0203881c end:0x02039578 diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 3d32bbbe..3de57def 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -207,4 +207,3 @@ public: }; extern ItemManager *gItemManager; -extern UnkStruct_027e0d38 *data_027e0d38; diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index b438a0da..c3d4479d 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -5,19 +5,18 @@ #include "types.h" #define BMG_MAGIC "MESGbmg1" -#define BMG_TAG(a, b, c, d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) #define BMG_GET_INF1(pGroups, flags) ((pGroups)->entries[(flags) >> 0x10].func_02037258((flags) & 0xFFFF)) #define BMG_GET_MSG_OFFSET(pGroups, flags) (BMG_GET_INF1((pGroups), (flags))->offset) #define BMG_GET_MSG_ADDR(pGroups, flags) \ ((u32) (pGroups)->entries[(flags) >> 0x10].pDAT1 + (BMG_GET_MSG_OFFSET((pGroups), (flags)) & ~1)) enum BMGTag { - /* "INF1" */ BMG_TAG_INF1 = BMG_TAG('I', 'N', 'F', '1'), - /* "FLW1" */ BMG_TAG_FLW1 = BMG_TAG('F', 'L', 'W', '1'), - /* "FLI1" */ BMG_TAG_FLI1 = BMG_TAG('F', 'L', 'I', '1'), - /* "DAT1" */ BMG_TAG_DAT1 = BMG_TAG('D', 'A', 'T', '1'), - /* "MID1" */ BMG_TAG_MID1 = BMG_TAG('M', 'I', 'D', '1'), - /* "MID1" */ BMG_TAG_STR1 = BMG_TAG('S', 'T', 'R', '1'), + /* "INF1" */ BMG_TAG_INF1 = '1FNI', + /* "FLW1" */ BMG_TAG_FLW1 = '1WLF', + /* "FLI1" */ BMG_TAG_FLI1 = '1ILF', + /* "DAT1" */ BMG_TAG_DAT1 = '1TAD', + /* "MID1" */ BMG_TAG_MID1 = '1DIM', + /* "STR1" */ BMG_TAG_STR1 = '1RTS', }; enum BMGEncoding { diff --git a/include/Unknown/UnkStruct_02037750.hpp b/include/Unknown/UnkStruct_02037750.hpp index 359d5fd2..a480c1a3 100644 --- a/include/Unknown/UnkStruct_02037750.hpp +++ b/include/Unknown/UnkStruct_02037750.hpp @@ -37,7 +37,7 @@ public: UnkStruct_02037750(unk32 param1, unk32 param2); static LinkStateInteract *GetLinkStateInteract(); - void func_020385d0(s32 param1, u8 *param2); + unk32 func_020385d0(s32 param1, u8 *param2); }; class UnkStruct_020386d8_24 { diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp index 489c4534..0fa56bfb 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -48,7 +48,6 @@ ARM bool UnkStruct_02037750::vfunc_24(unk32 param1) { ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { u16 uVar1; s64 lVar2; - Random *pRVar3; char cVar4; u16 uVar5; int iVar6; @@ -59,8 +58,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { u32 uVar11; bool bVar12; - pRVar3 = gRandom; - uVar7 = (u32) * (u16 *) (param1 + 0x2); + uVar7 = (u32) * (u16 *) (param1 + 0x2); if (uVar7 >= 0xF && uVar7 <= 0x2E) { pcVar8 = this->mUnk_04[((uVar7 - 0xF) << 0x1E) >> 0x1C]; @@ -101,17 +99,17 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { if (uVar7 == 0x0) { uVar10 = 0x0; } else { - lVar2 = gRandom->mRandomValue * gRandom->mFactor; - uVar10 = gRandom->Next(lVar2); - // uVar10 = *(int *)((int)&gRandom->mAddend + 0x4) + - // *(int *)((int)&gRandom->mFactor + 0x4) * - // *(uint *)&gRandom->mRandomValue + *(uint *)&gRandom->mFactor * - // *(int *)((int)&gRandom->mRandomValue + 0x4) + - // (lVar2 >> 0x20) + (gRandom->mAddend << uVar11); // CARRY4 + lVar2 = gRandom.mRandomValue * gRandom.mFactor; + uVar10 = gRandom.Next(lVar2); + // uVar10 = *(int *)((int)&gRandom.mAddend + 0x4) + + // *(int *)((int)&gRandom.mFactor + 0x4) * + // *(uint *)&gRandom.mRandomValue + *(uint *)&gRandom.mFactor * + // *(int *)((int)&gRandom.mRandomValue + 0x4) + + // (lVar2 >> 0x20) + (gRandom.mAddend << uVar11); // CARRY4 // part of the inline? - // *(uint *)&gRandom->mRandomValue = *(uint *)&gRandom->mAddend + uVar11; - // *(uint *)((int)&gRandom->mRandomValue + 0x4) = uVar10; + // *(uint *)&gRandom.mRandomValue = *(uint *)&gRandom.mAddend + uVar11; + // *(uint *)((int)&gRandom.mRandomValue + 0x4) = uVar10; if (uVar7 != 0x0) { uVar10 = (uVar7 * uVar10 >> 0x20); @@ -126,9 +124,9 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { case 0x9: break; case 0xa: break; case 0xb: - lVar2 = gRandom->mRandomValue * gRandom->mFactor; + lVar2 = gRandom.mRandomValue * gRandom.mFactor; uVar7 = lVar2; - uVar10 = gRandom->Next(uVar7); + uVar10 = gRandom.Next(uVar7); return (int) (uVar10 * 0x64 >> 0x20) < (param1 + 0x4); case 0xc: @@ -136,9 +134,9 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { if (uVar7 == 0x0) { uVar10 = 0x0; } else { - lVar2 = gRandom->mRandomValue * gRandom->mFactor; + lVar2 = gRandom.mRandomValue * gRandom.mFactor; uVar11 = lVar2; - uVar10 = gRandom->Next(uVar11); + uVar10 = gRandom.Next(uVar11); if (uVar7 != 0x0) { uVar10 = (uVar7 * uVar10 >> 0x20); @@ -159,9 +157,9 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { if (uVar7 == 0x0) { uVar10 = 0x0; } else { - lVar2 = gRandom->mRandomValue * gRandom->mFactor; + lVar2 = gRandom.mRandomValue * gRandom.mFactor; uVar11 = lVar2; - uVar10 = gRandom->Next(uVar11); + uVar10 = gRandom.Next(uVar11); if (uVar7 != 0x0) { uVar10 = (uVar7 * uVar10 >> 0x20); From 4aaa8c1da392e3893b36d4fd34b56830e923b955 Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 1 Jul 2025 00:20:45 +0200 Subject: [PATCH 62/64] Port delinks to usa --- config/usa/arm9/delinks.txt | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/config/usa/arm9/delinks.txt b/config/usa/arm9/delinks.txt index d3ab3589..3913ca13 100644 --- a/config/usa/arm9/delinks.txt +++ b/config/usa/arm9/delinks.txt @@ -17,3 +17,37 @@ libs/cpp/src/__register_global_object.cpp: complete .text start:0x0204f890 end:0x0204f8b0 .bss start:0x02076d48 end:0x02076d4c + +src/Main/Message/BmgRelatedFunctions.cpp: + .text start:0x0202d3b8 end:0x0202d568 + +src/Main/Unknown/UnkStruct_02032f0c.cpp: + .text start:0x02032f08 end:0x02033cfc + +src/Main/Unknown/UnkStruct_02035064.cpp: + .text start:0x02035020 end:0x0203532c + .data start:0x02057ae0 end:0x02057ae8 + +src/Main/Message/MessageManager.cpp: + .text start:0x020363f8 end:0x02037170 + +src/Main/Message/BMG.cpp: + .text start:0x02037170 end:0x02037408 + .data start:0x02057b30 end:0x02057c70 + .rodata start:0x02056914 end:0x0205699c + +src/Main/Unknown/UnkStruct_02037750.cpp: + .text start:0x0203770c end:0x0203879c + .data start:0x02057c70 end:0x02057d28 + +src/Main/Unknown/UnkStruct_02038aa0.cpp: + .text start:0x020387d8 end:0x02039534 + +src/Main/Message/func_0203c358.cpp: + .text start:0x0203c314 end:0x0203c6e8 + +src/Main/Message/func_0203c72c.cpp: + .text start:0x0203c6e8 end:0x0203c864 + +src/Main/Unknown/UnkStruct_0203dae0.cpp: + .text start:0x0203da9c end:0x0203e740 From 0567d5aaa59eee67d07f1ca013bee0268e038d2e Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 1 Jul 2025 00:24:41 +0200 Subject: [PATCH 63/64] Clang format --- include/Message/MessageManager.hpp | 4 +- src/Main/Message/BmgRelatedFunctions.cpp | 105 +++++++++++------------ 2 files changed, 54 insertions(+), 55 deletions(-) diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 28e4764e..ed4ddcd2 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -3,11 +3,11 @@ #include "global.h" #include "types.h" +#include "Debug/DebugHierarchy.hpp" #include "Message/BMG.hpp" #include "Message/MsgProc.hpp" #include "System/SysNew.hpp" #include "nds/math.h" -#include "Debug/DebugHierarchy.hpp" #include "Unknown/UnkStruct_0202e1a0.hpp" #include "Unknown/UnkStruct_02032f0c.hpp" @@ -36,7 +36,7 @@ public: /* 0x20 */ UnkStruct_02037750 *mUnk_20[2]; /* 0x28 */ UnkStruct_02038aa0 *mUnk_28[6]; //! TODO: is it the right type? /* 0x40 */ UnkStruct_020397f8 *mUnk_40[2]; // is array size 6? - /* 0x48 */ DebugHierarchy* mDebug; + /* 0x48 */ DebugHierarchy *mDebug; /* 0x4C */ static void func_0203643c(u32 *param_1, MessageManager *param_2, u32 param_3); diff --git a/src/Main/Message/BmgRelatedFunctions.cpp b/src/Main/Message/BmgRelatedFunctions.cpp index 579d5fe9..dcb3d255 100644 --- a/src/Main/Message/BmgRelatedFunctions.cpp +++ b/src/Main/Message/BmgRelatedFunctions.cpp @@ -7,61 +7,60 @@ extern "C" { THUMB void func_0202d3bc(int param_1, unsigned int *param_2, char *path, int param_4, int param_5, bool param_6, int param_7, int param_8) { - /* - bool bVar1; - dword dVar2; - int iVar3; - dword *pdVar4; - uint uVar5; - dword local_64; - astruct_3 aStack_60; - dword *pdStack_18; + // bool bVar1; + // dword dVar2; + // int iVar3; + // dword *pdVar4; + // uint uVar5; + // dword local_64; + // astruct_3 aStack_60; + // dword *pdStack_18; - pdVar4 = (dword *)(uint)param_4; - *(char **)PTR_DWORD_0202d46c = path; - local_64 = DWORD_0202d470; - if (pdVar4 != (dword *)0x0) { - *pdVar4 = DWORD_0202d470; - } - pdStack_18 = pdVar4; - astruct_3(&aStack_60); - bVar1 = FUN_02041e7c(&aStack_60,path); - if (bVar1) { - uVar5 = aStack_60._40_4_ - aStack_60._36_4_; - if (uVar5 != 0) { - if (param_6) { - local_64 = FUN_0202d23c(&aStack_60,param_1,param_2,param_5,0,uVar5,pdVar4,param_7,param_8); - } - else { - if (param_7 == 0) { - dVar2 = FUN_0202d1c4(param_1,param_2,uVar5,param_5); - } - else { - dVar2 = 0; - if (uVar5 <= param_8) { - dVar2 = param_7; - } - } - if (dVar2 != 0) { - iVar3 = astruct_3::FUN_02041fa4(&aStack_60,dVar2,uVar5); - if (iVar3 == -1) { - if (param_7 == 0) { - FUN_0202d21c(dVar2); - } - } - else { - local_64 = dVar2; - if (pdVar4 != (dword *)0x0) { - *pdVar4 = uVar5; - } - } - } - } - } - astruct_3::FUN_02041ea8(&aStack_60); - } + // pdVar4 = (dword *)(uint)param_4; + // *(char **)PTR_DWORD_0202d46c = path; + // local_64 = DWORD_0202d470; + // if (pdVar4 != (dword *)0x0) { + // *pdVar4 = DWORD_0202d470; + // } + // pdStack_18 = pdVar4; + // astruct_3(&aStack_60); + // bVar1 = FUN_02041e7c(&aStack_60,path); + // if (bVar1) { + // uVar5 = aStack_60._40_4_ - aStack_60._36_4_; + // if (uVar5 != 0) { + // if (param_6) { + // local_64 = FUN_0202d23c(&aStack_60,param_1,param_2,param_5,0,uVar5,pdVar4,param_7,param_8); + // } + // else { + // if (param_7 == 0) { + // dVar2 = FUN_0202d1c4(param_1,param_2,uVar5,param_5); + // } + // else { + // dVar2 = 0; + // if (uVar5 <= param_8) { + // dVar2 = param_7; + // } + // } + // if (dVar2 != 0) { + // iVar3 = astruct_3::FUN_02041fa4(&aStack_60,dVar2,uVar5); + // if (iVar3 == -1) { + // if (param_7 == 0) { + // FUN_0202d21c(dVar2); + // } + // } + // else { + // local_64 = dVar2; + // if (pdVar4 != (dword *)0x0) { + // *pdVar4 = uVar5; + // } + // } + // } + // } + // } + // astruct_3::FUN_02041ea8(&aStack_60); + // } - return local_64;*/ + // return local_64; } THUMB void func_0202d550(int param_1, unsigned int *param_2, char *path, int param_4, int param_5, bool param_6) { From d5ee59ebf71787a0c6a8ac9c5f5890e79407c60d Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 1 Jul 2025 00:35:22 +0200 Subject: [PATCH 64/64] Bump objdiff --- tools/configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/configure.py b/tools/configure.py index 0662b332..ef93ed71 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -28,7 +28,7 @@ args = parser.parse_args() GAME = "ph" DSD_VERSION = 'v0.9.1' WIBO_VERSION = '0.6.16' -OBJDIFF_VERSION = 'v2.7.1' +OBJDIFF_VERSION = 'v3.0.0-beta.6' MWCC_VERSION = "2.0/sp1p5" DECOMP_ME_COMPILER = "mwcc_30_131" CC_FLAGS = " ".join([