summaryrefslogtreecommitdiff
path: root/src/Main/Unknown
diff options
context:
space:
mode:
Diffstat (limited to 'src/Main/Unknown')
-rw-r--r--src/Main/Unknown/UnkStruct_02037750.cpp27
-rw-r--r--src/Main/Unknown/UnkStruct_02038aa0.cpp25
-rw-r--r--src/Main/Unknown/UnkStruct_020397f8.cpp71
-rw-r--r--src/Main/Unknown/UnkStruct_02063220.cpp17
4 files changed, 95 insertions, 45 deletions
diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp
index 0fa56bfb..3d9fe9a5 100644
--- a/src/Main/Unknown/UnkStruct_02037750.cpp
+++ b/src/Main/Unknown/UnkStruct_02037750.cpp
@@ -74,7 +74,8 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) {
if ((s32) uVar7 <= 0) {
switch (uVar7) {
case 0x0:
- case 0x2f: break;
+ case 0x2f:
+ break;
case 0x7:
if (data_027e0d54[0xd] != 0) {
return -0x1;
@@ -117,12 +118,18 @@ 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;
@@ -143,8 +150,10 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) {
}
}
return (int) (char) uVar10;
- case 0xd: return gItemManager->GetNumRupees() != 0;
- case 0xe: return gItemManager->HasItem(param1 + 0x4) != 0;
+ 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;
diff --git a/src/Main/Unknown/UnkStruct_02038aa0.cpp b/src/Main/Unknown/UnkStruct_02038aa0.cpp
index 75e512bf..c32b4df8 100644
--- a/src/Main/Unknown/UnkStruct_02038aa0.cpp
+++ b/src/Main/Unknown/UnkStruct_02038aa0.cpp
@@ -57,8 +57,7 @@ ARM void UnkStruct_02038aa0::func_02038b74(void) {}
ARM bool UnkStruct_02038aa0::func_02038b78() {
if (data_027e0c54 == 0) {
if ((this->mUnk_50 != 0 && gMessageManager.func_02036850() != 0) ||
- (this->mUnk_50 == 0 && gMessageManager.func_02036824() != 0))
- {
+ (this->mUnk_50 == 0 && gMessageManager.func_02036824() != 0)) {
return true;
}
@@ -204,12 +203,22 @@ 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 c446d859..03011bfe 100644
--- a/src/Main/Unknown/UnkStruct_020397f8.cpp
+++ b/src/Main/Unknown/UnkStruct_020397f8.cpp
@@ -148,7 +148,9 @@ ARM void UnkStruct_020397f8::vfunc_2c() {
if (this->mUnk_15c == 1) {
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) {
@@ -362,8 +364,7 @@ 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)
- {
+ (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;
@@ -427,7 +428,8 @@ ARM void UnkStruct_020397f8::vfunc_44(s32 touchLastX, s32 touchLastY) {
if (gTouchControl.mTouch == 0) {
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);
@@ -438,7 +440,8 @@ 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) {
@@ -522,8 +525,7 @@ ARM void UnkStruct_020397f8::vfunc_50(EntryINF1 *param1, unk32 param2, s32 *para
}
if (gGame.mModeId == GameModeId_Adventure && data_027e0d38->func_ov000_02078b40() == 2 &&
- func_ov003_020f3f94(data_ov009_0211f5b4) == 0)
- {
+ func_ov003_020f3f94(data_ov009_0211f5b4) == 0) {
UnkStruct_020397f8 *pVar4 = (UnkStruct_020397f8 *) gMessageManager.mUnk_28[4];
if (pVar4 != NULL && pVar4->mUnk_15c > 0) {
@@ -740,14 +742,16 @@ 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();
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;
+ default:
+ break;
}
return 0;
@@ -767,16 +771,30 @@ ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1 *param1, unk32 param2
if (this->func_02032fa4() == 0) {
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;
@@ -825,8 +843,7 @@ 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()))
- {
+ (gAdventureFlags->Exists() && gAdventureFlags->func_ov00_02097738())) {
uVar2 = 0x16;
} else {
uVar2 = 0;
@@ -858,15 +875,23 @@ 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;
}
}
diff --git a/src/Main/Unknown/UnkStruct_02063220.cpp b/src/Main/Unknown/UnkStruct_02063220.cpp
index a7ccc315..3025ebfa 100644
--- a/src/Main/Unknown/UnkStruct_02063220.cpp
+++ b/src/Main/Unknown/UnkStruct_02063220.cpp
@@ -56,8 +56,10 @@ const u16 data_020562e2[] = {
THUMB bool UnkStruct_02063220::func_0202f3f0(unk32 param1) {
switch (param1) {
case 2:
- case 3: return true;
- default: break;
+ case 3:
+ return true;
+ default:
+ break;
}
return false;
@@ -67,9 +69,14 @@ THUMB unk32 UnkStruct_02063220::func_0202f400(unk32 param1) {
unk32 ret = 0;
switch (param1) {
- case 2: ret = 1; break;
- case 3: ret = 2; break;
- default: break;
+ case 2:
+ ret = 1;
+ break;
+ case 3:
+ ret = 2;
+ break;
+ default:
+ break;
}
return ret;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 03:06:54 +0000