Use YES/NO constants for MSGBOX_YESNO

21 files changed, 133 insertions, 133 deletions

diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 6de5ccf47..6b2da5ccb 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -32,9 +32,9 @@ BerryTree_EventScript_CheckSoil:: @ 8274359
 
 BerryTree_EventScript_WantToPlant:: @ 8274374
 	msgbox BerryTree_Text_WantToPlant, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq BerryTree_EventScript_ChooseBerryToPlant
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq BerryTree_EventScript_CancelPlanting
 	end
 
@@ -110,9 +110,9 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
 	faceplayer
 	special EventObjectInteractionGetBerryCountString
 	msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq BerryTree_EventScript_PickBerry
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq BerryTree_EventScript_CancelPickingBerry
 
 BerryTree_EventScript_PickBerry:: @ 8274448
@@ -159,9 +159,9 @@ BerryTree_EventScript_WantToWater:: @ 827448D
 	goto_if_eq BerryTree_EventScript_DontWater
 	special EventObjectInteractionGetBerryName
 	msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq BerryTree_EventScript_WaterBerry
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq BerryTree_EventScript_DontWater
 
 BerryTree_EventScript_DontWater:: @ 82744BE
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index ccda6afce..ebb2e6ef0 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -890,7 +890,7 @@ RecordCorner_EventScript_AlreadyMixed:: @ 82774E0
 
 EventScript_ConfirmLeaveTradeRoom:: @ 82774EF
 	msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_TerminateLink
 	erasebox 0, 0, 29, 19
 	releaseall
@@ -1005,7 +1005,7 @@ CableClub_EventScript_WirelessClubAttendant:: @ 8277672
 	faceplayer
 	goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
 	msgbox CableClub_Text_AskAboutLinking, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_DontAskAboutLinking
 	msgbox CableClub_Text_ExplainWirelessClub, MSGBOX_DEFAULT
 	release
@@ -1080,7 +1080,7 @@ CableClub_EventScript_DirectCornerHasRecordMix:: @ 82777CB
 
 CableClub_EventScript_WirelessTrade:: @ 827780D
 	msgbox CableClub_Text_TradePokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_AbortLink
 	call CableClub_EventScript_CheckPartyTradeRequirements
 	compare VAR_RESULT, 0
@@ -1132,7 +1132,7 @@ CableClub_EventScript_WirelessBattleInfo:: @ 82778CB
 
 CableClub_EventScript_WirelessRecordMix:: @ 82778D9
 	msgbox CableClub_Text_AccessRecordCorner, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_AbortLink
 	setvar VAR_0x8004, 12
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
@@ -1140,7 +1140,7 @@ CableClub_EventScript_WirelessRecordMix:: @ 82778D9
 
 CableClub_EventScript_WirelessBerryCrush:: @ 82778F7
 	msgbox CableClub_Text_UseBerryCrush, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_AbortLink
 	special HasAtLeastOneBerry
 	compare VAR_RESULT, FALSE
@@ -1500,7 +1500,7 @@ MossdeepCity_GameCorner_1F_EventScript_AdapterNotConnected:: @ 8277E48
 
 MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon:: @ 8277E55
 	msgbox MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
 	compare VAR_0x8005, 0
 	call_if_eq MossdeepCity_GameCorner_1F_EventScript_ExplainPokemonJumpRequirements
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 9a9816a5f..857c1e205 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -154,15 +154,15 @@ LilycoveCity_ContestLobby_EventScript_279F12:: @ 8279F12
 LilycoveCity_ContestLobby_EventScript_279F21:: @ 8279F21
 	msgbox LilycoveCity_ContestLobby_Text_27B5C4, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_279E13
-	case 1, LilycoveCity_ContestLobby_EventScript_279F87
+	case NO, LilycoveCity_ContestLobby_EventScript_279E13
+	case YES, LilycoveCity_ContestLobby_EventScript_279F87
 	end
 
 LilycoveCity_ContestLobby_EventScript_279F45:: @ 8279F45
 	msgbox LilycoveCity_ContestLobby_Text_27B547, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_279E13
-	case 1, LilycoveCity_ContestLobby_EventScript_279F87
+	case NO, LilycoveCity_ContestLobby_EventScript_279E13
+	case YES, LilycoveCity_ContestLobby_EventScript_279F87
 	end
 
 LilycoveCity_ContestLobby_EventScript_279F69:: @ 8279F69
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 062fd9f5a..b4c23a694 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -15,10 +15,10 @@ Route117_EventScript_DaycareMan:: @ 8291C18
 
 Route117_EventScript_DaycareEggWaiting:: @ 8291C4D
 	msgbox Route117_Text_DoYouWantEgg, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_EventScript_DaycareAcceptEgg
 	msgbox Route117_Text_IWillKeepDoYouWantIt, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_EventScript_DaycareAcceptEgg
 	msgbox Route117_Text_IllKeepIt, MSGBOX_DEFAULT
 	clearflag FLAG_PENDING_DAYCARE_EGG
@@ -88,7 +88,7 @@ Route117_PokemonDayCare_EventScript_DaycareWoman:: @ 8291D11
 	compare VAR_RESULT, DAYCARE_TWO_MONS
 	goto_if_eq Route117_PokemonDayCare_EventScript_TwoMonsInDaycare
 	msgbox Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
 	msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT
 	release
@@ -130,7 +130,7 @@ Route117_PokemonDayCare_EventScript_ComeAgain:: @ 8291DCA
 
 Route117_PokemonDayCare_EventScript_CanRaiseOneMore:: @ 8291DD4
 	msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
@@ -170,10 +170,10 @@ Route117_PokemonDayCare_EventScript_OneMonInDaycare:: @ 8291E2F
 	setvar VAR_0x8004, 0
 	call Route117_PokemonDayCare_EventScript_DisplayLevelsGained
 	msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
 	msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
@@ -197,7 +197,7 @@ Route117_PokemonDayCare_EventScript_TryRetrieveMon:: @ 8291E6D
 Route117_PokemonDayCare_EventScript_CostPrompt:: @ 8291EAC
 	special GetDaycareCost
 	msgbox Route117_PokemonDayCare_Text_ItWillCostX, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_CheckEnoughMoney
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
@@ -229,7 +229,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2
 
 Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon:: @ 8291F24
 	msgbox Route117_PokemonDayCare_Text_TakeOtherOneBackToo, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
@@ -272,7 +272,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
 	setvar VAR_0x8004, 1
 	call Route117_PokemonDayCare_EventScript_DisplayLevelsGained
 	msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
 	msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT
 	release
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index bd98a3676..56e3297b6 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -9,7 +9,7 @@ EventScript_CutTree:: @ 82906BB
 	bufferpartymonnick 0, VAR_RESULT
 	buffermovename 1, MOVE_CUT
 	msgbox Text_WantToCut, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_CancelCut
 	msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT
 	closemessage
@@ -68,7 +68,7 @@ EventScript_RockSmash:: @ 82907A6
 	bufferpartymonnick 0, VAR_RESULT
 	buffermovename 1, MOVE_ROCK_SMASH
 	msgbox Text_WantToSmash, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_CancelSmash
 	msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT
 	closemessage
@@ -133,7 +133,7 @@ EventScript_StrengthBoulder:: @ 82908BA
 	goto_if_eq EventScript_CantStrength
 	setfieldeffectargument 0, VAR_RESULT
 	msgbox Text_WantToStrength, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_CancelStrength
 	closemessage
 	dofieldeffect FLDEFF_USE_STRENGTH
@@ -195,7 +195,7 @@ EventScript_UseWaterfall:: @ 8290A49
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
 	msgbox Text_WantToWaterfall, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_EndWaterfall
 	msgbox Text_MonUsedWaterfall, MSGBOX_DEFAULT
 	dofieldeffect FLDEFF_USE_WATERFALL
@@ -231,7 +231,7 @@ EventScript_UseDive:: @ 8290B0F
 	setfieldeffectargument 0, VAR_RESULT
 	setfieldeffectargument 1, 1
 	msgbox Text_WantToDive, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_EndDive
 	msgbox Text_MonUsedDive, MSGBOX_DEFAULT
 	dofieldeffect FLDEFF_USE_DIVE
@@ -256,7 +256,7 @@ EventScript_UseDiveUnderwater:: @ 8290B5A
 	setfieldeffectargument 0, VAR_RESULT
 	setfieldeffectargument 1, 1
 	msgbox Text_WantToSurface, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_EndSurface
 	msgbox Text_MonUsedDive, MSGBOX_DEFAULT
 	dofieldeffect FLDEFF_USE_DIVE
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 7ed366aca..f61b9d6db 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -305,7 +305,7 @@ GabbyAndTy_EventScript_RequestInterviewLostAMon:: @ 828D099
 	end
 
 GabbyAndTy_EventScript_Interview:: @ 828D0A7
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut
 	msgbox GabbyAndTy_Text_DescribeYourFeelings, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY
diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc
index 8512ca105..8b2b72f75 100644
--- a/data/scripts/interview.inc
+++ b/data/scripts/interview.inc
@@ -14,9 +14,9 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879
 	copyvar VAR_0x8009, VAR_0x8006
 	msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C
 	end
 
@@ -61,17 +61,17 @@ SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883
 	goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8
 	setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
 	msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8
 	msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C
 	end
 
@@ -117,9 +117,9 @@ SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F
 	copyvar VAR_0x8009, VAR_0x8006
 	msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45
 	end
 
@@ -190,9 +190,9 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21
 	copyvar VAR_0x8009, VAR_0x8006
 	msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0
 	end
 
@@ -271,9 +271,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A
 	copyvar VAR_0x8009, VAR_0x8006
 	msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E
 	end
 
diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc
index ac0931fd8..659cd027b 100644
--- a/data/scripts/kecleon.inc
+++ b/data/scripts/kecleon.inc
@@ -57,7 +57,7 @@ EventScript_Kecleon:: @ 8272336
 
 EventScript_AskUseDevonScope:: @ 8272350
 	msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_BattleKecleon
 	release
 	end
diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc
index 5f6621fa3..b7b9d514a 100644
--- a/data/scripts/lilycove_lady.inc
+++ b/data/scripts/lilycove_lady.inc
@@ -56,9 +56,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveGreatThing:: @ 82A8427
 
 LilycoveCity_PokemonCenter_1F_EventScript_RequestItem:: @ 82A8435
     msgbox LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing, MSGBOX_YESNO
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor
     end
 
@@ -85,9 +85,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C
 
 LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem:: @ 82A848E
     msgbox LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem
     end
 
@@ -195,9 +195,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady:: @ 82A85E0
 LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz:: @ 82A85EE
     setvar VAR_0x8004, 0
     msgbox LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz
     end
 
@@ -234,9 +234,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer:: @ 82A8656
 
 LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz:: @ 82A8660
     msgbox LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz
     end
 
@@ -311,9 +311,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize:: @ 82A874C
 
 LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz:: @ 82A8759
     msgbox LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz
     end
 
@@ -338,9 +338,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D
 
 LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize:: @ 82A87AF
     msgbox LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PickPrize
     end
 
@@ -360,9 +360,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1
 
 LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion:: @ 82A87F8
     msgbox LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion
     end
 
@@ -406,9 +406,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock:: @ 82A8876
     compare VAR_RESULT, FALSE
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase
     msgbox LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock, MSGBOX_YESNO
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock
     end
 
@@ -429,9 +429,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA
 
 LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock:: @ 82A88D7
     msgbox LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock
     end
 
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index deeec7721..34622775a 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -13,9 +13,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_Bard:: @ 828E0A6
 	lock
 	faceplayer
 	msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PlaySong
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong
 	end
 
@@ -37,9 +37,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong:: @ 828E0EA
 
 MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics:: @ 828E0F4
 	msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics
 	end
 
@@ -55,7 +55,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics:: @ 828E113
 	special ScrSpecial_PlayBardSong
 	delay 60
 	msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics
 	special ScrSpecial_SaveBardSongLyrics
 	msgbox MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile, MSGBOX_DEFAULT
@@ -158,7 +158,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Trader:: @ 828E4D4
 	lock
 	faceplayer
 	msgbox MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade
 	special ScrSpecial_GetTraderTradedFlag
 	compare VAR_RESULT, TRUE
@@ -186,7 +186,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive:: @ 828E517
 	compare VAR_0x8004, 0xFFFF
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_InvalidDecor
 	msgbox MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor
 	special ScrSpecial_DoesPlayerHaveNoDecorations
 	compare VAR_RESULT, TRUE
@@ -228,7 +228,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive:: @ 828E584
 	compare VAR_RESULT, TRUE
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor
 	msgbox MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive
 	special ScrSpecial_TraderDoDecorationTrade
 	msgbox MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC, MSGBOX_DEFAULT
@@ -815,7 +815,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Storyteller:: @ 829014A
 	setvar VAR_0x800A, 0
 	setvar VAR_0x800B, 0
 	msgbox MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller
 	specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot
 	compare VAR_RESULT, 0
@@ -850,7 +850,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales:: @ 82901DA
 	msgbox MauvilleCity_PokemonCenter_1F_Text_IKnowNoTales, MSGBOX_DEFAULT
 MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales:: @ 82901E2
 	msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller
 	specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat
 	compare VAR_RESULT, 1
@@ -901,9 +901,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_Giddy:: @ 82902F6
 	lock
 	faceplayer
 	msgbox MauvilleCity_PokemonCenter_1F_Text_HearMyStory, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineGiddy
 	end
 
diff --git a/data/scripts/mevent.inc b/data/scripts/mevent.inc
index 88f44e002..731154315 100644
--- a/data/scripts/mevent.inc
+++ b/data/scripts/mevent.inc
@@ -1,7 +1,7 @@
 EventScript_Questionnaire:: @ 827381B
 	lockall
 	msgbox Mevent_Text_FillOutQuestionnaire, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq Mevent_EventScript_Release
 	setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
 	call Common_ShowEasyChatScreen
diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc
index 0d4244023..a7807ce51 100644
--- a/data/scripts/move_tutors.inc
+++ b/data/scripts/move_tutors.inc
@@ -3,10 +3,10 @@ SlateportCity_PokemonFanClub_EventScript_SwaggerTutor:: @ 82C7F16
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, MoveTutor_EventScript_SwaggerTaught
 	msgbox MoveTutor_Text_SwaggerTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SwaggerDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SwaggerDeclined
 	msgbox MoveTutor_Text_SwaggerWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_SWAGGER
@@ -32,10 +32,10 @@ MauvilleCity_EventScript_RolloutTutor:: @ 82C7F7E
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MoveTutor_EventScript_RolloutTaught
 	msgbox MoveTutor_Text_RolloutTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_RolloutDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_RolloutDeclined
 	msgbox MoveTutor_Text_RolloutWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_ROLLOUT
@@ -61,10 +61,10 @@ VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor:: @ 82C7FE6
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, MoveTutor_EventScript_FuryCutterTaught
 	msgbox MoveTutor_Text_FuryCutterTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
 	msgbox MoveTutor_Text_FuryCutterWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_FURY_CUTTER
@@ -90,10 +90,10 @@ LavaridgeTown_House_EventScript_MimicTutor:: @ 82C804E
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, MoveTutor_EventScript_MimicTaught
 	msgbox MoveTutor_MimicTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_MimicDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_MimicDeclined
 	msgbox MoveTutor_Text_MimicWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_MIMIC
@@ -119,10 +119,10 @@ FallarborTown_Mart_EventScript_MetronomeTutor:: @ 82C80B6
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, MoveTutor_EventScript_MetronomeTaught
 	msgbox MoveTutor_Text_MetronomeTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_MetronomeDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_MetronomeDeclined
 	msgbox MoveTutor_Text_MetronomeWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_METRONOME
@@ -148,10 +148,10 @@ FortreeCity_House2_EventScript_SleepTalkTutor:: @ 82C811E
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, MoveTutor_EventScript_SleepTalkTaught
 	msgbox MoveTutor_Text_SleepTalkTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
 	msgbox MoveTutor_Text_SleepTalkWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_SLEEP_TALK
@@ -177,10 +177,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor:: @ 82C8186
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, MoveTutor_EventScript_SubstituteTaught
 	msgbox MoveTutor_Text_SubstituteTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SubstituteDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SubstituteDeclined
 	msgbox MoveTutor_Text_SubstituteWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_SUBSTITUTE
@@ -206,10 +206,10 @@ MossdeepCity_EventScript_DynamicPunchTutor:: @ 82C81EE
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MoveTutor_EventScript_DynamicPunchTaught
 	msgbox MoveTutor_Text_DynamicPunchTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
 	msgbox MoveTutor_Text_DynamicPunchWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_DYNAMIC_PUNCH
@@ -235,10 +235,10 @@ SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor:: @ 82C8256
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, MoveTutor_EventScript_DoubleEdgeTaught
 	msgbox MoveTutor_Text_DoubleEdgeTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
 	msgbox MoveTutor_Text_DoubleEdgeWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_DOUBLE_EDGE
@@ -264,10 +264,10 @@ PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor:: @ 82C82BE
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, MoveTutor_EventScript_ExplosionTaught
 	msgbox MoveTutor_Text_ExplosionTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_ExplosionDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_ExplosionDeclined
 	msgbox MoveTutor_Text_ExplosionWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_EXPLOSION
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index 0d4be2c0d..18b203d61 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -6,9 +6,9 @@ Common_EventScript_PkmnCenterNurse:: @ 827191E
     compare VAR_RESULT, 4
     goto_if_eq EventScript_PkmnCenterNurse_GoldCard
     msgbox gText_WouldYouLikeToRestYourPkmn, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq EventScript_PkmnCenterNurse_HealPkmn
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq EventScript_PkmnCenterNurse_Goodbye
     end
 
@@ -112,14 +112,14 @@ EventScript_PkmnCenterNurse_GoldCard:: @ 8271A68
     applymovement VAR_0x800B, Common_Movement_Delay48
     waitmovement 0
     msgbox gText_NoticesGoldCard, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn
     message gText_WeHopeToSeeYouAgain2
     return
 
 EventScript_PkmnCenterNurse_AskForUsual:: @ 8271AAC
     msgbox gText_YouWantTheUsual, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn
     message gText_WeHopeToSeeYouAgain2
     return
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 9590f3140..c223bc1c7 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -252,7 +252,7 @@ EventScript_Pblock1_Ask:: @ 8293C3E
 	applymovement 16, LilycoveCity_ContestLobby_Movement_294053
 	waitmovement 0
 	msgbox Text_Pblock1_Ask, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_Pblock1_Yes
 	goto EventScript_Pblock1_No
 	end
@@ -283,7 +283,7 @@ LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C
 
 EventScript_Pblock1_KnowHow: @ 8293CB9
 	msgbox Text_Pblock1_KnowHow, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_Pblock1_Start
 	goto EventScript_Pblock1_Explain
 	end
@@ -337,7 +337,7 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D
 	applymovement 3, LilycoveCity_ContestLobby_Movement_294053
 	waitmovement 0
 	msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_293DC6
 	goto LilycoveCity_ContestLobby_EventScript_293D7D
 	end
@@ -354,7 +354,7 @@ LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87
 
 LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91
 	msgbox LilycoveCity_ContestLobby_Text_29328C, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_293DAA
 	goto LilycoveCity_ContestLobby_EventScript_293DB8
 	end
@@ -403,7 +403,7 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E
 	applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053
 	waitmovement 0
 	msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_293EA3
 	goto LilycoveCity_ContestLobby_EventScript_293E5A
 	end
@@ -420,7 +420,7 @@ LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64
 
 LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E
 	msgbox LilycoveCity_ContestLobby_Text_29357E, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_293E87
 	goto LilycoveCity_ContestLobby_EventScript_293E95
 	end
diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc
index 50284d590..b89d2fbd0 100644
--- a/data/scripts/prof_birch.inc
+++ b/data/scripts/prof_birch.inc
@@ -49,7 +49,7 @@ ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141
 
 ProfBirch_EventScript_AskRatePokedex:: @ 8272155
 	msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq ProfBirch_EventScript_DeclineRating
 	call ProfBirch_EventScript_RatePokedex
 	release
diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc
index f70b7f83e..23f224ae4 100644
--- a/data/scripts/record_mix.inc
+++ b/data/scripts/record_mix.inc
@@ -3,9 +3,9 @@ EventScript_MixRecordsPrompt:: @ 8271D5E
 	lock
 	faceplayer
 	msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_MixRecords
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_DeclineMixRecords
 	goto EventScript_DeclineMixRecords
 
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 83cf5d16d..72d1d3c92 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -14,7 +14,7 @@ SafariZone_EventScript_Exit:: @ 82A4B5D
 SafariZone_EventScript_RetirePrompt:: @ 82A4B6F
 	lockall
 	msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq SafariZone_EventScript_Retire
 	releaseall
 	end
@@ -46,7 +46,7 @@ EventScript_PokeBlockFeeder:: @ 82A4BAC
 	compare VAR_RESULT, 0xFFFF
 	goto_if_ne SafariZone_EventScript_PokeblockPresent
 	msgbox SafariZone_Text_PlacePokeblockOnFeeder, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq SafariZone_EventScript_ChoosePokeblock
 	releaseall
 	end
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index f2a99cd36..04fab5598 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -52,7 +52,7 @@ SecretBase_EventScript_Cave:: @ 8275A50
 	goto_if_eq SecretBase_EventScript_CaveNoSecretPower
 	bufferpartymonnick 0, VAR_RESULT
 	msgbox SecretBase_Text_IndentUseSecretPower, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT
 	closemessage
@@ -84,7 +84,7 @@ SecretBase_EventScript_Tree:: @ 8275AA9
 	goto_if_eq SecretBase_EventScript_TreeNoSecretPower
 	bufferpartymonnick 0, VAR_RESULT
 	msgbox SecretBase_Text_TreeUseSecretPower, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT
 	closemessage
@@ -116,7 +116,7 @@ SecretBase_EventScript_Shrub:: @ 8275B02
 	goto_if_eq SecretBase_EventScript_ShrubNoSecretPower
 	bufferpartymonnick 0, VAR_RESULT
 	msgbox SecretBase_Text_ClumpUseSecretPower, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT
 	closemessage
@@ -161,7 +161,7 @@ SecretBase_EventScript_FirstEntrance:: @ 8275B81
 	waitmovement 0
 	setvar VAR_INIT_SECRET_BASE, 1
 	msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq SecretBase_EventScript_SetAsBase
 	closemessage
 	playse SE_KAIDAN
@@ -209,17 +209,17 @@ SecretBase_EventScript_AlreadyHasSecretBase:: @ 8275BE8
 	lockall
 	special GetSecretBaseNearbyMapName
 	msgbox SecretBase_Text_WouldYouLikeToMoveBases, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	fadescreenswapbuffers 1
 	special MoveOutOfSecretBaseFromOutside
 	closemessage
 	fadescreenswapbuffers 0
 	msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	bufferpartymonnick 0, VAR_0x8004
 	buffermovename 1, MOVE_SECRET_POWER
@@ -347,7 +347,7 @@ SecretBase_EventScript_Trainer0:: @ 8275DD6
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer0PostBattle
 	msgbox SecretBase_Text_Trainer0PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer0DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -384,7 +384,7 @@ SecretBase_EventScript_Trainer1:: @ 8275E4E
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer1PostBattle
 	msgbox SecretBase_Text_Trainer1PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer1DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -421,7 +421,7 @@ SecretBase_EventScript_Trainer2:: @ 8275EC6
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer2PostBattle
 	msgbox SecretBase_Text_Trainer2PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer2DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -458,7 +458,7 @@ SecretBase_EventScript_Trainer3:: @ 8275F3E
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer3PostBattle
 	msgbox SecretBase_Text_Trainer3PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer3DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -495,7 +495,7 @@ SecretBase_EventScript_Trainer4:: @ 8275FB6
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer4PostBattle
 	msgbox SecretBase_Text_Trainer4PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer4DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -532,7 +532,7 @@ SecretBase_EventScript_Trainer5:: @ 827602E
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer5PostBattle
 	msgbox SecretBase_Text_Trainer5PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer5DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -569,7 +569,7 @@ SecretBase_EventScript_Trainer6:: @ 82760A6
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer6PostBattle
 	msgbox SecretBase_Text_Trainer6PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer6DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -606,7 +606,7 @@ SecretBase_EventScript_Trainer7:: @ 827611E
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer7PostBattle
 	msgbox SecretBase_Text_Trainer7PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer7DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -643,7 +643,7 @@ SecretBase_EventScript_Trainer8:: @ 8276196
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer8PostBattle
 	msgbox SecretBase_Text_Trainer8PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer8DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -680,7 +680,7 @@ SecretBase_EventScript_Trainer9:: @ 827620E
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer9PostBattle
 	msgbox SecretBase_Text_Trainer9PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer9DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 51a327142..c89202ded 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -37,7 +37,7 @@ Route111_EventScript_2765FF:: @ 82765FF
 	lock
 	faceplayer
 	msgbox Route111_Text_2762C9, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route111_EventScript_27661E
 	msgbox Route111_Text_27655C, MSGBOX_DEFAULT
 	release
diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc
index 3f83e38b0..3a4c044a3 100644
--- a/data/scripts/shared_secret_base.inc
+++ b/data/scripts/shared_secret_base.inc
@@ -68,7 +68,7 @@ SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531
 
 SecretBase_EventScript_PCPackUp:: @ 823B568
     msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq SecretBase_EventScript_PCShowMainMenu
     closemessage
     special MoveOutOfSecretBase
@@ -120,7 +120,7 @@ SecretBase_EventScript_PCRegister:: @ 823B5F0
     goto_if_eq SecretBase_EventScript_CantRegisterTooManyBases
     special CopyCurSecretBaseOwnerName_StrVar1
     msgbox SecretBase_Text_WantToRegisterSecretBase, MSGBOX_YESNO
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq SecretBase_EventScript_PCRegisterMenu
     msgbox SecretBase_Text_RegistrationCompleted, MSGBOX_SIGN
     special ToggleCurSecretBaseRegistry
@@ -130,7 +130,7 @@ SecretBase_EventScript_PCRegister:: @ 823B5F0
 
 SecretBase_EventScript_AlreadyRegistered:: @ 823B62F
     msgbox SecretBase_Text_AlreadyRegisteredDelete, MSGBOX_YESNO
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq SecretBase_EventScript_PCRegisterMenu
     msgbox SecretBase_Text_DataUnregistered, MSGBOX_SIGN
     special ToggleCurSecretBaseRegistry
diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc
index 154cc53c2..af6cac1da 100644
--- a/data/scripts/surf.inc
+++ b/data/scripts/surf.inc
@@ -6,7 +6,7 @@ EventScript_UseSurf:: @ 8271EA0
 	setfieldeffectargument 0, VAR_RESULT
 	lockall
 	msgbox gText_WantToUseSurf, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_ReleaseUseSurf
 	msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT
 	dofieldeffect FLDEFF_USE_SURF