diff options
| author | Yanis <35189056+Yanis002@users.noreply.github.com> | 2024-12-13 02:21:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-12 20:21:49 -0500 |
| commit | 0fc36972fb3f18b49ba21771c78d2ca7fea66b20 (patch) | |
| tree | b857b5bf3aac37bc81df428c4505cb41548a9983 /src | |
| parent | c57dff4f78dbeba3defde8b9727628e3abb03c52 (diff) | |
Name Kokiri Forest cutscenes (and related ones) (#2338)
* named kokiri forest cutscenes (and related parts)
* added missing pal n64 names (and changes in code)
* removed unneeded comments
* add kokiri forest duplicates from spirit temple
* review 1
* review 2 (+ build fix)
Diffstat (limited to 'src')
| -rw-r--r-- | src/code/z_demo.c | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Sa/z_en_sa.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 7908c7cca..58a2b690a 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -111,7 +111,7 @@ EntranceCutscene sEntranceCutsceneTable[] = { { ENTR_SPIRIT_TEMPLE_BOSS_0, 0, EVENTCHKINF_C0, gSpiritBossNabooruKnuckleIntroCs }, { ENTR_GERUDOS_FORTRESS_17, 0, EVENTCHKINF_C7, gGerudoFortressFirstCaptureCs }, { ENTR_DEATH_MOUNTAIN_CRATER_1, 2, EVENTCHKINF_B9, gDeathMountainCraterIntroCs }, - { ENTR_KOKIRI_FOREST_12, 2, EVENTCHKINF_C6, gKokiriForestDekuSproutCs }, + { ENTR_KOKIRI_FOREST_12, 2, EVENTCHKINF_C6, gKokiriForestDekuSproutPart3Cs }, }; void* sCutscenesUnknownList[] = { 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 67076188b..44ff94350 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -503,7 +503,7 @@ void EnSa_Init(Actor* thisx, PlayState* play) { case 4: this->unk_210 = 0; this->actor.gravity = -1.0f; - play->csCtx.script = SEGMENTED_TO_VIRTUAL(gSpot04Cs_10E20); + play->csCtx.script = SEGMENTED_TO_VIRTUAL(gKokiriForestSariaGreetingCs); gSaveContext.cutsceneTrigger = 1; EnSa_ChangeAnim(this, ENSA_ANIM1_4); this->actionFunc = func_80AF68E4; |