falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match func_80167DE4 (from debug)

This commit is contained in:
Derek Hensley 2022-08-17 21:19:40 -07:00
parent 628d39ea03
commit f5e71876ef
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -2603,7 +2603,7 @@ void Play_Init(GameState* gameState);
// void func_8016EA90(void);
// void func_8016F1A8(void);
// void func_8016F4EC(void);
void func_8016F5A8(PlayState* play, s8* pcParm2, Input* iParm3);
void func_8016F5A8(PlayState* play, HiresoStruct* arg1, Input* input);
void func_8016FC78(HiresoStruct* this);
void func_8016FC98(HiresoStruct* this);
void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg);

29
src/code/z_play.c
View File

@ -372,7 +372,34 @@ Input* D_801D0D60 = NULL;
#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/Play_Update.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_80167DE4.s")
void func_80167DE4(PlayState* play) {
if (D_801F6DFC == 0) {
if (play->pauseCtx.unk_1F0 != 0) {
D_801F6DFC = 1;
D_801F6D50.unk_00 = 0;
}
} else {
if (CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_L) ||
CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_B) ||
CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_START) ||
(gIrqMgrResetStatus != 0)) {
D_801F6DFC = 0;
play->pauseCtx.unk_1F0 = 0;
D_801F6D50.unk_00 = 0;
play->msgCtx.msgLength = 0;
play->msgCtx.msgMode = 0;
play->msgCtx.currentTextId = 0;
play->msgCtx.stateTimer = 0;
play_sound(NA_SE_SY_CANCEL);
}
}
if (D_801F6DFC != 0) {
func_8016F5A8(play, &D_801F6D50, play->state.input);
func_8015680C(play);
} else {
Play_Update(play);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_80167F0C.s")