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/RustboroCity | |
| parent | ef67f2d33b45348d76d722f250cdbcc8485be264 (diff) | |
| parent | 8b1595ebc36a623240fa8dd509864f5400eed1f9 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/RustboroCity')
| -rw-r--r-- | data/maps/RustboroCity/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 58c87bc05..c72a92f27 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -896,19 +896,19 @@ RustboroCity_EventScript_RestoreBgm:: @ 81E10D6 return RustboroCity_EventScript_BattleMayTreecko:: @ 81E10DB - trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_MayDefeat + trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TREECKO, RustboroCity_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_MayBrineyHint end RustboroCity_EventScript_BattleMayTorchic:: @ 81E10EE - trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_MayDefeat + trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TORCHIC, RustboroCity_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_MayBrineyHint end RustboroCity_EventScript_BattleMayMudkip:: @ 81E1101 - trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_MayDefeat + trainerbattle_no_intro TRAINER_MAY_RUSTBORO_MUDKIP, RustboroCity_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_MayBrineyHint end @@ -960,19 +960,19 @@ RustboroCity_EventScript_BrendanBrineyHint:: @ 81E11C0 end RustboroCity_EventScript_BattleBrendanTreecko:: @ 81E11D5 - trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_BrendanDefeat + trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TREECKO, RustboroCity_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_BrendanBrineyHint end RustboroCity_EventScript_BattleBrendanTorchic:: @ 81E11E8 - trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_BrendanDefeat + trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TORCHIC, RustboroCity_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_BrendanBrineyHint end RustboroCity_EventScript_BattleBrendanMudkip:: @ 81E11FB - trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_BrendanDefeat + trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_MUDKIP, RustboroCity_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_BrendanBrineyHint end |