fixing merge conflicts

1 files changed, 51 insertions, 54 deletions

diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
index 2b749c873..0b71effee 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
@@ -5,66 +5,66 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711
 	.byte 0
 
 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721
-	compare 0x408f, 0
-	callif 1, RustboroCity_DevonCorp_3F_EventScript_15772D
+	compare VAR_DEVON_CORP_3F_STATE, 0
+	call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D
 	end
 
 RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D
-	movespriteperm 2, 3, 2
-	spritebehave 2, 9
+	setobjectxyperm 2, 3, 2
+	setobjectmovementtype 2, 9
 	return
 
 RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739
-	map_script_2 0x408f, 0, RustboroCity_DevonCorp_3F_EventScript_157743
+	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157743
 	.2byte 0
 
 RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743
-	spriteface 255, 4
+	turnobject 255, 4
 	end
 
 RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748
-	map_script_2 0x408f, 0, RustboroCity_DevonCorp_3F_EventScript_157752
+	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157752
 	.2byte 0
 
 RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
 	lockall
 	msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4
-	closebutton
-	move 2, RustboroCity_DevonCorp_3F_Movement_157815
-	waitmove 0
-	pause 80
-	move 2, RustboroCity_DevonCorp_3F_Movement_15781E
-	waitmove 0
+	closemessage
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815
+	waitmovement 0
+	delay 80
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E
+	waitmovement 0
 	msgbox RustboroCity_DevonCorp_3F_Text_183903, 4
-	closebutton
-	playmusic 420, 0
-	move 2, RustboroCity_DevonCorp_3F_Movement_157803
-	move 255, RustboroCity_DevonCorp_3F_Movement_157827
-	waitmove 0
+	closemessage
+	playbgm BGM_TSURETEK, FALSE
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803
+	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827
+	waitmovement 0
 	msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4
-	closebutton
-	fadedefault
-	move 2, RustboroCity_DevonCorp_3F_Movement_157812
-	move 255, RustboroCity_DevonCorp_3F_Movement_157835
-	waitmove 0
+	closemessage
+	fadedefaultbgm
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812
+	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835
+	waitmovement 0
 	msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4
-	giveitem ITEM_LETTER
+	giveitem_std ITEM_LETTER
 	msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4
-	fanfare 370
+	playfanfare BGM_FANFA4
 	message RustboroCity_DevonCorp_3F_Text_183422
 	waitfanfare
-	waittext
-	setflag 2050
-	setflag 188
+	waitmessage
+	setflag FLAG_SYS_POKENAV_GET
+	setflag FLAG_RECEIVED_POKENAV
 	msgbox RustboroCity_DevonCorp_3F_Text_183439, 4
-	setflag 894
-	clearflag 807
-	clearflag 983
-	clearflag 739
-	clearflag 881
-	setvar 0x4096, 1
-	clearflag 814
-	setvar 0x408f, 1
+	setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116
+	clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setvar VAR_BRINEY_LOCATION, 1
+	clearflag FLAG_HIDE_RIVAL_RUSTBORO
+	setvar VAR_DEVON_CORP_3F_STATE, 1
 	releaseall
 	end
 
@@ -146,43 +146,40 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835
 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
 	lock
 	faceplayer
-	checkflag 272
-	jumpeq RustboroCity_DevonCorp_3F_EventScript_15789B
-	checkflag 189
-	jumpeq RustboroCity_DevonCorp_3F_EventScript_157864
+	goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B
+	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864
 	msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4
-	closebutton
-	move LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
-	waitmove 0
+	closemessage
+	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	waitmovement 0
 	release
 	end
 
 RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864
 	msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4
-	giveitem ITEM_EXP_SHARE
+	giveitem_std ITEM_EXP_SHARE
 	compare RESULT, 0
-	jumpeq RustboroCity_DevonCorp_3F_EventScript_1A029B
-	setflag 272
+	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B
+	setflag FLAG_RECEIVED_EXP_SHARE
 	msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4
-	closebutton
-	move LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
-	waitmove 0
+	closemessage
+	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	waitmovement 0
 	release
 	end
 
 RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B
 	msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4
-	closebutton
-	move LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
-	waitmove 0
+	closemessage
+	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	waitmovement 0
 	release
 	end
 
 RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0
 	lock
 	faceplayer
-	checkflag 256
-	jumpeq RustboroCity_DevonCorp_3F_EventScript_1578C5
+	goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5
 	msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4
 	release
 	end