Add npc text color constants

asm/macros/event.inc

@@ -1540,7 +1540,8 @@
 	.2byte \box
 	.endm
 
-	@ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text, 0xFF resets the color to the default for the current OW's gender, and all other values produce black text.
+	@ Sets the color of the text in standard message boxes. color is any NPC_TEXT_COLOR_* constant.
+	@ The color will be reset to NPC_TEXT_COLOR_DEFAULT whenever ProcessPlayerFieldInput is called.
 	.macro textcolor color:req
 	.byte 0xc7
 	.byte \color

data/event_scripts.s

@@ -1317,7 +1317,7 @@ EventScript_BrailleCursorWaitButton::
 	return
 
 EventScript_NoMoreRoomForPokemon::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox Text_NoMoreRoomForPokemon
 	release
 	end

data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc

@@ -41,10 +41,10 @@ CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink::
 	msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	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
@@ -148,7 +148,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink::
 	compare VAR_RESULT, FALSE
 	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

data/maps/CeladonCity_GameCorner/scripts.inc

@@ -134,7 +134,7 @@ CeladonCity_GameCorner_EventScript_Fisher::
 	compare VAR_TEMP_1, (MAX_COINS + 1) - 10
 	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 +148,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
@@ -195,7 +195,7 @@ CeladonCity_GameCorner_EventScript_Scientist::
 	compare VAR_TEMP_1, (MAX_COINS + 1) - 20
 	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
@@ -223,7 +223,7 @@ CeladonCity_GameCorner_EventScript_Gentleman::
 	compare VAR_TEMP_1, (MAX_COINS + 1) - 20
 	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

data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc

@@ -111,7 +111,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon::
 	checkcoins VAR_RESULT
 	compare VAR_RESULT, VAR_TEMP_2
 	goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	switch VAR_TEMP_1
 	case SPECIES_ABRA,     CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra
 	case SPECIES_CLEFAIRY, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy
@@ -185,7 +185,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon::
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox Text_NoMoreRoomForPokemon
 	hidecoinsbox 0, 0
 	release
@@ -200,7 +200,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
@@ -333,7 +333,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/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
@@ -203,7 +203,7 @@ CeruleanCity_EventScript_GruntDefeated::
 	end
 
 CeruleanCity_EventScript_NoRoomForTM28::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox CeruleanCity_Text_MakeRoomForThisCantRun
 	release
 	end
@@ -229,7 +229,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

data/maps/CinnabarIsland/scripts.inc

@@ -62,7 +62,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 +71,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 +94,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

data/maps/CinnabarIsland_Gym/scripts.inc

@@ -267,7 +267,7 @@ CinnabarIsland_Gym_EventScript_BattleQuinn::
 	call_if_eq CinnabarIsland_Gym_EventScript_QuinnApproachLeft
 	compare VAR_TEMP_1, 1
 	call_if_eq CinnabarIsland_Gym_EventScript_QuinnApproachRight
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	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
@@ -343,7 +343,7 @@ CinnabarIsland_Gym_EventScript_BattleAvery::
 	call_if_eq CinnabarIsland_Gym_EventScript_AveryApproachLeft
 	compare VAR_TEMP_1, 1
 	call_if_eq CinnabarIsland_Gym_EventScript_AveryApproachRight
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	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
@@ -428,7 +428,7 @@ CinnabarIsland_Gym_EventScript_BattleRamon::
 	call_if_eq CinnabarIsland_Gym_EventScript_RamonApproachLeft
 	compare VAR_TEMP_1, 1
 	call_if_eq CinnabarIsland_Gym_EventScript_RamonApproachRight
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	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
@@ -504,7 +504,7 @@ CinnabarIsland_Gym_EventScript_BattleDerek::
 	call_if_eq CinnabarIsland_Gym_EventScript_DerekApproachLeft
 	compare VAR_TEMP_1, 1
 	call_if_eq CinnabarIsland_Gym_EventScript_DerekApproachRight
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	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
@@ -580,7 +580,7 @@ CinnabarIsland_Gym_EventScript_BattleDusty::
 	call_if_eq CinnabarIsland_Gym_EventScript_DustyApproachLeft
 	compare VAR_TEMP_1, 1
 	call_if_eq CinnabarIsland_Gym_EventScript_DustyApproachRight
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	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
@@ -656,7 +656,7 @@ CinnabarIsland_Gym_EventScript_BattleZac::
 	call_if_eq CinnabarIsland_Gym_EventScript_ZacApproachLeft
 	compare VAR_TEMP_1, 1
 	call_if_eq CinnabarIsland_Gym_EventScript_ZacApproachRight
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	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_PokemonLab_ExperimentRoom/scripts.inc

@@ -154,7 +154,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil::
 	compare VAR_RESULT, NO
 	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
@@ -169,7 +169,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil::
 	compare VAR_RESULT, NO
 	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
@@ -184,7 +184,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber::
 	compare VAR_RESULT, NO
 	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
@@ -254,7 +254,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl::
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
 	waitmessage
@@ -269,7 +269,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty::
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
 	waitmessage

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

data/maps/FiveIsland_MemorialPillar/scripts.inc

@@ -62,7 +62,7 @@ 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

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

@@ -45,13 +45,13 @@ 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
@@ -101,9 +101,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_WaterLabyrinth/scripts.inc

@@ -33,7 +33,7 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg::
 	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

data/maps/FourIsland/scripts.inc

@@ -29,7 +29,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
@@ -110,7 +110,7 @@ FourIsland_EventScript_DaycareAcceptEgg::
 	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

@@ -18,11 +18,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 +32,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 +48,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 +67,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 +84,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

@@ -138,7 +138,7 @@ 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

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,7 +39,7 @@ 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 FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone
@@ -99,7 +99,7 @@ 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
@@ -119,7 +119,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone::
 	removemoney 500
 	updatemoneybox
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_ThatllBe500WeOnlyUseSpecialBalls
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls
 	waitfanfare

data/maps/FuchsiaCity_WardensHouse/scripts.inc

@@ -15,7 +15,7 @@ FuchsiaCity_WardensHouse_EventScript_Warden::
 	end
 
 FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_TMHM
 	message FuchsiaCity_WardensHouse_Text_GaveGoldTeethToWarden
 	waitmessage

data/maps/MtEmber_Exterior/scripts.inc

@@ -90,7 +90,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/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
@@ -68,7 +68,7 @@ MtMoon_B2F_EventScript_DomeFossil::
 	applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil
 	waitmovement 0
 	copyobjectxytoperm LOCALID_MIGUEL
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	message MtMoon_B2F_Text_ThenThisFossilIsMine
 	waitmessage
@@ -100,7 +100,7 @@ MtMoon_B2F_EventScript_HelixFossil::
 	applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil
 	waitmovement 0
 	copyobjectxytoperm LOCALID_MIGUEL
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	message MtMoon_B2F_Text_ThenThisFossilIsMine
 	waitmessage

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

data/maps/OneIsland_Harbor/scripts.inc

@@ -17,7 +17,7 @@ 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

data/maps/OneIsland_PokemonCenter_1F/scripts.inc

@@ -62,7 +62,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
@@ -136,7 +136,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
@@ -259,7 +259,7 @@ 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
@@ -305,7 +305,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
@@ -340,7 +340,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass::
 	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,7 +454,7 @@ 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

data/maps/PalletTown/scripts.inc

@@ -47,7 +47,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
@@ -187,7 +187,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
@@ -442,11 +442,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_ProfessorOaksLab/scripts.inc

@@ -65,7 +65,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
@@ -95,7 +95,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene::
 	call_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth
 	compare VAR_FACING, DIR_WEST
 	call_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits
 	closemessage
 	call EventScript_RestorePrevTextColor
@@ -123,7 +123,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene::
 	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast
 	compare VAR_FACING, DIR_WEST
 	call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	message PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded
 	waitmessage
@@ -227,7 +227,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 +282,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 +315,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
@@ -650,7 +650,7 @@ 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
@@ -716,7 +716,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
 	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
@@ -1170,7 +1170,7 @@ PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice::
 	applymovement LOCALID_PROF_OAK, Movement_FaceRight
 	waitmovement 0
 	showmonpic PLAYER_STARTER_SPECIES, 10, 3
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	compare PLAYER_STARTER_NUM, 0
 	goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur
 	compare PLAYER_STARTER_NUM, 1
@@ -1264,10 +1264,10 @@ 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
 	bufferspeciesname STR_VAR_1, RIVAL_STARTER_SPECIES
 	message PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak
 	waitmessage

data/maps/PewterCity/scripts.inc

@@ -284,7 +284,7 @@ PewterCity_EventScript_GymGuideTriggerRight::
 	end
 
 PewterCity_EventScript_GymGuideTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe
 	closemessage
 	playbgm MUS_FOLLOW_ME, 0
@@ -695,7 +695,7 @@ PewterCity_EventScript_RunningShoesAideTriggerBottom::
 	end
 
 PewterCity_EventScript_AideGiveRunningShoes::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	compare VAR_TEMP_1, 1
 	call_if_eq PewterCity_EventScript_AideNoticePlayer
 	compare VAR_TEMP_1, 2
@@ -718,7 +718,7 @@ PewterCity_EventScript_AideGiveRunningShoes::
 	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
@@ -740,7 +740,7 @@ PewterCity_EventScript_AideGiveRunningShoes::
 	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_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

@@ -64,7 +64,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerRight::
 	end
 
 PewterCity_Museum_1F_EventScript_EntranceTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	showmoneybox 0, 0
 	msgbox PewterCity_Museum_1F_Text_Its50YForChildsTicket, MSGBOX_YESNO
 	compare VAR_RESULT, YES

data/maps/PokemonLeague_ChampionsRoom/scripts.inc

@@ -51,7 +51,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

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/PokemonTower_2F/scripts.inc

@@ -20,7 +20,7 @@ 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 PokemonTower_2F_EventScript_RivalFacePlayerRight

data/maps/PokemonTower_6F/scripts.inc

@@ -3,7 +3,7 @@ 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

data/maps/Route1/scripts.inc

@@ -6,7 +6,7 @@ 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
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_BagIsFull

data/maps/Route16_NorthEntrance_1F/scripts.inc

@@ -46,7 +46,7 @@ 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

data/maps/Route18_EastEntrance_1F/scripts.inc

@@ -46,7 +46,7 @@ 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

data/maps/Route22/scripts.inc

@@ -24,7 +24,7 @@ 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
@@ -184,7 +184,7 @@ 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

data/maps/Route24/scripts.inc

@@ -39,7 +39,7 @@ Route24_EventScript_RocketTriggerRight::
 	end
 
 Route24_EventScript_RocketTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	compare VAR_TEMP_1, 0
 	call_if_eq Route24_EventScript_RocketApproachPlayer
 	compare VAR_TEMP_1, 1

data/maps/Route4_PokemonCenter_1F/scripts.inc

@@ -48,7 +48,7 @@ Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp::
 	checkmoney MAGIKARP_PRICE
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route4_PokemonCenter_1F_EventScript_NotEnoughMoney
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	setvar VAR_TEMP_1, SPECIES_MAGIKARP
 	givemon SPECIES_MAGIKARP, 5
 	compare VAR_RESULT, 0
@@ -134,7 +134,7 @@ 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
 	release

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

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

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

data/maps/Route8_WestEntrance/scripts.inc

@@ -24,7 +24,7 @@ Route8_WestEntrance_EventScript_GuardTriggerBottom::
 	end
 
 Route8_WestEntrance_EventScript_GuardTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea

data/maps/SSAnne_2F_Corridor/scripts.inc

@@ -22,7 +22,7 @@ SSAnne_2F_Corridor_EventScript_RivalTriggerRight::
 	end
 
 SSAnne_2F_Corridor_EventScript_RivalTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	playse SE_EXIT
 	delay 5
 	playbgm MUS_ENCOUNTER_RIVAL, 0

data/maps/SSAnne_CaptainsOffice/scripts.inc

@@ -7,7 +7,7 @@ SSAnne_CaptainsOffice_EventScript_Captain::
 	lock
 	goto_if_set FLAG_GOT_HM01, SSAnne_CaptainsOffice_EventScript_AlreadyGotCut
 	msgbox SSAnne_CaptainsOffice_Text_CaptainIFeelSeasick
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	message SSAnne_CaptainsOffice_Text_RubbedCaptainsBack
 	waitmessage
 	playfanfare MUS_HEAL

data/maps/SaffronCity/scripts.inc

@@ -51,7 +51,7 @@ SaffronCity_EventScript_DoorGuardGrunt::
 	end
 
 SaffronCity_EventScript_DoorGuardAsleep::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox SaffronCity_Text_HesTakingASnooze
 	release
 	end

data/maps/SaffronCity_Dojo/scripts.inc

@@ -27,7 +27,7 @@ SaffronCity_Dojo_EventScript_HitmonleeBall::
 	setvar VAR_TEMP_1, SPECIES_HITMONLEE
 	applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO
 	call EventScript_RestorePrevTextColor
 	compare VAR_RESULT, YES
@@ -49,7 +49,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall::
 	setvar VAR_TEMP_1, SPECIES_HITMONCHAN
 	applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO
 	call EventScript_RestorePrevTextColor
 	compare VAR_RESULT, YES

data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc

@@ -18,7 +18,7 @@ SaffronCity_PokemonTrainerFanClub_OnFrame::
 
 SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans::
 	lockall
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	applymovement LOCALID_BATTLE_GIRL, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN

data/maps/SevenIsland_House_Room1/scripts.inc

@@ -35,7 +35,7 @@ SevenIsland_House_Room1_OnFrame::
 
 SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle::
 	lockall
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerReEnterRoom
 	waitmovement 0
 	applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer

data/maps/SevenIsland_SevaultCanyon_House/scripts.inc

@@ -14,7 +14,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan::
 	applymovement LOCALID_BALDING_MAN, Movement_FacePlayer
 	waitmovement 0
 	msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox SevenIsland_SevaultCanyon_House_Text_WouldYouLikeToDance, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SevenIsland_SevaultCanyon_House_EventScript_DeclineDance
@@ -48,7 +48,7 @@ SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced::
 	end
 
 SevenIsland_SevaultCanyon_House_EventScript_DeclineDance::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox SevenIsland_SevaultCanyon_House_Text_ComeOnDance
 	release
 	end

data/maps/SilphCo_11F/scripts.inc

@@ -63,7 +63,7 @@ SilphCo_11F_EventScript_GiovanniTriggerRight::
 	end
 
 SilphCo_11F_EventScript_BattleGiovanni::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 25

data/maps/SilphCo_7F/scripts.inc

@@ -34,7 +34,7 @@ SilphCo_7F_EventScript_RivalTriggerBottom::
 	end
 
 SilphCo_7F_EventScript_RivalScene::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	playbgm MUS_ENCOUNTER_RIVAL, 0
 	applymovement LOCALID_RIVAL, Movement_ExclamationMark
 	waitmovement 0
@@ -140,7 +140,7 @@ SilphCo_7F_EventScript_LaprasGuy::
 	end
 
 SilphCo_7F_EventScript_ReceiveLaprasParty::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message SilphCo_7F_Text_ObtainedLaprasFromEmployee
 	waitmessage
@@ -155,7 +155,7 @@ SilphCo_7F_EventScript_ReceiveLaprasParty::
 	end
 
 SilphCo_7F_EventScript_ReceiveLaprasPC::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message SilphCo_7F_Text_ObtainedLaprasFromEmployee
 	waitmessage
@@ -174,7 +174,7 @@ SilphCo_7F_EventScript_LaprasTransferredToPC::
 	end
 
 SilphCo_7F_EventScript_EndReceiveLapras::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox SilphCo_7F_Text_ExplainLapras
 	setflag FLAG_GOT_LAPRAS_FROM_SILPH
 	release

data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc

@@ -7,7 +7,7 @@ SixIsland_DottedHole_SapphireRoom_MapScripts::
 SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire::
 	lock
 	faceplayer
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_KEY_ITEM
 	message SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire
 	waitmessage
@@ -41,7 +41,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire::
 	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast
 	compare VAR_FACING, DIR_WEST
 	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou
 	closemessage
 	compare VAR_FACING, DIR_NORTH

data/maps/SixIsland_PokemonCenter_1F/scripts.inc

@@ -22,7 +22,7 @@ SixIsland_PokemonCenter_1F_OnFrame::
 
 SixIsland_PokemonCenter_1F_EventScript_RivalScene::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playbgm MUS_ENCOUNTER_RIVAL, 0

data/maps/ThreeIsland/scripts.inc

@@ -161,7 +161,7 @@ ThreeIsland_EventScript_AntiBiker2BikersGone::
 
 ThreeIsland_EventScript_BikerBossIntroTrigger::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight
 	waitmovement 0
 	msgbox ThreeIsland_Text_AreYouBossGoBackToKanto
@@ -220,7 +220,7 @@ ThreeIsland_EventScript_BattleBikersTriggerRight::
 	end
 
 ThreeIsland_EventScript_BattleBikersScene::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_BIKER1, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN

data/maps/TrainerTower_Lobby/scripts.inc

@@ -81,7 +81,7 @@ TrainerTower_Lobby_EventScript_LostChallenge::
 	lock
 	faceplayer
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox TrainerTower_Lobby_Text_TooBadComeBackTryAgain
 	goto TrainerTower_Lobby_EventScript_ExitChallenge
 
@@ -90,7 +90,7 @@ TrainerTower_Lobby_EventScript_164938::
 	lock
 	faceplayer
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch
 TrainerTower_Lobby_EventScript_ExitChallenge::
 	closemessage
@@ -152,7 +152,7 @@ TrainerTower_Lobby_Mart_Items::
 TrainerTower_Lobby_EventScript_EntryTrigger::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox TrainerTower_Lobby_Text_WelcomeToTrainerTower
 	ttower_getnumfloors
 	compare VAR_RESULT, FALSE

data/maps/TwoIsland_House/scripts.inc

@@ -76,7 +76,7 @@ TwoIsland_House_EventScript_ChooseMoveToTeach::
 
 TwoIsland_House_EventScript_GiveBigMushroom::
 	removeitem ITEM_BIG_MUSHROOM
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox TwoIsland_House_Text_HandedOverOneBigMushroom
 	call EventScript_RestorePrevTextColor
 	goto TwoIsland_House_EventScript_EndTutorMove
@@ -84,7 +84,7 @@ TwoIsland_House_EventScript_GiveBigMushroom::
 
 TwoIsland_House_EventScript_GiveTinyMushrooms::
 	removeitem ITEM_TINY_MUSHROOM, 2
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox TwoIsland_House_Text_HandedOverTwoTinyMushrooms
 	call EventScript_RestorePrevTextColor
 	goto TwoIsland_House_EventScript_EndTutorMove

data/maps/TwoIsland_JoyfulGameCorner/scripts.inc

@@ -37,9 +37,9 @@ TwoIsland_JoyfulGameCorner_OnFrame::
 
 TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	special BufferBigGuyOrBigGirlString
 	msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy
 	closemessage
@@ -51,7 +51,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene::
 
 TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_DADDY, Movement_171520
 	waitmovement 0
 	msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo
@@ -157,7 +157,7 @@ TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite::
 	goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone
 	msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsForMe
 	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_OBTAIN_TMHM
 	message TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy
 	waitmessage

data/maps/VermilionCity/scripts.inc

@@ -199,7 +199,7 @@ VermilionCity_EventScript_ExitedTicketCheck::
 	end
 
 VermilionCity_EventScript_CheckTicket::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFastestLeft
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0

data/maps/ViridianCity/scripts.inc

@@ -46,7 +46,7 @@ ViridianCity_EventScript_TryUnlockGym::
 
 ViridianCity_EventScript_GymDoorLocked::
 	lockall
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
@@ -203,7 +203,7 @@ ViridianCity_EventScript_DreamEaterTutor::
 
 ViridianCity_EventScript_RoadBlocked::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox ViridianCity_Text_ThisIsPrivateProperty
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Movement_WalkDown
@@ -217,7 +217,7 @@ ViridianCity_Movement_WalkDown::
 
 ViridianCity_EventScript_TutorialTriggerLeft::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
@@ -228,7 +228,7 @@ ViridianCity_EventScript_TutorialTriggerLeft::
 
 ViridianCity_EventScript_TutorialTriggerRight::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft

data/maps/ViridianCity_Mart/scripts.inc

@@ -20,7 +20,7 @@ ViridianCity_Mart_OnFrame::
 
 ViridianCity_Mart_EventScript_ParcelScene::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement LOCALID_CLERK, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox ViridianCity_Mart_Text_YouCameFromPallet

data/maps/ViridianCity_School/scripts.inc

@@ -41,7 +41,7 @@ ViridianCity_School_EventScript_Notebook::
 	msgbox ViridianCity_School_Text_NotebookFourthPage
 	applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes
 	releaseall
 	end

data/scripts/bag_full.inc

@@ -1,5 +1,5 @@
 EventScript_BagIsFull::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox Text_TooBadBagFull
 	release
 	end

data/scripts/cable_club.inc

@@ -113,7 +113,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom::
 	special HelpSystem_Enable
 	special QuestLog_StartRecordingInputsAfterDeferredEvent
 	setvar VAR_CABLE_CLUB_STATE, 0
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	compare VAR_0x8007, 0
 	goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
 	applymovement VAR_0x8007, Movement_AttendantFaceLeft
@@ -139,7 +139,7 @@ CableClub_EventScript_PlayerExitTradeCenter::
 	special HelpSystem_Enable
 	special QuestLog_StartRecordingInputsAfterDeferredEvent
 	setvar VAR_CABLE_CLUB_STATE, 0
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	compare VAR_0x8007, 0
 	goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight
@@ -163,7 +163,7 @@ CableClub_EventScript_PlayerExitUnionRoom::
 	special HelpSystem_Enable
 	special QuestLog_StartRecordingInputsAfterDeferredEvent
 	setvar VAR_CABLE_CLUB_STATE, 0
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	compare VAR_0x8007, 0
 	goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight
@@ -192,7 +192,7 @@ CableClub_EventScript_PlayerExitLinkRoom::
 
 CableClub_EventScript_Tutorial::
 	lockall
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox CableClub_Text_FirstTimeRightThisWay
@@ -285,7 +285,7 @@ CableClub_EventScript_TryEnterColosseum::
 	message CableClub_Text_PleaseWaitBCancel
 	waitmessage
 	special HelpSystem_Disable
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special TryBattleLinkup
 	waitstate
 	call EventScript_RestorePrevTextColor
@@ -392,7 +392,7 @@ CableClub_EventScript_TradeCenter::
 	message CableClub_Text_PleaseWaitBCancel
 	waitmessage
 	special HelpSystem_Disable
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special TryTradeLinkup
 	waitstate
 	call EventScript_RestorePrevTextColor
@@ -608,14 +608,14 @@ CableClub_EventScript_ShowBattleRecords::
 
 BattleColosseum_2P_EventScript_PlayerSpot0::
 	setvar VAR_0x8005, 0
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special EnterColosseumPlayerSpot
 	waitstate
 	end
 
 BattleColosseum_2P_EventScript_PlayerSpot1::
 	setvar VAR_0x8005, 1
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special EnterColosseumPlayerSpot
 	waitstate
 	end
@@ -627,7 +627,7 @@ BattleColosseum_4P_EventScript_PlayerSpot0::
 	compare VAR_RESULT, 0
 	goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
 	setvar VAR_0x8005, 0
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special EnterColosseumPlayerSpot
 	waitstate
 	end
@@ -639,7 +639,7 @@ BattleColosseum_4P_EventScript_PlayerSpot1::
 	compare VAR_RESULT, 0
 	goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
 	setvar VAR_0x8005, 1
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special EnterColosseumPlayerSpot
 	waitstate
 	end
@@ -651,7 +651,7 @@ BattleColosseum_4P_EventScript_PlayerSpot2::
 	compare VAR_RESULT, 0
 	goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
 	setvar VAR_0x8005, 2
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special EnterColosseumPlayerSpot
 	waitstate
 	end
@@ -663,7 +663,7 @@ BattleColosseum_4P_EventScript_PlayerSpot3::
 	compare VAR_RESULT, 0
 	goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
 	setvar VAR_0x8005, 3
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special EnterColosseumPlayerSpot
 	waitstate
 	end
@@ -673,14 +673,14 @@ BattleColosseum_4P_EventScript_CancelSpotTrigger::
 
 TradeCenter_EventScript_Chair0::
 	setvar VAR_0x8005, 0
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special EnterTradeSeat
 	waitstate
 	end
 
 TradeCenter_EventScript_Chair1::
 	setvar VAR_0x8005, 1
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special EnterTradeSeat
 	waitstate
 	end
@@ -688,7 +688,7 @@ TradeCenter_EventScript_Chair1::
 @ Unused
 TradeCenter_EventScript_Chair2::
 	setvar VAR_0x8005, 2
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special EnterTradeSeat
 	waitstate
 	end
@@ -696,7 +696,7 @@ TradeCenter_EventScript_Chair2::
 @ Unused
 TradeCenter_EventScript_Chair3::
 	setvar VAR_0x8005, 3
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special EnterTradeSeat
 	waitstate
 	end
@@ -710,7 +710,7 @@ RecordCorner_EventScript_Spot3::
 	end
 
 CableClub_EventScript_ReadTrainerCard::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox Text_LookedAtPlayersTrainerCard
 	fadescreen FADE_TO_BLACK
 	special Script_ShowLinkTrainerCard
@@ -718,7 +718,7 @@ CableClub_EventScript_ReadTrainerCard::
 	end
 
 CableClub_EventScript_ReadTrainerCardColored::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox Text_LookedAtPlayersTrainerCardColored
 	fadescreen FADE_TO_BLACK
 	special Script_ShowLinkTrainerCard
@@ -726,13 +726,13 @@ CableClub_EventScript_ReadTrainerCardColored::
 	end
 
 CableClub_EventScript_TooBusyToNotice::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox Text_TrainerTooBusyToNotice
 	closemessage
 	end
 
 BattleColosseum_2P_EventScript_Attendant::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special Script_FacePlayer
 	msgbox Text_TakeSeatStartBattle
 	special Script_ClearHeldMovement
@@ -740,7 +740,7 @@ BattleColosseum_2P_EventScript_Attendant::
 	end
 
 TradeCenter_EventScript_Attendant::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special Script_FacePlayer
 	msgbox Text_TakeSeatStartTrade
 	special Script_ClearHeldMovement
@@ -752,7 +752,7 @@ RecordCorner_EventScript_Attendant::
 	end
 
 TradeCenter_ConfirmLeaveRoom::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox Text_TerminateLinkIfYouLeaveRoom, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq TradeCenter_TerminateLink
@@ -761,7 +761,7 @@ TradeCenter_ConfirmLeaveRoom::
 	end
 
 TradeCenter_TerminateLink::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	messageautoscroll Text_TerminateLinkConfirmation
 	waitmessage
 	special ExitLinkRoom
@@ -1002,7 +1002,7 @@ CableClub_EventScript_SaveAndChooseLinkLeader::
 	end
 
 CableClub_EventScript_ChooseLinkLeaderFrom2::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	message CableClub_Text_ChooseGroupLeaderOfTwo
 	waitmessage
 	call EventScript_RestorePrevTextColor
@@ -1037,7 +1037,7 @@ CableClub_EventScript_TryJoinGroup2Players::
 	return
 
 CableClub_EventScript_ChooseLinkLeaderFrom4::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	message CableClub_Text_ChooseGroupLeaderOfFour
 	waitmessage
 	call EventScript_RestorePrevTextColor
@@ -1072,7 +1072,7 @@ CableClub_EventScript_TryJoinGroup4Players::
 	return
 
 CableClub_EventScript_ChooseLinkLeader::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	message CableClub_Text_ChooseGroupLeader
 	waitmessage
 	call EventScript_RestorePrevTextColor
@@ -1282,7 +1282,7 @@ CableClub_EventScript_PlayDodrioBerryPicking::
 	end
 
 CableClub_EventScript_ChooseLinkLeaderMinigame::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	message CableClub_Text_ChooseGroupLeader
 	waitmessage
 	call EventScript_RestorePrevTextColor

data/scripts/day_care.inc

@@ -98,7 +98,7 @@ Route5_PokemonDayCare_EventScript_RetrieveMon::
 	bufferpartymonnick STR_VAR_1, VAR_RESULT
 	copyvar VAR_RESULT, VAR_0x8008
 	msgbox Route5_PokemonDayCare_Text_ThankYouHeresMon
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	waitse
 	playmoncry VAR_RESULT, CRY_MODE_NORMAL
 	msgbox Route5_PokemonDayCare_Text_PlayerGotMonBack

data/scripts/fame_checker.inc

@@ -3,7 +3,7 @@ ViridianCity_School_EventScript_PokemonJournal::
 	faceplayer
 	famechecker FAMECHECKER_OAK, 3
 	famechecker FAMECHECKER_DAISY, 3
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureProfOak
 	release
 	end
@@ -13,7 +13,7 @@ EventScript_PokemonJournalUnused1::
 	faceplayer
 	famechecker FAMECHECKER_DAISY, 1
 	famechecker FAMECHECKER_OAK, 4
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureProfOak
 	release
 	end
@@ -22,7 +22,7 @@ EventScript_PokemonJournalUnused2::
 	lock
 	faceplayer
 	famechecker FAMECHECKER_DAISY, 4
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureProfOak
 	release
 	end
@@ -30,7 +30,7 @@ EventScript_PokemonJournalUnused2::
 FourIsland_PokemonCenter_1F_EventScript_PokemonJournal::
 	lockall
 	famechecker FAMECHECKER_DAISY, 5
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureDaisyOak
 	releaseall
 	end
@@ -54,7 +54,7 @@ MtMoon_1F_EventScript_BaldingMan::
 PewterCity_Museum_1F_EventScript_PokemonJournalBrock::
 	lockall
 	famechecker FAMECHECKER_BROCK, 5
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureBrock
 	releaseall
 	end
@@ -79,7 +79,7 @@ CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty::
 	lock
 	faceplayer
 	famechecker FAMECHECKER_MISTY, 5
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureMisty
 	release
 	end
@@ -87,7 +87,7 @@ CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty::
 VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge::
 	lockall
 	famechecker FAMECHECKER_LTSURGE, 5
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureLtSurge
 	releaseall
 	end
@@ -96,7 +96,7 @@ CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika::
 	lock
 	faceplayer
 	famechecker FAMECHECKER_ERIKA, 5
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureErika
 	release
 	end
@@ -105,7 +105,7 @@ FuchsiaCity_WardensHouse_EventScript_PokemonJournalKoga::
 	lock
 	faceplayer
 	famechecker FAMECHECKER_KOGA, 4
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureKoga
 	release
 	end
@@ -122,7 +122,7 @@ SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina::
 	lock
 	faceplayer
 	famechecker FAMECHECKER_SABRINA, 4
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureSabrina
 	release
 	end
@@ -138,7 +138,7 @@ CinnabarIsland_Gym_EventScript_BlaineFujiPhoto::
 FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal::
 	lockall
 	famechecker FAMECHECKER_BLAINE, 5
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureBlaine
 	releaseall
 	end
@@ -155,7 +155,7 @@ FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal::
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LORELEI, 3
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureLorelei
 	release
 	end
@@ -164,7 +164,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno::
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BRUNO, 2
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureBruno
 	release
 	end
@@ -190,7 +190,7 @@ SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal::
 	lock
 	faceplayer
 	famechecker FAMECHECKER_AGATHA, 3
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureAgatha
 	release
 	end
@@ -239,7 +239,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal::
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 4
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureLance
 	release
 	end
@@ -264,7 +264,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji::
 	lock
 	faceplayer
 	famechecker FAMECHECKER_MRFUJI, 5
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PokemonJournal_Text_SpecialFeatureMrFuji
 	release
 	end

data/scripts/itemfinder.inc

@@ -1,6 +1,6 @@
 EventScript_ItemfinderDigUpUnderfootItem::
 	lockall
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	waitse
 	call EventScript_TryPickUpHiddenItem
 	compare VAR_0x8007, TRUE

data/scripts/move_tutors.inc

@@ -557,7 +557,7 @@ EventScript_ChooseMoveTutorMon::
 	return
 
 EventScript_CanOnlyBeLearnedOnce::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special DisableMsgBoxWalkaway
 	signmsg
 	msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO

data/scripts/obtain_item.inc

@@ -9,7 +9,7 @@ EventScript_RestorePrevTextColor::
 
 Std_ObtainItem::
 	copyvar VAR_PREV_TEXT_COLOR, VAR_TEXT_COLOR
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	additem VAR_0x8000, VAR_0x8001
 	copyvar VAR_0x8007, VAR_RESULT
 	call EventScript_ObtainItemMessage
@@ -160,7 +160,7 @@ EventScript_NoRoomToPickUpItem::
 
 EventScript_HiddenItemScript::
 	lockall
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	waitse
 	compare VAR_0x8005, 0
 	goto_if_eq EventScript_TryPickUpHiddenCoins

data/scripts/pokedex_rating.inc

@@ -65,7 +65,7 @@ PokedexRating_EventScript_Rate::
 	end
 
 PokedexRating_EventScript_SetTextColor::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	return
 
 PokedexRating_EventScript_DexIncomplete::

data/scripts/pokemon_league.inc

@@ -23,7 +23,7 @@ PokemonLeague_EventScript_SetDoorOpen::
 
 PokemonLeague_EventScript_PreventExit::
 	lockall
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	msgbox Text_VoiceRangOutDontRunAway
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_Movement_ForcePlayerIn

data/scripts/questionnaire.inc

@@ -1,6 +1,6 @@
 EventScript_Questionnaire::
 	lockall
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq EventScript_DeclineQuestionnaire
@@ -9,7 +9,7 @@ EventScript_Questionnaire::
 	lock
 	faceplayer
 	specialvar VAR_0x8008, GetMartClerkObjectId
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	compare VAR_0x8004, 0
 	goto_if_eq EventScript_EnableMysteryGift
 	compare VAR_RESULT, 0
@@ -28,7 +28,7 @@ EventScript_EnableMysteryGift::
 	waitmovement 0
 	msgbox Text_YouKnowThoseWords
 	setflag FLAG_SYS_MYSTERY_GIFT_ENABLED
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special DisableMsgBoxWalkaway
 	signmsg
 	msgbox Text_YouCanAccessMysteryGift

data/scripts/route23.inc

@@ -115,7 +115,7 @@ Route23_EventScript_RecognizeBadge::
 	end
 
 Route23_EventScript_BadgeGuardTrigger::
-	textcolor 0
+	textcolor NPC_TEXT_COLOR_MALE
 	applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	switch VAR_TEMP_1

data/scripts/std_msgbox.inc

@@ -28,7 +28,7 @@ Std_MsgboxYesNo::
 	return
 
 Std_ReceivedItem::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	compare VAR_0x8002, MUS_LEVEL_UP
 	call_if_eq EventScript_ReceivedItemFanfare1
 	compare VAR_0x8002, MUS_OBTAIN_KEY_ITEM

data/scripts/trainer_card.inc

@@ -238,7 +238,7 @@ FourIsland_House2_EventScript_AlreadyBraggedHoFMax::
 	end
 
 FourIsland_House2_EventScript_BraggedHoF::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message FourIsland_House2_Text_HoFStickerApplied
 	waitmessage
@@ -301,7 +301,7 @@ FourIsland_House2_EventScript_AlreadyBraggedEggsMax::
 	end
 
 FourIsland_House2_EventScript_BraggedEggs::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message FourIsland_House2_Text_EggStickerApplied
 	waitmessage
@@ -364,7 +364,7 @@ FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax::
 	end
 
 FourIsland_House2_EventScript_BraggedLinkWins::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message FourIsland_House2_Text_VictoryStickerApplied
 	waitmessage

data/scripts/trainer_tower.inc

@@ -292,7 +292,7 @@ TrainerTower_Roof_EventScript_GivePrize:
 
 TrainerTower_Roof_EventScript_ReceivePrize:
 	msgbox TrainerTower_Roof_Text_ThisIsForYou
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	playfanfare MUS_LEVEL_UP
 	message Text_ObtainedTheX
 	waitfanfare

data/scripts/white_out.inc

@@ -1,6 +1,6 @@
 EventScript_AfterWhiteOutHeal::
 	lockall
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox Text_FirstShouldRestoreMonsHealth
 	call EventScript_PkmnCenterNurse_TakeAndHealPkmn
 	call_if_unset FLAG_DEFEATED_BROCK, EventScript_AfterWhiteOutHealMsgPreBrock
@@ -23,7 +23,7 @@ EventScript_AfterWhiteOutHealMsg::
 
 EventScript_AfterWhiteOutMomHeal::
 	lockall
-	textcolor 1
+	textcolor NPC_TEXT_COLOR_FEMALE
 	applymovement LOCALID_MOM, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox Text_HadQuiteAnExperienceTakeRest
@@ -35,7 +35,7 @@ EventScript_AfterWhiteOutMomHeal::
 
 EventScript_FieldPoison::
 	lockall
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	special TryFieldPoisonWhiteOut
 	waitstate
 	compare VAR_RESULT, TRUE

include/constants/vars.h

@@ -334,4 +334,11 @@
 
 #define SPECIAL_VARS_END           0x8014
 
+// Text color ids for VAR_TEXT_COLOR / VAR_PREV_TEXT_COLOR
+#define NPC_TEXT_COLOR_MALE      0 // Blue, for male NPCs
+#define NPC_TEXT_COLOR_FEMALE    1 // Red, for female NPCs
+#define NPC_TEXT_COLOR_MON       2 // Black, for Pokémon
+#define NPC_TEXT_COLOR_NEUTRAL   3 // Black, for inanimate objects and messages from the game
+#define NPC_TEXT_COLOR_DEFAULT 255 // If an NPC is selected, use the color specified by GetColorFromTextColorTable, otherwise use Neutral.
+
 #endif // GUARD_CONSTANTS_VARS_H

src/battle_message.c

@@ -2378,7 +2378,13 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
     {PIXEL_FILL(0x1), 4, 0x00, 1, 0, 1, 1, 0x2, 0x1, 0x3}
 };
 
-const u8 gUnknown_83FEC90[] = {0x04, 0x05, 0x02, 0x02};
+static const u8 sNpcTextColorToFont[] = 
+{
+    [NPC_TEXT_COLOR_MALE]    = FONT_4, 
+    [NPC_TEXT_COLOR_FEMALE]  = FONT_5, 
+    [NPC_TEXT_COLOR_MON]     = FONT_2, 
+    [NPC_TEXT_COLOR_NEUTRAL] = FONT_2,
+};
 
 // windowId: Upper 2 bits are text flags
 //   x40: Use NPC context-defined font
@@ -2388,15 +2394,15 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) {
     struct TextPrinterTemplate printerTemplate;
     u8 speed;
     int x;
-    u8 context;
+    u8 color;
 
     u8 textFlags = windowId & 0xC0;
     windowId &= 0x3F;
     if (!(textFlags & 0x80))
         FillWindowPixelBuffer(windowId, sTextOnWindowsInfo_Normal[windowId].fillValue);
     if (textFlags & 0x40) {
-        context = ContextNpcGetTextColor();
+        color = ContextNpcGetTextColor();
-        printerTemplate.fontId = gUnknown_83FEC90[context];
+        printerTemplate.fontId = sNpcTextColorToFont[color];
     }
     else {
         printerTemplate.fontId = sTextOnWindowsInfo_Normal[windowId].fontId;

src/dynamic_placeholder_text_util.c

@@ -4,85 +4,87 @@
 
 static EWRAM_DATA const u8 *sStringPointers[8] = {0};
 
+#define COLORS(a, b)((a) | (b << 4))
+
 static const u8 sTextColorTable[] =
 {
  // [LOW_NYBBLE / 2]                            = 0xXY, // HIGH_NYBBLE
-    [OBJ_EVENT_GFX_RED_NORMAL / 2]              = 0x00, // OBJ_EVENT_GFX_RED_BIKE
+    [OBJ_EVENT_GFX_RED_NORMAL / 2]              = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_RED_BIKE
-    [OBJ_EVENT_GFX_RED_SURF / 2]                = 0x00, // OBJ_EVENT_GFX_RED_FIELD_MOVE
+    [OBJ_EVENT_GFX_RED_SURF / 2]                = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_RED_FIELD_MOVE
-    [OBJ_EVENT_GFX_RED_FISH / 2]                = 0x00, // OBJ_EVENT_GFX_RED_VS_SEEKER
+    [OBJ_EVENT_GFX_RED_FISH / 2]                = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_RED_VS_SEEKER
-    [OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE / 2]      = 0x10, // OBJ_EVENT_GFX_GREEN_NORMAL
+    [OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE / 2]      = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_GREEN_NORMAL
-    [OBJ_EVENT_GFX_GREEN_BIKE / 2]              = 0x11, // OBJ_EVENT_GFX_GREEN_SURF
+    [OBJ_EVENT_GFX_GREEN_BIKE / 2]              = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_GREEN_SURF
-    [OBJ_EVENT_GFX_GREEN_FIELD_MOVE / 2]        = 0x11, // OBJ_EVENT_GFX_GREEN_FISH
+    [OBJ_EVENT_GFX_GREEN_FIELD_MOVE / 2]        = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_GREEN_FISH
-    [OBJ_EVENT_GFX_GREEN_VS_SEEKER / 2]         = 0x11, // OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE
+    [OBJ_EVENT_GFX_GREEN_VS_SEEKER / 2]         = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE
-    [OBJ_EVENT_GFX_RS_BRENDAN / 2]              = 0x10, // OBJ_EVENT_GFX_RS_MAY
+    [OBJ_EVENT_GFX_RS_BRENDAN / 2]              = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_RS_MAY
-    [OBJ_EVENT_GFX_LITTLE_BOY / 2]              = 0x10, // OBJ_EVENT_GFX_LITTLE_GIRL
+    [OBJ_EVENT_GFX_LITTLE_BOY / 2]              = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_LITTLE_GIRL
-    [OBJ_EVENT_GFX_YOUNGSTER / 2]               = 0x00, // OBJ_EVENT_GFX_BOY
+    [OBJ_EVENT_GFX_YOUNGSTER / 2]               = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BOY
-    [OBJ_EVENT_GFX_BUG_CATCHER / 2]             = 0x00, // OBJ_EVENT_GFX_SITTING_BOY
+    [OBJ_EVENT_GFX_BUG_CATCHER / 2]             = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SITTING_BOY
-    [OBJ_EVENT_GFX_LASS / 2]                    = 0x11, // OBJ_EVENT_GFX_WOMAN_1
+    [OBJ_EVENT_GFX_LASS / 2]                    = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_WOMAN_1
-    [OBJ_EVENT_GFX_BATTLE_GIRL / 2]             = 0x01, // OBJ_EVENT_GFX_MAN
+    [OBJ_EVENT_GFX_BATTLE_GIRL / 2]             = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_MAN
-    [OBJ_EVENT_GFX_ROCKER / 2]                  = 0x00, // OBJ_EVENT_GFX_FAT_MAN
+    [OBJ_EVENT_GFX_ROCKER / 2]                  = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_FAT_MAN
-    [OBJ_EVENT_GFX_WOMAN_2 / 2]                 = 0x11, // OBJ_EVENT_GFX_BEAUTY
+    [OBJ_EVENT_GFX_WOMAN_2 / 2]                 = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_BEAUTY
-    [OBJ_EVENT_GFX_BALDING_MAN / 2]             = 0x10, // OBJ_EVENT_GFX_WOMAN_3
+    [OBJ_EVENT_GFX_BALDING_MAN / 2]             = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_WOMAN_3
-    [OBJ_EVENT_GFX_OLD_MAN_1 / 2]               = 0x00, // OBJ_EVENT_GFX_OLD_MAN_2
+    [OBJ_EVENT_GFX_OLD_MAN_1 / 2]               = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_OLD_MAN_2
-    [OBJ_EVENT_GFX_OLD_MAN_LYING_DOWN / 2]      = 0x10, // OBJ_EVENT_GFX_OLD_WOMAN
+    [OBJ_EVENT_GFX_OLD_MAN_LYING_DOWN / 2]      = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_OLD_WOMAN
-    [OBJ_EVENT_GFX_TUBER_M_WATER / 2]           = 0x10, // OBJ_EVENT_GFX_TUBER_F
+    [OBJ_EVENT_GFX_TUBER_M_WATER / 2]           = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_TUBER_F
-    [OBJ_EVENT_GFX_TUBER_M_LAND / 2]            = 0x00, // OBJ_EVENT_GFX_CAMPER
+    [OBJ_EVENT_GFX_TUBER_M_LAND / 2]            = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_CAMPER
-    [OBJ_EVENT_GFX_PICNICKER / 2]               = 0x01, // OBJ_EVENT_GFX_COOLTRAINER_M
+    [OBJ_EVENT_GFX_PICNICKER / 2]               = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_COOLTRAINER_M
-    [OBJ_EVENT_GFX_COOLTRAINER_F / 2]           = 0x01, // OBJ_EVENT_GFX_SWIMMER_M_WATER
+    [OBJ_EVENT_GFX_COOLTRAINER_F / 2]           = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SWIMMER_M_WATER
-    [OBJ_EVENT_GFX_SWIMMER_F_WATER / 2]         = 0x01, // OBJ_EVENT_GFX_SWIMMER_M_LAND
+    [OBJ_EVENT_GFX_SWIMMER_F_WATER / 2]         = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SWIMMER_M_LAND
-    [OBJ_EVENT_GFX_SWIMMER_F_LAND / 2]          = 0x01, // OBJ_EVENT_GFX_WORKER_M
+    [OBJ_EVENT_GFX_SWIMMER_F_LAND / 2]          = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_WORKER_M
-    [OBJ_EVENT_GFX_WORKER_F / 2]                = 0x01, // OBJ_EVENT_GFX_ROCKET_M
+    [OBJ_EVENT_GFX_WORKER_F / 2]                = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_ROCKET_M
-    [OBJ_EVENT_GFX_ROCKET_F / 2]                = 0x01, // OBJ_EVENT_GFX_GBA_KID
+    [OBJ_EVENT_GFX_ROCKET_F / 2]                = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_GBA_KID
-    [OBJ_EVENT_GFX_SUPER_NERD / 2]              = 0x00, // OBJ_EVENT_GFX_BIKER
+    [OBJ_EVENT_GFX_SUPER_NERD / 2]              = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BIKER
-    [OBJ_EVENT_GFX_BLACKBELT / 2]               = 0x00, // OBJ_EVENT_GFX_SCIENTIST
+    [OBJ_EVENT_GFX_BLACKBELT / 2]               = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SCIENTIST
-    [OBJ_EVENT_GFX_HIKER / 2]                   = 0x00, // OBJ_EVENT_GFX_FISHER
+    [OBJ_EVENT_GFX_HIKER / 2]                   = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_FISHER
-    [OBJ_EVENT_GFX_CHANNELER / 2]               = 0x01, // OBJ_EVENT_GFX_CHEF
+    [OBJ_EVENT_GFX_CHANNELER / 2]               = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_CHEF
-    [OBJ_EVENT_GFX_POLICEMAN / 2]               = 0x00, // OBJ_EVENT_GFX_GENTLEMAN
+    [OBJ_EVENT_GFX_POLICEMAN / 2]               = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_GENTLEMAN
-    [OBJ_EVENT_GFX_SAILOR / 2]                  = 0x00, // OBJ_EVENT_GFX_CAPTAIN
+    [OBJ_EVENT_GFX_SAILOR / 2]                  = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_CAPTAIN
-    [OBJ_EVENT_GFX_NURSE / 2]                   = 0x11, // OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST
+    [OBJ_EVENT_GFX_NURSE / 2]                   = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST
-    [OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST / 2] = 0x01, // OBJ_EVENT_GFX_UNUSED_MALE_RECEPTIONIST
+    [OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_UNUSED_MALE_RECEPTIONIST
-    [OBJ_EVENT_GFX_CLERK / 2]                   = 0x00, // OBJ_EVENT_GFX_MG_DELIVERYMAN
+    [OBJ_EVENT_GFX_CLERK / 2]                   = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_MG_DELIVERYMAN
-    [OBJ_EVENT_GFX_TRAINER_TOWER_DUDE / 2]      = 0x00, // OBJ_EVENT_GFX_PROF_OAK
+    [OBJ_EVENT_GFX_TRAINER_TOWER_DUDE / 2]      = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_PROF_OAK
-    [OBJ_EVENT_GFX_BLUE / 2]                    = 0x00, // OBJ_EVENT_GFX_BILL
+    [OBJ_EVENT_GFX_BLUE / 2]                    = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BILL
-    [OBJ_EVENT_GFX_LANCE / 2]                   = 0x10, // OBJ_EVENT_GFX_AGATHA
+    [OBJ_EVENT_GFX_LANCE / 2]                   = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_AGATHA
-    [OBJ_EVENT_GFX_DAISY / 2]                   = 0x11, // OBJ_EVENT_GFX_LORELEI
+    [OBJ_EVENT_GFX_DAISY / 2]                   = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_LORELEI
-    [OBJ_EVENT_GFX_MR_FUJI / 2]                 = 0x00, // OBJ_EVENT_GFX_BRUNO
+    [OBJ_EVENT_GFX_MR_FUJI / 2]                 = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BRUNO
-    [OBJ_EVENT_GFX_BROCK / 2]                   = 0x10, // OBJ_EVENT_GFX_MISTY
+    [OBJ_EVENT_GFX_BROCK / 2]                   = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_MISTY
-    [OBJ_EVENT_GFX_LT_SURGE / 2]                = 0x10, // OBJ_EVENT_GFX_ERIKA
+    [OBJ_EVENT_GFX_LT_SURGE / 2]                = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_ERIKA
-    [OBJ_EVENT_GFX_KOGA / 2]                    = 0x10, // OBJ_EVENT_GFX_SABRINA
+    [OBJ_EVENT_GFX_KOGA / 2]                    = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_SABRINA
-    [OBJ_EVENT_GFX_BLAINE / 2]                  = 0x00, // OBJ_EVENT_GFX_GIOVANNI
+    [OBJ_EVENT_GFX_BLAINE / 2]                  = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_GIOVANNI
-    [OBJ_EVENT_GFX_MOM / 2]                     = 0x01, // OBJ_EVENT_GFX_CELIO
+    [OBJ_EVENT_GFX_MOM / 2]                     = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_CELIO
-    [OBJ_EVENT_GFX_TEACHY_TV_HOST / 2]          = 0x00, // OBJ_EVENT_GFX_GYM_GUY
+    [OBJ_EVENT_GFX_TEACHY_TV_HOST / 2]          = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_GYM_GUY
-    [OBJ_EVENT_GFX_ITEM_BALL / 2]               = 0x33, // OBJ_EVENT_GFX_TOWN_MAP
+    [OBJ_EVENT_GFX_ITEM_BALL / 2]               = COLORS(NPC_TEXT_COLOR_NEUTRAL, NPC_TEXT_COLOR_NEUTRAL), // OBJ_EVENT_GFX_TOWN_MAP
-    [OBJ_EVENT_GFX_POKEDEX / 2]                 = 0x33, // OBJ_EVENT_GFX_CUT_TREE
+    [OBJ_EVENT_GFX_POKEDEX / 2]                 = COLORS(NPC_TEXT_COLOR_NEUTRAL, NPC_TEXT_COLOR_NEUTRAL), // OBJ_EVENT_GFX_CUT_TREE
-    [OBJ_EVENT_GFX_ROCK_SMASH_ROCK / 2]         = 0x33, // OBJ_EVENT_GFX_PUSHABLE_BOULDER
+    [OBJ_EVENT_GFX_ROCK_SMASH_ROCK / 2]         = COLORS(NPC_TEXT_COLOR_NEUTRAL, NPC_TEXT_COLOR_NEUTRAL), // OBJ_EVENT_GFX_PUSHABLE_BOULDER
-    [OBJ_EVENT_GFX_FOSSIL / 2]                  = 0x33, // OBJ_EVENT_GFX_RUBY
+    [OBJ_EVENT_GFX_FOSSIL / 2]                  = COLORS(NPC_TEXT_COLOR_NEUTRAL, NPC_TEXT_COLOR_NEUTRAL), // OBJ_EVENT_GFX_RUBY
-    [OBJ_EVENT_GFX_SAPPHIRE / 2]                = 0x33, // OBJ_EVENT_GFX_OLD_AMBER
+    [OBJ_EVENT_GFX_SAPPHIRE / 2]                = COLORS(NPC_TEXT_COLOR_NEUTRAL, NPC_TEXT_COLOR_NEUTRAL), // OBJ_EVENT_GFX_OLD_AMBER
-    [OBJ_EVENT_GFX_GYM_SIGN / 2]                = 0x33, // OBJ_EVENT_GFX_SIGN
+    [OBJ_EVENT_GFX_GYM_SIGN / 2]                = COLORS(NPC_TEXT_COLOR_NEUTRAL, NPC_TEXT_COLOR_NEUTRAL), // OBJ_EVENT_GFX_SIGN
-    [OBJ_EVENT_GFX_TRAINER_TIPS / 2]            = 0x33, // OBJ_EVENT_GFX_CLIPBOARD
+    [OBJ_EVENT_GFX_TRAINER_TIPS / 2]            = COLORS(NPC_TEXT_COLOR_NEUTRAL, NPC_TEXT_COLOR_NEUTRAL), // OBJ_EVENT_GFX_CLIPBOARD
-    [OBJ_EVENT_GFX_METEORITE / 2]               = 0x33, // OBJ_EVENT_GFX_LAPRAS_DOLL
+    [OBJ_EVENT_GFX_METEORITE / 2]               = COLORS(NPC_TEXT_COLOR_NEUTRAL, NPC_TEXT_COLOR_NEUTRAL), // OBJ_EVENT_GFX_LAPRAS_DOLL
-    [OBJ_EVENT_GFX_SEAGALLOP / 2]               = 0x23, // OBJ_EVENT_GFX_SNORLAX
+    [OBJ_EVENT_GFX_SEAGALLOP / 2]               = COLORS(NPC_TEXT_COLOR_NEUTRAL, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_SNORLAX
-    [OBJ_EVENT_GFX_SPEAROW / 2]                 = 0x22, // OBJ_EVENT_GFX_CUBONE
+    [OBJ_EVENT_GFX_SPEAROW / 2]                 = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_CUBONE
-    [OBJ_EVENT_GFX_POLIWRATH / 2]               = 0x22, // OBJ_EVENT_GFX_CLEFAIRY
+    [OBJ_EVENT_GFX_POLIWRATH / 2]               = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_CLEFAIRY
-    [OBJ_EVENT_GFX_PIDGEOT / 2]                 = 0x22, // OBJ_EVENT_GFX_JIGGLYPUFF
+    [OBJ_EVENT_GFX_PIDGEOT / 2]                 = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_JIGGLYPUFF
-    [OBJ_EVENT_GFX_PIDGEY / 2]                  = 0x22, // OBJ_EVENT_GFX_CHANSEY
+    [OBJ_EVENT_GFX_PIDGEY / 2]                  = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_CHANSEY
-    [OBJ_EVENT_GFX_OMANYTE / 2]                 = 0x22, // OBJ_EVENT_GFX_KANGASKHAN
+    [OBJ_EVENT_GFX_OMANYTE / 2]                 = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_KANGASKHAN
-    [OBJ_EVENT_GFX_PIKACHU / 2]                 = 0x22, // OBJ_EVENT_GFX_PSYDUCK
+    [OBJ_EVENT_GFX_PIKACHU / 2]                 = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_PSYDUCK
-    [OBJ_EVENT_GFX_NIDORAN_F / 2]               = 0x22, // OBJ_EVENT_GFX_NIDORAN_M
+    [OBJ_EVENT_GFX_NIDORAN_F / 2]               = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_NIDORAN_M
-    [OBJ_EVENT_GFX_NIDORINO / 2]                = 0x22, // OBJ_EVENT_GFX_MEOWTH
+    [OBJ_EVENT_GFX_NIDORINO / 2]                = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_MEOWTH
-    [OBJ_EVENT_GFX_SEEL / 2]                    = 0x22, // OBJ_EVENT_GFX_VOLTORB
+    [OBJ_EVENT_GFX_SEEL / 2]                    = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_VOLTORB
-    [OBJ_EVENT_GFX_SLOWPOKE / 2]                = 0x22, // OBJ_EVENT_GFX_SLOWBRO
+    [OBJ_EVENT_GFX_SLOWPOKE / 2]                = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_SLOWBRO
-    [OBJ_EVENT_GFX_MACHOP / 2]                  = 0x22, // OBJ_EVENT_GFX_WIGGLYTUFF
+    [OBJ_EVENT_GFX_MACHOP / 2]                  = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_WIGGLYTUFF
-    [OBJ_EVENT_GFX_DODUO / 2]                   = 0x22, // OBJ_EVENT_GFX_FEAROW
+    [OBJ_EVENT_GFX_DODUO / 2]                   = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_FEAROW
-    [OBJ_EVENT_GFX_MACHOKE / 2]                 = 0x22, // OBJ_EVENT_GFX_LAPRAS
+    [OBJ_EVENT_GFX_MACHOKE / 2]                 = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_LAPRAS
-    [OBJ_EVENT_GFX_ZAPDOS / 2]                  = 0x22, // OBJ_EVENT_GFX_MOLTRES
+    [OBJ_EVENT_GFX_ZAPDOS / 2]                  = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_MOLTRES
-    [OBJ_EVENT_GFX_ARTICUNO / 2]                = 0x22, // OBJ_EVENT_GFX_MEWTWO
+    [OBJ_EVENT_GFX_ARTICUNO / 2]                = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_MEWTWO
-    [OBJ_EVENT_GFX_MEW / 2]                     = 0x22, // OBJ_EVENT_GFX_ENTEI
+    [OBJ_EVENT_GFX_MEW / 2]                     = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_ENTEI
-    [OBJ_EVENT_GFX_SUICUNE / 2]                 = 0x22, // OBJ_EVENT_GFX_RAIKOU
+    [OBJ_EVENT_GFX_SUICUNE / 2]                 = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_RAIKOU
-    [OBJ_EVENT_GFX_LUGIA / 2]                   = 0x22, // OBJ_EVENT_GFX_HO_OH
+    [OBJ_EVENT_GFX_LUGIA / 2]                   = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_HO_OH
-    [OBJ_EVENT_GFX_CELEBI / 2]                  = 0x22, // OBJ_EVENT_GFX_KABUTO
+    [OBJ_EVENT_GFX_CELEBI / 2]                  = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_KABUTO
-    [OBJ_EVENT_GFX_DEOXYS_D / 2]                = 0x22, // OBJ_EVENT_GFX_DEOXYS_A
+    [OBJ_EVENT_GFX_DEOXYS_D / 2]                = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_MON), // OBJ_EVENT_GFX_DEOXYS_A
-    [OBJ_EVENT_GFX_DEOXYS_N / 2]                = 0x32, // OBJ_EVENT_GFX_SS_ANNE
+    [OBJ_EVENT_GFX_DEOXYS_N / 2]                = COLORS(NPC_TEXT_COLOR_MON, NPC_TEXT_COLOR_NEUTRAL), // OBJ_EVENT_GFX_SS_ANNE
 };
 
 void DynamicPlaceholderTextUtil_Reset(void)

src/field_specials.c

@@ -1542,18 +1542,26 @@ void SetSeenMon(void)
 void ResetContextNpcTextColor(void)
 {
     gSelectedObjectEvent = 0;
-    gSpecialVar_TextColor = 0xFF;
+    gSpecialVar_TextColor = NPC_TEXT_COLOR_DEFAULT;
 }
 
 u8 ContextNpcGetTextColor(void)
 {
     u8 gfxId;
-    if (gSpecialVar_TextColor != 0xFF)
+    if (gSpecialVar_TextColor != NPC_TEXT_COLOR_DEFAULT)
+    {
+        // A text color has been specified, use that
         return gSpecialVar_TextColor;
+    }
     else if (gSelectedObjectEvent == 0)
-        return 3;
+    {
+        // No text color specified and no object selected, use neutral
+        return NPC_TEXT_COLOR_NEUTRAL;
+    }
     else
     {
+        // An object is selected and no color has been specified.
+        // Use the text color normally associated with this object's sprite.
         gfxId = gObjectEvents[gSelectedObjectEvent].graphicsId;
         if (gfxId >= OBJ_EVENT_GFX_VAR_0)
             gfxId = VarGetObjectEventGraphicsId(gfxId - OBJ_EVENT_GFX_VAR_0);

src/menu_helpers.c

@@ -241,7 +241,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *quantity_p, u16 qmax)
 
 u8 GetDialogBoxFontId(void)
 {
-    if (!ContextNpcGetTextColor())
+    if (ContextNpcGetTextColor() == NPC_TEXT_COLOR_MALE)
         return FONT_4;
     else
         return FONT_5;

src/new_menu_helpers.c

@@ -425,16 +425,16 @@ u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed
 
 void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress)
 {
-    u8 result;
+    u8 color;
     void *nptr = NULL;
 
     gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress;    
-    result = ContextNpcGetTextColor();
+    color = ContextNpcGetTextColor();
-    if (result == 0)
+    if (color == NPC_TEXT_COLOR_MALE)
         AddTextPrinterParameterized2(0, FONT_4, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_BLUE, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
-    else if (result == 1)
+    else if (color == NPC_TEXT_COLOR_FEMALE)
         AddTextPrinterParameterized2(0, FONT_5, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_RED, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
-    else
+    else // NPC_TEXT_COLOR_MON / NPC_TEXT_COLOR_NEUTRAL
         AddTextPrinterParameterized2(0, FONT_2, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
 }
 

src/shop.c

@@ -217,7 +217,7 @@ static u8 CreateShopMenu(u8 a0)
 {
     gShopData.martType = GetMartTypeFromItemList(a0);
     gShopData.selectedRow = 0;
-    if (ContextNpcGetTextColor() == 0)
+    if (ContextNpcGetTextColor() == NPC_TEXT_COLOR_MALE)
         gShopData.fontId = FONT_4;
     else
         gShopData.fontId = FONT_5;