Merge pull request #534 from GriffinRichards/sync-scriptcmds

Sync script commands

data/event_scripts.s

@@ -73,16 +73,16 @@ gSpecialVars::
 
 	.align 2
 gStdScripts::
-	.4byte Std_ObtainItem
+	.4byte Std_ObtainItem           @ STD_OBTAIN_ITEM
-	.4byte Std_FindItem
+	.4byte Std_FindItem             @ STD_FIND_ITEM
-	.4byte Std_MsgboxNPC
+	.4byte Std_MsgboxNPC            @ MSGBOX_NPC
-	.4byte Std_MsgboxSign
+	.4byte Std_MsgboxSign           @ MSGBOX_SIGN
-	.4byte Std_MsgboxDefault
+	.4byte Std_MsgboxDefault        @ MSGBOX_DEFAULT
-	.4byte Std_MsgboxYesNo
+	.4byte Std_MsgboxYesNo          @ MSGBOX_YESNO
-	.4byte Std_MsgboxAutoclose
+	.4byte Std_MsgboxAutoclose      @ MSGBOX_AUTOCLOSE
-	.4byte Std_ObtainDecoration
+	.4byte Std_ObtainDecoration     @ STD_OBTAIN_DECORATION
-	.4byte Std_PutItemAway
+	.4byte Std_PutItemAway          @ STD_PUT_ITEM_AWAY
-	.4byte Std_ReceivedItem
+	.4byte Std_ReceivedItem         @ STD_RECEIVED_ITEM
 gStdScriptsEnd::
 
 	.include "data/maps/BattleColosseum_2P/scripts.inc"
@@ -1112,12 +1112,12 @@ EventScript_ChangePokemonNickname::
 
 @ Unused
 EventScript_HandOverItem::
-	getitemname 0, VAR_0x8004
+	bufferitemname STR_VAR_1, VAR_0x8004
 	playfanfare MUS_OBTAIN_TMHM
 	message Text_HandedOverItem
 	waitmessage
 	waitfanfare
-	removeitem VAR_0x8004, 1
+	removeitem VAR_0x8004
 	return
 
 	.include "data/scripts/pokemon_league.inc"
@@ -1249,8 +1249,7 @@ VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman::
 	msgbox VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain
 	setflag FLAG_GOT_VS_SEEKER
 	giveitem ITEM_VS_SEEKER
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, EventScript_BagIsFull
-	goto_if_eq EventScript_BagIsFull
 	msgbox VermilionCity_PokemonCenter_1F_Text_UseDeviceForRematches
 	release
 	end
@@ -1264,7 +1263,7 @@ VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker::
 	.include "data/scripts/white_out.inc"
 
 Std_PutItemAway::
-	bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
+	bufferitemnameplural STR_VAR_2, VAR_0x8000, VAR_0x8001
 	checkitemtype VAR_0x8000
 	call EventScript_BufferPutAwayPocketName
 	msgbox Text_PutItemAway
@@ -1280,23 +1279,23 @@ EventScript_BufferPutAwayPocketName::
 	end
 
 EventScript_BufferPutAwayPocketItems::
-	getstdstring 2, STDSTRING_ITEMS_POCKET
+	bufferstdstring STR_VAR_3, STDSTRING_ITEMS_POCKET
 	return
 
 EventScript_BufferPutAwayPocketKeyItems::
-	getstdstring 2, STDSTRING_KEY_ITEMS_POCKET
+	bufferstdstring STR_VAR_3, STDSTRING_KEY_ITEMS_POCKET
 	return
 
 EventScript_BufferPutAwayPocketPokeBalls::
-	getstdstring 2, STDSTRING_POKEBALLS_POCKET
+	bufferstdstring STR_VAR_3, STDSTRING_POKEBALLS_POCKET
 	return
 
 EventScript_BufferPutAwayPocketTMCase::
-	getstdstring 2, STDSTRING_TM_CASE
+	bufferstdstring STR_VAR_3, STDSTRING_TM_CASE
 	return
 
 EventScript_BufferPutAwayPocketBerryPouch::
-	getstdstring 2, STDSTRING_BERRY_POUCH
+	bufferstdstring STR_VAR_3, STDSTRING_BERRY_POUCH
 	return
 
 	.include "data/scripts/seagallop.inc"
@@ -1317,7 +1316,7 @@ EventScript_BrailleCursorWaitButton::
 	return
 
 EventScript_NoMoreRoomForPokemon::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox Text_NoMoreRoomForPokemon
 	release
 	end

data/maps/BirthIsland_Exterior/scripts.inc

@@ -37,8 +37,7 @@ BirthIsland_Exterior_OnResume::
 
 BirthIsland_Exterior_EventScript_TryRemoveDeoxys::
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_CAUGHT
+	goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
-	goto_if_ne EventScript_Return
 	removeobject LOCALID_DEOXYS
 	return
 
@@ -71,9 +70,9 @@ BirthIsland_Exterior_EventScript_NotSolved3::
 BirthIsland_Exterior_EventScript_Deoxys::
 	addobject LOCALID_DEOXYS
 	waitse
-	setfieldeffectarg 0, LOCALID_DEOXYS_ROCK
+	setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
-	setfieldeffectarg 1, 56
+	setfieldeffectargument 1, MAP_NUM(BIRTH_ISLAND_EXTERIOR)
-	setfieldeffectarg 2, 2
+	setfieldeffectargument 2, MAP_GROUP(BIRTH_ISLAND_EXTERIOR)
 	dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
 	playbgm MUS_ENCOUNTER_DEOXYS, 0
 	waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
@@ -84,21 +83,15 @@ BirthIsland_Exterior_EventScript_Deoxys::
 	delay 40
 	waitmoncry
 	setvar VAR_LAST_TALKED, LOCALID_DEOXYS
-	setvar VAR_0x8004, SPECIES_DEOXYS
+	seteventmon SPECIES_DEOXYS, 30
-	setvar VAR_0x8005, 30  @ Level
-	setvar VAR_0x8006, ITEM_NONE
-	special CreateEventLegalEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_WON
+	goto_if_eq VAR_RESULT, B_OUTCOME_WON, BirthIsland_Exterior_EventScript_DefeatedDeoxys
-	goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys
+	goto_if_eq VAR_RESULT, B_OUTCOME_RAN, BirthIsland_Exterior_EventScript_RanFromDeoxys
-	compare VAR_RESULT, B_OUTCOME_RAN
+	goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, BirthIsland_Exterior_EventScript_RanFromDeoxys
-	goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys
-	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys
 	setflag FLAG_FOUGHT_DEOXYS
 	release
 	end

data/maps/CeladonCity_Condominiums_1F/scripts.inc

@@ -10,8 +10,7 @@ CeladonCity_Condominiums_1F_EventScript_TeaWoman::
 	msgbox CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead
 	setflag FLAG_GOT_TEA
 	giveitem ITEM_TEA
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, EventScript_BagIsFull
-	goto_if_eq EventScript_BagIsFull
 	msgbox CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea
 	release
 	end

data/maps/CeladonCity_Condominiums_3F/scripts.inc

@@ -17,8 +17,7 @@ CeladonCity_Condominiums_3F_EventScript_Designer::
 	lock
 	faceplayer
 	specialvar VAR_RESULT, HasAllKantoMons
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, CeladonCity_Condominiums_3F_EventScript_CompletedPokedex
-	goto_if_eq CeladonCity_Condominiums_3F_EventScript_CompletedPokedex
 	msgbox CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex
 	release
 	end

data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc

@@ -11,13 +11,10 @@ CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall::
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, SPECIES_EEVEE
-	givemon SPECIES_EEVEE, 25, ITEM_NONE
+	givemon SPECIES_EEVEE, 25
-	compare VAR_RESULT, 0
+	goto_if_eq VAR_RESULT, 0, CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty
-	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty
+	goto_if_eq VAR_RESULT, 1, CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveePC
-	compare VAR_RESULT, 1
+	goto_if_eq VAR_RESULT, 2, EventScript_NoMoreRoomForPokemon
-	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveePC
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_NoMoreRoomForPokemon
 	release
 	end
 
@@ -27,10 +24,9 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty::
 	message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
 	waitmessage
 	waitfanfare
-	getspeciesname 0, SPECIES_EEVEE
+	bufferspeciesname STR_VAR_1, SPECIES_EEVEE
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
-	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
 	call EventScript_GetGiftMonPartySlot
 	call EventScript_ChangePokemonNickname
 	goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
@@ -42,10 +38,9 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveePC::
 	message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
 	waitmessage
 	waitfanfare
-	getspeciesname 0, SPECIES_EEVEE
+	bufferspeciesname STR_VAR_1, SPECIES_EEVEE
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC
-	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC
 	call EventScript_NameReceivedBoxMon
 	goto CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC
 	end

data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc

@@ -58,8 +58,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor::
 CeladonCity_DepartmentStore_Elevator_EventScript_To1F::
 	setvar VAR_0x8006, 4
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1
-	compare VAR_ELEVATOR_FLOOR, 4
+	goto_if_eq VAR_ELEVATOR_FLOOR, 4, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
-	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 4
 	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
@@ -68,8 +67,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To1F::
 CeladonCity_DepartmentStore_Elevator_EventScript_To2F::
 	setvar VAR_0x8006, 5
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1
-	compare VAR_ELEVATOR_FLOOR, 5
+	goto_if_eq VAR_ELEVATOR_FLOOR, 5, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
-	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 5
 	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
@@ -78,8 +76,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To2F::
 CeladonCity_DepartmentStore_Elevator_EventScript_To3F::
 	setvar VAR_0x8006, 6
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1
-	compare VAR_ELEVATOR_FLOOR, 6
+	goto_if_eq VAR_ELEVATOR_FLOOR, 6, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
-	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 6
 	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
@@ -88,8 +85,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To3F::
 CeladonCity_DepartmentStore_Elevator_EventScript_To4F::
 	setvar VAR_0x8006, 7
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1
-	compare VAR_ELEVATOR_FLOOR, 7
+	goto_if_eq VAR_ELEVATOR_FLOOR, 7, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
-	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 7
 	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
@@ -98,8 +94,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To4F::
 CeladonCity_DepartmentStore_Elevator_EventScript_To5F::
 	setvar VAR_0x8006, 8
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1
-	compare VAR_ELEVATOR_FLOOR, 8
+	goto_if_eq VAR_ELEVATOR_FLOOR, 8, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
-	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 8
 	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect

data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc

@@ -7,22 +7,18 @@ CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl::
 	lock
 	faceplayer
 	call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks
-	compare VAR_TEMP_1, 0
+	goto_if_eq VAR_TEMP_1, 0, CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink
-	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink
 	goto CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks::
 	setvar VAR_TEMP_1, 0
-	checkitem ITEM_FRESH_WATER, 1
+	checkitem ITEM_FRESH_WATER
-	compare VAR_RESULT, TRUE
+	call_if_eq VAR_RESULT, TRUE, CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater
-	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater
+	checkitem ITEM_SODA_POP
-	checkitem ITEM_SODA_POP, 1
+	call_if_eq VAR_RESULT, TRUE, CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop
-	compare VAR_RESULT, TRUE
+	checkitem ITEM_LEMONADE
-	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop
+	call_if_eq VAR_RESULT, TRUE, CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade
-	checkitem ITEM_LEMONADE, 1
-	compare VAR_RESULT, TRUE
-	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade
 	return
 
 CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater::
@@ -39,12 +35,11 @@ CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade::
 
 CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink::
 	msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
-	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	textcolor NPC_TEXT_COLOR_NEUTRAL
-	textcolor 3
 	message CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink
 	waitmessage
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	switch VAR_TEMP_1
 	case 1, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater
 	case 2, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop
@@ -141,26 +136,22 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade::
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink::
-	getitemname 0, VAR_0x8008
+	bufferitemname STR_VAR_1, VAR_0x8008
-	getitemname 1, VAR_0x8009
+	bufferitemname STR_VAR_2, VAR_0x8009
-	removeitem VAR_0x8008, 1
+	removeitem VAR_0x8008
-	checkitemspace VAR_0x8009, 1
+	checkitemspace VAR_0x8009
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward
-	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward
 	additem VAR_0x8009
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message Text_ReceivedItemFromLittleGirl
 	waitmessage
 	waitfanfare
 	putitemaway VAR_0x8009
 	call EventScript_RestorePrevTextColor
-	compare VAR_0x8008, ITEM_FRESH_WATER
+	call_if_eq VAR_0x8008, ITEM_FRESH_WATER, CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16
-	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16
+	call_if_eq VAR_0x8008, ITEM_SODA_POP, CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20
-	compare VAR_0x8008, ITEM_SODA_POP
+	call_if_eq VAR_0x8008, ITEM_LEMONADE, CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33
-	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20
-	compare VAR_0x8008, ITEM_LEMONADE
-	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33
 	release
 	end
 
@@ -210,7 +201,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine::
 	lockall
 	message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave
 	waitmessage
-	showmoneybox 0, 0, 0
+	showmoneybox 0, 0
 	goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink
 	end
 
@@ -227,48 +218,43 @@ CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink::
 
 CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater::
 	setvar VAR_TEMP_0, ITEM_FRESH_WATER
-	checkmoney 200, 0
+	checkmoney 200
 	goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop::
 	setvar VAR_TEMP_0, ITEM_SODA_POP
-	checkmoney 300, 0
+	checkmoney 300
 	goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade::
 	setvar VAR_TEMP_0, ITEM_LEMONADE
-	checkmoney 350, 0
+	checkmoney 350
 	goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater::
-	removemoney 200, 0
+	removemoney 200
 	return
 
 CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop::
-	removemoney 300, 0
+	removemoney 300
 	return
 
 CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade::
-	removemoney 350, 0
+	removemoney 350
 	return
 
 CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink::
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney
-	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney
+	checkitemspace VAR_TEMP_0
-	checkitemspace VAR_TEMP_0, 1
+	goto_if_eq VAR_RESULT, FALSE, CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink
-	compare VAR_RESULT, FALSE
+	call_if_eq VAR_TEMP_1, 0, CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater
-	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink
+	call_if_eq VAR_TEMP_1, 1, CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 2, CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade
-	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater
+	updatemoneybox
-	compare VAR_TEMP_1, 1
+	bufferitemname STR_VAR_1, VAR_TEMP_0
-	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop
-	compare VAR_TEMP_1, 2
-	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade
-	updatemoneybox 0, 0, 0
-	getitemname 0, VAR_TEMP_0
 	playse SE_VEND
 	msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut
 	additem VAR_TEMP_0
@@ -292,6 +278,6 @@ CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink::
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine::
-	hidemoneybox 0, 0
+	hidemoneybox
 	releaseall
 	end

data/maps/CeladonCity_GameCorner/scripts.inc

@@ -24,7 +24,7 @@ CeladonCity_GameCorner_EventScript_CoinsClerk::
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
-	showmoneybox 0, 0, 0
+	showmoneybox 0, 0
 	showcoinsbox 0, 5
 	message CeladonCity_GameCorner_Text_WelcomeBuySomeCoins
 	waitmessage
@@ -39,38 +39,32 @@ CeladonCity_GameCorner_EventScript_CoinsClerk::
 
 CeladonCity_GameCorner_EventScript_BuyCoins::
 	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_ClerkNoCoinCase
-	compare VAR_0x8009, 0
+	goto_if_eq VAR_0x8009, 0, CeladonCity_GameCorner_EventScript_Buy50Coins
-	goto_if_eq CeladonCity_GameCorner_EventScript_Buy50Coins
+	goto_if_eq VAR_0x8009, 1, CeladonCity_GameCorner_EventScript_Buy500Coins
-	compare VAR_0x8009, 1
-	goto_if_eq CeladonCity_GameCorner_EventScript_Buy500Coins
 	end
 
 CeladonCity_GameCorner_EventScript_Buy500Coins::
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, (MAX_COINS + 1) - 500
+	goto_if_ge VAR_TEMP_1, (MAX_COINS + 1) - 500, CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
-	goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
+	checkmoney 10000
-	checkmoney 10000, 0
+	goto_if_eq VAR_RESULT, FALSE, CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
-	compare VAR_RESULT, FALSE
-	goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
 	addcoins 500
-	removemoney 10000, 0
+	removemoney 10000
 	goto CeladonCity_GameCorner_EventScript_BoughtCoins
 	end
 
 CeladonCity_GameCorner_EventScript_Buy50Coins::
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, (MAX_COINS + 1) - 50
+	goto_if_ge VAR_TEMP_1, (MAX_COINS + 1) - 50, CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
-	goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
+	checkmoney 1000
-	checkmoney 1000, 0
+	goto_if_eq VAR_RESULT, FALSE, CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
-	compare VAR_RESULT, FALSE
-	goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
 	addcoins 50
-	removemoney 1000, 0
+	removemoney 1000
 	goto CeladonCity_GameCorner_EventScript_BoughtCoins
 	end
 
 CeladonCity_GameCorner_EventScript_BoughtCoins::
-	updatemoneybox 0, 0, 0
+	updatemoneybox
 	updatecoinsbox 0, 5
 	playse SE_SHOP
 	msgbox CeladonCity_GameCorner_Text_HereAreYourCoins
@@ -78,7 +72,7 @@ CeladonCity_GameCorner_EventScript_BoughtCoins::
 	end
 
 CeladonCity_GameCorner_EventScript_ClerkEnd::
-	hidemoneybox 0, 0
+	hidemoneybox
 	hidecoinsbox 0, 5
 	release
 	end
@@ -131,10 +125,9 @@ CeladonCity_GameCorner_EventScript_Fisher::
 	msgbox CeladonCity_GameCorner_Text_DoYouWantToPlay
 	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, (MAX_COINS + 1) - 10
+	goto_if_ge VAR_TEMP_1, (MAX_COINS + 1) - 10, CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins
-	goto_if_ge CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins
 	addcoins 10
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox CeladonCity_GameCorner_Text_Received10CoinsFromMan
 	playse SE_SHOP
 	waitse
@@ -148,7 +141,7 @@ CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins::
 	end
 
 CeladonCity_GameCorner_EventScript_GamblerNoCoinCase::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox CeladonCity_GameCorner_Text_DontHaveCoinCase
 	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
@@ -192,10 +185,9 @@ CeladonCity_GameCorner_EventScript_Scientist::
 	msgbox CeladonCity_GameCorner_Text_WantSomeCoins
 	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, (MAX_COINS + 1) - 20
+	goto_if_ge VAR_TEMP_1, (MAX_COINS + 1) - 20, CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins
-	goto_if_ge CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins
 	addcoins 20
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy
 	playse SE_SHOP
 	waitse
@@ -220,10 +212,9 @@ CeladonCity_GameCorner_EventScript_Gentleman::
 	msgbox CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo
 	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, (MAX_COINS + 1) - 20
+	goto_if_ge VAR_TEMP_1, (MAX_COINS + 1) - 20, CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins
-	goto_if_ge CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins
 	addcoins 20
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox CeladonCity_GameCorner_Text_Received20CoinsFromMan
 	playse SE_SHOP
 	waitse
@@ -254,11 +245,16 @@ CeladonCity_GameCorner_EventScript_DontPlaySlotMachine::
 CeladonCity_GameCorner_EventScript_SlotMachine::
 	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase
 	msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
-	goto_if_eq CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
+	setfieldeffectargument 0, OBJ_EVENT_ID_PLAYER
-	setfieldeffectarg 0, 255
+.ifdef BUGFIX
-	setfieldeffectarg 1, 10
+	setfieldeffectargument 1, MAP_NUM(CELADON_CITY_GAME_CORNER)
-	setfieldeffectarg 2, 14
+	setfieldeffectargument 2, MAP_GROUP(CELADON_CITY_GAME_CORNER)
+.else
+	@ Map num/group were provided in the wrong order
+	setfieldeffectargument 1, MAP_GROUP(CELADON_CITY_GAME_CORNER)
+	setfieldeffectargument 2, MAP_NUM(CELADON_CITY_GAME_CORNER)
+.endif
 	dofieldeffect FLDEFF_SMILEY_FACE_ICON
 	waitfieldeffect FLDEFF_SMILEY_FACE_ICON
 	specialvar VAR_RESULT, GetRandomSlotMachineId
@@ -423,10 +419,8 @@ CeladonCity_GameCorner_EventScript_RocketGrunt::
 CeladonCity_GameCorner_Text_DefeatedGrunt::
 	msgbox CeladonCity_GameCorner_Text_GruntPostBattle
 	closemessage
-	compare VAR_FACING, DIR_WEST
+	call_if_eq VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExitWest
-	call_if_eq CeladonCity_GameCorner_Text_GruntExitWest
+	call_if_ne VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExit
-	compare VAR_FACING, DIR_WEST
-	call_if_ne CeladonCity_GameCorner_Text_GruntExit
 	removeobject LOCALID_GRUNT
 	release
 	end

data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc

@@ -104,14 +104,12 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon::
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon::
-	getspeciesname 0, VAR_TEMP_1
+	bufferspeciesname STR_VAR_1, VAR_TEMP_1
 	msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
-	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	checkcoins VAR_RESULT
-	compare VAR_RESULT, VAR_TEMP_2
+	goto_if_lt VAR_RESULT, VAR_TEMP_2, CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins
-	goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins
+	textcolor NPC_TEXT_COLOR_NEUTRAL
-	textcolor 3
 	switch VAR_TEMP_1
 	case SPECIES_ABRA,     CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra
 	case SPECIES_CLEFAIRY, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy
@@ -123,10 +121,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon::
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra::
 	.ifdef FIRERED
-	givemon VAR_TEMP_1, 9, ITEM_NONE
+	givemon VAR_TEMP_1, 9
 	.else
 	.ifdef LEAFGREEN
-	givemon VAR_TEMP_1, 7, ITEM_NONE
+	givemon VAR_TEMP_1, 7
 	.endif
 	.endif
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
@@ -134,10 +132,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra::
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy::
 	.ifdef FIRERED
-	givemon VAR_TEMP_1, 8, ITEM_NONE
+	givemon VAR_TEMP_1, 8
 	.else
 	.ifdef LEAFGREEN
-	givemon VAR_TEMP_1, 12, ITEM_NONE
+	givemon VAR_TEMP_1, 12
 	.endif
 	.endif
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
@@ -145,47 +143,44 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy::
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini::
 	.ifdef FIRERED
-	givemon VAR_TEMP_1, 18, ITEM_NONE
+	givemon VAR_TEMP_1, 18
 	.else
 	.ifdef LEAFGREEN
-	givemon VAR_TEMP_1, 24, ITEM_NONE
+	givemon VAR_TEMP_1, 24
 	.endif
 	.endif
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther::
-	givemon VAR_TEMP_1, 25, ITEM_NONE
+	givemon VAR_TEMP_1, 25
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon::
 	.ifdef FIRERED
-	givemon VAR_TEMP_1, 26, ITEM_NONE
+	givemon VAR_TEMP_1, 26
 	.else
 	.ifdef LEAFGREEN
-	givemon VAR_TEMP_1, 18, ITEM_NONE
+	givemon VAR_TEMP_1, 18
 	.endif
 	.endif
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir::
-	givemon VAR_TEMP_1, 18, ITEM_NONE
+	givemon VAR_TEMP_1, 18
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon::
-	compare VAR_RESULT, 0
+	goto_if_eq VAR_RESULT, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty
-	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty
+	goto_if_eq VAR_RESULT, 1, CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC
-	compare VAR_RESULT, 1
+	goto_if_eq VAR_RESULT, 2, CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull
-	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC
-	compare VAR_RESULT, 2
-	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox Text_NoMoreRoomForPokemon
 	hidecoinsbox 0, 0
 	release
@@ -200,7 +195,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon::
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired
 	release
 	end
@@ -213,28 +208,26 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins::
 CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty::
 	removecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
-	getspeciesname 0, VAR_TEMP_1
+	bufferspeciesname STR_VAR_1, VAR_TEMP_1
 	playfanfare MUS_LEVEL_UP
 	message Text_PlayerObtainedTheMon
 	waitmessage
 	waitfanfare
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon
-	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC::
 	removecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
-	getspeciesname 0, VAR_TEMP_1
+	bufferspeciesname STR_VAR_1, VAR_TEMP_1
 	playfanfare MUS_LEVEL_UP
 	message Text_PlayerObtainedTheMon
 	waitmessage
 	waitfanfare
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC
-	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC
 	call EventScript_NameReceivedBoxMon
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC
 	end
@@ -271,61 +264,57 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM::
 CeladonCity_GameCorner_PrizeRoom_EventScript_TM13::
 	setvar VAR_TEMP_1, ITEM_TM13
 	setvar VAR_TEMP_2, 4000
-	getmovename 1, MOVE_ICE_BEAM
+	buffermovename STR_VAR_2, MOVE_ICE_BEAM
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_TM23::
 	setvar VAR_TEMP_1, ITEM_TM23
 	setvar VAR_TEMP_2, 3500
-	getmovename 1, MOVE_IRON_TAIL
+	buffermovename STR_VAR_2, MOVE_IRON_TAIL
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_TM24::
 	setvar VAR_TEMP_1, ITEM_TM24
 	setvar VAR_TEMP_2, 4000
-	getmovename 1, MOVE_THUNDERBOLT
+	buffermovename STR_VAR_2, MOVE_THUNDERBOLT
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_TM30::
 	setvar VAR_TEMP_1, ITEM_TM30
 	setvar VAR_TEMP_2, 4500
-	getmovename 1, MOVE_SHADOW_BALL
+	buffermovename STR_VAR_2, MOVE_SHADOW_BALL
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_TM35::
 	setvar VAR_TEMP_1, ITEM_TM35
 	setvar VAR_TEMP_2, 4000
-	getmovename 1, MOVE_FLAMETHROWER
+	buffermovename STR_VAR_2, MOVE_FLAMETHROWER
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM::
 	msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
-	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem::
-	getitemname 0, VAR_TEMP_1
+	bufferitemname STR_VAR_1, VAR_TEMP_1
 	msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
-	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize::
-	getitemname 0, VAR_TEMP_1
+	bufferitemname STR_VAR_1, VAR_TEMP_1
 	checkcoins VAR_RESULT
-	compare VAR_RESULT, VAR_TEMP_2
+	goto_if_lt VAR_RESULT, VAR_TEMP_2, CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins
-	goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins
+	checkitemspace VAR_TEMP_1
-	checkitemspace VAR_TEMP_1, 1
+	goto_if_eq VAR_RESULT, FALSE, CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull
-	compare VAR_RESULT, FALSE
-	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull
 	removecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
 	giveitem VAR_TEMP_1
@@ -333,7 +322,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize::
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox Text_TooBadBagFull
 	hidecoinsbox 0, 0
 	release

data/maps/CeladonCity_Gym/scripts.inc

@@ -21,9 +21,8 @@ CeladonCity_Gym_EventScript_DefeatedErika::
 
 CeladonCity_Gym_EventScript_GiveTM19::
 	msgbox CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis
-	checkitemspace ITEM_TM19, 1
+	checkitemspace ITEM_TM19
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeladonCity_Gym_EventScript_NoRoomForTM19
-	goto_if_eq CeladonCity_Gym_EventScript_NoRoomForTM19
 	giveitem_msg CeladonCity_Gym_Text_ReceivedTM19FromErika, ITEM_TM19
 	setflag FLAG_GOT_TM19_FROM_ERIKA
 	msgbox CeladonCity_Gym_Text_ExplainTM19

data/maps/CeladonCity_Restaurant/scripts.inc

@@ -14,9 +14,8 @@ CeladonCity_Restaurant_EventScript_CoinCaseMan::
 	faceplayer
 	goto_if_set FLAG_GOT_COIN_CASE, CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase
 	msgbox CeladonCity_Restaurant_Text_TakeThisImBusted
-	checkitemspace ITEM_COIN_CASE, 1
+	checkitemspace ITEM_COIN_CASE
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeladonCity_Restaurant_EventScript_NoRoomForCoinCase
-	goto_if_eq CeladonCity_Restaurant_EventScript_NoRoomForCoinCase
 	giveitem_msg CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan, ITEM_COIN_CASE
 	setflag FLAG_GOT_COIN_CASE
 	release

data/maps/CeruleanCave_B1F/scripts.inc

@@ -9,8 +9,7 @@ CeruleanCave_B1F_OnResume::
 
 CeruleanCave_B1F_EventScript_TryRemoveMewtwo::
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_CAUGHT
+	goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
-	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
 	return
 
@@ -35,18 +34,15 @@ CeruleanCave_B1F_EventScript_Mewtwo::
 	delay 20
 	playbgm MUS_ENCOUNTER_GYM_LEADER, 0
 	waitbuttonpress
-	setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
+	setwildbattle SPECIES_MEWTWO, 70
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_WON
+	goto_if_eq VAR_RESULT, B_OUTCOME_WON, CeruleanCave_B1F_EventScript_DefeatedMewtwo
-	goto_if_eq CeruleanCave_B1F_EventScript_DefeatedMewtwo
+	goto_if_eq VAR_RESULT, B_OUTCOME_RAN, CeruleanCave_B1F_EventScript_RanFromMewtwo
-	compare VAR_RESULT, B_OUTCOME_RAN
+	goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, CeruleanCave_B1F_EventScript_RanFromMewtwo
-	goto_if_eq CeruleanCave_B1F_EventScript_RanFromMewtwo
-	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq CeruleanCave_B1F_EventScript_RanFromMewtwo
 	setflag FLAG_FOUGHT_MEWTWO
 	release
 	end

data/maps/CeruleanCity/scripts.inc

@@ -41,7 +41,7 @@ CeruleanCity_EventScript_RivalTriggerRight::
 	end
 
 CeruleanCity_EventScript_Rival::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	setvar VAR_MAP_SCENE_ROUTE22, 2
 	playbgm MUS_ENCOUNTER_RIVAL, 0
 	addobject LOCALID_RIVAL
@@ -49,22 +49,16 @@ CeruleanCity_EventScript_Rival::
 	waitmovement 0
 	msgbox CeruleanCity_Text_RivalIntro
 	setvar VAR_LAST_TALKED, LOCALID_RIVAL
-	compare VAR_STARTER_MON, 2
+	call_if_eq VAR_STARTER_MON, 2, CeruleanCity_EventScript_RivalSquirtle
-	call_if_eq CeruleanCity_EventScript_RivalSquirtle
+	call_if_eq VAR_STARTER_MON, 1, CeruleanCity_EventScript_RivalBulbasaur
-	compare VAR_STARTER_MON, 1
+	call_if_eq VAR_STARTER_MON, 0, CeruleanCity_EventScript_RivalCharmander
-	call_if_eq CeruleanCity_EventScript_RivalBulbasaur
-	compare VAR_STARTER_MON, 0
-	call_if_eq CeruleanCity_EventScript_RivalCharmander
 	famechecker FAMECHECKER_BILL, 0
 	msgbox CeruleanCity_Text_RivalPostBattle
 	closemessage
 	playbgm MUS_RIVAL_EXIT, 0
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, CeruleanCity_EventScript_RivalStartExit
-	call_if_eq CeruleanCity_EventScript_RivalStartExit
+	call_if_eq VAR_TEMP_1, 1, CeruleanCity_EventScript_RivalStartExit
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 2, CeruleanCity_EventScript_RivalStartExitRight
-	call_if_eq CeruleanCity_EventScript_RivalStartExit
-	compare VAR_TEMP_1, 2
-	call_if_eq CeruleanCity_EventScript_RivalStartExitRight
 	msgbox CeruleanCity_Text_OhRightLittlePresentAsFavor
 	setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
 	setflag FLAG_GOT_FAME_CHECKER
@@ -189,9 +183,8 @@ CeruleanCity_EventScript_Grunt::
 
 CeruleanCity_EventScript_GruntDefeated::
 	msgbox CeruleanCity_Text_OkayIllReturnStolenTM
-	checkitemspace ITEM_TM28, 1
+	checkitemspace ITEM_TM28
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeruleanCity_EventScript_NoRoomForTM28
-	goto_if_eq CeruleanCity_EventScript_NoRoomForTM28
 	giveitem_msg CeruleanCity_Text_RecoveredTM28FromGrunt, ITEM_TM28
 	msgbox CeruleanCity_Text_BetterGetMovingBye
 	closemessage
@@ -203,7 +196,7 @@ CeruleanCity_EventScript_GruntDefeated::
 	end
 
 CeruleanCity_EventScript_NoRoomForTM28::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox CeruleanCity_Text_MakeRoomForThisCantRun
 	release
 	end
@@ -229,7 +222,7 @@ CeruleanCity_EventScript_GruntTriggerBottom::
 	end
 
 CeruleanCity_EventScript_GruntTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox CeruleanCity_Text_GruntIntro
 	setvar VAR_LAST_TALKED, LOCALID_GRUNT
 	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat
@@ -286,24 +279,18 @@ CeruleanCity_EventScript_Lass::
 	lock
 	random 3
 	copyvar VAR_0x8008, VAR_RESULT
-	compare VAR_0x8008, 0
+	call_if_eq VAR_0x8008, 0, CeruleanCity_EventScript_SlowbroCommand1
-	call_if_eq CeruleanCity_EventScript_SlowbroCommand1
+	call_if_eq VAR_0x8008, 1, CeruleanCity_EventScript_SlowbroCommand2
-	compare VAR_0x8008, 1
+	call_if_eq VAR_0x8008, 2, CeruleanCity_EventScript_SlowbroCommand3
-	call_if_eq CeruleanCity_EventScript_SlowbroCommand2
-	compare VAR_0x8008, 2
-	call_if_eq CeruleanCity_EventScript_SlowbroCommand3
 	waitmessage
 	delay 40
 	playse SE_PIN
 	applymovement LOCALID_SLOWBRO, Movement_QuestionMark
 	waitmovement 0
 	delay 30
-	compare VAR_0x8008, 0
+	call_if_eq VAR_0x8008, 0, CeruleanCity_EventScript_SlowbroFailed1
-	call_if_eq CeruleanCity_EventScript_SlowbroFailed1
+	call_if_eq VAR_0x8008, 1, CeruleanCity_EventScript_SlowbroFailed2
-	compare VAR_0x8008, 1
+	call_if_eq VAR_0x8008, 2, CeruleanCity_EventScript_SlowbroFailed3
-	call_if_eq CeruleanCity_EventScript_SlowbroFailed2
-	compare VAR_0x8008, 2
-	call_if_eq CeruleanCity_EventScript_SlowbroFailed3
 	release
 	end
 
@@ -335,14 +322,10 @@ CeruleanCity_EventScript_Slowbro::
 	lock
 	random 4
 	copyvar VAR_0x8008, VAR_RESULT
-	compare VAR_0x8008, 0
+	call_if_eq VAR_0x8008, 0, CeruleanCity_EventScript_SlowbroText1
-	call_if_eq CeruleanCity_EventScript_SlowbroText1
+	call_if_eq VAR_0x8008, 1, CeruleanCity_EventScript_SlowbroText2
-	compare VAR_0x8008, 1
+	call_if_eq VAR_0x8008, 2, CeruleanCity_EventScript_SlowbroText3
-	call_if_eq CeruleanCity_EventScript_SlowbroText2
+	call_if_eq VAR_0x8008, 3, CeruleanCity_EventScript_SlowbroText4
-	compare VAR_0x8008, 2
-	call_if_eq CeruleanCity_EventScript_SlowbroText3
-	compare VAR_0x8008, 3
-	call_if_eq CeruleanCity_EventScript_SlowbroText4
 	release
 	end
 

data/maps/CeruleanCity_BikeShop/scripts.inc

@@ -6,7 +6,7 @@ CeruleanCity_BikeShop_EventScript_Clerk::
 	faceplayer
 	goto_if_set FLAG_GOT_BICYCLE, CeruleanCity_BikeShop_EventScript_AlreadyGotBicycle
 	goto_if_set FLAG_GOT_BIKE_VOUCHER, CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher
-	showmoneybox 0, 0, 0
+	showmoneybox 0, 0
 	message CeruleanCity_BikeShop_Text_WelcomeToBikeShop
 	waitmessage
 	multichoice 11, 0, MULTICHOICE_BIKE_SHOP, FALSE
@@ -24,7 +24,7 @@ CeruleanCity_BikeShop_EventScript_TryPurchaseBicycle::
 
 CeruleanCity_BikeShop_EventScript_ClerkGoodbye::
 	msgbox CeruleanCity_BikeShop_Text_ThankYouComeAgain
-	hidemoneybox 0, 0
+	hidemoneybox
 	release
 	end
 

data/maps/CeruleanCity_Gym/scripts.inc

@@ -20,9 +20,8 @@ CeruleanCity_Gym_EventScript_MistyDefeated::
 
 CeruleanCity_Gym_EventScript_GiveTM03::
 	msgbox CeruleanCity_Gym_Text_ExplainCascadeBadge
-	checkitemspace ITEM_TM03, 1
+	checkitemspace ITEM_TM03
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeruleanCity_Gym_EventScript_NoRoomForTM03
-	goto_if_eq CeruleanCity_Gym_EventScript_NoRoomForTM03
 	giveitem_msg CeruleanCity_Gym_Text_ReceivedTM03FromMisty, ITEM_TM03
 	setflag FLAG_GOT_TM03_FROM_MISTY
 	msgbox CeruleanCity_Gym_Text_ExplainTM03

data/maps/CeruleanCity_House3/scripts.inc

@@ -12,14 +12,11 @@ CeruleanCity_House3_EventScript_Dontae::
 	call EventScript_GetInGameTradeSpeciesInfo
 	goto_if_set FLAG_DID_ZYNX_TRADE, CeruleanCity_House3_EventScript_AlreadyTraded
 	msgbox Trade_Text_DoYouHaveMonWouldYouTradeForMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CeruleanCity_House3_EventScript_DeclineTrade
-	goto_if_eq CeruleanCity_House3_EventScript_DeclineTrade
 	call EventScript_ChooseMonForInGameTrade
-	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge VAR_0x8004, PARTY_SIZE, CeruleanCity_House3_EventScript_DeclineTrade
-	goto_if_ge CeruleanCity_House3_EventScript_DeclineTrade
 	call EventScript_GetInGameTradeSpecies
-	compare VAR_RESULT, VAR_0x8009
+	goto_if_ne VAR_RESULT, VAR_0x8009, CeruleanCity_House3_EventScript_NotRequestedMon
-	goto_if_ne CeruleanCity_House3_EventScript_NotRequestedMon
 	call EventScript_DoInGameTrade
 	msgbox Trade_Text_Thanks
 	setflag FLAG_DID_ZYNX_TRADE
@@ -32,7 +29,7 @@ CeruleanCity_House3_EventScript_DeclineTrade::
 	end
 
 CeruleanCity_House3_EventScript_NotRequestedMon::
-	getspeciesname 0, VAR_0x8009
+	bufferspeciesname STR_VAR_1, VAR_0x8009
 	msgbox Trade_Text_ThisIsntMon
 	release
 	end

data/maps/CeruleanCity_House4/scripts.inc

@@ -9,20 +9,13 @@ CeruleanCity_House4_EventScript_WonderNewsBerryMan::
 	lock
 	specialvar VAR_0x8004, GetMENewsJisanItemAndState
 	copyvar VAR_0x8008, VAR_RESULT
-	compare VAR_0x8004, 0
+	goto_if_eq VAR_0x8004, 0, CeruleanCity_House4_EventScript_NoNews
-	goto_if_eq CeruleanCity_House4_EventScript_NoNews
+	goto_if_eq VAR_0x8004, 1, CeruleanCity_House4_EventScript_News1
-	compare VAR_0x8004, 1
+	goto_if_eq VAR_0x8004, 2, CeruleanCity_House4_EventScript_News2
-	goto_if_eq CeruleanCity_House4_EventScript_News1
+	goto_if_eq VAR_0x8004, 3, CeruleanCity_House4_EventScript_NewsNotSpread
-	compare VAR_0x8004, 2
+	goto_if_eq VAR_0x8004, 4, CeruleanCity_House4_EventScript_NewsSpread1
-	goto_if_eq CeruleanCity_House4_EventScript_News2
+	goto_if_eq VAR_0x8004, 5, CeruleanCity_House4_EventScript_NewsSpread2
-	compare VAR_0x8004, 3
+	goto_if_eq VAR_0x8004, 6, CeruleanCity_House4_EventScript_NewsDone
-	goto_if_eq CeruleanCity_House4_EventScript_NewsNotSpread
-	compare VAR_0x8004, 4
-	goto_if_eq CeruleanCity_House4_EventScript_NewsSpread1
-	compare VAR_0x8004, 5
-	goto_if_eq CeruleanCity_House4_EventScript_NewsSpread2
-	compare VAR_0x8004, 6
-	goto_if_eq CeruleanCity_House4_EventScript_NewsDone
 	end
 
 CeruleanCity_House4_EventScript_NoNews::
@@ -34,8 +27,7 @@ CeruleanCity_House4_EventScript_News1::
 	call CeruleanCity_House4_EventScript_MovementReactionToNews
 	msgbox CeruleanCity_House4_Text_NewNewsInformativeHaveThis
 	giveitem VAR_0x8008
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeruleanCity_House4_EventScript_NoRoomForBerries
-	goto_if_eq CeruleanCity_House4_EventScript_NoRoomForBerries
 	release
 	end
 
@@ -43,8 +35,7 @@ CeruleanCity_House4_EventScript_News2::
 	call CeruleanCity_House4_EventScript_MovementReactionToNews
 	msgbox CeruleanCity_House4_Text_IncredibleNewsHaveBerries
 	giveitem VAR_0x8008, 4
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeruleanCity_House4_EventScript_NoRoomForBerries
-	goto_if_eq CeruleanCity_House4_EventScript_NoRoomForBerries
 	release
 	end
 
@@ -59,8 +50,7 @@ CeruleanCity_House4_EventScript_NewsSpread1::
 	call CeruleanCity_House4_EventScript_MovementReactionToNews
 	msgbox CeruleanCity_House4_Text_ThanksForSpreadingNewsTakeThis
 	giveitem VAR_0x8008
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeruleanCity_House4_EventScript_NoRoomForBerries
-	goto_if_eq CeruleanCity_House4_EventScript_NoRoomForBerries
 	release
 	end
 
@@ -68,8 +58,7 @@ CeruleanCity_House4_EventScript_NewsSpread2::
 	call CeruleanCity_House4_EventScript_MovementReactionToNews
 	msgbox CeruleanCity_House4_Text_MagnificentNewsSpreadHaveBerries
 	giveitem VAR_0x8008, 4
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeruleanCity_House4_EventScript_NoRoomForBerries
-	goto_if_eq CeruleanCity_House4_EventScript_NoRoomForBerries
 	release
 	end
 

data/maps/CeruleanCity_House5/scripts.inc

@@ -6,14 +6,12 @@ CeruleanCity_House5_EventScript_BerryPowderMan::
 	faceplayer
 	goto_if_set FLAG_GOT_POWDER_JAR, CeruleanCity_House5_EventScript_AskToExchangePowder
 	msgbox CeruleanCity_House1_Text_AnyInterestInBerries, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CeruleanCity_House5_EventScript_NoInterestInBerries
-	goto_if_eq CeruleanCity_House5_EventScript_NoInterestInBerries
 	goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, CeruleanCity_House5_EventScript_NoBerries
 	msgbox CeruleanCity_House1_Text_HaveJustTheThing
 	setflag FLAG_GOT_POWDER_JAR
 	giveitem ITEM_POWDER_JAR
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, EventScript_BagIsFull
-	goto_if_eq EventScript_BagIsFull
 	msgbox CeruleanCity_House1_Text_GoCrushBerriesAtDirectCorner
 	release
 	end
@@ -57,77 +55,77 @@ CeruleanCity_House5_EventScript_ChooseExchangeItem::
 	end
 
 CeruleanCity_House5_EventScript_EnergyPowder::
-	getitemname 0, ITEM_ENERGY_POWDER
+	bufferitemname STR_VAR_1, ITEM_ENERGY_POWDER
 	setvar VAR_0x8008, ITEM_ENERGY_POWDER
 	setvar VAR_0x8009, 50
 	goto CeruleanCity_House5_EventScript_ExchangePowderForItem
 	end
 
 CeruleanCity_House5_EventScript_EnergyRoot::
-	getitemname 0, ITEM_ENERGY_ROOT
+	bufferitemname STR_VAR_1, ITEM_ENERGY_ROOT
 	setvar VAR_0x8008, ITEM_ENERGY_ROOT
 	setvar VAR_0x8009, 80
 	goto CeruleanCity_House5_EventScript_ExchangePowderForItem
 	end
 
 CeruleanCity_House5_EventScript_HealPowder::
-	getitemname 0, ITEM_HEAL_POWDER
+	bufferitemname STR_VAR_1, ITEM_HEAL_POWDER
 	setvar VAR_0x8008, ITEM_HEAL_POWDER
 	setvar VAR_0x8009, 50
 	goto CeruleanCity_House5_EventScript_ExchangePowderForItem
 	end
 
 CeruleanCity_House5_EventScript_RevivalHerb::
-	getitemname 0, ITEM_REVIVAL_HERB
+	bufferitemname STR_VAR_1, ITEM_REVIVAL_HERB
 	setvar VAR_0x8008, ITEM_REVIVAL_HERB
 	setvar VAR_0x8009, 300
 	goto CeruleanCity_House5_EventScript_ExchangePowderForItem
 	end
 
 CeruleanCity_House5_EventScript_Protein::
-	getitemname 0, ITEM_PROTEIN
+	bufferitemname STR_VAR_1, ITEM_PROTEIN
 	setvar VAR_0x8008, ITEM_PROTEIN
 	setvar VAR_0x8009, 1000
 	goto CeruleanCity_House5_EventScript_ExchangePowderForItem
 	end
 
 CeruleanCity_House5_EventScript_Iron::
-	getitemname 0, ITEM_IRON
+	bufferitemname STR_VAR_1, ITEM_IRON
 	setvar VAR_0x8008, ITEM_IRON
 	setvar VAR_0x8009, 1000
 	goto CeruleanCity_House5_EventScript_ExchangePowderForItem
 	end
 
 CeruleanCity_House5_EventScript_Carbos::
-	getitemname 0, ITEM_CARBOS
+	bufferitemname STR_VAR_1, ITEM_CARBOS
 	setvar VAR_0x8008, ITEM_CARBOS
 	setvar VAR_0x8009, 1000
 	goto CeruleanCity_House5_EventScript_ExchangePowderForItem
 	end
 
 CeruleanCity_House5_EventScript_Calcium::
-	getitemname 0, ITEM_CALCIUM
+	bufferitemname STR_VAR_1, ITEM_CALCIUM
 	setvar VAR_0x8008, ITEM_CALCIUM
 	setvar VAR_0x8009, 1000
 	goto CeruleanCity_House5_EventScript_ExchangePowderForItem
 	end
 
 CeruleanCity_House5_EventScript_Zinc::
-	getitemname 0, ITEM_ZINC
+	bufferitemname STR_VAR_1, ITEM_ZINC
 	setvar VAR_0x8008, ITEM_ZINC
 	setvar VAR_0x8009, 1000
 	goto CeruleanCity_House5_EventScript_ExchangePowderForItem
 	end
 
 CeruleanCity_House5_EventScript_HPUp::
-	getitemname 0, ITEM_HP_UP
+	bufferitemname STR_VAR_1, ITEM_HP_UP
 	setvar VAR_0x8008, ITEM_HP_UP
 	setvar VAR_0x8009, 1000
 	goto CeruleanCity_House5_EventScript_ExchangePowderForItem
 	end
 
 CeruleanCity_House5_EventScript_PPUp::
-	getitemname 0, ITEM_PP_UP
+	bufferitemname STR_VAR_1, ITEM_PP_UP
 	setvar VAR_0x8008, ITEM_PP_UP
 	setvar VAR_0x8009, 3000
 	goto CeruleanCity_House5_EventScript_ExchangePowderForItem
@@ -141,21 +139,17 @@ CeruleanCity_House5_EventScript_ExitMenu::
 
 CeruleanCity_House5_EventScript_ExchangePowderForItem::
 	msgbox CeruleanCity_House1_Text_YoullExchangeBerryPowderForItem, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CeruleanCity_House5_EventScript_ChooseExchangeItem
-	goto_if_eq CeruleanCity_House5_EventScript_ChooseExchangeItem
 	copyvar VAR_0x8004, VAR_0x8009
 	specialvar VAR_RESULT, Script_HasEnoughBerryPowder
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeruleanCity_House5_EventScript_NotEnoughBerryPowder
-	goto_if_eq CeruleanCity_House5_EventScript_NotEnoughBerryPowder
 	giveitem VAR_0x8008
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CeruleanCity_House5_EventScript_BagIsFull
-	goto_if_eq CeruleanCity_House5_EventScript_BagIsFull
 	copyvar VAR_0x8004, VAR_0x8009
 	special Script_TakeBerryPowder
 	special PrintPlayerBerryPowderAmount
 	msgbox CeruleanCity_House1_Text_TradeMoreBerryPowder, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, CeruleanCity_House5_EventScript_ChooseExchangeItem
-	goto_if_eq CeruleanCity_House5_EventScript_ChooseExchangeItem
 	msgbox CeruleanCity_House1_Text_HopeToSeeYouAgain
 	special RemoveBerryPowderVendorMenu
 	release

data/maps/CinnabarIsland/scripts.inc

@@ -9,12 +9,9 @@ CinnabarIsland_MapScripts::
 CinnabarIsland_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND
 	call CinnabarIsland_EventScript_CheckUnlockGym
-	compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1
+	call_if_eq VAR_MAP_SCENE_CINNABAR_ISLAND, 1, CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland
-	call_if_eq CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland
+	call_if_eq VAR_MAP_SCENE_CINNABAR_ISLAND, 3, CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands
-	compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3
+	call_if_eq VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter
-	call_if_eq CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands
-	compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
-	call_if_eq CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter
 	end
 
 CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter::
@@ -27,8 +24,7 @@ CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter::
 
 CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland::
 	getplayerxy VAR_0x8004, VAR_0x8005
-	compare VAR_0x8004, 18
+	goto_if_ge VAR_0x8004, 18, CinnabarIsland_EventScript_MoveSeagallopDown
-	goto_if_ge CinnabarIsland_EventScript_MoveSeagallopDown
 	setflag FLAG_TEMP_2
 	setobjectxyperm LOCALID_BILL, 18, 12
 	setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
@@ -62,7 +58,7 @@ CinnabarIsland_EventScript_ExitPokeCenterForOneIsland::
 	lockall
 	clearflag FLAG_DONT_TRANSITION_MUSIC
 	savebgm MUS_DUMMY
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2
 	delay 20
 	call CinnabarIsland_EventScript_SailToOneIsland
@@ -71,7 +67,7 @@ CinnabarIsland_EventScript_ExitPokeCenterForOneIsland::
 
 CinnabarIsland_EventScript_ReturnFromSeviiIslands::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain
 	closemessage
 	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExit
@@ -94,7 +90,7 @@ CinnabarIsland_Movement_BillExit::
 
 CinnabarIsland_EventScript_BillScene::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer1
 	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer2
 	playse SE_PIN
@@ -106,10 +102,8 @@ CinnabarIsland_EventScript_BillScene::
 	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer2
 	msgbox CinnabarIsland_Text_HeyIfItIsntPlayer
 	msgbox CinnabarIsland_Text_ComeWithMeToOneIsland, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, CinnabarIsland_EventScript_AgreeSailToOneIsland
-	goto_if_eq CinnabarIsland_EventScript_AgreeSailToOneIsland
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_EventScript_DeclineSailToOneIsland
-	compare VAR_RESULT, NO
-	goto_if_eq CinnabarIsland_EventScript_DeclineSailToOneIsland
 	end
 
 CinnabarIsland_EventScript_BillFacePlayer1::

data/maps/CinnabarIsland_Gym/scripts.inc

@@ -73,9 +73,8 @@ CinnabarIsland_Gym_EventScript_DefeatedBlaine::
 
 CinnabarIsland_Gym_EventScript_GiveTM38::
 	msgbox CinnabarIsland_Gym_Text_ExplainVolcanoBadge
-	checkitemspace ITEM_TM38, 1
+	checkitemspace ITEM_TM38
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, CinnabarIsland_Gym_EventScript_NoRoomForTM38
-	goto_if_eq CinnabarIsland_Gym_EventScript_NoRoomForTM38
 	giveitem_msg CinnabarIsland_Gym_Text_ReceivedTM38FromBlaine, ITEM_TM38
 	setflag FLAG_GOT_TM38_FROM_BLAINE
 	msgbox CinnabarIsland_Gym_Text_FireBlastIsUltimateFireMove
@@ -217,10 +216,8 @@ CinnabarIsland_Gym_EventScript_Quz1Right::
 CinnabarIsland_Gym_EventScript_Quiz1::
 	msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
 	msgbox CinnabarIsland_Gym_Text_QuizQuestion1, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz1Correct
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz1Correct
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz1Incorrect
-	compare VAR_RESULT, NO
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz1Incorrect
 	end
 
 CinnabarIsland_Gym_EventScript_CorrectAnswer::
@@ -263,11 +260,9 @@ CinnabarIsland_Gym_EventScript_Quiz1Incorrect::
 	end
 
 CinnabarIsland_Gym_EventScript_BattleQuinn::
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_QuinnApproachLeft
-	call_if_eq CinnabarIsland_Gym_EventScript_QuinnApproachLeft
+	call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_QuinnApproachRight
-	compare VAR_TEMP_1, 1
+	textcolor NPC_TEXT_COLOR_MALE
-	call_if_eq CinnabarIsland_Gym_EventScript_QuinnApproachRight
-	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_QuinnIntro
 	trainerbattle_no_intro TRAINER_BURGLAR_QUINN, CinnabarIsland_Gym_Text_QuinnDefeat
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
@@ -311,10 +306,8 @@ CinnabarIsland_Gym_EventScript_Quiz2Right::
 CinnabarIsland_Gym_EventScript_Quiz2::
 	msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
 	msgbox CinnabarIsland_Gym_Text_QuizQuestion2, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz2Incorrect
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz2Incorrect
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz2Correct
-	compare VAR_RESULT, NO
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz2Correct
 	end
 
 CinnabarIsland_Gym_EventScript_Quiz2Correct::
@@ -339,11 +332,9 @@ CinnabarIsland_Gym_EventScript_Quiz2Incorrect::
 	end
 
 CinnabarIsland_Gym_EventScript_BattleAvery::
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_AveryApproachLeft
-	call_if_eq CinnabarIsland_Gym_EventScript_AveryApproachLeft
+	call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_AveryApproachRight
-	compare VAR_TEMP_1, 1
+	textcolor NPC_TEXT_COLOR_MALE
-	call_if_eq CinnabarIsland_Gym_EventScript_AveryApproachRight
-	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_AveryIntro
 	trainerbattle_no_intro TRAINER_SUPER_NERD_AVERY, CinnabarIsland_Gym_Text_AveryDefeat
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
@@ -396,10 +387,8 @@ CinnabarIsland_Gym_EventScript_Quiz3Right::
 CinnabarIsland_Gym_EventScript_Quiz3::
 	msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
 	msgbox CinnabarIsland_Gym_Text_QuizQuestion3, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz3Incorrect
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz3Incorrect
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz3Correct
-	compare VAR_RESULT, NO
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz3Correct
 	end
 
 CinnabarIsland_Gym_EventScript_Quiz3Correct::
@@ -424,11 +413,9 @@ CinnabarIsland_Gym_EventScript_Quiz3Incorrect::
 	end
 
 CinnabarIsland_Gym_EventScript_BattleRamon::
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_RamonApproachLeft
-	call_if_eq CinnabarIsland_Gym_EventScript_RamonApproachLeft
+	call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_RamonApproachRight
-	compare VAR_TEMP_1, 1
+	textcolor NPC_TEXT_COLOR_MALE
-	call_if_eq CinnabarIsland_Gym_EventScript_RamonApproachRight
-	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_RamonIntro
 	trainerbattle_no_intro TRAINER_BURGLAR_RAMON, CinnabarIsland_Gym_Text_RamonDefeat
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
@@ -472,10 +459,8 @@ CinnabarIsland_Gym_EventScript_Quiz4Right::
 CinnabarIsland_Gym_EventScript_Quiz4::
 	msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
 	msgbox CinnabarIsland_Gym_Text_QuizQuestion4, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz4Incorrect
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz4Incorrect
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz4Correct
-	compare VAR_RESULT, NO
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz4Correct
 	end
 
 CinnabarIsland_Gym_EventScript_Quiz4Correct::
@@ -500,11 +485,9 @@ CinnabarIsland_Gym_EventScript_Quiz4Incorrect::
 	end
 
 CinnabarIsland_Gym_EventScript_BattleDerek::
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_DerekApproachLeft
-	call_if_eq CinnabarIsland_Gym_EventScript_DerekApproachLeft
+	call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_DerekApproachRight
-	compare VAR_TEMP_1, 1
+	textcolor NPC_TEXT_COLOR_MALE
-	call_if_eq CinnabarIsland_Gym_EventScript_DerekApproachRight
-	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_DerekIntro
 	trainerbattle_no_intro TRAINER_SUPER_NERD_DEREK, CinnabarIsland_Gym_Text_DerekDefeat
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
@@ -548,10 +531,8 @@ CinnabarIsland_Gym_EventScript_Quiz5Right::
 CinnabarIsland_Gym_EventScript_Quiz5::
 	msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
 	msgbox CinnabarIsland_Gym_Text_QuizQuestion5, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz5Correct
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz5Correct
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz5Incorrect
-	compare VAR_RESULT, NO
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz5Incorrect
 	end
 
 CinnabarIsland_Gym_EventScript_Quiz5Correct::
@@ -576,11 +557,9 @@ CinnabarIsland_Gym_EventScript_Quiz5Incorrect::
 	end
 
 CinnabarIsland_Gym_EventScript_BattleDusty::
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_DustyApproachLeft
-	call_if_eq CinnabarIsland_Gym_EventScript_DustyApproachLeft
+	call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_DustyApproachRight
-	compare VAR_TEMP_1, 1
+	textcolor NPC_TEXT_COLOR_MALE
-	call_if_eq CinnabarIsland_Gym_EventScript_DustyApproachRight
-	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_DustyIntro
 	trainerbattle_no_intro TRAINER_BURGLAR_DUSTY, CinnabarIsland_Gym_Text_DustyDefeat
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
@@ -624,10 +603,8 @@ CinnabarIsland_Gym_EventScript_Quiz6Right::
 CinnabarIsland_Gym_EventScript_Quiz6::
 	msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
 	msgbox CinnabarIsland_Gym_Text_QuizQuestion6, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz6Incorrect
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz6Incorrect
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz6Correct
-	compare VAR_RESULT, NO
-	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz6Correct
 	end
 
 CinnabarIsland_Gym_EventScript_Quiz6Correct::
@@ -652,11 +629,9 @@ CinnabarIsland_Gym_EventScript_Quiz6Incorrect::
 	end
 
 CinnabarIsland_Gym_EventScript_BattleZac::
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_ZacApproachLeft
-	call_if_eq CinnabarIsland_Gym_EventScript_ZacApproachLeft
+	call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_ZacApproachRight
-	compare VAR_TEMP_1, 1
+	textcolor NPC_TEXT_COLOR_MALE
-	call_if_eq CinnabarIsland_Gym_EventScript_ZacApproachRight
-	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_ZacIntro
 	trainerbattle_no_intro TRAINER_SUPER_NERD_ZAC, CinnabarIsland_Gym_Text_ZacDefeat
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen

data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc

@@ -32,8 +32,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill::
 	lock
 	faceplayer
 	msgbox CinnabarIsland_PokemonCenter_1F_Text_ReadyToSailToOneIsland, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail
-	goto_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail
 	msgbox CinnabarIsland_PokemonCenter_1F_Text_LetsGo
 	closemessage
 	playbgm MUS_FOLLOW_ME, 1
@@ -41,16 +40,13 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill::
 	setflag FLAG_DONT_TRANSITION_MUSIC
 	setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
 	delay 20
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_SOUTH, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth
-	call_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth
+	call_if_eq VAR_FACING, DIR_EAST, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast
-	compare VAR_FACING, DIR_EAST
+	call_if_eq VAR_FACING, DIR_WEST, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest
-	call_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast
-	compare VAR_FACING, DIR_WEST
-	call_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest
 	removeobject LOCALID_BILL
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
 	clearflag FLAG_HIDE_CINNABAR_BILL
-	warp MAP_CINNABAR_ISLAND, 255, 14, 11
+	warp MAP_CINNABAR_ISLAND, 14, 11
 	waitstate
 	release
 	end

data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc

@@ -3,8 +3,7 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts::
 	.byte 0
 
 CinnabarIsland_PokemonLab_Entrance_OnTransition::
-	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
+	call_if_eq VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1, CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil
-	call_if_eq CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil
 	end
 
 CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil::

data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc

@@ -12,14 +12,11 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_Garett::
 	call EventScript_GetInGameTradeSpeciesInfo
 	goto_if_set FLAG_DID_SEELOR_TRADE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_AlreadyTraded
 	msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade
 	call EventScript_ChooseMonForInGameTrade
-	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge VAR_0x8004, PARTY_SIZE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade
-	goto_if_ge CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade
 	call EventScript_GetInGameTradeSpecies
-	compare VAR_RESULT, VAR_0x8009
+	goto_if_ne VAR_RESULT, VAR_0x8009, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NotRequestedMon
-	goto_if_ne CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NotRequestedMon
 	call EventScript_DoInGameTrade
 	msgbox Trade_Text_HeyThanks
 	setflag FLAG_DID_SEELOR_TRADE
@@ -32,7 +29,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade::
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NotRequestedMon::
-	getspeciesname 0, VAR_0x8009
+	bufferspeciesname STR_VAR_1, VAR_0x8009
 	msgbox Trade_Text_WhatThatsNoMon
 	release
 	end
@@ -47,21 +44,15 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilScientist::
 	faceplayer
 	setvar VAR_RESULT, FALSE
 	call_if_set FLAG_REVIVED_AMBER, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedMtMoonFossil
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_RevivedAllFossils
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_RevivedAllFossils
+	goto_if_eq VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveRevivedMon
-	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
+	goto_if_eq VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilStillReviving
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveRevivedMon
-	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilStillReviving
 	call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddHelixFossilToList
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelix
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelix
 	call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddDomeFossilToList
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDome
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDome
 	call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilAmber
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilAmber
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe
 	goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
 	end
@@ -97,8 +88,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelix::
 	message CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe
 	waitmessage
 	call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelixAmber
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelixAmber
 	multichoice 0, 0, MULTICHOICE_HELIX, FALSE
 	switch VAR_RESULT
 	case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil
@@ -110,8 +100,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDome::
 	message CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe
 	waitmessage
 	call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDomeAmber
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDomeAmber
 	multichoice 0, 0, MULTICHOICE_DOME, FALSE
 	switch VAR_RESULT
 	case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil
@@ -148,13 +137,12 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDomeAmber::
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil::
-	getspeciesname 0, SPECIES_OMANYTE
+	bufferspeciesname STR_VAR_1, SPECIES_OMANYTE
-	getitemname 1, ITEM_HELIX_FOSSIL
+	bufferitemname STR_VAR_2, ITEM_HELIX_FOSSIL
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	removeitem ITEM_HELIX_FOSSIL
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
@@ -163,13 +151,12 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil::
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil::
-	getspeciesname 0, SPECIES_KABUTO
+	bufferspeciesname STR_VAR_1, SPECIES_KABUTO
-	getitemname 1, ITEM_DOME_FOSSIL
+	bufferitemname STR_VAR_2, ITEM_DOME_FOSSIL
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	removeitem ITEM_DOME_FOSSIL
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
@@ -178,13 +165,12 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil::
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber::
-	getspeciesname 0, SPECIES_AERODACTYL
+	bufferspeciesname STR_VAR_1, SPECIES_AERODACTYL
-	getitemname 1, ITEM_OLD_AMBER
+	bufferitemname STR_VAR_2, ITEM_OLD_AMBER
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	removeitem ITEM_OLD_AMBER
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
@@ -203,81 +189,67 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilStillReviving::
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveRevivedMon::
-	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, HELIX_FOSSIL
+	goto_if_eq VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, HELIX_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte
+	goto_if_eq VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, DOME_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto
-	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, DOME_FOSSIL
+	goto_if_eq VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, OLD_AMBER, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto
-	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, OLD_AMBER
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte::
 	setvar VAR_TEMP_1, SPECIES_OMANYTE
-	getspeciesname 0, SPECIES_OMANYTE
+	bufferspeciesname STR_VAR_1, SPECIES_OMANYTE
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife
-	givemon SPECIES_OMANYTE, 5, ITEM_NONE
+	givemon SPECIES_OMANYTE, 5
-	compare VAR_RESULT, 2
+	goto_if_eq VAR_RESULT, 2, EventScript_NoMoreRoomForPokemon
-	goto_if_eq EventScript_NoMoreRoomForPokemon
 	setflag FLAG_REVIVED_HELIX
-	compare VAR_RESULT, 0
+	goto_if_eq VAR_RESULT, 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
+	goto_if_eq VAR_RESULT, 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
-	compare VAR_RESULT, 1
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto::
 	setvar VAR_TEMP_1, SPECIES_KABUTO
-	getspeciesname 0, SPECIES_KABUTO
+	bufferspeciesname STR_VAR_1, SPECIES_KABUTO
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife
-	givemon SPECIES_KABUTO, 5, ITEM_NONE
+	givemon SPECIES_KABUTO, 5
-	compare VAR_RESULT, 2
+	goto_if_eq VAR_RESULT, 2, EventScript_NoMoreRoomForPokemon
-	goto_if_eq EventScript_NoMoreRoomForPokemon
 	setflag FLAG_REVIVED_DOME
-	compare VAR_RESULT, 0
+	goto_if_eq VAR_RESULT, 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
+	goto_if_eq VAR_RESULT, 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
-	compare VAR_RESULT, 1
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl::
 	setvar VAR_TEMP_1, SPECIES_AERODACTYL
-	getspeciesname 0, SPECIES_AERODACTYL
+	bufferspeciesname STR_VAR_1, SPECIES_AERODACTYL
 	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife
-	givemon SPECIES_AERODACTYL, 5, ITEM_NONE
+	givemon SPECIES_AERODACTYL, 5
-	compare VAR_RESULT, 2
+	goto_if_eq VAR_RESULT, 2, EventScript_NoMoreRoomForPokemon
-	goto_if_eq EventScript_NoMoreRoomForPokemon
 	setflag FLAG_REVIVED_AMBER
-	compare VAR_RESULT, 0
+	goto_if_eq VAR_RESULT, 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
+	goto_if_eq VAR_RESULT, 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
-	compare VAR_RESULT, 1
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
 	waitmessage
 	waitfanfare
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon
 	call EventScript_GetGiftMonPartySlot
 	call EventScript_ChangePokemonNickname
 	goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
 	waitmessage
 	waitfanfare
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC
 	call EventScript_NameReceivedBoxMon
 	goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC
 	end

data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc

@@ -12,14 +12,11 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_Clifton::
 	call EventScript_GetInGameTradeSpeciesInfo
 	goto_if_set FLAG_DID_ESPHERE_TRADE, CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonAlreadyTraded
 	msgbox Trade_Text_DoYouHaveMonWouldYouTradeForMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade
-	goto_if_eq CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade
 	call EventScript_ChooseMonForInGameTrade
-	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge VAR_0x8004, PARTY_SIZE, CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade
-	goto_if_ge CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade
 	call EventScript_GetInGameTradeSpecies
-	compare VAR_RESULT, VAR_0x8009
+	goto_if_ne VAR_RESULT, VAR_0x8009, CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonNotRequestedMon
-	goto_if_ne CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonNotRequestedMon
 	call EventScript_DoInGameTrade
 	msgbox Trade_Text_Thanks
 	setflag FLAG_DID_ESPHERE_TRADE
@@ -32,7 +29,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade::
 	end
 
 CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonNotRequestedMon::
-	getspeciesname 0, VAR_0x8009
+	bufferspeciesname STR_VAR_1, VAR_0x8009
 	msgbox Trade_Text_ThisIsntMon
 	release
 	end
@@ -51,18 +48,15 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_Norma::
 	copyvar VAR_0x8009, VAR_RESULT
 	goto_if_set FLAG_DID_TANGENY_TRADE, CinnabarIsland_PokemonLab_Lounge_EventScript_NormaAlreadyTraded
 	msgbox Trade_Text_DoYouHaveMonWantToTradeForMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade
-	goto_if_eq CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade
 	special ChoosePartyMon
 	waitstate
 	copyvar VAR_0x800A, VAR_0x8004
-	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge VAR_0x8004, PARTY_SIZE, CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade
-	goto_if_ge CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade
 	copyvar VAR_0x8005, VAR_0x800A
 	specialvar VAR_RESULT, GetTradeSpecies
 	copyvar VAR_0x800B, VAR_RESULT
-	compare VAR_RESULT, VAR_0x8009
+	goto_if_ne VAR_RESULT, VAR_0x8009, CinnabarIsland_PokemonLab_Lounge_EventScript_NormaNotRequestedMon
-	goto_if_ne CinnabarIsland_PokemonLab_Lounge_EventScript_NormaNotRequestedMon
 	copyvar VAR_0x8004, VAR_0x8008
 	copyvar VAR_0x8005, VAR_0x800A
 	special CreateInGameTradePokemon
@@ -79,7 +73,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade::
 	end
 
 CinnabarIsland_PokemonLab_Lounge_EventScript_NormaNotRequestedMon::
-	getspeciesname 0, VAR_0x8009
+	bufferspeciesname STR_VAR_1, VAR_0x8009
 	msgbox Trade_Text_ThisIsNoMon
 	release
 	end

data/maps/FiveIsland_LostCave_Room10/scripts.inc

@@ -19,7 +19,7 @@ FiveIsland_LostCave_Room10_OnFrame::
 
 FiveIsland_LostCave_Room10_EventScript_FindSelphyScene::
 	lockall
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	applymovement LOCALID_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyWander
 	waitmovement 0
 	delay 100
@@ -31,7 +31,7 @@ FiveIsland_LostCave_Room10_EventScript_FindSelphyScene::
 	msgbox FiveIsland_LostCave_Room10_Text_MayIAskYouToTakeMeHome
 	closemessage
 	call FiveIsland_LostCave_Room10_EventScript_SetSelphyFound
-	warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 255, 39, 10
+	warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 39, 10
 	waitstate
 	releaseall
 	end

data/maps/FiveIsland_MemorialPillar/scripts.inc

@@ -27,8 +27,7 @@ FiveIsland_MemorialPillar_EventScript_AlreadyGotTM42::
 FiveIsland_MemorialPillar_EventScript_ReturnedForTM42::
 	msgbox FiveIsland_MemorialPillar_Text_StillHaveThingAsMyThanks
 	giveitem ITEM_TM42
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, FiveIsland_MemorialPillar_EventScript_NoRoomForTM42
-	goto_if_eq FiveIsland_MemorialPillar_EventScript_NoRoomForTM42
 	call FiveIsland_MemorialPillar_EventScript_ReceivedTM42
 	release
 	end
@@ -40,21 +39,19 @@ FiveIsland_MemorialPillar_EventScript_Memorial::
 	goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced
 	goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced
 	msgbox FiveIsland_MemorialPillar_Text_HereLiesTectonixLemonadeOffering
-	checkitem ITEM_LEMONADE, 1
+	checkitem ITEM_LEMONADE
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade
-	goto_if_eq FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade
 	releaseall
 	end
 
 FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade::
 	msgbox FiveIsland_MemorialPillar_Text_LeaveAnotherLemonadeOffering, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FiveIsland_MemorialPillar_EventScript_PlaceLemonade
-	goto_if_eq FiveIsland_MemorialPillar_EventScript_PlaceLemonade
 	releaseall
 	end
 
 FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
-	removeitem ITEM_LEMONADE, 1
+	removeitem ITEM_LEMONADE
 	msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade
 	closemessage
 	applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestRight
@@ -62,11 +59,10 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
 	delay 45
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis
 	giveitem ITEM_TM42
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, FiveIsland_MemorialPillar_EventScript_NoRoomForTM42
-	goto_if_eq FiveIsland_MemorialPillar_EventScript_NoRoomForTM42
 	call FiveIsland_MemorialPillar_EventScript_ReceivedTM42
 	releaseall
 	end

data/maps/FiveIsland_ResortGorgeous/scripts.inc

@@ -19,7 +19,7 @@ FiveIsland_ResortGorgeous_OnFrame::
 
 FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene::
 	lockall
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow
 	closemessage
 	applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp

data/maps/FiveIsland_ResortGorgeous_House/scripts.inc

@@ -12,10 +12,8 @@ FiveIsland_ResortGorgeous_House_EventScript_Selphy::
 	lock
 	faceplayer
 	goto_if_set SHOWN_REQUESTED_MON, FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest
-	compare VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF
+	goto_if_eq VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF, FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong
-	goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong
+	goto_if_ne VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE, FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon
-	compare VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE
-	goto_if_ne FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon
 	msgbox FiveIsland_ResortGorgeous_House_Text_PleaseHearMyWish
 	goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon
 	end
@@ -34,8 +32,7 @@ FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong::
 FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon::
 	copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON
 	specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon
-	goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon
 	goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon
 	end
 
@@ -45,28 +42,23 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
 	addobject LOCALID_BUTLER
 	applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter
 	waitmovement 0
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady
 	applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FiveIsland_ResortGorgeous_House_Text_ButlerIShallDoAsYouBid
 	closemessage
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth
-	call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_EAST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast
-	call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth
+	call_if_eq VAR_FACING, DIR_WEST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest
-	compare VAR_FACING, DIR_EAST
+	copyobjectxytoperm LOCALID_BUTLER
-	call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast
-	compare VAR_FACING, DIR_WEST
-	call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest
-	moveobjectoffscreen LOCALID_BUTLER
 	msgbox FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks
 	giveitem VAR_RESORT_GORGEOUS_REWARD
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward
-	goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward
 	setflag SHOWN_REQUESTED_MON
 	setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE
 	release
@@ -101,9 +93,9 @@ FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest::
 	return
 
 FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FiveIsland_ResortGorgeous_House_Text_ButlerBagAppearsToBeFull
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FiveIsland_ResortGorgeous_House_Text_OhHowDisappointing
 	setflag SHOWN_REQUESTED_MON
 	setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE

data/maps/FiveIsland_RocketWarehouse/scripts.inc

@@ -84,8 +84,7 @@ FiveIsland_RocketWarehouse_EventScript_Admin2::
 
 FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2::
 	getplayerxy PLAYER_X_POS, PLAYER_Y_POS
-	compare PLAYER_X_POS, 24
+	call_if_le PLAYER_X_POS, 24, FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2
-	call_if_le FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2
 	msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle
 	closemessage
 	fadescreen FADE_TO_BLACK
@@ -118,37 +117,27 @@ FiveIsland_RocketWarehouse_EventScript_Admin1::
 FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1::
 	getplayerxy PLAYER_X_POS, PLAYER_Y_POS
 	specialvar VAR_RESULT, GetPlayerFacingDirection
-	compare VAR_RESULT, DIR_NORTH
+	call_if_eq VAR_RESULT, DIR_NORTH, FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1
-	call_if_eq FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1
 	msgbox FiveIsland_RocketWarehouse_Text_Admin1PostBattle
 	closemessage
-	compare PLAYER_X_POS, 24
+	call_if_le PLAYER_X_POS, 24, FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar
-	call_if_le FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar
+	call_if_eq PLAYER_X_POS, 25, FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch
-	compare PLAYER_X_POS, 25
+	call_if_eq PLAYER_X_POS, 26, FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
-	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch
+	call_if_eq PLAYER_X_POS, 27, FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
-	compare PLAYER_X_POS, 26
-	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
-	compare PLAYER_X_POS, 27
-	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
 	playse SE_PIN
 	call FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry
 	special DrawWholeMapView
 	waitse
-	compare PLAYER_X_POS, 24
+	call_if_le PLAYER_X_POS, 24, FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
-	call_if_le FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
+	call_if_eq PLAYER_X_POS, 25, FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
-	compare PLAYER_X_POS, 25
+	call_if_eq PLAYER_X_POS, 26, FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
-	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
+	call_if_eq PLAYER_X_POS, 27, FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown
-	compare PLAYER_X_POS, 26
-	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
-	compare PLAYER_X_POS, 27
-	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown
 	msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough
 	release
 	end
 
 FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1::
-	compare PLAYER_X_POS, 27
+	goto_if_eq PLAYER_X_POS, 27, EventScript_Return
-	goto_if_eq EventScript_Return
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return

data/maps/FiveIsland_WaterLabyrinth/scripts.inc

@@ -10,8 +10,7 @@ FiveIsland_WaterLabyrinth_EventScript_EggGentleman::
 	goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_ReturnForEgg
 	msgbox FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons
 	specialvar VAR_RESULT, GetLeadMonFriendship
-	compare VAR_RESULT, 6  @ Max friendship
+	goto_if_eq VAR_RESULT, 6, FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship
-	goto_if_eq FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship
 	msgbox FiveIsland_WaterLabyrinth_Text_HmmISeeIsee
 	release
 	end
@@ -29,11 +28,10 @@ FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship::
 
 FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg::
 	getpartysize
-	compare VAR_RESULT, PARTY_SIZE
+	goto_if_eq VAR_RESULT, PARTY_SIZE, FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg
-	goto_if_eq FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg
 	setflag FLAG_GOT_TOGEPI_EGG
 	giveegg SPECIES_TOGEPI
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan
 	waitfanfare
@@ -45,16 +43,14 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg::
 @ If the player has a Togepi/Togetic from this game (assumed to be the one the man gave you) then comment on it
 @ Otherwise make normal comment
 FiveIsland_WaterLabyrinth_EventScript_PostEggComment::
-	getspeciesname 1, SPECIES_TOGEPI
+	bufferspeciesname STR_VAR_2, SPECIES_TOGEPI
 	setvar VAR_0x8004, SPECIES_TOGEPI
 	specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
-	goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
+	bufferspeciesname STR_VAR_2, SPECIES_TOGETIC
-	getspeciesname 1, SPECIES_TOGETIC
 	setvar VAR_0x8004, SPECIES_TOGETIC
 	specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
-	goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
 	msgbox FiveIsland_WaterLabyrinth_Text_GladIMetSomeoneLikeYou
 	release
 	end

data/maps/FourIsland/scripts.inc

@@ -8,8 +8,7 @@ FourIsland_MapScripts::
 
 FourIsland_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND
-	compare VAR_MAP_SCENE_FOUR_ISLAND, 0
+	call_if_eq VAR_MAP_SCENE_FOUR_ISLAND, 0, FourIsland_EventScript_ShowRival
-	call_if_eq FourIsland_EventScript_ShowRival
 	call FourIsland_EventScript_TrySetDayCareManPos
 	end
 
@@ -29,7 +28,7 @@ FourIsland_OnFrame::
 
 FourIsland_EventScript_RivalScene::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playbgm MUS_ENCOUNTER_RIVAL, 0
@@ -78,23 +77,18 @@ FourIsland_EventScript_DaycareMan::
 	faceplayer
 	special GetDaycareMonNicknames
 	specialvar VAR_RESULT, GetDaycareState
-	compare VAR_RESULT, DAYCARE_EGG_WAITING
+	goto_if_eq VAR_RESULT, DAYCARE_EGG_WAITING, FourIsland_EventScript_DaycareEggWaiting
-	goto_if_eq FourIsland_EventScript_DaycareEggWaiting
+	goto_if_eq VAR_RESULT, DAYCARE_ONE_MON, FourIsland_EventScript_CheckOnOneMon
-	compare VAR_RESULT, DAYCARE_ONE_MON
+	goto_if_eq VAR_RESULT, DAYCARE_TWO_MONS, FourIsland_EventScript_CheckOnTwoMons
-	goto_if_eq FourIsland_EventScript_CheckOnOneMon
-	compare VAR_RESULT, DAYCARE_TWO_MONS
-	goto_if_eq FourIsland_EventScript_CheckOnTwoMons
 	msgbox DayCare_Text_ImDaycareManSpeakToMyWife
 	release
 	end
 
 FourIsland_EventScript_DaycareEggWaiting::
 	msgbox DayCare_Text_DoYouWantEgg, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FourIsland_EventScript_DaycareAcceptEgg
-	goto_if_eq FourIsland_EventScript_DaycareAcceptEgg
 	msgbox DayCare_Text_IWillKeepDoYouWantIt, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FourIsland_EventScript_DaycareAcceptEgg
-	goto_if_eq FourIsland_EventScript_DaycareAcceptEgg
 	msgbox DayCare_Text_IllKeepIt
 	clearflag FLAG_PENDING_DAYCARE_EGG
 	special RejectEggFromDayCare
@@ -103,14 +97,13 @@ FourIsland_EventScript_DaycareEggWaiting::
 
 FourIsland_EventScript_DaycareAcceptEgg::
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
-	compare VAR_RESULT, PARTY_SIZE
+	goto_if_ne VAR_RESULT, PARTY_SIZE, FourIsland_EventScript_DaycareReceivedEgg
-	goto_if_ne FourIsland_EventScript_DaycareReceivedEgg
 	msgbox DayCare_Text_YouHaveNoRoomForIt
 	release
 	end
 
 FourIsland_EventScript_DaycareReceivedEgg::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	message DayCare_Text_ReceivedEgg
 	call EventScript_RestorePrevTextColor
 	playfanfare MUS_LEVEL_UP

data/maps/FourIsland_IcefallCave_Back/scripts.inc

@@ -8,8 +8,7 @@ FourIsland_IcefallCave_Back_MapScripts::
 	.byte 0
 
 FourIsland_IcefallCave_Back_OnTransition::
-	compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
+	call_if_eq VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1, FourIsland_IcefallCave_Back_EventScript_HideLorelei
-	call_if_eq FourIsland_IcefallCave_Back_EventScript_HideLorelei
 	end
 
 FourIsland_IcefallCave_Back_EventScript_HideLorelei::
@@ -18,11 +17,11 @@ FourIsland_IcefallCave_Back_EventScript_HideLorelei::
 
 FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
 	lockall
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons
 	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
 	waitmovement 0
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe
 	closemessage
 	playse SE_PIN
@@ -32,7 +31,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
 	waitmovement 0
 	applymovement LOCALID_LORELEI, Movement_Delay48
 	waitmovement 0
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut
 	closemessage
 	applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestRight
@@ -48,17 +47,17 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
 	applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
 	waitmovement 0
 	playbgm MUS_ENCOUNTER_ROCKET, 0
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FourIsland_IcefallCave_Back_Text_GruntIntro
 	setvar VAR_LAST_TALKED, LOCALID_ROCKET3
 	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, FourIsland_IcefallCave_Back_Text_GruntDefeat
 	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp
 	waitmovement 0
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FourIsland_IcefallCave_Back_Text_NotTellingYouThat
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou
 	waitmessage
 	waitse
@@ -67,7 +66,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
 	waitmoncry
 	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat
 	waitmovement 0
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland
 	closemessage
 	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit
@@ -84,7 +83,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful
 	setflag FLAG_HIDE_RUIN_VALLEY_SCIENTIST
 	clearflag FLAG_HIDE_LORELEI_IN_HER_HOUSE

data/maps/FourIsland_PokemonDayCare/scripts.inc

@@ -8,32 +8,25 @@ FourIsland_PokemonDayCare_EventScript_DaycareWoman::
 	lock
 	faceplayer
 	specialvar VAR_RESULT, GetDaycareState
-	compare VAR_RESULT, DAYCARE_EGG_WAITING
+	goto_if_eq VAR_RESULT, DAYCARE_EGG_WAITING, FourIsland_PokemonDayCare_EggWaiting
-	goto_if_eq FourIsland_PokemonDayCare_EggWaiting
+	goto_if_eq VAR_RESULT, DAYCARE_ONE_MON, FourIsland_PokemonDayCare_OneMonInDaycare
-	compare VAR_RESULT, DAYCARE_ONE_MON
+	goto_if_eq VAR_RESULT, DAYCARE_TWO_MONS, FourIsland_PokemonDayCare_TwoMonsInDaycare
-	goto_if_eq FourIsland_PokemonDayCare_OneMonInDaycare
-	compare VAR_RESULT, DAYCARE_TWO_MONS
-	goto_if_eq FourIsland_PokemonDayCare_TwoMonsInDaycare
 	msgbox DayCare_Text_WouldYouLikeUsToRaiseMon, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FourIsland_PokemonDayCare_GiveMonToRaise
-	goto_if_eq FourIsland_PokemonDayCare_GiveMonToRaise
 	msgbox DayCare_Text_FineThenComeAgain
 	release
 	end
 
 FourIsland_PokemonDayCare_GiveMonToRaise::
 	specialvar VAR_RESULT, CountPartyNonEggMons
-	compare VAR_RESULT, 1
+	goto_if_eq VAR_RESULT, 1, FourIsland_PokemonDayCare_OnlyOneMonInParty
-	goto_if_eq FourIsland_PokemonDayCare_OnlyOneMonInParty
 	msgbox DayCare_Text_WhichMonShouldWeRaise
 	fadescreen FADE_TO_BLACK
 	special ChooseSendDaycareMon
 	waitstate
-	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge VAR_0x8004, PARTY_SIZE, FourIsland_PokemonDayCare_ComeAgain
-	goto_if_ge FourIsland_PokemonDayCare_ComeAgain
 	specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
-	compare VAR_RESULT, 0
+	goto_if_eq VAR_RESULT, 0, FourIsland_PokemonDayCare_OnlyOneAliveMonInParty
-	goto_if_eq FourIsland_PokemonDayCare_OnlyOneAliveMonInParty
 	specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies
 	waitse
 	playmoncry VAR_0x8005, CRY_MODE_NORMAL
@@ -42,8 +35,7 @@ FourIsland_PokemonDayCare_GiveMonToRaise::
 	special StoreSelectedPokemonInDaycare
 	incrementgamestat GAME_STAT_USED_DAYCARE
 	specialvar VAR_RESULT, GetDaycareState
-	compare VAR_RESULT, DAYCARE_ONE_MON
+	goto_if_eq VAR_RESULT, DAYCARE_ONE_MON, FourIsland_PokemonDayCare_CanRaiseOneMore
-	goto_if_eq FourIsland_PokemonDayCare_CanRaiseOneMore
 	release
 	end
 
@@ -54,8 +46,7 @@ FourIsland_PokemonDayCare_ComeAgain::
 
 FourIsland_PokemonDayCare_CanRaiseOneMore::
 	msgbox DayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FourIsland_PokemonDayCare_GiveMonToRaise
-	goto_if_eq FourIsland_PokemonDayCare_GiveMonToRaise
 	goto FourIsland_PokemonDayCare_ComeAgain
 	end
 
@@ -80,8 +71,7 @@ FourIsland_PokemonDayCare_MonHasGrownXLevels::
 
 FourIsland_PokemonDayCare_DisplayLevelsGained::
 	specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
-	compare VAR_RESULT, 0
+	call_if_ne VAR_RESULT, 0, FourIsland_PokemonDayCare_MonHasGrownXLevels
-	call_if_ne FourIsland_PokemonDayCare_MonHasGrownXLevels
 	return
 
 FourIsland_PokemonDayCare_OneMonInDaycare::
@@ -89,42 +79,35 @@ FourIsland_PokemonDayCare_OneMonInDaycare::
 	setvar VAR_0x8004, 0
 	call FourIsland_PokemonDayCare_DisplayLevelsGained
 	msgbox DayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FourIsland_PokemonDayCare_GiveMonToRaise
-	goto_if_eq FourIsland_PokemonDayCare_GiveMonToRaise
 	msgbox DayCare_Text_TakeYourMonBack, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FourIsland_PokemonDayCare_TryRetrieveMon
-	goto_if_eq FourIsland_PokemonDayCare_TryRetrieveMon
 	goto FourIsland_PokemonDayCare_ComeAgain
 	end
 
 FourIsland_PokemonDayCare_TryRetrieveMon::
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
-	compare VAR_RESULT, PARTY_SIZE
+	goto_if_eq VAR_RESULT, PARTY_SIZE, FourIsland_PokemonDayCare_NoRoomInParty
-	goto_if_eq FourIsland_PokemonDayCare_NoRoomInParty
 	specialvar VAR_RESULT, GetDaycareState
 	setvar VAR_0x8004, 0
-	compare VAR_RESULT, DAYCARE_ONE_MON
+	goto_if_eq VAR_RESULT, DAYCARE_ONE_MON, FourIsland_PokemonDayCare_CostPrompt
-	goto_if_eq FourIsland_PokemonDayCare_CostPrompt
 	special ShowDaycareLevelMenu
 	waitstate
 	copyvar VAR_0x8004, VAR_RESULT
-	compare VAR_RESULT, DAYCARE_EXITED_LEVEL_MENU
+	goto_if_eq VAR_RESULT, DAYCARE_EXITED_LEVEL_MENU, FourIsland_PokemonDayCare_ComeAgain
-	goto_if_eq FourIsland_PokemonDayCare_ComeAgain
 	goto FourIsland_PokemonDayCare_CostPrompt
 	end
 
 FourIsland_PokemonDayCare_CostPrompt::
 	special GetDaycareCost
 	msgbox DayCare_Text_ItWillCostX, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FourIsland_PokemonDayCare_CheckEnoughMoney
-	goto_if_eq FourIsland_PokemonDayCare_CheckEnoughMoney
 	goto FourIsland_PokemonDayCare_ComeAgain
 	end
 
 FourIsland_PokemonDayCare_CheckEnoughMoney::
 	specialvar VAR_RESULT, IsEnoughForCostInVar0x8005
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, FourIsland_PokemonDayCare_RetrieveMon
-	goto_if_eq FourIsland_PokemonDayCare_RetrieveMon
 	msgbox DayCare_Text_NotEnoughMoney
 	release
 	end
@@ -138,20 +121,18 @@ FourIsland_PokemonDayCare_RetrieveMon::
 	msgbox DayCare_Text_HeresYourMon
 	waitse
 	playmoncry VAR_RESULT, CRY_MODE_NORMAL
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox DayCare_Text_TookBackMon
 	call EventScript_RestorePrevTextColor
 	waitmoncry
 	specialvar VAR_RESULT, GetDaycareState
-	compare VAR_RESULT, DAYCARE_ONE_MON
+	goto_if_eq VAR_RESULT, DAYCARE_ONE_MON, FourIsland_PokemonDayCare_AskRetrieveOtherMon
-	goto_if_eq FourIsland_PokemonDayCare_AskRetrieveOtherMon
 	goto FourIsland_PokemonDayCare_ComeAgain
 	end
 
 FourIsland_PokemonDayCare_AskRetrieveOtherMon::
 	msgbox DayCare_Text_TakeOtherOneBackToo, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FourIsland_PokemonDayCare_TryRetrieveMon
-	goto_if_eq FourIsland_PokemonDayCare_TryRetrieveMon
 	goto FourIsland_PokemonDayCare_ComeAgain
 	end
 
@@ -193,8 +174,7 @@ FourIsland_PokemonDayCare_TwoMonsInDaycare::
 	setvar VAR_0x8004, 1
 	call FourIsland_PokemonDayCare_DisplayLevelsGained
 	msgbox DayCare_Text_TakeYourMonBack, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FourIsland_PokemonDayCare_TryRetrieveMon
-	goto_if_eq FourIsland_PokemonDayCare_TryRetrieveMon
 	msgbox DayCare_Text_ComeAgain
 	release
 	end
@@ -203,8 +183,7 @@ FourIsland_PokemonDayCare_TwoMonsInDaycare::
 FourIsland_PokemonDayCare_EventScript_UnusedRetrieveMon::
 	special ShowDaycareLevelMenu
 	waitstate
-	compare VAR_RESULT, 2
+	goto_if_eq VAR_RESULT, 2, FourIsland_PokemonDayCare_ComeAgain
-	goto_if_eq FourIsland_PokemonDayCare_ComeAgain
 	copyvar VAR_0x8004, VAR_RESULT
 	specialvar VAR_RESULT, TakePokemonFromDaycare
 	msgbox DayCare_Text_HeresYourMon

data/maps/FuchsiaCity/scripts.inc

@@ -72,9 +72,9 @@ FuchsiaCity_EventScript_ChanseySign::
 	lockall
 	setvar VAR_0x8004, SPECIES_CHANSEY
 	special SetSeenMon
-	drawmonpic SPECIES_CHANSEY, 10, 3
+	showmonpic SPECIES_CHANSEY, 10, 3
 	msgbox FuchsiaCity_Text_ChanseySign
-	erasemonpic
+	hidemonpic
 	releaseall
 	end
 
@@ -82,9 +82,9 @@ FuchsiaCity_EventScript_VoltorbSign::
 	lockall
 	setvar VAR_0x8004, SPECIES_VOLTORB
 	special SetSeenMon
-	drawmonpic SPECIES_VOLTORB, 10, 3
+	showmonpic SPECIES_VOLTORB, 10, 3
 	msgbox FuchsiaCity_Text_VoltorbSign
-	erasemonpic
+	hidemonpic
 	releaseall
 	end
 
@@ -92,9 +92,9 @@ FuchsiaCity_EventScript_KangaskhanSign::
 	lockall
 	setvar VAR_0x8004, SPECIES_KANGASKHAN
 	special SetSeenMon
-	drawmonpic SPECIES_KANGASKHAN, 10, 3
+	showmonpic SPECIES_KANGASKHAN, 10, 3
 	msgbox FuchsiaCity_Text_KangaskhanSign
-	erasemonpic
+	hidemonpic
 	releaseall
 	end
 
@@ -102,9 +102,9 @@ FuchsiaCity_EventScript_SlowpokeSign::
 	lockall
 	setvar VAR_0x8004, SPECIES_SLOWPOKE
 	special SetSeenMon
-	drawmonpic SPECIES_SLOWPOKE, 10, 3
+	showmonpic SPECIES_SLOWPOKE, 10, 3
 	msgbox FuchsiaCity_Text_SlowpokeSign
-	erasemonpic
+	hidemonpic
 	releaseall
 	end
 
@@ -112,9 +112,9 @@ FuchsiaCity_EventScript_LaprasSign::
 	lockall
 	setvar VAR_0x8004, SPECIES_LAPRAS
 	special SetSeenMon
-	drawmonpic SPECIES_LAPRAS, 10, 3
+	showmonpic SPECIES_LAPRAS, 10, 3
 	msgbox FuchsiaCity_Text_LaprasSign
-	erasemonpic
+	hidemonpic
 	releaseall
 	end
 
@@ -123,17 +123,17 @@ FuchsiaCity_EventScript_FossilMonSign::
 	goto_if_set FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_OmanyteSign
 	setvar VAR_0x8004, SPECIES_KABUTO
 	special SetSeenMon
-	drawmonpic SPECIES_KABUTO, 10, 3
+	showmonpic SPECIES_KABUTO, 10, 3
 	msgbox FuchsiaCity_Text_KabutoSign
-	erasemonpic
+	hidemonpic
 	releaseall
 	end
 
 FuchsiaCity_EventScript_OmanyteSign::
 	setvar VAR_0x8004, SPECIES_OMANYTE
 	special SetSeenMon
-	drawmonpic SPECIES_OMANYTE, 10, 3
+	showmonpic SPECIES_OMANYTE, 10, 3
 	msgbox FuchsiaCity_Text_OmanyteSign
-	erasemonpic
+	hidemonpic
 	releaseall
 	end

data/maps/FuchsiaCity_Gym/scripts.inc

@@ -20,9 +20,8 @@ FuchsiaCity_Gym_EventScript_DefeatedKoga::
 
 FuchsiaCity_Gym_EventScript_GiveTM06::
 	msgbox FuchsiaCity_Gym_Text_KogaExplainSoulBadge
-	checkitemspace ITEM_TM06, 1
+	checkitemspace ITEM_TM06
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, FuchsiaCity_Gym_EventScript_NoRoomForTM06
-	goto_if_eq FuchsiaCity_Gym_EventScript_NoRoomForTM06
 	giveitem_msg FuchsiaCity_Gym_Text_ReceivedTM06FromKoga, ITEM_TM06
 	setflag FLAG_GOT_TM06_FROM_KOGA
 	msgbox FuchsiaCity_Gym_Text_KogaExplainTM06

data/maps/FuchsiaCity_House2/scripts.inc

@@ -6,8 +6,7 @@ FuchsiaCity_House2_EventScript_FishingGurusBrother::
 	faceplayer
 	goto_if_set FLAG_GOT_GOOD_ROD, FuchsiaCity_House2_EventScript_AlreadyGotGoodRod
 	msgbox FuchsiaCity_House2_Text_DoYouLikeToFish, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FuchsiaCity_House2_EventScript_GiveGoodRod
-	goto_if_eq FuchsiaCity_House2_EventScript_GiveGoodRod
 	msgbox FuchsiaCity_House2_Text_OhThatsDisappointing
 	release
 	end
@@ -19,9 +18,8 @@ FuchsiaCity_House2_EventScript_AlreadyGotGoodRod::
 
 FuchsiaCity_House2_EventScript_GiveGoodRod::
 	msgbox FuchsiaCity_House2_Text_LikeYourStyleTakeThis
-	checkitemspace ITEM_GOOD_ROD, 1
+	checkitemspace ITEM_GOOD_ROD
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, FuchsiaCity_House2_EventScript_NoRoomForGoodRod
-	goto_if_eq FuchsiaCity_House2_EventScript_NoRoomForGoodRod
 	giveitem_msg FuchsiaCity_House2_Text_ReceivedGoodRod, ITEM_GOOD_ROD
 	msgbox FuchsiaCity_House2_Text_GoodRodCanCatchBetterMons
 	setflag FLAG_GOT_GOOD_ROD

data/maps/FuchsiaCity_House3/scripts.inc

@@ -5,8 +5,7 @@ FuchsiaCity_House3_EventScript_MoveDeleter::
 	lock
 	faceplayer
 	msgbox FuchsiaCity_House3_Text_WouldYouLikeToForgetMove, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter
-	goto_if_eq FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter
 	goto FuchsiaCity_House3_EventScript_CancelForgetMove
 	end
 
@@ -14,24 +13,19 @@ FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter::
 	msgbox FuchsiaCity_House3_Text_WhichMonShouldForgetMove
 	special ChoosePartyMon
 	waitstate
-	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge VAR_0x8004, PARTY_SIZE, FuchsiaCity_House3_EventScript_CancelForgetMove
-	goto_if_ge FuchsiaCity_House3_EventScript_CancelForgetMove
 	special IsSelectedMonEgg
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, FuchsiaCity_House3_EventScript_CantForgetMoveEgg
-	goto_if_eq FuchsiaCity_House3_EventScript_CantForgetMoveEgg
 	special GetNumMovesSelectedMonHas
-	compare VAR_RESULT, 1
+	goto_if_eq VAR_RESULT, 1, FuchsiaCity_House3_EventScript_CantForgetOnlyMove
-	goto_if_eq FuchsiaCity_House3_EventScript_CantForgetOnlyMove
 	msgbox FuchsiaCity_House3_Text_WhichMoveShouldBeForgotten
 	fadescreen FADE_TO_BLACK
 	special SelectMoveDeleterMove
 	fadescreen FADE_FROM_BLACK
-	compare VAR_0x8005, MAX_MON_MOVES
+	goto_if_eq VAR_0x8005, MAX_MON_MOVES, FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter
-	goto_if_eq FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter
 	special BufferMoveDeleterNicknameAndMove
 	msgbox FuchsiaCity_House3_Text_MonsMoveShouldBeForgotten, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FuchsiaCity_House3_EventScript_ForgetMove
-	goto_if_eq FuchsiaCity_House3_EventScript_ForgetMove
 	goto FuchsiaCity_House3_EventScript_CancelForgetMove
 	end
 

data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc

@@ -11,7 +11,7 @@ FuchsiaCity_SafariZone_Entrance_OnFrame::
 @ When player runs out of balls mid-battle
 FuchsiaCity_SafariZone_Entrance_EventScript_ExitWalkIn::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter
 	waitmovement 0
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain
@@ -26,7 +26,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitWalkIn::
 @ When player runs of out balls after catching a pokemon, or runs out of steps
 FuchsiaCity_SafariZone_Entrance_EventScript_ExitWarpIn::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
@@ -39,10 +39,9 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitWarpIn::
 @ When player re-enters the entrance building with balls/steps remaining
 FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_GoingToLeaveSafariZoneEarly, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone
-	goto_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_PleaseReturnSafariBalls
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
@@ -57,7 +56,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone::
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ReEnter
 	waitmovement 0
-	warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30
+	warp MAP_SAFARI_ZONE_CENTER, 26, 30
 	waitstate
 	end
 
@@ -99,40 +98,35 @@ FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft::
 	end
 
 FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	showmoneybox 0, 0, 0
+	showmoneybox 0, 0
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone
-	goto_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_OkayPleaseComeAgain
 	goto FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack
 	end
 
 FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone::
 	call FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons
-	checkmoney 500, 0
+	checkmoney 500
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, FuchsiaCity_SafariZone_Entrance_EventScript_NotEnoughMoney
-	goto_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_NotEnoughMoney
+	removemoney 500
-	removemoney 500, 0
+	updatemoneybox
-	updatemoneybox 0, 0, 0
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_ThatllBe500WeOnlyUseSpecialBalls
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls
 	waitfanfare
 	call EventScript_RestorePrevTextColor
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_CallYouOnPAWhenYouRunOut
 	closemessage
-	hidemoneybox 0, 0
+	hidemoneybox
-	compare VAR_TEMP_2, 0
+	call_if_eq VAR_TEMP_2, 0, FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneMid
-	call_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneMid
+	call_if_eq VAR_TEMP_2, 1, FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneRight
-	compare VAR_TEMP_2, 1
+	call_if_eq VAR_TEMP_2, 2, FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneLeft
-	call_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneRight
-	compare VAR_TEMP_2, 2
-	call_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneLeft
 	special EnterSafariMode
 	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2
 	warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30
@@ -156,11 +150,9 @@ FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneLeft::
 
 FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons::
 	getpartysize
-	compare VAR_RESULT, PARTY_SIZE
+	goto_if_ne VAR_RESULT, PARTY_SIZE, EventScript_Return
-	goto_if_ne EventScript_Return
 	specialvar VAR_RESULT, IsThereRoomInAnyBoxForMorePokemon
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, EventScript_Return
-	goto_if_eq EventScript_Return
 	msgbox SafariZone_Text_ExcuseMeYourPCBoxIsFull
 	goto FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack
 	end
@@ -172,7 +164,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_NotEnoughMoney::
 
 FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack::
 	closemessage
-	hidemoneybox 0, 0
+	hidemoneybox
 	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ForceBack
 	waitmovement 0
 	releaseall
@@ -203,8 +195,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_InfoAttendant::
 	lock
 	faceplayer
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_FirstTimeAtSafariZone, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, FuchsiaCity_SafariZone_Entrance_EventScript_ExplainSafariZone
-	goto_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_ExplainSafariZone
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_SorryYoureARegularHere
 	release
 	end

data/maps/FuchsiaCity_WardensHouse/scripts.inc

@@ -7,15 +7,13 @@ FuchsiaCity_WardensHouse_EventScript_Warden::
 	goto_if_set FLAG_GOT_HM04, FuchsiaCity_WardensHouse_EventScript_ExplainStrength
 	goto_if_set FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH, FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth
 	msgbox FuchsiaCity_WardensHouse_Text_HifFuffHefifoo, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	call_if_eq VAR_RESULT, YES, FuchsiaCity_WardensHouse_EventScript_WardenYes
-	call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenYes
+	call_if_eq VAR_RESULT, NO, FuchsiaCity_WardensHouse_EventScript_WardenNo
-	compare VAR_RESULT, NO
-	call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenNo
 	release
 	end
 
 FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_TMHM
 	message FuchsiaCity_WardensHouse_Text_GaveGoldTeethToWarden
 	waitmessage
@@ -23,13 +21,11 @@ FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth::
 	msgbox FuchsiaCity_WardensHouse_Text_WardenPoppedInHisTeeth
 	call EventScript_RestorePrevTextColor
 	checkplayergender
-	compare VAR_RESULT, MALE
+	call_if_eq VAR_RESULT, MALE, FuchsiaCity_WardensHouse_EventScript_WardenThanksMale
-	call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenThanksMale
+	call_if_eq VAR_RESULT, FEMALE, FuchsiaCity_WardensHouse_EventScript_WardenThanksFemale
-	compare VAR_RESULT, FEMALE
-	call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenThanksFemale
 	giveitem_msg FuchsiaCity_WardensHouse_Text_ReceivedHM04FromWarden, ITEM_HM04
 	setflag FLAG_GOT_HM04
-	removeitem ITEM_GOLD_TEETH, 1
+	removeitem ITEM_GOLD_TEETH
 	release
 	end
 

data/maps/IndigoPlateau_Exterior/scripts.inc

@@ -8,8 +8,7 @@ IndigoPlateau_Exterior_MapScripts::
 
 IndigoPlateau_Exterior_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR
-	compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1
+	call_if_eq VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, IndigoPlateau_Exterior_EventScript_PlayCreditsMusic
-	call_if_eq IndigoPlateau_Exterior_EventScript_PlayCreditsMusic
 	end
 
 IndigoPlateau_Exterior_EventScript_PlayCreditsMusic::

data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc

@@ -8,8 +8,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts::
 IndigoPlateau_PokemonCenter_1F_OnTransition::
 	setrespawn SPAWN_INDIGO_PLATEAU
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
-	compare VAR_RESULT, TRUE
+	call_if_eq VAR_RESULT, TRUE, IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor
-	call_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor
 	end
 
 IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor::
@@ -21,8 +20,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard::
 	lock
 	faceplayer
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete
-	goto_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete
 	msgbox IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck
 	release
 	end

data/maps/LavenderTown/scripts.inc

@@ -12,8 +12,7 @@ LavenderTown_EventScript_LittleGirl::
 	lock
 	faceplayer
 	msgbox LavenderTown_Text_DoYouBelieveInGhosts, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, LavenderTown_EventScript_LittleGirlBelieve
-	goto_if_eq LavenderTown_EventScript_LittleGirlBelieve
 	msgbox LavenderTown_Text_JustImaginingWhiteHand
 	release
 	end

data/maps/LavenderTown_House2/scripts.inc

@@ -5,20 +5,16 @@ LavenderTown_House2_EventScript_NameRater::
 	lock
 	faceplayer
 	msgbox LavenderTown_House2_Text_WantMeToRateNicknames, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, LavenderTown_House2_EventScript_ChooseMon
-	goto_if_eq LavenderTown_House2_EventScript_ChooseMon
+	goto_if_eq VAR_RESULT, NO, LavenderTown_House2_EventScript_DontRateNickname
-	compare VAR_RESULT, NO
-	goto_if_eq LavenderTown_House2_EventScript_DontRateNickname
 	end
 
 LavenderTown_House2_EventScript_ChooseMon::
 	msgbox LavenderTown_House2_Text_CritiqueWhichMonsNickname
 	special ChoosePartyMon
 	waitstate
-	compare VAR_0x8004, PARTY_SIZE
+	goto_if_lt VAR_0x8004, PARTY_SIZE, LavenderTown_House2_EventScript_CheckCanRateMon
-	goto_if_lt LavenderTown_House2_EventScript_CheckCanRateMon
+	goto_if_ge VAR_0x8004, PARTY_SIZE, LavenderTown_House2_EventScript_DontRateNickname
-	compare VAR_0x8004, PARTY_SIZE
-	goto_if_ge LavenderTown_House2_EventScript_DontRateNickname
 	end
 
 LavenderTown_House2_EventScript_DontRateNickname::
@@ -28,21 +24,16 @@ LavenderTown_House2_EventScript_DontRateNickname::
 
 LavenderTown_House2_EventScript_CheckCanRateMon::
 	specialvar VAR_RESULT, GetPartyMonSpecies
-	compare VAR_RESULT, SPECIES_EGG
+	goto_if_eq VAR_RESULT, SPECIES_EGG, LavenderTown_House2_EventScript_CantNicknameEgg
-	goto_if_eq LavenderTown_House2_EventScript_CantNicknameEgg
 	special BufferMonNickname
 	special IsMonOTIDNotPlayers
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, LavenderTown_House2_EventScript_CantNicknameTradeMon
-	goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon
 	specialvar VAR_RESULT, IsMonOTNameNotPlayers
 	special BufferMonNickname
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, LavenderTown_House2_EventScript_CantNicknameTradeMon
-	goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon
 	msgbox LavenderTown_House2_Text_GiveItANicerName, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, LavenderTown_House2_EventScript_ChooseNewNickname
-	goto_if_eq LavenderTown_House2_EventScript_ChooseNewNickname
+	goto_if_eq VAR_RESULT, NO, LavenderTown_House2_EventScript_DontRateNickname
-	compare VAR_RESULT, NO
-	goto_if_eq LavenderTown_House2_EventScript_DontRateNickname
 	end
 
 LavenderTown_House2_EventScript_CantNicknameEgg::
@@ -60,8 +51,7 @@ LavenderTown_House2_EventScript_ChooseNewNickname::
 	call EventScript_ChangePokemonNickname
 	specialvar VAR_RESULT, NameRaterWasNicknameChanged
 	special BufferMonNickname
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, LavenderTown_House2_EventScript_ChoseNewNickname
-	goto_if_eq LavenderTown_House2_EventScript_ChoseNewNickname
 	msgbox LavenderTown_House2_Text_FromNowOnShallBeKnownAsSameName
 	release
 	end

data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc

@@ -6,9 +6,8 @@ LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji::
 	faceplayer
 	goto_if_set FLAG_GOT_POKE_FLUTE, LavenderTown_VolunteerPokemonHouse_EventScript_AlreadyHavePokeFlute
 	msgbox LavenderTown_VolunteerPokemonHouse_Text_IdLikeYouToHaveThis
-	checkitemspace ITEM_POKE_FLUTE, 1
+	checkitemspace ITEM_POKE_FLUTE
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute
-	goto_if_eq LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute
 	setflag FLAG_GOT_POKE_FLUTE
 	giveitem_msg LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji, ITEM_POKE_FLUTE, 1, MUS_OBTAIN_KEY_ITEM
 	msgbox LavenderTown_VolunteerPokemonHouse_Text_ExplainPokeFlute

data/maps/MtEmber_Exterior/scripts.inc

@@ -8,8 +8,7 @@ MtEmber_Exterior_MapScripts::
 
 MtEmber_Exterior_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR
-	compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2
+	call_if_eq VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2, MtEmber_Exterior_EventScript_RocketsFaceDown
-	call_if_eq MtEmber_Exterior_EventScript_RocketsFaceDown
 	end
 
 MtEmber_Exterior_EventScript_RocketsFaceDown::
@@ -18,8 +17,7 @@ MtEmber_Exterior_EventScript_RocketsFaceDown::
 	return
 
 MtEmber_Exterior_OnLoad::
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
+	call_if_ge VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4, MtEmber_Exterior_EventScript_OpenCave
-	call_if_ge MtEmber_Exterior_EventScript_OpenCave
 	end
 
 MtEmber_Exterior_EventScript_OpenCave::
@@ -29,8 +27,7 @@ MtEmber_Exterior_EventScript_OpenCave::
 MtEmber_Exterior_EventScript_Grunt1::
 	lock
 	goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, MtEmber_Exterior_EventScript_Grunt1Defeated
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
+	goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4, MtEmber_Exterior_EventScript_BattleGrunt1
-	goto_if_eq MtEmber_Exterior_EventScript_BattleGrunt1
 	msgbox MtEmber_Exterior_Text_WellTryDiggingHere
 	release
 	end
@@ -65,8 +62,7 @@ MtEmber_Exterior_EventScript_Grunt2::
 	lock
 	faceplayer
 	goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_EventScript_DefeatedGrunt2
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
+	goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4, MtEmber_Exterior_EventScript_BattleGrunt2
-	goto_if_eq MtEmber_Exterior_EventScript_BattleGrunt2
 	msgbox MtEmber_Exterior_Text_YoureInTheWayGetLost
 	closemessage
 	applymovement LOCALID_GRUNT2, Movement_FaceOriginalDirection
@@ -90,7 +86,7 @@ MtEmber_Exterior_EventScript_BattleGrunt2::
 
 MtEmber_Exterior_EventScript_RocketPasswordScene::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox MtEmber_Exterior_Text_PunchedThroughAtLast
 	message MtEmber_Exterior_Text_WhatsPasswordAgain
 	waitmessage

data/maps/MtEmber_Summit/scripts.inc

@@ -9,8 +9,7 @@ MtEmber_Summit_OnResume::
 
 MtEmber_Summit_EventScript_TryRemoveMoltres::
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_CAUGHT
+	goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
-	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
 	return
 
@@ -27,7 +26,7 @@ MtEmber_Summit_EventScript_Moltres::
 	special QuestLog_CutRecording
 	lock
 	faceplayer
-	setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE
+	setwildbattle SPECIES_MOLTRES, 50
 	waitse
 	playmoncry SPECIES_MOLTRES, CRY_MODE_ENCOUNTER
 	message Text_Gyaoo
@@ -41,12 +40,9 @@ MtEmber_Summit_EventScript_Moltres::
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_WON
+	goto_if_eq VAR_RESULT, B_OUTCOME_WON, MtEmber_Summit_EventScript_DefeatedMoltres
-	goto_if_eq MtEmber_Summit_EventScript_DefeatedMoltres
+	goto_if_eq VAR_RESULT, B_OUTCOME_RAN, MtEmber_Summit_EventScript_RanFromMoltres
-	compare VAR_RESULT, B_OUTCOME_RAN
+	goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, MtEmber_Summit_EventScript_RanFromMoltres
-	goto_if_eq MtEmber_Summit_EventScript_RanFromMoltres
-	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq MtEmber_Summit_EventScript_RanFromMoltres
 	setflag FLAG_FOUGHT_MOLTRES
 	release
 	end

data/maps/MtMoon_B2F/scripts.inc

@@ -33,7 +33,7 @@ MtMoon_B2F_EventScript_Miguel::
 	end
 
 MtMoon_B2F_EventScript_BattleMiguel::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	message MtMoon_B2F_Text_MiguelIntro
 	waitmessage
 	playbgm MUS_ENCOUNTER_GYM_LEADER, 0
@@ -58,8 +58,7 @@ MtMoon_B2F_EventScript_DomeFossil::
 	lock
 	faceplayer
 	msgbox MtMoon_B2F_Text_YouWantDomeFossil, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, MtMoon_B2F_EventScript_DontTakeFossil
-	goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil
 	removeobject LOCALID_DOME_FOSSIL
 	giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_OBTAIN_KEY_ITEM
 	closemessage
@@ -67,8 +66,8 @@ MtMoon_B2F_EventScript_DomeFossil::
 	delay 10
 	applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil
 	waitmovement 0
-	moveobjectoffscreen LOCALID_MIGUEL
+	copyobjectxytoperm LOCALID_MIGUEL
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	message MtMoon_B2F_Text_ThenThisFossilIsMine
 	waitmessage
@@ -90,8 +89,7 @@ MtMoon_B2F_EventScript_HelixFossil::
 	lock
 	faceplayer
 	msgbox MtMoon_B2F_Text_YouWantHelixFossil, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, MtMoon_B2F_EventScript_DontTakeFossil
-	goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil
 	removeobject LOCALID_HELIX_FOSSIL
 	giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_OBTAIN_KEY_ITEM
 	closemessage
@@ -99,8 +97,8 @@ MtMoon_B2F_EventScript_HelixFossil::
 	delay 10
 	applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil
 	waitmovement 0
-	moveobjectoffscreen LOCALID_MIGUEL
+	copyobjectxytoperm LOCALID_MIGUEL
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	message MtMoon_B2F_Text_ThenThisFossilIsMine
 	waitmessage

data/maps/NavelRock_Base/scripts.inc

@@ -25,8 +25,7 @@ NavelRock_Base_OnResume::
 
 NavelRock_Base_EventScript_TryRemoveLugia::
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_CAUGHT
+	goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
-	goto_if_ne EventScript_Return
 	removeobject LOCALID_LUGIA
 	return
 
@@ -56,21 +55,15 @@ NavelRock_Base_EventScript_Lugia::
 	playmoncry SPECIES_LUGIA, CRY_MODE_ENCOUNTER
 	waitmoncry
 	delay 20
-	setvar VAR_0x8004, SPECIES_LUGIA
+	seteventmon SPECIES_LUGIA, 70
-	setvar VAR_0x8005, 70  @ Level
-	setvar VAR_0x8006, ITEM_NONE
-	special CreateEventLegalEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_WON
+	goto_if_eq VAR_RESULT, B_OUTCOME_WON, NavelRock_Base_EventScript_DefeatedLugia
-	goto_if_eq NavelRock_Base_EventScript_DefeatedLugia
+	goto_if_eq VAR_RESULT, B_OUTCOME_RAN, NavelRock_Base_EventScript_RanFromLugia
-	compare VAR_RESULT, B_OUTCOME_RAN
+	goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, NavelRock_Base_EventScript_RanFromLugia
-	goto_if_eq NavelRock_Base_EventScript_RanFromLugia
-	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq NavelRock_Base_EventScript_RanFromLugia
 	setflag FLAG_FOUGHT_LUGIA
 	release
 	end

data/maps/NavelRock_Summit/scripts.inc

@@ -28,8 +28,7 @@ NavelRock_Summit_OnResume::
 
 NavelRock_Summit_EventScript_TryRemoveHoOh::
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_CAUGHT
+	goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
-	goto_if_ne EventScript_Return
 	removeobject LOCALID_HO_OH
 	return
 
@@ -60,22 +59,16 @@ NavelRock_Summit_EventScript_HoOh::
 	applymovement LOCALID_HO_OH, Movement_HoOhApproach
 	waitmovement 0
 	special RemoveCameraObject
-	setvar VAR_0x8004, SPECIES_HO_OH
+	seteventmon SPECIES_HO_OH, 70
-	setvar VAR_0x8005, 70  @ Level
-	setvar VAR_0x8006, ITEM_NONE
-	special CreateEventLegalEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	setvar VAR_LAST_TALKED, LOCALID_HO_OH
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_WON
+	goto_if_eq VAR_RESULT, B_OUTCOME_WON, NavelRock_Summit_EventScript_DefeatedHoOh
-	goto_if_eq NavelRock_Summit_EventScript_DefeatedHoOh
+	goto_if_eq VAR_RESULT, B_OUTCOME_RAN, NavelRock_Summit_EventScript_RanFromHoOh
-	compare VAR_RESULT, B_OUTCOME_RAN
+	goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, NavelRock_Summit_EventScript_RanFromHoOh
-	goto_if_eq NavelRock_Summit_EventScript_RanFromHoOh
-	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq NavelRock_Summit_EventScript_RanFromHoOh
 	setflag FLAG_FOUGHT_HO_OH
 	releaseall
 	end

data/maps/OneIsland/scripts.inc

@@ -15,7 +15,7 @@ OneIsland_OnFrame::
 
 OneIsland_EventScript_EnterOneIslandFirstTime::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerExitHarbor
 	waitmovement 0
 	msgbox OneIsland_Text_BillLetsGoSeeCelio
@@ -32,7 +32,7 @@ OneIsland_EventScript_EnterOneIslandFirstTime::
 	waitdooranim
 	removeobject LOCALID_BILL
 	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 3
-	warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9
+	warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 9, 9
 	waitstate
 	releaseall
 	end

data/maps/OneIsland_Harbor/scripts.inc

@@ -17,11 +17,11 @@ OneIsland_Harbor_OnFrame::
 
 OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor
 	waitmovement 0
 	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2
-	warp MAP_ONE_ISLAND, 255, 12, 18
+	warp MAP_ONE_ISLAND, 12, 18
 	waitstate
 	releaseall
 	end

data/maps/OneIsland_PokemonCenter_1F/scripts.inc

@@ -9,8 +9,7 @@ OneIsland_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 OneIsland_PokemonCenter_1F_OnLoad::
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
+	call_if_ge VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5, OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile
-	call_if_ge OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile
 	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn
 	end
 
@@ -30,12 +29,9 @@ OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn::
 
 OneIsland_PokemonCenter_1F_OnTransition::
 	setrespawn SPAWN_ONE_ISLAND
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
+	call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6, OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone
-	call_if_eq OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone
+	call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0
+	call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2, OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos
-	call_if_eq OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
-	call_if_eq OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone::
@@ -62,7 +58,7 @@ OneIsland_PokemonCenter_1F_OnFrame::
 
 OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio
 	applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio
 	waitmovement 0
@@ -111,10 +107,8 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
 	msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis
 	giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_OBTAIN_KEY_ITEM
 	msgbox OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands
-	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
+	call_if_ge VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2, OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage
-	call_if_ge OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage
+	call_if_lt VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2, OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap
-	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
-	call_if_lt OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap
 	setflag FLAG_SYS_SEVII_MAP_123
 	msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater
 	closemessage
@@ -136,7 +130,7 @@ OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp::
 	return
 
 OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	message OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap
 	waitmessage
@@ -207,21 +201,15 @@ OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll::
 OneIsland_PokemonCenter_1F_EventScript_Celio::
 	lock
 	faceplayer
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7
+	goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7, OneIsland_PokemonCenter_1F_EventScript_CelioGiveBillFact
-	goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioGiveBillFact
+	goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6, OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
-	goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire
 	goto_if_set FLAG_RECOVERED_SAPPHIRE, OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
+	goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5, OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass
-	goto_if_eq OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass
 	goto_if_set FLAG_GOT_RUBY, OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
+	goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4, OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby
-	goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
-	compare VAR_RESULT, TRUE
+	goto_if_eq VAR_RESULT, TRUE, OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby
-	goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby
+	goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3, OneIsland_PokemonCenter_1F_EventScript_CelioPlayerMissingNationalDex
-	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
-	goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioPlayerMissingNationalDex
 	msgbox OneIsland_PokemonCenter_1F_Text_SorryForBeingPoorHost
 	closemessage
 	applymovement LOCALID_CELIO, Movement_FaceOriginalDirection
@@ -232,10 +220,8 @@ OneIsland_PokemonCenter_1F_EventScript_Celio::
 OneIsland_PokemonCenter_1F_EventScript_CelioGiveBillFact::
 	msgbox OneIsland_PokemonCenter_1F_Text_CelioHearingRumorsAboutYou
 	random 3
-	compare VAR_RESULT, 0
+	goto_if_eq VAR_RESULT, 0, OneIsland_PokemonCenter_1F_EventScript_BillFact1
-	goto_if_eq OneIsland_PokemonCenter_1F_EventScript_BillFact1
+	goto_if_eq VAR_RESULT, 1, OneIsland_PokemonCenter_1F_EventScript_BillFact2
-	compare VAR_RESULT, 1
-	goto_if_eq OneIsland_PokemonCenter_1F_EventScript_BillFact2
 	famechecker FAMECHECKER_BILL, 5
 	msgbox OneIsland_PokemonCenter_1F_Text_BillCantStomachMilk
 	release
@@ -259,13 +245,13 @@ OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire::
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_TMHM
 	message OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio
 	waitmessage
 	waitfanfare
 	call EventScript_RestorePrevTextColor
-	removeitem ITEM_SAPPHIRE, 1
+	removeitem ITEM_SAPPHIRE
 	msgbox OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime
 	closemessage
 	applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine
@@ -305,7 +291,7 @@ OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass::
 
 OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby::
 	msgbox OneIsland_PokemonCenter_1F_Text_OhThats
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_TMHM
 	message OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio
 	waitmessage
@@ -321,26 +307,24 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby::
 	applymovement LOCALID_CELIO, Movement_FacePlayer
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_MayIAskOneMoreFavor, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio
-	goto_if_eq OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio
 	goto OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio::
 	msgbox OneIsland_PokemonCenter_1F_Text_PleaseINeedYourHelp, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio
-	goto_if_eq OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio
 	goto OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass::
 	msgbox OneIsland_PokemonCenter_1F_Text_AnotherGemstoneInSeviiIslands
-	removeitem ITEM_RUBY, 1
+	removeitem ITEM_RUBY
-	removeitem ITEM_TRI_PASS, 1
+	removeitem ITEM_TRI_PASS
 	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
 	additem ITEM_RAINBOW_PASS
 	setflag FLAG_SYS_SEVII_MAP_4567
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	message OneIsland_PokemonCenter_1F_Text_ReturnedTriPassForRainbowPass
 	waitmessage
@@ -454,20 +438,16 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom::
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	playse SE_PIN
 	applymovement LOCALID_BILL, Movement_ExclamationMark
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer
 	closemessage
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 1, OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillTop
-	call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillTop
+	call_if_eq VAR_TEMP_1, 2, OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidTop
-	compare VAR_TEMP_1, 2
+	call_if_eq VAR_TEMP_1, 3, OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidBottom
-	call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidTop
+	call_if_eq VAR_TEMP_1, 4, OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom
-	compare VAR_TEMP_1, 3
-	call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidBottom
-	compare VAR_TEMP_1, 4
-	call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom
 	delay 10
 	msgbox OneIsland_PokemonCenter_1F_Text_BillWeGotItDone
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown

data/maps/PalletTown/scripts.inc

@@ -11,16 +11,13 @@ PalletTown_MapScripts::
 PalletTown_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN
 	call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_TryReadySignLady
-	compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0
+	call_if_eq VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0, PalletTown_EventScript_SetSignLadyPos
-	call_if_eq PalletTown_EventScript_SetSignLadyPos
+	call_if_eq VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1, PalletTown_EventScript_SetSignLadyDone
-	compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
-	call_if_eq PalletTown_EventScript_SetSignLadyDone
 	end
 
 PalletTown_EventScript_TryReadySignLady::
 	goto_if_unset FLAG_OPENED_START_MENU, EventScript_Return
-	compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
+	goto_if_ge VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1, EventScript_Return
-	goto_if_ge EventScript_Return
 	setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
 	return
 
@@ -47,7 +44,7 @@ PalletTown_OnFrame::
 @ Oak approaches player after exiting their house post Elite Four to check if they should receieve the National Dex
 PalletTown_EventScript_OakRatingScene::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	setobjectxyperm LOCALID_PROF_OAK, 14, 14
 	setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT
 	addobject LOCALID_PROF_OAK
@@ -59,10 +56,9 @@ PalletTown_EventScript_OakRatingScene::
 	specialvar VAR_RESULT, GetPokedexCount
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
-	getnumberstring 0, VAR_0x8008
+	buffernumberstring STR_VAR_1, VAR_0x8008
-	getnumberstring 1, VAR_0x8009
+	buffernumberstring STR_VAR_2, VAR_0x8009
-	compare VAR_0x8009, 60
+	goto_if_lt VAR_0x8009, 60, PalletTown_EventScript_NotEnoughMonsForNationalDex
-	goto_if_lt PalletTown_EventScript_NotEnoughMonsForNationalDex
 	msgbox PalletTown_Text_CaughtXImpressiveFollowMe
 	closemessage
 	playbgm MUS_FOLLOW_ME, 0
@@ -79,7 +75,7 @@ PalletTown_EventScript_OakRatingScene::
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7
 	setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3
 	setflag FLAG_HIDE_OAK_IN_PALLET_TOWN
-	warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12
+	warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6, 12
 	waitstate
 	releaseall
 	end
@@ -187,7 +183,7 @@ PalletTown_EventScript_OakTriggerRight::
 
 PalletTown_EventScript_OakTrigger::
 	famechecker FAMECHECKER_OAK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	delay 30
 	playbgm MUS_OAK, 0
 	message PalletTown_Text_OakDontGoOut
@@ -201,18 +197,14 @@ PalletTown_EventScript_OakTrigger::
 	waitmovement 0
 	delay 30
 	addobject LOCALID_PROF_OAK
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, PalletTown_EventScript_OakEnterLeft
-	call_if_eq PalletTown_EventScript_OakEnterLeft
+	call_if_eq VAR_TEMP_1, 1, PalletTown_EventScript_OakEnterRight
-	compare VAR_TEMP_1, 1
-	call_if_eq PalletTown_EventScript_OakEnterRight
 	delay 30
 	msgbox PalletTown_Text_OakGrassUnsafeNeedMon
 	closemessage
 	delay 30
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, PalletTown_EventScript_OakLeadPlayerToLabLeft
-	call_if_eq PalletTown_EventScript_OakLeadPlayerToLabLeft
+	call_if_eq VAR_TEMP_1, 1, PalletTown_EventScript_OakLeadPlayerToLabRight
-	compare VAR_TEMP_1, 1
-	call_if_eq PalletTown_EventScript_OakLeadPlayerToLabRight
 	opendoor 16, 13
 	waitdooranim
 	applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab
@@ -225,7 +217,7 @@ PalletTown_EventScript_OakTrigger::
 	setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 1
 	setflag FLAG_HIDE_OAK_IN_PALLET_TOWN
 	setflag FLAG_DONT_TRANSITION_MUSIC
-	warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12
+	warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6, 12
 	waitstate
 	releaseall
 	end
@@ -335,12 +327,9 @@ PalletTown_Movement_PlayerEnterLab::
 
 PalletTown_EventScript_SignLady::
 	lock
-	compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2, PalletTown_EventScript_SignLadyDone
-	goto_if_eq PalletTown_EventScript_SignLadyDone
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1, PalletTown_EventScript_SignLadyJustShowedSign
-	compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
+	goto_if_eq SIGN_LADY_READY, TRUE, PalletTown_EventScript_SignLadyStartShowSign
-	goto_if_eq PalletTown_EventScript_SignLadyJustShowedSign
-	compare SIGN_LADY_READY, TRUE
-	goto_if_eq PalletTown_EventScript_SignLadyStartShowSign
 	goto_if_set FLAG_TEMP_2, PalletTown_EventScript_SignLadyGoReadSign
 	msgbox PalletTown_Text_HmmIsThatRight
 	applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
@@ -352,11 +341,9 @@ PalletTown_EventScript_SignLady::
 	waitmovement 0
 	msgbox PalletTown_Text_OhLookLook
 	closemessage
-	compare VAR_FACING, DIR_EAST
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_EventScript_SignLadyMoveOutOfWayRight
-	call_if_eq PalletTown_EventScript_SignLadyMoveOutOfWayRight
+	call_if_ne VAR_FACING, DIR_EAST, PalletTown_EventScript_SignLadyMoveOutOfWayLeft
-	compare VAR_FACING, DIR_EAST
+	copyobjectxytoperm LOCALID_SIGN_LADY
-	call_if_ne PalletTown_EventScript_SignLadyMoveOutOfWayLeft
-	moveobjectoffscreen 1
 	setflag FLAG_TEMP_2
 	release
 	end
@@ -442,11 +429,11 @@ PalletTown_EventScript_SignLadyTrigger::
 	end
 
 PalletTown_EventScript_SignLadyShowSign::
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox PalletTown_Text_LookCopiedTrainerTipsSign
 	closemessage
 	delay 20
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	setflag FLAG_OPENED_START_MENU
 	setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
 	setvar SIGN_LADY_READY, FALSE

data/maps/PalletTown_PlayersHouse_1F/scripts.inc

@@ -8,10 +8,8 @@ PalletTown_PlayersHouse_1F_EventScript_Mom::
 	faceplayer
 	goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, PalletTown_PlayersHouse_1F_EventScript_MomHeal
 	checkplayergender
-	compare VAR_RESULT, MALE
+	call_if_eq VAR_RESULT, MALE, PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale
-	call_if_eq PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale
+	call_if_eq VAR_RESULT, FEMALE, PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale
-	compare VAR_RESULT, FEMALE
-	call_if_eq PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale
 	closemessage
 	applymovement LOCALID_MOM, Movement_FaceOriginalDirection
 	waitmovement 0
@@ -37,18 +35,15 @@ PalletTown_PlayersHouse_1F_EventScript_MomHeal::
 @ Displays special text if interacted with from side or back (which are normally inaccessible)
 PalletTown_PlayersHouse_1F_EventScript_TV::
 	lockall
-	compare VAR_FACING, DIR_NORTH
+	goto_if_eq VAR_FACING, DIR_NORTH, PalletTown_PlayersHouse_1F_EventScript_TVScreen
-	goto_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreen
 	msgbox PalletTown_PlayersHouse_1F_Text_OopsWrongSide
 	releaseall
 	end
 
 PalletTown_PlayersHouse_1F_EventScript_TVScreen::
 	checkplayergender
-	compare VAR_RESULT, MALE
+	call_if_eq VAR_RESULT, MALE, PalletTown_PlayersHouse_1F_EventScript_TVScreenMale
-	call_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreenMale
+	call_if_eq VAR_RESULT, FEMALE, PalletTown_PlayersHouse_1F_EventScript_TVScreenFemale
-	compare VAR_RESULT, FEMALE
-	call_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreenFemale
 	releaseall
 	end
 

data/maps/PalletTown_PlayersHouse_2F/scripts.inc

@@ -4,8 +4,7 @@ PalletTown_PlayersHouse_2F_MapScripts::
 	.byte 0
 
 PalletTown_PlayersHouse_2F_OnTransition::
-	compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0
+	call_if_eq VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, PalletTown_PlayersHouse_2F_EventScript_SetRespawn
-	call_if_eq PalletTown_PlayersHouse_2F_EventScript_SetRespawn
 	end
 
 PalletTown_PlayersHouse_2F_EventScript_SetRespawn::

data/maps/PalletTown_ProfessorOaksLab/scripts.inc

@@ -21,12 +21,9 @@ PalletTown_ProfessorOaksLab_MapScripts::
 
 PalletTown_ProfessorOaksLab_OnTransition::
 	setflag FLAG_VISITED_OAKS_LAB
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
+	call_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene
+	call_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7
+	call_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8, PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished
 	call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_SetSkipPokeBallCheck
 	end
 
@@ -65,7 +62,7 @@ PalletTown_ProfessorOaksLab_OnFrame::
 PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene:: @ 8169002 
 	lockall
 	setvar VAR_FACING, DIR_NORTH
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
 	waitmovement 0
 	removeobject LOCALID_PROF_OAK
@@ -80,33 +77,23 @@ PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene:: @ 8169002
 PalletTown_ProfessorOaksLab_EventScript_NationalDexScene::
 	msgbox PalletTown_ProfessorOaksLab_Text_OakSightingsOfRareMons
 	closemessage
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalJustLetMeHandleEverything
 	fadedefaultbgm
 	msgbox PalletTown_ProfessorOaksLab_Text_OakNeedYourHelpTooNeedToSeePokedexes
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest
-	compare VAR_FACING, DIR_WEST
+	textcolor NPC_TEXT_COLOR_NEUTRAL
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest
-	textcolor 3
 	msgbox PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits
 	closemessage
 	call EventScript_RestorePrevTextColor
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest
 	addobject LOCALID_POKEDEX_1
 	addobject LOCALID_POKEDEX_2
 	delay 30
@@ -115,15 +102,11 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene::
 	removeobject LOCALID_POKEDEX_1
 	removeobject LOCALID_POKEDEX_2
 	delay 30
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest
-	compare VAR_FACING, DIR_EAST
+	textcolor NPC_TEXT_COLOR_NEUTRAL
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest
-	textcolor 3
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	message PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded
 	waitmessage
@@ -134,14 +117,10 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene::
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex
 	closemessage
 	playbgm MUS_RIVAL_EXIT, 0
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_RivalExit
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
 	removeobject LOCALID_RIVAL
 	fadedefaultbgm
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
@@ -227,7 +206,7 @@ PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth::
 
 PalletTown_ProfessorOaksLab_ChooseStarterScene::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
 	waitmovement 0
 	removeobject LOCALID_PROF_OAK
@@ -282,7 +261,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalReact::
 
 PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_PROF_OAK, Movement_FaceDown
 	waitmovement 0
 	msgbox PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet
@@ -315,7 +294,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight::
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalBattle::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	playbgm MUS_ENCOUNTER_RIVAL, 0
 	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
 	waitmovement 0
@@ -325,12 +304,9 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattle::
 	closemessage
 	applymovement LOCALID_PROF_OAK, Movement_FaceDown
 	waitmovement 0
-	compare VAR_STARTER_MON, 0
+	goto_if_eq VAR_STARTER_MON, 0, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander
+	goto_if_eq VAR_STARTER_MON, 1, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur
-	compare VAR_STARTER_MON, 1
+	goto_if_eq VAR_STARTER_MON, 2, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur
-	compare VAR_STARTER_MON, 2
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle
 	end
 
 @ The scripts for the rival approaching the player for battle are a bit bloated because
@@ -338,12 +314,9 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattle::
 @ NOTE: Names below refer to the Rival's mon (e.g. for RivalBattleSquirtle, player has Charmander)
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle::
-	compare VAR_TEMP_2, 1
+	goto_if_eq VAR_TEMP_2, 1, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft
+	goto_if_eq VAR_TEMP_2, 2, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid
-	compare VAR_TEMP_2, 2
+	goto_if_eq VAR_TEMP_2, 3, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid
-	compare VAR_TEMP_2, 3
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft::
@@ -394,12 +367,9 @@ PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight::
 	step_end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander::
-	compare VAR_TEMP_2, 1
+	goto_if_eq VAR_TEMP_2, 1, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft
+	goto_if_eq VAR_TEMP_2, 2, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid
-	compare VAR_TEMP_2, 2
+	goto_if_eq VAR_TEMP_2, 3, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid
-	compare VAR_TEMP_2, 3
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft::
@@ -453,12 +423,9 @@ PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight::
 	step_end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur::
-	compare VAR_TEMP_2, 1
+	goto_if_eq VAR_TEMP_2, 1, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft
+	goto_if_eq VAR_TEMP_2, 2, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid
-	compare VAR_TEMP_2, 2
+	goto_if_eq VAR_TEMP_2, 3, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid
-	compare VAR_TEMP_2, 3
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft::
@@ -510,12 +477,9 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle::
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon
 	closemessage
 	playbgm MUS_RIVAL_EXIT, 0
-	compare VAR_TEMP_2, 1
+	call_if_eq VAR_TEMP_2, 1, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft
+	call_if_eq VAR_TEMP_2, 2, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid
-	compare VAR_TEMP_2, 2
+	call_if_eq VAR_TEMP_2, 3, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid
-	compare VAR_TEMP_2, 3
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight
 	removeobject LOCALID_RIVAL
 	playse SE_EXIT
 	fadedefaultbgm
@@ -592,10 +556,8 @@ PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight::
 PalletTown_ProfessorOaksLab_EventScript_Rival::
 	lock
 	faceplayer
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3, PalletTown_ProfessorOaksLab_EventScript_RivalChoseStarter
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalChoseStarter
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2, PalletTown_ProfessorOaksLab_EventScript_RivalWaitingForStarter
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWaitingForStarter
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalGrampsIsntAround
 	release
 	end
@@ -614,21 +576,14 @@ PalletTown_ProfessorOaksLab_EventScript_ProfOak::
 	lock
 	faceplayer
 	goto_if_set SHOWED_OAK_COMPLETE_DEX, PalletTown_ProfessorOaksLab_EventScript_OakJustShownCompleteDex
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9, PalletTown_ProfessorOaksLab_EventScript_RatePokedex
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedex
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait
 	goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_TryStartNationalDexScene
-	compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
+	goto_if_eq VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1, PalletTown_ProfessorOaksLab_EventScript_RatePokedex
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedex
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6, PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
+	goto_if_ge VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1, PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4, PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow
-	compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3, PalletTown_ProfessorOaksLab_EventScript_OakCanReachNextTownWithMon
-	goto_if_ge PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_OakCanReachNextTownWithMon
 	msgbox PalletTown_ProfessorOaksLab_Text_OakWhichOneWillYouChoose
 	release
 	end
@@ -650,25 +605,21 @@ PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow::
 
 PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
 	msgbox PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_TMHM
 	message PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel
 	waitmessage
 	waitfanfare
 	call EventScript_RestorePrevTextColor
-	removeitem ITEM_OAKS_PARCEL, 1
+	removeitem ITEM_OAKS_PARCEL
 	msgbox PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered
 	playbgm MUS_ENCOUNTER_RIVAL, 0
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalGramps
 	closemessage
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest
 	fadedefaultbgm
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalWhatDidYouCallMeFor
 	closemessage
@@ -678,24 +629,16 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
 	waitmovement 0
 	applymovement LOCALID_PROF_OAK, Movement_Delay48
 	waitmovement 0
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast
-	compare VAR_FACING, DIR_EAST
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest
-	compare VAR_FACING, DIR_NORTH
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth
 	msgbox PalletTown_ProfessorOaksLab_Text_OakHaveRequestForYouTwo
 	closemessage
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest
 	msgbox PalletTown_ProfessorOaksLab_Text_OakPokedexOnDesk
 	closemessage
 	delay 40
@@ -707,16 +650,12 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
 	delay 10
 	removeobject LOCALID_POKEDEX_2
 	delay 25
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest
 	delay 10
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	message PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak
 	waitmessage
@@ -731,25 +670,17 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
 	famechecker FAMECHECKER_OAK, 1
 	msgbox PalletTown_ProfessorOaksLab_Text_OakCompleteMonGuideWasMyDream
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalLeaveItToMeGramps
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap
 	closemessage
 	playbgm MUS_RIVAL_EXIT, 0
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_RivalExit
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
 	removeobject LOCALID_RIVAL
 	fadedefaultbgm
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
@@ -852,10 +783,9 @@ PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls::
 	specialvar VAR_RESULT, GetPokedexCount
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
-	getnumberstring 0, VAR_0x8008
+	buffernumberstring STR_VAR_1, VAR_0x8008
-	getnumberstring 1, VAR_0x8009
+	buffernumberstring STR_VAR_2, VAR_0x8009
-	compare VAR_0x8009, 1  @ Player only has starter
+	goto_if_eq VAR_0x8009, 1, PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls  @ Player only has starter
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls
 	goto PalletTown_ProfessorOaksLab_EventScript_RatePokedex
 	end
 
@@ -870,14 +800,10 @@ PalletTown_ProfessorOaksLab_EventScript_DexCompleted::
 	delay 40
 	message PokedexRating_Text_Wroooaaarrr
 	waitmessage
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth
+	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest
 	applymovement LOCALID_PROF_OAK, Movement_FacePlayer
 	waitmovement 0
 	closemessage
@@ -986,8 +912,7 @@ Movement_1699C5:
 PalletTown_ProfessorOaksLab_EventScript_TryStartNationalDexScene::
 	call PokedexRating_EventScript_RateInPerson
 	closemessage
-	compare VAR_0x8009, 60
+	goto_if_lt VAR_0x8009, 60, PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene
-	goto_if_lt PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene
 	goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene
 	delay 30
 	msgbox PalletTown_ProfessorOaksLab_Text_OakFavorToAskYouPlayer
@@ -1003,15 +928,13 @@ PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls::
 	special QuestLog_CutRecording
 	goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait
 	goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls
-	checkitem ITEM_POKE_BALL, 1
+	checkitem ITEM_POKE_BALL
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls
 	goto PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls::
-	compare VAR_MAP_SCENE_ROUTE22, 2
+	goto_if_ge VAR_MAP_SCENE_ROUTE22, 2, PalletTown_ProfessorOaksLab_EventScript_GivePlayerMoreBalls
-	goto_if_ge PalletTown_ProfessorOaksLab_EventScript_GivePlayerMoreBalls
 	goto PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait
 	end
 
@@ -1158,10 +1081,8 @@ PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall::
 	setvar PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR
 	setvar RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER
 	setvar RIVAL_STARTER_ID, LOCALID_CHARMANDER_BALL
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
+	goto_if_ge VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3, PalletTown_ProfessorOaksLab_EventScript_LastPokeBall
-	goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2, PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice
 	msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls
 	release
 	end
@@ -1169,64 +1090,53 @@ PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall::
 PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice::
 	applymovement LOCALID_PROF_OAK, Movement_FaceRight
 	waitmovement 0
-	drawmonpic PLAYER_STARTER_SPECIES, 10, 3
+	showmonpic PLAYER_STARTER_SPECIES, 10, 3
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
-	compare PLAYER_STARTER_NUM, 0
+	goto_if_eq PLAYER_STARTER_NUM, 0, PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur
+	goto_if_eq PLAYER_STARTER_NUM, 1, PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle
-	compare PLAYER_STARTER_NUM, 1
+	goto_if_eq PLAYER_STARTER_NUM, 2, PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle
-	compare PLAYER_STARTER_NUM, 2
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur::
 	msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingBulbasaur, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, PalletTown_ProfessorOaksLab_EventScript_ChoseStarter
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter
+	goto_if_eq VAR_RESULT, NO, PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter
-	compare VAR_RESULT, NO
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle::
 	msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, PalletTown_ProfessorOaksLab_EventScript_ChoseStarter
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter
+	goto_if_eq VAR_RESULT, NO, PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter
-	compare VAR_RESULT, NO
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander::
 	msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, PalletTown_ProfessorOaksLab_EventScript_ChoseStarter
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter
+	goto_if_eq VAR_RESULT, NO, PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter
-	compare VAR_RESULT, NO
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter::
-	erasemonpic
+	hidemonpic
 	release
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_ChoseStarter::
-	erasemonpic
+	hidemonpic
 	removeobject VAR_LAST_TALKED
 	msgbox PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic
 	call EventScript_RestorePrevTextColor
 	setflag FLAG_SYS_POKEMON_GET
 	setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
-	givemon PLAYER_STARTER_SPECIES, 5, ITEM_NONE
+	givemon PLAYER_STARTER_SPECIES, 5
 	copyvar VAR_STARTER_MON, PLAYER_STARTER_NUM
-	getspeciesname 0, PLAYER_STARTER_SPECIES
+	bufferspeciesname STR_VAR_1, PLAYER_STARTER_SPECIES
 	message PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak
 	waitmessage
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	waitfanfare
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, EventScript_GiveNicknameToStarter
-	goto_if_eq EventScript_GiveNicknameToStarter
+	goto_if_eq VAR_RESULT, NO, PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter
-	compare VAR_RESULT, NO
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter
 	end
 
 EventScript_GiveNicknameToStarter::
@@ -1237,12 +1147,9 @@ EventScript_GiveNicknameToStarter::
 
 PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter::
 	closemessage
-	compare PLAYER_STARTER_NUM, 0
+	goto_if_eq PLAYER_STARTER_NUM, 0, PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander
+	goto_if_eq PLAYER_STARTER_NUM, 1, PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur
-	compare PLAYER_STARTER_NUM, 1
+	goto_if_eq PLAYER_STARTER_NUM, 2, PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur
-	compare PLAYER_STARTER_NUM, 2
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander::
@@ -1264,11 +1171,11 @@ PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur::
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalIllTakeThisOneThen
 	removeobject RIVAL_STARTER_ID
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
-	getspeciesname 0, RIVAL_STARTER_SPECIES
+	bufferspeciesname STR_VAR_1, RIVAL_STARTER_SPECIES
 	message PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak
 	waitmessage
 	playfanfare MUS_OBTAIN_KEY_ITEM
@@ -1317,10 +1224,8 @@ PalletTown_ProfessorOaksLab_EventScript_SquirtleBall::
 	setvar PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE
 	setvar RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR
 	setvar RIVAL_STARTER_ID, LOCALID_BULBASAUR_BALL
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
+	goto_if_ge VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3, PalletTown_ProfessorOaksLab_EventScript_LastPokeBall
-	goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2, PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice
 	msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls
 	release
 	end
@@ -1332,10 +1237,8 @@ PalletTown_ProfessorOaksLab_EventScript_CharmanderBall::
 	setvar PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER
 	setvar RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE
 	setvar RIVAL_STARTER_ID, LOCALID_SQUIRTLE_BALL
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
+	goto_if_ge VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3, PalletTown_ProfessorOaksLab_EventScript_LastPokeBall
-	goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2, PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
-	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice
 	msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls
 	release
 	end
@@ -1395,8 +1298,7 @@ PalletTown_ProfessorOaksLab_EventScript_LeftSign::
 
 PalletTown_ProfessorOaksLab_EventScript_RightSign::
 	lockall
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
+	goto_if_ge VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6, PalletTown_ProfessorOaksLab_EventScript_RightSignAlt
-	goto_if_ge PalletTown_ProfessorOaksLab_EventScript_RightSignAlt
 	msgbox PalletTown_ProfessorOaksLab_Text_SaveOptionInMenu
 	releaseall
 	end

data/maps/PalletTown_RivalsHouse/scripts.inc

@@ -8,10 +8,8 @@ PalletTown_RivalsHouse_MapScripts::
 	.byte 0
 
 PalletTown_RivalsHouse_OnTransition::
-	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
+	call_if_lt VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2, PalletTown_RivalsHouse_EventScript_MoveDaisyToTable
-	call_if_lt PalletTown_RivalsHouse_EventScript_MoveDaisyToTable
+	call_if_ge VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2, PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap
-	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
-	call_if_ge PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap
 	end
 
 PalletTown_RivalsHouse_EventScript_MoveDaisyToTable::
@@ -28,14 +26,10 @@ PalletTown_RivalsHouse_EventScript_Daisy::
 	faceplayer
 	famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
 	goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_RivalsHouse_EventScript_GroomMon
-	compare RECEIVED_TOWN_MAP, TRUE
+	goto_if_eq RECEIVED_TOWN_MAP, TRUE, PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest
-	goto_if_eq PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2, PalletTown_RivalsHouse_EventScript_ExplainTownMap
-	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
+	goto_if_eq VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 1, PalletTown_RivalsHouse_EventScript_GiveTownMap
-	goto_if_eq PalletTown_RivalsHouse_EventScript_ExplainTownMap
+	goto_if_ge VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_RivalsHouse_EventScript_HeardBattledRival
-	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 1
-	goto_if_eq PalletTown_RivalsHouse_EventScript_GiveTownMap
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
-	goto_if_ge PalletTown_RivalsHouse_EventScript_HeardBattledRival
 	msgbox PalletTown_RivalsHouse_Text_HiBrothersAtLab
 	closemessage
 	applymovement LOCALID_DAISY, Movement_FaceOriginalDirection
@@ -51,21 +45,17 @@ PalletTown_RivalsHouse_EventScript_HeardBattledRival::
 PalletTown_RivalsHouse_EventScript_GroomMon::
 	goto_if_questlog EventScript_ReleaseEnd
 	special QuestLog_CutRecording
-	compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
+	goto_if_lt VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500, PalletTown_RivalsHouse_EventScript_RateMonFriendship
-	goto_if_lt PalletTown_RivalsHouse_EventScript_RateMonFriendship
 	msgbox PalletTown_RivalsHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, PalletTown_RivalsHouse_EventScript_DeclineGrooming
-	goto_if_eq PalletTown_RivalsHouse_EventScript_DeclineGrooming
 	msgbox PalletTown_RivalsHouse_Text_GroomWhichOne
 	special ChoosePartyMon
 	waitstate
 	lock
 	faceplayer
-	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge VAR_0x8004, PARTY_SIZE, PalletTown_RivalsHouse_EventScript_DeclineGrooming
-	goto_if_ge PalletTown_RivalsHouse_EventScript_DeclineGrooming
 	specialvar VAR_RESULT, GetPartyMonSpecies
-	compare VAR_RESULT, SPECIES_EGG
+	goto_if_eq VAR_RESULT, SPECIES_EGG, PalletTown_RivalsHouse_EventScript_CantGroomEgg
-	goto_if_eq PalletTown_RivalsHouse_EventScript_CantGroomEgg
 	msgbox PalletTown_RivalsHouse_Text_LookingNiceInNoTime
 	closemessage
 	fadescreen FADE_TO_BLACK
@@ -144,9 +134,8 @@ PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest::
 PalletTown_RivalsHouse_EventScript_GiveTownMap::
 	msgbox PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp
 	closemessage
-	checkitemspace ITEM_TOWN_MAP, 1
+	checkitemspace ITEM_TOWN_MAP
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, PalletTown_RivalsHouse_EventScript_NoRoomForTownMap
-	goto_if_eq PalletTown_RivalsHouse_EventScript_NoRoomForTownMap
 	applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	removeobject LOCALID_TOWN_MAP

data/maps/PewterCity/scripts.inc

@@ -19,8 +19,7 @@ PewterCity_EventScript_GymGuide::
 	msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe
 	closemessage
 	playbgm MUS_FOLLOW_ME, 0
-	compare VAR_FACING, DIR_EAST
+	call_if_eq VAR_FACING, DIR_EAST, PewterCity_EventScript_WalkToGymEast
-	call_if_eq PewterCity_EventScript_WalkToGymEast
 	msgbox PewterCity_Text_GoTakeOnBrock
 	closemessage
 	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit
@@ -284,16 +283,13 @@ PewterCity_EventScript_GymGuideTriggerRight::
 	end
 
 PewterCity_EventScript_GymGuideTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe
 	closemessage
 	playbgm MUS_FOLLOW_ME, 0
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, PewterCity_EventScript_WalkToGymTop
-	call_if_eq PewterCity_EventScript_WalkToGymTop
+	call_if_eq VAR_TEMP_1, 1, PewterCity_EventScript_WalkToGymMid
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_WalkToGymBottom
-	call_if_eq PewterCity_EventScript_WalkToGymMid
-	compare VAR_TEMP_1, 2
-	call_if_eq PewterCity_EventScript_WalkToGymBottom
 	msgbox PewterCity_Text_GoTakeOnBrock
 	closemessage
 	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit
@@ -440,20 +436,15 @@ PewterCity_EventScript_MuseumGuide::
 	lock
 	faceplayer
 	msgbox PewterCity_Text_DidYouCheckOutMuseum, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, PewterCity_EventScript_CheckedOutMuseum
-	goto_if_eq PewterCity_EventScript_CheckedOutMuseum
 	msgbox PewterCity_Text_ReallyYouHaveToGo
 	closemessage
 	delay 10
 	playbgm MUS_FOLLOW_ME, 0
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PewterCity_EventScript_LeadToMuseumNorth
-	call_if_eq PewterCity_EventScript_LeadToMuseumNorth
+	call_if_eq VAR_FACING, DIR_SOUTH, PewterCity_EventScript_LeadToMuseumSouth
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_WEST, PewterCity_EventScript_LeadToMuseumWest
-	call_if_eq PewterCity_EventScript_LeadToMuseumSouth
+	call_if_eq VAR_FACING, DIR_EAST, PewterCity_EventScript_LeadToMuseumEast
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PewterCity_EventScript_LeadToMuseumWest
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PewterCity_EventScript_LeadToMuseumEast
 	msgbox PewterCity_Text_ThisIsTheMuseum
 	closemessage
 	delay 10
@@ -631,8 +622,7 @@ PewterCity_EventScript_BugCatcher::
 	lock
 	faceplayer
 	msgbox PewterCity_Text_DoYouKnowWhatImDoing, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, PewterCity_EventScript_KnowWhatTheyreDoing
-	goto_if_eq PewterCity_EventScript_KnowWhatTheyreDoing
 	msgbox PewterCity_Text_SprayingRepelToKeepWildMonsOut
 	release
 	end
@@ -695,13 +685,10 @@ PewterCity_EventScript_RunningShoesAideTriggerBottom::
 	end
 
 PewterCity_EventScript_AideGiveRunningShoes::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 1, PewterCity_EventScript_AideNoticePlayer
-	call_if_eq PewterCity_EventScript_AideNoticePlayer
+	call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_AideNoticePlayer
-	compare VAR_TEMP_1, 2
+	call_if_eq VAR_TEMP_1, 3, PewterCity_EventScript_AideNoticePlayer
-	call_if_eq PewterCity_EventScript_AideNoticePlayer
-	compare VAR_TEMP_1, 3
-	call_if_eq PewterCity_EventScript_AideNoticePlayer
 	waitse
 	playse SE_PIN
 	applymovement LOCALID_AIDE, Movement_ExclamationMark
@@ -709,16 +696,12 @@ PewterCity_EventScript_AideGiveRunningShoes::
 	applymovement LOCALID_AIDE, Movement_Delay48
 	waitmovement 0
 	msgbox PewterCity_Text_OhPlayer
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, PewterCity_EventScript_AideApproachPlayer0
-	call_if_eq PewterCity_EventScript_AideApproachPlayer0
+	call_if_eq VAR_TEMP_1, 1, PewterCity_EventScript_AideApproachPlayer1
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_AideApproachPlayer2
-	call_if_eq PewterCity_EventScript_AideApproachPlayer1
+	call_if_eq VAR_TEMP_1, 3, PewterCity_EventScript_AideApproachPlayer3
-	compare VAR_TEMP_1, 2
-	call_if_eq PewterCity_EventScript_AideApproachPlayer2
-	compare VAR_TEMP_1, 3
-	call_if_eq PewterCity_EventScript_AideApproachPlayer3
 	msgbox PewterCity_Text_AskedToDeliverThis
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	message PewterCity_Text_ReceivedRunningShoesFromAide
 	waitmessage
@@ -731,16 +714,12 @@ PewterCity_EventScript_AideGiveRunningShoes::
 	call EventScript_RestorePrevTextColor
 	msgbox PewterCity_Text_MustBeGoingBackToLab
 	closemessage
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, PewterCity_EventScript_AideExit0
-	call_if_eq PewterCity_EventScript_AideExit0
+	call_if_eq VAR_TEMP_1, 1, PewterCity_EventScript_AideExit1
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_AideExit2
-	call_if_eq PewterCity_EventScript_AideExit1
+	call_if_eq VAR_TEMP_1, 3, PewterCity_EventScript_AideExit3
-	compare VAR_TEMP_1, 2
-	call_if_eq PewterCity_EventScript_AideExit2
-	compare VAR_TEMP_1, 3
-	call_if_eq PewterCity_EventScript_AideExit3
 	delay 30
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PewterCity_Text_RunningShoesLetterFromMom
 	closemessage
 	removeobject LOCALID_AIDE

data/maps/PewterCity_Gym/scripts.inc

@@ -22,9 +22,8 @@ PewterCity_Gym_EventScript_DefeatedBrock::
 
 PewterCity_Gym_EventScript_GiveTM39::
 	msgbox PewterCity_Gym_Text_TakeThisWithYou
-	checkitemspace ITEM_TM39, 1
+	checkitemspace ITEM_TM39
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, PewterCity_Gym_EventScript_NoRoomForTM39
-	goto_if_eq PewterCity_Gym_EventScript_NoRoomForTM39
 	giveitem_msg PewterCity_Gym_Text_ReceivedTM39FromBrock, ITEM_TM39
 	setflag FLAG_GOT_TM39_FROM_BROCK
 	msgbox PewterCity_Gym_Text_ExplainTM39
@@ -46,10 +45,8 @@ PewterCity_Gym_EventScript_GymGuy::
 	faceplayer
 	goto_if_set FLAG_DEFEATED_BROCK, PewterCity_Gym_EventScript_GymGuyPostVictory
 	msgbox PewterCity_Gym_Text_LetMeTakeYouToTheTop, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, PewterCity_Gym_EventScript_GymGuyTakeMeToTop
-	goto_if_eq PewterCity_Gym_EventScript_GymGuyTakeMeToTop
+	goto_if_eq VAR_RESULT, NO, PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop
-	compare VAR_RESULT, NO
-	goto_if_eq PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop
 	end
 
 PewterCity_Gym_EventScript_GymGuyPostVictory::

data/maps/PewterCity_House1/scripts.inc

@@ -24,7 +24,7 @@ PewterCity_House1_EventScript_Nidoran::
 	end
 
 PewterCity_House1_EventScript_DoNidoranCry::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	waitse
 	playmoncry SPECIES_NIDORAN_M, CRY_MODE_NORMAL
 	msgbox PewterCity_House1_Text_Nidoran

data/maps/PewterCity_Museum_1F/scripts.inc

@@ -7,22 +7,17 @@ PewterCity_Museum_1F_MapScripts::
 PewterCity_Museum_1F_EventScript_Scientist1::
 	lock
 	faceplayer
-	compare VAR_FACING, DIR_WEST
+	goto_if_eq VAR_FACING, DIR_WEST, PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
-	goto_if_eq PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
+	goto_if_eq VAR_FACING, DIR_SOUTH, PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
-	compare VAR_FACING, DIR_SOUTH
+	goto_if_eq VAR_FACING, DIR_NORTH, PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
-	goto_if_eq PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
-	compare VAR_FACING, DIR_NORTH
-	goto_if_eq PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
 	msgbox PewterCity_Museum_1F_Text_PleaseEnjoyYourself
 	release
 	end
 
 PewterCity_Museum_1F_EventScript_Scientist1BehindCounter::
 	msgbox PewterCity_Museum_1F_Text_DoYouKnowWhatAmberIs, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter
-	goto_if_eq PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter
+	goto_if_eq VAR_RESULT, NO, PewterCity_Museum_1F_EventScript_ExplainAmber
-	compare VAR_RESULT, NO
-	goto_if_eq PewterCity_Museum_1F_EventScript_ExplainAmber
 	end
 
 PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter::
@@ -64,37 +59,32 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerRight::
 	end
 
 PewterCity_Museum_1F_EventScript_EntranceTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
-	showmoneybox 0, 0, 0
+	showmoneybox 0, 0
 	msgbox PewterCity_Museum_1F_Text_Its50YForChildsTicket, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, PewterCity_Museum_1F_EventScript_TryPayForTicket
-	goto_if_eq PewterCity_Museum_1F_EventScript_TryPayForTicket
 	msgbox PewterCity_Museum_1F_Text_ComeAgain
 	closemessage
-	hidemoneybox 0, 0
+	hidemoneybox
 	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
 	waitmovement 0
 	releaseall
 	end
 
 PewterCity_Museum_1F_EventScript_TryPayForTicket::
-	checkmoney 50, 0
+	checkmoney 50
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, PewterCity_Museum_1F_EventScript_NotEnoughMoney
-	goto_if_eq PewterCity_Museum_1F_EventScript_NotEnoughMoney
 	closemessage
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, PewterCity_Museum_1F_EventScript_PlayerApproachCounterLeft
-	call_if_eq PewterCity_Museum_1F_EventScript_PlayerApproachCounterLeft
+	call_if_eq VAR_TEMP_1, 1, PewterCity_Museum_1F_EventScript_PlayerApproachCounterMid
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 2, PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight
-	call_if_eq PewterCity_Museum_1F_EventScript_PlayerApproachCounterMid
-	compare VAR_TEMP_1, 2
-	call_if_eq PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight
 	playse SE_SHOP
-	removemoney 50, 0
+	removemoney 50
-	updatemoneybox 0, 0, 0
+	updatemoneybox
 	waitse
 	msgbox PewterCity_Museum_1F_Text_Right50YThankYou
 	setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 1
-	hidemoneybox 0, 0
+	hidemoneybox
 	releaseall
 	end
 
@@ -116,7 +106,7 @@ PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight::
 PewterCity_Museum_1F_EventScript_NotEnoughMoney::
 	msgbox PewterCity_Museum_1F_Text_DontHaveEnoughMoney
 	closemessage
-	hidemoneybox 0, 0
+	hidemoneybox
 	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
 	waitmovement 0
 	releaseall
@@ -157,9 +147,8 @@ PewterCity_Museum_1F_EventScript_OldAmberScientist::
 	faceplayer
 	goto_if_set FLAG_GOT_OLD_AMBER, PewterCity_Museum_1F_EventScript_AlreadyGotOldAmber
 	msgbox PewterCity_Museum_1F_Text_WantYouToGetAmberExamined
-	checkitemspace ITEM_OLD_AMBER, 1
+	checkitemspace ITEM_OLD_AMBER
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, PewterCity_Museum_1F_EventScript_NoRoomForOldAmber
-	goto_if_eq PewterCity_Museum_1F_EventScript_NoRoomForOldAmber
 	setflag FLAG_GOT_OLD_AMBER
 	removeobject LOCALID_OLD_AMBER
 	giveitem_msg PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan, ITEM_OLD_AMBER, 1, MUS_OBTAIN_KEY_ITEM

data/maps/PokemonLeague_AgathasRoom/scripts.inc

@@ -12,8 +12,7 @@ PokemonLeague_AgathasRoom_OnResume::
 
 PokemonLeague_AgathasRoom_OnLoad::
 	call_if_set FLAG_DEFEATED_AGATHA, PokemonLeague_AgathasRoom_EventScript_SetDoorOpen
-	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3
+	call_if_eq VAR_MAP_SCENE_POKEMON_LEAGUE, 3, PokemonLeague_AgathasRoom_EventScript_CloseEntry
-	call_if_eq PokemonLeague_AgathasRoom_EventScript_CloseEntry
 	end
 
 PokemonLeague_AgathasRoom_EventScript_CloseEntry::

data/maps/PokemonLeague_BrunosRoom/scripts.inc

@@ -14,8 +14,7 @@ PokemonLeague_BrunosRoom_OnResume::
 
 PokemonLeague_BrunosRoom_OnLoad::
 	call_if_set FLAG_DEFEATED_BRUNO, PokemonLeague_BrunosRoom_EventScript_SetDoorOpen
-	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2
+	call_if_eq VAR_MAP_SCENE_POKEMON_LEAGUE, 2, PokemonLeague_BrunosRoom_EventScript_CloseEntry
-	call_if_eq PokemonLeague_BrunosRoom_EventScript_CloseEntry
 	end
 
 PokemonLeague_BrunosRoom_EventScript_CloseEntry::
@@ -81,14 +80,10 @@ PokemonLeague_BrunosRoom_EventScript_Rematch::
 PokemonLeague_BrunosRoom_EventScript_PostBattle::
 	msgbox PokemonLeague_BrunosRoom_Text_PostBattle
 	closemessage
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
-	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
+	call_if_eq VAR_FACING, DIR_SOUTH, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_WEST, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
-	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
+	call_if_eq VAR_FACING, DIR_EAST, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
 	release
 	end
 
@@ -97,14 +92,10 @@ PokemonLeague_BrunosRoom_EventScript_DefeatedBruno::
 	call PokemonLeague_EventScript_OpenDoor
 	msgbox PokemonLeague_BrunosRoom_Text_PostBattle
 	closemessage
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_NORTH, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
-	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
+	call_if_eq VAR_FACING, DIR_SOUTH, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_WEST, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
-	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
+	call_if_eq VAR_FACING, DIR_EAST, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
-	compare VAR_FACING, DIR_WEST
-	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
-	compare VAR_FACING, DIR_EAST
-	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
 	release
 	end
 

data/maps/PokemonLeague_ChampionsRoom/scripts.inc

@@ -10,12 +10,9 @@ PokemonLeague_ChampionsRoom_MapScripts::
 PokemonLeague_ChampionsRoom_OnResume::
 	setvar VAR_0x8004, 4
 	call PokemonLeague_EventScript_DoLightingEffect
-	compare VAR_STARTER_MON, 2
+	call_if_eq VAR_STARTER_MON, 2, PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle
-	call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle
+	call_if_eq VAR_STARTER_MON, 1, PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur
-	compare VAR_STARTER_MON, 1
+	call_if_eq VAR_STARTER_MON, 0, PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander
-	call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur
-	compare VAR_STARTER_MON, 0
-	call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander
 	end
 
 PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle::
@@ -51,7 +48,7 @@ PokemonLeague_ChampionsRoom_OnFrame::
 
 PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	setflag FLAG_TEMP_2
 	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerEnter
 	waitmovement 0
@@ -79,7 +76,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
 	waitmovement 0
 	delay 25
 	specialvar VAR_RESULT, GetStarterSpecies
-	getspeciesname 0, VAR_RESULT
+	bufferspeciesname STR_VAR_1, VAR_RESULT
 	msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
 	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestRight
 	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestLeft
@@ -96,7 +93,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
 	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit
 	waitmovement 0
 	setvar VAR_TEMP_1, 1
-	warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12
+	warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 5, 12
 	waitstate
 	releaseall
 	end
@@ -107,21 +104,15 @@ PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd::
 	end
 
 PokemonLeague_ChampionsRoom_EventScript_Battle::
-	compare VAR_STARTER_MON, 2
+	call_if_eq VAR_STARTER_MON, 2, PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle
-	call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle
+	call_if_eq VAR_STARTER_MON, 1, PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur
-	compare VAR_STARTER_MON, 1
+	call_if_eq VAR_STARTER_MON, 0, PokemonLeague_ChampionsRoom_EventScript_BattleCharmander
-	call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur
-	compare VAR_STARTER_MON, 0
-	call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleCharmander
 	return
 
 PokemonLeague_ChampionsRoom_EventScript_Rematch::
-	compare VAR_STARTER_MON, 2
+	call_if_eq VAR_STARTER_MON, 2, PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle
-	call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle
+	call_if_eq VAR_STARTER_MON, 1, PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur
-	compare VAR_STARTER_MON, 1
+	call_if_eq VAR_STARTER_MON, 0, PokemonLeague_ChampionsRoom_EventScript_RematchCharmander
-	call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur
-	compare VAR_STARTER_MON, 0
-	call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchCharmander
 	return
 
 PokemonLeague_ChampionsRoom_EventScript_Intro::

data/maps/PokemonLeague_HallOfFame/scripts.inc

@@ -19,7 +19,7 @@ PokemonLeague_HallOfFame_OnFrame::
 
 PokemonLeague_HallOfFame_EventScript_EnterRoom::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom
 	waitmovement 0
 	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestLeft

data/maps/PokemonLeague_LancesRoom/scripts.inc

@@ -13,8 +13,7 @@ PokemonLeague_LancesRoom_OnResume::
 	end
 
 PokemonLeague_LancesRoom_OnLoad::
-	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4
+	call_if_eq VAR_MAP_SCENE_POKEMON_LEAGUE, 4, PokemonLeague_LancesRoom_EventScript_CloseEntry
-	call_if_eq PokemonLeague_LancesRoom_EventScript_CloseEntry
 	call_if_set FLAG_DEFEATED_LANCE, PokemonLeague_LancesRoom_EventScript_SetDoorOpen
 	end
 

data/maps/PokemonLeague_LoreleisRoom/scripts.inc

@@ -13,8 +13,7 @@ PokemonLeague_LoreleisRoom_OnResume::
 
 PokemonLeague_LoreleisRoom_OnLoad::
 	call_if_set FLAG_DEFEATED_LORELEI, PokemonLeague_LoreleisRoom_EventScript_SetDoorOpen
-	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1
+	call_if_eq VAR_MAP_SCENE_POKEMON_LEAGUE, 1, PokemonLeague_LoreleisRoom_EventScript_CloseEntry
-	call_if_eq PokemonLeague_LoreleisRoom_EventScript_CloseEntry
 	end
 
 PokemonLeague_LoreleisRoom_EventScript_CloseEntry::

data/maps/PokemonTower_1F/scripts.inc

@@ -22,8 +22,7 @@ PokemonTower_1F_EventScript_Woman2::
 	lock
 	faceplayer
 	checkplayergender
-	compare VAR_RESULT, MALE
+	goto_if_eq VAR_RESULT, MALE, PokemonTower_1F_EventScript_Woman2MalePlayer
-	goto_if_eq PokemonTower_1F_EventScript_Woman2MalePlayer
 	msgbox PokemonTower_1F_Text_ComeToPayRespectsGirl
 	release
 	end

data/maps/PokemonTower_2F/scripts.inc

@@ -20,31 +20,24 @@ PokemonTower_2F_EventScript_RivalTriggerDown::
 	end
 
 PokemonTower_2F_EventScript_Rival::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	playbgm MUS_ENCOUNTER_RIVAL, 0
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, PokemonTower_2F_EventScript_RivalFacePlayerRight
-	call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerRight
+	call_if_eq VAR_TEMP_1, 1, PokemonTower_2F_EventScript_RivalFacePlayerDown
-	compare VAR_TEMP_1, 1
-	call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerDown
 	applymovement LOCALID_RIVAL, Movement_ExclamationMark
 	waitmovement 0
 	applymovement LOCALID_RIVAL, Movement_Delay48
 	waitmovement 0
 	msgbox PokemonTower_2F_Text_RivalIntro
 	setvar VAR_LAST_TALKED, LOCALID_RIVAL
-	compare VAR_STARTER_MON, 2
+	call_if_eq VAR_STARTER_MON, 2, PokemonTower_2F_EventScript_RivalSquirtle
-	call_if_eq PokemonTower_2F_EventScript_RivalSquirtle
+	call_if_eq VAR_STARTER_MON, 1, PokemonTower_2F_EventScript_RivalBulbasaur
-	compare VAR_STARTER_MON, 1
+	call_if_eq VAR_STARTER_MON, 0, PokemonTower_2F_EventScript_RivalCharmander
-	call_if_eq PokemonTower_2F_EventScript_RivalBulbasaur
-	compare VAR_STARTER_MON, 0
-	call_if_eq PokemonTower_2F_EventScript_RivalCharmander
 	msgbox PokemonTower_2F_Text_RivalPostBattle
 	closemessage
 	playbgm MUS_RIVAL_EXIT, 0
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, PokemonTower_2F_EventScript_RivalExitRight
-	call_if_eq PokemonTower_2F_EventScript_RivalExitRight
+	call_if_eq VAR_TEMP_1, 1, PokemonTower_2F_EventScript_RivalExitDown
-	compare VAR_TEMP_1, 1
-	call_if_eq PokemonTower_2F_EventScript_RivalExitDown
 	playse SE_EXIT
 	delay 25
 	fadedefaultbgm

data/maps/PokemonTower_6F/scripts.inc

@@ -3,15 +3,14 @@ PokemonTower_6F_MapScripts::
 
 PokemonTower_6F_EventScript_MarowakGhost::
 	lockall
-	textcolor 2
+	textcolor NPC_TEXT_COLOR_MON
 	msgbox PokemonTower_6F_Text_BeGoneIntruders
 	goto_if_questlog EventScript_ReleaseEnd
-	setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
+	setwildbattle SPECIES_MAROWAK, 30
 	special StartMarowakBattle
 	waitstate
 	special QuestLog_CutRecording
-	compare VAR_RESULT, FALSE  @ Set by CB2_EndMarowakBattle
+	goto_if_eq VAR_RESULT, FALSE, PokemonTower_6F_EventScript_DefeatedMarowakGhost  @ VAR_RESULT set by CB2_EndMarowakBattle
-	goto_if_eq PokemonTower_6F_EventScript_DefeatedMarowakGhost
 	applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp
 	waitmovement 0
 	releaseall

data/maps/PokemonTower_7F/scripts.inc

@@ -14,7 +14,7 @@ PokemonTower_7F_EventScript_MrFuji::
 	setflag FLAG_RESCUED_MR_FUJI
 	msgbox PokemonTower_7F_Text_MrFujiThankYouFollowMe
 	closemessage
-	warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7
+	warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 4, 7
 	waitstate
 	release
 	end
@@ -28,12 +28,9 @@ PokemonTower_7F_EventScript_DefeatedGrunt1::
 	msgbox PokemonTower_7F_Text_Grunt1PostBattle
 	closemessage
 	getplayerxy VAR_0x8004, VAR_0x8005
-	compare VAR_0x8004, 10
+	goto_if_eq VAR_0x8004, 10, PokemonTower_7F_EventScript_Grunt1ExitMid
-	goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitMid
+	goto_if_eq VAR_0x8004, 11, PokemonTower_7F_EventScript_Grunt1ExitRight
-	compare VAR_0x8004, 11
+	goto_if_eq VAR_0x8004, 9, PokemonTower_7F_EventScript_Grunt1ExitLeft
-	goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitRight
-	compare VAR_0x8004, 9
-	goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitLeft
 	applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1Exit
 	waitmovement 0
 	goto PokemonTower_7F_EventScript_RemoveGrunt1
@@ -116,10 +113,8 @@ PokemonTower_7F_EventScript_DefeatedGrunt2::
 	msgbox PokemonTower_7F_Text_Grunt2PostBattle
 	closemessage
 	getplayerxy VAR_0x8004, VAR_0x8005
-	compare VAR_0x8004, 12
+	goto_if_eq VAR_0x8004, 12, PokemonTower_7F_EventScript_Grunt2ExitLeft
-	goto_if_eq PokemonTower_7F_EventScript_Grunt2ExitLeft
+	goto_if_eq VAR_0x8004, 13, PokemonTower_7F_EventScript_Grunt2ExitRight
-	compare VAR_0x8004, 13
-	goto_if_eq PokemonTower_7F_EventScript_Grunt2ExitRight
 	applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2Exit
 	waitmovement 0
 	goto PokemonTower_7F_EventScript_RemoveGrunt2
@@ -181,10 +176,8 @@ PokemonTower_7F_EventScript_DefeatedGrunt3::
 	msgbox PokemonTower_7F_Text_Grunt3PostBattle
 	closemessage
 	getplayerxy VAR_0x8004, VAR_0x8005
-	compare VAR_0x8004, 10
+	goto_if_eq VAR_0x8004, 10, PokemonTower_7F_EventScript_Grunt3ExitRight
-	goto_if_eq PokemonTower_7F_EventScript_Grunt3ExitRight
+	goto_if_eq VAR_0x8004, 9, PokemonTower_7F_EventScript_Grunt3ExitLeft
-	compare VAR_0x8004, 9
-	goto_if_eq PokemonTower_7F_EventScript_Grunt3ExitLeft
 	applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3Exit
 	waitmovement 0
 	goto PokemonTower_7F_EventScript_RemoveGrunt3

data/maps/PowerPlant/scripts.inc

@@ -9,8 +9,7 @@ PowerPlant_OnResume::
 
 PowerPlant_EventScript_TryRemoveStaticMon::
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_CAUGHT
+	goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
-	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
 	return
 
@@ -38,7 +37,7 @@ PowerPlant_EventScript_Zapdos::
 	special QuestLog_CutRecording
 	lock
 	faceplayer
-	setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE
+	setwildbattle SPECIES_ZAPDOS, 50
 	waitse
 	playmoncry SPECIES_ZAPDOS, CRY_MODE_ENCOUNTER
 	message Text_Gyaoo
@@ -52,12 +51,9 @@ PowerPlant_EventScript_Zapdos::
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_WON
+	goto_if_eq VAR_RESULT, B_OUTCOME_WON, PowerPlant_EventScript_DefeatedZapdos
-	goto_if_eq PowerPlant_EventScript_DefeatedZapdos
+	goto_if_eq VAR_RESULT, B_OUTCOME_RAN, PowerPlant_EventScript_RanFromZapdos
-	compare VAR_RESULT, B_OUTCOME_RAN
+	goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, PowerPlant_EventScript_RanFromZapdos
-	goto_if_eq PowerPlant_EventScript_RanFromZapdos
-	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq PowerPlant_EventScript_RanFromZapdos
 	setflag FLAG_FOUGHT_ZAPDOS
 	release
 	end
@@ -76,7 +72,7 @@ PowerPlant_EventScript_Electrode1::
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
-	setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
+	setwildbattle SPECIES_ELECTRODE, 34
 	waitse
 	playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
 	delay 40
@@ -86,12 +82,9 @@ PowerPlant_EventScript_Electrode1::
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special QuestLog_CutRecording
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_WON
+	goto_if_eq VAR_RESULT, B_OUTCOME_WON, PowerPlant_EventScript_FoughtElectrode1
-	goto_if_eq PowerPlant_EventScript_FoughtElectrode1
+	goto_if_eq VAR_RESULT, B_OUTCOME_RAN, PowerPlant_EventScript_FoughtElectrode1
-	compare VAR_RESULT, B_OUTCOME_RAN
+	goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, PowerPlant_EventScript_FoughtElectrode1
-	goto_if_eq PowerPlant_EventScript_FoughtElectrode1
-	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq PowerPlant_EventScript_FoughtElectrode1
 	setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
 	release
 	end
@@ -105,7 +98,7 @@ PowerPlant_EventScript_Electrode2::
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
-	setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
+	setwildbattle SPECIES_ELECTRODE, 34
 	waitse
 	playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
 	delay 40
@@ -115,12 +108,9 @@ PowerPlant_EventScript_Electrode2::
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special QuestLog_CutRecording
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_WON
+	goto_if_eq VAR_RESULT, B_OUTCOME_WON, PowerPlant_EventScript_FoughtElectrode2
-	goto_if_eq PowerPlant_EventScript_FoughtElectrode2
+	goto_if_eq VAR_RESULT, B_OUTCOME_RAN, PowerPlant_EventScript_FoughtElectrode2
-	compare VAR_RESULT, B_OUTCOME_RAN
+	goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, PowerPlant_EventScript_FoughtElectrode2
-	goto_if_eq PowerPlant_EventScript_FoughtElectrode2
-	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq PowerPlant_EventScript_FoughtElectrode2
 	setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
 	release
 	end

data/maps/RocketHideout_B4F/scripts.inc

@@ -12,8 +12,7 @@ RocketHideout_B4F_OnLoad::
 	setvar NUM_DOOR_GRUNTS_DEFEATED, 0
 	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
 	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
-	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_ne NUM_DOOR_GRUNTS_DEFEATED, 2, RocketHideout_B4F_EventScript_SetBarrier
-	call_if_ne RocketHideout_B4F_EventScript_SetBarrier
 	end
 
 RocketHideout_B4F_EventScript_CountGruntDefeated::
@@ -46,8 +45,7 @@ RocketHideout_B4F_EventScript_SilphScope::
 	faceplayer
 	removeobject LOCALID_SILPH_SCOPE
 	giveitem ITEM_SILPH_SCOPE
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, EventScript_BagIsFull
-	goto_if_eq EventScript_BagIsFull
 	release
 	end
 
@@ -70,8 +68,7 @@ RocketHideout_B4F_EventScript_LiftKey::
 	setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT
 	removeobject LOCALID_LIFT_KEY
 	giveitem ITEM_LIFT_KEY
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, EventScript_BagIsFull
-	goto_if_eq EventScript_BagIsFull
 	release
 	end
 
@@ -84,10 +81,8 @@ RocketHideout_B4F_EventScript_DefeatedGrunt2::
 	setvar NUM_DOOR_GRUNTS_DEFEATED, 0
 	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
 	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
-	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_eq NUM_DOOR_GRUNTS_DEFEATED, 2, RocketHideout_B4F_EventScript_RemoveBarrier
-	call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier
+	call_if_eq NUM_DOOR_GRUNTS_DEFEATED, 2, RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval
-	compare NUM_DOOR_GRUNTS_DEFEATED, 2
-	call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval
 	release
 	end
 
@@ -100,10 +95,8 @@ RocketHideout_B4F_EventScript_DefeatedGrunt3::
 	setvar NUM_DOOR_GRUNTS_DEFEATED, 0
 	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
 	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
-	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_eq NUM_DOOR_GRUNTS_DEFEATED, 2, RocketHideout_B4F_EventScript_RemoveBarrier
-	call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier
+	call_if_eq NUM_DOOR_GRUNTS_DEFEATED, 2, RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval
-	compare NUM_DOOR_GRUNTS_DEFEATED, 2
-	call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval
 	release
 	end
 

data/maps/RocketHideout_Elevator/scripts.inc

@@ -45,8 +45,7 @@ RocketHideout_Elevator_EventScript_ChooseFloor::
 RocketHideout_Elevator_EventScript_ToB1F::
 	setvar VAR_0x8006, 3
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25
-	compare VAR_ELEVATOR_FLOOR, 3
+	goto_if_eq VAR_ELEVATOR_FLOOR, 3, RocketHideout_Elevator_EventScript_ExitFloorSelect
-	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
 	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 3
 	goto RocketHideout_Elevator_EventScript_ExitFloorSelect
@@ -55,8 +54,7 @@ RocketHideout_Elevator_EventScript_ToB1F::
 RocketHideout_Elevator_EventScript_ToB2F::
 	setvar VAR_0x8006, 2
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16
-	compare VAR_ELEVATOR_FLOOR, 2
+	goto_if_eq VAR_ELEVATOR_FLOOR, 2, RocketHideout_Elevator_EventScript_ExitFloorSelect
-	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
 	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 2
 	goto RocketHideout_Elevator_EventScript_ExitFloorSelect
@@ -65,8 +63,7 @@ RocketHideout_Elevator_EventScript_ToB2F::
 RocketHideout_Elevator_EventScript_ToB4F::
 	setvar VAR_0x8006, 0
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23
-	compare VAR_ELEVATOR_FLOOR, 0
+	goto_if_eq VAR_ELEVATOR_FLOOR, 0, RocketHideout_Elevator_EventScript_ExitFloorSelect
-	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
 	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 0
 	goto RocketHideout_Elevator_EventScript_ExitFloorSelect

data/maps/Route1/scripts.inc

@@ -6,11 +6,10 @@ Route1_EventScript_MartClerk::
 	faceplayer
 	goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, Route1_EventScript_AlreadyGotPotion
 	msgbox Route1_Text_WorkAtPokeMartTakeSample
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
-	checkitemspace ITEM_POTION, 1
+	checkitemspace ITEM_POTION
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, EventScript_BagIsFull
-	goto_if_eq EventScript_BagIsFull
+	bufferitemname STR_VAR_2, ITEM_POTION
-	getitemname 1, ITEM_POTION
 	playfanfare MUS_LEVEL_UP
 	message Text_ObtainedTheX
 	waitmessage

data/maps/Route10_PokemonCenter_1F/scripts.inc

@@ -35,18 +35,15 @@ Route10_PokemonCenter_1F_EventScript_Aide::
 	call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
 	goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone
 	msgbox Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Aide_EventScript_DeclineCheckMons
-	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, GetPokedexCount
-	getnumberstring 2, VAR_0x8006
+	buffernumberstring STR_VAR_3, VAR_0x8006
 	call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
-	compare VAR_0x8006, REQUIRED_OWNED_MONS
+	goto_if_lt VAR_0x8006, REQUIRED_OWNED_MONS, Aide_EventScript_HaventCaughtEnough
-	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox Route10_PokemonCenter_1F_Text_GreatHereYouGo
-	checkitemspace ITEM_EVERSTONE, 1
+	checkitemspace ITEM_EVERSTONE
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, Aide_EventScript_NoRoomForItem
-	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide, ITEM_EVERSTONE
 	setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
 	msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone
@@ -59,6 +56,6 @@ Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone::
 	end
 
 Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo::
-	getnumberstring 0, REQUIRED_OWNED_MONS
+	buffernumberstring STR_VAR_1, REQUIRED_OWNED_MONS
-	getitemname 1, ITEM_EVERSTONE
+	bufferitemname STR_VAR_2, ITEM_EVERSTONE
 	return

data/maps/Route11_EastEntrance_2F/scripts.inc

@@ -26,14 +26,11 @@ Route11_EastEntrance_2F_EventScript_Turner::
 	call EventScript_GetInGameTradeSpeciesInfo
 	goto_if_set FLAG_DID_NINA_TRADE, Route11_EastEntrance_2F_EventScript_AlreadyTraded
 	msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Route11_EastEntrance_2F_EventScript_DeclineTrade
-	goto_if_eq Route11_EastEntrance_2F_EventScript_DeclineTrade
 	call EventScript_ChooseMonForInGameTrade
-	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge VAR_0x8004, PARTY_SIZE, Route11_EastEntrance_2F_EventScript_DeclineTrade
-	goto_if_ge Route11_EastEntrance_2F_EventScript_DeclineTrade
 	call EventScript_GetInGameTradeSpecies
-	compare VAR_RESULT, VAR_0x8009
+	goto_if_ne VAR_RESULT, VAR_0x8009, Route11_EastEntrance_2F_EventScript_NotRequestedMon
-	goto_if_ne Route11_EastEntrance_2F_EventScript_NotRequestedMon
 	call EventScript_DoInGameTrade
 	msgbox Trade_Text_HeyThanks
 	setflag FLAG_DID_NINA_TRADE
@@ -46,7 +43,7 @@ Route11_EastEntrance_2F_EventScript_DeclineTrade::
 	end
 
 Route11_EastEntrance_2F_EventScript_NotRequestedMon::
-	getspeciesname 0, VAR_0x8009
+	bufferspeciesname STR_VAR_1, VAR_0x8009
 	msgbox Trade_Text_WhatThatsNoMon
 	release
 	end
@@ -62,18 +59,15 @@ Route11_EastEntrance_2F_EventScript_Aide::
 	call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo
 	goto_if_set FLAG_GOT_ITEMFINDER, Route11_EastEntrance_2F_EventScript_AlreadyGotItemfinder
 	msgbox Route11_EastEntrance_2F_Text_GiveItemfinderIfCaught30, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Aide_EventScript_DeclineCheckMons
-	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, GetPokedexCount
-	getnumberstring 2, VAR_0x8006
+	buffernumberstring STR_VAR_3, VAR_0x8006
 	call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo
-	compare VAR_0x8006, REQUIRED_CAUGHT_MONS
+	goto_if_lt VAR_0x8006, REQUIRED_CAUGHT_MONS, Aide_EventScript_HaventCaughtEnough
-	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox Route11_EastEntrance_2F_Text_GreatHereYouGo
-	checkitemspace ITEM_ITEMFINDER, 1
+	checkitemspace ITEM_ITEMFINDER
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, Aide_EventScript_NoRoomForItem
-	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg Route11_EastEntrance_2F_Text_ReceivedItemfinderFromAide, ITEM_ITEMFINDER
 	setflag FLAG_GOT_ITEMFINDER
 	msgbox Route11_EastEntrance_2F_Text_ExplainItemfinder
@@ -86,6 +80,6 @@ Route11_EastEntrance_2F_EventScript_AlreadyGotItemfinder::
 	end
 
 Route11_EastEntrance_2F_EventScript_GetAideRequestInfo::
-	getnumberstring 0, REQUIRED_CAUGHT_MONS
+	buffernumberstring STR_VAR_1, REQUIRED_CAUGHT_MONS
-	getitemname 1, ITEM_ITEMFINDER
+	bufferitemname STR_VAR_2, ITEM_ITEMFINDER
 	return

data/maps/Route12/scripts.inc

@@ -17,10 +17,9 @@ Route12_EventScript_Snorlax::
 	goto_if_questlog EventScript_ReleaseEnd
 	special QuestLog_CutRecording
 	msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Route12_EventScript_DontUsePokeFlute
-	goto_if_eq Route12_EventScript_DontUsePokeFlute
 	call EventScript_AwakenSnorlax
-	setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
+	setwildbattle SPECIES_SNORLAX, 30
 	waitse
 	playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER
 	delay 40
@@ -31,12 +30,9 @@ Route12_EventScript_Snorlax::
 	dowildbattle
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_WON
+	goto_if_eq VAR_RESULT, B_OUTCOME_WON, Route12_EventScript_FoughtSnorlax
-	goto_if_eq Route12_EventScript_FoughtSnorlax
+	goto_if_eq VAR_RESULT, B_OUTCOME_RAN, Route12_EventScript_FoughtSnorlax
-	compare VAR_RESULT, B_OUTCOME_RAN
+	goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, Route12_EventScript_FoughtSnorlax
-	goto_if_eq Route12_EventScript_FoughtSnorlax
-	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq Route12_EventScript_FoughtSnorlax
 	release
 	end
 

data/maps/Route12_FishingHouse/scripts.inc

@@ -6,16 +6,14 @@ Route12_FishingHouse_EventScript_FishingGuruBrother::
 	faceplayer
 	goto_if_set FLAG_GOT_SUPER_ROD, Route12_FishingHouse_EventScript_CheckMagikarpRecord
 	msgbox Route12_FishingHouse_Text_DoYouLikeToFish, MSGBOX_YESNO
-	compare VAR_RESULT, YES
+	goto_if_eq VAR_RESULT, YES, Route12_FishingHouse_EventScript_GiveSuperRod
-	goto_if_eq Route12_FishingHouse_EventScript_GiveSuperRod
 	msgbox Route12_FishingHouse_Text_OhThatsDisappointing
 	release
 	end
 
 Route12_FishingHouse_EventScript_GiveSuperRod::
-	checkitemspace ITEM_SUPER_ROD, 1
+	checkitemspace ITEM_SUPER_ROD
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, Route12_FishingHouse_EventScript_NoRoomForSuperRod
-	goto_if_eq Route12_FishingHouse_EventScript_NoRoomForSuperRod
 	additem ITEM_SUPER_ROD
 	msgbox Route12_FishingHouse_Text_TakeThisAndFish
 	msgreceiveditem Route12_FishingHouse_Text_ReceivedSuperRod, ITEM_SUPER_ROD
@@ -34,24 +32,18 @@ Route12_FishingHouse_EventScript_CheckMagikarpRecord::
 	special QuestLog_CutRecording
 	setvar VAR_0x8004, SPECIES_MAGIKARP
 	specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, Route12_FishingHouse_EventScript_NoMagikarpInParty
-	goto_if_eq Route12_FishingHouse_EventScript_NoMagikarpInParty
 	special GetMagikarpSizeRecordInfo
 	msgbox Route12_FishingHouse_Text_OhMagikarpAllowMeToSee
 	special ChoosePartyMon
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
-	compare VAR_RESULT, PARTY_SIZE
+	goto_if_ge VAR_RESULT, PARTY_SIZE, Route12_FishingHouse_EventScript_CancelShowMon
-	goto_if_ge Route12_FishingHouse_EventScript_CancelShowMon
 	special CompareMagikarpSize
-	compare VAR_RESULT, 1
+	goto_if_eq VAR_RESULT, 1, Route12_FishingHouse_EventScript_NotMagikarp
-	goto_if_eq Route12_FishingHouse_EventScript_NotMagikarp
+	goto_if_eq VAR_RESULT, 2, Route12_FishingHouse_EventScript_NotRecordMagikarp
-	compare VAR_RESULT, 2
+	goto_if_eq VAR_RESULT, 3, Route12_FishingHouse_EventScript_NewRecordMagikarp
-	goto_if_eq Route12_FishingHouse_EventScript_NotRecordMagikarp
+	goto_if_eq VAR_RESULT, 4, Route12_FishingHouse_EventScript_TieRecordMagikarp
-	compare VAR_RESULT, 3
-	goto_if_eq Route12_FishingHouse_EventScript_NewRecordMagikarp
-	compare VAR_RESULT, 4
-	goto_if_eq Route12_FishingHouse_EventScript_TieRecordMagikarp
 	release
 	end
 
@@ -85,8 +77,7 @@ Route12_FishingHouse_EventScript_NewRecordMagikarp::
 	setflag FLAG_GOT_RECORD_SETTING_MAGIKARP
 	msgbox Route12_FishingHouse_Text_WhoaXInchesTakeThis
 	giveitem ITEM_NET_BALL
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, Route12_FishingHouse_EventScript_NoRoomForNetBall
-	goto_if_eq Route12_FishingHouse_EventScript_NoRoomForNetBall
 	msgbox Route12_FishingHouse_Text_LookForwardToGreaterRecords
 	release
 	end

data/maps/Route12_NorthEntrance_2F/scripts.inc

@@ -14,13 +14,10 @@ Route12_NorthEntrance_2F_EventScript_Lass::
 	faceplayer
 	goto_if_set FLAG_GOT_TM27, Route12_NorthEntrance_2F_EventScript_ExplainTM27
 	checkplayergender
-	compare VAR_RESULT, MALE
+	call_if_eq VAR_RESULT, MALE, Route12_NorthEntrance_2F_EventScript_TakeTMMale
-	call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMMale
+	call_if_eq VAR_RESULT, FEMALE, Route12_NorthEntrance_2F_EventScript_TakeTMFemale
-	compare VAR_RESULT, FEMALE
+	checkitemspace ITEM_TM27
-	call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMFemale
+	goto_if_eq VAR_RESULT, FALSE, Route12_NorthEntrance_2F_EventScript_NoRoomForTM27
-	checkitemspace ITEM_TM27, 1
-	compare VAR_RESULT, FALSE
-	goto_if_eq Route12_NorthEntrance_2F_EventScript_NoRoomForTM27
 	giveitem_msg Route12_NorthEntrance_2F_Text_ReceivedTM27FromLittleGirl, ITEM_TM27
 	msgbox Route12_NorthEntrance_2F_Text_ExplainTM27
 	setflag FLAG_GOT_TM27

data/maps/Route15_WestEntrance_2F/scripts.inc

@@ -6,10 +6,10 @@ Route15_WestEntrance_2F_MapScripts::
 Route15_WestEntrance_2F_EventScript_LeftBinoculars::
 	lockall
 	msgbox Route15_WestEntrance_2F_Text_LargeShiningBird
-	drawmonpic SPECIES_ARTICUNO, 10, 3
+	showmonpic SPECIES_ARTICUNO, 10, 3
 	delay 20
 	waitbuttonpress
-	erasemonpic
+	hidemonpic
 	setvar VAR_0x8004, SPECIES_ARTICUNO
 	special SetSeenMon
 	releaseall
@@ -25,18 +25,15 @@ Route15_WestEntrance_2F_EventScript_Aide::
 	call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo
 	goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare
 	msgbox Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Aide_EventScript_DeclineCheckMons
-	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, GetPokedexCount
-	getnumberstring 2, VAR_0x8006
+	buffernumberstring STR_VAR_3, VAR_0x8006
 	call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo
-	compare VAR_0x8006, REQUIRED_CAUGHT_MONS
+	goto_if_lt VAR_0x8006, REQUIRED_CAUGHT_MONS, Aide_EventScript_HaventCaughtEnough
-	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox Route15_WestEntrance_2F_Text_GreatHereYouGo
-	checkitemspace ITEM_EXP_SHARE, 1
+	checkitemspace ITEM_EXP_SHARE
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, Aide_EventScript_NoRoomForItem
-	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg Route15_WestEntrance_2F_Text_ReceivedItemFromAide, ITEM_EXP_SHARE
 	setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE
 	msgbox Route15_WestEntrance_2F_Text_ExplainExpShare
@@ -49,6 +46,6 @@ Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare::
 	end
 
 Route15_WestEntrance_2F_EventScript_GetAideRequestInfo::
-	getnumberstring 0, REQUIRED_CAUGHT_MONS
+	buffernumberstring STR_VAR_1, REQUIRED_CAUGHT_MONS
-	getitemname 1, ITEM_EXP_SHARE
+	bufferitemname STR_VAR_2, ITEM_EXP_SHARE
 	return

data/maps/Route16/scripts.inc

@@ -13,8 +13,7 @@ Route16_EventScript_RemoveSnorlax::
 	return
 
 Route16_OnTransition::
-	compare VAR_MAP_SCENE_ROUTE16, 1
+	call_if_eq VAR_MAP_SCENE_ROUTE16, 1, Route16_OnTransitionCyclingRoad
-	call_if_eq Route16_OnTransitionCyclingRoad
 	end
 
 Route16_OnTransitionCyclingRoad::
@@ -36,10 +35,9 @@ Route16_EventScript_Snorlax::
 	goto_if_questlog EventScript_ReleaseEnd
 	special QuestLog_CutRecording
 	msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Route16_EventScript_DontUsePokeFlute
-	goto_if_eq Route16_EventScript_DontUsePokeFlute
 	call EventScript_AwakenSnorlax
-	setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
+	setwildbattle SPECIES_SNORLAX, 30
 	waitse
 	playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER
 	delay 40
@@ -49,12 +47,9 @@ Route16_EventScript_Snorlax::
 	dowildbattle
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, B_OUTCOME_WON
+	goto_if_eq VAR_RESULT, B_OUTCOME_WON, Route16_EventScript_FoughtSnorlax
-	goto_if_eq Route16_EventScript_FoughtSnorlax
+	goto_if_eq VAR_RESULT, B_OUTCOME_RAN, Route16_EventScript_FoughtSnorlax
-	compare VAR_RESULT, B_OUTCOME_RAN
+	goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, Route16_EventScript_FoughtSnorlax
-	goto_if_eq Route16_EventScript_FoughtSnorlax
-	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq Route16_EventScript_FoughtSnorlax
 	release
 	end
 

data/maps/Route16_House/scripts.inc

@@ -6,9 +6,8 @@ Route16_House_EventScript_Woman::
 	faceplayer
 	goto_if_set FLAG_GOT_HM02, Route16_House_EventScript_AlreadyGotHM02
 	msgbox Route16_House_Text_FoundMySecretRetreat
-	checkitemspace ITEM_HM02, 1
+	checkitemspace ITEM_HM02
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, Route16_House_EventScript_NoRoomForHM02
-	goto_if_eq Route16_House_EventScript_NoRoomForHM02
 	giveitem_msg Route16_House_Text_ReceivedHM02FromGirl, ITEM_HM02
 	msgbox Route16_House_Text_ExplainHM02
 	setflag FLAG_GOT_HM02

data/maps/Route16_NorthEntrance_1F/scripts.inc

@@ -46,20 +46,16 @@ Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom::
 	end
 
 Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
-	compare VAR_0x8008, 1
+	call_if_eq VAR_0x8008, 1, Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop
-	call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop
+	call_if_eq VAR_0x8008, 2, Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid
-	compare VAR_0x8008, 2
+	call_if_eq VAR_0x8008, 3, Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom
-	call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid
+	call_if_eq VAR_0x8008, 4, Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom
-	compare VAR_0x8008, 3
-	call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom
-	compare VAR_0x8008, 4
-	call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom
 	msgbox Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkRight

data/maps/Route16_NorthEntrance_2F/scripts.inc

@@ -25,18 +25,15 @@ Route16_NorthEntrance_2F_EventScript_Aide::
 	call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo
 	goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin
 	msgbox Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Aide_EventScript_DeclineCheckMons
-	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, GetPokedexCount
-	getnumberstring 2, VAR_0x8006
+	buffernumberstring STR_VAR_3, VAR_0x8006
 	call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo
-	compare VAR_0x8006, REQUIRED_CAUGHT_MONS
+	goto_if_lt VAR_0x8006, REQUIRED_CAUGHT_MONS, Aide_EventScript_HaventCaughtEnough
-	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox Route16_NorthEntrance_2F_Text_GreatHereYouGo
-	checkitemspace ITEM_AMULET_COIN, 1
+	checkitemspace ITEM_AMULET_COIN
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, Aide_EventScript_NoRoomForItem
-	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide, ITEM_AMULET_COIN
 	setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE
 	msgbox Route16_NorthEntrance_2F_Text_ExplainAmuletCoin
@@ -49,6 +46,6 @@ Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin::
 	end
 
 Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo::
-	getnumberstring 0, REQUIRED_CAUGHT_MONS
+	buffernumberstring STR_VAR_1, REQUIRED_CAUGHT_MONS
-	getitemname 1, ITEM_AMULET_COIN
+	bufferitemname STR_VAR_2, ITEM_AMULET_COIN
 	return

data/maps/Route18/scripts.inc

@@ -4,8 +4,7 @@ Route18_MapScripts::
 	.byte 0
 
 Route18_OnTransition::
-	compare VAR_MAP_SCENE_ROUTE16, 1
+	call_if_eq VAR_MAP_SCENE_ROUTE16, 1, Route18_OnTransitionCyclingRoad
-	call_if_eq Route18_OnTransitionCyclingRoad
 	end
 
 Route18_OnTransitionCyclingRoad::

data/maps/Route18_EastEntrance_1F/scripts.inc

@@ -46,20 +46,16 @@ Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom::
 	end
 
 Route18_EastEntrance_1F_EventScript_NeedBikeTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox Route18_EastEntrance_1F_Text_ExcuseMe
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
-	compare VAR_0x8008, 1
+	call_if_eq VAR_0x8008, 1, Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop
-	call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop
+	call_if_eq VAR_0x8008, 2, Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid
-	compare VAR_0x8008, 2
+	call_if_eq VAR_0x8008, 3, Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom
-	call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid
+	call_if_eq VAR_0x8008, 4, Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom
-	compare VAR_0x8008, 3
-	call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom
-	compare VAR_0x8008, 4
-	call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom
 	msgbox Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkRight

data/maps/Route18_EastEntrance_2F/scripts.inc

@@ -16,14 +16,11 @@ Route18_EastEntrance_2F_EventScript_Haden::
 	call EventScript_GetInGameTradeSpeciesInfo
 	goto_if_set FLAG_DID_MARC_TRADE, Route18_EastEntrance_2F_EventScript_AlreadyTraded
 	msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Route18_EastEntrance_2F_EventScript_DeclineTrade
-	goto_if_eq Route18_EastEntrance_2F_EventScript_DeclineTrade
 	call EventScript_ChooseMonForInGameTrade
-	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge VAR_0x8004, PARTY_SIZE, Route18_EastEntrance_2F_EventScript_DeclineTrade
-	goto_if_ge Route18_EastEntrance_2F_EventScript_DeclineTrade
 	call EventScript_GetInGameTradeSpecies
-	compare VAR_RESULT, VAR_0x8009
+	goto_if_ne VAR_RESULT, VAR_0x8009, Route18_EastEntrance_2F_EventScript_NotRequestedMon
-	goto_if_ne Route18_EastEntrance_2F_EventScript_NotRequestedMon
 	call EventScript_DoInGameTrade
 	msgbox Trade_Text_HeyThanks
 	setflag FLAG_DID_MARC_TRADE
@@ -36,7 +33,7 @@ Route18_EastEntrance_2F_EventScript_DeclineTrade::
 	end
 
 Route18_EastEntrance_2F_EventScript_NotRequestedMon::
-	getspeciesname 0, VAR_0x8009
+	bufferspeciesname STR_VAR_1, VAR_0x8009
 	msgbox Trade_Text_WhatThatsNoMon
 	release
 	end

data/maps/Route22/scripts.inc

@@ -24,33 +24,24 @@ Route22_EventScript_EarlyRivalTriggerBottom::
 	end
 
 Route22_EventScript_EarlyRival::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	playbgm MUS_ENCOUNTER_RIVAL, 0
 	addobject LOCALID_RIVAL
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, Route22_EventScript_EarlyRivalApproach
-	call_if_eq Route22_EventScript_EarlyRivalApproach
+	call_if_eq VAR_TEMP_1, 1, Route22_EventScript_EarlyRivalApproach
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 2, Route22_EventScript_EarlyRivalApproachBottom
-	call_if_eq Route22_EventScript_EarlyRivalApproach
-	compare VAR_TEMP_1, 2
-	call_if_eq Route22_EventScript_EarlyRivalApproachBottom
 	delay 6
 	msgbox Route22_Text_EarlyRivalIntro
-	compare VAR_STARTER_MON, 2
+	call_if_eq VAR_STARTER_MON, 2, Route22_EventScript_EarlyRivalSquirtle
-	call_if_eq Route22_EventScript_EarlyRivalSquirtle
+	call_if_eq VAR_STARTER_MON, 1, Route22_EventScript_EarlyRivalBulbasaur
-	compare VAR_STARTER_MON, 1
+	call_if_eq VAR_STARTER_MON, 0, Route22_EventScript_EarlyRivalCharmander
-	call_if_eq Route22_EventScript_EarlyRivalBulbasaur
-	compare VAR_STARTER_MON, 0
-	call_if_eq Route22_EventScript_EarlyRivalCharmander
 	msgbox Route22_Text_EarlyRivalPostBattle
 	closemessage
 	delay 10
 	playbgm MUS_RIVAL_EXIT, 0
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, Route22_EventScript_EarlyRivalExit
-	call_if_eq Route22_EventScript_EarlyRivalExit
+	call_if_eq VAR_TEMP_1, 1, Route22_EventScript_EarlyRivalExit
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 2, Route22_EventScript_EarlyRivalExitBottom
-	call_if_eq Route22_EventScript_EarlyRivalExit
-	compare VAR_TEMP_1, 2
-	call_if_eq Route22_EventScript_EarlyRivalExitBottom
 	fadedefaultbgm
 	removeobject LOCALID_RIVAL
 	setvar VAR_MAP_SCENE_ROUTE22, 2
@@ -184,23 +175,17 @@ Route22_EventScript_LateRivalTriggerBottom::
 	end
 
 Route22_EventScript_LateRival::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	playbgm MUS_ENCOUNTER_RIVAL, 0
 	addobject LOCALID_RIVAL
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, Route22_EventScript_LateRivalApproach
-	call_if_eq Route22_EventScript_LateRivalApproach
+	call_if_eq VAR_TEMP_1, 1, Route22_EventScript_LateRivalApproach
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 2, Route22_EventScript_LateRivalApproachBottom
-	call_if_eq Route22_EventScript_LateRivalApproach
-	compare VAR_TEMP_1, 2
-	call_if_eq Route22_EventScript_LateRivalApproachBottom
 	msgbox Route22_Text_LateRivalIntro
 	setvar VAR_LAST_TALKED, LOCALID_RIVAL
-	compare VAR_STARTER_MON, 2
+	call_if_eq VAR_STARTER_MON, 2, Route22_EventScript_LateRivalSquirtle
-	call_if_eq Route22_EventScript_LateRivalSquirtle
+	call_if_eq VAR_STARTER_MON, 1, Route22_EventScript_LateRivalBulbasaur
-	compare VAR_STARTER_MON, 1
+	call_if_eq VAR_STARTER_MON, 0, Route22_EventScript_LateRivalCharmander
-	call_if_eq Route22_EventScript_LateRivalBulbasaur
-	compare VAR_STARTER_MON, 0
-	call_if_eq Route22_EventScript_LateRivalCharmander
 	msgbox Route22_Text_LateRivalPostBattle
 	closemessage
 	delay 10

data/maps/Route22_NorthEntrance/scripts.inc

@@ -5,7 +5,7 @@ Route22_NorthEntrance_EventScript_BoulderBadgeGuard::
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 1
-	getstdstring 0, STDSTRING_BOULDER_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_BOULDER_BADGE
 	goto Route22_NorthEntrance_EventScript_BadgeGuard
 	end
 
@@ -13,6 +13,6 @@ Route22_NorthEntrance_EventScript_BoulderBadgeGuardTrigger::
 	lockall
 	setvar VAR_TEMP_1, 1
 	setvar VAR_0x8009, 1
-	getstdstring 0, STDSTRING_BOULDER_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_BOULDER_BADGE
 	goto Route23_EventScript_BadgeGuardTrigger
 	end

data/maps/Route23/scripts.inc

@@ -23,7 +23,7 @@ Route23_EventScript_CascadeBadgeGuard::
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 2
-	getstdstring 0, STDSTRING_CASCADE_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_CASCADE_BADGE
 	goto Route23_EventScript_BadgeGuard
 	end
 
@@ -31,7 +31,7 @@ Route23_EventScript_ThunderBadgeGuard::
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 3
-	getstdstring 0, STDSTRING_THUNDER_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_THUNDER_BADGE
 	goto Route23_EventScript_BadgeGuard
 	end
 
@@ -39,7 +39,7 @@ Route23_EventScript_RainbowBadgeGuard::
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 4
-	getstdstring 0, STDSTRING_RAINBOW_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_RAINBOW_BADGE
 	goto Route23_EventScript_BadgeGuard
 	end
 
@@ -47,7 +47,7 @@ Route23_EventScript_SoulBadgeGuard::
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 5
-	getstdstring 0, STDSTRING_SOUL_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_SOUL_BADGE
 	goto Route23_EventScript_BadgeGuard
 	end
 
@@ -55,7 +55,7 @@ Route23_EventScript_MarshBadgeGuard::
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 6
-	getstdstring 0, STDSTRING_MARSH_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_MARSH_BADGE
 	goto Route23_EventScript_BadgeGuard
 	end
 
@@ -63,7 +63,7 @@ Route23_EventScript_VolcanoBadgeGuard::
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 7
-	getstdstring 0, STDSTRING_VOLCANO_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_VOLCANO_BADGE
 	goto Route23_EventScript_BadgeGuard
 	end
 
@@ -71,7 +71,7 @@ Route23_EventScript_EarthBadgeGuard::
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 8
-	getstdstring 0, STDSTRING_EARTH_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_EARTH_BADGE
 	goto Route23_EventScript_BadgeGuard
 	end
 
@@ -79,7 +79,7 @@ Route23_EventScript_CascadeBadgeGuardTrigger::
 	lockall
 	setvar VAR_TEMP_1, 2
 	setvar VAR_0x8009, LOCALID_CASCADE_BADGE_GUARD
-	getstdstring 0, STDSTRING_CASCADE_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_CASCADE_BADGE
 	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
@@ -87,7 +87,7 @@ Route23_EventScript_ThunderBadgeGuardTrigger::
 	lockall
 	setvar VAR_TEMP_1, 3
 	setvar VAR_0x8009, LOCALID_THUNDER_BADGE_GUARD
-	getstdstring 0, STDSTRING_THUNDER_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_THUNDER_BADGE
 	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
@@ -95,7 +95,7 @@ Route23_EventScript_RainbowBadgeGuardTrigger::
 	lockall
 	setvar VAR_TEMP_1, 4
 	setvar VAR_0x8009, LOCALID_RAINBOW_BADGE_GUARD
-	getstdstring 0, STDSTRING_RAINBOW_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_RAINBOW_BADGE
 	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
@@ -103,7 +103,7 @@ Route23_EventScript_SoulBadgeGuardTrigger::
 	lockall
 	setvar VAR_TEMP_1, 5
 	setvar VAR_0x8009, LOCALID_SOUL_BADGE_GUARD
-	getstdstring 0, STDSTRING_SOUL_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_SOUL_BADGE
 	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
@@ -111,7 +111,7 @@ Route23_EventScript_MarshBadgeGuardTrigger::
 	lockall
 	setvar VAR_TEMP_1, 6
 	setvar VAR_0x8009, LOCALID_MARSH_BADGE_GUARD
-	getstdstring 0, STDSTRING_MARSH_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_MARSH_BADGE
 	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
@@ -119,7 +119,7 @@ Route23_EventScript_VolcanoBadgeGuardTrigger::
 	lockall
 	setvar VAR_TEMP_1, 7
 	setvar VAR_0x8009, LOCALID_VOLCANO_BADGE_GUARD
-	getstdstring 0, STDSTRING_VOLCANO_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_VOLCANO_BADGE
 	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
@@ -127,7 +127,7 @@ Route23_EventScript_EarthBadgeGuardTrigger::
 	lockall
 	setvar VAR_TEMP_1, 8
 	setvar VAR_0x8009, LOCALID_EARTH_BADGE_GUARD
-	getstdstring 0, STDSTRING_EARTH_BADGE
+	bufferstdstring STR_VAR_1, STDSTRING_EARTH_BADGE
 	goto Route23_EventScript_BadgeGuardTrigger
 	end
 

data/maps/Route24/scripts.inc

@@ -6,12 +6,10 @@ Route24_MapScripts::
 Route24_EventScript_Rocket::
 	lock
 	faceplayer
-	compare VAR_MAP_SCENE_ROUTE24, 1
+	goto_if_eq VAR_MAP_SCENE_ROUTE24, 1, Route24_EventScript_RocketPostBattle
-	goto_if_eq Route24_EventScript_RocketPostBattle
 	msgbox Route24_Text_JustEarnedFabulousPrize
-	checkitemspace ITEM_NUGGET, 1
+	checkitemspace ITEM_NUGGET
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, Route24_EventScript_NoRoomForNugget
-	goto_if_eq Route24_EventScript_NoRoomForNugget
 	call Route24_EventScript_BattleRocket
 	release
 	end
@@ -39,17 +37,14 @@ Route24_EventScript_RocketTriggerRight::
 	end
 
 Route24_EventScript_RocketTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, Route24_EventScript_RocketApproachPlayer
-	call_if_eq Route24_EventScript_RocketApproachPlayer
+	call_if_eq VAR_TEMP_1, 1, Route24_EventScript_RocketMotionToPlayer
-	compare VAR_TEMP_1, 1
-	call_if_eq Route24_EventScript_RocketMotionToPlayer
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox Route24_Text_JustEarnedFabulousPrize
-	checkitemspace ITEM_NUGGET, 1
+	checkitemspace ITEM_NUGGET
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, Route24_EventScript_NoRoomForNuggetTrigger
-	goto_if_eq Route24_EventScript_NoRoomForNuggetTrigger
 	call Route24_EventScript_BattleRocket
 	releaseall
 	end
@@ -81,8 +76,7 @@ Route24_EventScript_NoRoomForNuggetTrigger::
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown
 	waitmovement 0
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, Route24_EventScript_RocketWalkBackToPos
-	call_if_eq Route24_EventScript_RocketWalkBackToPos
 	release
 	end
 

data/maps/Route25_SeaCottage/scripts.inc

@@ -29,10 +29,8 @@ Route25_SeaCottage_EventScript_Bill::
 	goto_if_set FLAG_GOT_SS_TICKET, Route25_SeaCottage_EventScript_BillGoToSSAnne
 	goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_BillGiveSSTicket
 	checkplayergender
-	compare VAR_RESULT, MALE
+	goto_if_eq VAR_RESULT, MALE, Route25_SeaCottage_EventScript_BillAskForHelpMale
-	goto_if_eq Route25_SeaCottage_EventScript_BillAskForHelpMale
+	goto_if_eq VAR_RESULT, FEMALE, Route25_SeaCottage_EventScript_BillAskForHelpFemale
-	compare VAR_RESULT, FEMALE
-	goto_if_eq Route25_SeaCottage_EventScript_BillAskForHelpFemale
 	end
 
 Route25_SeaCottage_EventScript_BillAskForHelpMale::
@@ -46,19 +44,14 @@ Route25_SeaCottage_EventScript_BillAskForHelpFemale::
 	end
 
 Route25_SeaCottage_EventScript_BillAskForHelp::
-	compare VAR_RESULT, NO
+	call_if_eq VAR_RESULT, NO, Route25_SeaCottage_EventScript_DeclineHelpBill
-	call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBill
 	msgbox Route25_SeaCottage_Text_RunCellSeparationOnPC
 	closemessage
 	delay 10
-	compare VAR_FACING, DIR_SOUTH
+	call_if_eq VAR_FACING, DIR_SOUTH, Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth
-	call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth
+	call_if_eq VAR_FACING, DIR_NORTH, Route25_SeaCottage_EventScript_BillWalkToTeleporter
-	compare VAR_FACING, DIR_NORTH
+	call_if_eq VAR_FACING, DIR_WEST, Route25_SeaCottage_EventScript_BillWalkToTeleporter
-	call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter
+	call_if_eq VAR_FACING, DIR_EAST, Route25_SeaCottage_EventScript_BillWalkToTeleporter
-	compare VAR_FACING, DIR_WEST
-	call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter
-	compare VAR_FACING, DIR_EAST
-	call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter
 	opendoor 10, 3
 	waitdooranim
 	applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillEnterTeleporter
@@ -74,10 +67,8 @@ Route25_SeaCottage_EventScript_BillAskForHelp::
 @ Just returns after message, execution continues as if player had said yes
 Route25_SeaCottage_EventScript_DeclineHelpBill::
 	checkplayergender
-	compare VAR_RESULT, MALE
+	call_if_eq VAR_RESULT, MALE, Route25_SeaCottage_EventScript_DeclineHelpBillMale
-	call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillMale
+	call_if_eq VAR_RESULT, FEMALE, Route25_SeaCottage_EventScript_DeclineHelpBillFemale
-	compare VAR_RESULT, FEMALE
-	call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillFemale
 	return
 
 Route25_SeaCottage_EventScript_DeclineHelpBillMale::
@@ -106,13 +97,10 @@ Route25_SeaCottage_EventScript_BillGoToSSAnne::
 Route25_SeaCottage_EventScript_BillGiveSSTicket::
 	famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
 	checkplayergender
-	compare VAR_RESULT, MALE
+	call_if_eq VAR_RESULT, MALE, Route25_SeaCottage_EventScript_BillThanksMale
-	call_if_eq Route25_SeaCottage_EventScript_BillThanksMale
+	call_if_eq VAR_RESULT, FEMALE, Route25_SeaCottage_EventScript_BillThanksFemale
-	compare VAR_RESULT, FEMALE
+	checkitemspace ITEM_SS_TICKET
-	call_if_eq Route25_SeaCottage_EventScript_BillThanksFemale
+	goto_if_eq VAR_RESULT, FALSE, Route25_SeaCottage_EventScript_NoRoomForSSTicket
-	checkitemspace ITEM_SS_TICKET, 1
-	compare VAR_RESULT, FALSE
-	goto_if_eq Route25_SeaCottage_EventScript_NoRoomForSSTicket
 	giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_OBTAIN_KEY_ITEM
 	setflag FLAG_GOT_SS_TICKET_DUP
 	setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET
@@ -258,36 +246,36 @@ Route25_SeaCottage_EventScript_BillsMonList::
 	end
 
 Route25_SeaCottage_EventScript_ViewEevee::
-	drawmonpic SPECIES_EEVEE, 10, 3
+	showmonpic SPECIES_EEVEE, 10, 3
 	waitbuttonpress
-	erasemonpic
+	hidemonpic
 	setvar VAR_0x8004, SPECIES_EEVEE
 	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 
 Route25_SeaCottage_EventScript_ViewFlareon::
-	drawmonpic SPECIES_FLAREON, 10, 3
+	showmonpic SPECIES_FLAREON, 10, 3
 	waitbuttonpress
-	erasemonpic
+	hidemonpic
 	setvar VAR_0x8004, SPECIES_FLAREON
 	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 
 Route25_SeaCottage_EventScript_ViewJolteon::
-	drawmonpic SPECIES_JOLTEON, 10, 3
+	showmonpic SPECIES_JOLTEON, 10, 3
 	waitbuttonpress
-	erasemonpic
+	hidemonpic
 	setvar VAR_0x8004, SPECIES_JOLTEON
 	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 
 Route25_SeaCottage_EventScript_ViewVaporeon::
-	drawmonpic SPECIES_VAPOREON, 10, 3
+	showmonpic SPECIES_VAPOREON, 10, 3
 	waitbuttonpress
-	erasemonpic
+	hidemonpic
 	setvar VAR_0x8004, SPECIES_VAPOREON
 	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList

data/maps/Route2_EastBuilding/scripts.inc

@@ -9,18 +9,15 @@ Route2_EastBuilding_EventScript_Aide::
 	call Route2_EastBuilding_EventScript_GetAideRequestInfo
 	goto_if_set FLAG_GOT_HM05, Route2_EastBuilding_EventScript_AlreadyGotHM05
 	msgbox Route2_EastBuilding_Text_GiveHM05IfSeen10Mons, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Aide_EventScript_DeclineCheckMons
-	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, GetPokedexCount
-	getnumberstring 2, VAR_0x8006
+	buffernumberstring STR_VAR_3, VAR_0x8006
 	call Route2_EastBuilding_EventScript_GetAideRequestInfo
-	compare VAR_0x8006, REQUIRED_SEEN_MONS
+	goto_if_lt VAR_0x8006, REQUIRED_SEEN_MONS, Aide_EventScript_HaventCaughtEnough
-	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox Route2_EastBuilding_Text_GreatHereYouGo
-	checkitemspace ITEM_HM05, 1
+	checkitemspace ITEM_HM05
-	compare VAR_RESULT, FALSE
+	goto_if_eq VAR_RESULT, FALSE, Aide_EventScript_NoRoomForItem
-	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg Route2_EastBuilding_Text_ReceivedHM05FromAide, ITEM_HM05
 	setflag FLAG_GOT_HM05
 	msgbox Route2_EastBuilding_Text_ExplainHM05
@@ -33,8 +30,8 @@ Route2_EastBuilding_EventScript_AlreadyGotHM05::
 	end
 
 Route2_EastBuilding_EventScript_GetAideRequestInfo::
-	getnumberstring 0, REQUIRED_SEEN_MONS
+	buffernumberstring STR_VAR_1, REQUIRED_SEEN_MONS
-	getitemname 1, ITEM_HM05
+	bufferitemname STR_VAR_2, ITEM_HM05
 	return
 
 Route2_EastBuilding_EventScript_Rocker::

data/maps/Route2_House/scripts.inc

@@ -12,14 +12,11 @@ Route2_House_EventScript_Reyley::
 	call EventScript_GetInGameTradeSpeciesInfo
 	goto_if_set FLAG_DID_MIMIEN_TRADE, Route2_House_EventScript_AlreadyTraded
 	msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Route2_House_EventScript_DeclineTrade
-	goto_if_eq Route2_House_EventScript_DeclineTrade
 	call EventScript_ChooseMonForInGameTrade
-	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge VAR_0x8004, PARTY_SIZE, Route2_House_EventScript_DeclineTrade
-	goto_if_ge Route2_House_EventScript_DeclineTrade
 	call EventScript_GetInGameTradeSpecies
-	compare VAR_RESULT, VAR_0x8009
+	goto_if_ne VAR_RESULT, VAR_0x8009, Route2_House_EventScript_NotRequestedMon
-	goto_if_ne Route2_House_EventScript_NotRequestedMon
 	call EventScript_DoInGameTrade
 	msgbox Trade_Text_HeyThanks
 	setflag FLAG_DID_MIMIEN_TRADE
@@ -32,7 +29,7 @@ Route2_House_EventScript_DeclineTrade::
 	end
 
 Route2_House_EventScript_NotRequestedMon::
-	getspeciesname 0, VAR_0x8009
+	bufferspeciesname STR_VAR_1, VAR_0x8009
 	msgbox Trade_Text_WhatThatsNoMon
 	release
 	end

data/maps/Route4_PokemonCenter_1F/scripts.inc

@@ -24,12 +24,10 @@ Route4_PokemonCenter_1F_EventScript_MagikarpSalesman::
 	lock
 	faceplayer
 	goto_if_set FLAG_BOUGHT_MAGIKARP, Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp
-	showmoneybox 0, 0, 0
+	showmoneybox 0, 0
 	checkplayergender
-	compare VAR_RESULT, MALE
+	goto_if_eq VAR_RESULT, MALE, Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale
-	goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale
+	goto_if_eq VAR_RESULT, FEMALE, Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale
-	compare VAR_RESULT, FEMALE
-	goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale
 	end
 
 Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale::
@@ -43,30 +41,24 @@ Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale::
 	end
 
 Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp::
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Route4_PokemonCenter_1F_EventScript_DeclineMagikarp
-	goto_if_eq Route4_PokemonCenter_1F_EventScript_DeclineMagikarp
+	checkmoney MAGIKARP_PRICE
-	checkmoney MAGIKARP_PRICE, 0
+	goto_if_eq VAR_RESULT, FALSE, Route4_PokemonCenter_1F_EventScript_NotEnoughMoney
-	compare VAR_RESULT, FALSE
+	textcolor NPC_TEXT_COLOR_NEUTRAL
-	goto_if_eq Route4_PokemonCenter_1F_EventScript_NotEnoughMoney
-	textcolor 3
 	setvar VAR_TEMP_1, SPECIES_MAGIKARP
-	givemon SPECIES_MAGIKARP, 5, ITEM_NONE
+	givemon SPECIES_MAGIKARP, 5
-	compare VAR_RESULT, 0
+	goto_if_eq VAR_RESULT, 0, Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty
-	goto_if_eq Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty
+	goto_if_eq VAR_RESULT, 1, Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC
-	compare VAR_RESULT, 1
+	goto_if_eq VAR_RESULT, 2, Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp
-	goto_if_eq Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC
-	compare VAR_RESULT, 2
-	goto_if_eq Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp
 	end
 
 Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty::
 	call Route4_PokemonCenter_1F_EventScript_PayForMagikarp
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp
-	goto_if_eq Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp
 	call EventScript_GetGiftMonPartySlot
 	fadescreen FADE_TO_BLACK
-	hidemoneybox 0, 0
+	hidemoneybox
 	special ChangePokemonNickname
 	waitstate
 	goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp
@@ -75,10 +67,9 @@ Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty::
 Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC::
 	call Route4_PokemonCenter_1F_EventScript_PayForMagikarp
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
+	goto_if_eq VAR_RESULT, NO, Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox
-	goto_if_eq Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox
 	fadescreen FADE_TO_BLACK
-	hidemoneybox 0, 0
+	hidemoneybox
 	special ChangeBoxPokemonNickname
 	waitstate
 	lock
@@ -97,7 +88,7 @@ Route4_PokemonCenter_1F_EventScript_TransferMagikarp::
 	end
 
 Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp::
-	hidemoneybox 0, 0
+	hidemoneybox
 	goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp
 	end
 
@@ -107,24 +98,24 @@ Route4_PokemonCenter_1F_EventScript_BoughtMagikarp::
 	end
 
 Route4_PokemonCenter_1F_EventScript_PayForMagikarp::
-	removemoney MAGIKARP_PRICE, 0
+	removemoney MAGIKARP_PRICE
-	updatemoneybox 0, 0, 0
+	updatemoneybox
 	playfanfare MUS_LEVEL_UP
 	message Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp
 	waitmessage
 	waitfanfare
-	getspeciesname 0, SPECIES_MAGIKARP
+	bufferspeciesname STR_VAR_1, SPECIES_MAGIKARP
 	return
 
 Route4_PokemonCenter_1F_EventScript_DeclineMagikarp::
 	msgbox Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou
-	hidemoneybox 0, 0
+	hidemoneybox
 	release
 	end
 
 Route4_PokemonCenter_1F_EventScript_NotEnoughMoney::
 	msgbox Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney
-	hidemoneybox 0, 0
+	hidemoneybox
 	release
 	end
 
@@ -134,9 +125,9 @@ Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp::
 	end
 
 Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon
-	hidemoneybox 0, 0
+	hidemoneybox
 	release
 	end
 

data/maps/Route5_SouthEntrance/scripts.inc

@@ -24,7 +24,7 @@ Route5_SouthEntrance_EventScript_GuardTriggerRight::
 	end
 
 Route5_SouthEntrance_EventScript_GuardTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea
@@ -36,19 +36,16 @@ Route5_SouthEntrance_EventScript_GuardTrigger::
 	end
 
 Route5_SouthEntrance_EventScript_GiveTea::
-	removeitem ITEM_TEA, 1
+	removeitem ITEM_TEA
 	goto Route5_SouthEntrance_EventScript_GuardDrinkTea
 	end
 
 Route5_SouthEntrance_EventScript_GuardDrinkTea::
 	msgbox Route5_SouthEntrance_Text_ThatTeaLooksTasty
 	closemessage
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, Route5_SouthEntrance_EventScript_WalkToGuardLeft
-	call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardLeft
+	call_if_eq VAR_TEMP_1, 1, Route5_SouthEntrance_EventScript_WalkToGuardMid
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 2, Route5_SouthEntrance_EventScript_WalkToGuardRight
-	call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardMid
-	compare VAR_TEMP_1, 2
-	call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardRight
 	msgbox Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards
 	setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
 	releaseall

data/maps/Route6_NorthEntrance/scripts.inc

@@ -24,7 +24,7 @@ Route6_NorthEntrance_EventScript_GuardTriggerRight::
 	end
 
 Route6_NorthEntrance_EventScript_GuardTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea
@@ -36,19 +36,16 @@ Route6_NorthEntrance_EventScript_GuardTrigger::
 	end
 
 Route6_NorthEntrance_EventScript_GiveTea::
-	removeitem ITEM_TEA, 1
+	removeitem ITEM_TEA
 	goto Route6_NorthEntrance_EventScript_GuardDrinkTea
 	end
 
 Route6_NorthEntrance_EventScript_GuardDrinkTea::
 	msgbox Route6_NorthEntrance_Text_ThatTeaLooksTasty
 	closemessage
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, Route6_NorthEntrance_EventScript_WalkToGuardLeft
-	call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardLeft
+	call_if_eq VAR_TEMP_1, 1, Route6_NorthEntrance_EventScript_WalkToGuardMid
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 2, Route6_NorthEntrance_EventScript_WalkToGuardRight
-	call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardMid
-	compare VAR_TEMP_1, 2
-	call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardRight
 	msgbox Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards
 	setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
 	releaseall

data/maps/Route7_EastEntrance/scripts.inc

@@ -24,7 +24,7 @@ Route7_EastEntrance_EventScript_GuardTriggerBottom::
 	end
 
 Route7_EastEntrance_EventScript_GuardTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea
@@ -36,19 +36,16 @@ Route7_EastEntrance_EventScript_GuardTrigger::
 	end
 
 Route7_EastEntrance_EventScript_GiveTea::
-	removeitem ITEM_TEA, 1
+	removeitem ITEM_TEA
 	goto Route7_EastEntrance_EventScript_GuardDrinkTea
 	end
 
 Route7_EastEntrance_EventScript_GuardDrinkTea::
 	msgbox Route7_EastEntrance_Text_ThatTeaLooksTasty
 	closemessage
-	compare VAR_TEMP_1, 0
+	call_if_eq VAR_TEMP_1, 0, Route7_EastEntrance_WalkToGuardTop
-	call_if_eq Route7_EastEntrance_WalkToGuardTop
+	call_if_eq VAR_TEMP_1, 1, Route7_EastEntrance_WalkToGuardMid
-	compare VAR_TEMP_1, 1
+	call_if_eq VAR_TEMP_1, 2, Route7_EastEntrance_WalkToGuardBottom
-	call_if_eq Route7_EastEntrance_WalkToGuardMid
-	compare VAR_TEMP_1, 2
-	call_if_eq Route7_EastEntrance_WalkToGuardBottom
 	msgbox Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards
 	setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
 	releaseall