diff options
Diffstat (limited to 'data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc')
| -rw-r--r-- | data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 640446bf0..626263f76 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,37 +1,37 @@ CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 - map_script 3, CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2 - map_script 5, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2 +CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2 setrespawn SPAWN_CINNABAR_ISLAND end CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF - msgbox gUnknown_819A5BE, 2 + msgbox gUnknown_819A5BE, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8 - msgbox gUnknown_819A4F8, 2 + msgbox gUnknown_819A4F8, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901 - msgbox gUnknown_819A6B1, 2 + msgbox gUnknown_819A6B1, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A lock faceplayer msgbox gUnknown_819A725, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E9A5 + compare VAR_RESULT, NO + goto_if_eq EventScript_16E9A5 msgbox gUnknown_819A785 closemessage playbgm MUS_ANNAI, 1 @@ -39,12 +39,12 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A setflag FLAG_SPECIAL_FLAG_0x4001 setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_16E96F - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_16E981 - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_16E993 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_16E96F + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_16E981 + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_16E993 removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 clearflag FLAG_HIDE_CINNABAR_BILL @@ -55,19 +55,19 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A EventScript_16E96F:: @ 816E96F applymovement 7, Movement_16E9AF - applymovement 255, Movement_16E9B9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9B9 waitmovement 0 return EventScript_16E981:: @ 816E981 applymovement 7, Movement_16E9C3 - applymovement 255, Movement_16E9CF + applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9CF waitmovement 0 return EventScript_16E993:: @ 816E993 applymovement 7, Movement_16E9AF - applymovement 255, Movement_16E9DE + applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9DE waitmovement 0 return @@ -77,68 +77,68 @@ EventScript_16E9A5:: @ 816E9A5 end Movement_16E9AF:: @ 816E9AF - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_1b - step_60 + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + delay_8 + set_invisible step_end Movement_16E9B9:: @ 816E9B9 - step_10 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_1c - step_10 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + delay_16 + walk_down step_end Movement_16E9C3:: @ 816E9C3 - step_11 - step_12 - step_12 - step_10 - step_12 - step_12 - step_10 - step_10 - step_10 - step_1b - step_60 + walk_up + walk_left + walk_left + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + delay_8 + set_invisible step_end Movement_16E9CF:: @ 816E9CF - step_1c - step_1c - step_1c - step_02 - step_1c - step_12 - step_12 - step_12 - step_10 - step_10 - step_1b - step_10 - step_1b - step_60 + delay_16 + delay_16 + delay_16 + face_left + delay_16 + walk_left + walk_left + walk_left + walk_down + walk_down + delay_8 + walk_down + delay_8 + set_invisible step_end Movement_16E9DE:: @ 816E9DE - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_1c - step_10 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + delay_16 + walk_down step_end |