fixing merge conflicts

1 files changed, 124 insertions, 125 deletions

diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc
index 129bef7c9..7c715b6c2 100644
--- a/data/scripts/maps/RusturfTunnel.inc
+++ b/data/scripts/maps/RusturfTunnel.inc
@@ -4,155 +4,154 @@ RusturfTunnel_MapScripts:: @ 815C745
 	.byte 0
 
 RusturfTunnel_MapScript2_15C750:: @ 815C750
-	map_script_2 0x409a, 4, RusturfTunnel_EventScript_15C7D1
-	map_script_2 0x409a, 5, RusturfTunnel_EventScript_15C7D1
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_15C7D1
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_15C7D1
 	.2byte 0
 
 RusturfTunnel_MapScript1_15C762:: @ 815C762
 	call RusturfTunnel_EventScript_1A0196
-	compare 0x409a, 2
-	callif 1, RusturfTunnel_EventScript_15C773
+	compare VAR_RUSTURF_TUNNEL_STATE, 2
+	call_if_eq RusturfTunnel_EventScript_15C773
 	end
 
 RusturfTunnel_EventScript_15C773:: @ 815C773
-	movespriteperm 7, 13, 4
-	movespriteperm 6, 13, 5
+	setobjectxyperm 7, 13, 4
+	setobjectxyperm 6, 13, 5
 	return
 
 RusturfTunnel_EventScript_15C782:: @ 815C782
 	lock
 	faceplayer
 	msgbox RusturfTunnel_Text_194766, 4
-	closebutton
-	move LAST_TALKED, RusturfTunnel_Movement_1A083D
-	waitmove 0
+	closemessage
+	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
+	waitmovement 0
 	release
 	end
 
 RusturfTunnel_EventScript_15C799:: @ 815C799
 	lock
 	faceplayer
-	checkflag 1
-	jumpeq RusturfTunnel_EventScript_15C7BC
-	setflag 1
+	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC
+	setflag FLAG_TEMP_1
 	msgbox RusturfTunnel_Text_1944C5, 4
-	closebutton
-	move LAST_TALKED, RusturfTunnel_Movement_1A083D
-	waitmove 0
+	closemessage
+	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
+	waitmovement 0
 	release
 	end
 
 RusturfTunnel_EventScript_15C7BC:: @ 815C7BC
 	msgbox RusturfTunnel_Text_1945B2, 4
-	closebutton
-	move LAST_TALKED, RusturfTunnel_Movement_1A083D
-	waitmove 0
+	closemessage
+	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
+	waitmovement 0
 	release
 	end
 
 RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
 	lockall
-	compare 0x4001, 1
-	callif 1, RusturfTunnel_EventScript_15C8CA
-	compare 0x4001, 2
-	callif 1, RusturfTunnel_EventScript_15C8DF
-	compare 0x4001, 3
-	callif 1, RusturfTunnel_EventScript_15C8EA
+	compare VAR_TEMP_1, 1
+	call_if_eq RusturfTunnel_EventScript_15C8CA
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C8DF
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C8EA
 	call RusturfTunnel_EventScript_15C92D
 	msgbox RusturfTunnel_Text_19461D, 4
-	compare 0x4001, 2
-	callif 1, RusturfTunnel_EventScript_15C8EB
-	compare 0x4001, 3
-	callif 1, RusturfTunnel_EventScript_15C8EB
-	giveitem ITEM_HM04
-	setflag 106
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C8EB
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C8EB
+	giveitem_std ITEM_HM04
+	setflag FLAG_RECEIVED_HM04
 	msgbox RusturfTunnel_Text_194693, 4
-	closebutton
-	compare 0x4001, 1
-	callif 1, RusturfTunnel_EventScript_15C880
-	compare 0x4001, 2
-	callif 1, RusturfTunnel_EventScript_15C892
-	compare 0x4001, 3
-	callif 1, RusturfTunnel_EventScript_15C8AE
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if_eq RusturfTunnel_EventScript_15C880
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C892
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C8AE
 	msgbox RusturfTunnel_Text_194706, 4
-	closebutton
-	compare 0x4001, 1
-	callif 1, RusturfTunnel_EventScript_15C8F7
-	compare 0x4001, 2
-	callif 1, RusturfTunnel_EventScript_15C909
-	compare 0x4001, 3
-	callif 1, RusturfTunnel_EventScript_15C91B
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if_eq RusturfTunnel_EventScript_15C8F7
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C909
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C91B
 	call RusturfTunnel_EventScript_1A0442
 	releaseall
 	end
 
 RusturfTunnel_EventScript_15C880:: @ 815C880
-	move 255, RusturfTunnel_Movement_15C96A
-	move 1, RusturfTunnel_Movement_15C98F
-	waitmove 0
+	applymovement 255, RusturfTunnel_Movement_15C96A
+	applymovement 1, RusturfTunnel_Movement_15C98F
+	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C892:: @ 815C892
-	move 255, RusturfTunnel_Movement_15C96D
-	move 1, RusturfTunnel_Movement_15C994
-	waitmove 0
-	move 10, RusturfTunnel_Movement_1A0845
-	waitmove 0
+	applymovement 255, RusturfTunnel_Movement_15C96D
+	applymovement 1, RusturfTunnel_Movement_15C994
+	waitmovement 0
+	applymovement 10, RusturfTunnel_Movement_1A0845
+	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C8AE:: @ 815C8AE
-	move 255, RusturfTunnel_Movement_15C96D
-	move 1, RusturfTunnel_Movement_15C994
-	waitmove 0
-	move 10, RusturfTunnel_Movement_1A0845
-	waitmove 0
+	applymovement 255, RusturfTunnel_Movement_15C96D
+	applymovement 1, RusturfTunnel_Movement_15C994
+	waitmovement 0
+	applymovement 10, RusturfTunnel_Movement_1A0845
+	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C8CA:: @ 815C8CA
-	move 1, RusturfTunnel_Movement_1A0841
-	waitmove 0
-	move 255, RusturfTunnel_Movement_1A0845
-	waitmove 0
+	applymovement 1, RusturfTunnel_Movement_1A0841
+	waitmovement 0
+	applymovement 255, RusturfTunnel_Movement_1A0845
+	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C8DF:: @ 815C8DF
-	move 1, RusturfTunnel_Movement_15C970
-	waitmove 0
+	applymovement 1, RusturfTunnel_Movement_15C970
+	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C8EA:: @ 815C8EA
 	return
 
 RusturfTunnel_EventScript_15C8EB:: @ 815C8EB
-	closebutton
-	move 1, RusturfTunnel_Movement_15C98D
-	waitmove 0
+	closemessage
+	applymovement 1, RusturfTunnel_Movement_15C98D
+	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C8F7:: @ 815C8F7
-	move 10, RusturfTunnel_Movement_15C945
-	move 1, RusturfTunnel_Movement_15C973
-	waitmove 0
+	applymovement 10, RusturfTunnel_Movement_15C945
+	applymovement 1, RusturfTunnel_Movement_15C973
+	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C909:: @ 815C909
-	move 10, RusturfTunnel_Movement_15C951
-	move 1, RusturfTunnel_Movement_15C980
-	waitmove 0
+	applymovement 10, RusturfTunnel_Movement_15C951
+	applymovement 1, RusturfTunnel_Movement_15C980
+	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C91B:: @ 815C91B
-	move 10, RusturfTunnel_Movement_15C951
-	move 1, RusturfTunnel_Movement_15C980
-	waitmove 0
+	applymovement 10, RusturfTunnel_Movement_15C951
+	applymovement 1, RusturfTunnel_Movement_15C980
+	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C92D:: @ 815C92D
-	playsfx 21
-	move 1, RusturfTunnel_Movement_1A0833
-	waitmove 0
-	move 1, RusturfTunnel_Movement_1A0835
-	waitmove 0
+	playse SE_PIN
+	applymovement 1, RusturfTunnel_Movement_1A0833
+	waitmovement 0
+	applymovement 1, RusturfTunnel_Movement_1A0835
+	waitmovement 0
 	return
 
 RusturfTunnel_Movement_15C945:: @ 815C945
@@ -266,27 +265,27 @@ RusturfTunnel_Movement_15C994:: @ 815C994
 	step_end
 
 RusturfTunnel_EventScript_15C999:: @ 815C999
-	setvar 0x4001, 1
+	setvar VAR_TEMP_1, 1
 	end
 
 RusturfTunnel_EventScript_15C99F:: @ 815C99F
-	setvar 0x4001, 2
+	setvar VAR_TEMP_1, 2
 	end
 
 RusturfTunnel_EventScript_15C9A5:: @ 815C9A5
-	setvar 0x4001, 3
+	setvar VAR_TEMP_1, 3
 	end
 
 RusturfTunnel_EventScript_15C9AB:: @ 815C9AB
 	lockall
 	msgbox RusturfTunnel_Text_194159, 4
-	closebutton
-	move 6, RusturfTunnel_Movement_15C9D3
-	move 7, RusturfTunnel_Movement_15C9D3
-	waitmove 0
-	moveoffscreen 6
-	moveoffscreen 7
-	setvar 0x409a, 3
+	closemessage
+	applymovement 6, RusturfTunnel_Movement_15C9D3
+	applymovement 7, RusturfTunnel_Movement_15C9D3
+	waitmovement 0
+	moveobjectoffscreen 6
+	moveobjectoffscreen 7
+	setvar VAR_RUSTURF_TUNNEL_STATE, 3
 	releaseall
 	end
 
@@ -299,53 +298,53 @@ RusturfTunnel_Movement_15C9D3:: @ 815C9D3
 RusturfTunnel_EventScript_15C9D7:: @ 815C9D7
 	lock
 	faceplayer
-	checksound
-	pokecry SPECIES_WINGULL, 0
+	waitse
+	playmoncry SPECIES_WINGULL, 0
 	msgbox RusturfTunnel_Text_194188, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
 
 RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
 	lock
 	faceplayer
-	playmusic BGM_EVIL_TEAM, 0
+	playbgm BGM_EVIL_TEAM, FALSE
 	msgbox RusturfTunnel_Text_19419B, 4
 	trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243
 	msgbox RusturfTunnel_Text_194274, 4
-	giveitem ITEM_DEVON_GOODS
-	closebutton
-	move 255, RusturfTunnel_Movement_15CA99
-	move 6, RusturfTunnel_Movement_15CAA2
-	waitmove 0
-	disappear 6
-	pause 50
-	reappear 5
-	move 5, RusturfTunnel_Movement_15CAAC
-	waitmove 0
-	move 255, RusturfTunnel_Movement_15CA9F
-	move 5, RusturfTunnel_Movement_15CAC0
-	waitmove 0
+	giveitem_std ITEM_DEVON_GOODS
+	closemessage
+	applymovement 255, RusturfTunnel_Movement_15CA99
+	applymovement 6, RusturfTunnel_Movement_15CAA2
+	waitmovement 0
+	removeobject 6
+	delay 50
+	addobject 5
+	applymovement 5, RusturfTunnel_Movement_15CAAC
+	waitmovement 0
+	applymovement 255, RusturfTunnel_Movement_15CA9F
+	applymovement 5, RusturfTunnel_Movement_15CAC0
+	waitmovement 0
 	msgbox RusturfTunnel_Text_19432A, 4
-	move 5, RusturfTunnel_Movement_1A0839
-	waitmove 0
+	applymovement 5, RusturfTunnel_Movement_1A0839
+	waitmovement 0
 	message RusturfTunnel_Text_19434F
-	waittext
-	checksound
-	pokecry SPECIES_WINGULL, 0
-	waitbutton
-	waitpokecry
-	closebutton
-	move 5, RusturfTunnel_Movement_15CAB4
-	move 7, RusturfTunnel_Movement_15CAC3
-	waitmove 0
-	disappear 5
-	disappear 7
-	clearflag 142
-	setflag 143
-	setvar 0x405a, 4
-	setvar 0x4090, 1
-	setflag 891
+	waitmessage
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	waitbuttonpress
+	waitmoncry
+	closemessage
+	applymovement 5, RusturfTunnel_Movement_15CAB4
+	applymovement 7, RusturfTunnel_Movement_15CAC3
+	waitmovement 0
+	removeobject 5
+	removeobject 7
+	clearflag FLAG_DEVON_GOODS_STOLEN
+	setflag FLAG_RECOVERED_DEVON_GOODS
+	setvar VAR_RUSTBORO_STATE, 4
+	setvar VAR_BRINEY_HOUSE_STATE, 1
+	setflag FLAG_HIDE_BRINEY_ROUTE116
 	release
 	end