mirror of
https://github.com/zeldaret/st
synced 2026-08-30 17:19:47 -04:00
Decompile overlay 1 (Part 2) (#91)
* UnkStruct_027e09b8_001 OK * match func_ov001_020b7830 * fix build issues * UnkStruct_027e0cd8_001 49% * UnkStruct_027e0cd8_001 OK * fix build issues * UnkStruct_027e0cd8_0C_001 92% * port some MSL C++ headers from rb3 and key decomps * fix build issues * UnkStruct_027e0cd8_0C_001 98%
This commit is contained in:
@@ -71,7 +71,7 @@ bool MapObjectChestBase::vfunc_00() {
|
||||
SET_FLAG(this->mFlags, MapObjFlag_9);
|
||||
this->mUnk_18[0] = 0x0D;
|
||||
|
||||
UnkStruct_027e0cd8_0c *pUVar2 = data_027e0cd8->mUnk_0C;
|
||||
UnkStruct_027e0cd8_0C_Base *pUVar2 = data_027e0cd8->mUnk_0C;
|
||||
|
||||
if (this->mUnk_20.mUnk_00[3] == 1) {
|
||||
this->mPos.x += 0x7FC;
|
||||
@@ -91,7 +91,7 @@ bool MapObjectChestBase::vfunc_00() {
|
||||
// non-matching
|
||||
void MapObjectChestBase::vfunc_04() {
|
||||
fx32 iVar2;
|
||||
UnkStruct_027e0cd8_0c *pUVar5;
|
||||
UnkStruct_027e0cd8_0C_Base *pUVar5;
|
||||
VecFx32 sp48;
|
||||
VecFx32 sp3C;
|
||||
VecFx32 local_38;
|
||||
|
||||
@@ -61,7 +61,7 @@ bool MapObjectDoorDangerSpawn::vfunc_00(void) {
|
||||
}
|
||||
|
||||
void MapObjectDoorDangerSpawn::vfunc_04(void) {
|
||||
UnkStruct_027e0cd8_0c *ptr;
|
||||
UnkStruct_027e0cd8_0C_Base *ptr;
|
||||
VecFx32 auStack_20;
|
||||
|
||||
if (this->mUnk_20.mUnk_00[1] == 2) {
|
||||
@@ -403,7 +403,7 @@ void MapObjectDoorDangerSpawn::vfunc_5C(unk32 param1, unk32 param2) {
|
||||
}
|
||||
|
||||
bool MapObjectDoorDangerSpawn::vfunc_64(void) {
|
||||
UnkStruct_027e0cd8_0c *pUVar4;
|
||||
UnkStruct_027e0cd8_0C_Base *pUVar4;
|
||||
unk32 var_r0;
|
||||
bool var_r5;
|
||||
|
||||
@@ -441,7 +441,7 @@ bool MapObjectDoorDangerSpawn::vfunc_64(void) {
|
||||
}
|
||||
|
||||
bool MapObjectDoorDangerSpawn::vfunc_68(void) {
|
||||
UnkStruct_027e0cd8_0c *pUVar2 = data_027e0cd8->mUnk_0C;
|
||||
UnkStruct_027e0cd8_0C_Base *pUVar2 = data_027e0cd8->mUnk_0C;
|
||||
|
||||
if (this->mUnk_20.mUnk_00[2] == 1) {
|
||||
if (func_ov000_0209d29c(1)) {
|
||||
@@ -466,7 +466,7 @@ bool MapObjectDoorDangerSpawn::vfunc_68(void) {
|
||||
}
|
||||
|
||||
bool MapObjectDoorDangerSpawn::vfunc_6C(void) {
|
||||
UnkStruct_027e0cd8_0c *pUVar5;
|
||||
UnkStruct_027e0cd8_0C_Base *pUVar5;
|
||||
|
||||
switch (this->mUnk_20.mUnk_00[1]) {
|
||||
case 1:
|
||||
@@ -520,7 +520,7 @@ bool MapObjectDoorDangerSpawn::vfunc_6C(void) {
|
||||
}
|
||||
|
||||
bool MapObjectDoorDangerSpawn::func_ov031_020fdec8(void) {
|
||||
UnkStruct_027e0cd8_0c *pUVar4;
|
||||
UnkStruct_027e0cd8_0C_Base *pUVar4;
|
||||
VecFx32 *uVar3;
|
||||
int iVar1;
|
||||
|
||||
@@ -548,7 +548,7 @@ bool MapObjectDoorDangerSpawn::func_ov031_020fdec8(void) {
|
||||
}
|
||||
|
||||
pUVar4 = data_027e0cd8->mUnk_0C;
|
||||
uVar3 = pUVar4->func_ov001_020b8a5c(data_027e09a4->func_ov000_02070560()->mSpawnIndex, 0);
|
||||
uVar3 = (VecFx32 *) &pUVar4->func_ov001_020b8a5c(data_027e09a4->func_ov000_02070560()->mSpawnIndex, 0)->mUnk_00;
|
||||
|
||||
if (pUVar4->func_ov000_020802ec(this->mUnk_20.mUnk_00[0], uVar3)) {
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user