summaryrefslogtreecommitdiff
path: root/src/code/z_play.c
diff options
context:
space:
mode:
authormzxrules <mzxrules@gmail.com>2024-12-17 10:51:56 -0500
committerGitHub <noreply@github.com>2024-12-17 10:51:56 -0500
commit1adf696588d41d2c3fee4cb4f25cfa4c7d27be19 (patch)
treea43f05e2785d2e745c7510a238520fd753c0ef36 /src/code/z_play.c
parent524597dc145ef1b685d490fea6fd59eb3fff62fc (diff)
Document z_horse.c and related actors (#2278)
* document z_horse.h * .bss * suggestions and more comments * bss * INGORACE -> INGO_RACE * format header macros * FIx incorrect type comparision * EnInMode -> EnInStartMode * R_EXITED_SCENE_RIDING_HORSE
Diffstat (limited to 'src/code/z_play.c')
-rw-r--r--src/code/z_play.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 29d692433..dc61e491c 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -489,7 +489,7 @@ void Play_Init(GameState* thisx) {
Environment_PlaySceneSequence(this);
gSaveContext.seqId = this->sceneSequences.seqId;
gSaveContext.natureAmbienceId = this->sceneSequences.natureAmbienceId;
- func_8002DF18(this, GET_PLAYER(this));
+ Actor_InitPlayerHorse(this, GET_PLAYER(this));
AnimTaskQueue_Update(this, &this->animTaskQueue);
gSaveContext.respawnFlag = 0;
@@ -1879,6 +1879,7 @@ void Play_LoadToLastEntrance(PlayState* this) {
(gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_12) ||
(gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_13) ||
(gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_15)) {
+ // Avoid re-triggering the hop over Lon Lon fence cutscenes
this->nextEntranceIndex = ENTR_HYRULE_FIELD_6;
#endif
} else {