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

fix function names (and more)

Browse Source
This commit is contained in:
Yanis002
2025-01-27 21:21:40 +01:00
parent 277517b3be
commit 06a1f74615
7 changed files with 223 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Main/Message/MessageManager.cpp
+12 -24
View File
@@ -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();
}
}
src/Main/Message/UnkStruct_027E0C68_UnkSubClass1.cpp
+7 -7
View File
@@ -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);
}
src/Main/Message/func_020397f8.cpp
+20 -20
View File
@@ -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;
}
src/Main/Message/func_0203c8a8.cpp
+2 -2
View File
@@ -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);