izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

ENAN_GET_8000

Browse Source
This commit is contained in:
angie
2023-10-31 08:42:46 -03:00
parent 954beb6a84
commit 0914861a42
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_An/z_en_an.c
+1 -1
View File
@@ -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))) {
src/overlays/actors/ovl_En_An/z_en_an.h
+3 -1
View File
@@ -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)