Reformat compare + goto_if/call_if to single statements

1 files changed, 21 insertions, 42 deletions

diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index cd58627af..3de60df3f 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -11,8 +11,7 @@ MtPyre_Summit_MapScripts::
 	.byte 0
 
 MtPyre_Summit_OnTransition:
-	compare VAR_MT_PYRE_STATE, 2
-	call_if_eq MtPyre_Summit_EventScript_SetArchieMaxiePositions
+	call_if_eq VAR_MT_PYRE_STATE, 2, MtPyre_Summit_EventScript_SetArchieMaxiePositions
 	end
 
 MtPyre_Summit_EventScript_SetArchieMaxiePositions::
@@ -45,12 +44,9 @@ MtPyre_Summit_EventScript_TeamAquaExits::
 	applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	delay 50
-	compare VAR_0x8008, 0
-	call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer0
-	compare VAR_0x8008, 1
-	call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer1
-	compare VAR_0x8008, 2
-	call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer2
+	call_if_eq VAR_0x8008, 0, MtPyre_Summit_EventScript_ArchieFacePlayer0
+	call_if_eq VAR_0x8008, 1, MtPyre_Summit_EventScript_ArchieFacePlayer1
+	call_if_eq VAR_0x8008, 2, MtPyre_Summit_EventScript_ArchieFacePlayer2
 	msgbox MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo, MSGBOX_DEFAULT
 	closemessage
 	fadescreen FADE_TO_BLACK
@@ -65,12 +61,9 @@ MtPyre_Summit_EventScript_TeamAquaExits::
 	fadescreen FADE_FROM_BLACK
 	delay 20
 	setvar VAR_MT_PYRE_STATE, 1
-	compare VAR_0x8008, 0
-	call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer0
-	compare VAR_0x8008, 1
-	call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer1
-	compare VAR_0x8008, 2
-	call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer2
+	call_if_eq VAR_0x8008, 0, MtPyre_Summit_EventScript_OldLadyApproachPlayer0
+	call_if_eq VAR_0x8008, 1, MtPyre_Summit_EventScript_OldLadyApproachPlayer1
+	call_if_eq VAR_0x8008, 2, MtPyre_Summit_EventScript_OldLadyApproachPlayer2
 	msgbox MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis, MSGBOX_DEFAULT
 	giveitem ITEM_MAGMA_EMBLEM
 	setflag FLAG_RECEIVED_RED_OR_BLUE_ORB
@@ -142,19 +135,15 @@ MtPyre_Summit_EventScript_OldMan::
 	faceplayer
 	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, MtPyre_Summit_EventScript_OldManAfterRayquaza
 	msgbox MtPyre_Summit_Text_WillYouHearOutMyTale, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	call_if_eq MtPyre_Summit_EventScript_OldManTale
-	compare VAR_RESULT, NO
-	call_if_eq MtPyre_Summit_EventScript_DeclineOldManTale
+	call_if_eq VAR_RESULT, YES, MtPyre_Summit_EventScript_OldManTale
+	call_if_eq VAR_RESULT, NO, MtPyre_Summit_EventScript_DeclineOldManTale
 	release
 	end
 
 MtPyre_Summit_EventScript_OldManAfterRayquaza::
 	msgbox MtPyre_Summit_Text_HearTheNewLegendOfHoenn, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	call_if_eq MtPyre_Summit_EventScript_OldManNewTale
-	compare VAR_RESULT, NO
-	call_if_eq MtPyre_Summit_EventScript_DeclineOldManTale
+	call_if_eq VAR_RESULT, YES, MtPyre_Summit_EventScript_OldManNewTale
+	call_if_eq VAR_RESULT, NO, MtPyre_Summit_EventScript_DeclineOldManTale
 	release
 	end
 
@@ -174,8 +163,7 @@ MtPyre_Summit_EventScript_OldLady::
 	lock
 	faceplayer
 	goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_OldLadyAfterOrbsReturned
-	compare VAR_MT_PYRE_STATE, 3
-	call_if_ge MtPyre_Summit_EventScript_OldLadyOrbsReturned
+	call_if_ge VAR_MT_PYRE_STATE, 3, MtPyre_Summit_EventScript_OldLadyOrbsReturned
 	goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_OldLadyLegendariesAwake
 	msgbox MtPyre_Summit_Text_OrbsHaveBeenTaken, MSGBOX_DEFAULT
 	release
@@ -219,32 +207,23 @@ MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	delay 60
-	compare VAR_0x8008, 0
-	call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit0
-	compare VAR_0x8008, 1
-	call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit1
-	compare VAR_0x8008, 2
-	call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit2
+	call_if_eq VAR_0x8008, 0, MtPyre_Summit_EventScript_ArchieMaxieBeginExit0
+	call_if_eq VAR_0x8008, 1, MtPyre_Summit_EventScript_ArchieMaxieBeginExit1
+	call_if_eq VAR_0x8008, 2, MtPyre_Summit_EventScript_ArchieMaxieBeginExit2
 	playse SE_PIN
 	applymovement LOCALID_MAXIE, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement LOCALID_MAXIE, Common_Movement_Delay48
 	waitmovement 0
 	delay 30
-	compare VAR_0x8008, 0
-	call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer0
-	compare VAR_0x8008, 1
-	call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer1
-	compare VAR_0x8008, 2
-	call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer2
+	call_if_eq VAR_0x8008, 0, MtPyre_Summit_EventScript_MaxieApproachPlayer0
+	call_if_eq VAR_0x8008, 1, MtPyre_Summit_EventScript_MaxieApproachPlayer1
+	call_if_eq VAR_0x8008, 2, MtPyre_Summit_EventScript_MaxieApproachPlayer2
 	msgbox MtPyre_Summit_Text_MaxieSilence, MSGBOX_DEFAULT
 	closemessage
-	compare VAR_0x8008, 0
-	call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie0
-	compare VAR_0x8008, 1
-	call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie1
-	compare VAR_0x8008, 2
-	call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie2
+	call_if_eq VAR_0x8008, 0, MtPyre_Summit_EventScript_MaxieApproachArchie0
+	call_if_eq VAR_0x8008, 1, MtPyre_Summit_EventScript_MaxieApproachArchie1
+	call_if_eq VAR_0x8008, 2, MtPyre_Summit_EventScript_MaxieApproachArchie2
 	delay 30
 	applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieExit
 	applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieExit