hackern64/HackerSM64
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerSM64.git synced 2026-01-21 10:35:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #137 from Reonu/Reonu-patch-1

Browse Source 
Fix BUGFIX_DIALOG_TIME_STOP
This commit is contained in:
thecozies
2021-12-13 13:43:31 -06:00
committed by GitHub
parent 97eebacb1e d92ddeecd8
commit a2c4243600
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/object_helpers.c
View File

@@ -2024,7 +2024,7 @@ s32 cur_obj_update_dialog(s32 actionArg, s32 dialogFlags, s32 dialogID, UNUSED s
s32 dialogResponse = DIALOG_RESPONSE_NONE;
switch (o->oDialogState) {
#if BUGFIX_DIALOG_TIME_STOP
#ifdef BUGFIX_DIALOG_TIME_STOP
case DIALOG_STATUS_ENABLE_TIME_STOP:
// Patched :(
// Wait for Mario to be ready to speak, and then enable time stop
@@ -2109,7 +2109,7 @@ s32 cur_obj_update_dialog_with_cutscene(s32 actionArg, s32 dialogFlags, s32 cuts
s32 doneTurning = TRUE;
switch (o->oDialogState) {
#if BUGFIX_DIALOG_TIME_STOP
#ifdef BUGFIX_DIALOG_TIME_STOP
case DIALOG_STATUS_ENABLE_TIME_STOP:
// Wait for Mario to be ready to speak, and then enable time stop
if (mario_ready_to_speak() || gMarioState->action == ACT_READING_NPC_DIALOG) {