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/Route109.inc | |
| parent | 28e98d9df7db41f9dcc813ad4e0b37c568833aee (diff) | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
Merge branch 'master' into decompile_easy_chat
Diffstat (limited to 'data/scripts/maps/Route109.inc')
| -rw-r--r-- | data/scripts/maps/Route109.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index a9fa7d906..28bf046a4 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -54,7 +54,7 @@ Route109_EventScript_14F548:: @ 814F548 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 @@ -396,7 +396,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 @@ -409,7 +409,7 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 |