Merge pull request #207 from GriffinRichards/sync-script

Sync scripts with pokeemerald

2 files changed, 161 insertions, 172 deletions

diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
index a1d5b25a7..4f1a059ad 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -1,15 +1,14 @@
 OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8
-	map_script 3, OneIsland_PokemonCenter_1F_MapScript1_170C4E
-	map_script 5, OneIsland_PokemonCenter_1F_MapScript2_1BC05C
-	map_script 1, OneIsland_PokemonCenter_1F_MapScript3_170C0D
-	map_script 2, OneIsland_PokemonCenter_1F_MapScript4_170CA7
+	map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
+	map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_1F_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_1F_OnFrame
 	.byte 0
 
-OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D
-	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
-	call_if ge, EventScript_170C22
-	checkflag FLAG_SYS_CAN_LINK_WITH_RS
-	call_if TRUE, EventScript_170C36
+OneIsland_PokemonCenter_1F_OnLoad:: @ 8170C0D
+	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
+	call_if_ge EventScript_170C22
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_170C36
 	end
 
 EventScript_170C22:: @ 8170C22
@@ -26,14 +25,14 @@ EventScript_170C36:: @ 8170C36
 	setmetatile 15, 4, 859, 1
 	return
 
-OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E
+OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E
 	setrespawn SPAWN_ONE_ISLAND
-	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
-	call_if eq, EventScript_170C73
-	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0
-	call_if eq, EventScript_170C79
-	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
-	call_if eq, EventScript_170C90
+	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
+	call_if_eq EventScript_170C73
+	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0
+	call_if_eq EventScript_170C79
+	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
+	call_if_eq EventScript_170C90
 	end
 
 EventScript_170C73:: @ 8170C73
@@ -54,74 +53,71 @@ EventScript_170C90:: @ 8170C90
 	setobjectmovementtype 3, 9
 	return
 
-OneIsland_PokemonCenter_1F_MapScript4_170CA7:: @ 8170CA7
+OneIsland_PokemonCenter_1F_OnFrame:: @ 8170CA7
 	map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, EventScript_170CB1
 	.2byte 0
 
 EventScript_170CB1:: @ 8170CB1
 	lockall
 	textcolor 0
-	applymovement 255, Movement_170E7D
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_170E7D
 	applymovement 2, Movement_170E86
 	waitmovement 0
 	msgbox gUnknown_81A0CDE
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	playse SE_PIN
-	applymovement 3, Movement_1A75DB
+	applymovement 3, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Movement_1A75E7
+	applymovement 3, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	applymovement 3, Movement_1A75DD
+	applymovement 3, Movement_Delay48
 	waitmovement 0
 	msgbox gUnknown_81A0CF7
 	msgbox gUnknown_81A0D27
-	applymovement 2, Movement_1A75ED
-	applymovement 255, Movement_1A75E9
+	applymovement 2, Movement_WalkInPlaceFastestDown
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox gUnknown_81A0D72
-	applymovement 2, Movement_1A75EB
+	applymovement 2, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if TRUE, EventScript_170E34
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if FALSE, EventScript_170E3D
-	applymovement 3, Movement_1A75ED
+	call_if_set FLAG_SYS_GAME_CLEAR, EventScript_170E34
+	call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_170E3D
+	applymovement 3, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox gUnknown_81A0E17
 	msgbox gUnknown_81A0E90
-	applymovement 3, Movement_1A75E7
+	applymovement 3, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	msgbox gUnknown_81A0ECC
 	closemessage
-	applymovement 2, Movement_1A75E9
+	applymovement 2, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox gUnknown_81A0F40
-	applymovement 2, Movement_1A75ED
+	applymovement 2, Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	applymovement 255, Movement_1A75E9
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox gUnknown_81A0FB1
-	giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5
-	additem ITEM_METEORITE, 1
-	applymovement 3, Movement_1A75ED
+	msgreceiveditem gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5
+	additem ITEM_METEORITE
+	applymovement 3, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox gUnknown_81A1113
-	additem ITEM_TRI_PASS, 1
-	giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5
+	giveitem_msg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5
 	msgbox gUnknown_81A1150
-	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
-	call_if ge, EventScript_170E46
-	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
-	call_if lt, EventScript_170E58
+	compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
+	call_if_ge EventScript_170E46
+	compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
+	call_if_lt EventScript_170E58
 	setflag FLAG_SYS_SEVII_MAP_123
 	msgbox gUnknown_81A1230
 	closemessage
-	applymovement 2, Movement_1A75E9
+	applymovement 2, Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	applymovement 3, Movement_1A75E9
+	applymovement 3, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	setflag FLAG_SYS_PC_STORAGE_DISABLED
 	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
@@ -148,58 +144,56 @@ EventScript_170E46:: @ 8170E46
 EventScript_170E58:: @ 8170E58
 	setflag FLAG_HIDE_TOWN_MAP
 	setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
-	additem ITEM_TOWN_MAP, 1
-	giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5
+	giveitem_msg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5
 	return
 
 Movement_170E7D:: @ 8170E7D
-	step_11
-	step_11
-	step_13
-	step_13
-	step_13
-	step_13
-	step_13
-	step_2e
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 Movement_170E86:: @ 8170E86
-	step_11
-	step_13
-	step_13
-	step_13
-	step_13
-	step_13
-	step_11
-	step_30
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 Movement_170E8F:: @ 8170E8F
-	step_11
+	walk_up
 	step_end
 
 Movement_170E91:: @ 8170E91
-	step_12
-	step_30
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94
 	lock
 	faceplayer
-	call EventScript_1A6578
+	call EventScript_PkmnCenterNurse
 	release
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D
 	lock
-	checkflag FLAG_SEVII_DETOUR_FINISHED
-	goto_if TRUE, EventScript_170EB1
+	goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_170EB1
 	msgbox gUnknown_81A1266
 	release
 	end
 
 EventScript_170EB1:: @ 8170EB1
-	applymovement 2, Movement_1A75E1
+	applymovement 2, Movement_FacePlayer
 	waitmovement 0
 	msgbox gUnknown_81A128C
 	release
@@ -208,26 +202,24 @@ EventScript_170EB1:: @ 8170EB1
 OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
 	lock
 	faceplayer
-	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7
-	goto_if eq, EventScript_170F35
-	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
-	goto_if eq, EventScript_170F9B
-	checkflag FLAG_RECOVERED_SAPPHIRE
-	goto_if TRUE, EventScript_170FA5
-	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
-	goto_if eq, EventScript_17103A
-	checkflag FLAG_GOT_RUBY
-	goto_if TRUE, EventScript_171044
-	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
-	goto_if eq, EventScript_1710F2
+	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7
+	goto_if_eq EventScript_170F35
+	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
+	goto_if_eq EventScript_170F9B
+	goto_if_set FLAG_RECOVERED_SAPPHIRE, EventScript_170FA5
+	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
+	goto_if_eq EventScript_17103A
+	goto_if_set FLAG_GOT_RUBY, EventScript_171044
+	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
+	goto_if_eq EventScript_1710F2
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
-	compare_var_to_value VAR_RESULT, 1
-	goto_if eq, EventScript_1710FC
-	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
-	goto_if eq, EventScript_171134
+	compare VAR_RESULT, TRUE
+	goto_if_eq EventScript_1710FC
+	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
+	goto_if_eq EventScript_171134
 	msgbox gUnknown_81A1321
 	closemessage
-	applymovement 3, Movement_1A75E5
+	applymovement 3, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -235,10 +227,10 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
 EventScript_170F35:: @ 8170F35
 	msgbox gUnknown_81A1EBD
 	random 3
-	compare_var_to_value VAR_RESULT, 0
-	goto_if eq, EventScript_170F6D
-	compare_var_to_value VAR_RESULT, 1
-	goto_if eq, EventScript_170F84
+	compare VAR_RESULT, 0
+	goto_if_eq EventScript_170F6D
+	compare VAR_RESULT, 1
+	goto_if_eq EventScript_170F84
 	famechecker FAMECHECKER_BILL, 5
 	msgbox gUnknown_81A2076
 	release
@@ -289,7 +281,7 @@ EventScript_170FA5:: @ 8170FA5
 	call EventScript_170C36
 	special DrawWholeMapView
 	msgbox gUnknown_81A1D59
-	applymovement 3, Movement_1A75E1
+	applymovement 3, Movement_FacePlayer
 	waitmovement 0
 	msgbox gUnknown_81A1D7D
 	special sub_810B82C
@@ -321,18 +313,18 @@ EventScript_171044:: @ 8171044
 	call EventScript_170C22
 	special DrawWholeMapView
 	delay 30
-	applymovement 3, Movement_1A75E1
+	applymovement 3, Movement_FacePlayer
 	waitmovement 0
 	msgbox gUnknown_81A19AA, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
-	goto_if eq, EventScript_171099
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_171099
 	goto EventScript_1710B2
 	end
 
 EventScript_171099:: @ 8171099
 	msgbox gUnknown_81A1A08, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
-	goto_if eq, EventScript_171099
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_171099
 	goto EventScript_1710B2
 	end
 
@@ -341,7 +333,7 @@ EventScript_1710B2:: @ 81710B2
 	removeitem ITEM_RUBY, 1
 	removeitem ITEM_TRI_PASS, 1
 	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
-	additem ITEM_RAINBOW_PASS, 1
+	additem ITEM_RAINBOW_PASS
 	setflag FLAG_SYS_SEVII_MAP_4567
 	textcolor 3
 	playfanfare MUS_FAN5
@@ -363,10 +355,10 @@ EventScript_1710F2:: @ 81710F2
 
 EventScript_1710FC:: @ 81710FC
 	msgbox gUnknown_81A169B
-	applymovement 3, Movement_1A75E9
+	applymovement 3, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox gUnknown_81A1723
-	applymovement 3, Movement_1A75E1
+	applymovement 3, Movement_FacePlayer
 	waitmovement 0
 	msgbox gUnknown_81A17DF
 	setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 1
@@ -380,32 +372,31 @@ EventScript_171134:: @ 8171134
 	end
 
 Movement_17113E:: @ 817113E
-	step_26
-	step_1b
-	step_26
+	walk_in_place_up
+	delay_8
+	walk_in_place_up
 	step_end
 
 Movement_171142:: @ 8171142
-	step_2e
-	step_26
-	step_1c
-	step_26
-	step_26
+	walk_in_place_fastest_up
+	walk_in_place_up
+	delay_16
+	walk_in_place_up
+	walk_in_place_up
 	step_end
 
 OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148
-	msgbox gUnknown_81A20D5, 2
+	msgbox gUnknown_81A20D5, MSGBOX_NPC
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151
-	msgbox gUnknown_81A212D, 2
+	msgbox gUnknown_81A212D, MSGBOX_NPC
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A
 	lock
 	faceplayer
-	checkflag FLAG_SYS_CAN_LINK_WITH_RS
-	goto_if TRUE, EventScript_17116F
+	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_17116F
 	msgbox gUnknown_81A218D
 	release
 	end
@@ -417,10 +408,8 @@ EventScript_17116F:: @ 817116F
 
 OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179
 	lockall
-	checkflag FLAG_SYS_CAN_LINK_WITH_RS
-	goto_if TRUE, EventScript_1711A0
-	checkflag FLAG_SEVII_DETOUR_FINISHED
-	goto_if TRUE, EventScript_171196
+	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1711A0
+	goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_171196
 	msgbox gUnknown_81A223F
 	releaseall
 	end
@@ -437,74 +426,74 @@ EventScript_1711A0:: @ 81711A0
 
 OneIsland_PokemonCenter_1F_EventScript_1711AA:: @ 81711AA
 	lockall
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	goto EventScript_1711DA
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_1711B6:: @ 81711B6
 	lockall
-	setvar VAR_0x4001, 2
+	setvar VAR_TEMP_1, 2
 	goto EventScript_1711DA
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_1711C2:: @ 81711C2
 	lockall
-	setvar VAR_0x4001, 3
+	setvar VAR_TEMP_1, 3
 	goto EventScript_1711DA
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE
 	lockall
-	setvar VAR_0x4001, 4
+	setvar VAR_TEMP_1, 4
 	goto EventScript_1711DA
 	end
 
 EventScript_1711DA:: @ 81711DA
 	textcolor 0
 	playse SE_PIN
-	applymovement 2, Movement_1A75DB
+	applymovement 2, Movement_ExclamationMark
 	waitmovement 0
 	msgbox gUnknown_81A13B8
 	closemessage
-	compare_var_to_value VAR_0x4001, 1
-	call_if eq, EventScript_1712E4
-	compare_var_to_value VAR_0x4001, 2
-	call_if eq, EventScript_1712EF
-	compare_var_to_value VAR_0x4001, 3
-	call_if eq, EventScript_1712FA
-	compare_var_to_value VAR_0x4001, 4
-	call_if eq, EventScript_171305
+	compare VAR_TEMP_1, 1
+	call_if_eq EventScript_1712E4
+	compare VAR_TEMP_1, 2
+	call_if_eq EventScript_1712EF
+	compare VAR_TEMP_1, 3
+	call_if_eq EventScript_1712FA
+	compare VAR_TEMP_1, 4
+	call_if_eq EventScript_171305
 	delay 10
 	msgbox gUnknown_81A13CB
-	applymovement 255, Movement_1A75ED
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox gUnknown_81A1431
-	applymovement 2, Movement_1A75ED
+	applymovement 2, Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	applymovement 3, Movement_1A75E9
+	applymovement 3, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox gUnknown_81A1470
 	msgbox gUnknown_81A14E1
 	closemessage
-	applymovement 2, Movement_1A75E7
+	applymovement 2, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 10
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 15
 	msgbox gUnknown_81A14FB
 	closemessage
-	applymovement 2, Movement_1A75ED
+	applymovement 2, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 15
-	applymovement 3, Movement_1A75E7
+	applymovement 3, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	applymovement 255, Movement_1A75ED
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox gUnknown_81A1574
 	closemessage
 	delay 25
-	applymovement 255, Movement_171326
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_171326
 	applymovement 2, Movement_17132D
 	waitmovement 0
 	playse SE_KAIDAN
@@ -518,73 +507,73 @@ EventScript_1711DA:: @ 81711DA
 	end
 
 EventScript_1712E4:: @ 81712E4
-	applymovement 255, Movement_171310
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_171310
 	waitmovement 0
 	return
 
 EventScript_1712EF:: @ 81712EF
-	applymovement 255, Movement_171314
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_171314
 	waitmovement 0
 	return
 
 EventScript_1712FA:: @ 81712FA
-	applymovement 255, Movement_171316
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_171316
 	waitmovement 0
 	return
 
 EventScript_171305:: @ 8171305
-	applymovement 255, Movement_17131A
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_17131A
 	waitmovement 0
 	return
 
 Movement_171310:: @ 8171310
-	step_13
-	step_10
-	step_30
+	walk_right
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 Movement_171314:: @ 8171314
-	step_13
+	walk_right
 	step_end
 
 Movement_171316:: @ 8171316
-	step_13
-	step_11
-	step_30
+	walk_right
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 Movement_17131A:: @ 817131A
-	step_13
-	step_11
-	step_11
-	step_30
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 Movement_17131F:: @ 817131F
-	step_1c
-	step_1c
-	step_1a
-	step_2f
+	delay_16
+	delay_16
+	delay_4
+	walk_in_place_fastest_left
 	step_end
 
 Movement_171324:: @ 8171324
-	step_29
+	walk_in_place_fast_down
 	step_end
 
 Movement_171326:: @ 8171326
-	step_12
-	step_12
-	step_12
-	step_12
-	step_10
-	step_10
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 Movement_17132D:: @ 817132D
-	step_12
-	step_12
-	step_12
-	step_12
-	step_12
-	step_10
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
 	step_end
diff --git a/data/maps/OneIsland_PokemonCenter_1F/text.inc b/data/maps/OneIsland_PokemonCenter_1F/text.inc
index 3e9e5b521..e2d6c7fed 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/text.inc
+++ b/data/maps/OneIsland_PokemonCenter_1F/text.inc
@@ -108,7 +108,7 @@ gUnknown_81A1321:: @ 81A1321
     .string "I'm also sorry for being such a \n"
     .string "poor host on your visit here.$"
 
-Text_1A1390:: @ 81A1390
+Text_UsualPCServicesUnavailable:: @ 81A1390
     .string "The usual PC services aren't\n"
     .string "available…$"