diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-19 16:30:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 16:30:45 -0400 |
| commit | c2d95be156e6062a8170b2d2471b0183fb1d6949 (patch) | |
| tree | eeedb9c9b261f03e40a278c35029474f7f22af88 /data | |
| parent | 33ecfb46e498a8e6001ad59fb6ef1484534423e3 (diff) | |
| parent | 8e4b9876999cbe91088a38dea7406854adc33ffa (diff) | |
Merge pull request #1007 from GriffinRichards/fix-healloc
Revert more porymap-breaking changes from #968
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 333bffc37..95be20f75 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 .byte 0 EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F - setrespawn HEAL_LOCATION_EVER_GRANDE_CITY + setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1 call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott end diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index c69c28d8b..72c069243 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 .byte 0 EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD - setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_POKEMON_LEAGUE + setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2 setflag FLAG_LANDMARK_POKEMON_LEAGUE call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor end |