mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-06-26 10:04:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name DRDS, DRCK, DRKY, DRSW and DRTC (#58)

Browse Source 
* create name_actor.py

* name previously decompiled door map objects
This commit is contained in:
Yanis
2026-04-23 20:18:59 +02:00
committed by GitHub
parent c3c34ebe5a
commit 6c8c618b8a
18 changed files with 671 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/031_Land/MapObject/MapObjectUnkDRCK.cpp → src/031_Land/MapObject/MapObjectDoorClick.cpp
+29 -29
View File
@@ -1,4 +1,4 @@
#include "MapObject/MapObjectUnkDRCK.hpp"
#include "MapObject/MapObjectDoorClick.hpp"
#include "System/SysNew.hpp"
#include "Unknown/UnkStruct_027e09a8.hpp"
#include "Unknown/UnkStruct_027e09b8.hpp"
@@ -21,20 +21,20 @@ static const u16 data_ov031_02110c28[] = {0x00, 0x00, 0x00, 0x00, 0x07, 0x0A, 0x
const UnkStruct_ov031_021150b0 data_ov031_02115328(0x1E66);
ARM DECL_PROFILE(MapObjectProfileUnkDRCK);
ARM DECL_PROFILE(MapObjectProfileDoorClick);
ARM MapObject *MapObjectProfileUnkDRCK::Create() {
return new(HeapIndex_ITCM) MapObjectUnkDRCK();
ARM MapObject *MapObjectProfileDoorClick::Create() {
return new(HeapIndex_ITCM) MapObjectDoorClick();
}
ARM MapObjectProfileUnkDRCK::MapObjectProfileUnkDRCK() :
MapObjectProfile_Derived1(MapObjectId_DRCK, -1, 0) {
ARM MapObjectProfileDoorClick::MapObjectProfileDoorClick() :
MapObjectProfile_Derived1(MapObjectId_DoorClick, -1, 0) {
this->mUnk_06 = 2;
this->mUnk_1E |= 0x01;
this->mUnk_0C = 0x399A;
}
ARM MapObjectUnkDRCK::MapObjectUnkDRCK() :
ARM MapObjectDoorClick::MapObjectDoorClick() :
mUnk_9C(1),
mUnk_A0(0) {
this->mUnk_8F = true;
@@ -43,12 +43,12 @@ ARM MapObjectUnkDRCK::MapObjectUnkDRCK() :
this->func_ov000_0209d2c4(1, 1);
}
ARM u16 MapObjectUnkDRCK::vfunc2_1C(unk32 param1) {
ARM u16 MapObjectDoorClick::vfunc2_1C(unk32 param1) {
return data_ov031_02110c28[param1];
}
// https://decomp.me/scratch/zmw3b
ARM bool MapObjectUnkDRCK::vfunc_00(void) {
ARM bool MapObjectDoorClick::vfunc_00(void) {
Vec3p local_1c;
Vec3p local_28;
Vec3p local_40[2];
@@ -93,7 +93,7 @@ ARM bool MapObjectUnkDRCK::vfunc_00(void) {
return true;
}
ARM void MapObjectUnkDRCK::vfunc_08(void) {
ARM void MapObjectDoorClick::vfunc_08(void) {
if (this->mUnk_A4 != 0 && this->func_ov000_0209d29c(0)) {
this->mUnk_A4 = 0;
}
@@ -198,12 +198,12 @@ ARM void MapObjectUnkDRCK::vfunc_08(void) {
}
}
ARM void MapObjectUnkDRCK::vfunc_18(s8 *param1, s8 param2) {
ARM void MapObjectDoorClick::vfunc_18(s8 *param1, s8 param2) {
this->func_ov031_020fcb78(param1, param2);
}
// https://decomp.me/scratch/3XTMj
ARM void MapObjectUnkDRCK::vfunc_14(void) {
ARM void MapObjectDoorClick::vfunc_14(void) {
f32 factor;
f32 uVar3;
s32 sVar2;
@@ -246,7 +246,7 @@ ARM void MapObjectUnkDRCK::vfunc_14(void) {
this->mUnk_94.vfunc_14(&m, &local_48);
}
ARM void MapObjectUnkDRCK::vfunc_5C(unk32 param1, unk32 param2) {
ARM void MapObjectDoorClick::vfunc_5C(unk32 param1, unk32 param2) {
s32 var_r6;
u32 temp_r8;
UnkStackStruct1 sp8;
@@ -287,11 +287,11 @@ ARM void MapObjectUnkDRCK::vfunc_5C(unk32 param1, unk32 param2) {
}
}
ARM MapObject_10 *MapObjectUnkDRCK::vfunc2_14(void) {
ARM MapObject_10 *MapObjectDoorClick::vfunc2_14(void) {
return &this->mUnk_A8;
}
ARM bool MapObjectUnkDRCK::func_ov031_020ffde4(void) {
ARM bool MapObjectDoorClick::func_ov031_020ffde4(void) {
switch (this->mUnk_A4) {
case 0:
return true;
@@ -307,7 +307,7 @@ ARM bool MapObjectUnkDRCK::func_ov031_020ffde4(void) {
return false;
}
ARM unk32 MapObjectUnkDRCK::vfunc_28(void) {
ARM unk32 MapObjectDoorClick::vfunc_28(void) {
switch (this->mUnk_16) {
case 3:
case 4:
@@ -324,24 +324,24 @@ ARM unk32 MapObjectUnkDRCK::vfunc_28(void) {
return 0;
}
ARM bool MapObjectUnkDRCK::vfunc_64(void) {
ARM bool MapObjectDoorClick::vfunc_64(void) {
return this->func_ov000_0209d29c(1);
}
ARM bool MapObjectUnkDRCK::vfunc_68(void) {
ARM bool MapObjectDoorClick::vfunc_68(void) {
return false;
}
ARM bool MapObjectUnkDRCK::vfunc_6C(void) {
ARM bool MapObjectDoorClick::vfunc_6C(void) {
return false;
}
ARM void MapObjectUnkDRCK::vfunc_74(void) {
ARM void MapObjectDoorClick::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 MapObjectUnkDRCK::vfunc_7C(void) {
ARM void MapObjectDoorClick::vfunc_7C(void) {
this->MapObjectDoorBase::vfunc_7C();
if (this->mUnk_A0.mUnk_00 != NULL) {
@@ -349,7 +349,7 @@ ARM void MapObjectUnkDRCK::vfunc_7C(void) {
}
}
ARM void MapObjectUnkDRCK::vfunc_78(void) {
ARM void MapObjectDoorClick::vfunc_78(void) {
Vec3p local_24;
Vec3p local_30;
Vec3p VStack_3c;
@@ -404,22 +404,22 @@ ARM void MapObjectUnkDRCK::vfunc_78(void) {
}
}
ARM void MapObjectUnkDRCK::vfunc2_10(void) {
ARM void MapObjectDoorClick::vfunc2_10(void) {
unk32 index = this->mUnk_20.mUnk_00[0];
this->mUnk_94.vfunc_08(GetUnkPointer2<MapObjectProfileUnkDRCK>(index, data_ov031_02110c1c[index]));
this->mUnk_94.vfunc_08(GetUnkPointer2<MapObjectProfileDoorClick>(index, data_ov031_02110c1c[index]));
}
ARM void MapObjectUnkDRCK::vfunc_40(void) {
ARM void MapObjectDoorClick::vfunc_40(void) {
data_027e09a8->func_ov000_02071b30(0x143, &this->mPos, 0);
}
ARM void MapObjectUnkDRCK::vfunc_44(void) {
ARM void MapObjectDoorClick::vfunc_44(void) {
unk32 local_c = *(u32 *) &this->mUnk_38;
data_027e09a8->func_ov000_02071d34(&local_c, 0x142, &this->mPos, 0);
}
ARM void MapObjectUnkDRCK::vfunc_48(void) {}
ARM void MapObjectDoorClick::vfunc_48(void) {}
ARM void MapObjectUnkDRCK::vfunc_4C(void) {}
ARM void MapObjectDoorClick::vfunc_4C(void) {}
ARM void MapObjectUnkDRCK::vfunc2_18(void) {}
ARM void MapObjectDoorClick::vfunc2_18(void) {}
src/031_Land/MapObject/MapObjectUnkDRDS.cpp → src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp
+37 -37
View File
@@ -1,4 +1,4 @@
#include "MapObject/MapObjectUnkDRDS.hpp"
#include "MapObject/MapObjectDoorDangerSpawn.hpp"
#include "Actor/ActorManager.hpp"
#include "MapObject/MapObjectManager.hpp"
#include "System/SysNew.hpp"
@@ -23,21 +23,21 @@ extern UnkStruct_ov000_020b34c4_Callback data_ov000_020b4cc4;
const UnkStruct_ov031_021150b0 data_ov031_021150b0(0x1E66);
ARM DECL_PROFILE(MapObjectProfileUnkDRDS);
ARM DECL_PROFILE(MapObjectProfileDoorDangerSpawn);
ARM MapObject *MapObjectProfileUnkDRDS::Create() {
return new(HeapIndex_ITCM) MapObjectUnkDRDS();
ARM MapObject *MapObjectProfileDoorDangerSpawn::Create() {
return new(HeapIndex_ITCM) MapObjectDoorDangerSpawn();
}
ARM MapObjectProfileUnkDRDS::MapObjectProfileUnkDRDS() :
MapObjectProfile_Derived2(MapObjectId_DRDS, MapObjectId_DRDS) {
ARM MapObjectProfileDoorDangerSpawn::MapObjectProfileDoorDangerSpawn() :
MapObjectProfile_Derived2(MapObjectId_DoorDangerSpawn, MapObjectId_DoorDangerSpawn) {
this->mUnk_0E = 1;
this->mUnk_06 = -1;
this->mUnk_1E &= ~0x01;
}
ARM MapObjectUnkDRDS::MapObjectUnkDRDS() :
mUnk_94(GetUnkPointer1<MapObjectProfileUnkDRDS>()),
ARM MapObjectDoorDangerSpawn::MapObjectDoorDangerSpawn() :
mUnk_94(GetUnkPointer1<MapObjectProfileDoorDangerSpawn>()),
mUnk_9C(1),
mUnk_A0(0),
mUnk_A1(false),
@@ -50,7 +50,7 @@ ARM MapObjectUnkDRDS::MapObjectUnkDRDS() :
this->mUnk_89 = true;
}
ARM bool MapObjectUnkDRDS::vfunc_00(void) {
ARM bool MapObjectDoorDangerSpawn::vfunc_00(void) {
this->func_ov031_020fbf10(true, false);
this->mUnk_78 = 0x23;
this->mUnk_7A = 0x0F;
@@ -60,7 +60,7 @@ ARM bool MapObjectUnkDRDS::vfunc_00(void) {
return true;
}
ARM void MapObjectUnkDRDS::vfunc_04(void) {
ARM void MapObjectDoorDangerSpawn::vfunc_04(void) {
UnkStruct_027e0cd8_0c *ptr;
Vec3p auStack_20;
@@ -93,13 +93,13 @@ ARM void MapObjectUnkDRDS::vfunc_04(void) {
UnkStruct_ov000_020b34c4 stack;
bool run = true;
stack.mUnk_00 = &data_ov000_020b4cc4;
stack.mUnk_04 = MapObjectId_DRDS;
stack.mUnk_04 = MapObjectId_DoorDangerSpawn;
MapObject **ppMapObject =
gpMapObjManager->func_01fff520((UnkStruct_ov000_020b34c4 *) &stack.mUnk_00, gpMapObjManager->mMapObjTable);
if (ppMapObject != gpMapObjManager->mUnk_08) {
MapObjectUnkDRDS *pMapObject = (MapObjectUnkDRDS *) *ppMapObject;
MapObjectDoorDangerSpawn *pMapObject = (MapObjectDoorDangerSpawn *) *ppMapObject;
u32 temp1;
u32 temp2;
@@ -129,17 +129,17 @@ ARM void MapObjectUnkDRDS::vfunc_04(void) {
this->vfunc_5C(0, 0);
UnkStruct_027e09bc_0c *uVar5 = data_027e09bc->mUnk_0C;
MapObjectUnkDRDS::func_ov031_020fe5fc(&auStack_20, this);
MapObjectDoorDangerSpawn::func_ov031_020fe5fc(&auStack_20, this);
uVar5->func_ov000_0207834c(&auStack_20, (unk32) func_ov000_02077590(0), 0);
}
}
ARM void MapObjectUnkDRDS::vfunc2_04(void) {
ARM void MapObjectDoorDangerSpawn::vfunc2_04(void) {
this->MapObjectDoorBase::vfunc2_04();
}
ARM void MapObjectUnkDRDS::vfunc2_08(void) {
ARM void MapObjectDoorDangerSpawn::vfunc2_08(void) {
this->mUnk_8C = 1;
this->vfunc_84(1, &this->mUnk_4C, &this->mUnk_4A);
this->MapObjectDoorBase::vfunc2_08();
@@ -156,7 +156,7 @@ struct UnkStruct_Copy {
};
// https://decomp.me/scratch/KLkdU
ARM void MapObjectUnkDRDS::vfunc_08(void) {
ARM void MapObjectDoorDangerSpawn::vfunc_08(void) {
UnkStruct_Copy sp3C;
UnkStruct_Copy sp1C;
Vec3p sp10;
@@ -264,7 +264,7 @@ ARM void MapObjectUnkDRDS::vfunc_08(void) {
}
}
ARM void MapObjectUnkDRDS::vfunc_0C(void) {
ARM void MapObjectDoorDangerSpawn::vfunc_0C(void) {
this->MapObjectDoorBase::vfunc_0C();
if ((u16) this->mUnk_16 <= 1) {
@@ -272,7 +272,7 @@ ARM void MapObjectUnkDRDS::vfunc_0C(void) {
}
}
ARM void MapObjectUnkDRDS::vfunc_5C(unk32 param1, unk32 param2) {
ARM void MapObjectDoorDangerSpawn::vfunc_5C(unk32 param1, unk32 param2) {
UnkStruct_027e0cd8 **ptr;
s32 var_r6;
u32 temp_r8;
@@ -402,7 +402,7 @@ ARM void MapObjectUnkDRDS::vfunc_5C(unk32 param1, unk32 param2) {
}
}
ARM bool MapObjectUnkDRDS::vfunc_64(void) {
ARM bool MapObjectDoorDangerSpawn::vfunc_64(void) {
UnkStruct_027e0cd8_0c *pUVar4;
unk32 var_r0;
bool var_r5;
@@ -440,7 +440,7 @@ ARM bool MapObjectUnkDRDS::vfunc_64(void) {
return MapObjectDoorBase::vfunc_64();
}
ARM bool MapObjectUnkDRDS::vfunc_68(void) {
ARM bool MapObjectDoorDangerSpawn::vfunc_68(void) {
UnkStruct_027e0cd8_0c *pUVar2 = data_027e0cd8->mUnk_0C;
if (this->mUnk_20.mUnk_00[2] == 1) {
@@ -465,7 +465,7 @@ ARM bool MapObjectUnkDRDS::vfunc_68(void) {
return gpActorManager->func_ov000_0209704c() == 0;
}
ARM bool MapObjectUnkDRDS::vfunc_6C(void) {
ARM bool MapObjectDoorDangerSpawn::vfunc_6C(void) {
UnkStruct_027e0cd8_0c *pUVar5;
switch (this->mUnk_20.mUnk_00[1]) {
@@ -519,7 +519,7 @@ ARM bool MapObjectUnkDRDS::vfunc_6C(void) {
return false;
}
ARM bool MapObjectUnkDRDS::func_ov031_020fdec8(void) {
ARM bool MapObjectDoorDangerSpawn::func_ov031_020fdec8(void) {
UnkStruct_027e0cd8_0c *pUVar4;
Vec3p *uVar3;
int iVar1;
@@ -562,11 +562,11 @@ ARM bool MapObjectUnkDRDS::func_ov031_020fdec8(void) {
return false;
}
ARM void MapObjectUnkDRDS::vfunc_18(s8 *param1, s8 param2) {
ARM void MapObjectDoorDangerSpawn::vfunc_18(s8 *param1, s8 param2) {
this->func_ov031_020fcb78(param1, param2);
}
ARM void MapObjectUnkDRDS::vfunc_14(void) {
ARM void MapObjectDoorDangerSpawn::vfunc_14(void) {
Mat3p m;
Mat3p_InitYRotation(&m, SIN((u16) this->mUnk_14), COS((u16) this->mUnk_14));
@@ -576,7 +576,7 @@ ARM void MapObjectUnkDRDS::vfunc_14(void) {
this->mUnk_94.vfunc_14(&m, &pos);
}
ARM void MapObjectUnkDRDS::vfunc2_10(void) {
ARM void MapObjectDoorDangerSpawn::vfunc2_10(void) {
switch (this->mUnk_16) {
case 0:
default:
@@ -601,7 +601,7 @@ ARM void MapObjectUnkDRDS::vfunc2_10(void) {
}
// https://decomp.me/scratch/DEJfq
ARM void MapObjectUnkDRDS::vfunc_74(void) {
ARM void MapObjectDoorDangerSpawn::vfunc_74(void) {
Vec3p local_28;
Vec3p local_34;
Vec3p local_40;
@@ -652,7 +652,7 @@ ARM void MapObjectUnkDRDS::vfunc_74(void) {
}
}
ARM void MapObjectUnkDRDS::vfunc_7C(void) {
ARM void MapObjectDoorDangerSpawn::vfunc_7C(void) {
this->MapObjectDoorBase::vfunc_7C();
if (this->mUnk_A8.mUnk_00 != NULL) {
@@ -660,29 +660,29 @@ ARM void MapObjectUnkDRDS::vfunc_7C(void) {
}
}
ARM void MapObjectUnkDRDS::vfunc_40(void) {
ARM void MapObjectDoorDangerSpawn::vfunc_40(void) {
data_027e09a8->func_ov000_02071b30(0x138, &this->mPos, 0);
}
ARM void MapObjectUnkDRDS::vfunc_44(void) {
ARM void MapObjectDoorDangerSpawn::vfunc_44(void) {
unk32 local_c = *(u32 *) &this->mUnk_38;
data_027e09a8->func_ov000_02071d34(&local_c, 0x137, &this->mPos, 0);
}
ARM void MapObjectUnkDRDS::vfunc_48(void) {
ARM void MapObjectDoorDangerSpawn::vfunc_48(void) {
data_027e09a8->func_ov000_02071b30(0x13A, &this->mPos, 0);
}
ARM void MapObjectUnkDRDS::vfunc_4C(void) {
ARM void MapObjectDoorDangerSpawn::vfunc_4C(void) {
unk32 local_c = *(u32 *) &this->mUnk_38;
data_027e09a8->func_ov000_02071d34(&local_c, 0x139, &this->mPos, 0);
}
ARM bool MapObjectUnkDRDS::vfunc_88(void) {
ARM bool MapObjectDoorDangerSpawn::vfunc_88(void) {
return !data_027e09b8->func_01ffd420();
}
ARM unk32 MapObjectUnkDRDS::vfunc_8C(void) {
ARM unk32 MapObjectDoorDangerSpawn::vfunc_8C(void) {
if (this->mUnk_A2) {
if (data_027e0ce0->func_01fff1a4()) {
return 0x28;
@@ -694,7 +694,7 @@ ARM unk32 MapObjectUnkDRDS::vfunc_8C(void) {
return 0;
}
ARM void MapObjectUnkDRDS::vfunc_84(unk32 param1, Vec3p *param2, unk16 *param3) {
ARM void MapObjectDoorDangerSpawn::vfunc_84(unk32 param1, Vec3p *param2, unk16 *param3) {
s16 iVar1;
if (!this->mUnk_58) {
@@ -734,7 +734,7 @@ ARM void MapObjectUnkDRDS::vfunc_84(unk32 param1, Vec3p *param2, unk16 *param3)
Vec3p_Add(&this->mPos, &local_30, &this->mUnk_5C);
}
ARM void MapObjectUnkDRDS::func_ov031_020fe5fc(Vec3p *param1, MapObjectUnkDRDS *thisx) {
ARM void MapObjectDoorDangerSpawn::func_ov031_020fe5fc(Vec3p *param1, MapObjectDoorDangerSpawn *thisx) {
if (data_027e0ce0->func_01fff1a4()) {
Vec3p *piVar2 = data_027e0ce0->func_01fff148(1);
Vec3p *piVar3 = data_027e0ce0->func_01fff148(0);
@@ -750,5 +750,5 @@ ARM void MapObjectUnkDRDS::func_ov031_020fe5fc(Vec3p *param1, MapObjectUnkDRDS *
}
}
ARM MapObjectUnkDRDS::~MapObjectUnkDRDS() {}
ARM MapObjectProfileUnkDRDS::~MapObjectProfileUnkDRDS() {}
ARM MapObjectDoorDangerSpawn::~MapObjectDoorDangerSpawn() {}
ARM MapObjectProfileDoorDangerSpawn::~MapObjectProfileDoorDangerSpawn() {}
src/031_Land/MapObject/MapObjectUnkDRKY.cpp → src/031_Land/MapObject/MapObjectDoorKey.cpp
+27 -27
View File
@@ -1,4 +1,4 @@
#include "MapObject/MapObjectUnkDRKY.hpp"
#include "MapObject/MapObjectDoorKey.hpp"
#include "System/SysNew.hpp"
#include "Unknown/UnkStruct_027e09a8.hpp"
#include "Unknown/UnkStruct_027e0ce0.hpp"
@@ -9,22 +9,22 @@ extern "C" void func_01ffaf74(Vec3p *, Mat4x3p *, Vec3p *);
const UnkStruct_ov031_021150b0 data_ov031_02115184(0x1E66);
ARM DECL_PROFILE(MapObjectProfileUnkDRKY);
ARM DECL_PROFILE(MapObjectProfileDoorKey);
ARM MapObject *MapObjectProfileUnkDRKY::Create() {
return new(HeapIndex_ITCM) MapObjectUnkDRKY();
ARM MapObject *MapObjectProfileDoorKey::Create() {
return new(HeapIndex_ITCM) MapObjectDoorKey();
}
ARM MapObjectProfileUnkDRKY::MapObjectProfileUnkDRKY() :
MapObjectProfile_Derived2(MapObjectId_DRKY, MapObjectId_DRKY) {
ARM MapObjectProfileDoorKey::MapObjectProfileDoorKey() :
MapObjectProfile_Derived2(MapObjectId_DoorKey, MapObjectId_DoorKey) {
this->mUnk_0E = 1;
this->mUnk_06 = 2;
this->mUnk_1E |= 0x01;
this->mUnk_0C = 0x2666;
}
ARM MapObjectUnkDRKY::MapObjectUnkDRKY() :
mUnk_94(GetUnkPointer1<MapObjectProfileUnkDRKY>()),
ARM MapObjectDoorKey::MapObjectDoorKey() :
mUnk_94(GetUnkPointer1<MapObjectProfileDoorKey>()),
mUnk_9C(1),
mUnk_A0(0),
mUnk_A4(false) {
@@ -33,22 +33,22 @@ ARM MapObjectUnkDRKY::MapObjectUnkDRKY() :
this->mUnk_18[0] = 0x0E;
}
ARM bool MapObjectUnkDRKY::vfunc_00(void) {
ARM bool MapObjectDoorKey::vfunc_00(void) {
this->func_ov031_020fbf10(true, false);
return true;
}
ARM void MapObjectUnkDRKY::vfunc_08(void) {
ARM void MapObjectDoorKey::vfunc_08(void) {
this->MapObjectDoorBase::vfunc_08();
this->mUnk_A4 = false;
}
ARM void MapObjectUnkDRKY::vfunc_18(s8 *param1, s8 param2) {
ARM void MapObjectDoorKey::vfunc_18(s8 *param1, s8 param2) {
this->MapObjectDoorBase::func_ov031_020fcb78(param1, param2);
}
// https://decomp.me/scratch/XO3u2
ARM void MapObjectUnkDRKY::vfunc_14(void) {
ARM void MapObjectDoorKey::vfunc_14(void) {
f32 factor;
f32 uVar3;
s32 sVar2;
@@ -91,7 +91,7 @@ ARM void MapObjectUnkDRKY::vfunc_14(void) {
this->mUnk_94.vfunc_14(&m, &local_48);
}
ARM void MapObjectUnkDRKY::vfunc_5C(unk32 param1, unk32 param2) {
ARM void MapObjectDoorKey::vfunc_5C(unk32 param1, unk32 param2) {
this->mUnk_8D = true;
this->MapObjectDoorBase::vfunc_5C(param1, param2);
@@ -112,7 +112,7 @@ ARM void MapObjectUnkDRKY::vfunc_5C(unk32 param1, unk32 param2) {
}
}
ARM bool MapObjectUnkDRKY::func_ov031_020fea88(void) {
ARM bool MapObjectDoorKey::func_ov031_020fea88(void) {
if (this->mUnk_A4) {
return false;
}
@@ -124,7 +124,7 @@ ARM bool MapObjectUnkDRKY::func_ov031_020fea88(void) {
return false;
}
ARM unk32 MapObjectUnkDRKY::vfunc_28(void) {
ARM unk32 MapObjectDoorKey::vfunc_28(void) {
if (this->mUnk_A4) {
return -1;
}
@@ -149,24 +149,24 @@ ARM unk32 MapObjectUnkDRKY::vfunc_28(void) {
return 0;
}
ARM bool MapObjectUnkDRKY::vfunc_64(void) {
ARM bool MapObjectDoorKey::vfunc_64(void) {
return this->func_ov000_0209d668();
}
ARM bool MapObjectUnkDRKY::vfunc_68(void) {
ARM bool MapObjectDoorKey::vfunc_68(void) {
return false;
}
ARM bool MapObjectUnkDRKY::vfunc_6C(void) {
ARM bool MapObjectDoorKey::vfunc_6C(void) {
return false;
}
ARM void MapObjectUnkDRKY::vfunc_74(void) {
ARM 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 MapObjectUnkDRKY::vfunc_7C(void) {
ARM void MapObjectDoorKey::vfunc_7C(void) {
this->MapObjectDoorBase::vfunc_7C();
if (this->mUnk_A0.mUnk_00 != NULL) {
@@ -174,7 +174,7 @@ ARM void MapObjectUnkDRKY::vfunc_7C(void) {
}
}
ARM void MapObjectUnkDRKY::vfunc_78(void) {
ARM void MapObjectDoorKey::vfunc_78(void) {
Vec3p local_24;
Vec3p local_30;
Vec3p VStack_3c;
@@ -229,18 +229,18 @@ ARM void MapObjectUnkDRKY::vfunc_78(void) {
}
}
ARM void MapObjectUnkDRKY::vfunc_40(void) {
ARM void MapObjectDoorKey::vfunc_40(void) {
data_027e09a8->func_ov000_02071b30(0x136, &this->mPos, 0);
}
ARM void MapObjectUnkDRKY::vfunc_44(void) {
ARM void MapObjectDoorKey::vfunc_44(void) {
unk32 stack = *(u32 *) &this->mUnk_38;
data_027e09a8->func_ov000_02071d34(&stack, 0x135, &this->mPos, 0);
}
ARM void MapObjectUnkDRKY::vfunc_48(void) {}
ARM void MapObjectDoorKey::vfunc_48(void) {}
ARM void MapObjectUnkDRKY::vfunc_4C(void) {}
ARM void MapObjectDoorKey::vfunc_4C(void) {}
ARM MapObjectUnkDRKY::~MapObjectUnkDRKY() {}
ARM MapObjectProfileUnkDRKY::~MapObjectProfileUnkDRKY() {}
ARM MapObjectDoorKey::~MapObjectDoorKey() {}
ARM MapObjectProfileDoorKey::~MapObjectProfileDoorKey() {}
src/031_Land/MapObject/MapObjectUnkDRSW.cpp → src/031_Land/MapObject/MapObjectDoorSwitch.cpp
+25 -25
View File
@@ -1,4 +1,4 @@
#include "MapObject/MapObjectUnkDRSW.hpp"
#include "MapObject/MapObjectDoorSwitch.hpp"
#include "System/SysNew.hpp"
#include "Unknown/UnkStruct_027e09a8.hpp"
#include "Unknown/UnkStruct_027e09b8.hpp"
@@ -11,19 +11,19 @@ extern "C" void func_01ff9218(q20 *, q20, q20);
const UnkStruct_ov031_021150b0 data_ov031_02115254(0x1E66);
ARM DECL_PROFILE(MapObjectProfileUnkDRSW);
ARM DECL_PROFILE(MapObjectProfileDoorSwitch);
ARM MapObject *MapObjectProfileUnkDRSW::Create() {
return new(HeapIndex_ITCM) MapObjectUnkDRSW();
ARM MapObject *MapObjectProfileDoorSwitch::Create() {
return new(HeapIndex_ITCM) MapObjectDoorSwitch();
}
ARM MapObjectProfileUnkDRSW::MapObjectProfileUnkDRSW() :
MapObjectProfile_Derived2(MapObjectId_DRSW, MapObjectId_DRSW) {
ARM MapObjectProfileDoorSwitch::MapObjectProfileDoorSwitch() :
MapObjectProfile_Derived2(MapObjectId_DoorSwitch, MapObjectId_DoorSwitch) {
this->mUnk_06 = -1;
this->mUnk_1E &= ~0x01;
}
ARM MapObjectUnkDRSW::MapObjectUnkDRSW() :
ARM MapObjectDoorSwitch::MapObjectDoorSwitch() :
mUnk_094(0) {
this->mUnkPos = FLOAT_TO_Q20(0.0f);
@@ -37,7 +37,7 @@ ARM MapObjectUnkDRSW::MapObjectUnkDRSW() :
this->mUnk_89 = true;
}
ARM bool MapObjectUnkDRSW::vfunc_00(void) {
ARM bool MapObjectDoorSwitch::vfunc_00(void) {
this->mUnk_094.vfunc_08(this->vfunc2_10());
this->func_ov031_020fbf10(true, true);
@@ -90,7 +90,7 @@ ARM bool MapObjectUnkDRSW::vfunc_00(void) {
return true;
}
ARM void MapObjectUnkDRSW::vfunc_08(void) {
ARM 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 MapObjectUnkDRSW::vfunc_08(void) {
}
}
ARM bool MapObjectUnkDRSW::vfunc_64(void) {
ARM bool MapObjectDoorSwitch::vfunc_64(void) {
return this->func_ov000_0209d29c(0);
}
ARM bool MapObjectUnkDRSW::vfunc_6C(void) {
ARM bool MapObjectDoorSwitch::vfunc_6C(void) {
if (this->func_ov000_0209d29c(0)) {
return false;
}
@@ -112,7 +112,7 @@ ARM bool MapObjectUnkDRSW::vfunc_6C(void) {
return true;
}
ARM void MapObjectUnkDRSW::vfunc_14(void) {
ARM void MapObjectDoorSwitch::vfunc_14(void) {
u16 angle = this->mUnk_14;
Mat3p m;
@@ -123,11 +123,11 @@ ARM void MapObjectUnkDRSW::vfunc_14(void) {
this->mUnk_094.vfunc_14(&m, &local_40);
}
ARM void MapObjectUnkDRSW::vfunc_18(s8 *param1, s8 param2) {
ARM void MapObjectDoorSwitch::vfunc_18(s8 *param1, s8 param2) {
this->func_ov031_020fcb78(param1, param2);
}
ARM void MapObjectUnkDRSW::vfunc_74(void) {
ARM void MapObjectDoorSwitch::vfunc_74(void) {
Vec3p local_20(this->mPos);
Vec3p local_2c(0, 0, 0x666);
Mat4x3p m;
@@ -144,11 +144,11 @@ ARM void MapObjectUnkDRSW::vfunc_74(void) {
}
}
ARM void *MapObjectUnkDRSW::vfunc2_10(void) {
return GetUnkPointer1<MapObjectProfileUnkDRSW>();
ARM void *MapObjectDoorSwitch::vfunc2_10(void) {
return GetUnkPointer1<MapObjectProfileDoorSwitch>();
}
ARM void MapObjectUnkDRSW::vfunc_50(void) {
ARM void MapObjectDoorSwitch::vfunc_50(void) {
#if IS_JP
if (!this->mUnk_140) {
return;
@@ -207,7 +207,7 @@ ARM void MapObjectUnkDRSW::vfunc_50(void) {
#endif
}
ARM void MapObjectUnkDRSW::vfunc_54(void) {
ARM void MapObjectDoorSwitch::vfunc_54(void) {
this->func_ov031_020fcf0c(1);
#if IS_JP
@@ -280,7 +280,7 @@ ARM void MapObjectUnkDRSW::vfunc_54(void) {
#endif
}
ARM void MapObjectUnkDRSW::vfunc_58(void) {
ARM void MapObjectDoorSwitch::vfunc_58(void) {
#if IS_JP
if (!this->mUnk_140) {
return;
@@ -316,23 +316,23 @@ ARM void MapObjectUnkDRSW::vfunc_58(void) {
#endif
}
ARM void MapObjectUnkDRSW::vfunc_40(void) {
ARM void MapObjectDoorSwitch::vfunc_40(void) {
data_027e09a8->func_ov000_02071b30(0x131, &this->mPos, 0);
}
ARM void MapObjectUnkDRSW::vfunc_44(void) {
ARM 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 MapObjectUnkDRSW::vfunc_48(void) {
ARM void MapObjectDoorSwitch::vfunc_48(void) {
data_027e09a8->func_ov000_02071b30(0x133, &this->mPos, 0);
}
ARM void MapObjectUnkDRSW::vfunc_4C(void) {
ARM void MapObjectDoorSwitch::vfunc_4C(void) {
unk32 local_c = *(u32 *) &this->mUnk_38;
data_027e09a8->func_ov000_02071d34(&local_c, 0x132, &this->mPos, 0);
}
ARM MapObjectUnkDRSW::~MapObjectUnkDRSW() {}
ARM MapObjectProfileUnkDRSW::~MapObjectProfileUnkDRSW() {}
ARM MapObjectDoorSwitch::~MapObjectDoorSwitch() {}
ARM MapObjectProfileDoorSwitch::~MapObjectProfileDoorSwitch() {}
src/031_Land/MapObject/MapObjectDoorTouch.cpp
+55
View File
@@ -0,0 +1,55 @@
#include "MapObject/MapObjectDoorTouch.hpp"
#include "System/SysNew.hpp"
#include "Unknown/Common.hpp"
#include "Unknown/UnkStruct_027e09a8.hpp"
extern u32 data_ov031_02110c3c[];
ARM DECL_PROFILE(MapObjectProfileDoorTouch);
ARM MapObject *MapObjectProfileDoorTouch::Create() {
return new(HeapIndex_ITCM) MapObjectDoorTouch();
}
ARM MapObjectProfileDoorTouch::MapObjectProfileDoorTouch() :
MapObjectProfile_Derived1(MapObjectId_DoorTouch, -1, 0) {
this->mUnk_06 = -1;
this->mUnk_1E &= ~0x01;
}
ARM MapObjectDoorTouch::MapObjectDoorTouch() {
this->mUnk_18[0] = 0x0F;
}
ARM bool MapObjectDoorTouch::vfunc_00(void) {
this->MapObjectDoorClick::vfunc_00();
this->mUnk_88 = true;
return true;
}
ARM void MapObjectDoorTouch::vfunc2_10(void) {
MapObjectProfileDoorTouch *p = GET_PROFILE(MapObjectProfileDoorTouch);
unk32 index = this->mUnk_20.mUnk_00[0];
this->mUnk_94.vfunc_08(GetUnkPointer2<MapObjectProfileDoorTouch>(index, data_ov031_02110c3c[index]));
}
ARM void MapObjectDoorTouch::vfunc_40(void) {
data_027e09a8->func_ov000_02071b30(0x148, &this->mPos, 0);
}
ARM void MapObjectDoorTouch::vfunc_44(void) {
unk32 local_c = *(u32 *) &this->mUnk_38;
data_027e09a8->func_ov000_02071d34(&local_c, 0x147, &this->mPos, 0);
}
ARM void MapObjectDoorTouch::vfunc_48(void) {}
ARM void MapObjectDoorTouch::vfunc_4C(void) {}
ARM void MapObjectDoorTouch::vfunc2_18(void) {
data_027e09a8->func_ov000_02071b30(0x146, &this->mPos, 0);
}
ARM MapObjectDoorTouch::~MapObjectDoorTouch() {}
ARM MapObjectProfileDoorTouch::~MapObjectProfileDoorTouch() {}
src/031_Land/MapObject/MapObjectUnkDRTC.cpp
-55
View File
@@ -1,55 +0,0 @@
#include "MapObject/MapObjectUnkDRTC.hpp"
#include "System/SysNew.hpp"
#include "Unknown/Common.hpp"
#include "Unknown/UnkStruct_027e09a8.hpp"
extern u32 data_ov031_02110c3c[];
ARM DECL_PROFILE(MapObjectProfileUnkDRTC);
ARM MapObject *MapObjectProfileUnkDRTC::Create() {
return new(HeapIndex_ITCM) MapObjectUnkDRTC();
}
ARM MapObjectProfileUnkDRTC::MapObjectProfileUnkDRTC() :
MapObjectProfile_Derived1(MapObjectId_DRTC, -1, 0) {
this->mUnk_06 = -1;
this->mUnk_1E &= ~0x01;
}
ARM MapObjectUnkDRTC::MapObjectUnkDRTC() {
this->mUnk_18[0] = 0x0F;
}
ARM bool MapObjectUnkDRTC::vfunc_00(void) {
this->MapObjectUnkDRCK::vfunc_00();
this->mUnk_88 = true;
return true;
}
ARM void MapObjectUnkDRTC::vfunc2_10(void) {
MapObjectProfileUnkDRTC *p = GET_PROFILE(MapObjectProfileUnkDRTC);
unk32 index = this->mUnk_20.mUnk_00[0];
this->mUnk_94.vfunc_08(GetUnkPointer2<MapObjectProfileUnkDRTC>(index, data_ov031_02110c3c[index]));
}
ARM void MapObjectUnkDRTC::vfunc_40(void) {
data_027e09a8->func_ov000_02071b30(0x148, &this->mPos, 0);
}
ARM void MapObjectUnkDRTC::vfunc_44(void) {
unk32 local_c = *(u32 *) &this->mUnk_38;
data_027e09a8->func_ov000_02071d34(&local_c, 0x147, &this->mPos, 0);
}
ARM void MapObjectUnkDRTC::vfunc_48(void) {}
ARM void MapObjectUnkDRTC::vfunc_4C(void) {}
ARM void MapObjectUnkDRTC::vfunc2_18(void) {
data_027e09a8->func_ov000_02071b30(0x146, &this->mPos, 0);
}
ARM MapObjectUnkDRTC::~MapObjectUnkDRTC() {}
ARM MapObjectProfileUnkDRTC::~MapObjectProfileUnkDRTC() {}