mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-23 15:01:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

more progress

Browse Source
This commit is contained in:
Yanis002
2025-01-31 02:01:55 +01:00
parent a0c3bf4da2
commit 808b6f311c
7 changed files with 251 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/eur/arm9/symbols.txt
+16 -16
View File
@@ -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
config/usa/arm9/symbols.txt
+16 -16
View File
@@ -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
include/DTCM/UnkStruct_027e103c.hpp
+1
View File
@@ -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*);
include/Message/BMG.hpp
+4 -1
View File
@@ -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 {
include/Message/MsgProc.hpp
+63 -40
View File
@@ -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;
src/Main/Message/func_02038aa0.cpp
+146 -28
View File
@@ -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;
src/Main/Message/func_0203c8a8.cpp
+5 -5
View File
@@ -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) {