diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-05 11:36:47 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-01-05 11:36:47 -0800 |
| commit | aed64560bc222e4ea5ccec266c0d77859a05eaac (patch) | |
| tree | ecdbc1f85cf112f24207adb27b63b93d1e503edf /data/scripts/tv.inc | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
Add friendly macros for goto_if and call_if variants
Diffstat (limited to 'data/scripts/tv.inc')
| -rw-r--r-- | data/scripts/tv.inc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index cf82cf943..5a84a1b48 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -7,10 +7,8 @@ Event_TV:: @ 81A6E72 goto_if_eq EventScript_1A6F01 compare RESULT, 1 goto_if_eq EventScript_1A6F0B - checkflag FLAG_SYS_TV_START - goto_if 0, EventScript_1A6EF1 - checkflag FLAG_SYS_TV_WATCH - goto_if_eq EventScript_1A6EF1 + goto_if_unset FLAG_SYS_TV_START, EventScript_1A6EF1 + goto_if_set FLAG_SYS_TV_WATCH, EventScript_1A6EF1 specialvar RESULT, IsTVShowInSearchOfTrainersAiring compare RESULT, 1 goto_if_eq EventScript_1A6F66 @@ -27,7 +25,7 @@ EventScript_1A6EBB: copyvar VAR_SPECIAL_4, RESULT specialvar RESULT, GetTVShowType compare RESULT, 0 - goto_if 5, EventScript_1A6F21 + goto_if_ne EventScript_1A6F21 end EventScript_1A6EF1: @@ -60,7 +58,7 @@ EventScript_1A6F21: waitmessage waitbuttonpress compare RESULT, 1 - goto_if 5, EventScript_1A6F21 + goto_if_ne EventScript_1A6F21 goto EventScript_1A6F37 end |