diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:07:29 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:07:29 -0500 |
| commit | 3a44b090d15d5317028827778caa4d768761dd2e (patch) | |
| tree | d0db5158c041178cdfcf9b82d3b444bb18e38737 /data/maps/BattleFrontier_PokemonCenter_1F | |
| parent | accea672f16cb74b0ec16e0e740cf9f67a651dfb (diff) | |
| parent | 231355f84dccd11329d81d074fa36135cfad4f94 (diff) | |
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'data/maps/BattleFrontier_PokemonCenter_1F')
| -rw-r--r-- | data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 42c6db053..c99a0de38 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 - map_script 3, BattleFrontier_PokemonCenter_1F_MapScript1_267904 - map_script 5, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 .byte 0 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 |