mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-10-12 15:08:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove ARM and THUMB macros (#87)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
src/031_Land/MapObject/MapObjectDoorKey.cpp
+23 -23
View File
@@ -9,13 +9,13 @@ extern "C" void func_01ffaf74(VecFx32 *, Mat4x3p *, VecFx32 *);
const UnkStruct_ov031_021150b0 data_ov031_02115184(0x1E66);
ARM DECL_PROFILE(MapObjectProfileDoorKey);
DECL_PROFILE(MapObjectProfileDoorKey);
ARM MapObject *MapObjectProfileDoorKey::Create() {
MapObject *MapObjectProfileDoorKey::Create() {
return new(HeapIndex_ITCM) MapObjectDoorKey();
}
ARM MapObjectProfileDoorKey::MapObjectProfileDoorKey() :
MapObjectProfileDoorKey::MapObjectProfileDoorKey() :
MapObjectProfile_Derived2(MapObjectId_DoorKey, MapObjectId_DoorKey) {
this->mUnk_0E = 1;
this->mUnk_06 = 2;
@@ -23,7 +23,7 @@ ARM MapObjectProfileDoorKey::MapObjectProfileDoorKey() :
this->mUnk_0C = 0x2666;
}
ARM MapObjectDoorKey::MapObjectDoorKey() :
MapObjectDoorKey::MapObjectDoorKey() :
mUnk_94(GetModelFromProfile<MapObjectProfileDoorKey>()),
mUnk_9C(1),
mUnk_A0(0),
@@ -33,22 +33,22 @@ ARM MapObjectDoorKey::MapObjectDoorKey() :
this->mUnk_18[0] = 0x0E;
}
ARM bool MapObjectDoorKey::vfunc_00(void) {
bool MapObjectDoorKey::vfunc_00(void) {
this->func_ov031_020fbf10(true, false);
return true;
}
ARM void MapObjectDoorKey::vfunc_08(void) {
void MapObjectDoorKey::vfunc_08(void) {
this->MapObjectDoorBase::vfunc_08();
this->mUnk_A4 = false;
}
ARM void MapObjectDoorKey::vfunc_18(s8 *param1, s8 param2) {
void MapObjectDoorKey::vfunc_18(s8 *param1, s8 param2) {
this->MapObjectDoorBase::func_ov031_020fcb78(param1, param2);
}
// https://decomp.me/scratch/XO3u2
ARM void MapObjectDoorKey::vfunc_14(void) {
void MapObjectDoorKey::vfunc_14(void) {
f32 factor;
f32 uVar3;
s32 sVar2;
@@ -91,7 +91,7 @@ ARM void MapObjectDoorKey::vfunc_14(void) {
this->mUnk_94.vfunc_14(&m, &local_48);
}
ARM void MapObjectDoorKey::vfunc_5C(unk32 param1, unk32 param2) {
void MapObjectDoorKey::vfunc_5C(unk32 param1, unk32 param2) {
this->mUnk_8D = true;
this->MapObjectDoorBase::vfunc_5C(param1, param2);
@@ -112,7 +112,7 @@ ARM void MapObjectDoorKey::vfunc_5C(unk32 param1, unk32 param2) {
}
}
ARM bool MapObjectDoorKey::func_ov031_020fea88(void) {
bool MapObjectDoorKey::func_ov031_020fea88(void) {
if (this->mUnk_A4) {
return false;
}
@@ -124,7 +124,7 @@ ARM bool MapObjectDoorKey::func_ov031_020fea88(void) {
return false;
}
ARM unk32 MapObjectDoorKey::vfunc_28(void) {
unk32 MapObjectDoorKey::vfunc_28(void) {
if (this->mUnk_A4) {
return -1;
}
@@ -149,24 +149,24 @@ ARM unk32 MapObjectDoorKey::vfunc_28(void) {
return 0;
}
ARM bool MapObjectDoorKey::vfunc_64(void) {
bool MapObjectDoorKey::vfunc_64(void) {
return this->func_ov000_0209d668();
}
ARM bool MapObjectDoorKey::vfunc_68(void) {
bool MapObjectDoorKey::vfunc_68(void) {
return false;
}
ARM bool MapObjectDoorKey::vfunc_6C(void) {
bool MapObjectDoorKey::vfunc_6C(void) {
return false;
}
ARM void MapObjectDoorKey::vfunc_74(void) {
void MapObjectDoorKey::vfunc_74(void) {
data_027e0cec->func_ov000_0209ff8c(&this->mUnk_68, 0x89E, &this->mPos, 4);
data_027e0cec->func_ov000_0209ff8c(&this->mUnk_A0, 0x89E, &this->mPos, 4);
}
ARM void MapObjectDoorKey::vfunc_7C(void) {
void MapObjectDoorKey::vfunc_7C(void) {
this->MapObjectDoorBase::vfunc_7C();
if (this->mUnk_A0.mUnk_00 != NULL) {
@@ -174,7 +174,7 @@ ARM void MapObjectDoorKey::vfunc_7C(void) {
}
}
ARM void MapObjectDoorKey::vfunc_78(void) {
void MapObjectDoorKey::vfunc_78(void) {
VecFx32 local_24;
VecFx32 local_30;
VecFx32 VStack_3c;
@@ -229,18 +229,18 @@ ARM void MapObjectDoorKey::vfunc_78(void) {
}
}
ARM void MapObjectDoorKey::vfunc_40(void) {
void MapObjectDoorKey::vfunc_40(void) {
data_027e09a8->func_ov000_02071b30(0x136, &this->mPos, 0);
}
ARM void MapObjectDoorKey::vfunc_44(void) {
void MapObjectDoorKey::vfunc_44(void) {
unk32 stack = *(u32 *) &this->mUnk_38;
data_027e09a8->func_ov000_02071d34(&stack, 0x135, &this->mPos, 0);
}
ARM void MapObjectDoorKey::vfunc_48(void) {}
void MapObjectDoorKey::vfunc_48(void) {}
ARM void MapObjectDoorKey::vfunc_4C(void) {}
void MapObjectDoorKey::vfunc_4C(void) {}
ARM MapObjectDoorKey::~MapObjectDoorKey() {}
ARM MapObjectProfileDoorKey::~MapObjectProfileDoorKey() {}
MapObjectDoorKey::~MapObjectDoorKey() {}
MapObjectProfileDoorKey::~MapObjectProfileDoorKey() {}