summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-03-02 12:57:54 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-03-02 12:57:54 -0500
commit4ab3d77d8043fbf2dc7d7892b8e2f0ef1e96134f (patch)
treef0cb562e42e0e7850eba8921e22cf885bcb72360
parent9803cb612e6ca383694527d01f05f33edcc777a2 (diff)
Fix special var names
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc2
-rw-r--r--data/maps/FiveIsland_WaterLabyrinth/scripts.inc2
-rw-r--r--data/maps/FourIsland/scripts.inc2
-rw-r--r--data/maps/FourIsland_PokemonDayCare/scripts.inc2
-rw-r--r--data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc2
-rw-r--r--data/maps/FuchsiaCity_WardensHouse/scripts.inc2
-rw-r--r--data/maps/OneIsland_PokemonCenter_1F/scripts.inc8
-rw-r--r--data/maps/PalletTown_ProfessorOaksLab/scripts.inc10
-rw-r--r--data/maps/PewterCity/scripts.inc2
-rw-r--r--data/maps/PewterCity_House1/scripts.inc2
-rw-r--r--data/maps/Route1/scripts.inc2
-rw-r--r--data/maps/SSAnne_CaptainsOffice/scripts.inc2
-rw-r--r--data/maps/SaffronCity_Dojo/scripts.inc4
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_House/scripts.inc2
-rw-r--r--data/maps/TwoIsland_House/scripts.inc4
-rw-r--r--data/maps/TwoIsland_JoyfulGameCorner/scripts.inc2
-rw-r--r--data/scripts/cable_club.inc12
-rw-r--r--data/scripts/day_care.inc2
-rw-r--r--data/scripts/move_tutors.inc2
-rw-r--r--data/scripts/obtain_item.inc13
-rw-r--r--data/scripts/std_msgbox.inc2
-rw-r--r--data/scripts/trainer_tower.inc2
-rw-r--r--include/constants/vars.h10
-rw-r--r--src/event_data.c4
25 files changed, 50 insertions, 49 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index dae7ba832..564e18fb9 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -66,7 +66,7 @@ gSpecialVars:: @ 815FD0C
.4byte gSpecialVar_MonBoxPos
.4byte gSpecialVar_TextColor
.4byte gSpecialVar_PrevTextColor
- .4byte gUnknown_20370DE
+ .4byte gSpecialVar_0x8014
.include "data/specials.inc"
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
index bd05d824d..fb7cac74d 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
@@ -154,7 +154,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C
waitmessage
waitfanfare
putitemaway VAR_0x8009
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
compare VAR_0x8008, ITEM_FRESH_WATER
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16
compare VAR_0x8008, ITEM_SODA_POP
diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
index f1080d094..956652eb7 100644
--- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
@@ -38,7 +38,7 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA
message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan
waitfanfare
waitmessage
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
goto FiveIsland_WaterLabyrinth_EventScript_PostEggComment
end
diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc
index 8a7dfafbf..cc2347dee 100644
--- a/data/maps/FourIsland/scripts.inc
+++ b/data/maps/FourIsland/scripts.inc
@@ -112,7 +112,7 @@ FourIsland_EventScript_DaycareAcceptEgg:: @ 8167DD1
FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB
textcolor 3
message DayCare_Text_ReceivedEgg
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
playfanfare MUS_FANFA1
waitfanfare
waitbuttonpress
diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc
index c6cf95b20..dc04c477f 100644
--- a/data/maps/FourIsland_PokemonDayCare/scripts.inc
+++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc
@@ -138,7 +138,7 @@ FourIsland_PokemonDayCare_RetrieveMon:: @ 8171B05
playmoncry VAR_RESULT, 0
textcolor 3
msgbox DayCare_Text_TookBackMon
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
waitmoncry
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, DAYCARE_ONE_MON
diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
index 863ddbd48..ec9a7ca6a 100644
--- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
@@ -123,7 +123,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: @ 816D3CA
playfanfare MUS_FANFA1
message FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls
waitfanfare
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
msgbox FuchsiaCity_SafariZone_Entrance_Text_CallYouOnPAWhenYouRunOut
closemessage
hidemoneybox 0, 0
diff --git a/data/maps/FuchsiaCity_WardensHouse/scripts.inc b/data/maps/FuchsiaCity_WardensHouse/scripts.inc
index 141101e1b..1f0c891d6 100644
--- a/data/maps/FuchsiaCity_WardensHouse/scripts.inc
+++ b/data/maps/FuchsiaCity_WardensHouse/scripts.inc
@@ -21,7 +21,7 @@ FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth:: @ 816D780
waitmessage
waitfanfare
msgbox FuchsiaCity_WardensHouse_Text_WardenPoppedInHisTeeth
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
checkplayergender
compare VAR_RESULT, MALE
call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenThanksMale
diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
index 53d0aebcd..67c48c033 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -141,7 +141,7 @@ OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46
message OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap
waitmessage
waitfanfare
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
return
OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58
@@ -264,7 +264,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5
message OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio
waitmessage
waitfanfare
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
removeitem ITEM_SAPPHIRE, 1
msgbox OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime
closemessage
@@ -310,7 +310,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044
message OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio
waitmessage
waitfanfare
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
closemessage
applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine
waitmovement 0
@@ -349,7 +349,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: @ 81710B2
message OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage
waitmessage
waitfanfare
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
goto OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass
end
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 19518f6e7..ffa7d58f0 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -98,7 +98,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035
textcolor 3
msgbox PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits
closemessage
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
compare VAR_FACING, DIR_NORTH
call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth
compare VAR_FACING, DIR_SOUTH
@@ -128,7 +128,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035
message PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded
waitmessage
waitfanfare
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
special EnableNationalPokedex
msgbox PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex
msgbox PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex
@@ -655,7 +655,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E
message PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel
waitmessage
waitfanfare
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
removeitem ITEM_OAKS_PARCEL, 1
msgbox PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered
playbgm MUS_RIVAL1, 0
@@ -721,7 +721,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E
message PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak
waitmessage
waitfanfare
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
setflag FLAG_SYS_POKEDEX_GET
special sub_810B810
setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1
@@ -1212,7 +1212,7 @@ PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: @ 8169C74
erasemonpic
removeobject VAR_LAST_TALKED
msgbox PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
setflag FLAG_SYS_POKEMON_GET
setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
givemon PLAYER_STARTER_SPECIES, 5, ITEM_NONE
diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc
index 83d8f4d35..be854826b 100644
--- a/data/maps/PewterCity/scripts.inc
+++ b/data/maps/PewterCity/scripts.inc
@@ -728,7 +728,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE
signmsg
msgbox PewterCity_Text_ExplainRunningShoes
normalmsg
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
msgbox PewterCity_Text_MustBeGoingBackToLab
closemessage
compare VAR_TEMP_1, 0
diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc
index 3d173b174..f6b07a7f9 100644
--- a/data/maps/PewterCity_House1/scripts.inc
+++ b/data/maps/PewterCity_House1/scripts.inc
@@ -27,5 +27,5 @@ PewterCity_House1_EventScript_DoNidoranCry:: @ 816A749
playmoncry SPECIES_NIDORAN_M, 0
msgbox PewterCity_House1_Text_Nidoran
waitmoncry
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
return
diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc
index 36a42f65e..aaea71eaf 100644
--- a/data/maps/Route1/scripts.inc
+++ b/data/maps/Route1/scripts.inc
@@ -17,7 +17,7 @@ Route1_EventScript_MartClerk:: @ 8167EFE
waitfanfare
additem ITEM_POTION
msgbox Route1_Text_PutPotionAway
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
setflag FLAG_GOT_POTION_ON_ROUTE_1
release
end
diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc
index d5d976e21..3ccd4fa51 100644
--- a/data/maps/SSAnne_CaptainsOffice/scripts.inc
+++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc
@@ -10,7 +10,7 @@ SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A
waitmessage
playfanfare MUS_ME_ASA
waitfanfare
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
delay 50
applymovement 1, Movement_FacePlayer
waitmovement 0
diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc
index 88e53d64c..1dd8b31e1 100644
--- a/data/maps/SaffronCity_Dojo/scripts.inc
+++ b/data/maps/SaffronCity_Dojo/scripts.inc
@@ -29,7 +29,7 @@ SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00
waitmovement 0
textcolor 0
msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
compare VAR_RESULT, YES
goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
erasemonpic
@@ -51,7 +51,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46
waitmovement 0
textcolor 0
msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
compare VAR_RESULT, YES
goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
erasemonpic
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
index 3d0bb73ea..0c12e9362 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
@@ -18,7 +18,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183
goto_if_eq SevenIsland_SevaultCanyon_House_EventScript_DeclineDance
msgbox SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance
closemessage
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
compare VAR_FACING, DIR_SOUTH
call_if_ne SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown
delay 30
diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc
index 692f374fd..241f317a4 100644
--- a/data/maps/TwoIsland_House/scripts.inc
+++ b/data/maps/TwoIsland_House/scripts.inc
@@ -78,7 +78,7 @@ TwoIsland_House_EventScript_GiveBigMushroom:: @ 8171727
removeitem ITEM_BIG_MUSHROOM, 1
textcolor 3
msgbox TwoIsland_House_Text_HandedOverOneBigMushroom
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
goto TwoIsland_House_EventScript_EndTutorMove
end
@@ -86,7 +86,7 @@ TwoIsland_House_EventScript_GiveTinyMushrooms:: @ 8171741
removeitem ITEM_TINY_MUSHROOM, 2
textcolor 3
msgbox TwoIsland_House_Text_HandedOverTwoTinyMushrooms
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
goto TwoIsland_House_EventScript_EndTutorMove
end
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
index fcba4720c..f3b5f4dff 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
@@ -162,7 +162,7 @@ TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A
message TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy
waitmessage
waitfanfare
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
removeitem ITEM_METEORITE, 1
msgbox TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill
goto TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index c174eaf41..e7eda5271 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -288,7 +288,7 @@ CableClub_EventScript_TryEnterColosseum:: @ 81BB54C
textcolor 3
special TryBattleLinkup
waitstate
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
compare VAR_RESULT, 1
goto_if_eq CableClub_EventScript_EnterColosseum
compare VAR_RESULT, 2
@@ -395,7 +395,7 @@ CableClub_EventScript_TradeCenter:: @ 81BB6AB
textcolor 3
special TryTradeLinkup
waitstate
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
compare VAR_RESULT, 1
goto_if_eq CableClub_EventScript_EnterTradeCenter
compare VAR_RESULT, 2
@@ -1001,7 +1001,7 @@ CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 81BBDBC
textcolor 3
message CableClub_Text_ChooseGroupLeaderOfTwo
waitmessage
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroup2Players
@@ -1036,7 +1036,7 @@ CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 81BBE50
textcolor 3
message CableClub_Text_ChooseGroupLeaderOfFour
waitmessage
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroup4Players
@@ -1071,7 +1071,7 @@ CableClub_EventScript_ChooseLinkLeader:: @ 81BBEE4
textcolor 3
message CableClub_Text_ChooseGroupLeader
waitmessage
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroupXPlayers
@@ -1281,7 +1281,7 @@ CableClub_EventScript_ChooseLinkLeaderMinigame:: @ 81BC1CE
textcolor 3
message CableClub_Text_ChooseGroupLeader
waitmessage
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinMinigameLinkGroup
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 8e3318c35..59b65332b 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -102,7 +102,7 @@ Route5_PokemonDayCare_EventScript_RetrieveMon:: @ 81BF4EA
waitse
playmoncry VAR_RESULT, 0
msgbox Route5_PokemonDayCare_Text_PlayerGotMonBack
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
waitmoncry
goto Route5_PokemonDayCare_EventScript_CloseMoneyBox
end
diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc
index 40fcd43db..744e50199 100644
--- a/data/scripts/move_tutors.inc
+++ b/data/scripts/move_tutors.inc
@@ -560,7 +560,7 @@ EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37
signmsg
msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO
normalmsg
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
return
Movement_JumpInPlaceDown: @ 81C4F4C
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index 3ada6109c..a50693292 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -1,18 +1,19 @@
-EventScript_1A666F:: @ 81A666F
- copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID
+@ Unused, handled by textcolor script cmd
+EventScript_SaveTextColor:: @ 81A666F
+ copyvar VAR_PREV_TEXT_COLOR, VAR_TEXT_COLOR
return
-EventScript_1A6675:: @ 81A6675
- copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS
+EventScript_RestorePrevTextColor:: @ 81A6675
+ copyvar VAR_TEXT_COLOR, VAR_PREV_TEXT_COLOR
return
Std_ObtainItem:: @ 81A667B
- copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID
+ copyvar VAR_PREV_TEXT_COLOR, VAR_TEXT_COLOR
textcolor 3
additem VAR_0x8000, VAR_0x8001
copyvar VAR_0x8007, VAR_RESULT
call EventScript_ObtainItemMessage
- copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS
+ copyvar VAR_TEXT_COLOR, VAR_PREV_TEXT_COLOR
return
EventScript_ObtainItemMessage:: @ 81A6697
diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc
index d1605976e..da53a3cc1 100644
--- a/data/scripts/std_msgbox.inc
+++ b/data/scripts/std_msgbox.inc
@@ -39,7 +39,7 @@ Std_ReceivedItem:: @ 81A4E66
compare VAR_0x8002, MUS_FANFA1
call_if_eq EventScript_ReceivedItemWaitFanfare
putitemaway VAR_0x8000, VAR_0x8001
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
return
EventScript_ReceivedItemFanfare1:: @ 81A4EA2
diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc
index 45ffc285d..3b21c0844 100644
--- a/data/scripts/trainer_tower.inc
+++ b/data/scripts/trainer_tower.inc
@@ -299,7 +299,7 @@ TrainerTower_Roof_EventScript_ReceivePrize:
waitmessage
getstdstring 2, STDSTRING_ITEMS_POCKET
msgbox Text_PutItemAway
- call EventScript_1A6675
+ call EventScript_RestorePrevTextColor
goto TrainerTower_Roof_EventScript_CheckFinalTime
TrainerTower_Roof_EventScript_NoRoomForPrize:: @ 81C543A
diff --git a/include/constants/vars.h b/include/constants/vars.h
index ca3642ca3..640bf41fd 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -323,11 +323,11 @@
#define VAR_RESULT 0x800D
#define VAR_ITEM_ID 0x800E
#define VAR_LAST_TALKED 0x800F
-#define VAR_CONTEST_RANK 0x8010
-#define VAR_CONTEST_CATEGORY 0x8011
-#define VAR_MON_BOX_ID 0x8012
-#define VAR_MON_BOX_POS 0x8013
-#define VAR_TEXT_COLOR 0x8014
+#define VAR_MON_BOX_ID 0x8010
+#define VAR_MON_BOX_POS 0x8011
+#define VAR_TEXT_COLOR 0x8012
+#define VAR_PREV_TEXT_COLOR 0x8013
+#define VAR_0x8014 0x8014 // Unknown/unused
#define SPECIAL_VARS_END 0x8014
diff --git a/src/event_data.c b/src/event_data.c
index 74d1cf608..a162e8701 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -24,7 +24,7 @@ EWRAM_DATA u16 gSpecialVar_MonBoxId = 0;
EWRAM_DATA u16 gSpecialVar_MonBoxPos = 0;
EWRAM_DATA u16 gSpecialVar_TextColor = 0;
EWRAM_DATA u16 gSpecialVar_PrevTextColor = 0;
-EWRAM_DATA u16 gUnknown_20370DE = 0;
+EWRAM_DATA u16 gSpecialVar_0x8014 = 0;
EWRAM_DATA u8 sSpecialFlags[SPECIAL_FLAGS_COUNT] = {};
u16 gLastQuestLogStoredFlagOrVarIdx;
@@ -321,5 +321,5 @@ void ResetSpecialVars(void)
gSpecialVar_MonBoxPos = 0;
gSpecialVar_TextColor = 0;
gSpecialVar_PrevTextColor = 0;
- gUnknown_20370DE = 0;
+ gSpecialVar_0x8014 = 0;
}