diff options
Diffstat (limited to 'data/scripts/gabby_and_ty.inc')
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index e2f43b77e..5ddcf4a65 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -203,14 +203,13 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds compare FACING, 2 - call_if 1, Route111_EventScript_1AE5E0 + call_if_eq Route111_EventScript_1AE5E0 compare FACING, 1 - call_if 1, Route111_EventScript_1AE5EB + call_if_eq Route111_EventScript_1AE5EB compare FACING, 4 - call_if 1, Route111_EventScript_1AE5FD - checkflag FLAG_TEMP_1 - goto_if_eq Route111_EventScript_1AE73A - msgbox Route111_Text_1AC015, 5 + call_if_eq Route111_EventScript_1AE5FD + goto_if_set FLAG_TEMP_1, Route111_EventScript_1AE73A + msgbox Route111_Text_1AC015, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end @@ -237,13 +236,12 @@ Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds compare FACING, 2 - call_if 1, Route111_EventScript_1AE5E0 + call_if_eq Route111_EventScript_1AE5E0 compare FACING, 1 - call_if 1, Route111_EventScript_1AE5EB + call_if_eq Route111_EventScript_1AE5EB compare FACING, 4 - call_if 1, Route111_EventScript_1AE5FD - checkflag FLAG_TEMP_1 - goto_if_eq Route111_EventScript_1AE73A + call_if_eq Route111_EventScript_1AE5FD + goto_if_set FLAG_TEMP_1, Route111_EventScript_1AE73A specialvar RESULT, GabbyAndTyGetLastQuote compare RESULT, 0 goto_if_eq Route111_EventScript_1AE69F @@ -270,37 +268,37 @@ Route111_Movement_1AE69D:: @ 81AE69D step_end Route111_EventScript_1AE69F:: @ 81AE69F - msgbox Route111_Text_1AC60B, 5 + msgbox Route111_Text_1AC60B, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6AD:: @ 81AE6AD - msgbox Route111_Text_1AC3CF, 5 + msgbox Route111_Text_1AC3CF, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6BB:: @ 81AE6BB - msgbox Route111_Text_1AC18D, 5 + msgbox Route111_Text_1AC18D, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6C9:: @ 81AE6C9 - msgbox Route111_Text_1AC219, 5 + msgbox Route111_Text_1AC219, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6D7:: @ 81AE6D7 - msgbox Route111_Text_1AC2D6, 5 + msgbox Route111_Text_1AC2D6, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6E5:: @ 81AE6E5 - msgbox Route111_Text_1AC355, 5 + msgbox Route111_Text_1AC355, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6F3:: @ 81AE6F3 - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 setvar VAR_SPECIAL_4, 10 |