fixing merge conflicts

1 files changed, 47 insertions, 47 deletions

diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 8462603a6..6840c45f4 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -8,63 +8,63 @@ Route101_MapScript1_14E92F:: @ 814E92F
 	end
 
 Route101_MapScript2_14E935:: @ 814E935
-	map_script_2 0x4060, 0, Route101_EventScript_14E93F
+	map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_14E93F
 	.2byte 0
 
 Route101_EventScript_14E93F:: @ 814E93F
-	setflag 0x4000
-	setvar 0x4060, 1
+	setflag FLAG_SPECIAL_FLAG_0
+	setvar VAR_ROUTE101_STATE, 1
 	end
 
 Route101_EventScript_14E948:: @ 814E948
 	lockall
-	playmusic 410, 1
+	playbgm BGM_EVENT0, TRUE
 	msgbox Route101_Text_16D10E, 4
-	closebutton
-	movesprite 2, 0, 15
-	movesprite 4, 0, 16
-	move 255, Route101_Movement_14EA2C
-	move 2, Route101_Movement_14EA50
-	move 4, Route101_Movement_14EA1F
-	waitmove 0
-	move 4, Route101_Movement_14EA00
-	move 2, Route101_Movement_14EA31
-	waitmove 0
-	move 2, Route101_Movement_1A0843
-	waitmove 0
-	move 4, Route101_Movement_14EA27
-	move 2, Route101_Movement_14EA58
-	waitmove 0
+	closemessage
+	setobjectxy 2, 0, 15
+	setobjectxy 4, 0, 16
+	applymovement 255, Route101_Movement_14EA2C
+	applymovement 2, Route101_Movement_14EA50
+	applymovement 4, Route101_Movement_14EA1F
+	waitmovement 0
+	applymovement 4, Route101_Movement_14EA00
+	applymovement 2, Route101_Movement_14EA31
+	waitmovement 0
+	applymovement 2, Route101_Movement_1A0843
+	waitmovement 0
+	applymovement 4, Route101_Movement_14EA27
+	applymovement 2, Route101_Movement_14EA58
+	waitmovement 0
 	msgbox Route101_Text_16D119, 4
-	closebutton
-	setvar 0x4060, 2
+	closemessage
+	setvar VAR_ROUTE101_STATE, 2
 	releaseall
 	end
 
 Route101_EventScript_14E9B8:: @ 814E9B8
 	lockall
 	msgbox Route101_Text_16D15E, 4
-	closebutton
-	move 255, Route101_Movement_14E9FA
-	waitmove 0
+	closemessage
+	applymovement 255, Route101_Movement_14E9FA
+	waitmovement 0
 	releaseall
 	end
 
 Route101_EventScript_14E9CE:: @ 814E9CE
 	lockall
 	msgbox Route101_Text_16D15E, 4
-	closebutton
-	move 255, Route101_Movement_14E9FC
-	waitmove 0
+	closemessage
+	applymovement 255, Route101_Movement_14E9FC
+	waitmovement 0
 	releaseall
 	end
 
 Route101_EventScript_14E9E4:: @ 814E9E4
 	lockall
 	msgbox Route101_Text_16D15E, 4
-	closebutton
-	move 255, Route101_Movement_14E9FE
-	waitmove 0
+	closemessage
+	applymovement 255, Route101_Movement_14E9FE
+	waitmovement 0
 	releaseall
 	end
 
@@ -217,26 +217,26 @@ Route101_EventScript_14EA76:: @ 814EA76
 Route101_EventScript_14EA7F:: @ 814EA7F
 	lock
 	faceplayer
-	setflag 2048
-	setflag 82
+	setflag FLAG_SYS_POKEMON_GET
+	setflag FLAG_RESCUED_BIRCH
 	fadescreen 1
-	disappear 4
-	movesprite 255, 6, 13
-	move 255, Route101_Movement_1A083F
-	waitmove 0
-	special ChooseStarter
+	removeobject 4
+	setobjectxy 255, 6, 13
+	applymovement 255, Route101_Movement_1A083F
+	waitmovement 0
+	special ScrSpecial_ChooseStarter
 	waitstate
-	move 2, Route101_Movement_14EAD7
-	waitmove 0
+	applymovement 2, Route101_Movement_14EAD7
+	waitmovement 0
 	msgbox Route101_Text_16D191, 4
-	special HealPlayerParty
-	setflag 720
-	clearflag 721
-	setflag 700
-	setvar 0x4084, 2
-	setvar 0x4060, 3
-	clearflag 0x4000
-	warp LittlerootTown_ProfessorBirchsLab, 255, 6, 5
+	special ScrSpecial_HealPlayerParty
+	setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA
+	clearflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_HIDE_BIRCH_STARTERS_BAG
+	setvar VAR_BIRCH_LAB_STATE, 2
+	setvar VAR_ROUTE101_STATE, 3
+	clearflag FLAG_SPECIAL_FLAG_0
+	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
 	waitstate
 	release
 	end