mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 14:36:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some variable names for hookshot and moved some values (#2900)

Browse Source 
* Some variable names for hookshot and moved some values

* Revert using data.inc file
This commit is contained in:
Sven Elmendorp
2025-12-02 01:36:09 +01:00
committed by GitHub
parent 6a5397e847
commit 737db261e9
3 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_alink.h
+5 -4
View File
@@ -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();
}