From b01b20697e11c6b9c3b285ac045f1d7f49da3122 Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Tue, 10 Dec 2024 11:00:18 -0500 Subject: [PATCH] Renamed EVENTCHKINF_3C (#2324) * Renamed EVENTCHKINF_3C * Renamed to Nabooru Knuckle * Format for Jenkins --- include/z64save.h | 2 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/z64save.h b/include/z64save.h index a83b04639a..d8c2facbea 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -505,7 +505,7 @@ typedef enum LinkAge { #define EVENTCHKINF_39 0x39 #define EVENTCHKINF_OPENED_JABU_JABU 0x3A #define EVENTCHKINF_3B 0x3B -#define EVENTCHKINF_3C 0x3C +#define EVENTCHKINF_DEFEATED_NABOORU_KNUCKLE 0x3C // 0x40 #define EVENTCHKINF_40_INDEX 4 diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 223b2a515c..47b89c6fbf 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -1528,7 +1528,7 @@ void EnIk_StartDefeatCutscene(Actor* thisx, PlayState* play) { Cutscene_SetScript(play, gSpiritBossNabooruKnuckleDefeatCs); gSaveContext.cutsceneTrigger = 1; Actor_SetScale(&this->actor, 0.01f); - SET_EVENTCHKINF(EVENTCHKINF_3C); + SET_EVENTCHKINF(EVENTCHKINF_DEFEATED_NABOORU_KNUCKLE); EnIk_SetupCsAction3(this, play); } } @@ -1537,7 +1537,8 @@ void EnIk_Init(Actor* thisx, PlayState* play) { EnIk* this = (EnIk*)thisx; s32 upperParams = IK_GET_UPPER_PARAMS(&this->actor); - if (((IK_GET_ARMOR_TYPE(&this->actor) == IK_TYPE_NABOORU) && GET_EVENTCHKINF(EVENTCHKINF_3C)) || + if (((IK_GET_ARMOR_TYPE(&this->actor) == IK_TYPE_NABOORU) && + GET_EVENTCHKINF(EVENTCHKINF_DEFEATED_NABOORU_KNUCKLE)) || (upperParams != 0 && Flags_GetSwitch(play, upperParams >> 8))) { Actor_Kill(&this->actor); } else {