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

Decompiling some actors and objects of overlay 031 (#123)

Browse Source 
* feat: decompiling skdo

* feat: update

* fix: match back .data of doors

* feat: fully decompiled SWCH for eur missing bss for JP

* feat: increase matching code

* feat: decompile most part of SCCN

* feat: update

* feat: progress sccn jap data

* feat: progress decompiling

* fix: build issues

* feat: increase matching

* refactor: rename BLST to Blast

* feat: increase grss

* refactor: rename unkgrss to grass

* refactor: rename id

* refactor: change to fx32

* feat: complete RMTG actor

* refactor: use ARRAY_LENGTH macro
This commit is contained in:
Alessevan
2026-08-02 08:09:49 -04:00
committed by GitHub
parent f1c7b3cc72
commit f90c7cd531
107 changed files with 2023 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/031_Land/MapObject/MapObjectDoorKey.cpp
+13 -13
View File
@@ -91,12 +91,12 @@ void MapObjectDoorKey::vfunc_14(void) {
this->mUnk_94.vfunc_14(&m, &local_48);
}
void MapObjectDoorKey::vfunc_5C(unk32 param1, unk32 param2) {
void MapObjectDoorKey::vfunc_5C(MapObjState state, unk32 param2) {
this->mUnk_8D = true;
this->MapObjectDoorBase::vfunc_5C(param1, param2);
this->MapObjectDoorBase::vfunc_5C(state, param2);
switch (this->mUnk_16) {
case 3:
switch (this->mState) {
case MapObjDoorKeyState_3:
if (param2 == 0) {
data_027e0ce0->mUnk_2C->GetInventory()->GiveSmallKeys(-1);
}
@@ -104,7 +104,7 @@ void MapObjectDoorKey::vfunc_5C(unk32 param1, unk32 param2) {
UNSET_FLAG(this->mFlags, MapObjFlag_9);
data_027e09a8->func_ov000_02071b30(0x134, &this->mPos, 0);
break;
case 8:
case MapObjDoorKeyState_8:
UNSET_FLAG(this->mFlags, MapObjFlag_9);
break;
default:
@@ -133,16 +133,16 @@ unk32 MapObjectDoorKey::vfunc_28(void) {
return -1;
}
switch (this->mUnk_16) {
case 3:
case 4:
case 5:
case 6:
case 7:
case 8:
switch (this->mState) {
case MapObjDoorKeyState_3:
case MapObjDoorKeyState_4:
case MapObjDoorKeyState_5:
case MapObjDoorKeyState_6:
case MapObjDoorKeyState_7:
case MapObjDoorKeyState_8:
return -1;
default:
this->vfunc_5C(3, 0);
this->vfunc_5C(MapObjDoorKeyState_3, 0);
break;
}