From 79fdae13c84568d4964f87cc3bd76cbe5f16f97b Mon Sep 17 00:00:00 2001 From: Angie Date: Mon, 16 Oct 2023 23:41:47 -0300 Subject: [PATCH] Name the remaining weekeventregs from anju --- include/z64save.h | 4 ++-- src/overlays/actors/ovl_En_An/z_en_an.c | 8 ++++---- src/overlays/actors/ovl_En_Pm/z_en_pm.c | 2 +- tools/weekeventregconvert.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/z64save.h b/include/z64save.h index eaff390f8..98c558415 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -1058,7 +1058,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_55_20 PACK_WEEKEVENTREG_FLAG(55, 0x20) +#define WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL PACK_WEEKEVENTREG_FLAG(55, 0x20) #define WEEKEVENTREG_55_40 PACK_WEEKEVENTREG_FLAG(55, 0x40) // Gyorg has been defeated @@ -1356,7 +1356,7 @@ typedef enum { #define WEEKEVENTREG_86_01 PACK_WEEKEVENTREG_FLAG(86, 0x01) #define WEEKEVENTREG_86_02 PACK_WEEKEVENTREG_FLAG(86, 0x02) #define WEEKEVENTREG_86_04 PACK_WEEKEVENTREG_FLAG(86, 0x04) -#define WEEKEVENTREG_86_08 PACK_WEEKEVENTREG_FLAG(86, 0x08) +#define WEEKEVENTREG_LISTENED_ANJU_POSTMAN_CONVERSATION PACK_WEEKEVENTREG_FLAG(86, 0x08) #define WEEKEVENTREG_86_10 PACK_WEEKEVENTREG_FLAG(86, 0x10) #define WEEKEVENTREG_86_20 PACK_WEEKEVENTREG_FLAG(86, 0x20) #define WEEKEVENTREG_86_40 PACK_WEEKEVENTREG_FLAG(86, 0x40) 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 687bc92e6..a446bdeba 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -1400,7 +1400,7 @@ s32 EnAn_MsgEvent_ReceiveLetterFromPostman(Actor* thisx, PlayState* play) { case 0x1: case 0x3: case 0x5: - if ((CHECK_WEEKEVENTREG(WEEKEVENTREG_86_08)) && (this->msgEventState == 3)) { + if ((CHECK_WEEKEVENTREG(WEEKEVENTREG_LISTENED_ANJU_POSTMAN_CONVERSATION)) && (this->msgEventState == 3)) { CutsceneManager_Stop(csId); } else if ((this->actor.child != NULL) && (this->actor.child->update != NULL)) { Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)), @@ -1558,7 +1558,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_55_20)) { + if ((Player_GetMask(play) == PLAYER_MASK_KAFEIS_MASK) || CHECK_WEEKEVENTREG(WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) { this->msgEventState++; goto label; } else { @@ -1762,7 +1762,7 @@ s32 EnAn_CheckTalk(EnAn* this, PlayState* play) { this->stateFlags |= ENAN_STATE_20; } - if ((this->scheduleResult == ANJU_SCH_LAUNDRY_POOL_SIT) && CHECK_WEEKEVENTREG(WEEKEVENTREG_55_20)) { + if ((this->scheduleResult == ANJU_SCH_LAUNDRY_POOL_SIT) && CHECK_WEEKEVENTREG(WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) { this->stateFlags &= ~ENAN_STATE_20; } @@ -2635,7 +2635,7 @@ s32 EnAn_ProcessSchedule_80B56880(EnAn* this, PlayState* play, ScheduleOutput* s this->stateFlags |= ENAN_STATE_UPDATE_EYES | ENAN_STATE_200; this->stateFlags |= ENAN_STATE_DRAW_UMBRELLA; - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_55_20)) { + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) { EnAn_ChangeAnim(this, play, ENAN_ANIM_UMBRELLA_CRYING); this->stateFlags |= ENAN_STATE_IGNORE_GRAVITY; this->actor.world.rot.y += 0x7FF8; diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c index 88942f2d0..8f2da4cd8 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -843,7 +843,7 @@ s32 func_80AF81E8(EnPm* this, PlayState* play) { case 1: case 3: case 5: - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_86_08) && (this->unk_378 == 3)) { + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_LISTENED_ANJU_POSTMAN_CONVERSATION) && (this->unk_378 == 3)) { CutsceneManager_Stop(csId); } else { Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)), &this->actor); diff --git a/tools/weekeventregconvert.py b/tools/weekeventregconvert.py index f0a19d0af..4b020fb4d 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_55_20", + (55 << 8) | 0x20: "WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL", (55 << 8) | 0x40: "WEEKEVENTREG_55_40", (55 << 8) | 0x80: "WEEKEVENTREG_CLEARED_GREAT_BAY_TEMPLE", (56 << 8) | 0x01: "WEEKEVENTREG_56_01", @@ -695,7 +695,7 @@ weekEventReg = { (86 << 8) | 0x01: "WEEKEVENTREG_86_01", (86 << 8) | 0x02: "WEEKEVENTREG_86_02", (86 << 8) | 0x04: "WEEKEVENTREG_86_04", - (86 << 8) | 0x08: "WEEKEVENTREG_86_08", + (86 << 8) | 0x08: "WEEKEVENTREG_LISTENED_ANJU_POSTMAN_CONVERSATION", (86 << 8) | 0x10: "WEEKEVENTREG_86_10", (86 << 8) | 0x20: "WEEKEVENTREG_86_20", (86 << 8) | 0x40: "WEEKEVENTREG_86_40",