summaryrefslogtreecommitdiff
path: root/data/maps/Route110/scripts.inc
diff options
context:
space:
mode:
authorhuderlem <huderlem@gmail.com>2019-12-28 12:06:35 -0600
committerGitHub <noreply@github.com>2019-12-28 12:06:35 -0600
commit3b05398975895881a123cb30e28119dedf1f2c69 (patch)
tree5bf4c4f09fcb761eae756a147364d4830e45ce9f /data/maps/Route110/scripts.inc
parent8d64bc9df837021584b1d1c34796a8b8290246d7 (diff)
parent31b4656324db19dd08f65192f4a9b44094a23153 (diff)
Merge pull request #945 from Fontbane/patch-5
Give rival and Maxie parties better names
Diffstat (limited to 'data/maps/Route110/scripts.inc')
-rw-r--r--data/maps/Route110/scripts.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
index bccc903f1..be1931d19 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -421,17 +421,17 @@ Route110_EventScript_MayBattle:: @ 81EF7EB
end
Route110_EventScript_MayBattleTreecko:: @ 81EF81A
- trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_MayDefeated
+ trainerbattle_no_intro TRAINER_MAY_ROUTE_110_TREECKO, Route110_Text_MayDefeated
goto Route110_EventScript_MayDefeated
end
Route110_EventScript_MayBattleTorchic:: @ 81EF82A
- trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_MayDefeated
+ trainerbattle_no_intro TRAINER_MAY_ROUTE_110_TORCHIC, Route110_Text_MayDefeated
goto Route110_EventScript_MayDefeated
end
Route110_EventScript_MayBattleMudkip:: @ 81EF83A
- trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_MayDefeated
+ trainerbattle_no_intro TRAINER_MAY_ROUTE_110_MUDKIP, Route110_Text_MayDefeated
goto Route110_EventScript_MayDefeated
end
@@ -451,17 +451,17 @@ Route110_EventScript_BrendanBattle:: @ 81EF865
end
Route110_EventScript_BrendanBattleTreecko:: @ 81EF894
- trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_BrendanDefeated
+ trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_TREECKO, Route110_Text_BrendanDefeated
goto Route110_EventScript_BrendanDefeated
end
Route110_EventScript_BrendanBattleTorchic:: @ 81EF8A4
- trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_BrendanDefeated
+ trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_TORCHIC, Route110_Text_BrendanDefeated
goto Route110_EventScript_BrendanDefeated
end
Route110_EventScript_BrendanBattleMudkip:: @ 81EF8B4
- trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_BrendanDefeated
+ trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_MUDKIP, Route110_Text_BrendanDefeated
goto Route110_EventScript_BrendanDefeated
end