mirror of
https://github.com/zeldaret/st
synced 2026-09-02 17:53:19 -04:00
Decompiling some actors and objects of overlay 031 (#123)
* 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:
@@ -7,7 +7,7 @@ struct UnkStruct {
|
||||
unk32 four;
|
||||
};
|
||||
|
||||
extern "C" void func_01ffecdc(int, void *);
|
||||
extern "C" unk32 func_01ffecdc(int, void *);
|
||||
|
||||
MapObject *MapObjectManager::func_01fff498(Vec2bCpp param1) {
|
||||
if (this->mUnk_0C[param1.y][param1.x] < 0) {
|
||||
@@ -29,16 +29,13 @@ void MapObjectManager::func_01fff4cc(UnkCallback_func_01fff4cc param1, void *par
|
||||
}
|
||||
}
|
||||
|
||||
// non-matching
|
||||
MapObject **MapObjectManager::func_01fff520(UnkStruct_ov000_020b34c4 *param1, MapObject **param2) {
|
||||
MapObject **ptr = param2;
|
||||
|
||||
while (ptr != this->mUnk_08) {
|
||||
MapObject *ptr2 = *ptr;
|
||||
if (ptr2 != NULL && GET_FLAG((ptr2)->mFlags, MapObjFlag_Alive)) {
|
||||
UnkStruct_ov000_020b34c4_Callback cb = *param1->mUnk_00;
|
||||
|
||||
if ((*cb)(param1, ptr2)) {
|
||||
if (param1->vfunc_00(ptr2)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -53,7 +50,7 @@ MapObjectId MapObject::GetMapObjectId() {
|
||||
return this->mpProfile->mMapObjId;
|
||||
}
|
||||
|
||||
void MapObject::func_01fff590(unk32 param2) {
|
||||
unk32 MapObject::func_01fff590(unk32 param2) {
|
||||
UnkStruct stack;
|
||||
unk32 one;
|
||||
unk32 two;
|
||||
@@ -69,5 +66,5 @@ void MapObject::func_01fff590(unk32 param2) {
|
||||
stack.two = two;
|
||||
stack.three = three;
|
||||
stack.four = four;
|
||||
func_01ffecdc(param2, &stack);
|
||||
return func_01ffecdc(param2, &stack);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user