fixing merge conflicts

1 files changed, 55 insertions, 55 deletions

diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc
index 4c7da3d0d..22c3fa391 100644
--- a/data/scripts/maps/Route103.inc
+++ b/data/scripts/maps/Route103.inc
@@ -9,24 +9,24 @@ Route103_MapScript1_14EB87:: @ 814EB87
 
 Route103_EventScript_14EB92:: @ 814EB92
 	lockall
-	checkgender
+	checkplayergender
 	compare RESULT, 0
-	jumpeq Route103_EventScript_14EBAB
+	goto_if_eq Route103_EventScript_14EBAB
 	compare RESULT, 1
-	jumpeq Route103_EventScript_14EC04
+	goto_if_eq Route103_EventScript_14EC04
 	end
 
 Route103_EventScript_14EBAB:: @ 814EBAB
 	msgbox Route103_Text_16D57A, 4
-	playmusic 415, 1
-	move 2, Route103_Movement_1A0839
-	waitmove 0
-	move 2, Route103_Movement_1A0833
-	waitmove 0
-	move 2, Route103_Movement_1A0835
-	waitmove 0
+	playbgm BGM_GIRL_SUP, TRUE
+	applymovement 2, Route103_Movement_1A0839
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0833
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0835
+	waitmovement 0
 	msgbox Route103_Text_16D5B6, 4
-	switch 0x4023
+	switch VAR_STARTER_MON
 	case 0, Route103_EventScript_14EC5D
 	case 1, Route103_EventScript_14EC6D
 	case 2, Route103_EventScript_14EC7D
@@ -34,15 +34,15 @@ Route103_EventScript_14EBAB:: @ 814EBAB
 
 Route103_EventScript_14EC04:: @ 814EC04
 	msgbox Route103_Text_16D762, 4
-	playmusic 421, 1
-	move 2, Route103_Movement_1A0839
-	waitmove 0
-	move 2, Route103_Movement_1A0833
-	waitmove 0
-	move 2, Route103_Movement_1A0835
-	waitmove 0
+	playbgm BGM_BOY_SUP, TRUE
+	applymovement 2, Route103_Movement_1A0839
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0833
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0835
+	waitmovement 0
 	msgbox Route103_Text_16D7A9, 4
-	switch 0x4023
+	switch VAR_STARTER_MON
 	case 0, Route103_EventScript_14EC8D
 	case 1, Route103_EventScript_14EC9D
 	case 2, Route103_EventScript_14ECAD
@@ -50,46 +50,46 @@ Route103_EventScript_14EC04:: @ 814EC04
 
 Route103_EventScript_14EC5D:: @ 814EC5D
 	trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B
-	jump Route103_EventScript_14ECBD
+	goto Route103_EventScript_14ECBD
 	end
 
 Route103_EventScript_14EC6D:: @ 814EC6D
 	trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B
-	jump Route103_EventScript_14ECBD
+	goto Route103_EventScript_14ECBD
 	end
 
 Route103_EventScript_14EC7D:: @ 814EC7D
 	trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B
-	jump Route103_EventScript_14ECBD
+	goto Route103_EventScript_14ECBD
 	end
 
 Route103_EventScript_14EC8D:: @ 814EC8D
 	trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836
-	jump Route103_EventScript_14ECCB
+	goto Route103_EventScript_14ECCB
 	end
 
 Route103_EventScript_14EC9D:: @ 814EC9D
 	trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836
-	jump Route103_EventScript_14ECCB
+	goto Route103_EventScript_14ECCB
 	end
 
 Route103_EventScript_14ECAD:: @ 814ECAD
 	trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836
-	jump Route103_EventScript_14ECCB
+	goto Route103_EventScript_14ECCB
 	end
 
 Route103_EventScript_14ECBD:: @ 814ECBD
 	msgbox Route103_Text_16D688, 4
-	jump Route103_EventScript_14ECD9
+	goto Route103_EventScript_14ECD9
 	end
 
 Route103_EventScript_14ECCB:: @ 814ECCB
 	msgbox Route103_Text_16D856, 4
-	jump Route103_EventScript_14ECD9
+	goto Route103_EventScript_14ECD9
 	end
 
 Route103_EventScript_14ECD9:: @ 814ECD9
-	closebutton
+	closemessage
 	switch FACING
 	case 1, Route103_EventScript_14ED29
 	case 2, Route103_EventScript_14ED0C
@@ -98,33 +98,33 @@ Route103_EventScript_14ECD9:: @ 814ECD9
 	end
 
 Route103_EventScript_14ED0C:: @ 814ED0C
-	move 2, Route103_Movement_14ED67
-	waitmove 0
-	playsfx 10
-	move 2, Route103_Movement_14ED6B
-	waitmove 0
-	jump Route103_EventScript_14ED46
+	applymovement 2, Route103_Movement_14ED67
+	waitmovement 0
+	playse SE_DANSA
+	applymovement 2, Route103_Movement_14ED6B
+	waitmovement 0
+	goto Route103_EventScript_14ED46
 	end
 
 Route103_EventScript_14ED29:: @ 814ED29
-	move 2, Route103_Movement_14ED71
-	waitmove 0
-	playsfx 10
-	move 2, Route103_Movement_14ED74
-	waitmove 0
-	jump Route103_EventScript_14ED46
+	applymovement 2, Route103_Movement_14ED71
+	waitmovement 0
+	playse SE_DANSA
+	applymovement 2, Route103_Movement_14ED74
+	waitmovement 0
+	goto Route103_EventScript_14ED46
 	end
 
 Route103_EventScript_14ED46:: @ 814ED46
-	disappear 2
-	setvar 0x4062, 1
-	setvar 0x4084, 4
-	clearflag 889
-	setflag 130
-	setvar 0x40c7, 1
-	clearflag 979
-	playmusicbattle 0
-	fadedefault
+	removeobject 2
+	setvar VAR_ROUTE103_STATE, 1
+	setvar VAR_BIRCH_LAB_STATE, 4
+	clearflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	setflag FLAG_DEFEATED_RIVAL_ROUTE103
+	setvar VAR_OLDALE_STATE, 1
+	clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	savebgm 0
+	fadedefaultbgm
 	releaseall
 	end
 
@@ -173,9 +173,9 @@ Route103_EventScript_14ED94:: @ 814ED94
 
 Route103_EventScript_14EDAB:: @ 814EDAB
 	trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC
-	specialval RESULT, sub_8082C68
+	specialvar RESULT, ShouldTryRematchBattle
 	compare RESULT, 1
-	jumpeq Route103_EventScript_14EDD6
+	goto_if_eq Route103_EventScript_14EDD6
 	msgbox Route103_Text_1B7E50, 6
 	end
 
@@ -186,9 +186,9 @@ Route103_EventScript_14EDD6:: @ 814EDD6
 
 Route103_EventScript_14EDF1:: @ 814EDF1
 	trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E
-	specialval RESULT, sub_8082C68
+	specialvar RESULT, ShouldTryRematchBattle
 	compare RESULT, 1
-	jumpeq Route103_EventScript_14EE1C
+	goto_if_eq Route103_EventScript_14EE1C
 	msgbox Route103_Text_1B7F40, 6
 	end
 
@@ -204,9 +204,9 @@ Route103_EventScript_14EE37:: @ 814EE37
 
 Route103_EventScript_14EE4E:: @ 814EE4E
 	trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC
-	specialval RESULT, sub_8082C68
+	specialvar RESULT, ShouldTryRematchBattle
 	compare RESULT, 1
-	jumpeq Route103_EventScript_14EE75
+	goto_if_eq Route103_EventScript_14EE75
 	msgbox Route103_Text_1B830D, 6
 	end