diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-09-24 14:28:51 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-09-24 14:28:51 -0500 |
| commit | 86e7bf1fd61b151011038cdb281db3de0a1d9e6a (patch) | |
| tree | 5a29fa240501cdf4046a4f97e1197cd8c52cf447 /data/scripts/maps/Route118.inc | |
| parent | ae5ec7f5b05218ba21c53ef632590a5243a7f647 (diff) | |
Replace more script commands and fix German build
Diffstat (limited to 'data/scripts/maps/Route118.inc')
| -rw-r--r-- | data/scripts/maps/Route118.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index a28352c94..7d4109f59 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -10,12 +10,12 @@ Route118_EventScript_150F34:: @ 8150F34 lock faceplayer checkflag 227 - jumpeq Route118_EventScript_150F89 + goto_if_eq Route118_EventScript_150F89 msgbox Route118_Text_170F12, 5 compare RESULT, 1 - jumpeq Route118_EventScript_150F5E + goto_if_eq Route118_EventScript_150F5E compare RESULT, 0 - jumpeq Route118_EventScript_150F7F + goto_if_eq Route118_EventScript_150F7F end Route118_EventScript_150F5E:: @ 8150F5E @@ -84,11 +84,11 @@ Route118_EventScript_151004:: @ 8151004 msgbox Route118_Text_170D66, 4 closebutton compare 0x8008, 0 - callif 1, Route118_EventScript_151048 + call_if 1, Route118_EventScript_151048 compare 0x8008, 1 - callif 1, Route118_EventScript_151053 + call_if 1, Route118_EventScript_151053 compare 0x8008, 2 - callif 1, Route118_EventScript_15105E + call_if 1, Route118_EventScript_15105E setvar 0x4071, 1 disappear 19 releaseall @@ -163,7 +163,7 @@ Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route118_EventScript_1510B6 + goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 end @@ -186,7 +186,7 @@ Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route118_EventScript_151122 + goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 end |