diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
| commit | 0f5b0005676cd3db623eb557f86cf92b1e020827 (patch) | |
| tree | 257857a4bed89a1d9410a9945efd63a76ea16582 /data/scripts/maps/Route114.inc | |
| parent | 28e98d9df7db41f9dcc813ad4e0b37c568833aee (diff) | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
Merge branch 'master' into decompile_easy_chat
Diffstat (limited to 'data/scripts/maps/Route114.inc')
| -rw-r--r-- | data/scripts/maps/Route114.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 302c162b0..f6bb6d8ba 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -87,7 +87,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 @@ -100,7 +100,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 |