diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-18 12:55:48 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-18 12:55:48 -0500 |
| commit | 75a32c9dc54e32dd8c87af98dd0d3def658f7b02 (patch) | |
| tree | e14c28dfd6de59cef7771ccb9d6ef239f8093023 /data/scripts/maps/Route121.inc | |
| parent | cfb0e233eebd172ce9131f4e4b940b18db6eb1d0 (diff) | |
| parent | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (diff) | |
Merge branch 'link' of github.com:pikalaxalt/pokeemerald into link
Diffstat (limited to 'data/scripts/maps/Route121.inc')
| -rw-r--r-- | data/scripts/maps/Route121.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 0d1f8863e..c813fe6ac 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -15,7 +15,7 @@ Route121_EventScript_1F5E0F:: @ 81F5E0F Route121_EventScript_1F5E18:: @ 81F5E18 lockall - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 applymovement 13, Route121_Movement_2725B8 waitmovement 0 msgbox Route121_Text_1F605A, 4 @@ -72,8 +72,8 @@ Route121_EventScript_1F5E74:: @ 81F5E74 Route121_EventScript_1F5E8B:: @ 81F5E8B trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 msgbox Route121_Text_29F21E, 4 release @@ -112,8 +112,8 @@ Route121_EventScript_1F5F1F:: @ 81F5F1F Route121_EventScript_1F5F3A:: @ 81F5F3A trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 msgbox Route121_Text_29F66F, 4 release @@ -157,8 +157,8 @@ Route121_EventScript_1F5FE1:: @ 81F5FE1 Route121_EventScript_1F5FF8:: @ 81F5FF8 trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 msgbox Route121_Text_29F7D4, 4 release |