mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-08-28 08:48:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make hex number case more consistent (#83)

Browse Source 
* consistent hex in vfunc names

* consistent hex in code

* Actor_c4 -> Actor_C4, Actor_9c -> Actor_9C
This commit is contained in:
Yanis
2026-06-17 22:34:56 +02:00
committed by GitHub
parent 453db24d41
commit 8490ce55c3
525 changed files with 2005 additions and 2005 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/031_Land/Actor/ActorHeart.cpp
+16 -16
View File
@@ -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();
}
src/031_Land/Actor/ActorItemDrop.cpp
+11 -11
View File
@@ -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() {}
src/031_Land/Actor/ActorRupee.cpp
+13 -13
View File
@@ -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() {}
src/031_Land/MapObject/MapObjectChestBase.cpp
+1 -1
View File
@@ -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() {