improve goto_if macros

1 files changed, 91 insertions, 92 deletions

diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 2b0bfd8aa..1224a0ebe 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -2,7 +2,7 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5
 	lock
 	faceplayer
 	compare VAR_0x408A, 0
-	goto_if 5, LilycoveCity_ContestLobby_EventScript_279D13
+	goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13
 	checkflag FLAG_0x05F
 	call_if 1, LilycoveCity_ContestLobby_EventScript_279CEA
 	checkflag FLAG_0x05F
@@ -30,7 +30,7 @@ LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13
 LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C
 	giveitem_std ITEM_LUXURY_BALL
 	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_ContestLobby_EventScript_279D4B
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B
 	setvar VAR_0x408A, 0
 	closemessage
 	release
@@ -89,18 +89,18 @@ LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13
 	msgbox LilycoveCity_ContestLobby_Text_27B44A, MSGBOX_DEFAULT
 	choosecontestmon
 	compare VAR_0x8004, 255
-	goto_eq LilycoveCity_ContestLobby_EventScript_279E09
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_279E09
 	special sub_80F7F30
 	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_ContestLobby_EventScript_279F12
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F12
 	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_279F87
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F87
 	compare VAR_RESULT, 2
-	goto_eq LilycoveCity_ContestLobby_EventScript_279F45
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F45
 	compare VAR_RESULT, 3
-	goto_eq LilycoveCity_ContestLobby_EventScript_279F69
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F69
 	compare VAR_RESULT, 4
-	goto_eq LilycoveCity_ContestLobby_EventScript_279F78
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F78
 	end
 
 LilycoveCity_ContestLobby_EventScript_279E62:: @ 8279E62
@@ -274,7 +274,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097
 
 LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1
 	compare VAR_0x4088, 5
-	goto_eq LinkContestRoom1_EventScript_27A0C7
+	goto_if_eq LinkContestRoom1_EventScript_27A0C7
 	lockall
 	msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT
 	releaseall
@@ -283,7 +283,7 @@ LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1
 LinkContestRoom1_EventScript_27A0C7:: @ 827A0C7
 	specialvar VAR_RESULT, sub_80F9160
 	compare VAR_RESULT, 1
-	goto_eq LinkContestRoom1_EventScript_27A0DE
+	goto_if_eq LinkContestRoom1_EventScript_27A0DE
 	messageautoscroll LinkContestRoom1_Text_27B78F
 	waitmessage
 	return
@@ -307,7 +307,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5
 	call LinkContestRoom1_EventScript_27A133
 	addvar VAR_0x8006, 1
 	compare VAR_0x8006, 4
-	goto_if 5, LinkContestRoom1_EventScript_27A0F5
+	goto_if_ne LinkContestRoom1_EventScript_27A0F5
 	call LinkContestRoom1_EventScript_27A230
 	setvar VAR_TEMP_1, 6
 	return
@@ -315,7 +315,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5
 LinkContestRoom1_EventScript_27A133:: @ 827A133
 	specialvar VAR_RESULT, sub_80F9160
 	compare VAR_RESULT, 1
-	goto_eq LinkContestRoom1_EventScript_27A144
+	goto_if_eq LinkContestRoom1_EventScript_27A144
 	return
 
 LinkContestRoom1_EventScript_27A144:: @ 827A144
@@ -325,13 +325,13 @@ LinkContestRoom1_EventScript_27A144:: @ 827A144
 
 LinkContestRoom1_EventScript_27A149:: @ 827A149
 	compare VAR_0x8006, 0
-	goto_eq LinkContestRoom1_EventScript_27A176
+	goto_if_eq LinkContestRoom1_EventScript_27A176
 	compare VAR_0x8006, 1
-	goto_eq LinkContestRoom1_EventScript_27A18D
+	goto_if_eq LinkContestRoom1_EventScript_27A18D
 	compare VAR_0x8006, 2
-	goto_eq LinkContestRoom1_EventScript_27A1A4
+	goto_if_eq LinkContestRoom1_EventScript_27A1A4
 	compare VAR_0x8006, 3
-	goto_eq LinkContestRoom1_EventScript_27A1BB
+	goto_if_eq LinkContestRoom1_EventScript_27A1BB
 	return
 
 LinkContestRoom1_EventScript_27A176:: @ 827A176
@@ -394,7 +394,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2
 
 LinkContestRoom1_EventScript_27A217:: @ 827A217
 	compare VAR_0x4088, 5
-	goto_eq LinkContestRoom1_EventScript_27A229
+	goto_if_eq LinkContestRoom1_EventScript_27A229
 	message LinkContestRoom1_Text_27B815
 	waitmessage
 	return
@@ -422,14 +422,14 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230
 
 LinkContestRoom1_EventScript_27A26C:: @ 827A26C
 	compare VAR_0x4088, 5
-	goto_eq LinkContestRoom1_EventScript_27A280
+	goto_if_eq LinkContestRoom1_EventScript_27A280
 	msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT
 	return
 
 LinkContestRoom1_EventScript_27A280:: @ 827A280
 	specialvar VAR_RESULT, sub_80F9160
 	compare VAR_RESULT, 1
-	goto_eq LinkContestRoom1_EventScript_27A297
+	goto_if_eq LinkContestRoom1_EventScript_27A297
 	messageautoscroll LinkContestRoom1_Text_27B830
 	waitmessage
 	return
@@ -448,7 +448,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297
 
 LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9
 	compare VAR_0x4088, 5
-	goto_eq LinkContestRoom1_EventScript_27A2CA
+	goto_if_eq LinkContestRoom1_EventScript_27A2CA
 	message LinkContestRoom1_Text_27B8F2
 	return
 
@@ -535,107 +535,107 @@ LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5
 	compare VAR_RESULT, 7
 	call_if 1, LinkContestRoom1_EventScript_27A756
 	compare VAR_TEMP_0, 0
-	goto_if 2, LinkContestRoom1_EventScript_27A3E5
+	goto_if_gt LinkContestRoom1_EventScript_27A3E5
 	waitmovement 0
 	return
 
 LinkContestRoom1_EventScript_27A454:: @ 827A454
 	compare VAR_0x8004, 80
-	goto_if 2, LinkContestRoom1_EventScript_27A654
+	goto_if_gt LinkContestRoom1_EventScript_27A654
 	compare VAR_0x8004, 70
-	goto_if 2, LinkContestRoom1_EventScript_27A64E
+	goto_if_gt LinkContestRoom1_EventScript_27A64E
 	compare VAR_0x8004, 60
-	goto_if 2, LinkContestRoom1_EventScript_27A648
+	goto_if_gt LinkContestRoom1_EventScript_27A648
 	compare VAR_0x8004, 50
-	goto_if 2, LinkContestRoom1_EventScript_27A642
+	goto_if_gt LinkContestRoom1_EventScript_27A642
 	compare VAR_0x8004, 40
-	goto_if 2, LinkContestRoom1_EventScript_27A63C
+	goto_if_gt LinkContestRoom1_EventScript_27A63C
 	compare VAR_0x8004, 30
-	goto_if 2, LinkContestRoom1_EventScript_27A636
+	goto_if_gt LinkContestRoom1_EventScript_27A636
 	compare VAR_0x8004, 20
-	goto_if 2, LinkContestRoom1_EventScript_27A630
+	goto_if_gt LinkContestRoom1_EventScript_27A630
 	compare VAR_0x8004, 10
-	goto_if 2, LinkContestRoom1_EventScript_27A62A
+	goto_if_gt LinkContestRoom1_EventScript_27A62A
 	setvar VAR_TEMP_0, 0
 	return
 
 LinkContestRoom1_EventScript_27A4B2:: @ 827A4B2
 	compare VAR_0x8004, 230
-	goto_if 2, LinkContestRoom1_EventScript_27A654
+	goto_if_gt LinkContestRoom1_EventScript_27A654
 	compare VAR_0x8004, 210
-	goto_if 2, LinkContestRoom1_EventScript_27A64E
+	goto_if_gt LinkContestRoom1_EventScript_27A64E
 	compare VAR_0x8004, 190
-	goto_if 2, LinkContestRoom1_EventScript_27A648
+	goto_if_gt LinkContestRoom1_EventScript_27A648
 	compare VAR_0x8004, 170
-	goto_if 2, LinkContestRoom1_EventScript_27A642
+	goto_if_gt LinkContestRoom1_EventScript_27A642
 	compare VAR_0x8004, 150
-	goto_if 2, LinkContestRoom1_EventScript_27A63C
+	goto_if_gt LinkContestRoom1_EventScript_27A63C
 	compare VAR_0x8004, 130
-	goto_if 2, LinkContestRoom1_EventScript_27A636
+	goto_if_gt LinkContestRoom1_EventScript_27A636
 	compare VAR_0x8004, 110
-	goto_if 2, LinkContestRoom1_EventScript_27A630
+	goto_if_gt LinkContestRoom1_EventScript_27A630
 	compare VAR_0x8004, 90
-	goto_if 2, LinkContestRoom1_EventScript_27A62A
+	goto_if_gt LinkContestRoom1_EventScript_27A62A
 	setvar VAR_TEMP_0, 0
 	return
 
 LinkContestRoom1_EventScript_27A510:: @ 827A510
 	compare VAR_0x8004, 380
-	goto_if 2, LinkContestRoom1_EventScript_27A654
+	goto_if_gt LinkContestRoom1_EventScript_27A654
 	compare VAR_0x8004, 350
-	goto_if 2, LinkContestRoom1_EventScript_27A64E
+	goto_if_gt LinkContestRoom1_EventScript_27A64E
 	compare VAR_0x8004, 320
-	goto_if 2, LinkContestRoom1_EventScript_27A648
+	goto_if_gt LinkContestRoom1_EventScript_27A648
 	compare VAR_0x8004, 290
-	goto_if 2, LinkContestRoom1_EventScript_27A642
+	goto_if_gt LinkContestRoom1_EventScript_27A642
 	compare VAR_0x8004, 260
-	goto_if 2, LinkContestRoom1_EventScript_27A63C
+	goto_if_gt LinkContestRoom1_EventScript_27A63C
 	compare VAR_0x8004, 230
-	goto_if 2, LinkContestRoom1_EventScript_27A636
+	goto_if_gt LinkContestRoom1_EventScript_27A636
 	compare VAR_0x8004, 200
-	goto_if 2, LinkContestRoom1_EventScript_27A630
+	goto_if_gt LinkContestRoom1_EventScript_27A630
 	compare VAR_0x8004, 170
-	goto_if 2, LinkContestRoom1_EventScript_27A62A
+	goto_if_gt LinkContestRoom1_EventScript_27A62A
 	setvar VAR_TEMP_0, 0
 	return
 
 LinkContestRoom1_EventScript_27A56E:: @ 827A56E
 	compare VAR_0x8004, 600
-	goto_if 2, LinkContestRoom1_EventScript_27A654
+	goto_if_gt LinkContestRoom1_EventScript_27A654
 	compare VAR_0x8004, 560
-	goto_if 2, LinkContestRoom1_EventScript_27A64E
+	goto_if_gt LinkContestRoom1_EventScript_27A64E
 	compare VAR_0x8004, 520
-	goto_if 2, LinkContestRoom1_EventScript_27A648
+	goto_if_gt LinkContestRoom1_EventScript_27A648
 	compare VAR_0x8004, 480
-	goto_if 2, LinkContestRoom1_EventScript_27A642
+	goto_if_gt LinkContestRoom1_EventScript_27A642
 	compare VAR_0x8004, 440
-	goto_if 2, LinkContestRoom1_EventScript_27A63C
+	goto_if_gt LinkContestRoom1_EventScript_27A63C
 	compare VAR_0x8004, 400
-	goto_if 2, LinkContestRoom1_EventScript_27A636
+	goto_if_gt LinkContestRoom1_EventScript_27A636
 	compare VAR_0x8004, 360
-	goto_if 2, LinkContestRoom1_EventScript_27A630
+	goto_if_gt LinkContestRoom1_EventScript_27A630
 	compare VAR_0x8004, 320
-	goto_if 2, LinkContestRoom1_EventScript_27A62A
+	goto_if_gt LinkContestRoom1_EventScript_27A62A
 	setvar VAR_TEMP_0, 0
 	return
 
 LinkContestRoom1_EventScript_27A5CC:: @ 827A5CC
 	compare VAR_0x8004, 600
-	goto_if 2, LinkContestRoom1_EventScript_27A654
+	goto_if_gt LinkContestRoom1_EventScript_27A654
 	compare VAR_0x8004, 550
-	goto_if 2, LinkContestRoom1_EventScript_27A64E
+	goto_if_gt LinkContestRoom1_EventScript_27A64E
 	compare VAR_0x8004, 500
-	goto_if 2, LinkContestRoom1_EventScript_27A648
+	goto_if_gt LinkContestRoom1_EventScript_27A648
 	compare VAR_0x8004, 450
-	goto_if 2, LinkContestRoom1_EventScript_27A642
+	goto_if_gt LinkContestRoom1_EventScript_27A642
 	compare VAR_0x8004, 400
-	goto_if 2, LinkContestRoom1_EventScript_27A63C
+	goto_if_gt LinkContestRoom1_EventScript_27A63C
 	compare VAR_0x8004, 300
-	goto_if 2, LinkContestRoom1_EventScript_27A636
+	goto_if_gt LinkContestRoom1_EventScript_27A636
 	compare VAR_0x8004, 200
-	goto_if 2, LinkContestRoom1_EventScript_27A630
+	goto_if_gt LinkContestRoom1_EventScript_27A630
 	compare VAR_0x8004, 100
-	goto_if 2, LinkContestRoom1_EventScript_27A62A
+	goto_if_gt LinkContestRoom1_EventScript_27A62A
 	setvar VAR_TEMP_0, 0
 	return
 
@@ -673,7 +673,7 @@ LinkContestRoom1_EventScript_27A654:: @ 827A654
 
 LinkContestRoom1_EventScript_27A65A:: @ 827A65A
 	compare VAR_TEMP_1, 1
-	goto_eq LinkContestRoom1_EventScript_27A67D
+	goto_if_eq LinkContestRoom1_EventScript_27A67D
 	applymovement 6, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
 	delay 14
@@ -686,7 +686,7 @@ LinkContestRoom1_EventScript_27A67D:: @ 827A67D
 
 LinkContestRoom1_EventScript_27A67E:: @ 827A67E
 	compare VAR_TEMP_2, 1
-	goto_eq LinkContestRoom1_EventScript_27A6A1
+	goto_if_eq LinkContestRoom1_EventScript_27A6A1
 	applymovement 12, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
 	delay 14
@@ -699,7 +699,7 @@ LinkContestRoom1_EventScript_27A6A1:: @ 827A6A1
 
 LinkContestRoom1_EventScript_27A6A2:: @ 827A6A2
 	compare VAR_TEMP_3, 1
-	goto_eq LinkContestRoom1_EventScript_27A6C5
+	goto_if_eq LinkContestRoom1_EventScript_27A6C5
 	applymovement 7, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
 	delay 14
@@ -712,7 +712,7 @@ LinkContestRoom1_EventScript_27A6C5:: @ 827A6C5
 
 LinkContestRoom1_EventScript_27A6C6:: @ 827A6C6
 	compare VAR_TEMP_4, 1
-	goto_eq LinkContestRoom1_EventScript_27A6E9
+	goto_if_eq LinkContestRoom1_EventScript_27A6E9
 	applymovement 8, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
 	delay 14
@@ -725,7 +725,7 @@ LinkContestRoom1_EventScript_27A6E9:: @ 827A6E9
 
 LinkContestRoom1_EventScript_27A6EA:: @ 827A6EA
 	compare VAR_TEMP_5, 1
-	goto_eq LinkContestRoom1_EventScript_27A70D
+	goto_if_eq LinkContestRoom1_EventScript_27A70D
 	applymovement 9, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
 	delay 14
@@ -738,7 +738,7 @@ LinkContestRoom1_EventScript_27A70D:: @ 827A70D
 
 LinkContestRoom1_EventScript_27A70E:: @ 827A70E
 	compare VAR_TEMP_6, 1
-	goto_eq LinkContestRoom1_EventScript_27A731
+	goto_if_eq LinkContestRoom1_EventScript_27A731
 	applymovement 10, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
 	delay 14
@@ -751,7 +751,7 @@ LinkContestRoom1_EventScript_27A731:: @ 827A731
 
 LinkContestRoom1_EventScript_27A732:: @ 827A732
 	compare VAR_TEMP_7, 1
-	goto_eq LinkContestRoom1_EventScript_27A755
+	goto_if_eq LinkContestRoom1_EventScript_27A755
 	applymovement 11, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
 	delay 14
@@ -764,7 +764,7 @@ LinkContestRoom1_EventScript_27A755:: @ 827A755
 
 LinkContestRoom1_EventScript_27A756:: @ 827A756
 	compare VAR_TEMP_8, 1
-	goto_eq LinkContestRoom1_EventScript_27A779
+	goto_if_eq LinkContestRoom1_EventScript_27A779
 	applymovement 15, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
 	delay 14
@@ -846,14 +846,14 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801
 
 LinkContestRoom1_EventScript_27A853:: @ 827A853
 	compare VAR_0x4088, 5
-	goto_eq LinkContestRoom1_EventScript_27A867
+	goto_if_eq LinkContestRoom1_EventScript_27A867
 	msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT
 	return
 
 LinkContestRoom1_EventScript_27A867:: @ 827A867
 	specialvar VAR_RESULT, sub_80F9160
 	compare VAR_RESULT, 1
-	goto_eq LinkContestRoom1_EventScript_27A87E
+	goto_if_eq LinkContestRoom1_EventScript_27A87E
 	messageautoscroll LinkContestRoom1_Text_27B904
 	waitmessage
 	return
@@ -896,7 +896,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5
 
 LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB
 	compare VAR_0x4088, 5
-	goto_eq LinkContestRoom1_EventScript_27A90F
+	goto_if_eq LinkContestRoom1_EventScript_27A90F
 	msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT
 	return
 
@@ -909,7 +909,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F
 
 LinkContestRoom1_EventScript_27A91E:: @ 827A91E
 	compare VAR_0x4088, 5
-	goto_eq LinkContestRoom1_EventScript_27A932
+	goto_if_eq LinkContestRoom1_EventScript_27A932
 	msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT
 	return
 
@@ -922,7 +922,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932
 
 LinkContestRoom1_EventScript_27A941:: @ 827A941
 	compare VAR_0x4088, 5
-	goto_eq LinkContestRoom1_EventScript_27A955
+	goto_if_eq LinkContestRoom1_EventScript_27A955
 	msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT
 	return
 
@@ -935,7 +935,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955
 
 LinkContestRoom1_EventScript_27A964:: @ 827A964
 	compare VAR_0x4088, 5
-	goto_eq LinkContestRoom1_EventScript_27A978
+	goto_if_eq LinkContestRoom1_EventScript_27A978
 	msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT
 	return
 
@@ -986,7 +986,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4
 
 LinkContestRoom1_EventScript_27AA00:: @ 827AA00
 	compare VAR_0x4088, 5
-	goto_eq LinkContestRoom1_EventScript_27AA14
+	goto_if_eq LinkContestRoom1_EventScript_27AA14
 	msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT
 	return
 
@@ -1009,7 +1009,7 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B
 	applymovement 6, LinkContestRoom1_Movement_27AD37
 	applymovement 8, LinkContestRoom1_Movement_27AD33
 	compare VAR_TEMP_1, 4
-	goto_if 5, LinkContestRoom1_EventScript_27AA1B
+	goto_if_ne LinkContestRoom1_EventScript_27AA1B
 	delay 30
 	return
 
@@ -1084,10 +1084,9 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F
 
 LinkContestRoom1_EventScript_27AB36:: @ 827AB36
 	compare VAR_0x4088, 5
-	goto_eq LinkContestRoom1_EventScript_27ABD8
+	goto_if_eq LinkContestRoom1_EventScript_27ABD8
 	call LinkContestRoom1_EventScript_27AB9E
-	checkflag FLAG_TEMP_2
-	goto_eq LinkContestRoom1_EventScript_27AB82
+	goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82
 	lockall
 	msgbox LinkContestRoom1_Text_27BBA8, MSGBOX_DEFAULT
 	releaseall
@@ -1099,7 +1098,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36
 	delay 30
 	special sub_80F88E8
 	compare VAR_0x8004, 1
-	goto_eq LinkContestRoom1_EventScript_27ABD2
+	goto_if_eq LinkContestRoom1_EventScript_27ABD2
 	return
 
 LinkContestRoom1_EventScript_27AB82:: @ 827AB82
@@ -1109,24 +1108,24 @@ LinkContestRoom1_EventScript_27AB82:: @ 827AB82
 	delay 90
 	special sub_80F88E8
 	compare VAR_0x8004, 1
-	goto_eq LinkContestRoom1_EventScript_27ABD2
+	goto_if_eq LinkContestRoom1_EventScript_27ABD2
 	return
 
 LinkContestRoom1_EventScript_27AB9E:: @ 827AB9E
 	specialvar VAR_RESULT, sub_80F7F7C
 	compare VAR_RESULT, 1
-	goto_eq LinkContestRoom1_EventScript_27ABAF
+	goto_if_eq LinkContestRoom1_EventScript_27ABAF
 	return
 
 LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF
 	special sub_80F831C
 	compare VAR_0x8005, 3
-	goto_eq LinkContestRoom1_EventScript_27ABBE
+	goto_if_eq LinkContestRoom1_EventScript_27ABBE
 	return
 
 LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE
 	compare VAR_CONTEST_RANK, 3
-	goto_eq LinkContestRoom1_EventScript_27ABCD
+	goto_if_eq LinkContestRoom1_EventScript_27ABCD
 	setflag FLAG_TEMP_2
 	return
 
@@ -1147,7 +1146,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8
 	special sub_80F831C
 	special sub_80F88E8
 	compare VAR_0x8004, 1
-	goto_eq LinkContestRoom1_EventScript_27ABF1
+	goto_if_eq LinkContestRoom1_EventScript_27ABF1
 	closemessage
 	return
 
@@ -1197,7 +1196,7 @@ LinkContestRoom1_EventScript_27AC51:: @ 827AC51
 LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E
 	special sub_80F831C
 	compare VAR_0x8005, 3
-	goto_eq LinkContestRoom1_EventScript_27AC77
+	goto_if_eq LinkContestRoom1_EventScript_27AC77
 	lockall
 	msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
 	releaseall
@@ -1208,9 +1207,9 @@ LinkContestRoom1_EventScript_27AC77:: @ 827AC77
 	call_if 1, LinkContestRoom1_EventScript_27ABCE
 	specialvar VAR_RESULT, sub_80F7F7C
 	compare VAR_RESULT, 0
-	goto_eq LinkContestRoom1_EventScript_27ACDF
+	goto_if_eq LinkContestRoom1_EventScript_27ACDF
 	compare VAR_CONTEST_RANK, 3
-	goto_eq LinkContestRoom1_EventScript_27ACBD
+	goto_if_eq LinkContestRoom1_EventScript_27ACBD
 	lockall
 	msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
 	releaseall
@@ -1227,7 +1226,7 @@ LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8
 LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD
 	giveitem_std ITEM_LUXURY_BALL
 	compare VAR_RESULT, 0
-	goto_eq LinkContestRoom1_EventScript_27ACA8
+	goto_if_eq LinkContestRoom1_EventScript_27ACA8
 	lockall
 	msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
 	releaseall
@@ -1433,7 +1432,7 @@ LinkContestRoom1_Movement_27AD7E: @ 827AD7E
 LinkContestRoom1_EventScript_27AD80:: @ 827AD80
 	specialvar VAR_RESULT, sub_80F9134
 	compare VAR_RESULT, 1
-	goto_eq LinkContestRoom1_EventScript_27AD91
+	goto_if_eq LinkContestRoom1_EventScript_27AD91
 	return
 
 LinkContestRoom1_EventScript_27AD91:: @ 827AD91
@@ -1442,7 +1441,7 @@ LinkContestRoom1_EventScript_27AD91:: @ 827AD91
 LilycoveCity_ContestLobby_EventScript_27AD92:: @ 827AD92
 	specialvar VAR_RESULT, sub_80F9134
 	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_27ADA3
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_27ADA3
 	return
 
 LilycoveCity_ContestLobby_EventScript_27ADA3:: @ 827ADA3