From d1acad0dd8c597b567376d253284a335a5554bee Mon Sep 17 00:00:00 2001 From: Aetias Date: Mon, 26 May 2025 23:30:28 +0200 Subject: [PATCH] Delink `ActorRefill` --- config/eur/arm9/overlays/ov014/delinks.txt | 6 ++ config/usa/arm9/overlays/ov014/delinks.txt | 6 ++ include/Actor/Player/ActorRefill.hpp | 102 +++++++++++++++++++++ src/14_Land/Actor/Player/ActorRefill.cpp | 31 +++++++ 4 files changed, 145 insertions(+) create mode 100644 include/Actor/Player/ActorRefill.hpp create mode 100644 src/14_Land/Actor/Player/ActorRefill.cpp diff --git a/config/eur/arm9/overlays/ov014/delinks.txt b/config/eur/arm9/overlays/ov014/delinks.txt index 60aa7fc6..b5ed209d 100644 --- a/config/eur/arm9/overlays/ov014/delinks.txt +++ b/config/eur/arm9/overlays/ov014/delinks.txt @@ -12,3 +12,9 @@ src/14_Land/Actor/ActorRupee.cpp: .ctor start:0x0215591c end:0x02155920 .data start:0x02158994 end:0x02158a94 .bss start:0x0215b1f4 end:0x0215b214 + +src/14_Land/Actor/Player/ActorRefill.cpp: + .text start:0x02134e24 end:0x02135940 + .init start:0x02154c14 end:0x02154d24 + .ctor start:0x021558ec end:0x021558f0 + .data start:0x021578b0 end:0x02157d70 diff --git a/config/usa/arm9/overlays/ov014/delinks.txt b/config/usa/arm9/overlays/ov014/delinks.txt index c0472e4a..2290a8e6 100644 --- a/config/usa/arm9/overlays/ov014/delinks.txt +++ b/config/usa/arm9/overlays/ov014/delinks.txt @@ -12,3 +12,9 @@ src/14_Land/Actor/ActorRupee.cpp: .ctor start:0x02155878 end:0x0215587c .data start:0x021588f4 end:0x021589f8 .bss start:0x0215b154 end:0x0215b174 + +src/14_Land/Actor/Player/ActorRefill.cpp: + .text start:0x02134d80 end:0x0213589c + .init start:0x02154b70 end:0x02154c80 + .ctor start:0x02155848 end:0x0215584c + .data start:0x02157810 end:0x02157cd0 diff --git a/include/Actor/Player/ActorRefill.hpp b/include/Actor/Player/ActorRefill.hpp new file mode 100644 index 00000000..47e7d9fc --- /dev/null +++ b/include/Actor/Player/ActorRefill.hpp @@ -0,0 +1,102 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include "Actor/Actor.hpp" + +class ActorRefill : public Actor { +public: + /* 000 (base) */ + /* 158 */ unk32 mUnk_158; + /* 15c */ unk32 mUnk_15c; + /* 160 */ unk32 mUnk_160; + /* 164 */ unk8 mUnk_164; + /* 165 */ unk8 mUnk_165[0x3]; + /* 168 */ + +public: + ActorRefill(); + + /* 00 */ virtual ~ActorRefill() override; + /* 08 */ virtual bool vfunc_08() override; + /* 14 */ virtual void vfunc_14(u32 param1) override; + /* 20 */ virtual void vfunc_20(bool param1) override; + /* b4 */ virtual unk32 vfunc_b4() = 0; + /* b8 */ + + bool func_ov014_02135364(unk32 param1); + void func_ov014_02135474(); +}; + +class ActorRefillBombs : public ActorRefill { +public: + /* 000 (base) */ + /* 168 */ + +public: + ActorRefillBombs(); + static ActorRefillBombs *Create(); + + /* 00 */ virtual ~ActorRefillBombs() override; + /* b4 */ virtual unk32 vfunc_b4() override; + /* b8 */ +}; + +class ActorRefillBombchus : public ActorRefill { +public: + /* 000 (base) */ + /* 168 */ + +public: + ActorRefillBombchus(); + static ActorRefillBombchus *Create(); + + /* 00 */ virtual ~ActorRefillBombchus() override; + /* b4 */ virtual unk32 vfunc_b4() override; + /* b8 */ +}; + +class ActorRefillArrows : public ActorRefill { +public: + /* 000 (base) */ + /* 168 */ + +public: + ActorRefillArrows(); + static ActorRefillArrows *Create(); + + /* 00 */ virtual ~ActorRefillArrows() override; + /* b4 */ virtual unk32 vfunc_b4() override; + /* b8 */ +}; + +class ActorRefillTime : public ActorRefill { +public: + /* 000 (base) */ + /* 168 */ + +public: + ActorRefillTime(); + static ActorRefillTime *Create(); + + /* 00 */ virtual ~ActorRefillTime() override; + /* 08 */ virtual bool vfunc_08() override; + /* b4 */ virtual unk32 vfunc_b4() override; + /* b8 */ +}; + +class ActorLSTM : public ActorRefill { +public: + /* 000 (base) */ + /* 168 */ + +public: + ActorLSTM(); + static ActorLSTM *Create(); + + /* 00 */ virtual ~ActorLSTM() override; + /* 08 */ virtual bool vfunc_08() override; + /* b4 */ virtual unk32 vfunc_b4() override; + /* b8 */ +}; diff --git a/src/14_Land/Actor/Player/ActorRefill.cpp b/src/14_Land/Actor/Player/ActorRefill.cpp new file mode 100644 index 00000000..841c4910 --- /dev/null +++ b/src/14_Land/Actor/Player/ActorRefill.cpp @@ -0,0 +1,31 @@ +#include "Actor/Player/ActorRefill.hpp" + +ActorRefillBombs *ActorRefillBombs::Create() {} +ActorRefillBombchus *ActorRefillBombchus::Create() {} +ActorRefillArrows *ActorRefillArrows::Create() {} +ActorRefillTime *ActorRefillTime::Create() {} +ActorLSTM *ActorLSTM::Create() {} +ActorRefill::ActorRefill() {} +ActorRefill::~ActorRefill() {} +bool ActorRefill::vfunc_08() {} +void ActorRefill::vfunc_14(u32 param1) {} +bool ActorRefill::func_ov014_02135364(unk32 param1) {} +void ActorRefill::vfunc_20(bool param1) {} +void ActorRefill::func_ov014_02135474() {} +ActorRefillBombs::ActorRefillBombs() {} +ActorRefillBombs::~ActorRefillBombs() {} +unk32 ActorRefillBombs::vfunc_b4() {} +ActorRefillBombchus::ActorRefillBombchus() {} +ActorRefillBombchus::~ActorRefillBombchus() {} +unk32 ActorRefillBombchus::vfunc_b4() {} +ActorRefillArrows::ActorRefillArrows() {} +ActorRefillArrows::~ActorRefillArrows() {} +unk32 ActorRefillArrows::vfunc_b4() {} +ActorRefillTime::ActorRefillTime() {} +ActorRefillTime::~ActorRefillTime() {} +bool ActorRefillTime::vfunc_08() {} +unk32 ActorRefillTime::vfunc_b4() {} +ActorLSTM::ActorLSTM() {} +ActorLSTM::~ActorLSTM() {} +bool ActorLSTM::vfunc_08() {} +unk32 ActorLSTM::vfunc_b4() {}