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

Change Q20 in macros to FX32 (#71)

Browse Source 
* refactor: change Q20 in macros to FX32

* fix: renaming macros does not renamed every occurrence

* fix: opaque IDE magic occurred

* refactor: revert order of libs

* refactor: remove unused macros for FX31(Q19) and FX33(Q21)
This commit is contained in:
Alessevan
2026-05-31 21:29:10 -04:00
committed by GitHub
parent 905ceeb4b3
commit e5fe52aa54
18 changed files with 258 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/031_Land/MapObject/MapObjectDoorBase.cpp
+36 -35
View File
@@ -24,30 +24,30 @@ UnkStruct_ov031_02117210 data_ov031_02117210;
UnkStruct_ov019_020d24c8_28_258_00 data_ov031_02117204(NULL, 0);
ARM UnkStruct_ov031_02117210::UnkStruct_ov031_02117210() {
this->mUnk_00[0].mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
this->mUnk_00[0].mUnk_0C.y = FLOAT_TO_Q20(0.0f);
this->mUnk_00[0].mUnk_0C.z = -FLOAT_TO_Q20(0.35f);
this->mUnk_00[0].mUnk_18.x = FLOAT_TO_Q20(1.0f);
this->mUnk_00[0].mUnk_18.y = FLOAT_TO_Q20(2.4f);
this->mUnk_00[0].mUnk_18.z = FLOAT_TO_Q20(0.35f);
this->mUnk_00[0].mUnk_0C.x = -FLOAT_TO_FX32(1.0f);
this->mUnk_00[0].mUnk_0C.y = FLOAT_TO_FX32(0.0f);
this->mUnk_00[0].mUnk_0C.z = -FLOAT_TO_FX32(0.35f);
this->mUnk_00[0].mUnk_18.x = FLOAT_TO_FX32(1.0f);
this->mUnk_00[0].mUnk_18.y = FLOAT_TO_FX32(2.4f);
this->mUnk_00[0].mUnk_18.z = FLOAT_TO_FX32(0.35f);
this->mUnk_00[0].mUnk_04 &= 0xFE;
this->mUnk_00[0].mUnk_08 = 0x7009;
this->mUnk_00[1].mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
this->mUnk_00[1].mUnk_0C.y = FLOAT_TO_Q20(0.0f);
this->mUnk_00[1].mUnk_0C.z = -FLOAT_TO_Q20(1.35f);
this->mUnk_00[1].mUnk_18.x = FLOAT_TO_Q20(1.0f);
this->mUnk_00[1].mUnk_18.y = FLOAT_TO_Q20(2.4f);
this->mUnk_00[1].mUnk_18.z = FLOAT_TO_Q20(0.35f);
this->mUnk_00[1].mUnk_0C.x = -FLOAT_TO_FX32(1.0f);
this->mUnk_00[1].mUnk_0C.y = FLOAT_TO_FX32(0.0f);
this->mUnk_00[1].mUnk_0C.z = -FLOAT_TO_FX32(1.35f);
this->mUnk_00[1].mUnk_18.x = FLOAT_TO_FX32(1.0f);
this->mUnk_00[1].mUnk_18.y = FLOAT_TO_FX32(2.4f);
this->mUnk_00[1].mUnk_18.z = FLOAT_TO_FX32(0.35f);
this->mUnk_00[1].mUnk_04 &= 0xFE;
this->mUnk_00[1].mUnk_08 = 0x7009;
this->mUnk_00[2].mUnk_0C.x = -FLOAT_TO_Q20(0.35f);
this->mUnk_00[2].mUnk_0C.y = FLOAT_TO_Q20(0.0f);
this->mUnk_00[2].mUnk_0C.z = -FLOAT_TO_Q20(1.0f);
this->mUnk_00[2].mUnk_18.x = FLOAT_TO_Q20(0.35f);
this->mUnk_00[2].mUnk_18.y = FLOAT_TO_Q20(2.4f);
this->mUnk_00[2].mUnk_18.z = FLOAT_TO_Q20(1.0f);
this->mUnk_00[2].mUnk_0C.x = -FLOAT_TO_FX32(0.35f);
this->mUnk_00[2].mUnk_0C.y = FLOAT_TO_FX32(0.0f);
this->mUnk_00[2].mUnk_0C.z = -FLOAT_TO_FX32(1.0f);
this->mUnk_00[2].mUnk_18.x = FLOAT_TO_FX32(0.35f);
this->mUnk_00[2].mUnk_18.y = FLOAT_TO_FX32(2.4f);
this->mUnk_00[2].mUnk_18.z = FLOAT_TO_FX32(1.0f);
this->mUnk_00[2].mUnk_04 &= 0xFE;
this->mUnk_00[2].mUnk_08 = 0x7009;
}
@@ -81,12 +81,12 @@ ARM MapObjectDoorBase::MapObjectDoorBase() :
ARM void MapObjectDoorBase::func_ov031_020fbf10(bool param1, bool param2) {
if (this->IsOrientedVertically()) {
this->mPos.z += FLOAT_TO_Q20(0.5f);
this->mPos.z += FLOAT_TO_FX32(0.5f);
Vec2b local_16(1, 2);
this->func_ov000_0209d2f0(5, 1, &local_16);
} else {
this->mPos.x += FLOAT_TO_Q20(0.5f);
this->mPos.x += FLOAT_TO_FX32(0.5f);
Vec2b local_18(2, 1);
this->func_ov000_0209d2f0(5, 1, &local_18);
}
@@ -126,7 +126,7 @@ ARM void MapObjectDoorBase::vfunc_08() {
}
if (this->mUnk_80 > 0) {
func_01ff9218(&this->mUnk_6C, 0, func_01ffb464(INT_TO_Q20(this->mUnk_80)));
func_01ff9218(&this->mUnk_6C, 0, func_01ffb464(INT_TO_FX32(this->mUnk_80)));
}
if (this->mUnk_80 == 0) {
@@ -206,7 +206,7 @@ ARM void MapObjectDoorBase::vfunc_08() {
this->mUnk_80--;
if (this->mUnk_80 > 0) {
func_01ff9218(&this->mUnk_6C, 0x1000, func_01ffb464(INT_TO_Q20(this->mUnk_80)));
func_01ff9218(&this->mUnk_6C, 0x1000, func_01ffb464(INT_TO_FX32(this->mUnk_80)));
}
if (this->mUnk_88) {
@@ -277,19 +277,19 @@ ARM void MapObjectDoorBase::vfunc_0C() {
ARM void MapObjectDoorBase::vfunc_60() {
switch (this->mUnk_16) {
case 0:
if (!this->mUnk_86 && !GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C <= FLOAT_TO_Q20(0.5f)) {
if (!this->mUnk_86 && !GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C <= FLOAT_TO_FX32(0.5f)) {
this->func_ov031_020fcf0c(1);
}
this->vfunc_54();
break;
case 2:
if (this->mUnk_86 && !GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C <= FLOAT_TO_Q20(0.5f)) {
if (this->mUnk_86 && !GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C <= FLOAT_TO_FX32(0.5f)) {
this->func_ov031_020fcf0c(1);
this->vfunc_58();
}
break;
case 5:
if (GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C >= FLOAT_TO_Q20(0.5f)) {
if (GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C >= FLOAT_TO_FX32(0.5f)) {
this->func_ov031_020fcf0c(0);
}
break;
@@ -331,7 +331,7 @@ ARM void MapObjectDoorBase::vfunc_5C(unk32 param1, unk32 param2) {
this->mUnk_82 = 0;
this->mUnk_84 = 0x0D;
this->mUnk_80 =
(MUL_Q20(INT_TO_Q20(this->mUnk_7A), func_01ffb428(this->mUnk_6C, 0x1000)) + FLOAT_TO_Q20(0.5f)) >> 12;
(MUL_FX32(INT_TO_FX32(this->mUnk_7A), func_01ffb428(this->mUnk_6C, 0x1000)) + FLOAT_TO_FX32(0.5f)) >> 12;
this->vfunc_50();
@@ -409,7 +409,8 @@ ARM void MapObjectDoorBase::vfunc_5C(unk32 param1, unk32 param2) {
this->vfunc_7C();
this->mUnk_80 =
(MUL_Q20(INT_TO_Q20(this->mUnk_78), func_01ffb428(0x1000 - this->mUnk_6C, 0x1000)) + FLOAT_TO_Q20(0.5f)) >> 12;
(MUL_FX32(INT_TO_FX32(this->mUnk_78), func_01ffb428(0x1000 - this->mUnk_6C, 0x1000)) + FLOAT_TO_FX32(0.5f)) >>
12;
if (this->mUnk_8A) {
this->mUnk_82 = 0;
@@ -658,12 +659,12 @@ ARM void MapObjectDoorBase::vfunc_84(unk32 param1, VecFx32 *param2, unk16 *param
*param3 = this->mUnk_14;
if (param1 != 0) {
local_20.x = MUL_Q20(SIN((u16) this->mUnk_14), 0x1000);
local_20.z = MUL_Q20(COS((u16) this->mUnk_14), 0x1000);
local_20.x = MUL_FX32(SIN((u16) this->mUnk_14), 0x1000);
local_20.z = MUL_FX32(COS((u16) this->mUnk_14), 0x1000);
local_20.y = 0;
} else {
local_20.x = MUL_Q20(SIN((u16) this->mUnk_14), 0xC00);
local_20.z = MUL_Q20(COS((u16) this->mUnk_14), 0xC00);
local_20.x = MUL_FX32(SIN((u16) this->mUnk_14), 0xC00);
local_20.z = MUL_FX32(COS((u16) this->mUnk_14), 0xC00);
local_20.y = 0;
*param3 += -DEG_TO_ANG(180);
@@ -713,7 +714,7 @@ ARM void MapObjectDoorBase::vfunc2_08() {
bool result = data_027e0ce0->func_01fff1a4();
temp_r0 = this->mPos.x;
temp_r1 = this->mPos.y;
temp_r2 = this->mPos.z - FLOAT_TO_Q20(3.0f);
temp_r2 = this->mPos.z - FLOAT_TO_FX32(3.0f);
if (!result) {
this->mUnk_4C.x = temp_r0;
@@ -726,7 +727,7 @@ ARM void MapObjectDoorBase::vfunc2_08() {
return;
}
this->mUnk_4C.x = temp_r0 - FLOAT_TO_Q20(1.0f);
this->mUnk_4C.x = temp_r0 - FLOAT_TO_FX32(1.0f);
this->mUnk_4C.y = temp_r1;
this->mUnk_4C.z = temp_r2;
@@ -734,9 +735,9 @@ ARM void MapObjectDoorBase::vfunc2_08() {
// *temp_r3_2 = this->mUnk_4A;
data_027e0ce0->func_ov000_0208bbd4(this->mUnk_44, &this->mUnk_4C, this->mUnk_4A);
this->mUnk_5C.x = this->mPos.x + FLOAT_TO_Q20(1.0f);
this->mUnk_5C.x = this->mPos.x + FLOAT_TO_FX32(1.0f);
this->mUnk_5C.y = this->mPos.y;
this->mUnk_5C.z = this->mPos.z - FLOAT_TO_Q20(3.0f);
this->mUnk_5C.z = this->mPos.z - FLOAT_TO_FX32(3.0f);
this->mUnk_5A = this->mUnk_4A;
// temp_r2_2 = sp - 4;