diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-11-07 08:12:32 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-07 08:12:32 +1100 |
| commit | 72bdfdee3f4862551863bfca5321cb7413050090 (patch) | |
| tree | df17053336507f431cf7442ae6bdadcc5a66ebb4 | |
| parent | 864748c6f96eed0e084a30df9d1f76918bb69415 (diff) | |
Match Message_Update (#1469)
| -rw-r--r-- | src/code/z_message.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/code/z_message.c b/src/code/z_message.c index 53f4cbdf7..3cc79e649 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -5211,10 +5211,6 @@ s16 D_801D0464[] = { 0x1B8E, }; -#ifdef NON_MATCHING -// Down to a single compiler-managed stack variable -// Also contains in-function data -// https://decomp.me/scratch/QcQ0a void Message_Update(PlayState* play) { static u8 D_801D0468 = 0; MessageContext* msgCtx = &play->msgCtx; @@ -5730,7 +5726,7 @@ void Message_Update(PlayState* play) { ((play->activeCamId == CAM_ID_MAIN) || ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF))) && (play->msgCtx.ocarinaMode == OCARINA_MODE_END)) { - if ((gSaveContext.prevHudVisibility == HUD_VISIBILITY_IDLE) || + if (((u32)gSaveContext.prevHudVisibility == HUD_VISIBILITY_IDLE) || (gSaveContext.prevHudVisibility == HUD_VISIBILITY_NONE) || (gSaveContext.prevHudVisibility == HUD_VISIBILITY_NONE_ALT)) { gSaveContext.prevHudVisibility = HUD_VISIBILITY_ALL; @@ -6001,10 +5997,6 @@ void Message_Update(PlayState* play) { break; } } -#else -u8 D_801D0468 = 0; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/Message_Update.s") -#endif void Message_SetTables(PlayState* play) { play->msgCtx.messageEntryTableNes = D_801C6B98; |