From 34c1b41780e3190dd4993e95a5450281e67cc04f Mon Sep 17 00:00:00 2001 From: Yanis <35189056+Yanis002@users.noreply.github.com> Date: Mon, 16 Dec 2024 13:12:44 +0100 Subject: [PATCH] Name cutscenes from the Master Sword and Deku Tree Mouth actors (#2364) * name cs from master sword & deku tree actors * review 1 * review 2 * choice declined/accepted renames * review 3 * updated comment about the ms reveal flag --- include/z64save.h | 2 +- src/code/z_demo.c | 4 ++-- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 16 ++++++++-------- .../z_bg_toki_swd_cutscene_data_1.c | 2 +- .../z_bg_toki_swd_cutscene_data_2.c | 2 +- .../z_bg_toki_swd_cutscene_data_3.c | 2 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 16 ++++++++-------- .../z_bg_treemouth_cutscene_data.c | 8 ++++---- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/z64save.h b/include/z64save.h index 30c51eeb02..ebdccf4505 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -524,7 +524,7 @@ typedef enum LinkAge { #define EVENTCHKINF_4C 0x4C #define EVENTCHKINF_CREATED_RAINBOW_BRIDGE 0x4D #define EVENTCHKINF_CAUGHT_BY_CASTLE_GUARDS 0x4E // set but unused -#define EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS 0x4F // Cutscene in Temple of Time as adult after pulling the Master Sword for the first time +#define EVENTCHKINF_REVEALED_MASTER_SWORD 0x4F // Cutscene in Temple of Time when entering the Master Sword chamber for the first time #define EVENTCHKINF_50 0x50 #define EVENTCHKINF_51 0x51 #define EVENTCHKINF_52 0x52 diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 60c81ed83c..6e35b82554 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -734,7 +734,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti case CS_DEST_TEMPLE_OF_TIME_AFTER_LIGHT_MEDALLION: #if DEBUG_FEATURES - SET_EVENTCHKINF(EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS); + SET_EVENTCHKINF(EVENTCHKINF_REVEALED_MASTER_SWORD); #endif play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_4; play->transitionTrigger = TRANS_TRIGGER_START; @@ -905,7 +905,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti case CS_DEST_TEMPLE_OF_TIME_AFTER_LIGHT_MEDALLION_ALT: #if DEBUG_FEATURES - SET_EVENTCHKINF(EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS); + SET_EVENTCHKINF(EVENTCHKINF_REVEALED_MASTER_SWORD); #endif play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_4; play->transitionTrigger = TRANS_TRIGGER_START; diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index 3b2d73b30e..8dcc00db30 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -18,9 +18,9 @@ void func_808BAF40(BgTokiSwd* this, PlayState* play); void func_808BB0AC(BgTokiSwd* this, PlayState* play); void func_808BB128(BgTokiSwd* this, PlayState* play); -extern CutsceneData D_808BB2F0[]; -extern CutsceneData D_808BB7A0[]; -extern CutsceneData D_808BBD90[]; +extern CutsceneData gPullMasterSwordCs[]; +extern CutsceneData gPlaceMasterSwordCs[]; +extern CutsceneData gRevealMasterSwordCs[]; ActorProfile Bg_Toki_Swd_Profile = { /**/ ACTOR_BG_TOKI_SWD, @@ -93,19 +93,19 @@ void BgTokiSwd_Destroy(Actor* thisx, PlayState* play) { } void func_808BAF40(BgTokiSwd* this, PlayState* play) { - if (!GET_EVENTCHKINF(EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS) && !IS_CUTSCENE_LAYER && + if (!GET_EVENTCHKINF(EVENTCHKINF_REVEALED_MASTER_SWORD) && !IS_CUTSCENE_LAYER && Actor_IsFacingAndNearPlayer(&this->actor, 800.0f, 0x7530) && !Play_InCsMode(play)) { - SET_EVENTCHKINF(EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS); - play->csCtx.script = D_808BBD90; + SET_EVENTCHKINF(EVENTCHKINF_REVEALED_MASTER_SWORD); + play->csCtx.script = gRevealMasterSwordCs; gSaveContext.cutsceneTrigger = 1; } if (!LINK_IS_ADULT || GET_EVENTCHKINF(EVENTCHKINF_55)) { if (Actor_HasParent(&this->actor, play)) { if (!LINK_IS_ADULT) { Item_Give(play, ITEM_SWORD_MASTER); - play->csCtx.script = D_808BB2F0; + play->csCtx.script = gPullMasterSwordCs; } else { - play->csCtx.script = D_808BB7A0; + play->csCtx.script = gPlaceMasterSwordCs; } SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_MASTER_SWORD); diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c index 4aa74671e5..f11a8a551a 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_808BB2F0[] = { +CutsceneData gPullMasterSwordCs[] = { CS_HEADER(9, 425), CS_PLAYER_CUE_LIST(1), CS_PLAYER_CUE(PLAYER_CUEID_12, 0, 256, 0x0000, 0x0000, 0x0000, 0, 54, 52, 0, 54, 52, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c index db8e429301..de138790da 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_808BB7A0[] = { +CutsceneData gPlaceMasterSwordCs[] = { CS_HEADER(9, 368), CS_CAM_EYE_SPLINE(0, 126), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1, 101, -110, 0x616D), diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c index 2517a4d96a..c6c5e4eb60 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_808BBD90[] = { +CutsceneData gRevealMasterSwordCs[] = { CS_HEADER(11, 3000), CS_UNK_DATA_LIST(0x00000021, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000), diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 06eefa51c0..d245fce7cd 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -25,10 +25,10 @@ void func_808BC8B8(BgTreemouth* this, PlayState* play); void func_808BC9EC(BgTreemouth* this, PlayState* play); void func_808BCAF0(BgTreemouth* this, PlayState* play); -extern CutsceneData D_808BCE20[]; -extern CutsceneData D_808BD2A0[]; -extern CutsceneData D_808BD520[]; -extern CutsceneData D_808BD790[]; +extern CutsceneData gDekuTreeMeetingCs[]; +extern CutsceneData gDekuTreeChoiceCs[]; +extern CutsceneData gDekuTreeMouthOpeningCs[]; +extern CutsceneData gDekuTreeAskAgainCs[]; ActorProfile Bg_Treemouth_Profile = { /**/ ACTOR_BG_TREEMOUTH, @@ -146,14 +146,14 @@ void func_808BC8B8(BgTreemouth* this, PlayState* play) { this->dyna.actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; if (this->dyna.actor.isLockedOn) { this->dyna.actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - play->csCtx.script = D_808BD2A0; + play->csCtx.script = gDekuTreeChoiceCs; gSaveContext.cutsceneTrigger = 1; BgTreemouth_SetupAction(this, func_808BC9EC); } } } else if (Actor_IsFacingAndNearPlayer(&this->dyna.actor, 1658.0f, 0x4E20)) { Flags_SetEventChkInf(EVENTCHKINF_0C); - play->csCtx.script = D_808BCE20; + play->csCtx.script = gDekuTreeMeetingCs; gSaveContext.cutsceneTrigger = 1; BgTreemouth_SetupAction(this, func_808BC9EC); } @@ -186,11 +186,11 @@ void func_808BC9EC(BgTreemouth* this, PlayState* play) { play->csCtx.state = CS_STATE_RUN; if (play->msgCtx.choiceIndex == 0) { - play->csCtx.script = D_808BD520; + play->csCtx.script = gDekuTreeMouthOpeningCs; Flags_SetEventChkInf(EVENTCHKINF_05); BgTreemouth_SetupAction(this, func_808BCAF0); } else { - play->csCtx.script = D_808BD790; + play->csCtx.script = gDekuTreeAskAgainCs; play->csCtx.curFrame = 0; BgTreemouth_SetupAction(this, func_808BC8B8); } diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c index 3c0b900b86..020b2972b1 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_808BCE20[] = { +CutsceneData gDekuTreeMeetingCs[] = { CS_HEADER(12, 3000), CS_UNK_DATA_LIST(0x00000015, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000), @@ -62,7 +62,7 @@ CutsceneData D_808BCE20[] = { CS_END_OF_SCRIPT(), }; -CutsceneData D_808BD2A0[] = { +CutsceneData gDekuTreeChoiceCs[] = { CS_HEADER(9, 3000), CS_UNK_DATA_LIST(0x00000015, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000), @@ -102,7 +102,7 @@ CutsceneData D_808BD2A0[] = { CS_END_OF_SCRIPT(), }; -CutsceneData D_808BD520[] = { +CutsceneData gDekuTreeMouthOpeningCs[] = { CS_HEADER(8, 3000), CS_UNK_DATA_LIST(0x00000015, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000), @@ -137,7 +137,7 @@ CutsceneData D_808BD520[] = { CS_END_OF_SCRIPT(), }; -CutsceneData D_808BD790[] = { +CutsceneData gDekuTreeAskAgainCs[] = { CS_HEADER(8, 3000), CS_UNK_DATA_LIST(0x00000015, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000),