summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYanis002 <35189056+Yanis002@users.noreply.github.com>2025-02-12 20:20:34 +0100
committerYanis002 <35189056+Yanis002@users.noreply.github.com>2025-02-12 20:20:34 +0100
commit30bd3562ab974bc479d75d7dcf6f9cb9845ba724 (patch)
tree7fafe7b8584521c8bd628dcafe55e573f2063fb0 /src
parentbfa8a9e376848ee20575fde62718c1a019e86f29 (diff)
format
Diffstat (limited to 'src')
-rw-r--r--src/00_Core/DTCM/UnkStruct_027e103c.cpp2
-rw-r--r--src/Main/Message/BMG.cpp58
-rw-r--r--src/Main/Message/BmgRelatedFunctions.cpp91
-rw-r--r--src/Main/Message/MessageManager.cpp133
-rw-r--r--src/Main/Message/func_0203c358.cpp28
-rw-r--r--src/Main/Message/func_0203c72c.cpp24
-rw-r--r--src/Main/Unknown/UnkStruct_02032f0c.cpp18
-rw-r--r--src/Main/Unknown/UnkStruct_02035064.cpp6
-rw-r--r--src/Main/Unknown/UnkStruct_02037750.cpp81
-rw-r--r--src/Main/Unknown/UnkStruct_02038aa0.cpp76
-rw-r--r--src/Main/Unknown/UnkStruct_020397f8.cpp211
-rw-r--r--src/Main/Unknown/UnkStruct_0203dae0.cpp24
12 files changed, 346 insertions, 406 deletions
diff --git a/src/00_Core/DTCM/UnkStruct_027e103c.cpp b/src/00_Core/DTCM/UnkStruct_027e103c.cpp
index 98df9114..e455c9c9 100644
--- a/src/00_Core/DTCM/UnkStruct_027e103c.cpp
+++ b/src/00_Core/DTCM/UnkStruct_027e103c.cpp
@@ -59,7 +59,7 @@ void UnkStruct_027e103c::func_ov000_020cfa70(s32 param1, s32 param2) {}
unk8 UnkStruct_027e103c::func_ov000_020cfab0() {}
void UnkStruct_027e103c::func_ov000_020cfabc(s32 param1, s32 param2) {}
void UnkStruct_027e103c::func_ov000_020cfae8(s32 param1, s32 param2) {}
-void UnkStruct_027e103c::func_ov000_020cfb20(void* param1) {}
+void UnkStruct_027e103c::func_ov000_020cfb20(void *param1) {}
void UnkStruct_027e103c::func_ov000_020cfb38() {}
void UnkStruct_027e103c::func_ov000_020cfb48() {}
void UnkStruct_027e103c::func_ov000_020cfb58() {}
diff --git a/src/Main/Message/BMG.cpp b/src/Main/Message/BMG.cpp
index 15fab32a..cb9deac8 100644
--- a/src/Main/Message/BMG.cpp
+++ b/src/Main/Message/BMG.cpp
@@ -3,15 +3,15 @@ extern "C" {
}
#include "Message/BMG.hpp"
-char* func_0202ab38(u32* lang);
-u32* func_0202d550(int, u32*, char* path, int, int, int);
-void func_0202d590(BMGHeader*);
+char *func_0202ab38(u32 *lang);
+u32 *func_0202d550(int, u32 *, char *path, int, int, int);
+void func_0202d590(BMGHeader *);
extern u32 *data_027e0ce0[];
extern u32 data_027e05f4; // language
-extern u32* data_ov002_0210016c;
+extern u32 *data_ov002_0210016c;
-static char* sBMGFileNames[BMG_FILE_INDEX_MAX] = {
+static char *sBMGFileNames[BMG_FILE_INDEX_MAX] = {
"system", // BMG_FILE_INDEX_SYSTEM
"regular", // BMG_FILE_INDEX_REGULAR
"battle", // BMG_FILE_INDEX_BATTLE
@@ -50,26 +50,26 @@ static char* sBMGFileNames[BMG_FILE_INDEX_MAX] = {
THUMB void BMGFileInfo::func_020371b4() {
this->pHeader = NULL;
- this->pINF1 = NULL;
- this->pFLW1 = NULL;
- this->pFLI1 = NULL;
- this->pDAT1 = NULL;
+ this->pINF1 = NULL;
+ this->pFLW1 = NULL;
+ this->pFLI1 = NULL;
+ this->pDAT1 = NULL;
this->mUnk_14 = NULL;
this->mUnk_18 = 0;
}
// non-matching (equivalent)
-THUMB u16 BMGFileInfo::func_020371c8(u32* pFile, s16 unk_18) {
- SectionBase* pSection;
+THUMB u16 BMGFileInfo::func_020371c8(u32 *pFile, s16 unk_18) {
+ SectionBase *pSection;
u16 groupId;
u32 i;
- BMGHeader* pHeader = (BMGHeader*)pFile;
+ BMGHeader *pHeader = (BMGHeader *) pFile;
- groupId = -1;
+ groupId = -1;
this->mUnk_14 = pHeader;
this->mUnk_18 = unk_18;
this->pHeader = pHeader;
- pSection = (SectionBase*)((u8*)pFile + sizeof(BMGHeader));
+ pSection = (SectionBase *) ((u8 *) pFile + sizeof(BMGHeader));
for (i = 0; i < this->mUnk_14->numSections; i++) {
switch (pSection->tag) {
@@ -80,31 +80,27 @@ THUMB u16 BMGFileInfo::func_020371c8(u32* pFile, s16 unk_18) {
// unused
break;
case BMG_TAG_INF1:
- this->pINF1 = (SectionINF1*)pSection;
- groupId = this->pINF1->groupId;
+ this->pINF1 = (SectionINF1 *) pSection;
+ groupId = this->pINF1->groupId;
break;
case BMG_TAG_DAT1:
//! TODO: fake?
- this->pDAT1 = (SectionDAT1*)(pSection + 1);
- break;
- case BMG_TAG_FLW1:
- this->pFLW1 = (SectionFLW1*)pSection;
- break;
- case BMG_TAG_FLI1:
- this->pFLI1 = (SectionFLI1*)pSection;
+ this->pDAT1 = (SectionDAT1 *) (pSection + 1);
break;
+ case BMG_TAG_FLW1: this->pFLW1 = (SectionFLW1 *) pSection; break;
+ case BMG_TAG_FLI1: this->pFLI1 = (SectionFLI1 *) pSection; break;
}
- pSection = (SectionBase*)((u8*)pSection + pSection->size);
+ pSection = (SectionBase *) ((u8 *) pSection + pSection->size);
}
return groupId;
}
-ARM EntryINF1* BMGFileInfo::func_02037258(u16 param_2) {
+ARM EntryINF1 *BMGFileInfo::func_02037258(u16 param_2) {
if (this->pINF1 != NULL) {
if (param_2 < this->pINF1->numEntries) {
- return (EntryINF1*)((u32)&this->pINF1->entries + this->pINF1->entrySize * param_2);
+ return (EntryINF1 *) ((u32) & this->pINF1->entries + this->pINF1->entrySize * param_2);
}
return NULL;
@@ -115,8 +111,8 @@ ARM EntryINF1* BMGFileInfo::func_02037258(u16 param_2) {
// non-matching
ARM u16 BMGFileInfo::func_0203728c(unk32 param_2) {
- SectionFLI1* pFLI1;
- EntryFLI1* entry;
+ SectionFLI1 *pFLI1;
+ EntryFLI1 *entry;
u32 i;
u16 j;
@@ -151,7 +147,7 @@ ARM u16 BMGFileInfo::func_0203728c(unk32 param_2) {
THUMB void BMGGroups::func_020372f0(BMGFileIndex eIndex, s16 unk_18) {
char bmgPath[64];
BMGFileInfo bmgFile;
- u32* pFile;
+ u32 *pFile;
u16 groupId;
// path to the bmg file for the current language (i.e.: "English/Message/battle.bmg")
@@ -180,8 +176,8 @@ THUMB void BMGGroups::func_020372f0(BMGFileIndex eIndex, s16 unk_18) {
bmgFile.func_020371b4();
// assign sections and set the file info in the groups entries
- groupId = bmgFile.func_020371c8(pFile, unk_18);
- this->entries[groupId] = bmgFile;
+ groupId = bmgFile.func_020371c8(pFile, unk_18);
+ this->entries[groupId] = bmgFile;
this->entries[groupId].groupId = groupId;
}
diff --git a/src/Main/Message/BmgRelatedFunctions.cpp b/src/Main/Message/BmgRelatedFunctions.cpp
index cc8da5b6..579d5fe9 100644
--- a/src/Main/Message/BmgRelatedFunctions.cpp
+++ b/src/Main/Message/BmgRelatedFunctions.cpp
@@ -5,64 +5,65 @@ extern "C" {
#include "global.h"
#include "types.h"
-THUMB void func_0202d3bc(int param_1, unsigned int* param_2, char* path, int param_4, int param_5, bool param_6, int param_7, int param_8) {
+THUMB void func_0202d3bc(int param_1, unsigned int *param_2, char *path, int param_4, int param_5, bool param_6, int param_7,
+ int param_8) {
/*
- bool bVar1;
- dword dVar2;
- int iVar3;
- dword *pdVar4;
- uint uVar5;
- dword local_64;
- astruct_3 aStack_60;
- dword *pdStack_18;
-
- pdVar4 = (dword *)(uint)param_4;
- *(char **)PTR_DWORD_0202d46c = path;
- local_64 = DWORD_0202d470;
- if (pdVar4 != (dword *)0x0) {
- *pdVar4 = DWORD_0202d470;
- }
- pdStack_18 = pdVar4;
- astruct_3(&aStack_60);
- bVar1 = FUN_02041e7c(&aStack_60,path);
- if (bVar1) {
- uVar5 = aStack_60._40_4_ - aStack_60._36_4_;
- if (uVar5 != 0) {
- if (param_6) {
- local_64 = FUN_0202d23c(&aStack_60,param_1,param_2,param_5,0,uVar5,pdVar4,param_7,param_8);
- }
- else {
- if (param_7 == 0) {
- dVar2 = FUN_0202d1c4(param_1,param_2,uVar5,param_5);
+ bool bVar1;
+ dword dVar2;
+ int iVar3;
+ dword *pdVar4;
+ uint uVar5;
+ dword local_64;
+ astruct_3 aStack_60;
+ dword *pdStack_18;
+
+ pdVar4 = (dword *)(uint)param_4;
+ *(char **)PTR_DWORD_0202d46c = path;
+ local_64 = DWORD_0202d470;
+ if (pdVar4 != (dword *)0x0) {
+ *pdVar4 = DWORD_0202d470;
+ }
+ pdStack_18 = pdVar4;
+ astruct_3(&aStack_60);
+ bVar1 = FUN_02041e7c(&aStack_60,path);
+ if (bVar1) {
+ uVar5 = aStack_60._40_4_ - aStack_60._36_4_;
+ if (uVar5 != 0) {
+ if (param_6) {
+ local_64 = FUN_0202d23c(&aStack_60,param_1,param_2,param_5,0,uVar5,pdVar4,param_7,param_8);
}
else {
- dVar2 = 0;
- if (uVar5 <= param_8) {
- dVar2 = param_7;
+ if (param_7 == 0) {
+ dVar2 = FUN_0202d1c4(param_1,param_2,uVar5,param_5);
}
- }
- if (dVar2 != 0) {
- iVar3 = astruct_3::FUN_02041fa4(&aStack_60,dVar2,uVar5);
- if (iVar3 == -1) {
- if (param_7 == 0) {
- FUN_0202d21c(dVar2);
+ else {
+ dVar2 = 0;
+ if (uVar5 <= param_8) {
+ dVar2 = param_7;
}
}
- else {
- local_64 = dVar2;
- if (pdVar4 != (dword *)0x0) {
- *pdVar4 = uVar5;
+ if (dVar2 != 0) {
+ iVar3 = astruct_3::FUN_02041fa4(&aStack_60,dVar2,uVar5);
+ if (iVar3 == -1) {
+ if (param_7 == 0) {
+ FUN_0202d21c(dVar2);
+ }
+ }
+ else {
+ local_64 = dVar2;
+ if (pdVar4 != (dword *)0x0) {
+ *pdVar4 = uVar5;
+ }
}
}
}
}
+ astruct_3::FUN_02041ea8(&aStack_60);
}
- astruct_3::FUN_02041ea8(&aStack_60);
- }
- return local_64;*/
+ return local_64;*/
}
-THUMB void func_0202d550(int param_1, unsigned int* param_2, char* path, int param_4, int param_5, bool param_6) {
+THUMB void func_0202d550(int param_1, unsigned int *param_2, char *path, int param_4, int param_5, bool param_6) {
func_0202d3bc(param_1, param_2, path, param_4, param_5, param_6, 0, 0);
}
diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp
index f663ad59..a1a5da09 100644
--- a/src/Main/Message/MessageManager.cpp
+++ b/src/Main/Message/MessageManager.cpp
@@ -3,28 +3,29 @@
#include "Player/TouchControl.hpp"
#include "System/SysNew.hpp"
-extern ARM unk32 func_ov000_020d7f18(u32*, unk32);
-extern ARM unk32 func_02037628(u8*);
+extern ARM unk32 func_ov000_020d7f18(u32 *, unk32);
+extern ARM unk32 func_02037628(u8 *);
-extern u32* data_027e0ce0[];
+extern u32 *data_027e0ce0[];
extern u32 data_02056924[];
-extern UnkStruct_MsgProc_Base_unk_2C* data_02068e6c;
-extern UnkStruct_MsgProc_Base_unk_2C* data_02068e8c;
+extern UnkStruct_MsgProc_Base_unk_2C *data_02068e6c;
+extern UnkStruct_MsgProc_Base_unk_2C *data_02068e8c;
extern u16 data_02056918[];
extern ActorTypeId data_0205691c[];
struct UnkStruct_027e0ffc {
- void func_ov000_020cec60(u16, Vec3p*, Actor*, unk32);
+ void func_ov000_020cec60(u16, Vec3p *, Actor *, unk32);
};
-extern UnkStruct_027e0ffc* data_027e0ffc;
+extern UnkStruct_027e0ffc *data_027e0ffc;
extern u32 data_027e0618[];
// non-matching
-ARM void UnkStruct_027E0C68::func_0203643c(u32 *param_1, UnkStruct_027E0C68* param_2, u32 param_3) {
+ARM void UnkStruct_027E0C68::func_0203643c(u32 *param_1, UnkStruct_027E0C68 *param_2, u32 param_3) {
BMGGroups *pBVar2 = param_2->pGroups;
- *param_1 = ((u32)pBVar2->entries[param_3 >> 0x10].pDAT1 + (pBVar2->entries[param_3 >> 0x10].func_02037258(param_3 & 0xFFFF)->offset & ~1));
+ *param_1 = ((u32) pBVar2->entries[param_3 >> 0x10].pDAT1 +
+ (pBVar2->entries[param_3 >> 0x10].func_02037258(param_3 & 0xFFFF)->offset & ~1));
}
// non-matching
@@ -47,11 +48,8 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32
this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2);
this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLECOMMON, 2);
break;
- case 7:
- this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2);
- break;
- default:
- break;
+ case 7: this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2); break;
+ default: break;
}
for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) {
@@ -85,9 +83,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32
this->mUnk_28[i]->func_0203dc74(0x50, 0x60);
this->mUnk_28[i]->mUnk_2c = &data_02068e6c;
break;
- case 2:
- this->mUnk_28[i] = NULL;
- break;
+ case 2: this->mUnk_28[i] = NULL; break;
case 3:
if (func_0202ab48() == 0) {
this->mUnk_28[i] = new(data_027e0ce0[1], 4) MsgProc_Type2();
@@ -97,8 +93,7 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32
this->mUnk_28[i] = NULL;
}
break;
- default:
- break;
+ default: break;
}
if (this->mUnk_28[i] != NULL) {
@@ -129,30 +124,30 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) {
}
// non-matching
-ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_020366c4(void) {
+ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_020366c4(void) {
if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) {
- return (UnkStruct_020397f8*)this->mUnk_28[2];
+ return (UnkStruct_020397f8 *) this->mUnk_28[2];
}
- return (UnkStruct_020397f8*)this->mUnk_28[0];
+ return (UnkStruct_020397f8 *) this->mUnk_28[0];
}
// non-matching
-ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036700(void) {
+ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036700(void) {
if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) {
- return (UnkStruct_020397f8*)this->mUnk_28[0];
+ return (UnkStruct_020397f8 *) this->mUnk_28[0];
}
- return (UnkStruct_020397f8*)this->mUnk_28[2];
+ return (UnkStruct_020397f8 *) this->mUnk_28[2];
}
-ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_0203673c(void) {
+ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_0203673c(void) {
bool iVar1 = this->func_02036824();
bool iVar2 = this->func_02036850();
if (iVar1) {
return this->mUnk_18[0];
- }
+ }
if (iVar2) {
return this->mUnk_18[1];
@@ -188,21 +183,19 @@ ARM bool UnkStruct_027E0C68::func_020367dc(int param_2) {
}
ARM bool UnkStruct_027E0C68::func_020367ec(void) {
- return ((UnkStruct_020397f8*)this->mUnk_28[0])->mUnk_15c > 0;
+ return ((UnkStruct_020397f8 *) this->mUnk_28[0])->mUnk_15c > 0;
}
ARM bool UnkStruct_027E0C68::func_02036808(void) {
- return ((UnkStruct_020397f8*)this->mUnk_28[2])->mUnk_15c > 0;
+ return ((UnkStruct_020397f8 *) this->mUnk_28[2])->mUnk_15c > 0;
}
ARM bool UnkStruct_027E0C68::func_02036824(void) {
switch (data_027e077c.mUnk_0) {
case 0x01:
case 0x37:
- case 0x3B:
- return true;
- default:
- break;
+ case 0x3B: return true;
+ default: break;
}
return false;
@@ -213,9 +206,9 @@ ARM bool UnkStruct_027E0C68::func_02036850(void) {
return !(data_02056be4[data_027e077c.mUnk_0] & 2) && (data_02056be4[data_027e077c.mUnk_0] & 1);
}
-ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8* param_2) {
+ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8 *param_2) {
if ((param_2->mUnk_18 & ~0xFFFF) != (0x100 << 0x10)) {
- UnkStruct_020397f8* iVar1 = this->func_020366c4();
+ UnkStruct_020397f8 *iVar1 = this->func_020366c4();
if (iVar1->mUnk_15c <= 0) {
param_2->vfunc_10();
@@ -225,7 +218,7 @@ ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8* param_2) {
}
}
-ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750* param_2) {
+ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750 *param_2) {
if (this->mUnk_20[1] != NULL) {
return false;
}
@@ -236,11 +229,11 @@ ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750* param_2) {
// non-matching
ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) {
- UnkStruct_020397f8* unk_28_0;
- UnkStruct_020397f8* unk_28_2;
+ UnkStruct_020397f8 *unk_28_0;
+ UnkStruct_020397f8 *unk_28_2;
UnkStruct_02038aa0 *pSVar4;
ActorRef actorRef;
- Actor* pActor;
+ Actor *pActor;
bool iVar1;
bool iVar2;
s32 i;
@@ -251,10 +244,10 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p
this->mUnk_40[1] = this->mUnk_40[0];
- unk_28_0 = (UnkStruct_020397f8*)this->mUnk_28[0];
+ unk_28_0 = (UnkStruct_020397f8 *) this->mUnk_28[0];
if (unk_28_0 != NULL && unk_28_0->mUnk_15c > 0) {
- unk_28_2 = (UnkStruct_020397f8*)this->mUnk_28[2];
+ unk_28_2 = (UnkStruct_020397f8 *) this->mUnk_28[2];
if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) {
this->mUnk_40[0] = this->func_020366c4();
@@ -262,7 +255,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p
this->mUnk_40[0] = unk_28_2;
}
} else {
- unk_28_2 = (UnkStruct_020397f8*)this->mUnk_28[2];
+ unk_28_2 = (UnkStruct_020397f8 *) this->mUnk_28[2];
if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) {
this->mUnk_40[0] = unk_28_0;
@@ -305,7 +298,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p
this->mUnk_04 = 1;
//! TODO: fake?
- pSVar4 = this->func_02037178((UnkSubClass1_02256FF8*)this->mUnk_18[0]);
+ pSVar4 = this->func_02037178((UnkSubClass1_02256FF8 *) this->mUnk_18[0]);
if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->mUnk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) {
this->mUnk_04 = 0;
@@ -331,7 +324,7 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p
}
ARM void UnkStruct_027E0C68::func_02036bbc(void) {
- UnkStruct_02038aa0* pSVar3;
+ UnkStruct_02038aa0 *pSVar3;
bool bVar2;
bool bVar4;
s32 i;
@@ -366,7 +359,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) {
s32 i;
for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
- UnkStruct_02038aa0* pSVar1 = this->mUnk_28[i];
+ UnkStruct_02038aa0 *pSVar1 = this->mUnk_28[i];
if (pSVar1 != NULL) {
pSVar1->vfunc_3C(param_2);
@@ -374,7 +367,7 @@ ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) {
}
}
-ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8* param_2, unk32 param_3) {
+ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8 *param_2, unk32 param_3) {
u32 uVar1;
if (param_3 == 0) {
@@ -391,7 +384,7 @@ ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8* param_2, unk32 pa
return false;
}
-ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750* param_2) {
+ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750 *param_2) {
if (this->mUnk_20[0] != NULL && this->mUnk_20[0] != param_2) {
return false;
}
@@ -400,7 +393,7 @@ ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750* param_2) {
return true;
}
-ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750* param_2) {
+ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750 *param_2) {
if (this->mUnk_20[0] == param_2) {
this->mUnk_20[0] = NULL;
return true;
@@ -420,7 +413,7 @@ ARM void UnkStruct_027E0C68::func_02036d6c(void) {
}
// non-matching
-ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) {
+ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02036da8(u32 param_2, s16 *param_3) {
EntryINF1 *pEVar1;
EntryINF1 *pEVar2;
UnkStruct_02038aa0 *pSVar4;
@@ -429,7 +422,7 @@ ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* para
s16 iStack_38;
int iStack_34;
int iStack_30;
-
+
pEVar1 = this->pGroups->entries[param_2 >> 0x10].func_02037258(param_2 & 0xFFFF);
if (pEVar1 == NULL) {
@@ -438,7 +431,7 @@ ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* para
if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) {
pSVar4 = this->mUnk_28[4];
- func_02037628((u8*)&iStack_38);
+ func_02037628((u8 *) &iStack_38);
// ???
bVar6 = (data_02056be4[data_027e077c.mUnk_0] & 1) == 0;
@@ -454,10 +447,10 @@ ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* para
// iStack_30 = param_3[2];
pBVar5 = this->pGroups;
// pSVar4->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1);
- BMGFileInfo* entry = &(pBVar5)->entries[(param_2) >> 0x10];
- // pSVar4->vfunc_50(pEVar1,
+ BMGFileInfo *entry = &(pBVar5)->entries[(param_2) >> 0x10];
+ // pSVar4->vfunc_50(pEVar1,
// ((u32)entry->pDAT1 + (((entry.func_02037258((((param_2))) & 0xFFFF))->offset) & ~1)),
- // // BMG_GET_MSG_ADDR(pBVar5, param_2),
+ // // BMG_GET_MSG_ADDR(pBVar5, param_2),
// (s16*)&iStack_38, 1);
data_ov000_020eec9c.func_ov000_020d77e4(0x1C);
@@ -482,7 +475,7 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) {
auStack_28[21] = local_13;
auStack_28[20] = param_3;
- pSVar1 = this->func_02036f68(param_2, auStack_28);
+ pSVar1 = this->func_02036f68(param_2, auStack_28);
if (pSVar1 != NULL) {
if (this->mUnk_04 == 0) {
@@ -492,13 +485,13 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) {
}
// non-matching
-ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) {
+ARM UnkStruct_020397f8 *UnkStruct_027E0C68::func_02036f68(u32 param_2, u8 *param_3) {
EntryINF1 *pEVar1;
UnkStruct_02038aa0 *pSVar2;
EntryINF1 *pEVar3;
int iVar4;
UnkStruct_020397f8 *pSVar5;
-
+
pEVar1 = this->pGroups->entries[param_2 >> 0x10].func_02037258(param_2 & 0xffff);
if (pEVar1 == NULL) {
@@ -506,35 +499,36 @@ ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param
}
if (param_3[21] != 0) {
- pSVar5 = (UnkStruct_020397f8*)this->mUnk_28[2];
+ pSVar5 = (UnkStruct_020397f8 *) this->mUnk_28[2];
pSVar2 = this->mUnk_28[3];
} else {
- pSVar5 = (UnkStruct_020397f8*)this->mUnk_28[0];
+ pSVar5 = (UnkStruct_020397f8 *) this->mUnk_28[0];
pSVar2 = this->mUnk_28[1];
}
//! TODO: fake?
- pSVar5->mUnk_164 = (UnkStruct_020397f8*)pSVar2;
+ pSVar5->mUnk_164 = (UnkStruct_020397f8 *) pSVar2;
pSVar5->mUnk_418 = this->mUnk_28[5];
- pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s32*)param_3, 0);
+ pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s32 *) param_3, 0);
if (data_ov000_020eec9c.func_ov000_020d7f18(0x19) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x18) == 0 &&
data_ov000_020eec9c.func_ov000_020d7f18(0x34) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x35) == 0 &&
data_ov000_020eec9c.func_ov000_020d7f18(0x1A) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x1B) == 0 &&
- (param_3[12]) != 7) {
+ (param_3[12]) != 7)
+ {
data_ov000_020eec9c.func_ov000_020d77e4(0x1C);
}
return pSVar5;
}
-ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_020370d0(unk32 param_2, unk32 param_3) {
+ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_020370d0(unk32 param_2, unk32 param_3) {
return this->func_020370e8(param_2, -1, -1, param_3);
}
-ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) {
- UnkStruct_020386d8* puVar2;
+ARM UnkStruct_020386d8 *UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) {
+ UnkStruct_020386d8 *puVar2;
if (this->func_02036824()) {
puVar2 = this->mUnk_18[0];
@@ -557,8 +551,8 @@ ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 p
return NULL;
}
-ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) {
- UnkStruct_02038aa0* pSVar1;
+ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8 *param_2) {
+ UnkStruct_02038aa0 *pSVar1;
pSVar1 = this->func_02037178(param_2);
@@ -567,7 +561,7 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) {
}
}
-ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) {
+ARM UnkStruct_02038aa0 *UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8 *param_2) {
s32 i;
for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
@@ -579,5 +573,4 @@ ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8*
return NULL;
}
-ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() {
-}
+ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() {}
diff --git a/src/Main/Message/func_0203c358.cpp b/src/Main/Message/func_0203c358.cpp
index 329c08fd..ee80f15e 100644
--- a/src/Main/Message/func_0203c358.cpp
+++ b/src/Main/Message/func_0203c358.cpp
@@ -1,17 +1,16 @@
-#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 "Message/MessageManager.hpp"
+#include "Message/MsgProc.hpp"
+#include "Player/TouchControl.hpp"
+#include "Save/AdventureFlags.hpp"
#include "System/SysNew.hpp"
+#include "global.h"
-extern "C" void func_0203fc78(unk32*, unk32*);
+extern "C" void func_0203fc78(unk32 *, unk32 *);
THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) :
- UnkStruct_02038aa0(0, 0)
-{
+ UnkStruct_02038aa0(0, 0) {
this->mUnk_162 = 4;
this->mUnk_164 = 1;
this->mUnk_166 = 0;
@@ -28,21 +27,21 @@ THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) {
s16 uVar3;
s32 iVar4;
s32 local_20;
- s32 local_1c [2];
-
+ s32 local_1c[2];
+
this->func_02038b28();
uVar3 = 0;
for (iVar4 = 0; iVar4 < 2; iVar4++) {
local_1c[0] = 0xC0;
- local_20 = 0x10;
+ local_20 = 0x10;
if (iVar4 != 0) {
func_0203fc78(local_1c, &local_20);
}
- uVar1 = this->func_0203d318((s32)(local_1c[0] + 7 + ((u32)(local_1c[0] + 7 >> 2) >> 0x1D)) >> 3,
- (s32)(local_20 + 7 + ((u32)(local_20 + 7 >> 2) >> 0x1D)) >> 3);
+ uVar1 = this->func_0203d318((s32) (local_1c[0] + 7 + ((u32) (local_1c[0] + 7 >> 2) >> 0x1D)) >> 3,
+ (s32) (local_20 + 7 + ((u32) (local_20 + 7 >> 2) >> 0x1D)) >> 3);
if (uVar3 < uVar1) {
uVar3 = uVar1;
@@ -74,5 +73,4 @@ ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) {
return this->UnkStruct_0203dae0::vfunc_14(param_2 + this->mUnk_162, param_3);
}
-ARM MsgProc_Type2::~MsgProc_Type2() {
-}
+ARM MsgProc_Type2::~MsgProc_Type2() {}
diff --git a/src/Main/Message/func_0203c72c.cpp b/src/Main/Message/func_0203c72c.cpp
index 9c5282f1..b61c35be 100644
--- a/src/Main/Message/func_0203c72c.cpp
+++ b/src/Main/Message/func_0203c72c.cpp
@@ -1,18 +1,17 @@
-#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 "Message/MessageManager.hpp"
+#include "Message/MsgProc.hpp"
+#include "Player/TouchControl.hpp"
+#include "Save/AdventureFlags.hpp"
#include "System/SysNew.hpp"
+#include "global.h"
-extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void*, void*);
+extern "C" void func_0204f614(UnkClass_func_ov000_020d0644 *, unk32, unk32, void *, void *);
// non-matching
ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) :
- UnkStruct_02038aa0(1, 0)
-{
+ UnkStruct_02038aa0(1, 0) {
this->mUnk_162 = 1;
this->mUnk_164 = 0x1A;
this->mUnk_166 = 0xA6;
@@ -23,7 +22,8 @@ ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) :
this->mUnk_172 = -1;
this->mUnk_174 = -1;
- func_0204f614(this->mUnk_180, ARRAY_LEN(this->mUnk_180), sizeof(UnkClass_func_ov000_020d0644), UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c);
+ func_0204f614(this->mUnk_180, ARRAY_LEN(this->mUnk_180), sizeof(UnkClass_func_ov000_020d0644),
+ UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c);
this->mUnk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0);
this->mUnk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0);
@@ -31,8 +31,6 @@ ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) :
this->mUnk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0);
}
-ARM void MsgProc_Type3::func_0203c83c(void) {
-}
+ARM void MsgProc_Type3::func_0203c83c(void) {}
-ARM MsgProc_Type3::~MsgProc_Type3() {
-}
+ARM MsgProc_Type3::~MsgProc_Type3() {}
diff --git a/src/Main/Unknown/UnkStruct_02032f0c.cpp b/src/Main/Unknown/UnkStruct_02032f0c.cpp
index f95b7df3..16e22b29 100644
--- a/src/Main/Unknown/UnkStruct_02032f0c.cpp
+++ b/src/Main/Unknown/UnkStruct_02032f0c.cpp
@@ -1,9 +1,9 @@
#include "Unknown/UnkStruct_02032f0c.hpp"
#include "Unknown/UnkStruct_02035064.hpp"
-extern "C" void Fill32(unk32, void*, unk32);
-extern "C" void Fill16(unk32, void*, unk32);
-extern "C" void func_020296e0(unk32**, UnkStruct_MsgProc_Base_unk_2C**, unk32, unk32, unk32, unk32);
+extern "C" void Fill32(unk32, void *, unk32);
+extern "C" void Fill16(unk32, void *, unk32);
+extern "C" void func_020296e0(unk32 **, UnkStruct_MsgProc_Base_unk_2C **, unk32, unk32, unk32, unk32);
extern THUMB unk32 func_0202ab48(void);
ARM UnkStruct_02032e7c::UnkStruct_02032e7c() {
@@ -42,8 +42,7 @@ THUMB UnkStruct_02032f0c::UnkStruct_02032f0c() {
this->mUnk_34 = 3;
}
-THUMB UnkStruct_02032f0c::~UnkStruct_02032f0c() {
-}
+THUMB UnkStruct_02032f0c::~UnkStruct_02032f0c() {}
ARM void UnkStruct_02032f0c::func_02032f94() {}
@@ -64,9 +63,9 @@ ARM s32 UnkStruct_02032f0c::func_02032fb4() {
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;
+
+ iVar1 = ((param1 + 0x7 + ((param1 + 0x7) >> 0x1D))) * 0x8;
+ iVar2 = ((param2 + 0x7 + ((param2 + 0x7) >> 0x1D))) * 0x8;
this->mUnk_4a = param1;
this->mUnk_4c = param2;
this->mUnk_14 = (iVar1 + (iVar1 >> 0x1D)) * 0x2000 >> 0x10;
@@ -107,5 +106,4 @@ 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() {
-}
+ARM UnkStruct_02032e7c::~UnkStruct_02032e7c() {}
diff --git a/src/Main/Unknown/UnkStruct_02035064.cpp b/src/Main/Unknown/UnkStruct_02035064.cpp
index 151cdf8c..7a9646f4 100644
--- a/src/Main/Unknown/UnkStruct_02035064.cpp
+++ b/src/Main/Unknown/UnkStruct_02035064.cpp
@@ -11,11 +11,9 @@ ARM UnkStruct_02035064::UnkStruct_02035064() {
this->mUnk_87 = 0;
}
-ARM UnkStruct_02035064::~UnkStruct_02035064() {
-}
+ARM UnkStruct_02035064::~UnkStruct_02035064() {}
-ARM void UnkStruct_02035064::func_020350b0() {
-}
+ARM void UnkStruct_02035064::func_020350b0() {}
ARM void UnkStruct_02035064::func_020350b4(s32 param1, unk32 param2, unk8 param3, unk16 param4, unk16 param5) {}
diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp
index 9abe3745..f6e739b5 100644
--- a/src/Main/Unknown/UnkStruct_02037750.cpp
+++ b/src/Main/Unknown/UnkStruct_02037750.cpp
@@ -1,13 +1,13 @@
#include "Unknown/UnkStruct_02037750.hpp"
-#include "Message/MessageManager.hpp"
-#include "System/Random.hpp"
-#include "Save/AdventureFlags.hpp"
#include "Actor/ActorManager.hpp"
#include "Item/ItemManager.hpp"
+#include "Message/MessageManager.hpp"
+#include "Save/AdventureFlags.hpp"
+#include "System/Random.hpp"
-extern "C" ARM unk32 func_02037628(u8*);
-extern u8* data_027e0d54;
-extern unk32* data_027e0cb4;
+extern "C" ARM unk32 func_02037628(u8 *);
+extern u8 *data_027e0d54;
+extern unk32 *data_027e0cb4;
ARM UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) {
s32 i;
@@ -34,7 +34,7 @@ ARM void UnkStruct_02037750::vfunc_08(u32 param1) {
this->mUnk_1c = 0;
}
-ARM void UnkStruct_02037750::vfunc_0c(UnkStruct_020397f8* param1) {}
+ARM void UnkStruct_02037750::vfunc_0c(UnkStruct_020397f8 *param1) {}
ARM void UnkStruct_02037750::vfunc_10() {}
ARM bool UnkStruct_02037750::vfunc_24(unk32 param1) {
@@ -58,13 +58,13 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) {
u32 uVar10;
u32 uVar11;
bool bVar12;
-
+
pRVar3 = gRandom;
- uVar7 = (u32)*(u16 *)(param1 + 0x2);
+ uVar7 = (u32) * (u16 *) (param1 + 0x2);
if (uVar7 >= 0xF && uVar7 <= 0x2E) {
pcVar8 = this->mUnk_04[((uVar7 - 0xF) << 0x1E) >> 0x1C];
- iVar9 = 0;
+ iVar9 = 0;
if (pcVar8 != NULL) {
iVar9 = pcVar8(this->mUnk_14);
@@ -73,11 +73,10 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) {
return iVar9;
}
- if ((s32)uVar7 <= 0) {
- switch(uVar7) {
+ if ((s32) uVar7 <= 0) {
+ switch (uVar7) {
case 0x0:
- case 0x2f:
- break;
+ case 0x2f: break;
case 0x7:
if (data_027e0d54[0xd] != 0) {
return -0x1;
@@ -87,7 +86,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) {
case 0x1:
case 0x2:
case 0x3:
- UnkStruct_020397f8* ret_3 = data_027e0c68.func_020366c4();
+ UnkStruct_020397f8 *ret_3 = data_027e0c68.func_020366c4();
if (0x0 < ret_3->mUnk_15c) {
return -0x1;
@@ -102,7 +101,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) {
if (uVar7 == 0x0) {
uVar10 = 0x0;
} else {
- lVar2 = gRandom->mRandomValue * gRandom->mFactor;
+ lVar2 = gRandom->mRandomValue * gRandom->mFactor;
uVar10 = gRandom->Next(lVar2);
// uVar10 = *(int *)((int)&gRandom->mAddend + 0x4) +
// *(int *)((int)&gRandom->mFactor + 0x4) *
@@ -120,30 +119,24 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) {
}
return uVar10;
- case 0x4:
- return gAdventureFlags->Get(param1 + 0x4) != false;
- case 0x5:
- return gActorManager->func_ov00_020c3b2c(NULL) != 0;
- case 0x6:
- break;
- case 0x8:
- return (((data_027e0cb4[(param1 + 0x4) >> 5]) & 1) << ((param1 + 0x4) & 0x1f)) == 0x0;
- case 0x9:
- break;
- case 0xa:
- break;
+ case 0x4: return gAdventureFlags->Get(param1 + 0x4) != false;
+ case 0x5: return gActorManager->func_ov00_020c3b2c(NULL) != 0;
+ case 0x6: break;
+ case 0x8: return (((data_027e0cb4[(param1 + 0x4) >> 5]) & 1) << ((param1 + 0x4) & 0x1f)) == 0x0;
+ case 0x9: break;
+ case 0xa: break;
case 0xb:
- lVar2 = gRandom->mRandomValue * gRandom->mFactor;
- uVar7 = lVar2;
+ lVar2 = gRandom->mRandomValue * gRandom->mFactor;
+ uVar7 = lVar2;
uVar10 = gRandom->Next(uVar7);
- return (int)(uVar10 * 0x64 >> 0x20) < (param1 + 0x4);
+ return (int) (uVar10 * 0x64 >> 0x20) < (param1 + 0x4);
case 0xc:
uVar7 = (param1 + 0x1);
if (uVar7 == 0x0) {
uVar10 = 0x0;
} else {
- lVar2 = gRandom->mRandomValue * gRandom->mFactor;
+ lVar2 = gRandom->mRandomValue * gRandom->mFactor;
uVar11 = lVar2;
uVar10 = gRandom->Next(uVar11);
@@ -151,11 +144,9 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) {
uVar10 = (uVar7 * uVar10 >> 0x20);
}
}
- return (int)(char)uVar10;
- case 0xd:
- return gItemManager->GetNumRupees() != 0;
- case 0xe:
- return gItemManager->HasItem(param1 + 0x4) != 0;
+ return (int) (char) uVar10;
+ case 0xd: return gItemManager->GetNumRupees() != 0;
+ case 0xe: return gItemManager->HasItem(param1 + 0x4) != 0;
default:
if (uVar7 == 0x2f) {
return gItemManager->HasItem((param1 + 0x4) + 0x60) != 0;
@@ -168,7 +159,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) {
if (uVar7 == 0x0) {
uVar10 = 0x0;
} else {
- lVar2 = gRandom->mRandomValue * gRandom->mFactor;
+ lVar2 = gRandom->mRandomValue * gRandom->mFactor;
uVar11 = lVar2;
uVar10 = gRandom->Next(uVar11);
@@ -177,26 +168,25 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) {
}
}
- return (int)(char)uVar10;
+ return (int) (char) uVar10;
}
ARM unk32 UnkStruct_02037750::vfunc_2c(s32 param1) {}
ARM LinkStateInteract *UnkStruct_02037750::GetLinkStateInteract() {
- return (LinkStateInteract*)GetLinkState(2);
+ return (LinkStateInteract *) GetLinkState(2);
}
ARM bool UnkStruct_02037750::vfunc_30() {
return true;
}
-ARM unk32 UnkStruct_02037750::func_020385d0(s32 param1, u8* param2) {}
+ARM unk32 UnkStruct_02037750::func_020385d0(s32 param1, u8 *param2) {}
-ARM void UnkStruct_02037750::vfunc_14() {
-}
+ARM void UnkStruct_02037750::vfunc_14() {}
// non-matching
-ARM void UnkStruct_02037750::vfunc_18(unk32* param1) {
+ARM void UnkStruct_02037750::vfunc_18(unk32 *param1) {
param1[0] = 0;
}
@@ -233,5 +223,4 @@ ARM bool UnkStruct_020386d8::vfunc_30() {
return data_027e0c68.func_020366c4()->mUnk_15c <= 0;
}
-ARM UnkStruct_020386d8::~UnkStruct_020386d8() {
-}
+ARM UnkStruct_020386d8::~UnkStruct_020386d8() {}
diff --git a/src/Main/Unknown/UnkStruct_02038aa0.cpp b/src/Main/Unknown/UnkStruct_02038aa0.cpp
index 94d37f4c..31256b1c 100644
--- a/src/Main/Unknown/UnkStruct_02038aa0.cpp
+++ b/src/Main/Unknown/UnkStruct_02038aa0.cpp
@@ -19,19 +19,19 @@ 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) {
+ UnkStruct_0203dae0(param1),
+ mUnk_124(0) {
this->func_020387e0(this->mUnk_150);
this->pInfoEntry = 0;
this->mUnk_158.y = 0;
- this->mUnk_15c = 0;
- this->mUnk_15e = 0xFF;
- this->mUnk_15f = 0xFF;
- this->mUnk_160 = 1;
- this->mUnk_11e = param2;
+ this->mUnk_15c = 0;
+ this->mUnk_15e = 0xFF;
+ this->mUnk_15f = 0xFF;
+ this->mUnk_160 = 1;
+ this->mUnk_11e = param2;
}
-THUMB UnkStruct_02038aa0::~UnkStruct_02038aa0() {
-}
+THUMB UnkStruct_02038aa0::~UnkStruct_02038aa0() {}
THUMB void UnkStruct_02038aa0::func_02038b28(void) {
this->mUnk_114->mUnk_04 = NULL;
@@ -44,7 +44,7 @@ ARM void UnkStruct_02038aa0::vfunc_4c(u32 param1, unk32 param2) {
ARM void UnkStruct_02038aa0::vfunc_10() {}
ARM void UnkStruct_02038aa0::func_02038b40() {
- this->mUnk_15c = -1;
+ this->mUnk_15c = -1;
this->mUnk_128.mUnk_04 = NULL;
this->func_0203dc10(0);
this->vfunc_48();
@@ -52,13 +52,14 @@ ARM void UnkStruct_02038aa0::func_02038b40() {
ARM void UnkStruct_02038aa0::vfunc_48() {}
-ARM void UnkStruct_02038aa0::func_02038b74(void) {
-}
+ARM void UnkStruct_02038aa0::func_02038b74(void) {}
// non-matching
ARM bool UnkStruct_02038aa0::func_02038b78() {
if (data_027e0c54 == 0) {
- if ((this->mUnk_50 != 0 && data_027e0c68.func_02036850() != 0) || (this->mUnk_50 == 0 && data_027e0c68.func_02036824() != 0)) {
+ if ((this->mUnk_50 != 0 && data_027e0c68.func_02036850() != 0) ||
+ (this->mUnk_50 == 0 && data_027e0c68.func_02036824() != 0))
+ {
return true;
}
@@ -96,7 +97,7 @@ ARM unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) {
}
ARM s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) {
- u8 bVar1 = this->mUnk_2c[0]->mUnk_08[1];
+ u8 bVar1 = this->mUnk_2c[0]->mUnk_08[1];
unk32 iVar2 = this->func_02038cf4();
unk32 iVar1 = this->func_020337d8(param1 + 1);
return iVar2 + iVar1 - bVar1;
@@ -105,7 +106,7 @@ ARM s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) {
ARM s32 UnkStruct_02038aa0::func_02038cf4() {
unk32 iVar1;
unk32 iVar2;
-
+
iVar2 = this->mUnk_18;
iVar1 = this->func_02038d10();
return (iVar2 * 8 - iVar1) / 2;
@@ -133,20 +134,19 @@ ARM bool UnkStruct_02038aa0::func_02038ef4(s32 param1, s32 param2) {
this->func_0203e1b0(local_14 + param1, local_18 + param2, 0);
}
-ARM void UnkStruct_02038aa0::func_02038f40(void) {
-}
+ARM void UnkStruct_02038aa0::func_02038f40(void) {}
ARM void UnkStruct_02038aa0::vfunc_44(s32 touchLastX, s32 touchLastY) {}
// non-matching
-ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4) {
+ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1 *param1, u32 param2, s16 *param3, UnkSubClass1_02256FF8 *param4) {
int iVar1;
-
+
this->pInfoEntry = param1;
- this->mUnk_08 = param4;
- this->mUnk_15f = -1;
- this->mUnk_15c = 0x78;
- this->mUnk_15e = param4->mUnk_0c;
+ this->mUnk_08 = param4;
+ this->mUnk_15f = -1;
+ this->mUnk_15c = 0x78;
+ this->mUnk_15e = param4->mUnk_0c;
this->func_0203dcfc(0, 0, this->mUnk_11e, 2);
this->mUnk_128.func_02038858(param2);
this->mUnk_30 = this->mUnk_150[4] + 5;
@@ -155,7 +155,7 @@ ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1* param1, u32 param2, s16* param3
// this->vfunc_60(0, 0, (unk32)param3);
// this->vfunc_64(param3);
- if (*(unk32*)data_027e0618 == 2) {
+ if (*(unk32 *) data_027e0618 == 2) {
if (this->func_02032fa4() == 0) {
data_027e103c->func_ov000_020cfc9c(1, 0);
} else {
@@ -167,10 +167,10 @@ ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1* param1, u32 param2, s16* param3
}
// non-matching
-ARM void UnkStruct_02038aa0::vfunc_5c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) {
+ARM void UnkStruct_02038aa0::vfunc_5c(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;
@@ -191,8 +191,8 @@ 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->mUnk_15c = 10;
+ARM void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32 *param2, s16 *param3, unk32 param4) {
+ this->mUnk_15c = 10;
this->mUnk_150[2] = 1;
this->func_0203e2ac(param2);
}
@@ -205,22 +205,12 @@ ARM void UnkStruct_02038aa0::vfunc_64() {}
ARM s32 UnkStruct_02038aa0::vfunc_68(unk32 param1) {
switch (param1) {
- case 0:
- break;
- case 1:
- this->mUnk_34 = 4;
- break;
- case 2:
- this->mUnk_34 = 6;
- break;
- case 3:
- this->mUnk_34 = 1;
- break;
- case 4:
- this->mUnk_34 = 0;
- break;
- default:
- break;
+ case 0: break;
+ case 1: this->mUnk_34 = 4; break;
+ case 2: this->mUnk_34 = 6; break;
+ case 3: this->mUnk_34 = 1; break;
+ case 4: this->mUnk_34 = 0; break;
+ default: break;
}
return ((this->mUnk_18 << 3) - this->func_020337d8(param1)) / 2;
diff --git a/src/Main/Unknown/UnkStruct_020397f8.cpp b/src/Main/Unknown/UnkStruct_020397f8.cpp
index 3ecaaf6f..25fdc1bf 100644
--- a/src/Main/Unknown/UnkStruct_020397f8.cpp
+++ b/src/Main/Unknown/UnkStruct_020397f8.cpp
@@ -1,29 +1,30 @@
-#include "Message/MsgProc.hpp"
-#include "Message/MessageManager.hpp"
#include "Unknown/UnkStruct_020397f8.hpp"
#include "DTCM/UnkStruct_027e103c.hpp"
+#include "Message/MessageManager.hpp"
+#include "Message/MsgProc.hpp"
#include "Player/TouchControl.hpp"
#include "Save/AdventureFlags.hpp"
-extern "C" void func_ov000_020d0460(void*);
-extern "C" void func_0203efd8(void*, void*);
-extern "C" void func_0203ee48(void*);
-extern "C" void func_ov018_02169634(UnkStruct_020397f8*);
+extern "C" void func_ov000_020d0460(void *);
+extern "C" void func_0203efd8(void *, void *);
+extern "C" void func_0203ee48(void *);
+extern "C" void func_ov018_02169634(UnkStruct_020397f8 *);
extern unk16 data_02056a0e[];
extern u8 data_02056a08[];
extern u32 data_027e0618[];
THUMB UnkStruct_020397f8::UnkStruct_020397f8() :
- UnkStruct_02038aa0(0, 0), mUnk_164(NULL) {
- UnknownMsgChoiceStruct* puVar3;
+ UnkStruct_02038aa0(0, 0),
+ mUnk_164(NULL) {
+ UnknownMsgChoiceStruct *puVar3;
this->mUnk_410.mUnk_00 = this;
- this->mUnk_414 = 0;
- this->mUnk_418 = NULL;
- this->mUnk_41c = 0;
- this->mUnk_41e = 0;
- this->mUnk_420 = 0;
+ this->mUnk_414 = 0;
+ this->mUnk_418 = NULL;
+ this->mUnk_41c = 0;
+ this->mUnk_41e = 0;
+ this->mUnk_420 = 0;
this->mUnk_424.mUnk_00 = this;
// ???
@@ -31,7 +32,7 @@ THUMB UnkStruct_020397f8::UnkStruct_020397f8() :
do {
puVar3->mUnk_00 = NULL;
puVar3 += 1;
- } while ((unk32*)puVar3 < (unk32*)this->mUnk_528);
+ } while ((unk32 *) puVar3 < (unk32 *) this->mUnk_528);
func_0203ee48(&this->mUnk_424);
func_ov000_020d0460(&this->mUnk_534);
@@ -64,7 +65,7 @@ THUMB UnkStruct_020397f8::UnkStruct_020397f8() :
this->mUnk_585 = 0;
this->mUnk_586 = 0;
func_0203efd8(&this->mUnk_588, this);
- this->mUnk_124 = (UnkSubClass1_unk_124*)&this->mUnk_588;
+ this->mUnk_124 = (UnkSubClass1_unk_124 *) &this->mUnk_588;
this->func_02039ca8();
if (this->func_02032fa4() != 0) {
@@ -112,7 +113,7 @@ ARM void UnkStruct_020397f8::vfunc_2c() {
this->func_0203be64();
this->func_0203a35c();
-
+
if (this->mUnk_580 != 0) {
this->mUnk_168.func_0203516c();
}
@@ -120,11 +121,11 @@ ARM void UnkStruct_020397f8::vfunc_2c() {
if (this->mUnk_584 != 0) {
this->mUnk_300.func_0203516c();
}
-
+
if (this->mUnk_585 != 0) {
this->mUnk_388.func_0203516c();
}
-
+
if ((this->func_0203a2c0() != 0 && this->mUnk_57f == 0) && this->mUnk_56c <= 0) {
this->mUnk_1f0.func_0203516c();
}
@@ -145,11 +146,9 @@ ARM void UnkStruct_020397f8::vfunc_2c() {
}
if (this->mUnk_15c == 1) {
- if (this->mUnk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0) ) {
+ if (this->mUnk_586 == ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) {
switch (this->mUnk_150[1]) {
- case 0:
- this->func_0203b0ec(1);
- break;
+ case 0: this->func_0203b0ec(1); break;
case 2:
case 3:
if (this->func_0203a3e0() != 0) {
@@ -191,7 +190,7 @@ ARM void UnkStruct_020397f8::vfunc_3c(unk32 param1) {
// non-matching
ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) {
- UnkStruct_02038aa0* bVar1;
+ UnkStruct_02038aa0 *bVar1;
s8 cVar2;
unk32 iVar4;
unk32 iVar6;
@@ -213,23 +212,24 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) {
local_8c = 0;
local_90 = 0;
- bVar1 = data_027e0c68.mUnk_28[this->mUnk_50];
+ bVar1 = data_027e0c68.mUnk_28[this->mUnk_50];
this->vfunc_6C(&local_8c, &local_90);
this->func_0203a188(local_8c + param1, local_90 + param2);
- this->func_0203e1b0(param1 + local_8c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), param2 + local_90 + (this->mUnk_158.y - (this->mUnk_18 << 3) / 2), 0);
+ this->func_0203e1b0(param1 + local_8c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2),
+ param2 + local_90 + (this->mUnk_158.y - (this->mUnk_18 << 3) / 2), 0);
if (this->mUnk_584 != 0) {
iVar5 = this->mUnk_18 << 3;
if (this->mUnk_580 != 0) {
iVar5 = -0xC;
- } else {
+ } else {
iVar5 = 0;
}
this->mUnk_300.func_02034a1c(param1 + local_8c + this->mUnk_55c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2),
- iVar5 + param2 + local_90 + this->mUnk_560 + ((this->mUnk_158.y - (iVar5 / 2))), 0);
+ iVar5 + param2 + local_90 + this->mUnk_560 + ((this->mUnk_158.y - (iVar5 / 2))), 0);
}
if (this->mUnk_585 != 0 && ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0)) {
@@ -361,11 +361,13 @@ ARM void UnkStruct_020397f8::vfunc_48() {
}
ARM void UnkStruct_020397f8::func_0203a35c() {
- if ((this->mUnk_57c == 1 || this->mUnk_150[3] != 0) || (this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0) {
+ if ((this->mUnk_57c == 1 || this->mUnk_150[3] != 0) ||
+ (this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0)
+ {
if (this->func_0203a3e0()) {
- s16 mUnk_56e = this->mUnk_56e;
- s16 mUnk_570 = this->mUnk_570;
- UnkStruct_020397f8* mUnk_164 = this->mUnk_164;
+ s16 mUnk_56e = this->mUnk_56e;
+ s16 mUnk_570 = this->mUnk_570;
+ UnkStruct_020397f8 *mUnk_164 = this->mUnk_164;
mUnk_164->mUnk_168.mUnk_10 = mUnk_56e;
mUnk_164->mUnk_168.mUnk_14 = mUnk_570;
@@ -423,10 +425,9 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) {
}
if (gTouchControl.mTouch == 0) {
- switch(this->mUnk_150[1]) {
+ switch (this->mUnk_150[1]) {
case 3:
- case 4:
- break;
+ case 4: break;
case 5:
if (data_027e103c->mUnk_20 == 3) {
this->func_0203b0ec(1);
@@ -437,8 +438,7 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) {
this->func_0203b0ec(1);
}
break;
- case 7:
- break;
+ case 7: break;
case 2:
//! TODO: fixme
// if (this->mUnk_164->mUnk_168.mUnk_06 <= 0) {
@@ -477,25 +477,24 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) {
ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1, unk32 param2) {
unk32 iVar1;
unk32 uVar2;
- UnkStruct_0203b264* piVar3;
-
+ UnkStruct_0203b264 *piVar3;
+
if (this->mUnk_164->mUnk_168.mUnk_06 > 0 && this->mUnk_164->mUnk_15c <= 0) {
return false;
}
- iVar1 = this->vfunc_34(param2);
+ iVar1 = this->vfunc_34(param2);
piVar3 = NULL;
if (!(iVar1 < 0) && iVar1 < 4) {
piVar3 = this->mUnk_424.func_0203eeb0(iVar1, param1);
}
- if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16*)piVar3->mUnk_0)[2]) == 0x00FF0002) {
+ if (piVar3 != NULL && ((piVar3->mUnk_0[3] << 0x10) | ((u16 *) piVar3->mUnk_0)[2]) == 0x00FF0002) {
uVar2 = this->func_02038cb8(iVar1);
- this->mUnk_410.func_0203ec4c(piVar3, uVar2,
- (s16)(this->mUnk_158.x - ((this->mUnk_14 << 3) / 2)) + iVar1 + this->mUnk_56e,
- (s16)(this->mUnk_158.y - ((this->mUnk_18 << 3) / 2)) + iVar1 + this->mUnk_570
- );
+ this->mUnk_410.func_0203ec4c(piVar3, uVar2,
+ (s16) (this->mUnk_158.x - ((this->mUnk_14 << 3) / 2)) + iVar1 + this->mUnk_56e,
+ (s16) (this->mUnk_158.y - ((this->mUnk_18 << 3) / 2)) + iVar1 + this->mUnk_570);
this->mUnk_57f = 0;
return true;
@@ -505,7 +504,7 @@ ARM bool UnkStruct_020397f8::func_0203a6d0(unk32 param1, unk32 param2) {
}
// non-matching
-ARM void UnkStruct_020397f8::vfunc_50(EntryINF1* param1, unk32 param2, s32* param3, unk32 param4) {
+ARM void UnkStruct_020397f8::vfunc_50(EntryINF1 *param1, unk32 param2, s32 *param3, unk32 param4) {
bool bVar5;
bool bVar2;
int iVar4;
@@ -515,15 +514,17 @@ ARM void UnkStruct_020397f8::vfunc_50(EntryINF1* param1, unk32 param2, s32* para
iVar6 = param3[0];
if (data_027e0c54 != 0) {
- UnkStruct_020397f8* pVar4 = data_027e0c68.func_02036700();
+ UnkStruct_020397f8 *pVar4 = data_027e0c68.func_02036700();
if (pVar4 != NULL && pVar4->mUnk_15c > 0) {
this->func_02038b40();
}
}
- if (*((s32*)data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 && func_ov003_020f3f94(data_ov009_0211f5b4) == 0) {
- UnkStruct_020397f8* pVar4 = (UnkStruct_020397f8*)data_027e0c68.mUnk_28[4];
+ if (*((s32 *) data_027e0618) == 2 && data_027e0d38->func_ov000_02078b40() == 2 &&
+ func_ov003_020f3f94(data_ov009_0211f5b4) == 0)
+ {
+ UnkStruct_020397f8 *pVar4 = (UnkStruct_020397f8 *) data_027e0c68.mUnk_28[4];
if (pVar4 != NULL && pVar4->mUnk_15c > 0) {
this->func_02038b40();
@@ -531,7 +532,7 @@ ARM void UnkStruct_020397f8::vfunc_50(EntryINF1* param1, unk32 param2, s32* para
}
this->mUnk_586 = (data_02056be4[data_027e077c.mUnk_0] & 1) != 0;
- temp = param3[8];
+ temp = param3[8];
if (temp >= 0 && param3[9] >= 0) {
temp = param3[10];
@@ -568,19 +569,19 @@ ARM void UnkStruct_020397f8::vfunc_5c() {
// non-matching
ARM void UnkStruct_020397f8::vfunc_58() {
bool bVar1;
- s8* puVar2;
+ s8 *puVar2;
int iVar3;
char *pcVar4;
-
+
if (this->mUnk_160 != 0) {
if (data_027e103c != NULL) {
if (data_027e103c->func_ov000_020cf4bc() != 0) {
- puVar2 = (s8*)data_027e103c->func_ov000_020cef9c();
+ puVar2 = (s8 *) data_027e103c->func_ov000_020cef9c();
if ((puVar2 + 0x244) != NULL || (puVar2[0x250] == '\x02')) {
- puVar2 = (s8*)data_027e103c->func_ov000_020cef9c();
+ puVar2 = (s8 *) data_027e103c->func_ov000_020cef9c();
- if ((UnkStruct_020397f8*)(puVar2 + 0x244) == this) {
+ if ((UnkStruct_020397f8 *) (puVar2 + 0x244) == this) {
data_027e103c->func_ov000_020cfb38();
}
}
@@ -623,7 +624,7 @@ ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) {
u32 uVar3;
s32 unaff_r6;
bool bVar1;
-
+
iVar4 = 0;
bVar1 = false;
@@ -642,9 +643,9 @@ ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) {
this->mUnk_584 = 0;
if (this->mUnk_150[3] != 0) {
- iVar4 = 1;
+ iVar4 = 1;
this->mUnk_56c = this->mUnk_578;
- bVar1 = true;
+ bVar1 = true;
this->mUnk_15c = 0x78;
} else {
if ((this->mUnk_128.mUnk_04 == NULL || this->mUnk_128.mUnk_04[0] == 0) != 0) {
@@ -681,7 +682,7 @@ ARM s32 UnkStruct_020397f8::func_0203b0ec(u32 param1) {
}
// non-matching (regalloc)
-ARM unk32 UnkStruct_020397f8::vfunc_18(UnkStruct_0203b264* param1, unk32 param2, unk32 param3) {
+ARM unk32 UnkStruct_020397f8::vfunc_18(UnkStruct_0203b264 *param1, unk32 param2, unk32 param3) {
u16 sVar1;
u32 uVar4;
s32 unaff_r4;
@@ -703,7 +704,7 @@ ARM unk32 UnkStruct_020397f8::vfunc_18(UnkStruct_0203b264* param1, unk32 param2,
bVar5 = true;
if (sVar1 == 0x1A) {
- uVar4 = (param1->mUnk_0[3] << 0x10) | ((u16*)param1->mUnk_0)[2];
+ uVar4 = (param1->mUnk_0[3] << 0x10) | ((u16 *) param1->mUnk_0)[2];
if (((uVar4 == 0x0001000A || uVar4 == 0x00020000) || uVar4 == 0x00FF0000)) {
bVar5 = false;
@@ -721,7 +722,7 @@ ARM unk32 UnkStruct_020397f8::vfunc_18(UnkStruct_0203b264* param1, unk32 param2,
// non-matching
ARM unk32 UnkStruct_020397f8::vfunc_1c(u16 *param1, UnkStruct_0203b264 *param2, unk8 param3, unk32 param4) {
int iVar1;
- u16* psVar3;
+ u16 *psVar3;
psVar3 = param2->mUnk_4;
@@ -739,58 +740,43 @@ ARM unk32 UnkStruct_020397f8::vfunc_1c(u16 *param1, UnkStruct_0203b264 *param2,
}
switch (this->mUnk_57a) {
- case 0:
- return this->func_0203905c(param1, param2, param3, param4);
+ case 0: return this->func_0203905c(param1, param2, param3, param4);
case 1:
- UnknownMsgChoiceStruct* pChoiceData;
- s32 i = this->func_0203a30c();
+ UnknownMsgChoiceStruct *pChoiceData;
+ s32 i = this->func_0203a30c();
pChoiceData = &this->mUnk_428[this->mUnk_528[i]];
- return this->mUnk_164->func_0203cb5c(*param1, (((pChoiceData->mUnk_00->mUnk_0[3] << 0x10) | ((u16*)pChoiceData->mUnk_00->mUnk_0)[2]) + ~0xFFFE));
- default:
- break;
+ return this->mUnk_164->func_0203cb5c(
+ *param1, (((pChoiceData->mUnk_00->mUnk_0[3] << 0x10) | ((u16 *) pChoiceData->mUnk_00->mUnk_0)[2]) + ~0xFFFE));
+ default: break;
}
return 0;
}
// non-matching
-ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1* param1, unk32 param2, unk32 param3) {
+ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1 *param1, unk32 param2, unk32 param3) {
unk16 sVar1;
unk16 uVar2;
unk32 iVar3;
unk32 iVar4;
unk32 uVar5;
u32 uVar6;
-
+
uVar6 = 0;
if (this->func_02032fa4() == 0) {
- switch(param1->mUnk_0c) {
+ switch (param1->mUnk_0c) {
case 0:
- case 1:
- uVar6 = this->mUnk_580 != 0;
- break;
- case 2:
- uVar6 = 2;
- break;
- case 3:
- uVar6 = 3;
- break;
- case 5:
- uVar6 = 4;
- break;
- case 6:
- uVar6 = 5;
- break;
+ case 1: uVar6 = this->mUnk_580 != 0; break;
+ case 2: uVar6 = 2; break;
+ case 3: uVar6 = 3; break;
+ case 5: uVar6 = 4; break;
+ case 6: uVar6 = 5; break;
default:
// why???
switch (param1->mUnk_0c) {
- case 4:
- uVar6 = 8;
- break;
- case 7:
- uVar6 = 9;
- break;
+ case 4: uVar6 = 8; break;
+ case 7: uVar6 = 9; break;
default:
if (this->mUnk_580 != 0) {
uVar6 = 7;
@@ -826,7 +812,7 @@ ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1* param1, unk32 param2
}
if (param1->mUnk_10 <= 0 && iVar3 > 0) {
- uVar2 = param1->mUnk_12;
+ uVar2 = param1->mUnk_12;
this->mUnk_158.x = param1->mUnk_10;
this->mUnk_158.y = uVar2;
} else {
@@ -835,10 +821,12 @@ ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1* param1, unk32 param2
}
// non-matching (regalloc)
-ARM void UnkStruct_020397f8::vfunc_64(s16* param1) {
+ARM void UnkStruct_020397f8::vfunc_64(s16 *param1) {
unk32 uVar2;
- if (this->mUnk_50 != 0 || data_027e0db0.mUnk_04 > 0 || func_0203c084() != 0 || (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) {
+ if (this->mUnk_50 != 0 || data_027e0db0.mUnk_04 > 0 || func_0203c084() != 0 ||
+ (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738()))
+ {
uVar2 = 0x16;
} else {
uVar2 = 0;
@@ -870,23 +858,15 @@ ARM void UnkStruct_020397f8::func_0203b764() {
this->func_02039440(data_02056a04[i * 0x18], data_02056a16[i]);
switch (this->mUnk_57b) {
- case 1:
- this->mUnk_158.y -= 38;
- break;
+ case 1: this->mUnk_158.y -= 38; break;
case 2:
switch (this->pInfoEntry->mUnk_06) {
- case 2:
- this->mUnk_158.y -= 111;
- break;
- case 3:
- this->mUnk_158.y -= 98;
- break;
- default:
- break;
+ case 2: this->mUnk_158.y -= 111; break;
+ case 3: this->mUnk_158.y -= 98; break;
+ default: break;
}
break;
- default:
- break;
+ default: break;
}
}
@@ -958,8 +938,8 @@ ARM bool UnkStruct_020397f8::func_0203c13c() {
if (this->func_02032fa4() == 0) {
data_ov000_020eec9c.func_ov000_020d77e4(6);
data_027e103c->func_ov000_020cfb20(this);
- this->mUnk_585 = 1;
- this->mUnk_584 = 1;
+ this->mUnk_585 = 1;
+ this->mUnk_584 = 1;
this->mUnk_128.mUnk_18 = 0x00016000;
this->mUnk_128.mUnk_1c = NULL;
this->mUnk_128.mUnk_20 = 0;
@@ -973,13 +953,13 @@ ARM bool UnkStruct_020397f8::func_0203c13c() {
// non-matching
ARM bool UnkStruct_020397f8::func_0203c1a0() {
- s8* pVar1;
- u8* iVar3;
+ s8 *pVar1;
+ u8 *iVar3;
if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) {
this->mUnk_584 = 1;
- pVar1 = (s8*)data_027e103c->func_ov000_020cef9c();
+ pVar1 = (s8 *) data_027e103c->func_ov000_020cef9c();
iVar3 = data_027e0f7c.func_ov000_0209d90c(pVar1[0x24F], 0);
data_027e1054.func_ov003_020f4760(iVar3[1], 0);
data_ov000_020eec9c.func_ov000_020d77e4(6);
@@ -996,13 +976,13 @@ ARM bool UnkStruct_020397f8::func_0203c1a0() {
return 0;
}
-ARM bool UnkStruct_020397f8::func_0203c25c(UnkStruct_020397f8* param1) {
+ARM bool UnkStruct_020397f8::func_0203c25c(UnkStruct_020397f8 *param1) {
if (data_027e1054.mUnk_00->mUnk_00->mUnk_95 != 0) {
return false;
}
if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) {
- param1->mUnk_585 = 1;
+ param1->mUnk_585 = 1;
param1->mUnk_128.mUnk_18 = 0x00016000;
param1->mUnk_128.mUnk_1c = NULL;
param1->mUnk_128.mUnk_20 = 0;
@@ -1013,8 +993,7 @@ ARM bool UnkStruct_020397f8::func_0203c25c(UnkStruct_020397f8* param1) {
return false;
}
-ARM UnkStruct_020397f8::~UnkStruct_020397f8() {
-}
+ARM UnkStruct_020397f8::~UnkStruct_020397f8() {}
ARM bool UnkStruct_020397f8::vfunc_38() {
return true;
diff --git a/src/Main/Unknown/UnkStruct_0203dae0.cpp b/src/Main/Unknown/UnkStruct_0203dae0.cpp
index 67fe821e..880511ae 100644
--- a/src/Main/Unknown/UnkStruct_0203dae0.cpp
+++ b/src/Main/Unknown/UnkStruct_0203dae0.cpp
@@ -2,17 +2,17 @@
#include "System/SysNew.hpp"
extern u32 *data_027e0ce0[];
-extern "C" void Fill256(unk32, unk16*, unk32, unk32);
-extern "C" void func_0203fc78(u8, unk32*, unk32*);
+extern "C" void Fill256(unk32, unk16 *, unk32, unk32);
+extern "C" void func_0203fc78(u8, unk32 *, unk32 *);
extern "C" u16 func_0203d318(unk32, unk32);
-extern "C" void func_020298b8(unk32*, unk32, unk32, unk32, unk32);
-extern "C" void func_02029830(unk32*, unk32, unk32, unk32, unk32);
+extern "C" void func_020298b8(unk32 *, unk32, unk32, unk32, unk32);
+extern "C" void func_02029830(unk32 *, unk32, unk32, unk32, unk32);
extern "C" unk32 func_0203d400(u8);
extern "C" void func_02035440(u8);
class UnkStruct_02075dac {
public:
- unk32 func_0203f9b8(void*);
+ unk32 func_0203f9b8(void *);
};
extern UnkStruct_02075dac data_02075dac;
@@ -71,7 +71,7 @@ ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) {
unk32 local_c;
unk32 local_10;
- local_c = param1;
+ local_c = param1;
local_10 = param2;
func_0203fc78(this->func_02032fa4(), &local_c, &local_10);
@@ -82,8 +82,8 @@ ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) {
// non-matching
ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) {
- unk32* uVar5;
-
+ unk32 *uVar5;
+
this->mUnk_50 = param1;
this->vfunc_14(this->mUnk_4a, this->mUnk_4c);
this->mUnk_11c = func_0203d318(this->mUnk_10[0x1], this->mUnk_10[0x2]);
@@ -106,13 +106,13 @@ ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3
this->func_0203de58(param2);
}
-ARM unk32* UnkStruct_0203dae0::func_0203ddec() {
+ARM unk32 *UnkStruct_0203dae0::func_0203ddec() {
return this->mUnk_114->func_0203d1b4();
}
ARM void UnkStruct_0203dae0::func_0203ddfc() {
this->mUnk_114->mUnk_04 = 0;
- this->mUnk_11c = 0;
+ this->mUnk_11c = 0;
}
ARM void UnkStruct_0203dae0::func_0203de14() {
@@ -141,7 +141,7 @@ ARM void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) {
ARM void UnkStruct_0203dae0::vfunc_30() {
unk32 iVar2;
- iVar2 = this->mUnk_118;
+ iVar2 = this->mUnk_118;
this->mUnk_118 = data_02075dac.func_0203f9b8(this);
if (this->mUnk_118 == iVar2) {
@@ -171,7 +171,7 @@ ARM bool UnkStruct_0203dae0::func_0203e1b0(unk32 param1, unk32 param2, s32 param
ARM unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) {
unk32 iVar1;
-
+
iVar1 = this->UnkStruct_02032f0c::vfunc_18(param1);
if (iVar1 != 0) {