Sync obtain_item.inc

11 files changed, 237 insertions, 360 deletions

diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 8fe15bfb0..6d4122e84 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -17,6 +17,7 @@
 #include "constants/map_scripts.h"
 #include "constants/pokemon.h"
 #include "constants/berry.h"
+#include "constants/script_menu.h"
 	.include "include/macros.inc"
 	.include "include/macros/event.inc"
 	.include "constants/constants.inc"
@@ -800,168 +801,7 @@ EventScript_SetBrineyLocation_Route109:: @ 819FD55
 	return
 
 	.include "data/scripts/pkmn_center_nurse.inc"
-
-Std_ObtainItem: @ 819FDF7
-	additem VAR_0x8000, VAR_0x8001
-	copyvar VAR_0x8007, VAR_RESULT
-	call Std_ObtainItem_
-	return
-
-Std_ObtainItem_: @ 819FE07
-	bufferitemname 1, VAR_0x8000
-	checkitemtype VAR_0x8000
-	call GetItem_HandlePocket
-	compare VAR_0x8007, 0x1
-	call_if_eq Std_ObtainItem_Success
-	compare VAR_0x8007, 0x0
-	call_if_eq Std_ObtainItem_Fail
-	return
-
-GetItem_HandlePocket:
-	switch VAR_RESULT
-	case POCKET_ITEMS,      GetItem_HandlePocket_Items
-	case POCKET_KEY_ITEMS,  GetItem_HandlePocket_KeyItems
-	case POCKET_POKE_BALLS, GetItem_HandlePocket_PokeBalls
-	case POCKET_TM_HM,      GetItem_HandlePocket_TMsHMs
-	case POCKET_BERRIES,    GetItem_HandlePocket_Berries
-	end
-
-GetItem_HandlePocket_Items:
-	bufferstdstring 2, 0xE
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-GetItem_HandlePocket_KeyItems:
-	bufferstdstring 2, 0xF
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-GetItem_HandlePocket_PokeBalls:
-	bufferstdstring 2, 0x10
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-GetItem_HandlePocket_TMsHMs:
-	bufferstdstring 2, 0x11
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetTMHMFanfare
-	return
-
-GetItem_HandlePocket_Berries:
-	bufferstdstring 2, 0x12
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-Std_ObtainItem_Success: @ 819FEB7
-	message Message_ObtainedItem
-	waitfanfare
-	waitmessage
-	msgbox Message_PutAwayItem
-	setvar VAR_RESULT, 1
-	return
-
-Std_ObtainItem_Fail: @ 819FECC
-	setvar VAR_RESULT, 0
-	return
-
-PlayGetItemFanfare:
-	playfanfare MUS_FANFA4
-	return
-
-PlayGetTMHMFanfare:
-	playfanfare MUS_ME_WAZA
-	return
-
-Std_ObtainDecoration: @ 819FEDA
-	adddecoration VAR_0x8000
-	copyvar VAR_0x8007, VAR_RESULT
-	call Std_ObtainDecoration_
-	return
-
-Std_ObtainDecoration_: @ 819FEE8
-	bufferdecorationname 1, VAR_0x8000
-	compare VAR_0x8007, 1
-	call_if_eq Std_ObtainDecoration_Success
-	compare VAR_0x8007, 0
-	call_if_eq Std_ObtainDecoration_Fail
-	return
-
-Std_ObtainDecoration_Success: @ 819FF03
-	playfanfare MUS_FANFA4
-	message Message_ObtainedDecoration
-	waitfanfare
-	waitmessage
-	msgbox Message_TransferredToPC
-	setvar VAR_RESULT, 1
-	return
-
-Std_ObtainDecoration_Fail: @ 819FF1B
-	setvar VAR_RESULT, 0
-	return
-
-Std_FindItem: @ 819FF21
-	lock
-	faceplayer
-	waitse
-	additem VAR_0x8000, VAR_0x8001
-	copyvar VAR_0x8007, VAR_RESULT
-	bufferitemname 1, VAR_0x8000
-	checkitemtype VAR_0x8000
-	call GetItem_HandlePocket
-	compare VAR_0x8007, 1
-	call_if_eq Std_FindItem_Success
-	compare VAR_0x8007, 0
-	call_if_eq Std_FindItem_Fail
-	release
-	return
-
-Std_FindItem_Success: @ 819FF52
-	removeobject VAR_LAST_TALKED
-	message Message_FoundOneItem
-	waitfanfare
-	waitmessage
-	msgbox Message_PutAwayItem
-	return
-
-Std_FindItem_Fail: @ 819FF65
-	msgbox Message_ObtainedItem
-	msgbox Message_BagFull
-	setvar VAR_RESULT, 0
-	return
-
-HiddenItemScript:: @ 819FF7B
-	lockall
-	waitse
-	additem VAR_0x8005
-	copyvar VAR_0x8007, VAR_RESULT
-	bufferitemname 0x1, VAR_0x8005
-	checkitemtype VAR_0x8005
-	call GetItem_HandlePocket
-	compare VAR_0x8007, 1
-	goto_if_eq HiddenItemScript_Success
-	compare VAR_0x8007, 0
-	goto_if_eq HiddenItemScript_Fail
-	end
-
-HiddenItemScript_Success:
-	message Message_FoundOneItem
-	waitfanfare
-	waitmessage
-	msgbox Message_PutAwayItem
-	special SetFlagInVar
-	releaseall
-	end
-
-HiddenItemScript_Fail:
-	msgbox Message_FoundOneItem
-	msgbox Message_BagFull
-	setvar VAR_RESULT, 0
-	releaseall
-	end
+	.include "data/scripts/obtain_item.inc"
 
 UnusedMixRecordsScript: @ 819FFD5
 	lock
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 01a61b904..1c48b8501 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -17,6 +17,7 @@
 #include "constants/map_scripts.h"
 #include "constants/pokemon.h"
 #include "constants/berry.h"
+#include "constants/script_menu.h"
 	.include "include/macros.inc"
 	.include "include/macros/event.inc"
 	.include "constants/constants.inc"
@@ -799,168 +800,7 @@ EventScript_SetBrineyLocation_Route109:: @ 819FD55
 	return
 
 	.include "data/scripts/pkmn_center_nurse.inc"
-
-Std_ObtainItem: @ 819FDF7
-	additem VAR_0x8000, VAR_0x8001
-	copyvar VAR_0x8007, VAR_RESULT
-	call Std_ObtainItem_
-	return
-
-Std_ObtainItem_: @ 819FE07
-	bufferitemname 1, VAR_0x8000
-	checkitemtype VAR_0x8000
-	call GetItem_HandlePocket
-	compare VAR_0x8007, 0x1
-	call_if_eq Std_ObtainItem_Success
-	compare VAR_0x8007, 0x0
-	call_if_eq Std_ObtainItem_Fail
-	return
-
-GetItem_HandlePocket:
-	switch VAR_RESULT
-	case POCKET_ITEMS,      GetItem_HandlePocket_Items
-	case POCKET_KEY_ITEMS,  GetItem_HandlePocket_KeyItems
-	case POCKET_POKE_BALLS, GetItem_HandlePocket_PokeBalls
-	case POCKET_TM_HM,      GetItem_HandlePocket_TMsHMs
-	case POCKET_BERRIES,    GetItem_HandlePocket_Berries
-	end
-
-GetItem_HandlePocket_Items:
-	bufferstdstring 2, 0xE
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-GetItem_HandlePocket_KeyItems:
-	bufferstdstring 2, 0xF
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-GetItem_HandlePocket_PokeBalls:
-	bufferstdstring 2, 0x10
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-GetItem_HandlePocket_TMsHMs:
-	bufferstdstring 2, 0x11
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetTMHMFanfare
-	return
-
-GetItem_HandlePocket_Berries:
-	bufferstdstring 2, 0x12
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-Std_ObtainItem_Success: @ 819FEB7
-	message Message_ObtainedItem
-	waitfanfare
-	waitmessage
-	msgbox Message_PutAwayItem
-	setvar VAR_RESULT, 1
-	return
-
-Std_ObtainItem_Fail: @ 819FECC
-	setvar VAR_RESULT, 0
-	return
-
-PlayGetItemFanfare:
-	playfanfare MUS_FANFA4
-	return
-
-PlayGetTMHMFanfare:
-	playfanfare MUS_ME_WAZA
-	return
-
-Std_ObtainDecoration: @ 819FEDA
-	adddecoration VAR_0x8000
-	copyvar VAR_0x8007, VAR_RESULT
-	call Std_ObtainDecoration_
-	return
-
-Std_ObtainDecoration_: @ 819FEE8
-	bufferdecorationname 1, VAR_0x8000
-	compare VAR_0x8007, 1
-	call_if_eq Std_ObtainDecoration_Success
-	compare VAR_0x8007, 0
-	call_if_eq Std_ObtainDecoration_Fail
-	return
-
-Std_ObtainDecoration_Success: @ 819FF03
-	playfanfare MUS_FANFA4
-	message Message_ObtainedDecoration
-	waitfanfare
-	waitmessage
-	msgbox Message_TransferredToPC
-	setvar VAR_RESULT, 1
-	return
-
-Std_ObtainDecoration_Fail: @ 819FF1B
-	setvar VAR_RESULT, 0
-	return
-
-Std_FindItem: @ 819FF21
-	lock
-	faceplayer
-	waitse
-	additem VAR_0x8000, VAR_0x8001
-	copyvar VAR_0x8007, VAR_RESULT
-	bufferitemname 1, VAR_0x8000
-	checkitemtype VAR_0x8000
-	call GetItem_HandlePocket
-	compare VAR_0x8007, 1
-	call_if_eq Std_FindItem_Success
-	compare VAR_0x8007, 0
-	call_if_eq Std_FindItem_Fail
-	release
-	return
-
-Std_FindItem_Success: @ 819FF52
-	removeobject VAR_LAST_TALKED
-	message Message_FoundOneItem
-	waitfanfare
-	waitmessage
-	msgbox Message_PutAwayItem
-	return
-
-Std_FindItem_Fail: @ 819FF65
-	msgbox Message_ObtainedItem
-	msgbox Message_BagFull
-	setvar VAR_RESULT, 0
-	return
-
-HiddenItemScript:: @ 819FF7B
-	lockall
-	waitse
-	additem VAR_0x8005
-	copyvar VAR_0x8007, VAR_RESULT
-	bufferitemname 0x1, VAR_0x8005
-	checkitemtype VAR_0x8005
-	call GetItem_HandlePocket
-	compare VAR_0x8007, 1
-	goto_if_eq HiddenItemScript_Success
-	compare VAR_0x8007, 0
-	goto_if_eq HiddenItemScript_Fail
-	end
-
-HiddenItemScript_Success:
-	message Message_FoundOneItem
-	waitfanfare
-	waitmessage
-	msgbox Message_PutAwayItem
-	special SetFlagInVar
-	releaseall
-	end
-
-HiddenItemScript_Fail:
-	msgbox Message_FoundOneItem
-	msgbox Message_BagFull
-	setvar VAR_RESULT, 0
-	releaseall
-	end
+	.include "data/scripts/obtain_item.inc"
 
 UnusedMixRecordsScript: @ 819FFD5
 	lock
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
new file mode 100644
index 000000000..0dced2de8
--- /dev/null
+++ b/data/scripts/obtain_item.inc
@@ -0,0 +1,161 @@
+Std_ObtainItem: @ 819FDF7
+	additem VAR_0x8000, VAR_0x8001
+	copyvar VAR_0x8007, VAR_RESULT
+	call EventScript_ObtainItemMessage
+	return
+
+EventScript_ObtainItemMessage: @ 819FE07
+	bufferitemname 1, VAR_0x8000
+	checkitemtype VAR_0x8000
+	call EventScript_BufferPocketNameAndTryFanfare
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_ObtainedItem
+	compare VAR_0x8007, FALSE
+	call_if_eq EventScript_NoRoomForItem
+	return
+
+EventScript_BufferPocketNameAndTryFanfare:
+	switch VAR_RESULT
+	case POCKET_ITEMS,	    EventScript_BufferItemsPocket
+	case POCKET_KEY_ITEMS,  EventScript_BufferKeyItemsPocket
+	case POCKET_POKE_BALLS, EventScript_BufferPokeballsPocket
+	case POCKET_TM_HM,	    EventScript_BufferTMHMsPocket
+	case POCKET_BERRIES,	EventScript_BufferBerriesPocket
+	end
+
+EventScript_BufferItemsPocket:
+	bufferstdstring 2, STDSTRING_ITEMS
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_BufferKeyItemsPocket:
+	bufferstdstring 2, STDSTRING_KEYITEMS
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_BufferPokeballsPocket:
+	bufferstdstring 2, STDSTRING_POKEBALLS
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_BufferTMHMsPocket:
+	bufferstdstring 2, STDSTRING_TMHMS
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PlayFanfareObtainedTMHM
+	return
+
+EventScript_BufferBerriesPocket:
+	bufferstdstring 2, STDSTRING_BERRIES
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_ObtainedItem: @ 819FEB7
+	message Message_ObtainedItem
+	waitfanfare
+	waitmessage
+	msgbox Message_PutAwayItem
+	setvar VAR_RESULT, TRUE
+	return
+
+EventScript_NoRoomForItem: @ 819FECC
+	setvar VAR_RESULT, FALSE
+	return
+
+EventScript_PlayFanfareObtainedItem:
+	playfanfare MUS_FANFA4
+	return
+
+EventScript_PlayFanfareObtainedTMHM:
+	playfanfare MUS_ME_WAZA
+	return
+
+Std_ObtainDecoration: @ 819FEDA
+	adddecoration VAR_0x8000
+	copyvar VAR_0x8007, VAR_RESULT
+	call EventScript_ObtainDecorationMessage
+	return
+
+EventScript_ObtainDecorationMessage: @ 819FEE8
+	bufferdecorationname 1, VAR_0x8000
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_ObtainedDecor
+	compare VAR_0x8007, FALSE
+	call_if_eq EventScript_NoRoomForDecor
+	return
+
+EventScript_ObtainedDecor: @ 819FF03
+	playfanfare MUS_FANFA4
+	message Message_ObtainedDecoration
+	waitfanfare
+	waitmessage
+	msgbox Message_TransferredToPC
+	setvar VAR_RESULT, TRUE
+	return
+
+EventScript_NoRoomForDecor: @ 819FF1B
+	setvar VAR_RESULT, FALSE
+	return
+
+Std_FindItem: @ 819FF21
+	lock
+	faceplayer
+	waitse
+	additem VAR_0x8000, VAR_0x8001
+	copyvar VAR_0x8007, VAR_RESULT
+	bufferitemname 1, VAR_0x8000
+	checkitemtype VAR_0x8000
+	call EventScript_BufferPocketNameAndTryFanfare
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PickUpItem
+	compare VAR_0x8007, FALSE
+	call_if_eq EventScript_NoRoomToPickUpItem
+	release
+	return
+
+EventScript_PickUpItem: @ 819FF52
+	removeobject VAR_LAST_TALKED
+	message Message_FoundOneItem
+	waitfanfare
+	waitmessage
+	msgbox Message_PutAwayItem
+	return
+
+EventScript_NoRoomToPickUpItem: @ 819FF65
+	msgbox Message_ObtainedItem
+	msgbox Message_BagFull
+	setvar VAR_RESULT, FALSE
+	return
+
+EventScript_HiddenItem:: @ 819FF7B
+	lockall
+	waitse
+	additem VAR_0x8005
+	copyvar VAR_0x8007, VAR_RESULT
+	bufferitemname 1, VAR_0x8005
+	checkitemtype VAR_0x8005
+	call EventScript_BufferPocketNameAndTryFanfare
+	compare VAR_0x8007, TRUE
+	goto_if_eq EventScript_PickUpHiddenItem
+	compare VAR_0x8007, FALSE
+	goto_if_eq EventScript_NoRoomToPickUpHiddenItem
+	end
+
+EventScript_PickUpHiddenItem:
+	message Message_FoundOneItem
+	waitfanfare
+	waitmessage
+	msgbox Message_PutAwayItem
+	special SetHiddenItemFlag
+	releaseall
+	end
+
+EventScript_NoRoomToPickUpHiddenItem:
+	msgbox Message_FoundOneItem
+	msgbox Message_BagFull
+	setvar VAR_RESULT, FALSE
+	releaseall
+	end
diff --git a/data/specials.inc b/data/specials.inc
index 1427c284e..71e39c654 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -158,7 +158,7 @@ gSpecials::
 	def_special GetPlayerTrainerIdOnesDigit
 	def_special GetPlayerBigGuyGirlString
 	def_special GetRivalSonDaughterString
-	def_special SetFlagInVar
+	def_special SetHiddenItemFlag
 	def_special CableCarWarp
 	def_special CableCar
 	def_special Overworld_PlaySpecialMapMusic
diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h
new file mode 100644
index 000000000..fc429b620
--- /dev/null
+++ b/include/constants/script_menu.h
@@ -0,0 +1,34 @@
+#ifndef GUARD_SCRIPT_MENU_CONSTANTS_H
+#define GUARD_SCRIPT_MENU_CONSTANTS_H
+
+#define MULTICHOICE(name) {name, ARRAY_COUNT(name)}
+
+#define MAX_MULTICHOICE_WIDTH 28
+
+#define MULTI_B_PRESSED  127
+
+// Multichoice Ids
+// TODO
+
+// Std String Ids
+#define STDSTRING_COOL             0
+#define STDSTRING_BEAUTY           1
+#define STDSTRING_CUTE             2
+#define STDSTRING_SMART            3
+#define STDSTRING_TOUGH            4
+#define STDSTRING_NORMAL           5
+#define STDSTRING_SUPER            6
+#define STDSTRING_HYPER            7
+#define STDSTRING_MASTER           8
+#define STDSTRING_COOL2            9
+#define STDSTRING_BEAUTY2          10
+#define STDSTRING_CUTE2            11
+#define STDSTRING_SMART2           12
+#define STDSTRING_TOUGH2           13
+#define STDSTRING_ITEMS            14
+#define STDSTRING_KEYITEMS         15
+#define STDSTRING_POKEBALLS        16
+#define STDSTRING_TMHMS            17
+#define STDSTRING_BERRIES          18
+
+#endif //GUARD_SCRIPT_MENU_CONSTANTS_H
diff --git a/include/script_menu.h b/include/script_menu.h
index dca8c26a7..e63d03b2c 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -3,7 +3,7 @@
 
 struct MenuAction;
 
-extern const u8 *const gUnknown_083CE048[];
+extern const u8 *const gStdStrings[];
 
 bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4);
 bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5);
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index b67f11ae2..1fe046b0e 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -53,7 +53,7 @@ extern u8 SecretBase_EventScript_PC[];
 extern u8 SecretBase_EventScript_RecordMixingPC[];
 extern u8 gUnknown_081A0009[];
 extern u8 gUnknown_081C6C02[];
-extern u8 HiddenItemScript[];
+extern u8 EventScript_HiddenItem[];
 extern u8 Event_TV[];
 extern u8 gUnknown_081A0009[];
 extern u8 ClosedSootopolisDoorScript[];
@@ -435,7 +435,7 @@ static u8 *GetInteractedBackgroundEventScript(struct MapPosition *position, u8 m
         gSpecialVar_0x8005 = (u32)bgEvent->bgUnion.script;
         if (FlagGet(gSpecialVar_0x8004) == TRUE)
             return NULL;
-        return HiddenItemScript;
+        return EventScript_HiddenItem;
     case BG_EVENT_SECRET_BASE:
         if (direction == DIR_NORTH)
         {
diff --git a/src/field_specials.c b/src/field_specials.c
index 4abdc186d..6900db78a 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -722,7 +722,7 @@ void CableCarWarp(void)
     }
 }
 
-void SetFlagInVar(void)
+void SetHiddenItemFlag(void)
 {
     FlagSet(gSpecialVar_0x8004);
 }
diff --git a/src/scrcmd.c b/src/scrcmd.c
index fa13fa522..4d3f7ca2c 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1513,7 +1513,7 @@ bool8 ScrCmd_bufferstdstring(struct ScriptContext *ctx)
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 index = VarGet(ScriptReadHalfword(ctx));
 
-    StringCopy(sScriptStringVars[stringVarIndex], gUnknown_083CE048[index]);
+    StringCopy(sScriptStringVars[stringVarIndex], gStdStrings[index]);
     return FALSE;
 }
 
diff --git a/src/script_menu.c b/src/script_menu.c
index 1a7489c82..20787878a 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -11,6 +11,7 @@
 #include "sprite.h"
 #include "strings.h"
 #include "task.h"
+#include "constants/script_menu.h"
 
 // multichoice lists
 const struct MenuAction MultichoiceList_00[] =
@@ -555,27 +556,27 @@ const struct MultichoiceListStruct gMultichoiceLists[] =
     {MultichoiceList_72, ARRAY_COUNT(MultichoiceList_72)},
 };
 
-const u8 *const gUnknown_083CE048[] =
-{
-    OtherText_Cool2,
-    OtherText_Beauty3,
-    OtherText_Cute2,
-    OtherText_Smart2,
-    OtherText_Tough2,
-    OtherText_Normal,
-    OtherText_Super,
-    OtherText_Hyper,
-    OtherText_Master,
-    OtherText_Cool3,
-    OtherText_Beauty4,
-    OtherText_Cute3,
-    OtherText_Smart3,
-    OtherText_Tough3,
-    OtherText_Items,
-    OtherText_KeyItems,
-    OtherText_Balls,
-    OtherText_TMsHMs,
-    OtherText_Berries,
+const u8 *const gStdStrings[] =
+{
+    [STDSTRING_COOL]      = OtherText_Cool2,
+    [STDSTRING_BEAUTY]    = OtherText_Beauty3,
+    [STDSTRING_CUTE]      = OtherText_Cute2,
+    [STDSTRING_SMART]     = OtherText_Smart2,
+    [STDSTRING_TOUGH]     = OtherText_Tough2,
+    [STDSTRING_NORMAL]    = OtherText_Normal,
+    [STDSTRING_SUPER]     = OtherText_Super,
+    [STDSTRING_HYPER]     = OtherText_Hyper,
+    [STDSTRING_MASTER]    = OtherText_Master,
+    [STDSTRING_COOL2]     = OtherText_Cool3,
+    [STDSTRING_BEAUTY2]   = OtherText_Beauty4,
+    [STDSTRING_CUTE2]     = OtherText_Cute3,
+    [STDSTRING_SMART2]    = OtherText_Smart3,
+    [STDSTRING_TOUGH2]    = OtherText_Tough3,
+    [STDSTRING_ITEMS]     = OtherText_Items,
+    [STDSTRING_KEYITEMS]  = OtherText_KeyItems,
+    [STDSTRING_POKEBALLS] = OtherText_Balls,
+    [STDSTRING_TMHMS]     = OtherText_TMsHMs,
+    [STDSTRING_BERRIES]   = OtherText_Berries,
 };
 
 extern u8 gPCText_WhichPCShouldBeAccessed[];
diff --git a/src/tv.c b/src/tv.c
index dd4116bf6..6e67662bd 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -43,6 +43,7 @@
 #include "constants/moves.h"
 #include "constants/region_map_sections.h"
 #include "constants/metatile_labels.h"
+#include "constants/script_menu.h"
 
 struct UnkTvStruct
 {
@@ -1512,16 +1513,16 @@ void sub_80BEF10(u8 strvaridx, u8 rank)
     switch (rank)
     {
     case NORMAL_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[NORMAL_RANK + 5]);
+        StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_NORMAL]);
         break;
     case SUPER_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[SUPER_RANK + 5]);
+        StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_SUPER]);
         break;
     case HYPER_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[HYPER_RANK + 5]);
+        StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_HYPER]);
         break;
     case MASTER_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[MASTER_RANK + 5]);
+        StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_MASTER]);
         break;
     }
 }
@@ -1531,19 +1532,19 @@ void CopyContestCategoryToStringVar(u8 strvaridx, u8 category)
     switch (category)
     {
     case CONTEST_COOL:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_COOL]);
+        StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_COOL]);
         break;
     case CONTEST_BEAUTY:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_BEAUTY]);
+        StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_BEAUTY]);
         break;
     case CONTEST_CUTE:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_CUTE]);
+        StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_CUTE]);
         break;
     case CONTEST_SMART:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_SMART]);
+        StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_SMART]);
         break;
     case CONTEST_TOUGH:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_TOUGH]);
+        StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_TOUGH]);
         break;
     }
 }