diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /data/scripts/maps/Route113.inc | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'data/scripts/maps/Route113.inc')
| -rw-r--r-- | data/scripts/maps/Route113.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 7ee63e492..c1ce29b72 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -14,9 +14,9 @@ Route113_MapScript1_1F2161: @ 81F2161 Route113_EventScript_1F216A:: @ 81F216A getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4000, 19 + compare VAR_0x4000, 19 goto_if 0, Route113_EventScript_1F2189 - compare_var_to_value VAR_0x4000, 84 + compare VAR_0x4000, 84 goto_if 2, Route113_EventScript_1F2189 setweather 7 return @@ -60,8 +60,8 @@ Route113_EventScript_1F21D7:: @ 81F21D7 Route113_EventScript_1F21EE:: @ 81F21EE trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 msgbox Route113_Text_299F15, 4 release @@ -85,8 +85,8 @@ Route113_EventScript_1F2239:: @ 81F2239 Route113_EventScript_1F2250:: @ 81F2250 trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B msgbox Route113_Text_29A067, 4 release |