diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-23 11:17:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 11:17:30 -0600 |
| commit | 81b38c00e4933f2dea6fbd2e80ae13692a19fa66 (patch) | |
| tree | 3b33bed743d14b14e855dcb51ac6eb5bc8326a22 /data/scripts/gabby_and_ty.inc | |
| parent | e874267edb6617759e239da0fb5cb884867aec6d (diff) | |
| parent | 55005f1588fed924bb86c420458371bf99a88e0e (diff) | |
Merge pull request #466 from melthelesbian/compare_macros
improve compare macros
Diffstat (limited to 'data/scripts/gabby_and_ty.inc')
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index f95cfa0ab..39de44ba6 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -2,7 +2,7 @@ EventScript_28CCAA:: @ 828CCAA setvar VAR_0x8005, 8 special InterviewBefore compare VAR_RESULT, 1 - goto_eq EventScript_28CCC6 + goto_if_eq EventScript_28CCC6 setvar VAR_0x8005, 8 special InterviewAfter return @@ -215,13 +215,12 @@ Route111_EventScript_28CF56:: @ 828CF56 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 - call_if 1, Route111_EventScript_28CF94 + call_if_eq Route111_EventScript_28CF94 compare VAR_FACING, 1 - call_if 1, Route111_EventScript_28CF9F + call_if_eq Route111_EventScript_28CF9F compare VAR_FACING, 4 - call_if 1, Route111_EventScript_28CFB1 - checkflag FLAG_TEMP_1 - goto_eq Route111_EventScript_28D0EE + call_if_eq Route111_EventScript_28CFB1 + goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE msgbox Route111_Text_28B042, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end @@ -249,16 +248,15 @@ Route120_EventScript_28CFC3:: @ 828CFC3 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 - call_if 1, Route111_EventScript_28CF94 + call_if_eq Route111_EventScript_28CF94 compare VAR_FACING, 1 - call_if 1, Route111_EventScript_28CF9F + call_if_eq Route111_EventScript_28CF9F compare VAR_FACING, 4 - call_if 1, Route111_EventScript_28CFB1 - checkflag FLAG_TEMP_1 - goto_eq Route111_EventScript_28D0EE + call_if_eq Route111_EventScript_28CFB1 + goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE specialvar VAR_RESULT, GabbyAndTyGetLastQuote compare VAR_RESULT, 0 - goto_eq Route111_EventScript_28D053 + goto_if_eq Route111_EventScript_28D053 msgbox Route111_Text_28B137, MSGBOX_DEFAULT specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia switch VAR_RESULT @@ -313,14 +311,14 @@ Route111_EventScript_28D099:: @ 828D099 Route111_EventScript_28D0A7:: @ 828D0A7 compare VAR_RESULT, 0 - goto_eq Route111_EventScript_28D0E1 + goto_if_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B433, MSGBOX_DEFAULT setvar VAR_0x8004, 10 call Route111_EventScript_271E7C lock faceplayer compare VAR_RESULT, 0 - goto_eq Route111_EventScript_28D0E1 + goto_if_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B4AB, MSGBOX_DEFAULT special GabbyAndTyAfterInterview setflag FLAG_TEMP_1 |