diff options
Diffstat (limited to 'data/maps/SixIsland_PokemonCenter_1F/scripts.inc')
| -rw-r--r-- | data/maps/SixIsland_PokemonCenter_1F/scripts.inc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 1ad4df1ed..6bde430ab 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,39 +1,39 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A - map_script 3, SixIsland_PokemonCenter_1F_MapScript1_171D7A - map_script 5, SixIsland_PokemonCenter_1F_MapScript2_1BC05C - map_script 2, SixIsland_PokemonCenter_1F_MapScript3_171D8D + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_1F_OnFrame .byte 0 -SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A +SixIsland_PokemonCenter_1F_OnTransition:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND - compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 - call_if eq, EventScript_171D89 + compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 + call_if_eq EventScript_171D89 end EventScript_171D89:: @ 8171D89 clearflag FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL return -SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D +SixIsland_PokemonCenter_1F_OnFrame:: @ 8171D8D map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, EventScript_171D97 .2byte 0 EventScript_171D97:: @ 8171D97 lockall textcolor 0 - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 playbgm MUS_RIVAL1, 0 - applymovement 2, Movement_1A75DB + applymovement 2, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_1A75DD + applymovement 2, Movement_Delay48 waitmovement 0 delay 25 applymovement 2, Movement_171DF9 waitmovement 0 msgbox gUnknown_81A3F30 closemessage - applymovement 255, Movement_171E02 + applymovement OBJ_EVENT_ID_PLAYER, Movement_171E02 applymovement 2, Movement_171DFE waitmovement 0 fadedefaultbgm @@ -46,34 +46,34 @@ EventScript_171D97:: @ 8171D97 end Movement_171DF9:: @ 8171DF9 - step_13 - step_13 - step_10 - step_10 + walk_right + walk_right + walk_down + walk_down step_end Movement_171DFE:: @ 8171DFE - step_1c - step_1a - step_10 + delay_16 + delay_4 + walk_down step_end Movement_171E02:: @ 8171E02 - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end SixIsland_PokemonCenter_1F_EventScript_171E0E:: @ 8171E0E - msgbox gUnknown_81A3E02, 2 + msgbox gUnknown_81A3E02, MSGBOX_NPC end SixIsland_PokemonCenter_1F_EventScript_171E17:: @ 8171E17 - msgbox gUnknown_81A3E87, 2 + msgbox gUnknown_81A3E87, MSGBOX_NPC end |