falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed EVENTCHKINF_3A (#2325) 

* Renamed EVENTCHKINF_3A

* Remove redundant comment
This commit is contained in:
Jordan Longstaff 2024-12-07 15:46:47 -05:00 committed by GitHub
parent da7958db22
commit 4d902dcd95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/z64save.h
View File

@ -503,7 +503,7 @@ typedef enum LinkAge {
#define EVENTCHKINF_37 0x37 #define EVENTCHKINF_37 0x37
#define EVENTCHKINF_38 0x38 #define EVENTCHKINF_38 0x38
#define EVENTCHKINF_39 0x39 #define EVENTCHKINF_39 0x39
#define EVENTCHKINF_3A 0x3A #define EVENTCHKINF_OPENED_JABU_JABU 0x3A
#define EVENTCHKINF_3B 0x3B #define EVENTCHKINF_3B 0x3B
#define EVENTCHKINF_3C 0x3C #define EVENTCHKINF_3C 0x3C

4
src/overlays/actors/ovl_En_Jj/z_en_jj.c
View File

@ -96,7 +96,7 @@ void EnJj_Init(Actor* thisx, PlayState* play2) {
this->extraBlinkCounter = 0; this->extraBlinkCounter = 0;
this->extraBlinkTotal = 0; this->extraBlinkTotal = 0;
if (GET_EVENTCHKINF(EVENTCHKINF_3A)) { // Fish given if (GET_EVENTCHKINF(EVENTCHKINF_OPENED_JABU_JABU)) {
EnJj_SetupAction(this, EnJj_WaitToOpenMouth); EnJj_SetupAction(this, EnJj_WaitToOpenMouth);
} else { } else {
EnJj_SetupAction(this, EnJj_WaitForFish); EnJj_SetupAction(this, EnJj_WaitForFish);
@ -218,7 +218,7 @@ void EnJj_BeginCutscene(EnJj* this, PlayState* play) {
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
DynaPoly_DisableCollision(play, &play->colCtx.dyna, bodyCollisionActor->bgId); DynaPoly_DisableCollision(play, &play->colCtx.dyna, bodyCollisionActor->bgId);
Camera_SetFinishedFlag(GET_ACTIVE_CAM(play)); Camera_SetFinishedFlag(GET_ACTIVE_CAM(play));
SET_EVENTCHKINF(EVENTCHKINF_3A); SET_EVENTCHKINF(EVENTCHKINF_OPENED_JABU_JABU);
Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
} }