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/Route119/scripts.inc | |
| parent | ef67f2d33b45348d76d722f250cdbcc8485be264 (diff) | |
| parent | 8b1595ebc36a623240fa8dd509864f5400eed1f9 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/Route119/scripts.inc')
| -rw-r--r-- | data/maps/Route119/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 84486b0a0..947b8d184 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -86,17 +86,17 @@ Route119_EventScript_BattleMay:: @ 81F450B end Route119_EventScript_BattleMayTreecko:: @ 81F453A - trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_MayDefeat + trainerbattle_no_intro TRAINER_MAY_ROUTE_119_TREECKO, Route119_Text_MayDefeat goto Route119_EventScript_DefeatedMay end Route119_EventScript_BattleMayTorchic:: @ 81F454A - trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_MayDefeat + trainerbattle_no_intro TRAINER_MAY_ROUTE_119_TORCHIC, Route119_Text_MayDefeat goto Route119_EventScript_DefeatedMay end Route119_EventScript_BattleMayMudkip:: @ 81F455A - trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_MayDefeat + trainerbattle_no_intro TRAINER_MAY_ROUTE_119_MUDKIP, Route119_Text_MayDefeat goto Route119_EventScript_DefeatedMay end @@ -116,17 +116,17 @@ Route119_EventScript_BattleBrendan:: @ 81F4585 end Route119_EventScript_BattleBrendanTreecko:: @ 81F45B4 - trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_BrendanDefeat + trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_TREECKO, Route119_Text_BrendanDefeat goto Route119_EventScript_DefeatedBrendan end Route119_EventScript_BattleBrendanTorchic:: @ 81F45C4 - trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_BrendanDefeat + trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_TORCHIC, Route119_Text_BrendanDefeat goto Route119_EventScript_DefeatedBrendan end Route119_EventScript_BattleBrendanMudkip:: @ 81F45D4 - trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_BrendanDefeat + trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_MUDKIP, Route119_Text_BrendanDefeat goto Route119_EventScript_DefeatedBrendan end |