From 410c5acc2d58bb486b280a3a249c5fba43e2942e Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 31 Mar 2024 09:59:07 +0200 Subject: `LinkState4` -> `LinkStateRoll` --- include/Player/LinkState4.hpp | 42 ------------------------------------ include/Player/LinkStateInteract.hpp | 4 ++-- include/Player/LinkStateRoll.hpp | 42 ++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 include/Player/LinkState4.hpp create mode 100644 include/Player/LinkStateRoll.hpp (limited to 'include/Player') diff --git a/include/Player/LinkState4.hpp b/include/Player/LinkState4.hpp deleted file mode 100644 index c8d9b42f..00000000 --- a/include/Player/LinkState4.hpp +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include "global.h" -#include "types.h" - -#include "Player/LinkStateBase.hpp" - -class LinkState4 : public LinkStateBase { -public: - /* 00 (base) */ - /* 0c */ unk16 mUnk_0c; - /* 0e */ unk8 mUnk_0a[2]; - /* 10 */ unk16 mUnk_10; - /* 12 */ s16 mUnk_12; - /* 14 */ s16 mUnk_14; - /* 16 */ u16 mUnk_16; - /* 18 */ unk8 mUnk_18[2]; - /* 1a */ unk16 mUnk_1a; - /* 1c */ unk8 mUnk_1c[4]; - /* 20 */ unk32 mUnk_20; - /* 24 */ unk8 mUnk_24[2]; - /* 26 */ unk16 mUnk_26; - /* 28 */ unk8 mUnk_28[4]; - /* 2c */ unk32 mUnk_2c[5]; - /* 40 */ unk32 mUnk_40; - /* 44 */ unk32 mUnk_44[0x10]; - /* 84 */ void *mUnk_84; - /* 88 */ unk32 mUnk_88; - /* 8c */ unk8 mUnk_8c[0xc]; - /* 98 */ - - /* 00 */ virtual void vfunc_00() override; - /* 04 */ virtual ~LinkState4() override; - /* 0c */ virtual LinkStateId GetId() override; - /* 10 */ virtual void CreateDebugHierarchy() override; - /* 14 */ virtual void OnStateEnter() override; - /* 18 */ virtual void OnStateLeave(s32 param1) override; - /* 1c */ virtual void vfunc_1c() override; - /* 20 */ virtual bool vfunc_20(s32 param1) override; - /* 24 */ virtual bool vfunc_24(s32 param1) override; - /* 44 */ -}; diff --git a/include/Player/LinkStateInteract.hpp b/include/Player/LinkStateInteract.hpp index 8fe67f6a..a994fb06 100644 --- a/include/Player/LinkStateInteract.hpp +++ b/include/Player/LinkStateInteract.hpp @@ -6,7 +6,7 @@ #include "lib/math.h" #include "Player/LinkStateBase.hpp" -#include "Player/LinkState4.hpp" +#include "Player/LinkStateRoll.hpp" #include "Actor/ActorManager.hpp" #include "Actor/Actor.hpp" @@ -37,7 +37,7 @@ public: s32 GetGrabActorId(); bool func_ov00_020aa818(); void func_ov00_020aa844(Actor *param1); - LinkState4* GetLinkState4(); + LinkStateRoll* GetLinkStateRoll(); void SetGrabActorVelocity(Vec3p *velocity); void SetBombVelocity(Vec3p *velocity); void func_ov00_020ab6c8(); diff --git a/include/Player/LinkStateRoll.hpp b/include/Player/LinkStateRoll.hpp new file mode 100644 index 00000000..61650f91 --- /dev/null +++ b/include/Player/LinkStateRoll.hpp @@ -0,0 +1,42 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include "Player/LinkStateBase.hpp" + +class LinkStateRoll : public LinkStateBase { +public: + /* 00 (base) */ + /* 0c */ unk16 mUnk_0c; + /* 0e */ unk8 mUnk_0a[2]; + /* 10 */ unk16 mUnk_10; + /* 12 */ s16 mUnk_12; + /* 14 */ s16 mUnk_14; + /* 16 */ u16 mUnk_16; + /* 18 */ unk8 mUnk_18[2]; + /* 1a */ unk16 mUnk_1a; + /* 1c */ unk8 mUnk_1c[4]; + /* 20 */ unk32 mUnk_20; + /* 24 */ unk8 mUnk_24[2]; + /* 26 */ unk16 mUnk_26; + /* 28 */ unk8 mUnk_28[4]; + /* 2c */ unk32 mUnk_2c[5]; + /* 40 */ unk32 mUnk_40; + /* 44 */ unk32 mUnk_44[0x10]; + /* 84 */ void *mUnk_84; + /* 88 */ unk32 mUnk_88; + /* 8c */ unk8 mUnk_8c[0xc]; + /* 98 */ + + /* 00 */ virtual void vfunc_00() override; + /* 04 */ virtual ~LinkStateRoll() override; + /* 0c */ virtual LinkStateId GetId() override; + /* 10 */ virtual void CreateDebugHierarchy() override; + /* 14 */ virtual void OnStateEnter() override; + /* 18 */ virtual void OnStateLeave(s32 param1) override; + /* 1c */ virtual void vfunc_1c() override; + /* 20 */ virtual bool vfunc_20(s32 param1) override; + /* 24 */ virtual bool vfunc_24(s32 param1) override; + /* 44 */ +}; -- cgit v1.2.3