Sync obtain_item.inc

5 files changed, 36 insertions, 34 deletions

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;
     }
 }