diff options
| author | Sven Elmendorp <31472764+oga-sven@users.noreply.github.com> | 2025-12-02 01:36:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-01 16:36:09 -0800 |
| commit | 737db261e90ce8d501eb84f864b906c2f940d32e (patch) | |
| tree | a73c50df182d19994252ec9c82f67e87438026f2 /include | |
| parent | 6a5397e847ecb16a607a58daa51c8e20cc1b5fd1 (diff) | |
Some variable names for hookshot and moved some values (#2900)
* Some variable names for hookshot and moved some values
* Revert using data.inc file
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_alink.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index 888e8a899c..4677b0b5b5 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -13,6 +13,7 @@ #include "d/d_save.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" +#include "res/Object/AlAnm.h" class J2DAnmColorKey; class J2DAnmTransformKey; @@ -35,7 +36,7 @@ public: void initFrame() { field_0x4 = 0; - field_0x2c = 4.0f; + mLockCursorAngle = 4.0f; field_0x30 = 0.0f; } @@ -56,7 +57,7 @@ private: /* 0x20 */ J2DAnmTevRegKey* field_0x20; /* 0x24 */ J2DAnmColorKey* field_0x24; /* 0x28 */ J2DAnmTransformKey* field_0x28; - /* 0x2C */ f32 field_0x2c; + /* 0x2C */ f32 mLockCursorAngle; /* 0x30 */ f32 field_0x30; /* 0x34 */ f32 mPosX; /* 0x38 */ f32 mPosY; @@ -6708,8 +6709,8 @@ public: bool checkHorseTurnLAnime() const { return checkUpperAnime(0x24C); } bool checkHorseTurnRAnime() const { return checkUpperAnime(0x24D); } bool checkHorseTurnAnime() const { return checkHorseTurnLAnime() || checkHorseTurnRAnime(); } - bool checkHookshotShootAnime() const { return checkUpperAnime(0x18C); } - bool checkHookshotReadyAnime() const { return checkUpperAnime(0x18D); } + bool checkHookshotShootAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_HSSHOOT_e); } + bool checkHookshotReadyAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_HSWAIT_e); } BOOL checkHookshotAnime() const { return checkHookshotReadyAnime() || checkHookshotShootAnime(); } |