diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index bedf65216..75f26c28a 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -3308,7 +3308,7 @@ void EnAn_Init(Actor* thisx, PlayState* play) { this->actor.params &= (s16)~ENAN_8000; } - temp_v1 = (this->actor.params & ENAN_8000) >> 0xF; + temp_v1 = ENAN_GET_8000(&this->actor) >> 0xF; watchedCouplesMaskCs = CHECK_WEEKEVENTREG(WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED); if ((!watchedCouplesMaskCs && (temp_v1 == 1)) || (watchedCouplesMaskCs && (temp_v1 == 0))) { diff --git a/src/overlays/actors/ovl_En_An/z_en_an.h b/src/overlays/actors/ovl_En_An/z_en_an.h index 5d523c8c3..86a357d66 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.h +++ b/src/overlays/actors/ovl_En_An/z_en_an.h @@ -10,9 +10,11 @@ typedef void (*EnAnActionFunc)(struct EnAn*, PlayState*); typedef void (*EnAnDialogueFunc)(struct EnAn*, PlayState*); typedef s32 (*MsgEventFunc)(Actor*, PlayState*); -#define ENAN_GET_PATH_INDEX(thisx) ((thisx)->params & 0xFF) #define ENAN_8000 0x8000 +#define ENAN_GET_PATH_INDEX(thisx) ((thisx)->params & 0xFF) +#define ENAN_GET_8000(thisx) ((thisx)->params & ENAN_8000) + #define ENAN_STATE_8 (1 << 3) // path related #define ENAN_STATE_REACHED_PATH_END (1 << 4) #define ENAN_STATE_ENGAGED (1 << 5)