mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-07-11 14:38:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

post-update cleanup: step 3 (1/2)

Browse Source
This commit is contained in:
Yanis002
2025-02-05 01:47:40 +01:00
parent 7173439cd8
commit 5bd0f31b8b
21 changed files with 611 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/DTCM/UnkStruct_027e103c.hpp
+1 -1
View File
@@ -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();
include/Message/BMG.hpp
+1 -1
View File
@@ -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
include/Message/MessageManager.hpp
+8 -8
View File
@@ -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);
include/Message/MsgProc.hpp
+10 -10
View File
@@ -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);
include/Unknown/UnkStruct_02032f0c.hpp
+4 -1
View File
@@ -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);
include/Unknown/UnkStruct_02035064.hpp
+4 -1
View File
@@ -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();
include/Unknown/UnkStruct_02037750.hpp
+2 -2
View File
@@ -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();
include/Unknown/UnkStruct_02038aa0.hpp
+12 -11
View File
@@ -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);
};
include/Unknown/UnkStruct_020397f8.hpp
+20 -11
View File
@@ -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;
include/Unknown/UnkStruct_0203dae0.hpp
+2 -1
View File
@@ -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;