post-update cleanup: step 2

This commit is contained in:
Yanis002
2025-02-05 00:46:13 +01:00
parent b072add951
commit 7173439cd8
26 changed files with 1877 additions and 2166 deletions
+1 -1
View File
@@ -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++) {
-100
View File
@@ -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() {
}
-44
View File
@@ -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;
}
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -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);
+1 -1
View File
@@ -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;
-71
View File
@@ -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;
}
+106 -32
View File
@@ -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() {}
+21 -9
View File
@@ -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() {}
+47 -22
View File
@@ -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() {
}
+238 -40
View File
@@ -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);
}
File diff suppressed because it is too large Load Diff
+85 -23
View File
@@ -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) {}