Add strings2.h

21 files changed, 24 insertions, 103 deletions

diff --git a/src/battle_records.c b/src/battle_records.c
index 3290bbebe..35fd3284b 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -1,8 +1,6 @@
 #include "global.h"
 #include "menu.h"
-
-extern const u8 gOtherText_BattleResults[];
-extern const u8 gOtherText_WinLoseDraw[];
+#include "strings2.h"
 
 void PrintLinkBattleWinsLossesDraws(void *);
 
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c
index 293e2f24d..45dc59094 100644
--- a/src/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
@@ -11,6 +11,7 @@
 #include "species.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "strings2.h"
 #include "text.h"
 
 extern u8 gPlayerPartyCount;
@@ -34,7 +35,6 @@ extern u16 gTrainerBattleOpponent;
 extern struct PokemonStorage gPokemonStorage;
 
 extern u8 gBadEggNickname[];
-extern u8 gEggNickname[];
 extern u32 gBitTable[];
 extern struct BaseStats gBaseStats[];
 extern u8 gSpeciesNames[][11];
diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c
index 21cd643ef..2d0e3a551 100644
--- a/src/clear_save_data_menu.c
+++ b/src/clear_save_data_menu.c
@@ -7,10 +7,9 @@
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
+#include "strings2.h"
 #include "task.h"
 
-extern u8 gSystemText_ClearAllSaveDataPrompt[];
-extern u8 gSystemText_ClearingData[];
 extern const struct MenuAction gMenuYesNoItems[];
 
 static void VBlankCB_ClearSaveDataScreen(void);
diff --git a/src/diploma.c b/src/diploma.c
index c32b72a70..80adac8f7 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -7,13 +7,10 @@
 #include "rom4.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "strings2.h"
 #include "task.h"
 #include "text.h"
 
-extern u8 gOtherText_NationalDex[];
-extern u8 gOtherText_HoennDex[];
-extern u8 gOtherText_DiplomaCertificationGameFreak[];
-
 static void VBlankCB(void);
 static void MainCB2(void);
 static void Task_DiplomaFadeIn(u8);
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 86719a2ae..678b25a0e 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -7,6 +7,7 @@
 #include "rng.h"
 #include "string_util.h"
 #include "strings.h"
+#include "strings2.h"
 #include "text.h"
 
 u8 sub_80EB37C(u16);
@@ -28,8 +29,6 @@ extern const u8 gEasyChatGroupSizes[];
 
 extern u16 gSpecialVar_0x8004;
 
-extern const u8 gOtherText_ThreeQuestions[];
-
 #ifdef NONMATCHING
 u8 *sub_80EB3FC(u8 *dst, u16 word) {
     int group, wordIndex;
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 6a0fe1dce..c1b892f15 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -16,14 +16,10 @@
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
+#include "strings2.h"
 #include "task.h"
 #include "wild_encounter.h"
 
-extern u8 gOtherText_OhABite[];
-extern u8 gOtherText_PokeOnHook[];
-extern u8 gOtherText_NotEvenANibble[];
-extern u8 gOtherText_ItGotAway[];
-
 extern u32 gUnknown_0202FF84[];
 
 //Functions
diff --git a/src/field_region_map.c b/src/field_region_map.c
index ec630ad00..66e3d968c 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -5,6 +5,7 @@
 #include "palette.h"
 #include "sprite.h"
 #include "text.h"
+#include "strings2.h"
 
 extern void sub_80FA8EC(u32, u8);
 extern void sub_80FAB10(void);
@@ -29,8 +30,6 @@ struct UnkStruct
 
 extern struct UnkStruct unk_2000000;
 
-extern u8 gOtherText_Hoenn[];
-
 void CB2_FieldInitRegionMap(void);
 void CB2_FieldRegionMap(void);
 void VBlankCB_FieldRegionMap(void);
diff --git a/src/link.c b/src/link.c
index 224c0ae1c..7cf2fc611 100644
--- a/src/link.c
+++ b/src/link.c
@@ -10,6 +10,7 @@
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
+#include "strings2.h"
 #include "task.h"
 #include "text.h"
 
@@ -39,8 +40,6 @@ extern u16 gScriptItemId;
 
 extern u16 word_3004858;
 
-extern u8 gMultiText_LinkError[];
-
 static void InitLinkTestBG(u8, u8, u8, u8);
 void InitLinkTestBG_Unused(u8, u8, u8, u8);
 void LinkTestScreen();
diff --git a/src/mail.c b/src/mail.c
index 807864332..4ec107011 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -8,6 +8,7 @@
 #include "rom4.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "strings2.h"
 #include "task.h"
 #include "text.h"
 
@@ -70,8 +71,6 @@ extern u16 gUnknown_083E562C[][2];
 extern struct MailLayout gUnknown_083E5730[];
 extern struct MailLayout gUnknown_083E57A4[];
 
-extern u8 gOtherText_From[];
-
 static u8 sub_80F8A28(void);
 static void sub_80F8D50(void);
 static void sub_80F8DA0(void);
diff --git a/src/menu.c b/src/menu.c
index f9b9dbf0b..61eaebb6f 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -173,7 +173,7 @@ void MenuDrawTextWindow(u8 left, u8 top, u8 right, u8 bottom)
     DrawTextWindow(gMenuWindowPtr, left, top, right, bottom);
 }
 
-void sub_8071F40(u8 *str)
+void sub_8071F40(const u8 *str)
 {
     MenuDrawTextWindow(2, 14, 28, 19);
     MenuPrint(str, 3, 15);
@@ -637,7 +637,7 @@ void sub_8072B80(u8 *a1, u8 a2, u8 a3, u8 *a4)
     sub_8003460(gMenuWindowPtr, buffer, gMenuTextTileOffset, a2, a3);
 }
 
-void sub_8072BD8(u8 *a1, u8 a2, u8 a3, u16 a4)
+void sub_8072BD8(const u8 *a1, u8 a2, u8 a3, u16 a4)
 {
     sub_8004DB0(gMenuWindowPtr, a1, gMenuTextTileOffset, a2, a3, a4);
 }
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 97deb348c..e219354ff 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -10,19 +10,13 @@
 #include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "strings2.h"
 #include "task.h"
 #include "text.h"
 
 extern u8 unk_2000000[];
 extern u8 gUnknown_02039338;
 
-extern u8 gSystemText_LinkStandby[];
-extern u8 gSystemText_LoadEventPressA[];
-extern u8 gSystemText_LoadingEvent[];
-extern u8 gSystemText_DontCutLink[];
-extern u8 gSystemText_EventLoadSuccess[];
-extern u8 gSystemText_LoadingError[];
-
 static void VBlankCB(void);
 static bool8 CheckLanguageMatch(void);
 static bool8 GetEventLoadMessage(u8 *dest, u32 status);
diff --git a/src/naming_screen.c b/src/naming_screen.c
index b14c690e2..8c90686ee 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -8,6 +8,7 @@
 #include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "strings2.h"
 #include "task.h"
 #include "text.h"
 #include "trig.h"
@@ -48,7 +49,6 @@ extern const struct SpriteTemplate gSpriteTemplate_83CE670;
 extern const struct SpriteTemplate gSpriteTemplate_83CE688;
 extern const struct SpriteSheet gUnknown_083CE6A0[];
 extern const struct SpritePalette gUnknown_083CE708[];
-extern const u8 gOtherText_SentToPC[];
 extern const u8 gNamingScreenMenu_Gfx[];
 extern u16 gMenuMessageBoxContentTileOffset;
 extern const u16 gNamingScreenPalettes[];
@@ -57,9 +57,6 @@ extern const u16 gUnknown_083CEBF8[];
 extern const u16 gUnknown_083CF0A8[];
 extern const u16 gUnknown_08E86258[];
 extern const u8 gSpeciesNames[][11];
-extern const u8 OtherText_YourName[];
-extern const u8 OtherText_BoxName[];
-extern const u8 OtherText_PokeName[];
 
 static void C2_NamingScreen(void);
 static void sub_80B5AA0(void);
diff --git a/src/option_menu.c b/src/option_menu.c
index 613012972..40870e3ce 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -4,6 +4,7 @@
 #include "menu.h"
 #include "palette.h"
 #include "sprite.h"
+#include "strings2.h"
 #include "task.h"
 
 extern void SetPokemonCryStereo(u32 val);
@@ -33,28 +34,6 @@ enum {
 
 extern u8 gUnknown_0839F63C[];
 extern u8 gUnknown_0839F5FC[];  //palette
-extern u8 gSystemText_Normal[];
-extern u8 gSystemText_LR[];
-extern u8 gSystemText_LA[];
-extern u8 gSystemText_Terminator[];
-extern u8 gSystemText_Type[];
-extern u8 gSystemText_Mono[];
-extern u8 gSystemText_Stereo[];
-extern u8 gSystemText_Shift[];
-extern u8 gSystemText_Set[];
-extern u8 gSystemText_On[];
-extern u8 gSystemText_Off[];
-extern u8 gSystemText_Slow[];
-extern u8 gSystemText_Mid[];
-extern u8 gSystemText_Fast[];
-extern u8 gSystemText_OptionMenu[];
-extern u8 gSystemText_TextSpeed[];
-extern u8 gSystemText_BattleScene[];
-extern u8 gSystemText_BattleStyle[];
-extern u8 gSystemText_Sound[];
-extern u8 gSystemText_ButtonMode[];
-extern u8 gSystemText_Frame[];
-extern u8 gSystemText_Cancel[];
 
 static void Task_OptionMenuFadeIn(u8 taskId);
 static void Task_OptionMenuProcessInput(u8 taskId);
@@ -323,7 +302,7 @@ static void HighlightOptionMenuItem(u8 index)
     REG_WIN1V = WIN_RANGE_(index * 16 + 40, index * 16 + 56);
 }
 
-static void DrawOptionMenuChoice(u8 *text, u8 x, u8 y, u8 style)
+static void DrawOptionMenuChoice(const u8 *text, u8 x, u8 y, u8 style)
 {
     u8 dst[16];
     u16 i;
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 3be11f453..54efc0fc8 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -8,6 +8,7 @@
 #include "sprite.h"
 #include "string_util.h"
 #include "text.h"
+#include "strings2.h"
 
 extern u8 gPlayerPartyCount;
 extern struct Pokemon gPlayerParty[6];
@@ -34,7 +35,6 @@ extern u16 gTrainerBattleOpponent;
 extern struct PokemonStorage gPokemonStorage;
 
 extern u8 gBadEggNickname[];
-extern u8 gEggNickname[];
 extern u32 gBitTable[];
 extern struct BaseStats gBaseStats[];
 extern u8 gSpeciesNames[][11];
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index 6540858c1..3406a818b 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -3,6 +3,7 @@
 #include "event_data.h"
 #include "species.h"
 #include "string_util.h"
+#include "strings2.h"
 #include "text.h"
 
 extern u16 SpeciesToNationalPokedexNum(u16);
@@ -15,7 +16,6 @@ struct UnknownStruct
     u16 unk4;
 };
 
-extern u8 gOtherText_Marco[];
 extern u16 gScriptResult;
 extern u8 gSpeciesNames[][11];
 
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 5f96512f0..56a56e455 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -4,22 +4,11 @@
 #include "menu.h"
 #include "pokemon.h"
 #include "string_util.h"
+#include "strings2.h"
 
 extern struct Pokemon *unk_2018000;
 
 extern u8 *(gNatureNames[]);
-extern const u8 gOtherText_Terminator4[];
-extern const u8 gOtherText_Nature[];
-
-extern const u8 gOtherText_Met[];
-extern const u8 gOtherText_Egg2[];
-extern const u8 gOtherText_ObtainedInTrade[];
-extern const u8 gOtherText_FatefulEncounter[];
-extern const u8 gOtherText_Met2[];
-extern const u8 gOtherText_EggDayCare[];
-extern const u8 gOtherText_EggNicePlace[];
-extern const u8 gOtherText_EggObtainedInTrade[];
-extern const u8 gOtherText_EggHotSprings[];
 
 u8 *sub_80A1E9C(u8 *dest, u8 *src, u8);
 u8 PokemonSummaryScreen_CheckOT(struct Pokemon *pokemon);
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 58722010f..1ce088586 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -10,6 +10,7 @@
 #include "songs.h"
 #include "sound.h"
 #include "string_util.h"
+#include "strings2.h"
 #include "task.h"
 
 extern void *recordMixingSecretBases;
@@ -28,8 +29,6 @@ extern u16 gSpecialVar_0x8005;
 extern u32 gUnknown_03005D2C;
 extern u8 gUnknown_03000718;
 extern u8 gUnknown_0300071C[];
-extern u8 gOtherText_MixingComplete[];
-extern u8 gOtherText_MixingRecordsWithFriend[];
 extern bool8 gReceivedRemoteLinkPlayers;
 
 #define BUFFER_CHUNK_SIZE 200
diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index 7899fabb1..8910bb300 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -5,11 +5,7 @@
 #include "menu.h"
 #include "pokedex.h"
 #include "string_util.h"
-
-extern u8 gOtherText_Player[];
-extern u8 gOtherText_Badges[];
-extern u8 gOtherText_Pokedex[];
-extern u8 gOtherText_PlayTime[];
+#include "strings2.h"
 
 void HandleDrawSaveWindowInfo(s16 left, s16 top)
 {
diff --git a/src/start_menu.c b/src/start_menu.c
index c95c8b3f0..fb9013f7c 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -22,6 +22,7 @@
 #include "sprite.h"
 #include "string_util.h"
 #include "strings.h"
+#include "strings2.h"
 #include "task.h"
 #include "trainer_card.h"
 
@@ -60,17 +61,6 @@ extern u8 gSaveText_DontTurnOff[];
 extern u8 gSaveText_ThereIsAlreadyAFile[];
 extern u8 gSaveText_ThereIsADifferentFile[];
 extern u8 gSaveText_WouldYouLikeToSave[];
-extern u8 gOtherText_SafariStock[];
-extern u8 SystemText_Pokedex[];
-extern u8 SystemText_Pokemon[];
-extern u8 SystemText_BAG[];
-extern u8 SystemText_Pokenav[];
-extern u8 SystemText_Player[];
-extern u8 SystemText_Save[];
-extern u8 SystemText_Option[];
-extern u8 SystemText_Exit[];
-extern u8 SystemText_Retire[];
-extern u8 SystemText_Player[];
 
 static u8 StartMenu_PokedexCallback(void);
 static u8 StartMenu_PokemonCallback(void);
diff --git a/src/trainer_card.c b/src/trainer_card.c
index e6ed79c15..ef3a2d857 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -14,6 +14,7 @@
 #include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "strings2.h"
 #include "task.h"
 
 typedef void (*Callback)(void);
@@ -64,16 +65,6 @@ extern u16 gUnknown_083B5F4C[];
 extern u16 gUnknown_08E8CFC0[];
 extern u16 gUnknown_08E8D9C0[];
 
-extern u8 gOtherText_TrainersTrainerCard[];
-extern u8 gOtherText_FirstHOF[];
-extern u8 gOtherText_LinkCableBattles[];
-extern u8 gOtherText_BattleTowerWinRecord[];
-extern u8 gOtherText_ContestRecord[];
-extern u8 gOtherText_MixingRecord[];
-extern u8 gOtherText_TradeRecord[];
-extern u8 gOtherText_Boy[];
-extern u8 gOtherText_Girl[];
-
 extern bool8 (*const gUnknown_083B5EBC[])(struct Task *);
 extern bool8 (*const gUnknown_083B5ED8[])(struct Task *);
 
@@ -1831,7 +1822,7 @@ static void TrainerCard_Back_PrintPokemonTrades(void)
 
 void unref_sub_8094588(u16 left, u16 top)
 {
-    u8 *text = gOtherText_Boy;
+    const u8 *text = gOtherText_Boy;
 
     if (gSaveBlock2.playerGender == FEMALE)
     {
diff --git a/src/wallclock.c b/src/wallclock.c
index 0f3665c65..e8f6dbf1d 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -8,6 +8,7 @@
 #include "rtc.h"
 #include "songs.h"
 #include "sound.h"
+#include "strings2.h"
 #include "task.h"
 #include "trig.h"
 
@@ -15,7 +16,6 @@ extern u16 gSpecialVar_0x8004;
 extern u8 gMiscClock_Gfx[];
 extern u8 gUnknown_08E95774[];
 extern u8 gUnknown_08E954B0[];
-extern u8 gOtherText_CorrectTimePrompt[];
 extern const struct MenuAction gMenuYesNoItems[];
 extern u16 gMiscClockMale_Pal[];
 extern u16 gMiscClockFemale_Pal[];