fixing merge conflicts

1 files changed, 73 insertions, 75 deletions

diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
index e35015b3e..b7b36dd6d 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
@@ -3,19 +3,19 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA
 	.byte 0
 
 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0
-	compare 0x40c4, 1
-	callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC
-	setvar 0x40c4, 2
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 2
 	return
 
 RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2
 	lock
 	faceplayer
-	compare 0x40c4, 1
-	callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
 	msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4
 	release
 	end
@@ -23,10 +23,9 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2
 RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9
 	lock
 	faceplayer
-	compare 0x40c4, 1
-	callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
-	checkflag 287
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_157519
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519
 	msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4
 	release
 	end
@@ -39,10 +38,9 @@ RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519
 RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523
 	lock
 	faceplayer
-	compare 0x40c4, 1
-	callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
-	checkflag 188
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_157543
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543
 	msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4
 	release
 	end
@@ -55,8 +53,8 @@ RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543
 RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D
 	lock
 	faceplayer
-	compare 0x40c4, 1
-	callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
 	msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4
 	release
 	end
@@ -64,53 +62,53 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D
 RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564
 	lock
 	faceplayer
-	compare 0x40c4, 2
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_15764A
-	compare 0x40c4, 1
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_157640
+	compare VAR_FOSSIL_RESURRECTION_STATE, 2
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640
 	msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4
 	checkitem ITEM_ROOT_FOSSIL, 1
 	compare RESULT, 1
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_1575A6
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6
 	checkitem ITEM_CLAW_FOSSIL, 1
 	compare RESULT, 1
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_1575EE
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE
 	release
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6
-	closebutton
-	playsfx 21
-	move 5, RustboroCity_DevonCorp_2F_Movement_1A0833
-	waitmove 0
-	move 5, RustboroCity_DevonCorp_2F_Movement_1A0835
-	waitmove 0
-	msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5
-	compare RESULT, 0
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_157636
-	bufferitem 0, ITEM_ROOT_FOSSIL
+	closemessage
+	playse SE_PIN
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
+	waitmovement 0
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
+	bufferitemname 0, ITEM_ROOT_FOSSIL
 	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
-	removeitem ITEM_ROOT_FOSSIL, 1
-	setvar 0x40c4, 1
-	setvar 0x40c5, 1
+	takeitem ITEM_ROOT_FOSSIL, 1
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
+	setvar VAR_WHICH_FOSSIL_REVIVED, 1
 	release
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE
-	closebutton
-	playsfx 21
-	move 5, RustboroCity_DevonCorp_2F_Movement_1A0833
-	waitmove 0
-	move 5, RustboroCity_DevonCorp_2F_Movement_1A0835
-	waitmove 0
-	msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5
-	compare RESULT, 0
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_157636
-	bufferitem 0, ITEM_CLAW_FOSSIL
+	closemessage
+	playse SE_PIN
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
+	waitmovement 0
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
+	bufferitemname 0, ITEM_CLAW_FOSSIL
 	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
-	removeitem ITEM_CLAW_FOSSIL, 1
-	setvar 0x40c4, 1
-	setvar 0x40c5, 2
+	takeitem ITEM_CLAW_FOSSIL, 1
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
+	setvar VAR_WHICH_FOSSIL_REVIVED, 2
 	release
 	end
 
@@ -125,49 +123,49 @@ RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A
-	compare 0x40c5, 1
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_157661
-	compare 0x40c5, 2
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_1576B4
+	compare VAR_WHICH_FOSSIL_REVIVED, 1
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661
+	compare VAR_WHICH_FOSSIL_REVIVED, 2
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
-	bufferpoke 1, SPECIES_LILEEP
+	bufferspeciesname 1, SPECIES_LILEEP
 	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
-	countpokemon
+	getpartysize
 	compare RESULT, 6
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_157707
-	copyvar 0x8004, RESULT
-	setvar 0x40c4, 0
-	setflag 267
-	fanfare 370
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
+	copyvar VAR_SPECIAL_4, RESULT
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
+	setflag FLAG_RECEIVED_FOSSIL_MON
+	playfanfare BGM_FANFA4
 	message RustboroCity_DevonCorp_2F_Text_18319E
 	waitfanfare
-	waittext
-	givepokemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
-	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5
-	compare RESULT, 1
-	callif 1, RustboroCity_DevonCorp_2F_EventScript_1A0678
+	waitmessage
+	givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
+	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
+	compare RESULT, YES
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
 	release
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
-	bufferpoke 1, SPECIES_ANORITH
+	bufferspeciesname 1, SPECIES_ANORITH
 	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
-	countpokemon
+	getpartysize
 	compare RESULT, 6
-	jumpeq RustboroCity_DevonCorp_2F_EventScript_157707
-	copyvar 0x8004, RESULT
-	setvar 0x40c4, 0
-	setflag 267
-	fanfare 370
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
+	copyvar VAR_SPECIAL_4, RESULT
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
+	setflag FLAG_RECEIVED_FOSSIL_MON
+	playfanfare BGM_FANFA4
 	message RustboroCity_DevonCorp_2F_Text_18319E
 	waitfanfare
-	waittext
-	givepokemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
-	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5
-	compare RESULT, 1
-	callif 1, RustboroCity_DevonCorp_2F_EventScript_1A0678
+	waitmessage
+	givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
+	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
+	compare RESULT, YES
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
 	release
 	end