diff --git a/include/z64save.h b/include/z64save.h index d56347ec9..ca61f48eb 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -1059,7 +1059,7 @@ typedef enum { #define WEEKEVENTREG_TALKED_PART_TIMER_AS_GORON PACK_WEEKEVENTREG_FLAG(55, 0x04) #define WEEKEVENTREG_TALKED_PART_TIMER_AS_ZORA PACK_WEEKEVENTREG_FLAG(55, 0x08) #define WEEKEVENTREG_TALKED_PART_TIMER_AS_DEKU PACK_WEEKEVENTREG_FLAG(55, 0x10) -#define WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL PACK_WEEKEVENTREG_FLAG(55, 0x20) +#define WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL PACK_WEEKEVENTREG_FLAG(55, 0x20) #define WEEKEVENTREG_55_40 PACK_WEEKEVENTREG_FLAG(55, 0x40) // Gyorg has been defeated 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 50acb5663..e8e0349b4 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -1197,6 +1197,9 @@ void EnAn_UpdateFace(EnAn* this) { this->eyeTexIndex = ENAN_EYES_COMFORT; } break; + + default: + break; } if (!skipBlink) { @@ -1572,7 +1575,7 @@ s32 EnAn_MsgEvent_LaundryPool(Actor* thisx, PlayState* play) { switch (this->msgEventState) { case 0x0: if ((Player_GetMask(play) == PLAYER_MASK_KAFEIS_MASK) || - CHECK_WEEKEVENTREG(WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) { + CHECK_WEEKEVENTREG(WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL)) { this->msgEventState++; goto label; } else { @@ -1774,7 +1777,7 @@ s32 EnAn_CheckTalk(EnAn* this, PlayState* play) { } if ((this->scheduleResult == ANJU_SCH_LAUNDRY_POOL_SIT) && - CHECK_WEEKEVENTREG(WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) { + CHECK_WEEKEVENTREG(WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL)) { this->stateFlags &= ~ENAN_STATE_ENGAGED; } @@ -2656,7 +2659,7 @@ s32 EnAn_ProcessSchedule_80B56880(EnAn* this, PlayState* play, ScheduleOutput* s this->stateFlags |= ENAN_STATE_UPDATE_EYES | ENAN_STATE_LOST_ATTENTION; this->stateFlags |= ENAN_STATE_DRAW_UMBRELLA; - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) { + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL)) { EnAn_ChangeAnim(this, play, ENAN_ANIM_UMBRELLA_CRY); this->stateFlags |= ENAN_STATE_IGNORE_GRAVITY; this->actor.world.rot.y += 0x7FF8; diff --git a/tools/weekeventregconvert.py b/tools/weekeventregconvert.py index 4b020fb4d..0d721654e 100755 --- a/tools/weekeventregconvert.py +++ b/tools/weekeventregconvert.py @@ -449,7 +449,7 @@ weekEventReg = { (55 << 8) | 0x04: "WEEKEVENTREG_TALKED_PART_TIMER_AS_GORON", (55 << 8) | 0x08: "WEEKEVENTREG_TALKED_PART_TIMER_AS_ZORA", (55 << 8) | 0x10: "WEEKEVENTREG_TALKED_PART_TIMER_AS_DEKU", - (55 << 8) | 0x20: "WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL", + (55 << 8) | 0x20: "WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL", (55 << 8) | 0x40: "WEEKEVENTREG_55_40", (55 << 8) | 0x80: "WEEKEVENTREG_CLEARED_GREAT_BAY_TEMPLE", (56 << 8) | 0x01: "WEEKEVENTREG_56_01",