mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-08-25 07:44:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add parameters to MapObject::vfunc_28 (#146)

Browse Source 
* feat: increase global matching

* fix: better refactor

* fix: match back MapObjectDoorSwitch::MapObjectDoorSwitch

* style: remove old nonmatching comment
This commit is contained in:
Alessevan
2026-08-24 11:43:47 -04:00
committed by GitHub
parent f595c06b8d
commit 721bb0efd8
19 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/MapObject/MapObject.hpp
+1 -1
View File
@@ -148,7 +148,7 @@ public:
/* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3);
/* 20 */ virtual void vfunc_20();
/* 24 */ virtual void vfunc_24(MapObject *param1, VecFx32 param2);
/* 28 */ virtual unk32 vfunc_28();
/* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3);
/* 2C */ virtual bool vfunc_2C(VecFx32 *param1);
/* 30 */ virtual ~MapObject();
/* 38 */
include/MapObject/MapObjectBombFlower.hpp
+1 -1
View File
@@ -37,7 +37,7 @@ public:
/* 08 */ virtual void vfunc_08() override;
/* 14 */ virtual void vfunc_14() override;
/* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override;
/* 28 */ virtual unk32 vfunc_28() override;
/* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override;
/* 38 */ virtual void vfunc_38() override;
/* 44 */ virtual bool SetState(MapObjState state, unk32) override;
/* 48 */ virtual void vfunc_48() override;
include/MapObject/MapObjectChestBase.hpp
+1 -1
View File
@@ -64,7 +64,7 @@ public:
/* 0C */ virtual void vfunc_0C() override;
/* 14 */ virtual void vfunc_14() override;
/* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override;
/* 28 */ virtual ItemId vfunc_28() override;
/* 28 */ virtual ItemId vfunc_28(unk32 param1, unk32 param2, unk32 param3) override;
/* 30 */ virtual ~MapObjectChestBase() override;
/* 38 */ virtual void vfunc_38(unk32 param1, unk32 param2);
/* 3C */ virtual unk32 vfunc_3C();
include/MapObject/MapObjectDoorClick.hpp
+1 -1
View File
@@ -49,7 +49,7 @@ public:
/* 08 */ virtual void vfunc_08() override;
/* 14 */ virtual void vfunc_14() override;
/* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override;
/* 28 */ virtual unk32 vfunc_28() override;
/* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override;
/* 30 */ virtual ~MapObjectDoorClick() override {}
/* 40 */ virtual void vfunc_40() override;
/* 44 */ virtual void vfunc_44() override;
include/MapObject/MapObjectDoorKey.hpp
+1 -1
View File
@@ -40,7 +40,7 @@ public:
/* 08 */ virtual void vfunc_08() override;
/* 14 */ virtual void vfunc_14() override;
/* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override;
/* 28 */ virtual unk32 vfunc_28() override;
/* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override;
/* 30 */ virtual ~MapObjectDoorKey() override;
/* 40 */ virtual void vfunc_40() override;
/* 44 */ virtual void vfunc_44() override;
include/MapObject/MapObjectDoorSwitch.hpp
+3 -2
View File
@@ -1,5 +1,6 @@
#pragma once
#include "Actor/ActorUnkSCCN.hpp"
#include "MapObject/MapObject.hpp"
#include "MapObject/MapObjectDoorBase.hpp"
#include "MapObject/MapObjectProfile.hpp"
@@ -22,9 +23,9 @@ class MapObjectDoorSwitch : public MapObjectDoorBase {
public:
/* 000 (base) */
/* 094 */ ModelRender mUnk_094;
/* 0F4 */ MapObject_10 mUnk_0F4;
/* 0F4 */ MapObject_10_SCCN mUnk_0F4;
#if IS_JP
/* 118 */ MapObject_10 mUnk_118;
/* 118 */ MapObject_10_SCCN mUnk_118;
/* 13C */ fx32 mUnkPos;
/* 140 */ bool mUnk_140;
/* 141 */ bool mUnk_141;
include/MapObject/MapObjectPot_Base.hpp
+1 -1
View File
@@ -22,7 +22,7 @@ public:
// data_ov000_020b35d0
/* 00 */ virtual bool vfunc_00();
/* 24 */ virtual void vfunc_24(MapObject *param1, VecFx32 param2) override;
/* 28 */ virtual unk32 vfunc_28() override;
/* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override;
/* 30 */ virtual ~MapObjectPot_Base() = 0 override;
/* 38 */ virtual void vfunc_38() override;
/* 3C */ virtual bool vfunc_3C() override;