diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:51:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 05:51:49 -0500 |
| commit | 635267ce32bd696fe15391449efdf07fa35cf449 (patch) | |
| tree | 688ac2c6e0b8e135d8f3450b28b53e3c1c36638b /data/maps/Route103/scripts.inc | |
| parent | ef67f2d33b45348d76d722f250cdbcc8485be264 (diff) | |
| parent | 8b1595ebc36a623240fa8dd509864f5400eed1f9 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/Route103/scripts.inc')
| -rw-r--r-- | data/maps/Route103/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 7c578c5b7..34f832b1e 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -61,32 +61,32 @@ Route103_EventScript_RivalBrendan:: @ 81EC434 end Route103_EventScript_StartMayBattleTreecko:: @ 81EC48E - trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_MayDefeated + trainerbattle_no_intro TRAINER_MAY_ROUTE_103_TREECKO, Route103_Text_MayDefeated goto Route103_EventScript_AfterMayBattle end Route103_EventScript_StartMayBattleTorchic:: @ 81EC49E - trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_MayDefeated + trainerbattle_no_intro TRAINER_MAY_ROUTE_103_TORCHIC, Route103_Text_MayDefeated goto Route103_EventScript_AfterMayBattle end Route103_EventScript_StartMayBattleMudkip:: @ 81EC4AE - trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_MayDefeated + trainerbattle_no_intro TRAINER_MAY_ROUTE_103_MUDKIP, Route103_Text_MayDefeated goto Route103_EventScript_AfterMayBattle end Route103_EventScript_StartBrendanBattleTreecko:: @ 81EC4BE - trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_BrendanDefeated + trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_TREECKO, Route103_Text_BrendanDefeated goto Route103_EventScript_AfterBrendanBattle end Route103_EventScript_StartBrendanBattleTorchic:: @ 81EC4CE - trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_BrendanDefeated + trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_TORCHIC, Route103_Text_BrendanDefeated goto Route103_EventScript_AfterBrendanBattle end Route103_EventScript_StartBrendanBattleMudkip:: @ 81EC4DE - trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_BrendanDefeated + trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_MUDKIP, Route103_Text_BrendanDefeated goto Route103_EventScript_AfterBrendanBattle end |