diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:34:42 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:34:42 -0500 |
| commit | 72bb0daccbdcc4db701d05c10c8b968fe7b09c2a (patch) | |
| tree | c80c40148daa9b92dd39ba6a765b61c4fbf7214d /data/maps/FallarborTown_PokemonCenter_2F/scripts.inc | |
| parent | 6cb4c677cdf156d9d78f5f27bf3168882c1447ec (diff) | |
| parent | 231355f84dccd11329d81d074fa36135cfad4f94 (diff) | |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'data/maps/FallarborTown_PokemonCenter_2F/scripts.inc')
| -rw-r--r-- | data/maps/FallarborTown_PokemonCenter_2F/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc index 93482e860..8fce8e729 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB - map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, FallarborTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 |