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

renamed some classes

Browse Source
This commit is contained in:
Yanis002
2025-01-30 17:36:52 +01:00
parent 1c316549d4
commit 268d0822eb
11 changed files with 250 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Main/Message/MessageManager.cpp
+32 -32
View File
@@ -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++) {
src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp
+6 -6
View File
@@ -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);
}
src/Main/Message/func_02032f0c.cpp
+1 -1
View File
@@ -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;
src/Main/Message/func_0203744c.cpp
+3 -3
View File
@@ -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() {
}
src/Main/Message/func_020397f8.cpp
+52 -52
View File
@@ -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() {
}
src/Main/Message/func_0203c8a8.cpp
+7 -7
View File
@@ -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);