Use MSGBOX constants

data/maps/CeladonCity/scripts.inc

@@ -7,7 +7,7 @@ CeladonCity_OnTransition:: @ 8166C95
 	end
 
 CeladonCity_EventScript_166C99:: @ 8166C99
-	msgbox gUnknown_817FEC3, 2
+	msgbox gUnknown_817FEC3, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166CA2:: @ 8166CA2
@@ -17,11 +17,11 @@ CeladonCity_EventScript_166CA2:: @ 8166CA2
 	end
 
 CeladonCity_EventScript_166CAD:: @ 8166CAD
-	msgbox gUnknown_817FF4A, 2
+	msgbox gUnknown_817FF4A, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166CB6:: @ 8166CB6
-	msgbox gUnknown_817FFC5, 2
+	msgbox gUnknown_817FFC5, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166CBF:: @ 8166CBF
@@ -52,27 +52,27 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC
 	end
 
 CeladonCity_EventScript_166CFA:: @ 8166CFA
-	msgbox gUnknown_81800C2, 2
+	msgbox gUnknown_81800C2, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166D03:: @ 8166D03
-	msgbox gUnknown_818008C, 2
+	msgbox gUnknown_818008C, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166D0C:: @ 8166D0C
-	msgbox gUnknown_8180300, 2
+	msgbox gUnknown_8180300, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166D15:: @ 8166D15
-	msgbox gUnknown_81804E1, 2
+	msgbox gUnknown_81804E1, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166D1E:: @ 8166D1E
-	msgbox gUnknown_81800E1, 3
+	msgbox gUnknown_81800E1, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D27:: @ 8166D27
-	msgbox gUnknown_818017A, 3
+	msgbox gUnknown_818017A, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D30:: @ 8166D30
@@ -83,21 +83,21 @@ CeladonCity_EventScript_166D30:: @ 8166D30
 	end
 
 CeladonCity_EventScript_166D48:: @ 8166D48
-	msgbox gUnknown_81801E5, 3
+	msgbox gUnknown_81801E5, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D51:: @ 8166D51
-	msgbox gUnknown_81801F5, 3
+	msgbox gUnknown_81801F5, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D5A:: @ 8166D5A
-	msgbox gUnknown_8180224, 3
+	msgbox gUnknown_8180224, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D63:: @ 8166D63
-	msgbox gUnknown_81802A4, 3
+	msgbox gUnknown_81802A4, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D6C:: @ 8166D6C
-	msgbox gUnknown_81802CF, 3
+	msgbox gUnknown_81802CF, MSGBOX_SIGN
 	end

data/maps/CeladonCity_Condominiums_1F/scripts.inc

@@ -59,5 +59,5 @@ CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4
 	end
 
 CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7
-	msgbox gUnknown_8196287, 3
+	msgbox gUnknown_8196287, MSGBOX_SIGN
 	end

data/maps/CeladonCity_Condominiums_2F/scripts.inc

@@ -2,5 +2,5 @@ CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0
 	.byte 0
 
 CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1
-	msgbox gUnknown_81962A7, 3
+	msgbox gUnknown_81962A7, MSGBOX_SIGN
 	end

data/maps/CeladonCity_Condominiums_3F/scripts.inc

@@ -2,15 +2,15 @@ CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA
 	.byte 0
 
 CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB
-	msgbox gUnknown_81962BF, 2
+	msgbox gUnknown_81962BF, MSGBOX_NPC
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4
-	msgbox gUnknown_81962D7, 2
+	msgbox gUnknown_81962D7, MSGBOX_NPC
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED
-	msgbox gUnknown_81962FB, 2
+	msgbox gUnknown_81962FB, MSGBOX_NPC
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6
@@ -40,17 +40,17 @@ EventScript_16C418:: @ 816C418
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435
-	msgbox gUnknown_81964A8, 3
+	msgbox gUnknown_81964A8, MSGBOX_SIGN
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E
-	msgbox gUnknown_819640C, 3
+	msgbox gUnknown_819640C, MSGBOX_SIGN
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447
-	msgbox gUnknown_819644B, 3
+	msgbox gUnknown_819644B, MSGBOX_SIGN
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450
-	msgbox gUnknown_8196478, 3
+	msgbox gUnknown_8196478, MSGBOX_SIGN
 	end

data/maps/CeladonCity_Condominiums_Roof/scripts.inc

@@ -2,5 +2,5 @@ CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459
 	.byte 0
 
 CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A
-	msgbox gUnknown_81964C4, 3
+	msgbox gUnknown_81964C4, MSGBOX_SIGN
 	end

data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc

@@ -2,7 +2,7 @@ CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463
 	.byte 0
 
 CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464
-	msgbox gUnknown_81964D7, 2
+	msgbox gUnknown_81964D7, MSGBOX_NPC
 	end
 
 CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
@@ -27,7 +27,7 @@ EventScript_16C4A6:: @ 816C4A6
 	waitfanfare
 	getspeciesname 0, SPECIES_EEVEE
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16C514
 	call EventScript_1A8C27
 	call EventScript_1A74EB
@@ -42,7 +42,7 @@ EventScript_16C4DA:: @ 816C4DA
 	waitfanfare
 	getspeciesname 0, SPECIES_EEVEE
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16C509
 	call EventScript_1A8C33
 	goto EventScript_16C509
@@ -59,7 +59,7 @@ EventScript_16C514:: @ 816C514
 	end
 
 CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519
-	msgbox gUnknown_81967E3, 3
+	msgbox gUnknown_81967E3, MSGBOX_SIGN
 	end
 
 CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522

data/maps/CeladonCity_DepartmentStore_1F/scripts.inc

@@ -2,13 +2,13 @@ CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8
 	.byte 0
 
 CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9
-	msgbox gUnknown_81954DD, 2
+	msgbox gUnknown_81954DD, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2
-	msgbox gUnknown_8195537, 3
+	msgbox gUnknown_8195537, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB
-	msgbox gUnknown_81955B3, 3
+	msgbox gUnknown_81955B3, MSGBOX_SIGN
 	end

data/maps/CeladonCity_DepartmentStore_2F/scripts.inc

@@ -2,15 +2,15 @@ CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4
 	.byte 0
 
 CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5
-	msgbox gUnknown_81955C7, 2
+	msgbox gUnknown_81955C7, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE
-	msgbox gUnknown_819560F, 2
+	msgbox gUnknown_819560F, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
-	msgbox gUnknown_8195638, 3
+	msgbox gUnknown_8195638, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10

data/maps/CeladonCity_DepartmentStore_3F/scripts.inc

@@ -6,45 +6,45 @@ CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B
-	msgbox gUnknown_81956E9, 2
+	msgbox gUnknown_81956E9, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94
-	msgbox gUnknown_8195769, 2
+	msgbox gUnknown_8195769, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D
-	msgbox gUnknown_81957B0, 2
+	msgbox gUnknown_81957B0, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6
-	msgbox gUnknown_8195823, 2
+	msgbox gUnknown_8195823, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF
-	msgbox gUnknown_8195863, 3
+	msgbox gUnknown_8195863, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8
-	msgbox gUnknown_8195875, 3
+	msgbox gUnknown_8195875, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1
-	msgbox gUnknown_8195897, 3
+	msgbox gUnknown_8195897, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA
-	msgbox gUnknown_81958B8, 3
+	msgbox gUnknown_81958B8, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3
-	msgbox gUnknown_81958D8, 3
+	msgbox gUnknown_81958D8, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC
-	msgbox gUnknown_81958F6, 3
+	msgbox gUnknown_81958F6, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5
-	msgbox gUnknown_8195907, 3
+	msgbox gUnknown_8195907, MSGBOX_SIGN
 	end

data/maps/CeladonCity_DepartmentStore_4F/scripts.inc

@@ -2,15 +2,15 @@ CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE
 	.byte 0
 
 CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF
-	msgbox gUnknown_8195A68, 2
+	msgbox gUnknown_8195A68, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8
-	msgbox gUnknown_8195AC9, 2
+	msgbox gUnknown_8195AC9, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
-	msgbox gUnknown_8195B5B, 3
+	msgbox gUnknown_8195B5B, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A

data/maps/CeladonCity_DepartmentStore_5F/scripts.inc

@@ -2,15 +2,15 @@ CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40
 	.byte 0
 
 CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41
-	msgbox gUnknown_8195BBA, 2
+	msgbox gUnknown_8195BBA, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A
-	msgbox gUnknown_8195CA0, 2
+	msgbox gUnknown_8195CA0, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53
-	msgbox gUnknown_8195D14, 3
+	msgbox gUnknown_8195D14, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C

data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc

@@ -41,7 +41,7 @@ EventScript_16BD38:: @ 816BD38
 
 EventScript_16BD3E:: @ 816BD3E
 	msgbox gUnknown_8195D22, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16C00C
 	textcolor 3
 	message Text_195D5F
@@ -201,11 +201,11 @@ EventScript_16C018:: @ 816C018
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022
-	msgbox gUnknown_8195F98, 2
+	msgbox gUnknown_8195F98, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B
-	msgbox gUnknown_8196017, 3
+	msgbox gUnknown_8196017, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034

data/maps/CeladonCity_GameCorner/scripts.inc

@@ -15,7 +15,7 @@ EventScript_16C656:: @ 816C656
 	return
 
 CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
-	msgbox gUnknown_8196940, 2
+	msgbox gUnknown_8196940, MSGBOX_NPC
 	end
 
 CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
@@ -254,7 +254,7 @@ EventScript_16C96A:: @ 816C96A
 EventScript_16C96C:: @ 816C96C
 	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0
 	msgbox gUnknown_8196F46, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16C96A
 	setfieldeffectarg 0, 255
 	setfieldeffectarg 1, 10
@@ -417,7 +417,7 @@ EventScript_16CABE:: @ 816CABE
 
 CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5
 	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10
-	msgbox gUnknown_8196E9B, 6
+	msgbox gUnknown_8196E9B, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16CB10:: @ 816CB10
@@ -462,13 +462,13 @@ Movement_16CB53:: @ 816CB53
 	step_end
 
 CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A
-	msgbox gUnknown_8196F64, 3
+	msgbox gUnknown_8196F64, MSGBOX_SIGN
 	end
 
 CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63
-	msgbox gUnknown_8196F81, 3
+	msgbox gUnknown_8196F81, MSGBOX_SIGN
 	end
 
 CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C
-	msgbox gUnknown_8196FA0, 3
+	msgbox gUnknown_8196FA0, MSGBOX_SIGN
 	end

data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc

@@ -2,11 +2,11 @@ CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75
 	.byte 0
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76
-	msgbox gUnknown_8196FC1, 2
+	msgbox gUnknown_8196FC1, MSGBOX_NPC
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F
-	msgbox gUnknown_8196FFF, 2
+	msgbox gUnknown_8196FFF, MSGBOX_NPC
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
@@ -108,7 +108,7 @@ EventScript_16CC55:: @ 816CC55
 EventScript_16CC65:: @ 816CC65
 	getspeciesname 0, VAR_TEMP_1
 	msgbox gUnknown_819709D, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16CC10
 	checkcoins VAR_RESULT
 	compare VAR_RESULT, VAR_TEMP_2
@@ -221,7 +221,7 @@ EventScript_16CDB3:: @ 816CDB3
 	waitmessage
 	waitfanfare
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16CD83
 	goto EventScript_16CC10
 	end
@@ -235,7 +235,7 @@ EventScript_16CDE0:: @ 816CDE0
 	waitmessage
 	waitfanfare
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16CE12
 	call EventScript_1A8C33
 	goto EventScript_16CE12
@@ -309,7 +309,7 @@ EventScript_16CEF5:: @ 816CEF5
 
 EventScript_16CF09:: @ 816CF09
 	msgbox gUnknown_81970B2, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16CC10
 	goto EventScript_16CF3F
 	end
@@ -317,7 +317,7 @@ EventScript_16CF09:: @ 816CF09
 EventScript_16CF22:: @ 816CF22
 	getitemname 0, VAR_TEMP_1
 	msgbox gUnknown_819709D, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16CC10
 	goto EventScript_16CF3F
 	end

data/maps/CeladonCity_Gym/scripts.inc

@@ -37,39 +37,39 @@ EventScript_16D107:: @ 816D107
 
 CeladonCity_Gym_EventScript_16D111:: @ 816D111
 	trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4
-	msgbox gUnknown_81974D6, 6
+	msgbox gUnknown_81974D6, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D128:: @ 816D128
 	trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF
 	famechecker FAMECHECKER_ERIKA, 2
-	msgbox gUnknown_8197708, 6
+	msgbox gUnknown_8197708, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D14C:: @ 816D14C
 	trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB
-	msgbox gUnknown_81975D1, 6
+	msgbox gUnknown_81975D1, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D163:: @ 816D163
 	trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C
-	msgbox gUnknown_8197527, 6
+	msgbox gUnknown_8197527, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D17A:: @ 816D17A
 	trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660
 	famechecker FAMECHECKER_ERIKA, 3
-	msgbox gUnknown_8197664, 6
+	msgbox gUnknown_8197664, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D19E:: @ 816D19E
 	trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A
-	msgbox gUnknown_8197788, 6
+	msgbox gUnknown_8197788, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5
 	trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832
-	msgbox gUnknown_819783E, 6
+	msgbox gUnknown_819783E, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC

data/maps/CeladonCity_Hotel/scripts.inc

@@ -2,17 +2,17 @@ CeladonCity_Hotel_MapScripts:: @ 816D283
 	.byte 0
 
 CeladonCity_Hotel_EventScript_16D284:: @ 816D284
-	msgbox gUnknown_8197B77, 2
+	msgbox gUnknown_8197B77, MSGBOX_NPC
 	end
 
 CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D
-	msgbox gUnknown_8197BBE, 2
+	msgbox gUnknown_8197BBE, MSGBOX_NPC
 	end
 
 CeladonCity_Hotel_EventScript_16D296:: @ 816D296
-	msgbox gUnknown_8197C0C, 2
+	msgbox gUnknown_8197C0C, MSGBOX_NPC
 	end
 
 CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F
-	msgbox gUnknown_8197C30, 2
+	msgbox gUnknown_8197C30, MSGBOX_NPC
 	end

data/maps/CeladonCity_House1/scripts.inc

@@ -2,13 +2,13 @@ CeladonCity_House1_MapScripts:: @ 816D267
 	.byte 0
 
 CeladonCity_House1_EventScript_16D268:: @ 816D268
-	msgbox gUnknown_8197A9F, 2
+	msgbox gUnknown_8197A9F, MSGBOX_NPC
 	end
 
 CeladonCity_House1_EventScript_16D271:: @ 816D271
-	msgbox gUnknown_8197AD3, 2
+	msgbox gUnknown_8197AD3, MSGBOX_NPC
 	end
 
 CeladonCity_House1_EventScript_16D27A:: @ 816D27A
-	msgbox gUnknown_8197B20, 2
+	msgbox gUnknown_8197B20, MSGBOX_NPC
 	end

data/maps/CeladonCity_PokemonCenter_1F/scripts.inc

@@ -15,13 +15,13 @@ CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB
 	end
 
 CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604
-	msgbox gUnknown_819685B, 2
+	msgbox gUnknown_819685B, MSGBOX_NPC
 	end
 
 CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D
-	msgbox gUnknown_81968C2, 2
+	msgbox gUnknown_81968C2, MSGBOX_NPC
 	end
 
 CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616
-	msgbox gUnknown_8196913, 2
+	msgbox gUnknown_8196913, MSGBOX_NPC
 	end

data/maps/CeladonCity_Restaurant/scripts.inc

@@ -2,11 +2,11 @@ CeladonCity_Restaurant_MapScripts:: @ 816D1EA
 	.byte 0
 
 CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB
-	msgbox gUnknown_81978E6, 2
+	msgbox gUnknown_81978E6, MSGBOX_NPC
 	end
 
 CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4
-	msgbox gUnknown_8197915, 2
+	msgbox gUnknown_8197915, MSGBOX_NPC
 	end
 
 CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
@@ -33,9 +33,9 @@ EventScript_16D24B:: @ 816D24B
 	end
 
 CeladonCity_Restaurant_EventScript_16D255:: @ 816D255
-	msgbox gUnknown_8197952, 2
+	msgbox gUnknown_8197952, MSGBOX_NPC
 	end
 
 CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E
-	msgbox gUnknown_819798A, 2
+	msgbox gUnknown_819798A, MSGBOX_NPC
 	end

data/maps/CeruleanCity/scripts.inc

@@ -255,15 +255,15 @@ EventScript_166713:: @ 8166713
 	end
 
 CeruleanCity_EventScript_16671D:: @ 816671D
-	msgbox gUnknown_817F0B2, 2
+	msgbox gUnknown_817F0B2, MSGBOX_NPC
 	end
 
 CeruleanCity_EventScript_166726:: @ 8166726
-	msgbox gUnknown_817EF3F, 2
+	msgbox gUnknown_817EF3F, MSGBOX_NPC
 	end
 
 CeruleanCity_EventScript_16672F:: @ 816672F
-	msgbox gUnknown_817F319, 2
+	msgbox gUnknown_817F319, MSGBOX_NPC
 	end
 
 CeruleanCity_EventScript_166738:: @ 8166738
@@ -357,15 +357,15 @@ EventScript_16682F:: @ 816682F
 	return
 
 CeruleanCity_EventScript_166838:: @ 8166838
-	msgbox gUnknown_817F420, 3
+	msgbox gUnknown_817F420, MSGBOX_SIGN
 	end
 
 CeruleanCity_EventScript_166841:: @ 8166841
-	msgbox gUnknown_817F453, 3
+	msgbox gUnknown_817F453, MSGBOX_SIGN
 	end
 
 CeruleanCity_EventScript_16684A:: @ 816684A
-	msgbox gUnknown_817F4C5, 3
+	msgbox gUnknown_817F4C5, MSGBOX_SIGN
 	end
 
 CeruleanCity_EventScript_166853:: @ 8166853

data/maps/CeruleanCity_BikeShop/scripts.inc

@@ -48,7 +48,7 @@ EventScript_16AC62:: @ 816AC62
 	end
 
 CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C
-	msgbox gUnknown_81928CF, 2
+	msgbox gUnknown_81928CF, MSGBOX_NPC
 	end
 
 CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75
@@ -66,5 +66,5 @@ EventScript_16AC8A:: @ 816AC8A
 
 CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94
 CeruleanCity_EventScript_16AC94:: @ 816AC94
-	msgbox gUnknown_81929AD, 3
+	msgbox gUnknown_81929AD, MSGBOX_SIGN
 	end

data/maps/CeruleanCity_Gym/scripts.inc

@@ -36,13 +36,13 @@ EventScript_16AB3A:: @ 816AB3A
 
 CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44
 	trainerbattle_single TRAINER_PICNICKER_DIANA, Text_192481, Text_1924D0
-	msgbox gUnknown_81924E4, 6
+	msgbox gUnknown_81924E4, MSGBOX_AUTOCLOSE
 	end
 
 CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B
 	trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, Text_192524, Text_192547
 	famechecker FAMECHECKER_MISTY, 2
-	msgbox gUnknown_8192556, 6
+	msgbox gUnknown_8192556, MSGBOX_AUTOCLOSE
 	end
 
 CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F

data/maps/CeruleanCity_House2/scripts.inc

@@ -15,9 +15,9 @@ EventScript_16A98B:: @ 816A98B
 	end
 
 CeruleanCity_House2_EventScript_16A995:: @ 816A995
-	msgbox gUnknown_8191F2A, 2
+	msgbox gUnknown_8191F2A, MSGBOX_NPC
 	end
 
 CeruleanCity_House2_EventScript_16A99E:: @ 816A99E
-	msgbox gUnknown_8191F64, 3
+	msgbox gUnknown_8191F64, MSGBOX_SIGN
 	end

data/maps/CeruleanCity_House3/scripts.inc

@@ -2,7 +2,7 @@ CeruleanCity_House3_MapScripts:: @ 816A9A7
 	.byte 0
 
 CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8
-	msgbox gUnknown_8191F80, 2
+	msgbox gUnknown_8191F80, MSGBOX_NPC
 	end
 
 CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
@@ -12,7 +12,7 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
 	call EventScript_1A8CAD
 	goto_if_set FLAG_DID_ZYNX_TRADE, EventScript_16AA23
 	msgbox gUnknown_81A59FE, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16AA0B
 	call EventScript_1A8CBD
 	compare VAR_0x8004, 6

data/maps/CeruleanCity_House5/scripts.inc

@@ -6,7 +6,7 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
 	faceplayer
 	goto_if_set FLAG_GOT_POWDER_JAR, EventScript_16AEB7
 	msgbox gUnknown_8192F67, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16AEAD
 	goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, EventScript_16AEA3
 	msgbox gUnknown_8193003
@@ -141,7 +141,7 @@ EventScript_16B048:: @ 816B048
 
 EventScript_16B055:: @ 816B055
 	msgbox gUnknown_819331E, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16AEC8
 	copyvar VAR_0x8004, VAR_0x8009
 	specialvar VAR_RESULT, sub_815EEB0
@@ -154,7 +154,7 @@ EventScript_16B055:: @ 816B055
 	special sub_815EF5C
 	special sub_815F070
 	msgbox gUnknown_819337A, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16AEC8
 	msgbox gUnknown_81933FB
 	special sub_815F114

data/maps/CeruleanCity_Mart/scripts.inc

@@ -2,11 +2,11 @@ CeruleanCity_Mart_MapScripts:: @ 816AC9D
 	.byte 0
 
 CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E
-	msgbox gUnknown_81929C2, 2
+	msgbox gUnknown_81929C2, MSGBOX_NPC
 	end
 
 CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7
-	msgbox gUnknown_8192A79, 2
+	msgbox gUnknown_8192A79, MSGBOX_NPC
 	end
 
 CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0

data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc

@@ -15,11 +15,11 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_16AA45:: @ 816AA45
-	msgbox gUnknown_8192079, 2
+	msgbox gUnknown_8192079, MSGBOX_NPC
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E
-	msgbox gUnknown_8191FFB, 2
+	msgbox gUnknown_8191FFB, MSGBOX_NPC
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57
@@ -31,5 +31,5 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70
-	msgbox gUnknown_819214C, 2
+	msgbox gUnknown_819214C, MSGBOX_NPC
 	end

data/maps/CinnabarIsland/scripts.inc

@@ -103,9 +103,9 @@ EventScript_166FCD:: @ 8166FCD
 	call_if_set FLAG_TEMP_2, EventScript_167053
 	msgbox gUnknown_8180C90
 	msgbox gUnknown_8180CAA, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_167068
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_167078
 	end
 
@@ -337,15 +337,15 @@ CinnabarIsland_EventScript_1671EF:: @ 81671EF
 	end
 
 CinnabarIsland_EventScript_167208:: @ 8167208
-	msgbox gUnknown_8180BA0, 2
+	msgbox gUnknown_8180BA0, MSGBOX_NPC
 	end
 
 CinnabarIsland_EventScript_167211:: @ 8167211
-	msgbox gUnknown_8180C0D, 3
+	msgbox gUnknown_8180C0D, MSGBOX_SIGN
 	end
 
 CinnabarIsland_EventScript_16721A:: @ 816721A
-	msgbox gUnknown_8180C3E, 3
+	msgbox gUnknown_8180C3E, MSGBOX_SIGN
 	end
 
 CinnabarIsland_EventScript_167223:: @ 8167223

data/maps/CinnabarIsland_Gym/scripts.inc

@@ -82,12 +82,12 @@ EventScript_16DA75:: @ 816DA75
 
 CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F
 	trainerbattle_single TRAINER_SUPER_NERD_ERIK, Text_1997A5, Text_1997D6
-	msgbox gUnknown_81997EA, 6
+	msgbox gUnknown_81997EA, MSGBOX_AUTOCLOSE
 	end
 
 CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96
 	trainerbattle_single TRAINER_SUPER_NERD_AVERY, Text_1998BD, Text_1998ED, EventScript_16DAB1
-	msgbox gUnknown_8199911, 6
+	msgbox gUnknown_8199911, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DAB1:: @ 816DAB1
@@ -102,7 +102,7 @@ EventScript_16DABC:: @ 816DABC
 CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2
 	trainerbattle_single TRAINER_SUPER_NERD_DEREK, Text_1999B7, Text_1999DB, EventScript_16DAEA
 	famechecker FAMECHECKER_BLAINE, 2
-	msgbox gUnknown_81999DF, 6
+	msgbox gUnknown_81999DF, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DAEA:: @ 816DAEA
@@ -116,7 +116,7 @@ EventScript_16DAF5:: @ 816DAF5
 
 CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB
 	trainerbattle_single TRAINER_SUPER_NERD_ZAC, Text_199AFC, Text_199B16, EventScript_16DB16
-	msgbox gUnknown_8199B27, 6
+	msgbox gUnknown_8199B27, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DB16:: @ 816DB16
@@ -130,7 +130,7 @@ EventScript_16DB21:: @ 816DB21
 
 CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27
 	trainerbattle_single TRAINER_BURGLAR_QUINN, Text_19983F, Text_199870, EventScript_16DB42
-	msgbox gUnknown_819987D, 6
+	msgbox gUnknown_819987D, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DB42:: @ 816DB42
@@ -144,7 +144,7 @@ EventScript_16DB4D:: @ 816DB4D
 
 CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53
 	trainerbattle_single TRAINER_BURGLAR_RAMON, Text_199948, Text_199973, EventScript_16DB6E
-	msgbox gUnknown_8199986, 6
+	msgbox gUnknown_8199986, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DB6E:: @ 816DB6E
@@ -158,7 +158,7 @@ EventScript_16DB79:: @ 816DB79
 
 CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F
 	trainerbattle_single TRAINER_BURGLAR_DUSTY, Text_199A7F, Text_199AB9, EventScript_16DB9A
-	msgbox gUnknown_8199AC9, 6
+	msgbox gUnknown_8199AC9, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DB9A:: @ 816DB9A
@@ -210,9 +210,9 @@ CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4
 EventScript_16DC00:: @ 816DC00
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199D5A, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16DC43
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16DC6A
 	end
 
@@ -305,9 +305,9 @@ CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9
 EventScript_16DCF5:: @ 816DCF5
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199D79, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16DD41
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16DD1C
 	end
 
@@ -391,9 +391,9 @@ CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7
 EventScript_16DDD3:: @ 816DDD3
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199DA9, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16DE1F
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16DDFA
 	end
 
@@ -468,9 +468,9 @@ CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E
 EventScript_16DEAA:: @ 816DEAA
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199DC6, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16DEF6
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16DED1
 	end
 
@@ -545,9 +545,9 @@ CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75
 EventScript_16DF81:: @ 816DF81
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199E00, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16DFA8
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16DFCD
 	end
 
@@ -622,9 +622,9 @@ CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C
 EventScript_16E058:: @ 816E058
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199E36, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16E0A4
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16E07F
 	end
 

data/maps/CinnabarIsland_Mart/scripts.inc

@@ -2,11 +2,11 @@ CinnabarIsland_Mart_MapScripts:: @ 816EA0F
 	.byte 0
 
 CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10
-	msgbox gUnknown_819A7A0, 2
+	msgbox gUnknown_819A7A0, MSGBOX_NPC
 	end
 
 CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19
-	msgbox gUnknown_819A7F1, 2
+	msgbox gUnknown_819A7F1, MSGBOX_NPC
 	end
 
 CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22

data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc

@@ -15,22 +15,22 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF
-	msgbox gUnknown_819A5BE, 2
+	msgbox gUnknown_819A5BE, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8
-	msgbox gUnknown_819A4F8, 2
+	msgbox gUnknown_819A4F8, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901
-	msgbox gUnknown_819A6B1, 2
+	msgbox gUnknown_819A6B1, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
 	lock
 	faceplayer
 	msgbox gUnknown_819A725, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16E9A5
 	msgbox gUnknown_819A785
 	closemessage

data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc

@@ -12,21 +12,21 @@ EventScript_16E285:: @ 816E285
 	return
 
 CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B
-	msgbox gUnknown_8199EE5, 2
+	msgbox gUnknown_8199EE5, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294
-	msgbox gUnknown_8199F41, 3
+	msgbox gUnknown_8199F41, MSGBOX_SIGN
 	end
 
 CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D
-	msgbox gUnknown_8199F6A, 3
+	msgbox gUnknown_8199F6A, MSGBOX_SIGN
 	end
 
 CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6
-	msgbox gUnknown_8199F83, 3
+	msgbox gUnknown_8199F83, MSGBOX_SIGN
 	end
 
 CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF
-	msgbox gUnknown_8199F9A, 3
+	msgbox gUnknown_8199F9A, MSGBOX_SIGN
 	end

data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc

@@ -8,7 +8,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
 	call EventScript_1A8CAD
 	goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473
 	msgbox gUnknown_81A597B, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16E45B
 	call EventScript_1A8CBD
 	compare VAR_0x8004, 6
@@ -147,7 +147,7 @@ EventScript_16E668:: @ 816E668
 	getspeciesname 0, SPECIES_OMANYTE
 	getitemname 1, ITEM_HELIX_FOSSIL
 	msgbox gUnknown_819A3D4, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16E722
 	msgbox gUnknown_819A45D
 	textcolor 0
@@ -162,7 +162,7 @@ EventScript_16E6A6:: @ 816E6A6
 	getspeciesname 0, SPECIES_KABUTO
 	getitemname 1, ITEM_DOME_FOSSIL
 	msgbox gUnknown_819A3D4, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16E722
 	msgbox gUnknown_819A45D
 	textcolor 0
@@ -177,7 +177,7 @@ EventScript_16E6E4:: @ 816E6E4
 	getspeciesname 0, SPECIES_AERODACTYL
 	getitemname 1, ITEM_OLD_AMBER
 	msgbox gUnknown_819A3D4, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16E722
 	msgbox gUnknown_819A45D
 	textcolor 0
@@ -257,7 +257,7 @@ EventScript_16E827:: @ 816E827
 	waitfanfare
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16E895
 	call EventScript_1A8C27
 	call EventScript_1A74EB
@@ -272,7 +272,7 @@ EventScript_16E85B:: @ 816E85B
 	waitfanfare
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16E88A
 	call EventScript_1A8C33
 	goto EventScript_16E88A

data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc

@@ -2,7 +2,7 @@ CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8
 	.byte 0
 
 CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9
-	msgbox gUnknown_8199FB3, 2
+	msgbox gUnknown_8199FB3, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
@@ -12,7 +12,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
 	call EventScript_1A8CAD
 	goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334
 	msgbox gUnknown_81A59FE, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16E31C
 	call EventScript_1A8CBD
 	compare VAR_0x8004, 6
@@ -51,7 +51,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
 	copyvar VAR_0x8009, VAR_RESULT
 	goto_if_set FLAG_DID_TANGENY_TRADE, EventScript_16E3D4
 	msgbox gUnknown_81A5AD6, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16E3BC
 	special Special_ChooseMonFromParty
 	waitstate

data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc

@@ -6,13 +6,13 @@ CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF
 	end
 
 CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5
-	msgbox gUnknown_819A015, 2
+	msgbox gUnknown_819A015, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE
-	msgbox gUnknown_819A04A, 3
+	msgbox gUnknown_819A04A, MSGBOX_SIGN
 	end
 
 CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7
-	msgbox gUnknown_819A128, 3
+	msgbox gUnknown_819A128, MSGBOX_SIGN
 	end

data/maps/DiglettsCave_NorthEntrance/scripts.inc

@@ -2,5 +2,5 @@ DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7
 	.byte 0
 
 DiglettsCave_NorthEntrance_EventScript_160EE8:: @ 8160EE8
-	msgbox gUnknown_817462C, 2
+	msgbox gUnknown_817462C, MSGBOX_NPC
 	end

data/maps/DiglettsCave_SouthEntrance/scripts.inc

@@ -2,5 +2,5 @@ DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB
 	.byte 0
 
 DiglettsCave_SouthEntrance_EventScript_160EFC:: @ 8160EFC
-	msgbox gUnknown_81746A7, 2
+	msgbox gUnknown_81746A7, MSGBOX_NPC
 	end

data/maps/FiveIsland/scripts.inc

@@ -7,13 +7,13 @@ FiveIsland_OnTransition:: @ 8167E94
 	end
 
 FiveIsland_EventScript_167E98:: @ 8167E98
-	msgbox gUnknown_8182DFB, 3
+	msgbox gUnknown_8182DFB, MSGBOX_SIGN
 	end
 
 FiveIsland_EventScript_167EA1:: @ 8167EA1
-	msgbox gUnknown_8182E26, 2
+	msgbox gUnknown_8182E26, MSGBOX_NPC
 	end
 
 FiveIsland_EventScript_167EAA:: @ 8167EAA
-	msgbox gUnknown_8182E96, 2
+	msgbox gUnknown_8182E96, MSGBOX_NPC
 	end

data/maps/FiveIsland_House1/scripts.inc

@@ -2,5 +2,5 @@ FiveIsland_House1_MapScripts:: @ 8171D56
 	.byte 0
 
 FiveIsland_House1_EventScript_171D57:: @ 8171D57
-	msgbox gUnknown_81A3CAC, 2
+	msgbox gUnknown_81A3CAC, MSGBOX_NPC
 	end

data/maps/FiveIsland_House2/scripts.inc

@@ -2,5 +2,5 @@ FiveIsland_House2_MapScripts:: @ 8171D60
 	.byte 0
 
 FiveIsland_House2_EventScript_171D61:: @ 8171D61
-	msgbox gUnknown_81A3D5E, 2
+	msgbox gUnknown_81A3D5E, MSGBOX_NPC
 	end

data/maps/FiveIsland_LostCave_Room1/scripts.inc

@@ -3,5 +3,5 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6
 
 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7
 	trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, Text_17CEF5, Text_17CF42
-	msgbox gUnknown_817CF54, 6
+	msgbox gUnknown_817CF54, MSGBOX_AUTOCLOSE
 	end

data/maps/FiveIsland_LostCave_Room4/scripts.inc

@@ -3,5 +3,5 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10
 
 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11
 	trainerbattle_single TRAINER_PSYCHIC_LAURA, Text_17CFC1, Text_17CFFB
-	msgbox gUnknown_817D037, 6
+	msgbox gUnknown_817D037, MSGBOX_AUTOCLOSE
 	end

data/maps/FiveIsland_Meadow/scripts.inc

@@ -37,15 +37,15 @@ EventScript_168983:: @ 8168983
 
 FiveIsland_Meadow_EventScript_16898D:: @ 816898D
 	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, Text_18AC88, Text_18ACB3
-	msgbox gUnknown_818ACC5, 6
+	msgbox gUnknown_818ACC5, MSGBOX_AUTOCLOSE
 	end
 
 FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4
 	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, Text_18ACF0, Text_18AD39
-	msgbox gUnknown_818AD59, 6
+	msgbox gUnknown_818AD59, MSGBOX_AUTOCLOSE
 	end
 
 FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB
 	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, Text_18ADC6, Text_18ADFB
-	msgbox gUnknown_818AE16, 6
+	msgbox gUnknown_818AE16, MSGBOX_AUTOCLOSE
 	end

data/maps/FiveIsland_MemorialPillar/scripts.inc

@@ -48,7 +48,7 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
 
 EventScript_168A86:: @ 8168A86
 	msgbox gUnknown_818B105, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_168A9B
 	releaseall
 	end

data/maps/FiveIsland_PokemonCenter_1F/scripts.inc

@@ -15,9 +15,9 @@ FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00
 	end
 
 FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09
-	msgbox gUnknown_81A3BBA, 2
+	msgbox gUnknown_81A3BBA, MSGBOX_NPC
 	end
 
 FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12
-	msgbox gUnknown_81A3BFD, 2
+	msgbox gUnknown_81A3BFD, MSGBOX_NPC
 	end

data/maps/FiveIsland_ResortGorgeous/scripts.inc

@@ -40,5 +40,5 @@ Movement_168841:: @ 8168841
 	step_end
 
 FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844
-	msgbox gUnknown_818A7FE, 3
+	msgbox gUnknown_818A7FE, MSGBOX_SIGN
 	end

data/maps/FiveIsland_ResortGorgeous_House/scripts.inc

@@ -144,5 +144,5 @@ Movement_172060:: @ 8172060
 	step_end
 
 FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062
-	msgbox gUnknown_81A4657, 2
+	msgbox gUnknown_81A4657, MSGBOX_NPC
 	end

data/maps/FiveIsland_RocketWarehouse/scripts.inc

@@ -30,7 +30,7 @@ EventScript_163F6E:: @ 8163F6E
 	end
 
 FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78
-	msgbox gUnknown_817BB15, 3
+	msgbox gUnknown_817BB15, MSGBOX_SIGN
 	end
 
 FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81
@@ -44,12 +44,12 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81
 FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93
 	trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD
 	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7
-	msgbox gUnknown_817BCA3, 6
+	msgbox gUnknown_817BCA3, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_163FB7:: @ 8163FB7
 	famechecker FAMECHECKER_GIOVANNI, 5
-	msgbox gUnknown_817BCD7, 6
+	msgbox gUnknown_817BCD7, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_163FCD:: @ 8163FCD
@@ -61,17 +61,17 @@ EventScript_163FCD:: @ 8163FCD
 
 FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6
 	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585
-	msgbox gUnknown_817B5A6, 6
+	msgbox gUnknown_817B5A6, MSGBOX_AUTOCLOSE
 	end
 
 FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD
 	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9
-	msgbox gUnknown_817B6EF, 6
+	msgbox gUnknown_817B6EF, MSGBOX_AUTOCLOSE
 	end
 
 FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014
 	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F
-	msgbox gUnknown_817BA64, 6
+	msgbox gUnknown_817BA64, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16402F:: @ 816402F
@@ -99,12 +99,12 @@ EventScript_164065:: @ 8164065
 
 FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070
 	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F
-	msgbox gUnknown_817B642, 6
+	msgbox gUnknown_817B642, MSGBOX_AUTOCLOSE
 	end
 
 FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
 	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2
-	msgbox gUnknown_817B7FA, 6
+	msgbox gUnknown_817B7FA, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_1640A2:: @ 81640A2

data/maps/FourIsland/scripts.inc

@@ -90,10 +90,10 @@ FourIsland_EventScript_167D55:: @ 8167D55
 
 EventScript_167D9B:: @ 8167D9B
 	msgbox gUnknown_81BF5E3, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_167DD1
 	msgbox gUnknown_81BF7B6, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_167DD1
 	msgbox gUnknown_81BF6CF
 	clearflag FLAG_PENDING_DAYCARE_EGG
@@ -161,13 +161,13 @@ FourIsland_EventScript_167E5A:: @ 8167E5A
 	end
 
 FourIsland_EventScript_167E73:: @ 8167E73
-	msgbox gUnknown_8182D8E, 2
+	msgbox gUnknown_8182D8E, MSGBOX_NPC
 	end
 
 FourIsland_EventScript_167E7C:: @ 8167E7C
-	msgbox gUnknown_8182A03, 3
+	msgbox gUnknown_8182A03, MSGBOX_SIGN
 	end
 
 FourIsland_EventScript_167E85:: @ 8167E85
-	msgbox gUnknown_8182DEB, 3
+	msgbox gUnknown_8182DEB, MSGBOX_SIGN
 	end

data/maps/FourIsland_House1/scripts.inc

@@ -2,5 +2,5 @@ FourIsland_House1_MapScripts:: @ 8171C44
 	.byte 0
 
 FourIsland_House1_EventScript_171C45:: @ 8171C45
-	msgbox gUnknown_81A3802, 2
+	msgbox gUnknown_81A3802, MSGBOX_NPC
 	end

data/maps/FourIsland_IcefallCave_Back/scripts.inc

@@ -188,5 +188,5 @@ Movement_163F23:: @ 8163F23
 	step_end
 
 FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25
-	msgbox gUnknown_817B457, 2
+	msgbox gUnknown_817B457, MSGBOX_NPC
 	end

data/maps/FourIsland_Mart/scripts.inc

@@ -29,5 +29,5 @@ Items_171CD4:: @ 8171CD4
 	end
 
 FourIsland_Mart_EventScript_171CE8:: @ 8171CE8
-	msgbox gUnknown_81A3B14, 2
+	msgbox gUnknown_81A3B14, MSGBOX_NPC
 	end

data/maps/FourIsland_PokemonCenter_1F/scripts.inc

@@ -15,13 +15,13 @@ FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9
 	end
 
 FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02
-	msgbox gUnknown_81A3627, 2
+	msgbox gUnknown_81A3627, MSGBOX_NPC
 	end
 
 FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B
-	msgbox gUnknown_81A3697, 2
+	msgbox gUnknown_81A3697, MSGBOX_NPC
 	end
 
 FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14
-	msgbox gUnknown_81A3734, 2
+	msgbox gUnknown_81A3734, MSGBOX_NPC
 	end

data/maps/FourIsland_PokemonDayCare/scripts.inc

@@ -15,7 +15,7 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940
 	compare VAR_RESULT, 3
 	goto_if_eq EventScript_171B86
 	msgbox gUnknown_81BF7E4, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_171993
 	msgbox gUnknown_81BF916
 	release
@@ -54,7 +54,7 @@ EventScript_1719F7:: @ 81719F7
 
 EventScript_171A01:: @ 8171A01
 	msgbox gUnknown_81BF89F, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_171993
 	goto EventScript_1719F7
 	end
@@ -89,10 +89,10 @@ EventScript_171A52:: @ 8171A52
 	setvar VAR_0x8004, 0
 	call EventScript_171A41
 	msgbox gUnknown_81BF89F, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_171993
 	msgbox gUnknown_81BFAE8, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_171A90
 	goto EventScript_1719F7
 	end
@@ -116,7 +116,7 @@ EventScript_171A90:: @ 8171A90
 EventScript_171ACF:: @ 8171ACF
 	special GetDaycareCost
 	msgbox gUnknown_81BFA3B, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_171AEB
 	goto EventScript_1719F7
 	end
@@ -150,7 +150,7 @@ EventScript_171B05:: @ 8171B05
 
 EventScript_171B4E:: @ 8171B4E
 	msgbox gUnknown_81BF94F, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_171A90
 	goto EventScript_1719F7
 	end
@@ -192,7 +192,7 @@ EventScript_171B86:: @ 8171B86
 	setvar VAR_0x8004, 1
 	call EventScript_171A41
 	msgbox gUnknown_81BFAE8, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_171A90
 	msgbox gUnknown_81BF976
 	release

data/maps/FuchsiaCity/scripts.inc

@@ -17,19 +17,19 @@ EventScript_166D97:: @ 8166D97
 	return
 
 FuchsiaCity_EventScript_166D9D:: @ 8166D9D
-	msgbox gUnknown_818056E, 2
+	msgbox gUnknown_818056E, MSGBOX_NPC
 	end
 
 FuchsiaCity_EventScript_166DA6:: @ 8166DA6
-	msgbox gUnknown_81805C6, 2
+	msgbox gUnknown_81805C6, MSGBOX_NPC
 	end
 
 FuchsiaCity_EventScript_166DAF:: @ 8166DAF
-	msgbox gUnknown_818062C, 2
+	msgbox gUnknown_818062C, MSGBOX_NPC
 	end
 
 FuchsiaCity_EventScript_166DB8:: @ 8166DB8
-	msgbox gUnknown_818065A, 2
+	msgbox gUnknown_818065A, MSGBOX_NPC
 	end
 
 FuchsiaCity_EventScript_166DC1:: @ 8166DC1
@@ -41,23 +41,23 @@ FuchsiaCity_EventScript_166DC1:: @ 8166DC1
 	end
 
 FuchsiaCity_EventScript_166DDA:: @ 8166DDA
-	msgbox gUnknown_81806AB, 3
+	msgbox gUnknown_81806AB, MSGBOX_SIGN
 	end
 
 FuchsiaCity_EventScript_166DE3:: @ 8166DE3
-	msgbox gUnknown_81806D3, 3
+	msgbox gUnknown_81806D3, MSGBOX_SIGN
 	end
 
 FuchsiaCity_EventScript_166DEC:: @ 8166DEC
-	msgbox gUnknown_81806F0, 3
+	msgbox gUnknown_81806F0, MSGBOX_SIGN
 	end
 
 FuchsiaCity_EventScript_166DF5:: @ 8166DF5
-	msgbox gUnknown_818070D, 3
+	msgbox gUnknown_818070D, MSGBOX_SIGN
 	end
 
 EventScript_166DFE:: @ 8166DFE
-	msgbox gUnknown_8180727, 3
+	msgbox gUnknown_8180727, MSGBOX_SIGN
 	end
 
 FuchsiaCity_EventScript_166E07:: @ 8166E07

data/maps/FuchsiaCity_Building1/scripts.inc

@@ -7,9 +7,9 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C
 	goto_if_set FLAG_GOT_HM04, EventScript_16D7FA
 	goto_if_set FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH, EventScript_16D780
 	msgbox gUnknown_8198DF9, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	call_if_eq EventScript_16D7E8
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	call_if_eq EventScript_16D7F1
 	release
 	end
@@ -55,9 +55,9 @@ EventScript_16D7FA:: @ 816D7FA
 	end
 
 FuchsiaCity_Building1_EventScript_16D804:: @ 816D804
-	msgbox gUnknown_819913C, 3
+	msgbox gUnknown_819913C, MSGBOX_SIGN
 	end
 
 FuchsiaCity_Building1_EventScript_16D80D:: @ 816D80D
-	msgbox gUnknown_8199167, 3
+	msgbox gUnknown_8199167, MSGBOX_SIGN
 	end

data/maps/FuchsiaCity_Gym/scripts.inc

@@ -36,33 +36,33 @@ EventScript_16D5E7:: @ 816D5E7
 
 FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1
 	trainerbattle_single TRAINER_TAMER_PHIL, Text_198866, Text_1988B6
-	msgbox gUnknown_81988CB, 6
+	msgbox gUnknown_81988CB, MSGBOX_AUTOCLOSE
 	end
 
 FuchsiaCity_Gym_EventScript_16D608:: @ 816D608
 	trainerbattle_single TRAINER_TAMER_EDGAR, Text_19891F, Text_19897F
-	msgbox gUnknown_8198985, 6
+	msgbox gUnknown_8198985, MSGBOX_AUTOCLOSE
 	end
 
 FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F
 	trainerbattle_single TRAINER_JUGGLER_KIRK, Text_19871E, Text_198779
 	famechecker FAMECHECKER_KOGA, 2
-	msgbox gUnknown_8198787, 6
+	msgbox gUnknown_8198787, MSGBOX_AUTOCLOSE
 	end
 
 FuchsiaCity_Gym_EventScript_16D643:: @ 816D643
 	trainerbattle_single TRAINER_JUGGLER_SHAWN, Text_1989A1, Text_1989EA
-	msgbox gUnknown_8198A10, 6
+	msgbox gUnknown_8198A10, MSGBOX_AUTOCLOSE
 	end
 
 FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A
 	trainerbattle_single TRAINER_JUGGLER_KAYDEN, Text_198629, Text_1986B4
-	msgbox gUnknown_81986C9, 6
+	msgbox gUnknown_81986C9, MSGBOX_AUTOCLOSE
 	end
 
 FuchsiaCity_Gym_EventScript_16D671:: @ 816D671
 	trainerbattle_single TRAINER_JUGGLER_NATE, Text_1987E8, Text_198812
-	msgbox gUnknown_8198825, 6
+	msgbox gUnknown_8198825, MSGBOX_AUTOCLOSE
 	end
 
 FuchsiaCity_Gym_EventScript_16D688:: @ 816D688

data/maps/FuchsiaCity_House1/scripts.inc

@@ -2,7 +2,7 @@ FuchsiaCity_House1_MapScripts:: @ 816D6C5
 	.byte 0
 
 FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6
-	msgbox gUnknown_8198BBB, 2
+	msgbox gUnknown_8198BBB, MSGBOX_NPC
 	end
 
 FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF
@@ -14,5 +14,5 @@ FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF
 	end
 
 FuchsiaCity_House1_EventScript_16D6E8:: @ 816D6E8
-	msgbox gUnknown_8198C7B, 2
+	msgbox gUnknown_8198C7B, MSGBOX_NPC
 	end

data/maps/FuchsiaCity_House2/scripts.inc

@@ -6,7 +6,7 @@ FuchsiaCity_House2_EventScript_16D817:: @ 816D817
 	faceplayer
 	goto_if_set FLAG_GOT_GOOD_ROD, EventScript_16D83F
 	msgbox gUnknown_819918E, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16D849
 	msgbox gUnknown_8199337
 	release

data/maps/FuchsiaCity_House3/scripts.inc

@@ -5,7 +5,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895
 	lock
 	faceplayer
 	msgbox gUnknown_81993B9, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16D8B0
 	goto EventScript_16D941
 	end
@@ -30,7 +30,7 @@ EventScript_16D8B0:: @ 816D8B0
 	goto_if_eq EventScript_16D8B0
 	special ScrSpecial_GetPokemonNicknameAndMoveName
 	msgbox gUnknown_8199485, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16D919
 	goto EventScript_16D941
 	end

data/maps/FuchsiaCity_Mart/scripts.inc

@@ -2,11 +2,11 @@ FuchsiaCity_Mart_MapScripts:: @ 816D4E0
 	.byte 0
 
 FuchsiaCity_Mart_EventScript_16D4E1:: @ 816D4E1
-	msgbox gUnknown_8198134, 2
+	msgbox gUnknown_8198134, MSGBOX_NPC
 	end
 
 FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA
-	msgbox gUnknown_81980BC, 2
+	msgbox gUnknown_81980BC, MSGBOX_NPC
 	end
 
 FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3

data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc

@@ -15,13 +15,13 @@ FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700
 	end
 
 FuchsiaCity_PokemonCenter_1F_EventScript_16D709:: @ 816D709
-	msgbox gUnknown_8198CB7, 2
+	msgbox gUnknown_8198CB7, MSGBOX_NPC
 	end
 
 FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712
-	msgbox gUnknown_8198D2E, 2
+	msgbox gUnknown_8198D2E, MSGBOX_NPC
 	end
 
 FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B
-	msgbox gUnknown_8198D9B, 2
+	msgbox gUnknown_8198D9B, MSGBOX_NPC
 	end

data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc

@@ -38,7 +38,7 @@ EventScript_16D312:: @ 816D312
 	lockall
 	textcolor 0
 	msgbox gUnknown_8197E1A, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16D345
 	msgbox gUnknown_8197E48
 	closemessage
@@ -102,7 +102,7 @@ EventScript_16D391:: @ 816D391
 	waitmovement 0
 	showmoneybox 0, 0, 0
 	msgbox gUnknown_8197C87, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16D3CA
 	msgbox gUnknown_8197DE9
 	goto EventScript_16D49A
@@ -200,7 +200,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7
 	lock
 	faceplayer
 	msgbox gUnknown_8197EB0, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16D4D6
 	msgbox gUnknown_819809E
 	release

data/maps/FuchsiaCity_ZooBuilding/scripts.inc

@@ -2,17 +2,17 @@ FuchsiaCity_ZooBuilding_MapScripts:: @ 816D528
 	.byte 0
 
 FuchsiaCity_ZooBuilding_EventScript_16D529:: @ 816D529
-	msgbox gUnknown_819816B, 2
+	msgbox gUnknown_819816B, MSGBOX_NPC
 	end
 
 FuchsiaCity_ZooBuilding_EventScript_16D532:: @ 816D532
-	msgbox gUnknown_81981C2, 2
+	msgbox gUnknown_81981C2, MSGBOX_NPC
 	end
 
 FuchsiaCity_ZooBuilding_EventScript_16D53B:: @ 816D53B
-	msgbox gUnknown_819822A, 2
+	msgbox gUnknown_819822A, MSGBOX_NPC
 	end
 
 FuchsiaCity_ZooBuilding_EventScript_16D544:: @ 816D544
-	msgbox gUnknown_8198285, 2
+	msgbox gUnknown_8198285, MSGBOX_NPC
 	end

data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc

@@ -37,7 +37,7 @@ EventScript_16EAB9:: @ 816EAB9
 	end
 
 IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3
-	msgbox gUnknown_819A837, 2
+	msgbox gUnknown_819A837, MSGBOX_NPC
 	end
 
 IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC

data/maps/LavenderTown/scripts.inc

@@ -12,7 +12,7 @@ LavenderTown_EventScript_16687D:: @ 816687D
 	lock
 	faceplayer
 	msgbox gUnknown_817F52E, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16689C
 	msgbox gUnknown_817F568
 	release
@@ -24,25 +24,25 @@ EventScript_16689C:: @ 816689C
 	end
 
 LavenderTown_EventScript_1668A6:: @ 81668A6
-	msgbox gUnknown_817F5B6, 2
+	msgbox gUnknown_817F5B6, MSGBOX_NPC
 	end
 
 LavenderTown_EventScript_1668AF:: @ 81668AF
-	msgbox gUnknown_817F614, 2
+	msgbox gUnknown_817F614, MSGBOX_NPC
 	end
 
 LavenderTown_EventScript_1668B8:: @ 81668B8
-	msgbox gUnknown_817F676, 3
+	msgbox gUnknown_817F676, MSGBOX_SIGN
 	end
 
 LavenderTown_EventScript_1668C1:: @ 81668C1
-	msgbox gUnknown_817F69A, 3
+	msgbox gUnknown_817F69A, MSGBOX_SIGN
 	end
 
 LavenderTown_EventScript_1668CA:: @ 81668CA
-	msgbox gUnknown_817F6D6, 3
+	msgbox gUnknown_817F6D6, MSGBOX_SIGN
 	end
 
 LavenderTown_EventScript_1668D3:: @ 81668D3
-	msgbox gUnknown_817F6F7, 3
+	msgbox gUnknown_817F6F7, MSGBOX_SIGN
 	end

data/maps/LavenderTown_House2/scripts.inc

@@ -5,9 +5,9 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266
 	lock
 	faceplayer
 	msgbox gUnknown_8193A4B, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16B287
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16B2AA
 	end
 
@@ -15,9 +15,9 @@ EventScript_16B287:: @ 816B287
 	msgbox gUnknown_8193AA6
 	special Special_ChooseMonFromParty
 	waitstate
-	compare VAR_0x8004, 6
+	compare VAR_0x8004, PARTY_SIZE
 	goto_if_lt EventScript_16B2B4
-	compare VAR_0x8004, 6
+	compare VAR_0x8004, PARTY_SIZE
 	goto_if_ge EventScript_16B2AA
 	end
 
@@ -39,9 +39,9 @@ EventScript_16B2B4:: @ 816B2B4
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_16B311
 	msgbox gUnknown_8193AD2, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16B31B
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16B2AA
 	end
 

data/maps/LavenderTown_Mart/scripts.inc

@@ -2,15 +2,15 @@ LavenderTown_Mart_MapScripts:: @ 816B34F
 	.byte 0
 
 LavenderTown_Mart_EventScript_16B350:: @ 816B350
-	msgbox gUnknown_8193CE5, 2
+	msgbox gUnknown_8193CE5, MSGBOX_NPC
 	end
 
 LavenderTown_Mart_EventScript_16B359:: @ 816B359
-	msgbox gUnknown_8193DB6, 2
+	msgbox gUnknown_8193DB6, MSGBOX_NPC
 	end
 
 LavenderTown_Mart_EventScript_16B362:: @ 816B362
-	msgbox gUnknown_8193DF1, 2
+	msgbox gUnknown_8193DF1, MSGBOX_NPC
 	end
 
 LavenderTown_Mart_EventScript_16B36B:: @ 816B36B

data/maps/LavenderTown_PokemonCenter_1F/scripts.inc

@@ -15,13 +15,13 @@ LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE
 	end
 
 LavenderTown_PokemonCenter_1F_EventScript_16B107:: @ 816B107
-	msgbox gUnknown_8193465, 2
+	msgbox gUnknown_8193465, MSGBOX_NPC
 	end
 
 LavenderTown_PokemonCenter_1F_EventScript_16B110:: @ 816B110
-	msgbox gUnknown_81934DE, 2
+	msgbox gUnknown_81934DE, MSGBOX_NPC
 	end
 
 LavenderTown_PokemonCenter_1F_EventScript_16B119:: @ 816B119
-	msgbox gUnknown_819353A, 2
+	msgbox gUnknown_819353A, MSGBOX_NPC
 	end

data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc

@@ -34,7 +34,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA
 	end
 
 LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3
-	msgbox gUnknown_81936B4, 2
+	msgbox gUnknown_81936B4, MSGBOX_NPC
 	end
 
 LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC
@@ -78,5 +78,5 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211
 	end
 
 LavenderTown_VolunteerPokemonHouse_EventScript_16B229:: @ 816B229
-	msgbox gUnknown_819392B, 3
+	msgbox gUnknown_819392B, MSGBOX_SIGN
 	end

data/maps/MtEmber_Exterior/scripts.inc

@@ -117,15 +117,15 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E
 
 MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4
 	trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, Text_17AB73, Text_17ABAA
-	msgbox gUnknown_817ABD8, 6
+	msgbox gUnknown_817ABD8, MSGBOX_AUTOCLOSE
 	end
 
 MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB
 	trainerbattle_single TRAINER_PKMN_RANGER_BETH, Text_17AC55, Text_17AC82
-	msgbox gUnknown_817ACA2, 6
+	msgbox gUnknown_817ACA2, MSGBOX_AUTOCLOSE
 	end
 
 MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2
 	trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, Text_17AD06, Text_17AD6B
-	msgbox gUnknown_817AD89, 6
+	msgbox gUnknown_817AD89, MSGBOX_AUTOCLOSE
 	end

data/maps/MtMoon_1F/scripts.inc

@@ -7,40 +7,40 @@ MtMoon_1F_OnTransition:: @ 81605EA
 	end
 
 MtMoon_1F_EventScript_1605EE:: @ 81605EE
-	msgbox gUnknown_8172AE0, 3
+	msgbox gUnknown_8172AE0, MSGBOX_SIGN
 	end
 
 MtMoon_1F_EventScript_1605F7:: @ 81605F7
 	trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB
-	msgbox gUnknown_81727DF, 6
+	msgbox gUnknown_81727DF, MSGBOX_AUTOCLOSE
 	end
 
 MtMoon_1F_EventScript_16060E:: @ 816060E
 	trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844
-	msgbox gUnknown_8172863, 6
+	msgbox gUnknown_8172863, MSGBOX_AUTOCLOSE
 	end
 
 MtMoon_1F_EventScript_160625:: @ 8160625
 	trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3
-	msgbox gUnknown_81728D2, 6
+	msgbox gUnknown_81728D2, MSGBOX_AUTOCLOSE
 	end
 
 MtMoon_1F_EventScript_16063C:: @ 816063C
 	trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4
-	msgbox gUnknown_81729AC, 6
+	msgbox gUnknown_81729AC, MSGBOX_AUTOCLOSE
 	end
 
 MtMoon_1F_EventScript_160653:: @ 8160653
 	trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927
-	msgbox gUnknown_817293C, 6
+	msgbox gUnknown_817293C, MSGBOX_AUTOCLOSE
 	end
 
 MtMoon_1F_EventScript_16066A:: @ 816066A
 	trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A
-	msgbox gUnknown_8172A26, 6
+	msgbox gUnknown_8172A26, MSGBOX_AUTOCLOSE
 	end
 
 MtMoon_1F_EventScript_160681:: @ 8160681
 	trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F
-	msgbox gUnknown_8172A97, 6
+	msgbox gUnknown_8172A97, MSGBOX_AUTOCLOSE
 	end

data/maps/MtMoon_B2F/scripts.inc

@@ -55,7 +55,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B
 	lock
 	faceplayer
 	msgbox gUnknown_8172E77, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_1607DE
 	removeobject 1
 	giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5
@@ -87,7 +87,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F
 	lock
 	faceplayer
 	msgbox gUnknown_8172E94, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_1607DE
 	removeobject 2
 	giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
@@ -120,20 +120,20 @@ Movement_1607E0:: @ 81607E0
 
 MtMoon_B2F_EventScript_1607E4:: @ 81607E4
 	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8
-	msgbox gUnknown_8172CCB, 6
+	msgbox gUnknown_8172CCB, MSGBOX_AUTOCLOSE
 	end
 
 MtMoon_B2F_EventScript_1607FB:: @ 81607FB
 	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46
-	msgbox gUnknown_8172D51, 6
+	msgbox gUnknown_8172D51, MSGBOX_AUTOCLOSE
 	end
 
 MtMoon_B2F_EventScript_160812:: @ 8160812
 	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF
-	msgbox gUnknown_8172DC1, 6
+	msgbox gUnknown_8172DC1, MSGBOX_AUTOCLOSE
 	end
 
 MtMoon_B2F_EventScript_160829:: @ 8160829
 	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E
-	msgbox gUnknown_8172E4B, 6
+	msgbox gUnknown_8172E4B, MSGBOX_AUTOCLOSE
 	end

data/maps/OneIsland/scripts.inc

@@ -100,13 +100,13 @@ EventScript_16753F:: @ 816753F
 	end
 
 OneIsland_EventScript_167549:: @ 8167549
-	msgbox gUnknown_8181A4A, 2
+	msgbox gUnknown_8181A4A, MSGBOX_NPC
 	end
 
 OneIsland_EventScript_167552:: @ 8167552
-	msgbox gUnknown_81819E1, 3
+	msgbox gUnknown_81819E1, MSGBOX_SIGN
 	end
 
 OneIsland_EventScript_16755B:: @ 816755B
-	msgbox gUnknown_8181A0A, 3
+	msgbox gUnknown_8181A0A, MSGBOX_SIGN
 	end

data/maps/OneIsland_House1/scripts.inc

@@ -2,9 +2,9 @@ OneIsland_House1_MapScripts:: @ 817135B
 	.byte 0
 
 OneIsland_House1_EventScript_17135C:: @ 817135C
-	msgbox gUnknown_81A2332, 2
+	msgbox gUnknown_81A2332, MSGBOX_NPC
 	end
 
 OneIsland_House1_EventScript_171365:: @ 8171365
-	msgbox gUnknown_81A2380, 2
+	msgbox gUnknown_81A2380, MSGBOX_NPC
 	end

data/maps/OneIsland_House2/scripts.inc

@@ -2,5 +2,5 @@ OneIsland_House2_MapScripts:: @ 817136E
 	.byte 0
 
 OneIsland_House2_EventScript_17136F:: @ 817136F
-	msgbox gUnknown_81A23B8, 2
+	msgbox gUnknown_81A23B8, MSGBOX_NPC
 	end

data/maps/OneIsland_KindleRoad/scripts.inc

@@ -2,9 +2,9 @@ OneIsland_KindleRoad_MapScripts:: @ 8168758
 	.byte 0
 
 OneIsland_KindleRoad_EventScript_168759:: @ 8168759
-	msgbox gUnknown_8189D02, 3
+	msgbox gUnknown_8189D02, MSGBOX_SIGN
 	end
 
 OneIsland_KindleRoad_EventScript_168762:: @ 8168762
-	msgbox gUnknown_8189D32, 3
+	msgbox gUnknown_8189D32, MSGBOX_SIGN
 	end

data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc

@@ -2,19 +2,19 @@ OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B
 	.byte 0
 
 OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C
-	msgbox gUnknown_817D34A, 2
+	msgbox gUnknown_817D34A, MSGBOX_NPC
 	end
 
 OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365
-	msgbox gUnknown_817D3DE, 2
+	msgbox gUnknown_817D3DE, MSGBOX_NPC
 	end
 
 OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E
-	msgbox gUnknown_817D4AA, 2
+	msgbox gUnknown_817D4AA, MSGBOX_NPC
 	end
 
 OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377
-	msgbox gUnknown_817D4E3, 2
+	msgbox gUnknown_817D4E3, MSGBOX_NPC
 	end
 
 OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380

data/maps/OneIsland_PokemonCenter_1F/scripts.inc

@@ -316,14 +316,14 @@ EventScript_171044:: @ 8171044
 	applymovement 3, Movement_FacePlayer
 	waitmovement 0
 	msgbox gUnknown_81A19AA, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_171099
 	goto EventScript_1710B2
 	end
 
 EventScript_171099:: @ 8171099
 	msgbox gUnknown_81A1A08, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_171099
 	goto EventScript_1710B2
 	end
@@ -386,11 +386,11 @@ Movement_171142:: @ 8171142
 	step_end
 
 OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148
-	msgbox gUnknown_81A20D5, 2
+	msgbox gUnknown_81A20D5, MSGBOX_NPC
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151
-	msgbox gUnknown_81A212D, 2
+	msgbox gUnknown_81A212D, MSGBOX_NPC
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A

data/maps/OneIsland_TreasureBeach/scripts.inc

@@ -2,5 +2,5 @@ OneIsland_TreasureBeach_MapScripts:: @ 816876B
 	.byte 0
 
 OneIsland_TreasureBeach_EventScript_16876C:: @ 816876C
-	msgbox gUnknown_8189DCE, 2
+	msgbox gUnknown_8189DCE, MSGBOX_NPC
 	end

data/maps/PalletTown/scripts.inc

@@ -438,7 +438,7 @@ Movement_16582C:: @ 816582C
 	step_end
 
 PalletTown_EventScript_16582F:: @ 816582F
-	msgbox gUnknown_817D80D, 2
+	msgbox gUnknown_817D80D, MSGBOX_NPC
 	end
 
 PalletTown_EventScript_165838:: @ 8165838
@@ -449,15 +449,15 @@ PalletTown_EventScript_165838:: @ 8165838
 	end
 
 PalletTown_EventScript_165850:: @ 8165850
-	msgbox gUnknown_817D87F, 3
+	msgbox gUnknown_817D87F, MSGBOX_SIGN
 	end
 
 PalletTown_EventScript_165859:: @ 8165859
-	msgbox gUnknown_817D88A, 3
+	msgbox gUnknown_817D88A, MSGBOX_SIGN
 	end
 
 PalletTown_EventScript_165862:: @ 8165862
-	msgbox gUnknown_817D895, 3
+	msgbox gUnknown_817D895, MSGBOX_SIGN
 	end
 
 PalletTown_EventScript_16586B:: @ 816586B

data/maps/PalletTown_GarysHouse/scripts.inc

@@ -51,7 +51,7 @@ EventScript_168DB9:: @ 8168DB9
 	compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
 	goto_if_lt EventScript_168E46
 	msgbox gUnknown_818D7D3, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_168E3C
 	msgbox gUnknown_818D8B2
 	special Special_ChooseMonFromParty
@@ -167,13 +167,13 @@ EventScript_168F59:: @ 8168F59
 	end
 
 PalletTown_GarysHouse_EventScript_168F63:: @ 8168F63
-	msgbox gUnknown_818D763, 2
+	msgbox gUnknown_818D763, MSGBOX_NPC
 	end
 
 PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C
-	msgbox gUnknown_818D7A1, 3
+	msgbox gUnknown_818D7A1, MSGBOX_SIGN
 	end
 
 PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75
-	msgbox gUnknown_818DC47, 3
+	msgbox gUnknown_818DC47, MSGBOX_SIGN
 	end

data/maps/PalletTown_PlayersHouse_2F/scripts.inc

@@ -22,11 +22,11 @@ EventScript_168CC8:: @ 8168CC8
 	end
 
 PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2
-	msgbox gUnknown_818D50B, 3
+	msgbox gUnknown_818D50B, MSGBOX_SIGN
 	end
 
 PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB
-	msgbox gUnknown_818D53B, 3
+	msgbox gUnknown_818D53B, MSGBOX_SIGN
 	end
 
 gUnknown_8168CE4:: @ 8168CE4

data/maps/PalletTown_ProfessorOaksLab/scripts.inc

@@ -1167,25 +1167,25 @@ EventScript_169BE1:: @ 8169BE1
 
 EventScript_OakDescribesBulbasaur:: @ 8169C14
 	msgbox gUnknown_818E272, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_ThisPokeIsRealyEnergetic
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_DeclinedStarter
 	end
 
 EventScript_OakDescribesCharmander:: @ 8169C33
 	msgbox gUnknown_818E207, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_ThisPokeIsRealyEnergetic
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_DeclinedStarter
 	end
 
 EventScript_OakDescribesSquirtle:: @ 8169C52
 	msgbox gUnknown_818E194, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_ThisPokeIsRealyEnergetic
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_DeclinedStarter
 	end
 
@@ -1209,9 +1209,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
 	playfanfare MUS_FAN5
 	waitfanfare
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_GiveNicknameToStarter
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_SkipGiveNicknameToStarter
 	end
 
@@ -1368,15 +1368,15 @@ PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F
-	msgbox gUnknown_818E9E5, 2
+	msgbox gUnknown_818E9E5, MSGBOX_NPC
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68
-	msgbox gUnknown_818EAF4, 3
+	msgbox gUnknown_818EAF4, MSGBOX_SIGN
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71
-	msgbox gUnknown_818EA66, 3
+	msgbox gUnknown_818EA66, MSGBOX_SIGN
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A

data/maps/PewterCity/scripts.inc

@@ -1025,14 +1025,14 @@ Movement_166042:: @ 8166042
 	step_end
 
 PewterCity_EventScript_166075:: @ 8166075
-	msgbox gUnknown_817E436, 2
+	msgbox gUnknown_817E436, MSGBOX_NPC
 	end
 
 PewterCity_EventScript_16607E:: @ 816607E
 	lock
 	faceplayer
 	msgbox gUnknown_817E53E, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_166136
 	msgbox gUnknown_817E589
 	closemessage
@@ -1351,7 +1351,7 @@ PewterCity_EventScript_166244:: @ 8166244
 	lock
 	faceplayer
 	msgbox gUnknown_817E602, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_166263
 	msgbox gUnknown_817E644
 	release
@@ -1363,15 +1363,15 @@ EventScript_166263:: @ 8166263
 	end
 
 PewterCity_EventScript_16626D:: @ 816626D
-	msgbox gUnknown_817E6F6, 3
+	msgbox gUnknown_817E6F6, MSGBOX_SIGN
 	end
 
 PewterCity_EventScript_166276:: @ 8166276
-	msgbox gUnknown_817E748, 3
+	msgbox gUnknown_817E748, MSGBOX_SIGN
 	end
 
 PewterCity_EventScript_16627F:: @ 816627F
-	msgbox gUnknown_817E7C5, 3
+	msgbox gUnknown_817E7C5, MSGBOX_SIGN
 	end
 
 PewterCity_EventScript_166288:: @ 8166288
@@ -1382,7 +1382,7 @@ PewterCity_EventScript_166288:: @ 8166288
 	end
 
 PewterCity_EventScript_1662A0:: @ 81662A0
-	msgbox gUnknown_817E824, 3
+	msgbox gUnknown_817E824, MSGBOX_SIGN
 	end
 
 PewterCity_EventScript_1662A9:: @ 81662A9

data/maps/PewterCity_Gym/scripts.inc

@@ -38,7 +38,7 @@ EventScript_16A634:: @ 816A634
 
 PewterCity_Gym_EventScript_16A63E:: @ 816A63E
 	trainerbattle_single TRAINER_CAMPER_LIAM, Text_1911EC, Text_191237
-	msgbox gUnknown_819126B, 6
+	msgbox gUnknown_819126B, MSGBOX_AUTOCLOSE
 	end
 
 PewterCity_Gym_EventScript_16A655:: @ 816A655
@@ -46,9 +46,9 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655
 	faceplayer
 	goto_if_set FLAG_DEFEATED_BROCK, EventScript_16A67F
 	msgbox gUnknown_8191298, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16A689
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16A697
 	end
 

data/maps/PewterCity_House1/scripts.inc

@@ -2,7 +2,7 @@ PewterCity_House1_MapScripts:: @ 816A71C
 	.byte 0
 
 PewterCity_House1_EventScript_16A71D:: @ 816A71D
-	msgbox gUnknown_81915DB, 2
+	msgbox gUnknown_81915DB, MSGBOX_NPC
 	end
 
 PewterCity_House1_EventScript_16A726:: @ 816A726

data/maps/PewterCity_House2/scripts.inc

@@ -2,9 +2,9 @@ PewterCity_House2_MapScripts:: @ 816A7DC
 	.byte 0
 
 PewterCity_House2_EventScript_16A7DD:: @ 816A7DD
-	msgbox gUnknown_81917E4, 2
+	msgbox gUnknown_81917E4, MSGBOX_NPC
 	end
 
 PewterCity_House2_EventScript_16A7E6:: @ 816A7E6
-	msgbox gUnknown_8191840, 2
+	msgbox gUnknown_8191840, MSGBOX_NPC
 	end

data/maps/PewterCity_Mart/scripts.inc

@@ -2,11 +2,11 @@ PewterCity_Mart_MapScripts:: @ 816A6CD
 	.byte 0
 
 PewterCity_Mart_EventScript_16A6CE:: @ 816A6CE
-	msgbox gUnknown_81914DE, 2
+	msgbox gUnknown_81914DE, MSGBOX_NPC
 	end
 
 PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7
-	msgbox gUnknown_8191541, 2
+	msgbox gUnknown_8191541, MSGBOX_NPC
 	end
 
 PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0

data/maps/PewterCity_Museum_1F/scripts.inc

@@ -16,9 +16,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B
 
 EventScript_16A348:: @ 816A348
 	msgbox gUnknown_8190550, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16A367
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16A37B
 	end
 
@@ -64,7 +64,7 @@ EventScript_16A3D1:: @ 816A3D1
 	textcolor 0
 	showmoneybox 0, 0, 0
 	msgbox gUnknown_81904B5, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_16A402
 	msgbox gUnknown_81904F9
 	closemessage
@@ -142,11 +142,11 @@ Movement_16A499:: @ 816A499
 	step_end
 
 PewterCity_Museum_1F_EventScript_16A49C:: @ 816A49C
-	msgbox gUnknown_81908CD, 2
+	msgbox gUnknown_81908CD, MSGBOX_NPC
 	end
 
 PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5
-	msgbox gUnknown_81906B4, 2
+	msgbox gUnknown_81906B4, MSGBOX_NPC
 	end
 
 PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE
@@ -174,7 +174,7 @@ EventScript_16A4FF:: @ 816A4FF
 	end
 
 PewterCity_Museum_1F_EventScript_16A509:: @ 816A509
-	msgbox gUnknown_819090A, 2
+	msgbox gUnknown_819090A, MSGBOX_NPC
 	end
 
 PewterCity_Museum_1F_EventScript_16A512:: @ 816A512

data/maps/PewterCity_Museum_2F/scripts.inc

@@ -2,29 +2,29 @@ PewterCity_Museum_2F_MapScripts:: @ 816A552
 	.byte 0
 
 PewterCity_Museum_2F_EventScript_16A553:: @ 816A553
-	msgbox gUnknown_8190B30, 2
+	msgbox gUnknown_8190B30, MSGBOX_NPC
 	end
 
 PewterCity_Museum_2F_EventScript_16A55C:: @ 816A55C
-	msgbox gUnknown_8190B80, 2
+	msgbox gUnknown_8190B80, MSGBOX_NPC
 	end
 
 PewterCity_Museum_2F_EventScript_16A565:: @ 816A565
-	msgbox gUnknown_8190BF3, 2
+	msgbox gUnknown_8190BF3, MSGBOX_NPC
 	end
 
 PewterCity_Museum_2F_EventScript_16A56E:: @ 816A56E
-	msgbox gUnknown_8190C1E, 2
+	msgbox gUnknown_8190C1E, MSGBOX_NPC
 	end
 
 PewterCity_Museum_2F_EventScript_16A577:: @ 816A577
-	msgbox gUnknown_8190C60, 2
+	msgbox gUnknown_8190C60, MSGBOX_NPC
 	end
 
 PewterCity_Museum_2F_EventScript_16A580:: @ 816A580
-	msgbox gUnknown_8190C81, 3
+	msgbox gUnknown_8190C81, MSGBOX_SIGN
 	end
 
 PewterCity_Museum_2F_EventScript_16A589:: @ 816A589
-	msgbox gUnknown_8190C8F, 3
+	msgbox gUnknown_8190C8F, MSGBOX_SIGN
 	end

data/maps/PewterCity_PokemonCenter_1F/scripts.inc

@@ -15,7 +15,7 @@ PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F
 	end
 
 PewterCity_PokemonCenter_1F_EventScript_16A778:: @ 816A778
-	msgbox gUnknown_81916A9, 2
+	msgbox gUnknown_81916A9, MSGBOX_NPC
 	end
 
 PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781
@@ -31,7 +31,7 @@ PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781
 	end
 
 PewterCity_PokemonCenter_1F_EventScript_16A798:: @ 816A798
-	msgbox gUnknown_8191701, 2
+	msgbox gUnknown_8191701, MSGBOX_NPC
 	end
 
 PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1
@@ -41,5 +41,5 @@ PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1
 	end
 
 PewterCity_PokemonCenter_1F_EventScript_16A7AC:: @ 816A7AC
-	msgbox gUnknown_8191780, 2
+	msgbox gUnknown_8191780, MSGBOX_NPC
 	end

data/maps/PokemonMansion_1F/scripts.inc

@@ -23,10 +23,10 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212
 
 PokemonMansion_1F_EventScript_162226:: @ 8162226
 	trainerbattle_single TRAINER_SCIENTIST_TED, Text_177364, Text_177391
-	msgbox gUnknown_8177397, 6
+	msgbox gUnknown_8177397, MSGBOX_AUTOCLOSE
 	end
 
 PokemonMansion_1F_EventScript_16223D:: @ 816223D
 	trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, Text_1773C6, Text_1773FD
-	msgbox gUnknown_8177418, 6
+	msgbox gUnknown_8177418, MSGBOX_AUTOCLOSE
 	end

data/maps/PokemonMansion_2F/scripts.inc

@@ -17,14 +17,14 @@ PokemonMansion_2F_EventScript_162264:: @ 8162264
 	end
 
 PokemonMansion_2F_EventScript_162278:: @ 8162278
-	msgbox gUnknown_817751F, 3
+	msgbox gUnknown_817751F, MSGBOX_SIGN
 	end
 
 PokemonMansion_2F_EventScript_162281:: @ 8162281
-	msgbox gUnknown_8177574, 3
+	msgbox gUnknown_8177574, MSGBOX_SIGN
 	end
 
 PokemonMansion_2F_EventScript_16228A:: @ 816228A
 	trainerbattle_single TRAINER_BURGLAR_ARNIE, Text_177498, Text_1774CB
-	msgbox gUnknown_81774E3, 6
+	msgbox gUnknown_81774E3, MSGBOX_AUTOCLOSE
 	end

data/maps/PokemonMansion_3F/scripts.inc

@@ -17,15 +17,15 @@ PokemonMansion_3F_EventScript_1622B1:: @ 81622B1
 	end
 
 PokemonMansion_3F_EventScript_1622C5:: @ 81622C5
-	msgbox gUnknown_8177685, 3
+	msgbox gUnknown_8177685, MSGBOX_SIGN
 	end
 
 PokemonMansion_3F_EventScript_1622CE:: @ 81622CE
 	trainerbattle_single TRAINER_BURGLAR_SIMON, Text_1775E7, Text_177602
-	msgbox gUnknown_8177608, 6
+	msgbox gUnknown_8177608, MSGBOX_AUTOCLOSE
 	end
 
 PokemonMansion_3F_EventScript_1622E5:: @ 81622E5
 	trainerbattle_single TRAINER_SCIENTIST_BRAYDON, Text_177628, Text_177643
-	msgbox gUnknown_8177657, 6
+	msgbox gUnknown_8177657, MSGBOX_AUTOCLOSE
 	end

data/maps/PokemonMansion_B1F/scripts.inc

@@ -17,15 +17,15 @@ PokemonMansion_B1F_EventScript_16230C:: @ 816230C
 	end
 
 PokemonMansion_B1F_EventScript_162320:: @ 8162320
-	msgbox gUnknown_8177798, 3
+	msgbox gUnknown_8177798, MSGBOX_SIGN
 	end
 
 PokemonMansion_B1F_EventScript_162329:: @ 8162329
 	trainerbattle_single TRAINER_BURGLAR_LEWIS, Text_1776C0, Text_1776D7
-	msgbox gUnknown_81776DE, 6
+	msgbox gUnknown_81776DE, MSGBOX_AUTOCLOSE
 	end
 
 PokemonMansion_B1F_EventScript_162340:: @ 8162340
 	trainerbattle_single TRAINER_SCIENTIST_IVAN, Text_177720, Text_177757
-	msgbox gUnknown_817776A, 6
+	msgbox gUnknown_817776A, MSGBOX_AUTOCLOSE
 	end

data/maps/PokemonTower_1F/scripts.inc

@@ -7,15 +7,15 @@ PokemonTower_1F_OnTransition:: @ 816323B
 	end
 
 PokemonTower_1F_EventScript_16323F:: @ 816323F
-	msgbox gUnknown_8179CAB, 2
+	msgbox gUnknown_8179CAB, MSGBOX_NPC
 	end
 
 PokemonTower_1F_EventScript_163248:: @ 8163248
-	msgbox gUnknown_8179C8C, 2
+	msgbox gUnknown_8179C8C, MSGBOX_NPC
 	end
 
 PokemonTower_1F_EventScript_163251:: @ 8163251
-	msgbox gUnknown_8179C41, 2
+	msgbox gUnknown_8179C41, MSGBOX_NPC
 	end
 
 PokemonTower_1F_EventScript_16325A:: @ 816325A
@@ -34,5 +34,5 @@ EventScript_163272:: @ 8163272
 	end
 
 PokemonTower_1F_EventScript_16327C:: @ 816327C
-	msgbox gUnknown_8179B7A, 2
+	msgbox gUnknown_8179B7A, MSGBOX_NPC
 	end

data/maps/PokemonTower_2F/scripts.inc

@@ -2,7 +2,7 @@ PokemonTower_2F_MapScripts:: @ 8163285
 	.byte 0
 
 PokemonTower_2F_EventScript_163286:: @ 8163286
-	msgbox gUnknown_8179EAE, 2
+	msgbox gUnknown_8179EAE, MSGBOX_NPC
 	end
 
 PokemonTower_2F_EventScript_16328F:: @ 816328F

data/maps/PokemonTower_3F/scripts.inc

@@ -3,15 +3,15 @@ PokemonTower_3F_MapScripts:: @ 81633A6
 
 PokemonTower_3F_EventScript_1633A7:: @ 81633A7
 	trainerbattle_single TRAINER_CHANNELER_PATRICIA, Text_179FA0, Text_179FBC
-	msgbox gUnknown_8179FD3, 6
+	msgbox gUnknown_8179FD3, MSGBOX_AUTOCLOSE
 	end
 
 PokemonTower_3F_EventScript_1633BE:: @ 81633BE
 	trainerbattle_single TRAINER_CHANNELER_CARLY, Text_179F62, Text_179F72
-	msgbox gUnknown_8179F88, 6
+	msgbox gUnknown_8179F88, MSGBOX_AUTOCLOSE
 	end
 
 PokemonTower_3F_EventScript_1633D5:: @ 81633D5
 	trainerbattle_single TRAINER_CHANNELER_HOPE, Text_179F09, Text_179F21
-	msgbox gUnknown_8179F31, 6
+	msgbox gUnknown_8179F31, MSGBOX_AUTOCLOSE
 	end

data/maps/PokemonTower_4F/scripts.inc

@@ -3,15 +3,15 @@ PokemonTower_4F_MapScripts:: @ 81633EC
 
 PokemonTower_4F_EventScript_1633ED:: @ 81633ED
 	trainerbattle_single TRAINER_CHANNELER_PAULA, Text_17A004, Text_17A017
-	msgbox gUnknown_817A02B, 6
+	msgbox gUnknown_817A02B, MSGBOX_AUTOCLOSE
 	end
 
 PokemonTower_4F_EventScript_163404:: @ 8163404
 	trainerbattle_single TRAINER_CHANNELER_LAUREL, Text_17A046, Text_17A061
-	msgbox gUnknown_817A067, 6
+	msgbox gUnknown_817A067, MSGBOX_AUTOCLOSE
 	end
 
 PokemonTower_4F_EventScript_16341B:: @ 816341B
 	trainerbattle_single TRAINER_CHANNELER_JODY, Text_17A096, Text_17A0AB
-	msgbox gUnknown_817A0BB, 6
+	msgbox gUnknown_817A0BB, MSGBOX_AUTOCLOSE
 	end