diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-04-20 03:52:00 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-19 13:52:00 -0400 |
| commit | 9d25fad40743fe259867bc81c152591683c8fe73 (patch) | |
| tree | d580e92942742b3acff5067aedb1de1204c211eb /src/code/z_kaleido_setup.c | |
| parent | 543c38ae06d68ce2aa603144dbbe76262d00ddb6 (diff) | |
Cutscene Documentation (z_eventmgr.c OK) (#1164)
* begin cutscene docs
* more docs
* more docs
* z_eventmgr.c OK
Co-authored-by: Thar0 <Thar0@users.noreply.github.com>
* cutscene camera
* commands WIP
* more docs
* merge master
* csId, oof
* more cleanup
* more docs, csCam
* more cleanup
* more docs
* more
* cleanup functions.h
* better misc cmd docs
* apply discord discussions
* small adjustment
* more cleanup
* more docs
* more cleanup
* more cs cam docs
* small fix
* cmd cleanup
* small cleanup
* better match, thanks anon
* remove last return
* PR suggestions, small cleanup
* next PR review
* rm internal funcs from functions.h
* more PR
* add comment
* csCam interp typedef handler
* cleanup, scene cmd
* missed an enum use
* ActorCutscene -> CutsceneManager, PR Suggestions
* more PR Suggestions
* more actorCutscene cleanup
* R_USE_DEBUG_CUTSCENE
* more small docs
* move functions to cutscene.h
* PlayerCsId
* fix bss
* missed some function headers
* more scene cleanup
* more scene cleanup
* missed one
* CS_SPAWN_FLAGS
* wrong usage of macro
* more cleanup
* name last cs transition types
* IsNext bool
* update namefixer
* fix namefixer
* more cleanup
* add comment
* fixed enums for motion blur
* consistent cutscene lists
* cutscene entry func consistent
* PR Suggestion
* fig review
* fix additionalCsId name in actor
* more pr review
* bss
---------
Co-authored-by: Thar0 <Thar0@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Diffstat (limited to 'src/code/z_kaleido_setup.c')
| -rw-r--r-- | src/code/z_kaleido_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index f873ea8ff..148aad84e 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -92,7 +92,7 @@ void KaleidoSetup_Update(PlayState* play) { if ((pauseCtx->state == PAUSE_STATE_OFF) && (pauseCtx->debugEditor == DEBUG_EDITOR_NONE) && (play->gameOverCtx.state == GAMEOVER_INACTIVE)) { if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { - if ((gSaveContext.save.cutscene < 0xFFF0) && (gSaveContext.nextCutsceneIndex < 0xFFF0)) { + if ((gSaveContext.save.cutsceneIndex < 0xFFF0) && (gSaveContext.nextCutsceneIndex < 0xFFF0)) { if (!Play_InCsMode(play) || ((msgCtx->msgMode != 0) && (msgCtx->currentTextId == 0xFF))) { if ((play->unk_1887C < 2) && (gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) && (gSaveContext.magicState != MAGIC_STATE_FILL)) { |