diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-10-09 10:23:23 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-10-09 10:40:04 -0700 |
| commit | 72beb410f423cafd35989c0b8dd4c52860cf80f8 (patch) | |
| tree | 155aa1e2c39ebd504e095bc8c1dc218aad3acdc4 /data/scripts/maps/Route123.inc | |
| parent | a871ce87a74421df64a9ad381d37dc32ff9bdc6d (diff) | |
| parent | 3e03d362fae398fa56c4a6e45d7b999772d0803f (diff) | |
Merge remote-tracking branch 'upstream/master' into party_menu
Diffstat (limited to 'data/scripts/maps/Route123.inc')
| -rw-r--r-- | data/scripts/maps/Route123.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 891a395f0..14c5a2dba 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -10,15 +10,15 @@ Route123_EventScript_151C5D:: @ 8151C5D lock faceplayer checkflag 232 - jumpeq Route123_EventScript_151CAC + goto_if_eq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty compare RESULT, 0 - jumpeq Route123_EventScript_151CAA + goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 giveitem ITEM_TM19 compare RESULT, 0 - jumpeq Route123_EventScript_1A029B + goto_if_eq Route123_EventScript_1A029B setflag 232 msgbox Route123_Text_171E34, 4 release @@ -62,9 +62,9 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route123_EventScript_151D3D + goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 end @@ -75,9 +75,9 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route123_EventScript_151D7B + goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 end |