mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-08 22:35:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name some scene cutscenes 2 (Graveyard, Meadow and Lake Hylia) (#2339)

Browse Source 
* name cs from graveyard, meadow and lake hylia

* `gLakeHyliaWaterRaisingCs` --> `gLakeHyliaRestoredCs`
This commit is contained in:
Yanis
2024-12-15 01:53:28 +01:00
committed by GitHub
parent 0f27d2fea3
commit db8d351c5b
8 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_En_Sa/z_en_sa.c
+1 -1
View File
@@ -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;
}
src/overlays/actors/ovl_En_Xc/z_en_xc.c
+1 -1
View File
@@ -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);