diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 01:15:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 01:15:36 -0500 |
| commit | e5df61e362beaaab9ae4344f4f160397df9c54cc (patch) | |
| tree | 8bb86e5e523406b21daa08aff9bce080184fe31e /data/maps/Route110 | |
| parent | 017fa294b5c88ddd7513cb4976b5c29cad0b94a5 (diff) | |
| parent | 8b1595ebc36a623240fa8dd509864f5400eed1f9 (diff) | |
Merge branch 'master' into doc-dome
Diffstat (limited to 'data/maps/Route110')
| -rw-r--r-- | data/maps/Route110/scripts.inc | 12 |
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 |