diff options
| author | Yanis <35189056+Yanis002@users.noreply.github.com> | 2024-12-15 01:53:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-14 19:53:28 -0500 |
| commit | db8d351c5b7af29b938f6d51fd960ea1e2bd9db7 (patch) | |
| tree | 885f90718aeb8a9f351c750a1ff8bfe830d7d9ff /src | |
| parent | 0f27d2fea3b6257bcddfca0ec333453096ab2c77 (diff) | |
Name some scene cutscenes 2 (Graveyard, Meadow and Lake Hylia) (#2339)
* name cs from graveyard, meadow and lake hylia
* `gLakeHyliaWaterRaisingCs` --> `gLakeHyliaRestoredCs`
Diffstat (limited to 'src')
| -rw-r--r-- | src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c | 4 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Sa/z_en_sa.c | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Xc/z_en_xc.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 308098c18..324166d43 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -258,8 +258,8 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) { gSaveContext.cutsceneTrigger = 1; break; case 6: - play->csCtx.script = LINK_IS_ADULT ? SEGMENTED_TO_VIRTUAL(spot02_scene_Cs_003C80) - : SEGMENTED_TO_VIRTUAL(spot02_scene_Cs_005020); + play->csCtx.script = LINK_IS_ADULT ? SEGMENTED_TO_VIRTUAL(gGraveyardTombOpeningAdultCs) + : SEGMENTED_TO_VIRTUAL(gGraveyardTombOpeningChildCs); gSaveContext.cutsceneTrigger = 1; SET_EVENTCHKINF(EVENTCHKINF_1D); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 79cba6bbb..b2543c317 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -627,7 +627,7 @@ void func_80AF683C(EnSa* this, PlayState* play) { Player* player = GET_PLAYER(play); if (!(player->actor.world.pos.z >= -2220.0f) && !Play_InCsMode(play)) { - play->csCtx.script = SEGMENTED_TO_VIRTUAL(spot05_scene_Cs_005730); + play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMeadowSariasSongCs); gSaveContext.cutsceneTrigger = 1; this->actionFunc = func_80AF68E4; } diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 8a4b4be3f..b693f3070 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -305,7 +305,7 @@ s32 EnXc_MinuetCS(EnXc* this, PlayState* play) { if (!Play_InCsMode(play)) { s32 pad; - play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMinuetCs); + play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMeadowMinuetCs); gSaveContext.cutsceneTrigger = 1; SET_EVENTCHKINF(EVENTCHKINF_50); Item_Give(play, ITEM_SONG_MINUET); |