improve goto_if macros

1 files changed, 41 insertions, 45 deletions

diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 829062a73..54f6501fe 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -8,17 +8,17 @@ LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
 	call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7
 	call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD
 	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
 	compare VAR_0x40D3, 4
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
 	compare VAR_0x40D3, 3
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD
 	specialvar VAR_RESULT, sub_80C08E4
 	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9
 	setobjectmovementtype 3, 3
 	setobjectxyperm 3, 5, 10
 	end
@@ -100,9 +100,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB
 	waitfanfare
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07
@@ -114,9 +114,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36
@@ -129,9 +129,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67
@@ -265,9 +265,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84
 	lock
 	faceplayer
 	compare VAR_0x4084, 3
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1
-	checkflag FLAG_0x058
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1
+	goto_if_set FLAG_0x058, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT
 	setflag FLAG_0x058
 	release
@@ -286,39 +285,39 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
 	release
 	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
 	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
 	waitmovement 0
 	drawmonpic SPECIES_CYNDAQUIL, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
 	release
 	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
 	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
 	waitmovement 0
 	drawmonpic SPECIES_TOTODILE, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
 	release
 	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
 	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
 	waitmovement 0
 	drawmonpic SPECIES_CHIKORITA, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE
 	end
 
@@ -338,9 +337,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
 	setvar VAR_TEMP_1, 155
 	givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
 	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC
 	erasemonpic
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
 	end
@@ -350,7 +349,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
 	removeobject 4
 	msgbox gUnknown_08273374, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
 	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
@@ -361,7 +360,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC
 	removeobject 4
 	msgbox gUnknown_08273374, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
 	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
 	end
@@ -383,9 +382,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
 	setvar VAR_TEMP_1, 158
 	givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
 	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D
 	erasemonpic
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
 	end
@@ -395,7 +394,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
 	removeobject 5
 	msgbox gUnknown_08273374, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
 	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
@@ -406,7 +405,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D
 	removeobject 5
 	msgbox gUnknown_08273374, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
 	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
 	end
@@ -428,9 +427,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
 	setvar VAR_TEMP_1, 152
 	givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3
 	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E
 	erasemonpic
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
 	end
@@ -440,7 +439,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
 	removeobject 6
 	msgbox gUnknown_08273374, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
 	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
@@ -451,7 +450,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E
 	removeobject 6
 	msgbox gUnknown_08273374, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
 	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
 	end
@@ -479,13 +478,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
 	lock
 	faceplayer
 	compare VAR_0x40D3, 5
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A
 	compare VAR_0x40D3, 2
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
-	checkflag FLAG_0x119
-	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
+	goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
+	goto_if_unset FLAG_0x119, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
 	end
 
@@ -500,14 +497,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
-	checkflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
-	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, LittlerootTown_ProfessorBirchsLab_EventScript_272141
 	compare VAR_0x40D3, 3
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
 	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141
 	compare VAR_0x4084, 5
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT
 	release
 	end
@@ -603,11 +599,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC
 	lock
 	faceplayer
 	compare VAR_0x40D3, 5
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A
 	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA465
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA465
 	compare VAR_0x40D3, 2
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA490
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490
 	checkplayergender
 	compare VAR_RESULT, 0
 	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA428