diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-12 17:04:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 17:04:23 -0500 |
| commit | 92d99d4fd2e5579372b9f4cc39468000553ba3a8 (patch) | |
| tree | 4ff8e60d1ad6a25dad888a4e78011624b46ad9ec /data/maps/FiveIsland_PokemonCenter_1F | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
| parent | 0676e732869d0e62322b001cbab57b8500361005 (diff) | |
Merge pull request #207 from GriffinRichards/sync-script
Sync scripts with pokeemerald
Diffstat (limited to 'data/maps/FiveIsland_PokemonCenter_1F')
| -rw-r--r-- | data/maps/FiveIsland_PokemonCenter_1F/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index a16cb37d1..21148cede 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -1,23 +1,23 @@ FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 - map_script 3, FiveIsland_PokemonCenter_1F_MapScript1_171CFC - map_script 5, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC +FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC setrespawn SPAWN_FIVE_ISLAND end FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09 - msgbox gUnknown_81A3BBA, 2 + msgbox gUnknown_81A3BBA, MSGBOX_NPC end FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12 - msgbox gUnknown_81A3BFD, 2 + msgbox gUnknown_81A3BFD, MSGBOX_NPC end |