diff options
| author | yenatch <yenatch@gmail.com> | 2017-10-08 23:54:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-08 23:54:46 -0400 |
| commit | b0d49dbbfbfcf39c2a9f88572437b6af77c8f709 (patch) | |
| tree | be0dadd4cb3a6c36e27233836a6f104359d49949 /data/scripts/maps/Route125.inc | |
| parent | b21c159b08c57a948edb268ac9b9b5baf6b4332d (diff) | |
| parent | 3776a9fb4f0531535b0b5879dab7b3b6bd231736 (diff) | |
Merge branch 'master' into scaninc
Diffstat (limited to 'data/scripts/maps/Route125.inc')
| -rw-r--r-- | data/scripts/maps/Route125.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index a5d2457d5..489a7314b 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -4,7 +4,7 @@ Route125_MapScripts:: @ 8151F1E Route125_MapScript1_151F24:: @ 8151F24 checkflag 2090 - callif 1, Route125_EventScript_1A02C1 + call_if 1, Route125_EventScript_1A02C1 end Route125_EventScript_151F2E:: @ 8151F2E @@ -29,9 +29,9 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route125_EventScript_151FB1 + goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end |