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/ThreeIsland_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/ThreeIsland_PokemonCenter_1F')
| -rw-r--r-- | data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 559b2a03c..15d568a6f 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 - map_script 3, ThreeIsland_PokemonCenter_1F_MapScript1_17183D - map_script 5, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -ThreeIsland_PokemonCenter_1F_MapScript1_17183D:: @ 817183D +ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D setrespawn SPAWN_THREE_ISLAND end ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A - msgbox gUnknown_81A303B, 2 + msgbox gUnknown_81A303B, MSGBOX_NPC end ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853 - msgbox gUnknown_81A30A3, 2 + msgbox gUnknown_81A30A3, MSGBOX_NPC end ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C - msgbox gUnknown_81A2FB5, 2 + msgbox gUnknown_81A2FB5, MSGBOX_NPC end |