Remove ARM and THUMB macros (#87)

* remove ARM and THUMB macros

* fix regressions
This commit is contained in:
Yanis
2026-06-18 18:41:28 +02:00
committed by GitHub
parent b88aed88eb
commit d1e3be4c0b
770 changed files with 16287 additions and 16209 deletions
+21 -21
View File
@@ -11,19 +11,19 @@ extern "C" void func_01ff9218(fx32 *, fx32, fx32);
const UnkStruct_ov031_021150b0 data_ov031_02115254(0x1E66);
ARM DECL_PROFILE(MapObjectProfileDoorSwitch);
DECL_PROFILE(MapObjectProfileDoorSwitch);
ARM MapObject *MapObjectProfileDoorSwitch::Create() {
MapObject *MapObjectProfileDoorSwitch::Create() {
return new(HeapIndex_ITCM) MapObjectDoorSwitch();
}
ARM MapObjectProfileDoorSwitch::MapObjectProfileDoorSwitch() :
MapObjectProfileDoorSwitch::MapObjectProfileDoorSwitch() :
MapObjectProfile_Derived2(MapObjectId_DoorSwitch, MapObjectId_DoorSwitch) {
this->mUnk_06 = -1;
this->mUnk_1E &= ~0x01;
}
ARM MapObjectDoorSwitch::MapObjectDoorSwitch() :
MapObjectDoorSwitch::MapObjectDoorSwitch() :
mUnk_094(0) {
this->mUnkPos = FLOAT_TO_FX32(0.0f);
@@ -37,7 +37,7 @@ ARM MapObjectDoorSwitch::MapObjectDoorSwitch() :
this->mUnk_89 = true;
}
ARM bool MapObjectDoorSwitch::vfunc_00(void) {
bool MapObjectDoorSwitch::vfunc_00(void) {
this->mUnk_094.vfunc_08(this->GetModel());
this->func_ov031_020fbf10(true, true);
@@ -90,7 +90,7 @@ ARM bool MapObjectDoorSwitch::vfunc_00(void) {
return true;
}
ARM void MapObjectDoorSwitch::vfunc_08(void) {
void MapObjectDoorSwitch::vfunc_08(void) {
if (this->mUnk_20.mUnk_00[3] == 2 && data_027e09b8->func_01ffd420()) {
this->MapObjectDoorBase::vfunc_08();
} else if (this->mUnk_16 == 5 && this->vfunc_6C()) {
@@ -100,11 +100,11 @@ ARM void MapObjectDoorSwitch::vfunc_08(void) {
}
}
ARM bool MapObjectDoorSwitch::vfunc_64(void) {
bool MapObjectDoorSwitch::vfunc_64(void) {
return this->func_ov000_0209d29c(0);
}
ARM bool MapObjectDoorSwitch::vfunc_6C(void) {
bool MapObjectDoorSwitch::vfunc_6C(void) {
if (this->func_ov000_0209d29c(0)) {
return false;
}
@@ -112,7 +112,7 @@ ARM bool MapObjectDoorSwitch::vfunc_6C(void) {
return true;
}
ARM void MapObjectDoorSwitch::vfunc_14(void) {
void MapObjectDoorSwitch::vfunc_14(void) {
u16 angle = this->mUnk_14;
Mat3p m;
@@ -123,11 +123,11 @@ ARM void MapObjectDoorSwitch::vfunc_14(void) {
this->mUnk_094.vfunc_14(&m, &local_40);
}
ARM void MapObjectDoorSwitch::vfunc_18(s8 *param1, s8 param2) {
void MapObjectDoorSwitch::vfunc_18(s8 *param1, s8 param2) {
this->func_ov031_020fcb78(param1, param2);
}
ARM void MapObjectDoorSwitch::vfunc_74(void) {
void MapObjectDoorSwitch::vfunc_74(void) {
VecFx32 local_20 = this->mPos;
VecFx32 local_2c;
VecFx32_Init(0, 0, 0x666, &local_2c);
@@ -146,11 +146,11 @@ ARM void MapObjectDoorSwitch::vfunc_74(void) {
}
}
ARM G3d_Model *MapObjectDoorSwitch::GetModel(void) {
G3d_Model *MapObjectDoorSwitch::GetModel(void) {
return GetModelFromProfile<MapObjectProfileDoorSwitch>();
}
ARM void MapObjectDoorSwitch::vfunc_50(void) {
void MapObjectDoorSwitch::vfunc_50(void) {
#if IS_JP
if (!this->mUnk_140) {
return;
@@ -209,7 +209,7 @@ ARM void MapObjectDoorSwitch::vfunc_50(void) {
#endif
}
ARM void MapObjectDoorSwitch::vfunc_54(void) {
void MapObjectDoorSwitch::vfunc_54(void) {
this->func_ov031_020fcf0c(1);
#if IS_JP
@@ -282,7 +282,7 @@ ARM void MapObjectDoorSwitch::vfunc_54(void) {
#endif
}
ARM void MapObjectDoorSwitch::vfunc_58(void) {
void MapObjectDoorSwitch::vfunc_58(void) {
#if IS_JP
if (!this->mUnk_140) {
return;
@@ -318,23 +318,23 @@ ARM void MapObjectDoorSwitch::vfunc_58(void) {
#endif
}
ARM void MapObjectDoorSwitch::vfunc_40(void) {
void MapObjectDoorSwitch::vfunc_40(void) {
data_027e09a8->func_ov000_02071b30(0x131, &this->mPos, 0);
}
ARM void MapObjectDoorSwitch::vfunc_44(void) {
void MapObjectDoorSwitch::vfunc_44(void) {
unk32 local_c = *(u32 *) &this->mUnk_38;
data_027e09a8->func_ov000_02071d34(&local_c, 0x130, &this->mPos, 0);
}
ARM void MapObjectDoorSwitch::vfunc_48(void) {
void MapObjectDoorSwitch::vfunc_48(void) {
data_027e09a8->func_ov000_02071b30(0x133, &this->mPos, 0);
}
ARM void MapObjectDoorSwitch::vfunc_4C(void) {
void MapObjectDoorSwitch::vfunc_4C(void) {
unk32 local_c = *(u32 *) &this->mUnk_38;
data_027e09a8->func_ov000_02071d34(&local_c, 0x132, &this->mPos, 0);
}
ARM MapObjectDoorSwitch::~MapObjectDoorSwitch() {}
ARM MapObjectProfileDoorSwitch::~MapObjectProfileDoorSwitch() {}
MapObjectDoorSwitch::~MapObjectDoorSwitch() {}
MapObjectProfileDoorSwitch::~MapObjectProfileDoorSwitch() {}