mirror of
https://github.com/zeldaret/st
synced 2026-08-25 07:44:42 -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:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user