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/SevenIsland_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/SevenIsland_PokemonCenter_1F')
| -rw-r--r-- | data/maps/SevenIsland_PokemonCenter_1F/scripts.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 170459099..459806f32 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 - map_script 3, SevenIsland_PokemonCenter_1F_MapScript1_170B94 - map_script 5, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94 +SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94 setrespawn SPAWN_SEVEN_ISLAND end SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1 - msgbox gUnknown_81A0B98, 2 + msgbox gUnknown_81A0B98, MSGBOX_NPC end SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA - msgbox gUnknown_81A0C1F, 2 + msgbox gUnknown_81A0C1F, MSGBOX_NPC end SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3 - msgbox gUnknown_81A0CA5, 2 + msgbox gUnknown_81A0CA5, MSGBOX_NPC end |