Merge pull request #207 from GriffinRichards/sync-script

Sync scripts with pokeemerald

1 files changed, 72 insertions, 72 deletions

diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc
index 684c7506c..39eb3f0b4 100644
--- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc
+++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc
@@ -1,10 +1,10 @@
 FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82
-	map_script 3, FourIsland_IcefallCave_Back_MapScript1_163D88
+	map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition
 	.byte 0
 
-FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88
-	compare_var_to_value VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
-	call_if eq, EventScript_163D94
+FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88
+	compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
+	call_if_eq EventScript_163D94
 	end
 
 EventScript_163D94:: @ 8163D94
@@ -21,24 +21,24 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
 	msgbox gUnknown_817B0B9
 	closemessage
 	playse SE_PIN
-	applymovement 3, Movement_1A75DB
+	applymovement 3, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Movement_1A75ED
+	applymovement 3, Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	applymovement 3, Movement_1A75DD
+	applymovement 3, Movement_Delay48
 	waitmovement 0
 	textcolor 1
 	msgbox gUnknown_817B109
 	closemessage
-	applymovement 3, Movement_1A75EB
+	applymovement 3, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 18
-	applymovement 3, Movement_1A75ED
+	applymovement 3, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 35
 	applymovement 4, Movement_163F11
 	applymovement 3, Movement_163F18
-	applymovement 255, Movement_163EDD
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_163EDD
 	waitmovement 0
 	applymovement 2, Movement_163EE8
 	waitmovement 0
@@ -46,7 +46,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
 	textcolor 0
 	msgbox gUnknown_817B20B
 	setvar VAR_LAST_TALKED, 4
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_45, 0, Text_17B251
+	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, Text_17B251
 	applymovement 3, Movement_163F1B
 	waitmovement 0
 	textcolor 1
@@ -66,7 +66,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
 	msgbox gUnknown_817B399
 	closemessage
 	applymovement 3, Movement_163F1D
-	applymovement 255, Movement_163EE2
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_163EE2
 	applymovement 1, Movement_163EF0
 	applymovement 2, Movement_163EFA
 	applymovement 4, Movement_163F05
@@ -77,7 +77,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
 	delay 50
 	applymovement 3, Movement_163F23
 	waitmovement 0
-	applymovement 255, Movement_1A75E7
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	textcolor 1
 	msgbox gUnknown_817B457
@@ -88,105 +88,105 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
 	end
 
 Movement_163EDD:: @ 8163EDD
-	step_11
-	step_11
-	step_13
-	step_11
+	walk_up
+	walk_up
+	walk_right
+	walk_up
 	step_end
 
 Movement_163EE2:: @ 8163EE2
-	step_1c
-	step_2f
-	step_1c
-	step_1c
-	step_2d
+	delay_16
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 Movement_163EE8:: @ 8163EE8
-	step_25
+	walk_in_place_down
 	step_end
 
 gUnknown_163EEA:: @ 8163EEA
-	step_4c
-	step_13
-	step_4d
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
 	step_end
 
 Movement_163EEE:: @ 8163EEE
-	step_29
+	walk_in_place_fast_down
 	step_end
 
 Movement_163EF0:: @ 8163EF0
-	step_13
-	step_10
-	step_1d
-	step_1d
-	step_1d
-	step_1d
-	step_1d
-	step_1d
-	step_1d
+	walk_right
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
 	step_end
 
 Movement_163EFA:: @ 8163EFA
-	step_1c
-	step_12
-	step_10
-	step_1d
-	step_1d
-	step_1d
-	step_1d
-	step_1d
-	step_1d
-	step_1d
+	delay_16
+	walk_left
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
 	step_end
 
 Movement_163F05:: @ 8163F05
-	step_1c
-	step_10
-	step_1c
-	step_10
-	step_20
-	step_20
-	step_1d
-	step_1d
-	step_1d
-	step_1d
-	step_1d
+	delay_16
+	walk_down
+	delay_16
+	walk_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
 	step_end
 
 Movement_163F11:: @ 8163F11
-	step_1c
-	step_1b
-	step_30
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
 	step_end
 
 Movement_163F15:: @ 8163F15
-	step_12
-	step_12
+	walk_left
+	walk_left
 	step_end
 
 Movement_163F18:: @ 8163F18
-	step_12
-	step_11
+	walk_left
+	walk_up
 	step_end
 
 Movement_163F1B:: @ 8163F1B
-	step_26
+	walk_in_place_up
 	step_end
 
 Movement_163F1D:: @ 8163F1D
-	step_1b
-	step_30
-	step_1c
-	step_1c
-	step_2d
+	delay_8
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 Movement_163F23:: @ 8163F23
-	step_13
+	walk_right
 	step_end
 
 FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25
-	msgbox gUnknown_817B457, 2
+	msgbox gUnknown_817B457, MSGBOX_NPC
 	end