Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-11-24 06:29:59 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Match Message_Update (#1469)

Browse Source
This commit is contained in:
engineer124 2023-11-07 08:12:32 +11:00 committed by GitHub
parent 864748c6f9
commit 72bdfdee3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/code/z_message.c
View File

@ -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;