Merge pull request #207 from GriffinRichards/sync-script

Sync scripts with pokeemerald

1 files changed, 74 insertions, 74 deletions

diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc
index 82d75a686..02b06920a 100644
--- a/data/maps/SSAnne_2F_Corridor/scripts.inc
+++ b/data/maps/SSAnne_2F_Corridor/scripts.inc
@@ -3,7 +3,7 @@ SSAnne_2F_Corridor_MapScripts:: @ 81608DE
 
 SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF
 	lockall
-	setvar VAR_0x4001, 0
+	setvar VAR_TEMP_1, 0
 	goto EventScript_160903
 
 EventScript_1608EA:: @ 81608EA
@@ -11,7 +11,7 @@ EventScript_1608EA:: @ 81608EA
 
 SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB
 	lockall
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	goto EventScript_160903
 
 EventScript_1608F6:: @ 81608F6
@@ -19,7 +19,7 @@ EventScript_1608F6:: @ 81608F6
 
 SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7
 	lockall
-	setvar VAR_0x4001, 2
+	setvar VAR_TEMP_1, 2
 	goto EventScript_160903
 
 EventScript_160902:: @ 8160902
@@ -32,33 +32,33 @@ EventScript_160903:: @ 8160903
 	playbgm MUS_RIVAL1, 0
 	addobject 1
 	delay 10
-	applymovement 1, Movement_1A75ED
+	applymovement 1, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 20
-	compare_var_to_value VAR_0x4001, 0
-	call_if eq, EventScript_1609AD
-	compare_var_to_value VAR_0x4001, 1
-	call_if eq, EventScript_1609B8
-	compare_var_to_value VAR_0x4001, 2
-	call_if eq, EventScript_1609CA
+	compare VAR_TEMP_1, 0
+	call_if_eq EventScript_1609AD
+	compare VAR_TEMP_1, 1
+	call_if_eq EventScript_1609B8
+	compare VAR_TEMP_1, 2
+	call_if_eq EventScript_1609CA
 	msgbox gUnknown_8173035
 	setvar VAR_LAST_TALKED, 1
-	compare_var_to_value VAR_STARTER_MON, 2
-	call_if eq, EventScript_1609DC
-	compare_var_to_value VAR_STARTER_MON, 1
-	call_if eq, EventScript_1609E7
-	compare_var_to_value VAR_STARTER_MON, 0
-	call_if eq, EventScript_1609F2
+	compare VAR_STARTER_MON, 2
+	call_if_eq EventScript_1609DC
+	compare VAR_STARTER_MON, 1
+	call_if_eq EventScript_1609E7
+	compare VAR_STARTER_MON, 0
+	call_if_eq EventScript_1609F2
 	msgbox gUnknown_8173164
 	closemessage
 	delay 10
 	playbgm MUS_RIVAL2, 0
-	compare_var_to_value VAR_0x4001, 0
-	call_if eq, EventScript_1609FD
-	compare_var_to_value VAR_0x4001, 1
-	call_if eq, EventScript_160A08
-	compare_var_to_value VAR_0x4001, 2
-	call_if eq, EventScript_160A13
+	compare VAR_TEMP_1, 0
+	call_if_eq EventScript_1609FD
+	compare VAR_TEMP_1, 1
+	call_if_eq EventScript_160A08
+	compare VAR_TEMP_1, 2
+	call_if_eq EventScript_160A13
 	fadedefaultbgm
 	removeobject 1
 	setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1
@@ -72,26 +72,26 @@ EventScript_1609AD:: @ 81609AD
 
 EventScript_1609B8:: @ 81609B8
 	applymovement 1, Movement_160A2E
-	applymovement 255, Movement_160A24
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_160A24
 	waitmovement 0
 	return
 
 EventScript_1609CA:: @ 81609CA
-	applymovement 255, Movement_160A1E
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_160A1E
 	applymovement 1, Movement_160A34
 	waitmovement 0
 	return
 
 EventScript_1609DC:: @ 81609DC
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_SQUIRTLE, 0, Text_173110
+	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, Text_173110
 	return
 
 EventScript_1609E7:: @ 81609E7
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_BULBASAUR, 0, Text_173110
+	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, Text_173110
 	return
 
 EventScript_1609F2:: @ 81609F2
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_CHARMANDER, 0, Text_173110
+	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, Text_173110
 	return
 
 EventScript_1609FD:: @ 81609FD
@@ -110,75 +110,75 @@ EventScript_160A13:: @ 8160A13
 	return
 
 Movement_160A1E:: @ 8160A1E
-	step_1c
-	step_1c
-	step_1c
-	step_1c
-	step_2f
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 Movement_160A24:: @ 8160A24
-	step_1c
-	step_1c
-	step_1c
-	step_1c
-	step_2f
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 Movement_160A2A:: @ 8160A2A
-	step_10
-	step_10
-	step_10
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 Movement_160A2E:: @ 8160A2E
-	step_10
-	step_10
-	step_10
-	step_10
-	step_30
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 Movement_160A34:: @ 8160A34
-	step_10
-	step_10
-	step_10
-	step_10
-	step_13
-	step_1a
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	delay_4
 	step_end
 
 Movement_160A3B:: @ 8160A3B
-	step_13
-	step_10
-	step_10
-	step_10
-	step_10
-	step_10
-	step_10
-	step_10
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 Movement_160A44:: @ 8160A44
-	step_10
-	step_10
-	step_10
-	step_10
-	step_10
-	step_10
-	step_10
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 Movement_160A4C:: @ 8160A4C
-	step_10
-	step_10
-	step_10
-	step_10
-	step_10
-	step_10
-	step_10
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54
-	msgbox gUnknown_8172FC3, 2
+	msgbox gUnknown_8172FC3, MSGBOX_NPC
 	end