completely get rid of TextStruct

6 files changed, 19 insertions, 19 deletions

diff --git a/include/script_menu.h b/include/script_menu.h
index 458aad13d..cc5c442ec 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -7,7 +7,7 @@ struct MultichoiceListStruct
     u8 count;
 };
 
-extern const struct TextStruct gUnknown_083CE048[];
+extern const u8 *const gUnknown_083CE048[];
 
 bool8 sub_80B5054(u8 left, u8 top, u8 var3, u8 var4);
 bool8 sub_80B50B0(u8 left, u8 top, u8 var3, u8 var4, u8 var5);
diff --git a/src/item_use.c b/src/item_use.c
index b906f91ad..1750c1584 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -55,7 +55,7 @@ extern u16 gBattleTypeFlags;
 static const u8 gSSTidalBetaString[] = _("この　チケットで　ふねに　のりほうだい\nはやく　のってみたいな");
 static const u8 gSSTidalBetaString2[] = _("この　チケットで　ふねに　のりほうだい\nはやく　のってみたいな");
 
-static const struct TextStruct gUnknown_083D61DC[2] =
+static const u8 *const gUnknown_083D61DC[2] =
 {
     gSSTidalBetaString,
     gSSTidalBetaString2,
@@ -768,11 +768,11 @@ void ItemUseOutOfBattle_SSTicket(u8 taskId)
     if(gTasks[taskId].data[2] == 0)
     {
         MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
-        DisplayItemMessageOnField(taskId, (u8 *)gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)].text, sub_80C9BB8, 1);
+        DisplayItemMessageOnField(taskId, gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)], sub_80C9BB8, 1);
     }
     else
     {
-        DisplayItemMessageOnField(taskId, (u8 *)gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)].text, sub_80C9BD8, 0);
+        DisplayItemMessageOnField(taskId, gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)], sub_80C9BD8, 0);
     }
 }
 
diff --git a/src/player_pc.c b/src/player_pc.c
index 38e01b92e..61a260630 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -100,7 +100,7 @@ static void Mailbox_MoveToBag(u8);
 static void Mailbox_Give(u8);
 static void Mailbox_Cancel(u8);
 
-static const struct TextStruct gPCText_OptionDescList[] =
+static const u8 *const gPCText_OptionDescList[] =
 {
     PCText_TakeOutItems,
     PCText_StoreItems,
@@ -319,7 +319,7 @@ static void InitItemStorageMenu(u8 var)
     MenuDrawTextWindow(0, 0, 11, 9);
     PrintMenuItems(1, 1, 4, (struct MenuAction *)gPCText_ItemPCOptionsText);
     InitMenu(0, 1, 1, 4, var, 10);
-    ItemStorageMenuPrint(gPCText_OptionDescList[var].text);
+    ItemStorageMenuPrint(gPCText_OptionDescList[var]);
 }
 
 static void ItemStorageMenuPrint(const u8 *textPtr)
@@ -334,13 +334,13 @@ static void ItemStorageMenuProcessInput(u8 var)
     {
         PlaySE(SE_SELECT);
         MoveMenuCursor(-1);
-        ItemStorageMenuPrint(gPCText_OptionDescList[GetMenuCursorPos()].text);
+        ItemStorageMenuPrint(gPCText_OptionDescList[GetMenuCursorPos()]);
     }
     else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
     {
         PlaySE(SE_SELECT);
         MoveMenuCursor(1);
-        ItemStorageMenuPrint(gPCText_OptionDescList[GetMenuCursorPos()].text);
+        ItemStorageMenuPrint(gPCText_OptionDescList[GetMenuCursorPos()]);
     }
     else if (gMain.newKeys & A_BUTTON)
     {
diff --git a/src/scrcmd.c b/src/scrcmd.c
index a394f2a55..45552f2fa 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1416,7 +1416,7 @@ bool8 ScrCmd_bufferstd(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 index = VarGet(ScriptReadHalfword(ctx));
-    StringCopy(sScriptStringVars[stringVarIndex], gUnknown_083CE048[index].text);
+    StringCopy(sScriptStringVars[stringVarIndex], gUnknown_083CE048[index]);
     return FALSE;
 }
 
diff --git a/src/script_menu.c b/src/script_menu.c
index e1ad3f467..f4ac55fb9 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -547,7 +547,7 @@ const struct MultichoiceListStruct gMultichoiceLists[] =
     {(struct MenuAction *)MultichoiceList_72, 5}
 };
 
-const struct TextStruct gUnknown_083CE048[] =
+const u8 *const gUnknown_083CE048[] =
 {
     OtherText_Cool2,
     OtherText_Beauty3,
diff --git a/src/tv.c b/src/tv.c
index 27fe9b84c..4701c7b8e 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1470,16 +1470,16 @@ void sub_80BEF10(u8 strvaridx, u8 rank)
     switch (rank)
     {
     case NORMAL_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[NORMAL_RANK + 5].text);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[NORMAL_RANK + 5]);
         break;
     case SUPER_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[SUPER_RANK + 5].text);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[SUPER_RANK + 5]);
         break;
     case HYPER_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[HYPER_RANK + 5].text);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[HYPER_RANK + 5]);
         break;
     case MASTER_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[MASTER_RANK + 5].text);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[MASTER_RANK + 5]);
         break;
     }
 }
@@ -1489,19 +1489,19 @@ void CopyContestCategoryToStringVar(u8 strvaridx, u8 category)
     switch (category)
     {
     case CONTEST_COOL:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_COOL].text);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_COOL]);
         break;
     case CONTEST_BEAUTY:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_BEAUTY].text);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_BEAUTY]);
         break;
     case CONTEST_CUTE:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_CUTE].text);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_CUTE]);
         break;
     case CONTEST_SMART:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_SMART].text);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_SMART]);
         break;
     case CONTEST_TOUGH:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_TOUGH].text);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_TOUGH]);
         break;
     }
 }