diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-09-14 12:49:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-14 13:49:17 -0300 |
| commit | 6451bcf15855ff3c0cb6cd1c0d4a9e2d03f41fae (patch) | |
| tree | 18d9ee3fb1e64c8a58aa1ea8d909cc5174a777ae /src/code/z_kaleido_setup.c | |
| parent | 85e141128b6d2150d0729613779a394ed198509f (diff) | |
`z_parameter`: Magic (#934)
* Document magic
* Cleanup
* Few fixes
* PR Suggestions, More Lens Docs
* Few comments
* missed a spot
* Better macros/names
* Deactivate Lens
* more PR suggestions
* fix names
Diffstat (limited to 'src/code/z_kaleido_setup.c')
| -rw-r--r-- | src/code/z_kaleido_setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 625adf20f..fa490dbca 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -75,7 +75,8 @@ void KaleidoSetup_Update(PlayState* play) { if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { if ((gSaveContext.save.cutscene < 0xFFF0) && (gSaveContext.nextCutsceneIndex < 0xFFF0)) { if (!Play_InCsMode(play) || ((msgCtx->msgMode != 0) && (msgCtx->currentTextId == 0xFF))) { - if ((play->unk_1887C < 2) && (gSaveContext.unk_3F28 != 8) && (gSaveContext.unk_3F28 != 9)) { + if ((play->unk_1887C < 2) && (gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) && + (gSaveContext.magicState != MAGIC_STATE_FILL)) { if (!(gSaveContext.eventInf[1] & 0x80) && !(player->stateFlags1 & 0x20)) { if (!(play->actorCtx.unk5 & 2) && !(play->actorCtx.unk5 & 4)) { if ((play->actorCtx.unk268 == 0) && CHECK_BTN_ALL(input->press.button, BTN_START)) { |