diff options
| author | petrie911 <69443847+petrie911@users.noreply.github.com> | 2021-03-31 11:18:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 12:18:31 -0400 |
| commit | 9b4482314a1dbbaf8ac354f587db45ee8697d431 (patch) | |
| tree | 8cac42b160f39a2ff6fd29f6a1948441e6c154ae /src/code/z_parameter.c | |
| parent | 28cfd82a4f692cdeb1e66c2df980da07e6b41e2d (diff) | |
OnePointDemo OK (#719)
* matches
* more matches
* progress?
* it's time
* so close
* organize declarations
* docs
* more fixes
* more fixes
* fix stage 1
* more fixes
* first try
* demo ids in decimal
* final cleanup
* one more thing
* fixes
* more cleanup
* onepointcs
* OnePointCutscene
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index c16001cf1..634009a4e 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -2082,7 +2082,7 @@ void Interface_SetNaviCall(GlobalContext* globalCtx, u16 naviCallState) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; if (((naviCallState == 0x1D) || (naviCallState == 0x1E)) && !interfaceCtx->naviCalling && - (globalCtx->csCtx.state == 0)) { + (globalCtx->csCtx.state == CS_STATE_IDLE)) { // clang-format off if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } @@ -2722,7 +2722,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { } if (interfaceCtx->naviCalling && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && - (globalCtx->csCtx.state == 0)) { + (globalCtx->csCtx.state == CS_STATE_IDLE)) { if (!sCUpInvisible) { // C-Up Button Texture, Color & Label (Navi Text) gDPPipeSync(OVERLAY_DISP++); @@ -4058,7 +4058,8 @@ void Interface_Update(GlobalContext* globalCtx) { if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && (msgCtx->msgMode == 0) && (globalCtx->sceneLoadFlag == 0) && (globalCtx->gameOverCtx.state == GAMEOVER_INACTIVE) && - (globalCtx->transitionMode == 0) && ((globalCtx->csCtx.state == 0) || !Player_InCsMode(globalCtx))) { + (globalCtx->transitionMode == 0) && + ((globalCtx->csCtx.state == CS_STATE_IDLE) || !Player_InCsMode(globalCtx))) { if ((gSaveContext.magicAcquired != 0) && (gSaveContext.magicLevel == 0)) { gSaveContext.magicLevel = gSaveContext.doubleMagic + 1; gSaveContext.unk_13F0 = 8; |