mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-10 04:46:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

add debug functionality + close to linking hozelda (#2804)

Browse Source
This commit is contained in:
roeming
2025-11-14 19:10:46 -05:00
committed by GitHub
parent 7da5a0371a
commit bdb67c2a29
4 changed files with 98 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_hozelda.h
+27 -3
View File
@@ -21,7 +21,7 @@ public:
/* 80848D54 */ virtual ~daHoZelda_matAnm_c() {}
/* 80845EDC */ virtual void calc(J3DMaterial*) const;
static bool getEyeMoveFlg() { return mEyeMoveFlg; }
static u8 getEyeMoveFlg() { return mEyeMoveFlg; }
static void offEyeMoveFlg() { mEyeMoveFlg = false; }
static void onEyeMoveFlg() { mEyeMoveFlg = true; }
@@ -29,7 +29,7 @@ public:
static void setMorfFrame(u8 i_frame) { mMorfFrame = i_frame; }
static void decMorfFrame() { cLib_calcTimer<u8>(&mMorfFrame); }
static bool mEyeMoveFlg;
static u8 mEyeMoveFlg;
static u8 mMorfFrame;
/* 0x0F4 */ f32 field_0xf4;
@@ -38,10 +38,34 @@ public:
/* 0x100 */ f32 mNowOffsetY;
};
struct daHoZelda_hio_c1 {
/* 0x0 */ s16 bow_search_y_angle;
/* 0x2 */ s16 bow_start_angle;
/* 0x4 */ s16 bow_end_angle;
/* 0x6 */ s16 field_0x6;
/* 0x8 */ f32 bow_start_distance;
/* 0xC */ f32 bow_end_distance;
};
struct daHoZelda_hio_c0 {
static daHoZelda_hio_c1 const m;
};
class daHoZelda_hio_c : public JORReflexible {
public:
daHoZelda_hio_c() {}
daHoZelda_hio_c() {
#if DEBUG
mParameters = daHoZelda_hio_c0::m;
#endif
}
/* 0x4 */ s8 mID;
#if DEBUG
void genMessage(JORMContext*);
virtual ~daHoZelda_hio_c() {}
/* 0x8 */ daHoZelda_hio_c1 mParameters;
#endif
};
/**
include/d/actor/d_a_player.h
+1 -1
View File
@@ -935,7 +935,7 @@ public:
BOOL checkSpecialHorseRide() { return checkNoResetFlg2(daPy_FLG2(FLG2_HORSE_ZELDA | FLG2_UNK_1000000 | FLG2_BOAR_SINGLE_BATTLE)); }
BOOL checkBoardNoFootAngle() const { return checkResetFlg1(RFLG1_UNK_40); }
bool checkGrabThrow() const { return checkResetFlg0(RFLG0_GRAB_THROW); }
bool checkMidnaAtnPos() const { return checkNoResetFlg1(FLG1_MIDNA_ATN_POS); }
BOOL checkMidnaAtnPos() const { return checkNoResetFlg1(FLG1_MIDNA_ATN_POS); }
bool checkMidnaHairAtnPos() const { return checkNoResetFlg1(FLG1_MIDNA_HAIR_ATN_POS); }
bool checkAttentionLock() const { return checkResetFlg0(RFLG0_UNK_10000); }
BOOL checkFishingRodUseStart() const { return checkResetFlg1(RFLG1_UNK_80); }