mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-09-01 01:31:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make hex digits consistent (#55)

Browse Source
This commit is contained in:
Yanis
2026-04-17 01:16:33 +02:00
committed by GitHub
parent c571032ee6
commit ec62ef3392
34 changed files with 495 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/000_Second/Actor/Actor.cpp
+16 -16
View File
@@ -7,24 +7,24 @@ ARM Actor::Actor() {
this->mVel.x = 0;
this->mVel.y = 0;
this->mVel.z = 0;
this->mUnk_2c = 0xCD;
this->mUnk_2C = 0xCD;
this->mUnk_38 = 0;
this->mUnk_3c = 0;
this->mUnk_3C = 0;
this->mUnk_40 = 0;
this->mUnk_48 = 4;
this->mUnk_4c = -1;
this->mUnk_4C = -1;
this->mUnk_50 = 0;
this->mUnk_52 = 0;
this->mUnk_54 = 0;
this->ResetFlags();
this->mUnk_84 = 0;
this->mUnk_5c.func_ov000_020975f8();
this->mUnk_5C.func_ov000_020975f8();
this->mRef.Reset();
this->mType = NULL;
_MI_CpuCopy(&data_ov000_020b539c_eur.mUnk_00, &this->mUnk_5c, sizeof(data_ov000_020b539c_eur.mUnk_00));
this->mPos = this->mUnk_5c.mUnk_00;
this->mPrevPos = this->mUnk_5c.mUnk_00;
this->mAngle = this->mUnk_5c.mUnk_0c;
_MI_CpuCopy(&data_ov000_020b539c_eur.mUnk_00, &this->mUnk_5C, sizeof(data_ov000_020b539c_eur.mUnk_00));
this->mPos = this->mUnk_5C.mUnk_00;
this->mPrevPos = this->mUnk_5C.mUnk_00;
this->mAngle = this->mUnk_5C.mUnk_0C;
SET_FLAGS(this->mFlags, ActorFlag_Alive, ActorFlag_Visible, ActorFlag_Active, ActorFlag_14);
this->mUnk_44 = 0xFF;
this->mUnk_46 = 0;
@@ -39,12 +39,12 @@ ARM void Actor::func_ov000_0209848c(ActorProfile *param1) {
s16 unk_1c;
Cylinder *temp_r3;
unk_1c = param1->mUnk_1c;
unk_1c = param1->mUnk_1C;
temp_r3 = &param1->mUnk_04;
this->mType = param1;
this->mUnk_30 = this->mUnk_34 = temp_r3;
this->mUnk_4e = unk_1c;
this->mUnk_4E = unk_1c;
}
ARM bool Actor::vfunc_18(unk32 param1) {
@@ -84,13 +84,13 @@ ARM void Actor::func_ov000_020984f0() {
// non-matching
ARM void Actor::vfunc_00(Vec3p *param1) {
*param1 = mPos;
param1->y += mUnk_4e;
param1->y += mUnk_4E;
// short sVar1;
// int iVar2;
// int iVar3;
// param1->x = this->mPos.x;
// param1->y = this->mPos.y + this->mUnk_4e;
// param1->y = this->mPos.y + this->mUnk_4E;
// param1->z = this->mPos.z;
}
@@ -99,11 +99,11 @@ ARM Vec3p *Actor::func_ov000_0209853c(unk32 param1) {
}
ARM bool Actor::vfunc_04() {
return this->mType->mUnk_1e & 1;
return this->mType->mUnk_1E & 1;
}
ARM unk16 Actor::vfunc_08() {
return this->mType->mUnk_1a;
return this->mType->mUnk_1A;
}
ARM unk8 Actor::vfunc_0c() {
@@ -132,7 +132,7 @@ ARM unk32 Actor::vfunc_38(unk32 param1) {
}
// ???
*(&this->mUnk_4a + var_r3) = 0;
*(&this->mUnk_4A + var_r3) = 0;
break;
default:
break;
@@ -163,6 +163,6 @@ ARM void Actor::func_ov000_0209862c(unk32 param1) {
var_ip = 0;
do {
var_ip += 1;
(&this->mUnk_4a)[var_ip] = param1;
(&this->mUnk_4A)[var_ip] = param1;
} while (var_ip < 2);
}
src/000_Second/Actor/ActorEventIcon.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ ARM ActorEventIcon::ActorEventIcon() {
}
ARM bool ActorEventIcon::vfunc_18(unk32 param1) {
this->mUnk_094.func_ov000_0206082c(0x5D, this->mUnk_6c);
this->mUnk_094.func_ov000_0206082c(0x5D, this->mUnk_6C);
return true;
}
src/000_Second/Actor/ActorUnkEFIK.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ ARM void ActorUnkEFIK::vfunc_20() {
for (int i = 0; i < length; i++) {
u8 j;
u8 k;
UnkStruct_027e0cd8_0c *pUVar5 = data_027e0cd8->mUnk_0c;
UnkStruct_027e0cd8_0c *pUVar5 = data_027e0cd8->mUnk_0C;
u8 bStack_3c[2];
bStack_3c[0] = 0;
src/000_Second/Actor/ActorUnkSWOB.cpp
+5 -5
View File
@@ -22,9 +22,9 @@ ARM ActorUnkSWOB::ActorUnkSWOB() {}
ARM bool ActorUnkSWOB::vfunc_18(unk32 param1) {
this->mUnk_9E = this->mUnk_78;
this->mUnk_94 = this->mUnk_6e;
this->mUnk_94 = this->mUnk_6E;
this->mUnk_98 = this->mUnk_70;
this->mUnk_A0 = this->mUnk_9E + this->mUnk_6c;
this->mUnk_A0 = this->mUnk_9E + this->mUnk_6C;
this->mUnk_A2 = this->mUnk_75;
this->mUnk_9C = this->mUnk_9E;
@@ -38,9 +38,9 @@ ARM bool ActorUnkSWOB::vfunc_18(unk32 param1) {
}
ARM void ActorUnkSWOB::func_ov000_0209a9b4(unk32 param1) {
this->mUnk_4c = param1;
this->mUnk_4C = param1;
switch (this->mUnk_4c) {
switch (this->mUnk_4C) {
case 0:
this->func_ov000_02098a88(0, 0);
break;
@@ -63,7 +63,7 @@ ARM void ActorUnkSWOB::func_ov000_0209a9b4(unk32 param1) {
// https://decomp.me/scratch/cUf0c
ARM void ActorUnkSWOB::func_ov000_0209aa30(void) {
if (this->mUnk_4c == 1) {
if (this->mUnk_4C == 1) {
return;
}
src/000_Second/Actor/ActorUnkSWTM.cpp
+8 -8
View File
@@ -23,7 +23,7 @@ ARM ActorUnkSWTM::ActorUnkSWTM() :
mUnk_A8(0) {}
ARM ActorUnkSWTM::~ActorUnkSWTM() {
if (this->mUnk_4c != 2 && this->func_ov000_02098a60(0) == 0) {
if (this->mUnk_4C != 2 && this->func_ov000_02098a60(0) == 0) {
this->func_ov000_0209b184();
}
}
@@ -32,8 +32,8 @@ ARM ActorUnkSWTM::~ActorUnkSWTM() {
ARM bool ActorUnkSWTM::vfunc_18(unk32 param1) {
this->mUnk_9E = this->mUnk_78;
this->mUnk_98 = this->mUnk_70;
this->mUnk_A4 = this->mUnk_6e * 30;
this->mUnk_A0 = this->mUnk_9E + this->mUnk_6c;
this->mUnk_A4 = this->mUnk_6E * 30;
this->mUnk_A0 = this->mUnk_9E + this->mUnk_6C;
this->mUnk_A2 = this->mUnk_75;
this->mUnk_9C = this->mUnk_9E;
@@ -47,7 +47,7 @@ ARM bool ActorUnkSWTM::vfunc_18(unk32 param1) {
}
ARM void ActorUnkSWTM::vfunc_20(void) {
switch (this->mUnk_4c) {
switch (this->mUnk_4C) {
case 0:
if (!this->func_ov000_0209afe4()) {
return;
@@ -94,10 +94,10 @@ ARM void ActorUnkSWTM::vfunc_20(void) {
ARM void ActorUnkSWTM::vfunc_24(void) {}
ARM void ActorUnkSWTM::func_ov000_0209af54(unk32 param1) {
this->mUnk_4c = param1;
this->mUnk_4C = param1;
this->mUnk_A8 = 0;
switch (this->mUnk_4c) {
switch (this->mUnk_4C) {
case 0:
this->func_ov000_02098a88(0, 0);
break;
@@ -167,7 +167,7 @@ ARM unk32 ActorUnkSWTM::func_ov000_0209b038(void) {
break;
}
for (int i = 0; i < this->mUnk_6c; i++) {
for (int i = 0; i < this->mUnk_6C; i++) {
if (data_027e0cd8->func_ov000_02081e30(this->mUnk_9E + i, this->mUnk_A2) == 0) {
return 0;
}
@@ -177,7 +177,7 @@ ARM unk32 ActorUnkSWTM::func_ov000_0209b038(void) {
}
ARM void ActorUnkSWTM::func_ov000_0209b160(void) {
if (this->mUnk_4c != 2) {
if (this->mUnk_4C != 2) {
data_ov000_020b5214.func_ov000_0206db44(0xA3);
}
}
src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp
+56 -56
View File
@@ -17,44 +17,44 @@ ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a8ae0(q20 param1) {
ARM ActorUnk_ov000_020a8bb0::ActorUnk_ov000_020a8bb0(UnkSystem4 *param1, unk32 param2) {
unk32 uVar2;
this->mUnk_0b0 = 0;
this->mUnk_094.mUnk_0c = param2;
this->mUnk_0a4.mUnk_00 = param1;
this->mUnk_0a4.mUnk_04 = 0;
this->mUnk_0a4.mUnk_08 = 0;
this->mUnk_0b4 = -1;
this->mUnk_0b8 = 0;
this->mUnk_0bc.Reset();
this->mUnk_0c0.x = 0;
this->mUnk_0c0.y = 0;
this->mUnk_0c0.z = 0;
this->mUnk_0cc = 0;
this->mUnk_0ce = 0;
this->mUnk_0d0 = 0;
this->mUnk_0d4 = 0;
this->mUnk_0d8 = 0;
this->mUnk_0da = 0;
this->mUnk_0dc = 0x2AAB;
this->mUnk_0de = 0xEAAB;
this->mUnk_0e0 = 0x1555;
this->mUnk_0e4 = 0;
this->mUnk_0e8 = 0;
this->mUnk_0ea = 0;
this->mUnk_0ec.func_ov024_020d6668();
this->mUnk_0B0 = 0;
this->mUnk_094.mUnk_0C = param2;
this->mUnk_0A4.mUnk_00 = param1;
this->mUnk_0A4.mUnk_04 = 0;
this->mUnk_0A4.mUnk_08 = 0;
this->mUnk_0B4 = -1;
this->mUnk_0B8 = 0;
this->mUnk_0BC.Reset();
this->mUnk_0C0.x = 0;
this->mUnk_0C0.y = 0;
this->mUnk_0C0.z = 0;
this->mUnk_0CC = 0;
this->mUnk_0CE = 0;
this->mUnk_0D0 = 0;
this->mUnk_0D4 = 0;
this->mUnk_0D8 = 0;
this->mUnk_0DA = 0;
this->mUnk_0DC = 0x2AAB;
this->mUnk_0DE = 0xEAAB;
this->mUnk_0E0 = 0x1555;
this->mUnk_0E4 = 0;
this->mUnk_0E8 = 0;
this->mUnk_0EA = 0;
this->mUnk_0EC.func_ov024_020d6668();
uVar2 = this->mUnk_34->size;
this->mUnk_114 = -1;
this->mUnk_118 = 0x1000;
this->mUnk_11c = 0x019A;
this->mUnk_11C = 0x019A;
this->mUnk_104 = 0;
this->mUnk_108 = uVar2;
this->mUnk_10c = 0;
this->mUnk_10C = 0;
this->mUnk_110 = uVar2;
this->mUnk_30 = (Cylinder *) &this->mUnk_104;
this->mUnk_4a = 5;
this->mUnk_4A = 5;
this->mUnk_44 = 0x1F;
this->mUnk_094.mUnk_08 = 3;
this->mUnk_38 = &this->mUnk_094.mUnk_00;
this->mUnk_0b0 |= 8;
this->mUnk_0B0 |= 8;
}
ARM ActorUnk_ov000_020a8bb0::~ActorUnk_ov000_020a8bb0() {}
@@ -64,9 +64,9 @@ ARM bool ActorUnk_ov000_020a8bb0::vfunc_18(unk32 param1) {
UNSET_FLAG(this->mFlags, ActorFlag_Alive);
}
if (this->mUnk_0b0 & 8) {
this->mUnk_0a4.mUnk_00->func_ov000_02057c38(6, 2);
this->mUnk_0a4.mUnk_00->func_ov000_0209a7b8(this, ActorUnk_ov000_020a8bb0::func_ov000_020a9804);
if (this->mUnk_0B0 & 8) {
this->mUnk_0A4.mUnk_00->func_ov000_02057c38(6, 2);
this->mUnk_0A4.mUnk_00->func_ov000_0209a7b8(this, ActorUnk_ov000_020a8bb0::func_ov000_020a9804);
}
this->vfunc_54(param1);
@@ -90,18 +90,18 @@ ARM unk32 ActorUnk_ov000_020a8bb0::func_ov000_020a8dd0() {
// non-matching
ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a8df0(ActorRef param1, unk32 param2) {
if (!((u32) (((param2 + 8) - param2) / 2) < 2)) {
this->mUnk_0b0 |= 2;
this->mUnk_0B0 |= 2;
} else {
this->mUnk_0b0 &= ~2;
this->mUnk_0B0 &= ~2;
}
if (this->mRef != param1) {
this->vfunc_b4();
*(u32 *) &this->mUnk_0bc = param1.Get32();
this->mUnk_0c0.x = 0;
this->mUnk_0c0.y = 0;
this->mUnk_0c0.z = 0;
this->mUnk_0b0 |= 1;
*(u32 *) &this->mUnk_0BC = param1.Get32();
this->mUnk_0C0.x = 0;
this->mUnk_0C0.y = 0;
this->mUnk_0C0.z = 0;
this->mUnk_0B0 |= 1;
}
}
@@ -115,26 +115,26 @@ ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a8e9c(Vec3p *param1) {
q20 y = param1->y;
q20 x = param1->z;
this->mUnk_0c0.x = x;
this->mUnk_0c0.y = y;
this->mUnk_0c0.z = x;
this->mUnk_0bc.Reset();
this->mUnk_0C0.x = x;
this->mUnk_0C0.y = y;
this->mUnk_0C0.z = x;
this->mUnk_0BC.Reset();
}
ARM void ActorUnk_ov000_020a8bb0::vfunc_b0() {
if (data_027e09b8->func_01ffd420() == 0) {
ActorUnk_vfunc_b0 auStack_60;
auStack_60.mUnk_24 = this;
auStack_60.mUnk_0c = this->mUnk_7c;
auStack_60.mUnk_0C = this->mUnk_7C;
auStack_60.mUnk_14 = 0;
auStack_60.mUnk_18 = -1;
auStack_60.mUnk_1c = -1;
auStack_60.mUnk_1C = -1;
auStack_60.mUnk_20 = 0;
auStack_60.mUnk_21 = 0;
auStack_60.mUnk_32 = 1;
this->vfunc_00(&auStack_60.mUnk_34);
this->mUnk_0b4 = data_027e09b8->func_ov000_02073470(&auStack_60, 0);
this->mUnk_0B4 = data_027e09b8->func_ov000_02073470(&auStack_60, 0);
}
}
@@ -151,7 +151,7 @@ ARM unk32 ActorUnk_ov000_020a8bb0::vfunc_90() {
}
ARM void ActorUnk_ov000_020a8bb0::vfunc_94() {
this->mUnk_0a4.mUnk_08 = 0xF6;
this->mUnk_0A4.mUnk_08 = 0xF6;
}
ARM void ActorUnk_ov000_020a8bb0::vfunc_60() {
@@ -176,8 +176,8 @@ ARM void ActorUnk_ov000_020a8bb0::vfunc_68() {
UNSET_FLAG(this->mFlags, ActorFlag_Interacting);
this->func_ov000_020a9200();
this->vfunc_ac();
this->mUnk_0b0 &= ~0x01;
this->mUnk_0b0 &= ~0x10;
this->mUnk_0B0 &= ~0x01;
this->mUnk_0B0 &= ~0x10;
}
ARM unk32 ActorUnk_ov000_020a8bb0::vfunc_7c() {
@@ -196,9 +196,9 @@ ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a91b8(Vec3p *param1, unk32 param
this->func_ov000_020a8e9c(param1);
if (param2 != 0) {
this->mUnk_0b0 |= 0x20;
this->mUnk_0B0 |= 0x20;
} else {
this->mUnk_0b0 &= ~0x20;
this->mUnk_0B0 &= ~0x20;
}
this->vfunc_58(7);
@@ -207,7 +207,7 @@ ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a91b8(Vec3p *param1, unk32 param
ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a9200() {}
ARM void ActorUnk_ov000_020a8bb0::vfunc_70() {
if (this->mUnk_4c != 5) {
if (this->mUnk_4C != 5) {
this->vfunc_58(4);
}
}
@@ -238,14 +238,14 @@ ARM void ActorUnk_ov000_020a8bb0::vfunc_20() {}
// non-matching
ARM void ActorUnk_ov000_020a8bb0::vfunc_24() {
if (data_027e09b8->func_ov000_020732dc(3) == 0 || !(this->mUnk_0b0 & 4)) {
if (data_027e09b8->func_ov000_020732dc(3) == 0 || !(this->mUnk_0B0 & 4)) {
this->vfunc_20();
}
if (!(this->mUnk_0b0 & 0x200)) {
this->mUnk_0b0 &= ~0x100;
if (!(this->mUnk_0B0 & 0x200)) {
this->mUnk_0B0 &= ~0x100;
} else {
this->mUnk_0b0 &= ~0x200;
this->mUnk_0B0 &= ~0x200;
}
}
@@ -256,7 +256,7 @@ ARM void ActorUnk_ov000_020a8bb0::vfunc_2c(unk32 param1) {
}
this->vfunc_b8();
this->mUnk_0a4.func_01ffc6d4(this->mAngle, &this->mPos);
this->mUnk_0A4.func_01ffc6d4(this->mAngle, &this->mPos);
}
ARM void ActorUnk_ov000_020a8bb0::vfunc_b8() {
src/000_Second/Item/ItemManager.cpp
+1 -1
View File
@@ -271,7 +271,7 @@ ARM unk32 ItemManager::func_ov000_020a8aa4() {
}
ARM unk32 ItemManager::func_ov000_020a8ab8() {
return this->mUnk_20 != NULL ? this->mUnk_20->mUnk_0c : 0;
return this->mUnk_20 != NULL ? this->mUnk_20->mUnk_0C : 0;
}
ARM unk32 ItemManager::func_ov000_020a8acc() {
src/000_Second/Item/TreasureManager.cpp
+9 -9
View File
@@ -9,13 +9,13 @@ ARM void TreasureManager::func_ov000_020a9b3c() {}
ARM void TreasureManager::func_ov000_020a9b4c() {}
ARM bool TreasureManager::func_ov000_020a9c4c(TreasureType type) {
return this->mUnk_3c[type] >= 0;
return this->mUnk_3C[type] >= 0;
}
// hasAnyTreasure
ARM bool TreasureManager::func_ov000_020a9c64() {
for (s32 i = 0; i < ARRAY_LEN(this->mUnk_3c); i++) {
if (this->mUnk_3c[i] >= 0) {
for (s32 i = 0; i < ARRAY_LEN(this->mUnk_3C); i++) {
if (this->mUnk_3C[i] >= 0) {
return true;
}
}
@@ -25,8 +25,8 @@ ARM bool TreasureManager::func_ov000_020a9c64() {
// getTreasureAmount
ARM unk32 TreasureManager::func_ov000_020a9c90(TreasureType type) {
if (this->mUnk_3c[type] >= 0) {
return this->mUnk_3c[type];
if (this->mUnk_3C[type] >= 0) {
return this->mUnk_3C[type];
}
return 0;
@@ -41,11 +41,11 @@ ARM bool TreasureManager::func_ov000_020a9ca4(TreasureType type) {
ARM void TreasureManager::func_ov000_020a9cbc(TreasureType type, s32 amount) {
s32 newAmount;
if (this->mUnk_3c[type] < 0) {
this->mUnk_3c[type] = 0;
if (this->mUnk_3C[type] < 0) {
this->mUnk_3C[type] = 0;
}
newAmount = this->mUnk_3c[type] + amount;
newAmount = this->mUnk_3C[type] + amount;
if (newAmount > MAX_TREASURE) {
newAmount = MAX_TREASURE;
@@ -53,7 +53,7 @@ ARM void TreasureManager::func_ov000_020a9cbc(TreasureType type, s32 amount) {
newAmount = 0;
}
this->mUnk_3c[type] = newAmount;
this->mUnk_3C[type] = newAmount;
}
ARM unk32 TreasureManager::func_ov000_020a9d78(unk32 param1) {}
src/000_Second/MapObject/MapObject.cpp
+1 -1
View File
@@ -147,7 +147,7 @@ ARM void MapObject::func_ov000_0209d2c4(unk32 param1, unk32 param2) {
}
ARM void MapObject::func_ov000_0209d2f0(unk32 param1, unk32 param2, Vec2b *param3) {
UnkStruct_027e0cd8_0c *temp_r5 = data_027e0cd8->mUnk_0c;
UnkStruct_027e0cd8_0c *temp_r5 = data_027e0cd8->mUnk_0C;
Vec2b sp0(0, 0);
sp0.x = this->mUnk_3A.x;
src/000_Second/MapObject/MapObjectMiniBlocks.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ ARM MapObjectMiniBlocks::MapObjectMiniBlocks() :
ARM bool MapObjectMiniBlocks::vfunc_00(void) {
GET_PROFILE(MapObjectProfileMiniBlocks)
->func_ov000_0209ccd8(this->mUnk_20.mUnk_00[1], data_ov000_020af574[this->mUnk_20.mUnk_00[1]]);
UnkStruct_027e0cd8_0c *pUnkStruct_027e0cd8_0c = data_027e0cd8->mUnk_0c;
UnkStruct_027e0cd8_0c *pUnkStruct_027e0cd8_0c = data_027e0cd8->mUnk_0C;
u8 uVar6;
if (this->mUnk_20.mUnk_00[1] != MiniBlocksVariant_BLKF) {
src/001_SceneInit/Actor/ActorManager_001.cpp
+2 -2
View File
@@ -54,7 +54,7 @@ THUMB ActorManager::ActorManager() {
this->mUnk_14.mUnk_04 = 0;
this->mUnk_24 = 0;
this->mUnk_28 = 0;
this->mUnk_2c = 0;
this->mUnk_2C = 0;
this->mUnk_30 = 0;
this->mUnk_34 = 0;
}
@@ -231,7 +231,7 @@ THUMB void ActorManager::func_ov001_020bb488() {
case 0x01:
case 0x03:
case 0x06:
if (data_027e0cd8->mUnk_0c->mUnk_128 & 0x800) {
if (data_027e0cd8->mUnk_0C->mUnk_128 & 0x800) {
func_ov031_020ea100();
}
break;
src/031_Land/Actor/ActorRupee.cpp
+73 -73
View File
@@ -62,15 +62,15 @@ ARM ActorRupee::ActorRupee() :
mUnk_94(0),
mUnk_96(0),
mUnk_98(0),
mUnk_9a(6),
mUnk_bc(0),
mUnk_c0(0),
mUnk_c4(this),
mUnk_e8(0),
mUnk_f0(0),
mUnk_f4(false) {
this->mUnk_a0 = 0x13100;
this->mUnk_40 = &this->mUnk_c4;
mUnk_9A(6),
mUnk_BC(0),
mUnk_C0(0),
mUnk_C4(this),
mUnk_E8(0),
mUnk_F0(0),
mUnk_F4(false) {
this->mUnk_A0 = 0x13100;
this->mUnk_40 = &this->mUnk_C4;
}
// https://decomp.me/scratch/wunA4
@@ -86,7 +86,7 @@ ARM bool ActorRupee::vfunc_18(unk32 param1) {
return false;
}
if (this->mUnk_6e == 0) {
if (this->mUnk_6E == 0) {
this->func_ov031_020e9904(3);
} else {
this->func_ov031_020e9904(10);
@@ -157,7 +157,7 @@ ARM bool ActorRupee::vfunc_18(unk32 param1) {
}
ARM void ActorRupee::func_ov031_020e8fec() {
switch (this->mUnk_6c) {
switch (this->mUnk_6C) {
case RupeeId_Green:
data_027e09a8->func_ov000_02071b30(0x73, &this->mPos, 0);
break;
@@ -176,14 +176,14 @@ ARM void ActorRupee::func_ov031_020e8fec() {
ARM void ActorRupee::func_ov031_020e9068() {
bool var_r4 = false;
switch (this->mUnk_6c) {
switch (this->mUnk_6C) {
case RupeeId_BigGreen:
case RupeeId_BigRed:
case RupeeId_Gold:
this->func_ov031_020e9904(5);
break;
default: {
ItemManager *pItemManager = data_027e0ce0->mUnk_2c;
ItemManager *pItemManager = data_027e0ce0->mUnk_2C;
pItemManager->GiveRupees(func_02017158(), false, true);
var_r4 = true;
break;
@@ -228,7 +228,7 @@ ARM void ActorRupee::func_ov031_020e91a8() {
return;
}
func_01fff05c(&sp0, data_027e0cd8->mUnk_0c, &this->mPos);
func_01fff05c(&sp0, data_027e0cd8->mUnk_0C, &this->mPos);
if (((sp0 >> 5) & 0x03) == 2) {
this->func_ov000_020984d0();
@@ -258,7 +258,7 @@ ARM void ActorRupee::func_ov031_020e9254() {
return;
}
func_01fff05c(&sp0, data_027e0cd8->mUnk_0c, &this->mPos);
func_01fff05c(&sp0, data_027e0cd8->mUnk_0C, &this->mPos);
if (((sp0 >> 5) & 0x03) == 2) {
this->func_ov000_020984d0();
@@ -287,10 +287,10 @@ ARM void ActorRupee::func_ov031_020e9310() {
this->mUnk_50++;
}
switch (this->mUnk_ec) {
switch (this->mUnk_EC) {
case 0:
if (data_027e0cd8->mUnk_0c->vfunc_28(&this->mPos, 1, 0) < this->mPos.y) {
this->mUnk_ec++;
if (data_027e0cd8->mUnk_0C->vfunc_28(&this->mPos, 1, 0) < this->mPos.y) {
this->mUnk_EC++;
}
break;
case 1:
@@ -300,10 +300,10 @@ ARM void ActorRupee::func_ov031_020e9310() {
this->mVel.y = 0;
this->mVel.z = 0;
func_01fff05c(&sp0, data_027e0cd8->mUnk_0c, &this->mPos);
func_01fff05c(&sp0, data_027e0cd8->mUnk_0C, &this->mPos);
if (((sp0 >> 5) & 3) != 2) {
this->mUnk_ec = 0;
this->mUnk_EC = 0;
} else {
this->func_ov000_020984d0();
}
@@ -333,11 +333,11 @@ ARM void ActorRupee::func_ov031_020e9434() {}
ARM void ActorRupee::func_ov031_020e9438() {
func_ov017_020bf99c();
this->mUnk_9c.func_ov000_02097bec();
this->mUnk_9C.func_ov000_02097bec();
}
ARM void ActorRupee::func_ov031_020e9450() {
this->func_ov017_020bf9c8(gpActorManager->func_01fff3b4(this->mUnk_bc));
this->func_ov017_020bf9c8(gpActorManager->func_01fff3b4(this->mUnk_BC));
this->mPrevPos = this->mPos;
Vec3p_Add(&this->mPos, &this->mVel, &this->mPos);
@@ -348,7 +348,7 @@ ARM void ActorRupee::func_ov031_020e9450() {
this->mVel.x = 0;
this->mVel.y = 0;
this->mVel.z = 0;
this->mUnk_a0 |= 0x1000;
this->mUnk_A0 |= 0x1000;
this->func_ov031_020e9904(0);
}
@@ -358,9 +358,9 @@ ARM void ActorRupee::func_ov031_020e94d4() {
this->mVel.x = 0;
this->mVel.y = 0;
this->mVel.z = 0;
this->mUnk_4a = 0;
this->mUnk_4A = 0;
this->mUnk_44 = 0;
this->mUnk_9c.func_ov000_02097bec();
this->mUnk_9C.func_ov000_02097bec();
UNSET_FLAG(this->mFlags, ActorFlag_Visible);
}
@@ -373,7 +373,7 @@ ARM void ActorRupee::func_ov031_020e951c() {
itemId = ItemId_None;
switch (this->mUnk_6c) {
switch (this->mUnk_6C) {
case RupeeId_Gold:
itemId = ItemId_BigGoldRupee;
break;
@@ -411,7 +411,7 @@ ARM void ActorRupee::func_ov031_020e95b0() {
ARM void ActorRupee::func_ov031_020e95c0() {
Actor *pActor;
pActor = gpActorManager->func_01fff3b4(this->mUnk_c0);
pActor = gpActorManager->func_01fff3b4(this->mUnk_C0);
if (pActor == NULL) {
this->func_ov031_020e9904(0);
return;
@@ -429,7 +429,7 @@ ARM void ActorRupee::func_ov031_020e9610() {
}
ARM void ActorRupee::func_ov031_020e9624() {
this->mUnk_9a = 0x14;
this->mUnk_9A = 0x14;
this->mUnk_98 = 0x00;
}
@@ -438,13 +438,13 @@ ARM void ActorRupee::func_ov031_020e9638() {
this->mVel.y = 0;
this->mVel.z = 0;
UNSET_FLAG(this->mFlags, ActorFlag_Visible);
this->mUnk_c4.mUnk_04 = 0;
this->mUnk_C4.mUnk_04 = 0;
if (this->mUnk_6e == 2) {
this->mUnk_4a = 1;
data_027e0cec->func_ov000_0209ff8c(&this->mUnk_f0, 0xD00C, &this->mPos, 2);
if (this->mUnk_6E == 2) {
this->mUnk_4A = 1;
data_027e0cec->func_ov000_0209ff8c(&this->mUnk_F0, 0xD00C, &this->mPos, 2);
} else {
this->mUnk_4a = 0;
this->mUnk_4A = 0;
}
this->mPos.y -= FLOAT_TO_Q20(1.2);
@@ -468,7 +468,7 @@ ARM void ActorRupee::func_ov031_020e970c() {
this->mVel.y = 0;
this->mVel.z = 0;
SET_FLAG(this->mFlags, ActorFlag_Visible);
this->mUnk_4a = 1;
this->mUnk_4A = 1;
this->mUnk_52 = -1;
this->mUnk_50 = 0;
}
@@ -485,7 +485,7 @@ ARM void ActorRupee::func_ov031_020e9740() {
sp4 = 0;
if (func_ov031_0210af50(sp0, &sp4) != 0) {
temp_r0 = data_027e0cd8->mUnk_0c;
temp_r0 = data_027e0cd8->mUnk_0C;
temp_r2 = (sp4 - 0x800) + temp_r0->vfunc_28(&this->mPos, 0, 0);
if (this->mPos.y != temp_r2) {
@@ -496,8 +496,8 @@ ARM void ActorRupee::func_ov031_020e9740() {
this->func_ov031_020e9904(0xC);
}
} else {
temp_r0 = data_027e0cd8->mUnk_0c;
this->mPos.y = temp_r0->vfunc_28(&this->mUnk_5c.mUnk_00, 0, 0);
temp_r0 = data_027e0cd8->mUnk_0C;
this->mPos.y = temp_r0->vfunc_28(&this->mUnk_5C.mUnk_00, 0, 0);
this->func_ov031_020e9904(0xC);
}
@@ -511,11 +511,11 @@ ARM void ActorRupee::func_ov031_020e9838() {
u16 sp2;
func_01ffedac(&sp2, &this->mPos);
this->mUnk_c4.mUnk_04 = 1;
this->mUnk_C4.mUnk_04 = 1;
func_ov031_0210b0e4(sp2, 0);
func_ov031_0210acd4(sp2);
func_ov031_0210acd4(sp2);
data_027e0cec->func_ov000_020a0110(&this->mUnk_f0);
data_027e0cec->func_ov000_020a0110(&this->mUnk_F0);
}
// non-matching
@@ -537,17 +537,17 @@ extern UnkStruct_ov031_02113520 data_ov031_02113520[13];
// non-matching
ARM void ActorRupee::func_ov031_020e9904(unk32 param1) {
this->mUnk_4c = param1;
this->mUnk_4C = param1;
this->mUnk_52 = -1;
this->mUnk_50 = 0;
this->mUnk_ec = 0;
u32 uVar1 = data_ov031_02113520[this->mUnk_4c].mUnk_04;
this->mUnk_EC = 0;
u32 uVar1 = data_ov031_02113520[this->mUnk_4C].mUnk_04;
UnkCallback_ov031_02113520 pcVar2;
if (!(uVar1 & 1)) {
pcVar2 = data_ov031_02113520[this->mUnk_4c].mUnk_00;
pcVar2 = data_ov031_02113520[this->mUnk_4C].mUnk_00;
} else {
pcVar2 = (UnkCallback_ov031_02113520) (((u32) this + uVar1 >> 1) + &data_ov031_02113520[this->mUnk_4c]);
pcVar2 = (UnkCallback_ov031_02113520) (((u32) this + uVar1 >> 1) + &data_ov031_02113520[this->mUnk_4C]);
}
pcVar2(this);
@@ -589,56 +589,56 @@ ARM void ActorRupee::vfunc_20() {
func_01fff17c(&sStack_1c, data_027e0ce0, 0);
func_02018114(&uStack_1a, sStack_1c);
this->mUnk_c4.mUnk_08 = uStack_1a;
this->mUnk_c4.mUnk_0a = uStack_18;
this->mUnk_c4.mUnk_0c = uStack_16;
this->mUnk_C4.mUnk_08 = uStack_1a;
this->mUnk_C4.mUnk_0A = uStack_18;
this->mUnk_C4.mUnk_0C = uStack_16;
uStack_1a = 0;
uStack_18 = 0x666;
uStack_16 = 0;
this->mUnk_c4.mUnk_0e = 0;
this->mUnk_c4.mUnk_10 = 0x666;
sVar1 = this->mUnk_4c;
this->mUnk_C4.mUnk_0E = 0;
this->mUnk_C4.mUnk_10 = 0x666;
sVar1 = this->mUnk_4C;
test = this->mPos;
if (sVar1 != 5) {
iVar4 = (int) (short) this->mUnk_4c;
iVar4 = (int) (short) this->mUnk_4C;
}
this->mUnk_c4.mUnk_12 = 0;
this->mUnk_C4.mUnk_12 = 0;
this->mPrevPos = test;
uVar3 = uVar2;
if ((sVar1 != 5 && iVar4 != 10) && iVar4 != 0xb) {
if ((sVar1 != 6) && ((u16) this->mUnk_98 < (u16) this->mUnk_9a)) {
if ((sVar1 != 6) && ((u16) this->mUnk_98 < (u16) this->mUnk_9A)) {
this->mUnk_98++;
}
uVar3 = uStack_18;
if ((u16) this->mUnk_9a <= (u16) this->mUnk_98) {
this->mUnk_3c = (unk32) & this->mUnk_9c;
if ((u16) this->mUnk_9A <= (u16) this->mUnk_98) {
this->mUnk_3C = (unk32) & this->mUnk_9C;
uStack_18 = uVar2;
this->func_ov000_020989e0();
uVar3 = uStack_18;
if ((this->mUnk_a4 & 0x3ffff) != 0) {
sVar1 = *(short *) &this->mUnk_b8;
if ((this->mUnk_A4 & 0x3ffff) != 0) {
sVar1 = *(short *) &this->mUnk_B8;
switch (mUnk_b8) {
switch (mUnk_B8) {
case 0x08:
case 0x10:
if ((this->mUnk_a8 & 0x100) != 0) {
if ((this->mUnk_A8 & 0x100) != 0) {
this->func_ov031_020e9068();
uVar3 = uStack_18;
}
break;
case 0x0C:
this->mUnk_bc = this->mUnk_a8;
this->mUnk_a0 &= 0xffffefff;
this->mUnk_BC = this->mUnk_A8;
this->mUnk_A0 &= 0xffffefff;
this->func_ov031_020e9904(6);
uVar3 = uStack_18;
break;
@@ -650,7 +650,7 @@ ARM void ActorRupee::vfunc_20() {
}
uStack_18 = uVar3;
iVar4 = (int) (short) this->mUnk_4c;
iVar4 = (int) (short) this->mUnk_4C;
// uVar5 = *(u32 *) (data_ov031_0211358c[iVar4 * 8]);
if (!(uVar5 & 1)) {
@@ -662,12 +662,12 @@ ARM void ActorRupee::vfunc_20() {
// (*pcVar6)();
if ((this->mUnk_80 < 0) && (this->mUnk_4c != 5)) {
if ((this->mUnk_80 < 0) && (this->mUnk_4C != 5)) {
this->func_ov031_020e9d94();
}
if (this->mUnk_6e != 0) {
sVar1 = this->mUnk_4c;
if (this->mUnk_6E != 0) {
sVar1 = this->mUnk_4C;
if (!(sVar1 != 10 && sVar1 != 0xb && sVar1 != 0xc)) {
func_01ffedac(&uStack_1e, &this->mPos);
@@ -683,7 +683,7 @@ ARM void ActorRupee::func_ov031_020e9b88() {
func_ov000_02098838();
Vec3p_Add(&this->mPos, &this->mVel, &this->mPos);
if (this->mUnk_5c.mUnk_00.y < this->mPos.y + this->mVel.y) {
if (this->mUnk_5C.mUnk_00.y < this->mPos.y + this->mVel.y) {
this->mUnk_44 = 0x9C;
} else {
this->mUnk_44 = 0x9F;
@@ -721,7 +721,7 @@ ARM void ActorRupee::vfunc_2c(unk32 param1) {
return;
}
func_ov000_0205c1f0(auStack_30, data_ov031_02110aa0[this->mUnk_6c]);
func_ov000_0205c1f0(auStack_30, data_ov031_02110aa0[this->mUnk_6C]);
iStack_18 = this->mPos;
if (!this->func_ov031_020e9d54()) {
@@ -734,7 +734,7 @@ ARM void ActorRupee::vfunc_2c(unk32 param1) {
uVar2 = 0x4CD;
}
if (this->mUnk_4c != 9) {
if (this->mUnk_4C != 9) {
iStack_28.x = this->mPos.x;
iStack_28.y = this->mPos.y + 0x80;
iStack_28.z = this->mPos.z;
@@ -743,7 +743,7 @@ ARM void ActorRupee::vfunc_2c(unk32 param1) {
}
ARM bool ActorRupee::func_ov031_020e9d54() {
switch (this->mUnk_6c) {
switch (this->mUnk_6C) {
case RupeeId_BigGreen:
case RupeeId_BigRed:
case RupeeId_Gold:
@@ -771,7 +771,7 @@ ARM void ActorRupee::func_ov031_020e9d94() {
return;
}
if (!this->mUnk_f4) {
if (!this->mUnk_F4) {
if (this->mUnk_94 < this->mUnk_96) {
this->mUnk_94++;
var_r1 = 0;
@@ -782,7 +782,7 @@ ARM void ActorRupee::func_ov031_020e9d94() {
if (var_r1 == 0) {
return;
}
this->mUnk_f4 = 1;
this->mUnk_F4 = 1;
this->mUnk_96 = 0x3C;
this->mUnk_94 = 0;
return;
@@ -822,7 +822,7 @@ ARM bool ActorRupee::func_ov031_020e9e5c() {
bool bVar6;
bool bVar7;
sVar1 = this->mUnk_4c;
sVar1 = this->mUnk_4C;
bVar6 = true;
bVar5 = true;
bVar4 = true;
@@ -867,7 +867,7 @@ ARM ActorRupee_c4::ActorRupee_c4(Actor *param1) :
ARM unk32 ActorRupee_c4::vfunc_00(Actor_c4_stack param1, unk32 param2) {
if (param2 != 0) {
ActorRupee *pRupee = GET_ACTOR_RUPEE(this->mUnk_20);
pRupee->mUnk_c0 = param1.param1;
pRupee->mUnk_C0 = param1.param1;
pRupee->func_ov031_020e9904(7);
}
src/110_PlayerGet/PlayerGet.cpp
+28 -28
View File
@@ -21,7 +21,7 @@
struct UnkStruct_02186240 {
/* 0000 */ unk8 mUnk_0000[0x3F68];
/* 3f68 */
/* 3F68 */
};
UnkStruct_02186240 data_ov110_02186240;
@@ -47,11 +47,11 @@ struct func_ov000_0205abcc_ret {
unk32 mUnk_04;
unk8 mUnk_08;
unk8 mUnk_09;
unk8 mUnk_0a;
unk8 mUnk_0b;
unk8 mUnk_0c;
unk8 mUnk_0d;
unk8 mUnk_0e;
unk8 mUnk_0A;
unk8 mUnk_0B;
unk8 mUnk_0C;
unk8 mUnk_0D;
unk8 mUnk_0E;
};
extern "C" func_ov000_0205abcc_ret *func_ov000_0205abcc(char *, char *, unk32, unk32, unk32);
extern "C" unk32 func_ov000_02077590(unk32);
@@ -224,27 +224,27 @@ static const unk32 data_ov110_021860c4[] = {
ARM void UnkStruct_PlayerGet_74::vfunc_00(unk32 param1, unk32 param2, unk32 param3) {
PlayerGet *unk_14 = (PlayerGet *) this->mUnk_14;
func_01ffc5a0(&unk_14->mUnk_8c, unk_14->mUnk_6c, unk_14->mUnk_70, &this->mUnk_04, param3);
func_01ffc5a0(&unk_14->mUnk_8C, unk_14->mUnk_6C, unk_14->mUnk_70, &this->mUnk_04, param3);
}
ARM PlayerGet::PlayerGet() :
mUnk_54(0, 0, -1, ItemId_None),
mUnk_64(mUnk_44, -1),
mUnk_6c(0x1000),
mUnk_6C(0x1000),
mUnk_70(0),
mUnk_72(0),
mUnk_73(0),
mUnk_74(this),
mUnk_8c(0) {}
mUnk_8C(0) {}
ARM PlayerGet::~PlayerGet() {
func_ov000_0205ca74(this->mUnk_54.mUnk_08);
UnkStruct_027e0cec *pData_027e0cec = data_027e0cec;
if (pData_027e0cec != NULL) {
UnkStruct_PlayerGet_ec *pUnk_ec = &this->mUnk_ec[0];
UnkStruct_PlayerGet_ec *pUnk_ec = &this->mUnk_EC[0];
while (pUnk_ec != (UnkStruct_PlayerGet_ec *) &this->mUnk_fc) {
while (pUnk_ec != (UnkStruct_PlayerGet_ec *) &this->mUnk_FC) {
pData_027e0cec->func_ov000_020a0110(pUnk_ec);
pUnk_ec++;
}
@@ -299,7 +299,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) {
*(u32 *) this->mUnk_54.mUnk_04 = param1->mUnk_10.y;
this->mUnk_54.mUnk_08 = param1->mUnk_10.z;
pItemManager = this->mUnk_28->pItemManager;
itemId = param1->mUnk_1c;
itemId = param1->mUnk_1C;
switch (itemId) {
case ItemId_BombBag:
@@ -331,7 +331,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) {
this->mUnk_54.mItemId = itemId;
this->mUnk_70 = 0;
this->mUnk_2c->mUnk_58 = 0;
this->mUnk_2C->mUnk_58 = 0;
func_ov000_0208ba10(auStack_108, &this->mUnk_24->mUnk_25, 0);
this->mUnk_40->mUnk_00 = 0x8000;
@@ -356,13 +356,13 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) {
if (iVar10->GetActorId() == ActorId_NormalShield) {
UNSET_FLAG(iVar10->mFlags, ActorFlag_Visible);
iVar10->mUnk_4a = 0;
iVar10->mUnk_4A = 0;
}
break;
case 0x3A:
if (this->mUnk_54.mItemId != ItemId_Nothing) {
if (func_ov000_020a4c00(this->mUnk_54.mItemId) == 0) {
this->mUnk_8c.vfunc_08(0);
this->mUnk_8C.vfunc_08(0);
} else {
unk32 niVar10;
@@ -402,7 +402,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) {
func_ov000_0205abcc((char *) auStack_64, (char *) auStack_48, 0, 1, this->mUnk_30->mUnk_24);
if (ret != NULL) {
if (ret->mUnk_08 != 0 && ret->mUnk_09 > 0) {
var_r1_2 = ret->mUnk_08 + ret->mUnk_0e + 4;
var_r1_2 = ret->mUnk_08 + ret->mUnk_0E + 4;
} else {
var_r1_2 = 0;
}
@@ -416,7 +416,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) {
var_r1_3 = NULL;
}
this->mUnk_8c.vfunc_08((unk32) var_r1_3);
this->mUnk_8C.vfunc_08((unk32) var_r1_3);
func_020156f4((char *) auStack_48);
func_02015644((char *) auStack_64);
}
@@ -425,22 +425,22 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) {
case ItemId_BigGreenRupee:
case ItemId_BigRedRupee:
case ItemId_BigGoldRupee:
this->mUnk_6c = 0x1666;
this->mUnk_6C = 0x1666;
break;
default:
this->mUnk_6c = 0x1000;
this->mUnk_6C = 0x1000;
break;
}
}
UnkStruct_027e09bc_0c *uVar11 = data_027e09bc->mUnk_0c;
UnkStruct_027e09bc_0c *uVar11 = data_027e09bc->mUnk_0C;
unk32 uVar6 = func_ov000_02077590(4);
uVar11->func_ov000_0207834c(this->mUnk_34, uVar6, 0);
UnkStruct_PlayerGet_48 *pUnk_48 = this->mUnk_48;
pUnk_48->mUnk_42 = 0x1000;
pUnk_48->mUnk_47 = 0;
pUnk_48->mUnk_5e = 0x1000;
pUnk_48->mUnk_5E = 0x1000;
pUnk_48->mUnk_63 = 0;
if (this->mUnk_44 != NULL) {
@@ -471,7 +471,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) {
return;
}
data_ov000_020b51b8.func_ov000_0206c96c(data_027e0cd8->mUnk_0c->func_ov000_02080a44());
data_ov000_020b51b8.func_ov000_0206c96c(data_027e0cd8->mUnk_0C->func_ov000_02080a44());
this->mUnk_73 = 1;
break;
case 0x3B:
@@ -483,7 +483,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) {
uStack_f0[2] = 0x872;
uStack_f0[0] = 0x870;
uStack_f0[3] = 0x873;
data_027e0cec->func_ov000_020a0000(this->mUnk_ec, this->mUnk_fc, uStack_f0, &VStack_fc, 1);
data_027e0cec->func_ov000_020a0000(this->mUnk_EC, this->mUnk_FC, uStack_f0, &VStack_fc, 1);
}
UnkStruct_ov000_02067bc4::UnkStruct1 auStack_30;
@@ -707,7 +707,7 @@ ARM void PlayerGet::vfunc_10(unk32 param1, unk32 param2) {
}
if (!temp_r6) {
data_027e09bc->mUnk_0c->func_ov000_02078230(0);
data_027e09bc->mUnk_0C->func_ov000_02078230(0);
}
if (data_027e09b8->func_ov000_020732fc(this->mUnk_54.mUnk_08) != 0) {
@@ -738,7 +738,7 @@ ARM void PlayerGet::vfunc_10(unk32 param1, unk32 param2) {
break;
}
temp_r5 = data_027e0cd8->mUnk_0c->func_ov000_02080a44();
temp_r5 = data_027e0cd8->mUnk_0C->func_ov000_02080a44();
if (data_ov000_020b51b8.mUnk_08[2] != NULL) {
var_r0 = 1;
@@ -776,7 +776,7 @@ ARM void PlayerGet::vfunc_18(unk32 param1, unk32 param2, unk32 param3) {
case 0x3A:
break;
case 0x3B:
if (param3 != 0 && this->mUnk_54.mItemId != ItemId_Nothing && this->mUnk_8c.mUnk_04 != 0) {
if (param3 != 0 && this->mUnk_54.mItemId != ItemId_Nothing && this->mUnk_8C.mUnk_04 != 0) {
Vec3p_Add(this->mUnk_34, (Vec3p *) &data_ov110_021861ec.mUnk_00, &auStack_18);
func_ov000_02058fc4(data_027e0958, &this->mUnk_74, &auStack_18);
}
@@ -798,13 +798,13 @@ THUMB void UnkStruct_027e0ce0_34::func_ov110_02185d3c(ItemId itemId) {
switch (itemId) {
case ItemId_31:
this->func_ov024_020d3d98(0, 0);
this->mUnk_2c = 1;
this->mUnk_2C = 1;
this->mUnk_00 = 0;
this->mUnk_10 = 0;
break;
case ItemId_33:
this->func_ov024_020d3d98(2, 0);
this->mUnk_2c = 2;
this->mUnk_2C = 2;
this->mUnk_04 = 2;
this->mUnk_14 = 0;
break;
src/112_PlayerSceneChange/PlayerSceneChange.cpp
+11 -11
View File
@@ -13,7 +13,7 @@ extern "C" void func_ov000_0205ca74(unk32);
extern "C" void func_ov000_0205d65c(void *, Vec3p *, Vec3p *, u32);
ARM PlayerSceneChange::PlayerSceneChange() {
this->mUnk_68 = this->mUnk_2c->mUnk_14C;
this->mUnk_68 = this->mUnk_2C->mUnk_14C;
this->mUnk_6C = -1;
this->mUnk_70.coords = this->mUnk_34->coords;
@@ -82,7 +82,7 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
switch (param1->mUnk_04) {
case 0x3C: {
int iVar19 = data_027e0cd8->mUnk_0c->func_ov000_02080658((this->mUnk_2c->mUnk_148 >> 16) & 0x3F, &this->mUnk_54);
int iVar19 = data_027e0cd8->mUnk_0C->func_ov000_02080658((this->mUnk_2C->mUnk_148 >> 16) & 0x3F, &this->mUnk_54);
if (iVar19 != 0 && this->mUnk_28->mUnk_94 != 0 && func_ov096_02179c14()) {
this->mUnk_54.mUnk_10 = 1;
}
@@ -143,9 +143,9 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
this->mUnk_70.z = temp_r8->z + MUL_Q20(data_0203f964[1], FLOAT_TO_Q20(2.0f));
break;
default:
if (this->mUnk_2c->mUnk_150 == 0x1000) {
if (this->mUnk_2C->mUnk_150 == 0x1000) {
MapObjectUnkDRTY *pDRTY =
(MapObjectUnkDRTY *) gpMapObjManager->func_01fff498(this->mUnk_2c->mUnk_150 >> 0x10, 0);
(MapObjectUnkDRTY *) gpMapObjManager->func_01fff498(this->mUnk_2C->mUnk_150 >> 0x10, 0);
if (pDRTY != NULL) {
pDRTY->func_ov000_0209d6ac((Vec3p *) &this->mUnk_70);
@@ -170,9 +170,9 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
}
}
} else {
if (((u32) ((u16) this->mUnk_2c->mUnk_150 << 0x10) >> 0x1E) == 1) {
if (((u32) ((u16) this->mUnk_2C->mUnk_150 << 0x10) >> 0x1E) == 1) {
ActorUnk_ov000_020a8bb0 *temp_r0_6 =
(ActorUnk_ov000_020a8bb0 *) gpActorManager->func_01fff3b4(this->mUnk_2c->mUnk_150);
(ActorUnk_ov000_020a8bb0 *) gpActorManager->func_01fff3b4(this->mUnk_2C->mUnk_150);
if (temp_r0_6 != NULL) {
this->mUnk_70.x = temp_r0_6->mPos.x;
@@ -418,7 +418,7 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
case 0x1E:
case 0x1F:
default:
UnkStruct_027e0cd8_0c *ptr = data_027e0cd8->mUnk_0c;
UnkStruct_027e0cd8_0c *ptr = data_027e0cd8->mUnk_0C;
switch (this->mUnk_68) {
case 0x0F:
@@ -622,10 +622,10 @@ ARM void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) {
case 0x14:
case 0x21:
case 0x25:
this->mUnk_2c->mUnk_9C = this->mUnk_34->y + 0xFFFFFCCD;
this->mUnk_2C->mUnk_9C = this->mUnk_34->y + 0xFFFFFCCD;
break;
default:
this->mUnk_2c->mUnk_9C = this->mUnk_34->y;
this->mUnk_2C->mUnk_9C = this->mUnk_34->y;
break;
}
break;
@@ -673,7 +673,7 @@ ARM void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) {
case 0x25:
break;
default:
this->mUnk_2c->mUnk_9C = this->mUnk_34->y;
this->mUnk_2C->mUnk_9C = this->mUnk_34->y;
break;
}
@@ -684,7 +684,7 @@ ARM void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) {
case 0x11:
case 0x13:
case 0x24: {
UnkStruct_027e0cd8_0c *temp_r0_13 = data_027e0cd8->mUnk_0c;
UnkStruct_027e0cd8_0c *temp_r0_13 = data_027e0cd8->mUnk_0C;
q20 temp_r0_14 = temp_r0_13->vfunc_28(this->mUnk_34, 0, 0);
Vec3p *temp_r2_9 = this->mUnk_34;
src/112_PlayerSceneChange/PlayerSceneChange2.cpp
+3 -3
View File
@@ -27,7 +27,7 @@ ARM void PlayerSceneChange2::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param
pVVar1->y = 0;
pVVar1->z = 0;
this->mUnk_2c->mUnk_58 = 0;
this->mUnk_2C->mUnk_58 = 0;
func_ov000_0208ba10(auStack_18, &this->mUnk_24->mUnk_94, 0);
@@ -76,10 +76,10 @@ ARM void PlayerSceneChange2::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param
func_ov000_0205d65c(&auStack_2c, this->mUnk_34, (Vec3p *) &this->mUnk_54, this->mUnk_40->mUnk_00);
this->mUnk_40->mUnk_00 = auStack_2c;
this->mUnk_2c->mUnk_26 = 0;
this->mUnk_2C->mUnk_26 = 0;
break;
case 0x45:
this->mUnk_2c->mUnk_26 = 0;
this->mUnk_2C->mUnk_26 = 0;
break;
default:
break;
src/Main/System/OverlayManager.cpp
+4 -4
View File
@@ -4,7 +4,7 @@
struct UnkStruct_020ee698 {
/* 00 */ unk8 mUnk_00[0x2C];
/* 2c */ unk32 mUnk_2c;
/* 2C */ unk32 mUnk_2C;
/* 30 */
};
extern UnkStruct_020ee698 data_ov000_020ee698;
@@ -16,11 +16,11 @@ struct OverlaySetup {
/* 03 */ unk8 mUnk_03;
/* 04 */ OverlayId slot1Overlay;
/* 08 */ OverlayId slot2Overlay;
/* 0c */ OverlayId slot3Overlay;
/* 0C */ OverlayId slot3Overlay;
/* 10 */ OverlayId slot12Overlay;
/* 14 */ void *mUnk_14;
/* 18 */ void *mUnk_18;
/* 1c */
/* 1C */
};
extern OverlaySetup gOverlaySetups[];
@@ -68,7 +68,7 @@ THUMB void OverlayManager::LoadOverlaySetup(s32 index) {
} else {
overlayId = pSetup->slot12Overlay;
if (index == 6 && data_ov000_020ee698.mUnk_2c == 2) {
if (index == 6 && data_ov000_020ee698.mUnk_2C == 2) {
overlayId = OverlayId_CastleTown;
}