diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:00:47 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:14:15 -0700 |
| commit | 415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch) | |
| tree | 8793240342d37104610f34756f6fee9db706ee8f /data/scripts/maps/Route102.inc | |
| parent | ae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff) | |
| parent | 1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff) | |
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'data/scripts/maps/Route102.inc')
| -rw-r--r-- | data/scripts/maps/Route102.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index b0a714763..95a0a4a1f 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -19,9 +19,9 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route102_EventScript_14EB25 + goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 end |