diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2023-10-03 14:51:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-04 08:51:45 +1100 |
| commit | 9e72c240d9d1190244a0b0a1fd9de1cec4a82bcb (patch) | |
| tree | f019acc3050f3c50f9d1208b440f1c785442a92a /src/code/z_kaleido_setup.c | |
| parent | f08a69a2cbded60798101e87797cc7a691ff5749 (diff) | |
Z_message (2 NON_MATCHINGS) (#1398)
* matched func_8014D62C
* matched func_8014D304
* matched func_80149048
* matched func_80159438 & func_8014CDF0
* matched Message_GetState
* matched func_80152CAC
* matched func_80149454
* matched func_801491DC
* matched func_80150A84
* matched func_801496C8
* matched func_80149C18
* func_8014995C progress
* matched 8014995C
* matched func_80153EF0
* fix MessageContext lottery guess array size to match func_801496C8
* matched 80148D64
* matched func_8014AAD0
* progress func_8014CFDC
* matched func_8014CFDC
* progress func_801514B0
* progress#2 func_801514B0
* matched func_801514B0
* progress func_8014C70C
* Progress on few functions
* fix some variables & func name
* change unk11F00 type and usages
* func_8014C70C matched
* match func_8015268c
* fix building
* format
* engi message WIP
* enums, cleanup
* missed one
* oops
* even more enums
* another oops
* func_8015E7EC NON_MATCHING
* cleanup Message_DrawTextCredits
* MSGMODE cleanup
* import sFontWidths
* Import z_message_nes data
* Message_DrawTextNES draft
* fix types in message_nes
* Message_DrawTextNES NON_EQUIVALENT
* Message_DrawTextNES improvement
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Import bss
* fixes
* Data clean up
* Delete Message_Decode m2c output
* Readd Message_Update data
* import data
* func declaration
* cleanup
* Language enum
* fix naming, some flags
* Update functions and variables related to the bombers notebook event queue.
* Update renamed variables.txt
* format
* attempt Message_DecodeCredits
* begin Message_DecodeNES
* decode cleanup
* incremental improvements on Message_DecodeNES
* oops
* more progress
* first attempt at Message_Decode
* cleanup Message_Decode
* Message_Decode progress
* good progress on decode loops
* more progress
* good Message_Decode progress, thank anon
* decode creep
* big improvements, thanks anon/hatal
* small nes improvement
* cleanup
* match Message_DrawTextDefault, big progress on Message_DrawTextNES
* namefixer for save structs
* Some cleanup/fix non-equivalencies in decodes
* cleanup
* Small cleanup
* func_80150A84
* TextBoxType enum usage
* Format
* match Message_DecodeCredit by Maide, small improvement in Message_DrawTextNES
* comments
* some docs
* cleanup, improve matches
* Some improvement
Co-Authored-By: Santiago <github-santaclose-noreplay@NA.com>
* Fixes
* Missed
* Match Message_DrawTextNES
* Move functions to z64message.h
* string macros
* Small cleanups
* 1 more small thing
* decompme scratches
* Cleanup
* Item enum
* PR
* SEGMENT_ROM_START
* PR
* format
* ocarina cleanup
---------
Co-authored-by: andzura <andzura@andzura.fr>
Co-authored-by: Angie <angheloalf95@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Zoey Zolotova <zoey.zolotova@gmail.com>
Co-authored-by: Santiago <github-santaclose-noreplay@NA.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 a08f2b56b..1b3aa49d7 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -93,7 +93,7 @@ void KaleidoSetup_Update(PlayState* play) { (play->gameOverCtx.state == GAMEOVER_INACTIVE)) { if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { if ((gSaveContext.save.cutsceneIndex < 0xFFF0) && (gSaveContext.nextCutsceneIndex < 0xFFF0)) { - if (!Play_InCsMode(play) || ((msgCtx->msgMode != 0) && (msgCtx->currentTextId == 0xFF))) { + if (!Play_InCsMode(play) || ((msgCtx->msgMode != MSGMODE_NONE) && (msgCtx->currentTextId == 0xFF))) { if ((play->unk_1887C < 2) && (gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) && (gSaveContext.magicState != MAGIC_STATE_FILL)) { if (!CHECK_EVENTINF(EVENTINF_17) && !(player->stateFlags1 & PLAYER_STATE1_20)) { |