diff options
| author | Aetias <aetias@outlook.com> | 2025-06-29 20:55:15 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2025-06-29 20:55:15 +0200 |
| commit | f1c2aa37a7a706808b4c992638d89ee211cc0efd (patch) | |
| tree | ac3efc0f20e0c349357e7ddd49e3859f5f0ee27a /include/Actor | |
| parent | 48d9d68c1032dbf5da12d13c54f6bcdfd9c8a95d (diff) | |
| parent | 21aaec6b40f8cb756e5ef4fff5552b980ab58d4e (diff) | |
Merge remote-tracking branch 'zeldaret/main' into decomp-ActorSpawner
Diffstat (limited to 'include/Actor')
| -rw-r--r-- | include/Actor/Actor.hpp | 2 | ||||
| -rw-r--r-- | include/Actor/Dungeon/ActorSwitchObject.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 25bc9d8a..b58c39c8 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -174,7 +174,7 @@ public: /* 00 */ virtual ~Actor(); /* 08 */ virtual bool Init(); - /* 0c */ virtual void vfunc_0c(); + /* 0c */ virtual bool vfunc_0c(); /* 10 */ virtual void vfunc_10(u32 param1); /* 14 */ virtual void vfunc_14(u32 param1); /* 18 */ virtual void vfunc_18(u32 param1); diff --git a/include/Actor/Dungeon/ActorSwitchObject.hpp b/include/Actor/Dungeon/ActorSwitchObject.hpp index 4142ff72..0658fcb2 100644 --- a/include/Actor/Dungeon/ActorSwitchObject.hpp +++ b/include/Actor/Dungeon/ActorSwitchObject.hpp @@ -22,7 +22,7 @@ public: /* 00 */ virtual ~ActorSwitchObject() override; /* 08 */ virtual bool Init() override; - /* 0c */ virtual void vfunc_0c() override; + /* 0c */ virtual bool vfunc_0c() override; /* 14 */ virtual void vfunc_14(u32 param1) override; /* 18 */ virtual void vfunc_18(u32 param1) override; /* b4 */ |