mirror of
https://github.com/zeldaret/st
synced 2026-07-08 14:26:24 -04:00
Make hex number case more consistent (#83)
* consistent hex in vfunc names * consistent hex in code * Actor_c4 -> Actor_C4, Actor_9c -> Actor_9C
This commit is contained in:
@@ -50,7 +50,7 @@ ARM bool Actor::vfunc_18(unk32 param1) {
|
||||
return true;
|
||||
}
|
||||
|
||||
ARM void Actor::vfunc_1c() {}
|
||||
ARM void Actor::vfunc_1C() {}
|
||||
|
||||
ARM void Actor::vfunc_20() {}
|
||||
|
||||
@@ -58,7 +58,7 @@ ARM void Actor::vfunc_24() {}
|
||||
|
||||
ARM void Actor::vfunc_28() {}
|
||||
|
||||
ARM void Actor::vfunc_2c(unk32 param1) {}
|
||||
ARM void Actor::vfunc_2C(unk32 param1) {}
|
||||
|
||||
ARM void Actor::vfunc_30() {}
|
||||
|
||||
@@ -99,7 +99,7 @@ ARM unk16 Actor::vfunc_08() {
|
||||
return this->mpProfile->mUnk_1A;
|
||||
}
|
||||
|
||||
ARM unk8 Actor::vfunc_0c() {
|
||||
ARM unk8 Actor::vfunc_0C() {
|
||||
return this->mpProfile->mUnk_18;
|
||||
}
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ ARM bool Actor_Derived1::vfunc_18(unk32 param1) {
|
||||
|
||||
ARM void Actor_Derived1::vfunc_54(unk32 param1) {}
|
||||
|
||||
ARM void Actor_Derived1::vfunc_1c() {
|
||||
ARM void Actor_Derived1::vfunc_1C() {
|
||||
this->func_ov031_020e3ca4();
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ ARM void Actor_Derived1::func_ov000_020a8df0(ActorRef param1, unk32 param2) {
|
||||
}
|
||||
|
||||
if (this->mRef != param1) {
|
||||
this->vfunc_b4();
|
||||
this->vfunc_B4();
|
||||
*(u32 *) &this->mUnk_0BC = param1.Get32();
|
||||
this->mUnk_0C0.x = 0;
|
||||
this->mUnk_0C0.y = 0;
|
||||
@@ -94,7 +94,7 @@ ARM void Actor_Derived1::func_ov000_020a8df0(ActorRef param1, unk32 param2) {
|
||||
}
|
||||
}
|
||||
|
||||
ARM void Actor_Derived1::vfunc_b4() {
|
||||
ARM void Actor_Derived1::vfunc_B4() {
|
||||
this->vfunc_58(0);
|
||||
}
|
||||
|
||||
@@ -110,9 +110,9 @@ ARM void Actor_Derived1::func_ov000_020a8e9c(VecFx32 *param1) {
|
||||
this->mUnk_0BC.Reset();
|
||||
}
|
||||
|
||||
ARM void Actor_Derived1::vfunc_b0() {
|
||||
ARM void Actor_Derived1::vfunc_B0() {
|
||||
if (data_027e09b8->func_01ffd420() == 0) {
|
||||
ActorUnk_vfunc_b0 auStack_60;
|
||||
ActorUnk_vfunc_B0 auStack_60;
|
||||
auStack_60.mpActor = this;
|
||||
auStack_60.mUnk_0C = this->mUnk_5C.mUnk_20;
|
||||
auStack_60.mUnk_14 = 0;
|
||||
@@ -131,7 +131,7 @@ ARM unk32 Actor_Derived1::vfunc_88() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
ARM unk32 Actor_Derived1::vfunc_8c() {
|
||||
ARM unk32 Actor_Derived1::vfunc_8C() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -146,7 +146,7 @@ ARM void Actor_Derived1::vfunc_94() {
|
||||
ARM void Actor_Derived1::vfunc_60() {
|
||||
if (data_027e09b8->func_01ffd420() == 0) {
|
||||
if (this->vfunc_64()) {
|
||||
this->vfunc_b0();
|
||||
this->vfunc_B0();
|
||||
this->func_ov000_020a9200();
|
||||
this->vfunc_58(4);
|
||||
}
|
||||
@@ -159,17 +159,17 @@ ARM bool Actor_Derived1::vfunc_64() {
|
||||
|
||||
ARM void Actor_Derived1::func_ov000_020a8ff4() {}
|
||||
|
||||
ARM void Actor_Derived1::vfunc_6c() {}
|
||||
ARM void Actor_Derived1::vfunc_6C() {}
|
||||
|
||||
ARM void Actor_Derived1::vfunc_68() {
|
||||
UNSET_FLAG(this->mFlags, ActorFlag_Interacting);
|
||||
this->func_ov000_020a9200();
|
||||
this->vfunc_ac();
|
||||
this->vfunc_Ac();
|
||||
this->mUnk_0B0 &= ~0x01;
|
||||
this->mUnk_0B0 &= ~0x10;
|
||||
}
|
||||
|
||||
ARM unk32 Actor_Derived1::vfunc_7c() {
|
||||
ARM unk32 Actor_Derived1::vfunc_7C() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -204,21 +204,21 @@ ARM void Actor_Derived1::vfunc_70() {
|
||||
ARM void Actor_Derived1::vfunc_74() {}
|
||||
ARM void Actor_Derived1::vfunc_78() {}
|
||||
ARM void Actor_Derived1::func_ov000_020a9248() {}
|
||||
ARM void Actor_Derived1::vfunc_5c() {}
|
||||
ARM void Actor_Derived1::vfunc_5C() {}
|
||||
ARM void Actor_Derived1::vfunc_98(unk32 param1) {}
|
||||
ARM void Actor_Derived1::func_ov000_020a94b0() {}
|
||||
ARM void Actor_Derived1::vfunc_9c() {}
|
||||
ARM void Actor_Derived1::vfunc_9C() {}
|
||||
|
||||
ARM unk32 Actor_Derived1::vfunc_a0() {
|
||||
ARM unk32 Actor_Derived1::vfunc_A0() {
|
||||
this->GetActorId();
|
||||
return 1;
|
||||
}
|
||||
|
||||
ARM void Actor_Derived1::vfunc_ac() {}
|
||||
ARM void Actor_Derived1::vfunc_Ac() {}
|
||||
ARM void Actor_Derived1::func_ov000_020a95d8() {}
|
||||
ARM void Actor_Derived1::vfunc_a4() {}
|
||||
ARM void Actor_Derived1::vfunc_A4() {}
|
||||
|
||||
ARM unk32 Actor_Derived1::vfunc_a8() {
|
||||
ARM unk32 Actor_Derived1::vfunc_A8() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -239,16 +239,16 @@ ARM void Actor_Derived1::vfunc_24() {
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM void Actor_Derived1::vfunc_2c(unk32 param1) {
|
||||
ARM void Actor_Derived1::vfunc_2C(unk32 param1) {
|
||||
if (this->func_01fff5d0(param1, 0) == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
this->vfunc_b8();
|
||||
this->vfunc_B8();
|
||||
this->mUnk_0A4.func_01ffc6d4(this->mAngle, &this->mPos);
|
||||
}
|
||||
|
||||
ARM void Actor_Derived1::vfunc_b8() {
|
||||
ARM void Actor_Derived1::vfunc_B8() {
|
||||
this->func_ov017_020bf5c4(&this->mPos, 0x666, 0x666, 0x1F, 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ THUMB void ActorManager::func_ov001_020bafdc() {
|
||||
if (pActor != NULL) {
|
||||
// alive and uninitialized?
|
||||
if (GET_FLAG(pActor->mFlags, ActorFlag_Alive) && !GET_FLAG(pActor->mFlags, ActorFlag_4)) {
|
||||
pActor->vfunc_1c();
|
||||
pActor->vfunc_1C();
|
||||
SET_FLAG(pActor->mFlags, ActorFlag_4);
|
||||
}
|
||||
}
|
||||
@@ -169,7 +169,7 @@ THUMB void ActorManager::func_ov001_020bb018(UnkStruct_func_ov001_020bb018_param
|
||||
|
||||
if (gOverlayManager.mLoadedOverlays[OverlaySlot_8] == OverlayIndex_Tower) {
|
||||
UnkStruct_StackTitleScreen auStack_3c("Screen/tex2d.bin", 1);
|
||||
auStack_3c.func_ov000_02059270(0x34, "baloon", 0x28a00000);
|
||||
auStack_3c.func_ov000_02059270(0x34, "baloon", 0x28A00000);
|
||||
auStack_3c.func_ov000_02059270(0x35, "dot", 0x28000000);
|
||||
}
|
||||
|
||||
|
||||
@@ -595,7 +595,7 @@ ARM void FileSelectMain::func_ov019_020c72a0() {
|
||||
var_r7 = 6;
|
||||
}
|
||||
|
||||
this->mUnk_03E8[this->mSaveSlotIndex].func_ov000_0206415c(&local_5c, 0, 0xf, 0);
|
||||
this->mUnk_03E8[this->mSaveSlotIndex].func_ov000_0206415c(&local_5c, 0, 0xF, 0);
|
||||
this->mUnk_07A0.mUnk_08 = var_r4;
|
||||
this->mUnk_0A80.mUnk_08 = var_r5;
|
||||
this->mUnk_0D60.mUnk_08 = var_r6;
|
||||
@@ -785,7 +785,7 @@ ARM void FileSelectMain::func_ov019_020c78ac() {
|
||||
|
||||
ARM void FileSelectMain::func_ov019_020c7910() {
|
||||
this->mUnk_03E8[this->mSaveSlotIndex].func_ov000_0206415c((void *) &UnkStruct_ov019_020d1e70::data_ov019_020d1e94.mUnk_00,
|
||||
0, 0x1e, 10);
|
||||
0, 0x1E, 10);
|
||||
|
||||
this->mUnk_10BC.mUnk_0A = 1;
|
||||
this->mUnk_10BC.mUnk_0B = 0;
|
||||
|
||||
@@ -453,15 +453,15 @@ ARM void FileSelectOptions::func_ov019_020cd614() {
|
||||
this->mUnk_1064.mUnk_08 = 0;
|
||||
|
||||
func_ov000_02062e44(&local_34, &this->mUnk_1388);
|
||||
this->mUnk_1420.func_ov000_0206415c(&local_34, 0, 0xc, 0);
|
||||
this->mUnk_1420.func_ov000_0206415c(&local_34, 0, 0xC, 0);
|
||||
|
||||
func_ov000_02062e44(&local_40, &this->mUnk_16AC);
|
||||
local_34 = local_40;
|
||||
this->mUnk_1744.func_ov000_0206415c(&local_34, 0, 0xc, 0);
|
||||
this->mUnk_1744.func_ov000_0206415c(&local_34, 0, 0xC, 0);
|
||||
|
||||
func_ov000_02062e44(&local_44, &this->mUnk_19D0);
|
||||
local_34 = local_44;
|
||||
this->mUnk_1A68.func_ov000_0206415c(&local_34, 0, 0xc, 0);
|
||||
this->mUnk_1A68.func_ov000_0206415c(&local_34, 0, 0xC, 0);
|
||||
}
|
||||
|
||||
ARM void FileSelectOptions::func_ov019_020cd788() {
|
||||
|
||||
@@ -70,7 +70,7 @@ void UnkStruct_ov024_020d8660::func_ov024_020c4ba0() {
|
||||
}
|
||||
|
||||
if (pActor != NULL) {
|
||||
ActorUnk_vfunc_b0 auStack_60;
|
||||
ActorUnk_vfunc_B0 auStack_60;
|
||||
auStack_60.mUnk_0C = this->mUnk_08;
|
||||
auStack_60.mUnk_14 = this->mUnk_0C.mUnk_00;
|
||||
auStack_60.mUnk_18 = this->mUnk_0C.mUnk_04;
|
||||
|
||||
@@ -160,7 +160,7 @@ void AdventureModeManager_174_Base::func_ov024_020c8b2c() {
|
||||
}
|
||||
|
||||
data_ov000_020b504c.func_ov000_02068068(0);
|
||||
data_0204a088->mUnk_120 = 0xffff;
|
||||
data_0204a088->mUnk_120 = 0xFFFF;
|
||||
data_02049f8c.mUnk_00 = this->mUnk_AC;
|
||||
data_ov000_020b504c.func_ov000_02067b60();
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ extern "C" void func_ov000_0205c204(unk32 *, VecFx32 *, unk32, unk32, unk32);
|
||||
extern "C" void func_ov000_0208bc00(UnkStruct_027e0ce0 *, unk16, unk16 *);
|
||||
extern "C" void func_ov000_02098838();
|
||||
extern "C" void func_ov017_020bf99c(void);
|
||||
extern "C" void func_ov017_02097bec(Actor_9c *);
|
||||
extern "C" void func_ov017_02097bec(Actor_9C *);
|
||||
|
||||
const Cylinder data_ov031_02113d64(0x800);
|
||||
|
||||
@@ -110,7 +110,7 @@ void ActorHeart::vfunc_20() {
|
||||
|
||||
stack.mUnk_02 = 0;
|
||||
stack.mUnk_04 = 0x666;
|
||||
stack.mUnk_06 = 0xfb33;
|
||||
stack.mUnk_06 = 0xFB33;
|
||||
|
||||
func_01fff17c(&stack, data_027e0ce0, 0);
|
||||
func_02018114(&stack.mUnk_02, stack.mUnk_00);
|
||||
@@ -169,7 +169,7 @@ void ActorHeart::vfunc_20() {
|
||||
}
|
||||
}
|
||||
|
||||
if (!(this->mUnk_A0 & 0x3ffff)) {
|
||||
if (!(this->mUnk_A0 & 0x3FFFF)) {
|
||||
unk16 var = this->mUnk_B4;
|
||||
if (var != 0x8 && var == 0xC) {
|
||||
this->mUnk_C0 = this->mUnk_A4;
|
||||
@@ -391,7 +391,7 @@ ARM void ActorHeart::func_ov031_020ef570() {
|
||||
}
|
||||
}
|
||||
|
||||
ARM void ActorHeart::vfunc_2c(unk32 param1) {
|
||||
ARM void ActorHeart::vfunc_2C(unk32 param1) {
|
||||
VecFx32 iStack_20;
|
||||
VecFx32 iStack_2c;
|
||||
unk32 auStack_30;
|
||||
@@ -402,13 +402,13 @@ ARM void ActorHeart::vfunc_2c(unk32 param1) {
|
||||
|
||||
iStack_20 = this->mPos;
|
||||
iStack_20.y += FLOAT_TO_FX32(0.03113);
|
||||
this->func_ov017_020bf5c4(&iStack_20, 0x400, 0x400, 0x1f, 0);
|
||||
this->func_ov017_020bf5c4(&iStack_20, 0x400, 0x400, 0x1F, 0);
|
||||
|
||||
func_ov000_0205c1f0(&auStack_30, 0x10);
|
||||
|
||||
iStack_2c = this->mPos;
|
||||
iStack_2c.y += FLOAT_TO_FX32(0.33);
|
||||
func_ov000_0205c204(&auStack_30, &iStack_2c, 0xccd, 0xccd, 0x1f);
|
||||
func_ov000_0205c204(&auStack_30, &iStack_2c, 0xCCD, 0xCCD, 0x1F);
|
||||
}
|
||||
|
||||
ARM void ActorHeart::func_ov031_020ef698() {
|
||||
@@ -431,33 +431,33 @@ ARM void ActorHeart::func_ov031_020ef698() {
|
||||
}
|
||||
}
|
||||
|
||||
ARM ActorHeart_c4::ActorHeart_c4(Actor *param1) :
|
||||
Actor_c4(param1) {
|
||||
ARM ActorHeart_C4::ActorHeart_C4(Actor *param1) :
|
||||
Actor_C4(param1) {
|
||||
this->mUnk_20 = param1;
|
||||
this->mUnk_04 = 1;
|
||||
}
|
||||
|
||||
ARM bool ActorHeart_c4::vfunc_00(ActorRef ref, unk32 param_3) {
|
||||
ARM bool ActorHeart_C4::vfunc_00(ActorRef ref, unk32 param_3) {
|
||||
if (param_3 != 0) {
|
||||
ActorHeart *pHeart = this->GetActorPtr<ActorHeart>();
|
||||
pHeart->mUnk_C4 = ref;
|
||||
pHeart->SetState(ActorHeartState_4);
|
||||
}
|
||||
|
||||
return this->Actor_c4::vfunc_00(ref, param_3);
|
||||
return this->Actor_C4::vfunc_00(ref, param_3);
|
||||
}
|
||||
|
||||
ARM void ActorHeart_c4::vfunc_04() {
|
||||
ARM void ActorHeart_C4::vfunc_04() {
|
||||
this->GetActorPtr<ActorHeart>()->SetState(ActorHeartState_5);
|
||||
this->Actor_c4::vfunc_04();
|
||||
this->Actor_C4::vfunc_04();
|
||||
}
|
||||
|
||||
ARM void ActorHeart_c4::vfunc_0c(unk32 param1) {
|
||||
ARM void ActorHeart_C4::vfunc_0C(unk32 param1) {
|
||||
this->GetActorPtr<ActorHeart>()->SetState(ActorHeartState_1);
|
||||
this->Actor_c4::vfunc_0c(param1);
|
||||
this->Actor_C4::vfunc_0C(param1);
|
||||
}
|
||||
|
||||
ARM void ActorHeart_c4::vfunc_08() {
|
||||
ARM void ActorHeart_C4::vfunc_08() {
|
||||
this->GetActorPtr<ActorHeart>()->func_ov031_020ef528();
|
||||
this->Actor_c4::vfunc_08();
|
||||
this->Actor_C4::vfunc_08();
|
||||
}
|
||||
|
||||
@@ -469,7 +469,7 @@ ARM void ActorItemDrop::func_ov031_020fa72c() {
|
||||
}
|
||||
}
|
||||
|
||||
ARM void ActorItemDrop::vfunc_2c(unk32 param1) {
|
||||
ARM void ActorItemDrop::vfunc_2C(unk32 param1) {
|
||||
VecFx32 vec1;
|
||||
VecFx32 vec2;
|
||||
unk32 value;
|
||||
@@ -526,35 +526,35 @@ ARM void ActorItemDrop::func_ov031_020fa900() {
|
||||
}
|
||||
}
|
||||
|
||||
ARM ActorItemDrop_c4::ActorItemDrop_c4(Actor *param_1) :
|
||||
Actor_c4(param_1) {
|
||||
ARM ActorItemDrop_C4::ActorItemDrop_C4(Actor *param_1) :
|
||||
Actor_C4(param_1) {
|
||||
this->mUnk_20 = param_1;
|
||||
this->mUnk_04 = 0x1;
|
||||
}
|
||||
|
||||
ARM bool ActorItemDrop_c4::vfunc_00(ActorRef ref, unk32 param_2) {
|
||||
ARM bool ActorItemDrop_C4::vfunc_00(ActorRef ref, unk32 param_2) {
|
||||
if (param_2 != 0) {
|
||||
ActorItemDrop *actorDroppedItem = this->GetActorPtr<ActorItemDrop>();
|
||||
actorDroppedItem->mUnk_E0 = ref;
|
||||
actorDroppedItem->SetState(ActorItemDropState_4);
|
||||
}
|
||||
|
||||
return Actor_c4::vfunc_00(ref, param_2);
|
||||
return Actor_C4::vfunc_00(ref, param_2);
|
||||
}
|
||||
|
||||
ARM void ActorItemDrop_c4::vfunc_04() {
|
||||
ARM void ActorItemDrop_C4::vfunc_04() {
|
||||
this->GetActorPtr<ActorItemDrop>()->SetState(ActorItemDropState_5);
|
||||
Actor_c4::vfunc_04();
|
||||
Actor_C4::vfunc_04();
|
||||
}
|
||||
|
||||
ARM void ActorItemDrop_c4::vfunc_0c(unk32 param_1) {
|
||||
ARM void ActorItemDrop_C4::vfunc_0C(unk32 param_1) {
|
||||
this->GetActorPtr<ActorItemDrop>()->SetState(ActorItemDropState_1);
|
||||
Actor_c4::vfunc_0c(param_1);
|
||||
Actor_C4::vfunc_0C(param_1);
|
||||
}
|
||||
|
||||
ARM void ActorItemDrop_c4::vfunc_08() {
|
||||
ARM void ActorItemDrop_C4::vfunc_08() {
|
||||
this->GetActorPtr<ActorItemDrop>()->SetState(ActorItemDropState_6);
|
||||
Actor_c4::vfunc_08();
|
||||
Actor_C4::vfunc_08();
|
||||
}
|
||||
|
||||
ARM ActorItemDrop::~ActorItemDrop() {}
|
||||
|
||||
@@ -595,7 +595,7 @@ ARM void ActorRupee::vfunc_20() {
|
||||
this->func_ov000_020989e0();
|
||||
uVar3 = uStack_18;
|
||||
|
||||
if ((this->mUnk_A4 & 0x3ffff) != 0) {
|
||||
if ((this->mUnk_A4 & 0x3FFFF) != 0) {
|
||||
sVar1 = *(short *) &this->mUnk_B8;
|
||||
|
||||
switch (mUnk_B8) {
|
||||
@@ -608,7 +608,7 @@ ARM void ActorRupee::vfunc_20() {
|
||||
break;
|
||||
case 0x0C:
|
||||
this->mUnk_BC = this->mUnk_A8;
|
||||
this->mUnk_A0 &= 0xffffefff;
|
||||
this->mUnk_A0 &= 0xFFFFEFFF;
|
||||
this->SetState(ActorRupeeState_6);
|
||||
uVar3 = uStack_18;
|
||||
break;
|
||||
@@ -670,7 +670,7 @@ extern unk32 data_ov031_02113468[];
|
||||
extern "C" void func_ov000_0205c204(unk32 *, VecFx32 *, unk32, unk32, unk32);
|
||||
|
||||
// non-matching
|
||||
ARM void ActorRupee::vfunc_2c(unk32 param1) {
|
||||
ARM void ActorRupee::vfunc_2C(unk32 param1) {
|
||||
VecFx32 iStack_18;
|
||||
VecFx32 iStack_28;
|
||||
unk32 auStack_30[4];
|
||||
@@ -814,35 +814,35 @@ ARM bool ActorRupee::func_ov031_020e9e5c() {
|
||||
return bVar7;
|
||||
}
|
||||
|
||||
ARM ActorRupee_c4::ActorRupee_c4(Actor *param1) :
|
||||
Actor_c4(param1) {
|
||||
ARM ActorRupee_C4::ActorRupee_C4(Actor *param1) :
|
||||
Actor_C4(param1) {
|
||||
this->mUnk_20 = param1;
|
||||
this->mUnk_04 = 1;
|
||||
}
|
||||
|
||||
ARM bool ActorRupee_c4::vfunc_00(ActorRef ref, unk32 param2) {
|
||||
ARM bool ActorRupee_C4::vfunc_00(ActorRef ref, unk32 param2) {
|
||||
if (param2 != 0) {
|
||||
ActorRupee *pRupee = this->GetActorPtr<ActorRupee>();
|
||||
pRupee->mUnk_C0 = ref.Get32();
|
||||
pRupee->SetState(ActorRupeeState_7);
|
||||
}
|
||||
|
||||
return this->Actor_c4::vfunc_00(ref, param2);
|
||||
return this->Actor_C4::vfunc_00(ref, param2);
|
||||
}
|
||||
|
||||
ARM void ActorRupee_c4::vfunc_04() {
|
||||
ARM void ActorRupee_C4::vfunc_04() {
|
||||
this->GetActorPtr<ActorRupee>()->SetState(ActorRupeeState_8);
|
||||
this->Actor_c4::vfunc_04();
|
||||
this->Actor_C4::vfunc_04();
|
||||
}
|
||||
|
||||
ARM void ActorRupee_c4::vfunc_0c(unk32 param1) {
|
||||
ARM void ActorRupee_C4::vfunc_0C(unk32 param1) {
|
||||
this->GetActorPtr<ActorRupee>()->SetState(ActorRupeeState_1);
|
||||
this->Actor_c4::vfunc_0c(param1);
|
||||
this->Actor_C4::vfunc_0C(param1);
|
||||
}
|
||||
|
||||
ARM void ActorRupee_c4::vfunc_08() {
|
||||
ARM void ActorRupee_C4::vfunc_08() {
|
||||
this->GetActorPtr<ActorRupee>()->func_ov031_020e9068();
|
||||
this->Actor_c4::vfunc_08();
|
||||
this->Actor_C4::vfunc_08();
|
||||
}
|
||||
|
||||
ARM ActorRupee::~ActorRupee() {}
|
||||
|
||||
@@ -253,7 +253,7 @@ ARM bool MapObjectChestBase::vfunc_44() {
|
||||
ARM void MapObjectChestBase::func_ov031_02103f48() {
|
||||
VecFx32 local_10;
|
||||
VecFx32_Init(this->mPos.x, this->mPos.y + 0x800, this->mPos.z, &local_10);
|
||||
data_027e0cec->func_ov000_0209feac(0x81f, &local_10, 4, 0, 0);
|
||||
data_027e0cec->func_ov000_0209feac(0x81F, &local_10, 4, 0, 0);
|
||||
}
|
||||
|
||||
ARM void MapObjectChestBase::vfunc_4C() {
|
||||
|
||||
@@ -497,7 +497,7 @@ ARM bool PlayerGet::func_ov110_02186b8c() {
|
||||
#endif
|
||||
|
||||
// https://decomp.me/scratch/ZAW2N
|
||||
ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) {
|
||||
ARM void PlayerGet::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) {
|
||||
ItemId itemId;
|
||||
ItemManager *pItemManager;
|
||||
Actor *pActor;
|
||||
|
||||
@@ -75,7 +75,7 @@ extern "C" bool func_ov000_02080998(VecFx32 *);
|
||||
extern "C" void func_01ff930c(UnkStruct_ov000_0208f820_40 *, unk16, unk32);
|
||||
|
||||
// https://decomp.me/scratch/c7PhN
|
||||
ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) {
|
||||
ARM void PlayerSceneChange::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) {
|
||||
const fx16 *pSinCosTable = gSinCosTable;
|
||||
Vec2b stack4;
|
||||
s16 stack3;
|
||||
@@ -297,7 +297,7 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
|
||||
break;
|
||||
}
|
||||
case 0x3F:
|
||||
if (param1->mUnk_00 != 0x3c) {
|
||||
if (param1->mUnk_00 != 0x3C) {
|
||||
this->mUnk_68 = data_027e09a4->func_ov000_02070554();
|
||||
}
|
||||
|
||||
@@ -545,11 +545,11 @@ ARM void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) {
|
||||
// s16 iVar3 = var_r1_2 >> 4;
|
||||
// fx32 uVar6 = gSinCosTable[iVar3 * 2] * 0x2000;
|
||||
// fx32 uVar5 = gSinCosTable[iVar3 * 2 + 1] * 0x2000;
|
||||
// fx32 iVar2 = (gSinCosTable[iVar3 * 2 + 1] >> 0x13) + (0xfffff7ff < uVar5);
|
||||
// fx32 iVar2 = (gSinCosTable[iVar3 * 2 + 1] >> 0x13) + (0xFFFFF7FF < uVar5);
|
||||
|
||||
// this->mUnk_70.x +=
|
||||
// (((uVar6 + 0x800) >> 0xc) | (gSinCosTable[iVar3 * 2] >> 0x13) + (0xfffff7ff < uVar6)) * 0x100000;
|
||||
// this->mUnk_70.z += (((uVar5 + 0x800) >> 0xc) | iVar2 << 0x14);
|
||||
// (((uVar6 + 0x800) >> 0xC) | (gSinCosTable[iVar3 * 2] >> 0x13) + (0xFFFFF7FF < uVar6)) * 0x100000;
|
||||
// this->mUnk_70.z += (((uVar5 + 0x800) >> 0xC) | iVar2 << 0x14);
|
||||
|
||||
s32 idx = (((s32) var_r1_2) >> 4) << 1;
|
||||
s32 sin16 = (s16) data_0203feb0[idx];
|
||||
@@ -723,7 +723,7 @@ ARM void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) {
|
||||
}
|
||||
}
|
||||
|
||||
ARM bool PlayerSceneChange::vfunc_1c(VecFx32 *param1) {
|
||||
ARM bool PlayerSceneChange::vfunc_1C(VecFx32 *param1) {
|
||||
if (data_027e0cdc->func_ov000_02082a28(1) == 0) {
|
||||
switch (this->mUnk_30->mUnk_68) {
|
||||
case 0x3C:
|
||||
@@ -746,5 +746,5 @@ ARM bool PlayerSceneChange::vfunc_1c(VecFx32 *param1) {
|
||||
}
|
||||
}
|
||||
|
||||
return this->UnkStruct_ov000_0208f820::vfunc_1c(param1);
|
||||
return this->UnkStruct_ov000_0208f820::vfunc_1C(param1);
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ ARM PlayerSceneChange2::PlayerSceneChange2() {
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM void PlayerSceneChange2::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) {
|
||||
ARM void PlayerSceneChange2::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) {
|
||||
s16 auStack_18[12];
|
||||
s16 auStack_2c;
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ extern "C" void func_020196fc() {
|
||||
GX_ResetBankForSubOBJExtPltt();
|
||||
func_02024264();
|
||||
func_02024278();
|
||||
GX_SetBankForLCDC(0x1ff);
|
||||
GX_SetBankForLCDC(0x1FF);
|
||||
|
||||
MI_CpuClearFast(HW_LCDC_VRAM, HW_LCDC_VRAM_SIZE);
|
||||
GX_DisableBankForLCDC();
|
||||
|
||||
Reference in New Issue
Block a user