fixing merge conflicts

1 files changed, 121 insertions, 124 deletions

diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc
index e352ac30e..d37100938 100644
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ b/data/scripts/maps/MtPyre_Summit.inc
@@ -8,105 +8,105 @@ MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7
 
 MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD
 	lockall
-	setvar 0x8008, 0
-	jump MtPyre_Summit_EventScript_15D4E1
+	setvar VAR_SPECIAL_8, 0
+	goto MtPyre_Summit_EventScript_15D4E1
 	end
 
 MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9
 	lockall
-	setvar 0x8008, 1
-	jump MtPyre_Summit_EventScript_15D4E1
+	setvar VAR_SPECIAL_8, 1
+	goto MtPyre_Summit_EventScript_15D4E1
 	end
 
 MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5
 	lockall
-	setvar 0x8008, 2
-	jump MtPyre_Summit_EventScript_15D4E1
+	setvar VAR_SPECIAL_8, 2
+	goto MtPyre_Summit_EventScript_15D4E1
 	end
 
 MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
-	move 255, MtPyre_Summit_Movement_1A0841
-	waitmove 0
-	move 2, MtPyre_Summit_Movement_1A0845
-	waitmove 0
-	pause 50
-	compare 0x8008, 0
-	callif 1, MtPyre_Summit_EventScript_15D593
-	compare 0x8008, 1
-	callif 1, MtPyre_Summit_EventScript_15D59E
-	compare 0x8008, 2
-	callif 1, MtPyre_Summit_EventScript_15D59F
+	applymovement 255, MtPyre_Summit_Movement_1A0841
+	waitmovement 0
+	applymovement 2, MtPyre_Summit_Movement_1A0845
+	waitmovement 0
+	delay 50
+	compare VAR_SPECIAL_8, 0
+	call_if_eq MtPyre_Summit_EventScript_15D593
+	compare VAR_SPECIAL_8, 1
+	call_if_eq MtPyre_Summit_EventScript_15D59E
+	compare VAR_SPECIAL_8, 2
+	call_if_eq MtPyre_Summit_EventScript_15D59F
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B52B0, 4
 	.else
 	msgbox MtPyre_Summit_Text_1B5EEC, 4
 	.endif
-	closebutton
+	closemessage
 	fadescreen 1
-	disappear 2
-	disappear 4
-	disappear 5
-	disappear 6
-	setflag 916
-	setflag 917
+	removeobject 2
+	removeobject 4
+	removeobject 5
+	removeobject 6
+	setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT
+	setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT
 	fadescreen 0
-	pause 20
+	delay 20
 	call MtPyre_Summit_EventScript_15D57A
-	compare 0x8008, 0
-	callif 1, MtPyre_Summit_EventScript_15D5AA
-	compare 0x8008, 1
-	callif 1, MtPyre_Summit_EventScript_15D5BF
-	compare 0x8008, 2
-	callif 1, MtPyre_Summit_EventScript_15D5CA
+	compare VAR_SPECIAL_8, 0
+	call_if_eq MtPyre_Summit_EventScript_15D5AA
+	compare VAR_SPECIAL_8, 1
+	call_if_eq MtPyre_Summit_EventScript_15D5BF
+	compare VAR_SPECIAL_8, 2
+	call_if_eq MtPyre_Summit_EventScript_15D5CA
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B53AB, 4
 	.else
 	msgbox MtPyre_Summit_Text_1B5FE6, 4
 	.endif
-	giveitem ITEM_RED_OR_BLUE_ORB
-	setflag 212
+	giveitem_std ITEM_RED_OR_BLUE_ORB
+	setflag FLAG_RECEIVED_RED_OR_BLUE_ORB
 	releaseall
 	end
 
 MtPyre_Summit_EventScript_15D57A:: @ 815D57A
-	setflag 111
-	setvar 0x4058, 1
-	clearflag 840
-	clearflag 835
-	setvar 0x40a0, 1
-	setvar 0x40b9, 1
+	setflag FLAG_MT_PYRE_ORB_STOLEN
+	setvar VAR_SLATEPORT_STATE, 1
+	clearflag FLAG_HIDE_STERN_SLATEPORT
+	clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
+	setvar VAR_SLATEPORT_HARBOR_STATE, 1
+	setvar VAR_MT_PYRE_STATE, 1
 	return
 
 MtPyre_Summit_EventScript_15D593:: @ 815D593
-	move 2, MtPyre_Summit_Movement_15D5E9
-	waitmove 0
+	applymovement 2, MtPyre_Summit_Movement_15D5E9
+	waitmovement 0
 	return
 
 MtPyre_Summit_EventScript_15D59E:: @ 815D59E
 	return
 
 MtPyre_Summit_EventScript_15D59F:: @ 815D59F
-	move 2, MtPyre_Summit_Movement_15D5EC
-	waitmove 0
+	applymovement 2, MtPyre_Summit_Movement_15D5EC
+	waitmovement 0
 	return
 
 MtPyre_Summit_EventScript_15D5AA:: @ 815D5AA
-	move 3, MtPyre_Summit_Movement_15D5DF
-	waitmove 0
-	move 255, MtPyre_Summit_Movement_1A0843
-	waitmove 0
+	applymovement 3, MtPyre_Summit_Movement_15D5DF
+	waitmovement 0
+	applymovement 255, MtPyre_Summit_Movement_1A0843
+	waitmovement 0
 	return
 
 MtPyre_Summit_EventScript_15D5BF:: @ 815D5BF
-	move 3, MtPyre_Summit_Movement_15D5E3
-	waitmove 0
+	applymovement 3, MtPyre_Summit_Movement_15D5E3
+	waitmovement 0
 	return
 
 MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA
-	move 3, MtPyre_Summit_Movement_15D5E5
-	waitmove 0
-	move 255, MtPyre_Summit_Movement_1A083F
-	waitmove 0
+	applymovement 3, MtPyre_Summit_Movement_15D5E5
+	waitmovement 0
+	applymovement 255, MtPyre_Summit_Movement_1A083F
+	waitmovement 0
 	return
 
 MtPyre_Summit_Movement_15D5DF:: @ 815D5DF
@@ -139,14 +139,14 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF
 	lock
 	faceplayer
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B586F, 5
+	msgbox UnknownString_81B586F, MSGBOX_YESNO
 	.else
-	msgbox MtPyre_Summit_Text_1B64B3, 5
+	msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO
 	.endif
-	compare RESULT, 1
-	callif 1, MtPyre_Summit_EventScript_15D611
-	compare RESULT, 0
-	callif 1, MtPyre_Summit_EventScript_15D61A
+	compare RESULT, YES
+	call_if_eq MtPyre_Summit_EventScript_15D611
+	compare RESULT, NO
+	call_if_eq MtPyre_Summit_EventScript_15D61A
 	release
 	end
 
@@ -169,12 +169,9 @@ MtPyre_Summit_EventScript_15D61A:: @ 815D61A
 MtPyre_Summit_EventScript_15D623:: @ 815D623
 	lock
 	faceplayer
-	checkflag 259
-	jumpeq MtPyre_Summit_EventScript_15D6C4
-	checkflag 113
-	jumpeq MtPyre_Summit_EventScript_15D64A
-	checkflag 129
-	jumpeq MtPyre_Summit_EventScript_15D6BA
+	goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_15D6C4
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, MtPyre_Summit_EventScript_15D64A
+	goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_15D6BA
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B54BE, 4
 	.else
@@ -185,45 +182,45 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623
 
 MtPyre_Summit_EventScript_15D64A:: @ 815D64A
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5647, 5
+	msgbox UnknownString_81B5647, MSGBOX_YESNO
 	.else
-	msgbox MtPyre_Summit_Text_1B6283, 5
+	msgbox MtPyre_Summit_Text_1B6283, MSGBOX_YESNO
 	.endif
-	compare RESULT, 1
-	jumpeq MtPyre_Summit_EventScript_15D669
-	compare RESULT, 0
-	jumpeq MtPyre_Summit_EventScript_15D69B
+	compare RESULT, YES
+	goto_if_eq MtPyre_Summit_EventScript_15D669
+	compare RESULT, NO
+	goto_if_eq MtPyre_Summit_EventScript_15D69B
 	end
 
 MtPyre_Summit_EventScript_15D669:: @ 815D669
-	setvar 0x8004, ITEM_RED_OR_BLUE_ORB
+	setvar VAR_SPECIAL_4, ITEM_RED_OR_BLUE_ORB
 	call MtPyre_Summit_EventScript_1A067F
-	closebutton
-	move LAST_TALKED, MtPyre_Summit_Movement_1A0841
-	waitmove 0
-	pause 40
-	move LAST_TALKED, MtPyre_Summit_Movement_1A0839
-	waitmove 0
-	pause 10
+	closemessage
+	applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841
+	waitmovement 0
+	delay 40
+	applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0839
+	waitmovement 0
+	delay 10
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B5762, 4
 	.else
 	msgbox MtPyre_Summit_Text_1B639C, 4
 	.endif
-	setflag 259
+	setflag FLAG_RETURNED_RED_OR_BLUE_ORB
 	release
 	end
 
 MtPyre_Summit_EventScript_15D69B:: @ 815D69B
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B56AB, 5
+	msgbox UnknownString_81B56AB, MSGBOX_YESNO
 	.else
-	msgbox MtPyre_Summit_Text_1B62E7, 5
+	msgbox MtPyre_Summit_Text_1B62E7, MSGBOX_YESNO
 	.endif
-	compare RESULT, 1
-	jumpeq MtPyre_Summit_EventScript_15D669
-	compare RESULT, 0
-	jumpeq MtPyre_Summit_EventScript_15D69B
+	compare RESULT, YES
+	goto_if_eq MtPyre_Summit_EventScript_15D669
+	compare RESULT, NO
+	goto_if_eq MtPyre_Summit_EventScript_15D69B
 	end
 
 MtPyre_Summit_EventScript_15D6BA:: @ 815D6BA
@@ -246,79 +243,79 @@ MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4
 
 MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE
 	lockall
-	setvar 0x8008, 0
-	jump MtPyre_Summit_EventScript_15D6F2
+	setvar VAR_SPECIAL_8, 0
+	goto MtPyre_Summit_EventScript_15D6F2
 	end
 
 MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA
 	lockall
-	setvar 0x8008, 1
-	jump MtPyre_Summit_EventScript_15D6F2
+	setvar VAR_SPECIAL_8, 1
+	goto MtPyre_Summit_EventScript_15D6F2
 	end
 
 MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6
 	lockall
-	setvar 0x8008, 2
-	jump MtPyre_Summit_EventScript_15D6F2
+	setvar VAR_SPECIAL_8, 2
+	goto MtPyre_Summit_EventScript_15D6F2
 	end
 
 MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2
-	move 255, MtPyre_Summit_Movement_1A0841
-	waitmove 0
-	move 2, MtPyre_Summit_Movement_1A0845
-	waitmove 0
-	pause 50
-	compare 0x8008, 0
-	callif 1, MtPyre_Summit_EventScript_15D75E
-	compare 0x8008, 1
-	callif 1, MtPyre_Summit_EventScript_15D769
-	compare 0x8008, 2
-	callif 1, MtPyre_Summit_EventScript_15D774
+	applymovement 255, MtPyre_Summit_Movement_1A0841
+	waitmovement 0
+	applymovement 2, MtPyre_Summit_Movement_1A0845
+	waitmovement 0
+	delay 50
+	compare VAR_SPECIAL_8, 0
+	call_if_eq MtPyre_Summit_EventScript_15D75E
+	compare VAR_SPECIAL_8, 1
+	call_if_eq MtPyre_Summit_EventScript_15D769
+	compare VAR_SPECIAL_8, 2
+	call_if_eq MtPyre_Summit_EventScript_15D774
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B5BFC, 4
 	.else
 	msgbox MtPyre_Summit_Text_1B6848, 4
 	.endif
-	closebutton
-	compare 0x8008, 0
-	callif 1, MtPyre_Summit_EventScript_15D77F
-	compare 0x8008, 1
-	callif 1, MtPyre_Summit_EventScript_15D78A
-	compare 0x8008, 2
-	callif 1, MtPyre_Summit_EventScript_15D795
-	disappear 2
-	setvar 0x40b9, 3
+	closemessage
+	compare VAR_SPECIAL_8, 0
+	call_if_eq MtPyre_Summit_EventScript_15D77F
+	compare VAR_SPECIAL_8, 1
+	call_if_eq MtPyre_Summit_EventScript_15D78A
+	compare VAR_SPECIAL_8, 2
+	call_if_eq MtPyre_Summit_EventScript_15D795
+	removeobject 2
+	setvar VAR_MT_PYRE_STATE, 3
 	releaseall
 	end
 
 MtPyre_Summit_EventScript_15D75E:: @ 815D75E
-	move 2, MtPyre_Summit_Movement_15D7A0
-	waitmove 0
+	applymovement 2, MtPyre_Summit_Movement_15D7A0
+	waitmovement 0
 	return
 
 MtPyre_Summit_EventScript_15D769:: @ 815D769
-	move 2, MtPyre_Summit_Movement_15D7A3
-	waitmove 0
+	applymovement 2, MtPyre_Summit_Movement_15D7A3
+	waitmovement 0
 	return
 
 MtPyre_Summit_EventScript_15D774:: @ 815D774
-	move 2, MtPyre_Summit_Movement_15D7A4
-	waitmove 0
+	applymovement 2, MtPyre_Summit_Movement_15D7A4
+	waitmovement 0
 	return
 
 MtPyre_Summit_EventScript_15D77F:: @ 815D77F
-	move 2, MtPyre_Summit_Movement_15D7A7
-	waitmove 0
+	applymovement 2, MtPyre_Summit_Movement_15D7A7
+	waitmovement 0
 	return
 
 MtPyre_Summit_EventScript_15D78A:: @ 815D78A
-	move 2, MtPyre_Summit_Movement_15D7B0
-	waitmove 0
+	applymovement 2, MtPyre_Summit_Movement_15D7B0
+	waitmovement 0
 	return
 
 MtPyre_Summit_EventScript_15D795:: @ 815D795
-	move 2, MtPyre_Summit_Movement_15D7B9
-	waitmove 0
+	applymovement 2, MtPyre_Summit_Movement_15D7B9
+	waitmovement 0
 	return
 
 MtPyre_Summit_Movement_15D7A0:: @ 815D7A0