Add strings2.h

23 files changed, 348 insertions, 105 deletions

diff --git a/include/menu.h b/include/menu.h
index 5b0f35a27..cb5efa448 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -23,7 +23,7 @@ void MenuZeroFillWindowRect(u8, u8, u8, u8);
 void MenuFillWindowRectWithBlankTile(u8, u8, u8, u8);
 void MenuZeroFillScreen(void);
 void MenuDrawTextWindow(u8, u8, u8, u8);
-void sub_8071F40(u8 *);
+void sub_8071F40(const u8 *);
 void sub_8071F60(u8, u8, u8, u8);
 u16 unref_sub_8071F98(u8, u8);
 void unref_sub_8071FBC(u16, u8, u8, u8, u8);
@@ -55,7 +55,7 @@ u8 unref_sub_8072A5C(u8 *, u8 *, u8, u16, u8, u32);
 int sub_8072AB0(u8 *, u8, u16, u8, u8, u32);
 void MenuPrint_RightAligned(u8 *, u8, u8);
 void sub_8072B80(u8 *, u8, u8, u8 *);
-void sub_8072BD8(u8 *, u8, u8, u16);
+void sub_8072BD8(const u8 *, u8, u8, u16);
 u8 *sub_8072C14(u8 *, s32, u8, u8);
 u8 *sub_8072C44(u8 *, s32, u8, u8);
 u8 *sub_8072C74(u8 *, const u8 *, u8, u8);
diff --git a/include/strings2.h b/include/strings2.h
new file mode 100644
index 000000000..600bb2d31
--- /dev/null
+++ b/include/strings2.h
@@ -0,0 +1,322 @@
+#ifndef GUARD_STRINGS2_H
+#define GUARD_STRINGS2_H
+
+// ???
+extern const u8 gOtherText_TopSpeed[];
+
+// berry_blender
+extern const u8 gMultiText_BerryBlenderMaxSpeedRecord[];
+extern const u8 gMultiText_2P3P4P[];
+extern const u8 gMultiText_Saving[];
+
+// link
+extern const u8 gMultiText_LinkError[];
+
+// option_menu
+extern const u8 gSystemText_OptionMenu[];
+extern const u8 gSystemText_TextSpeed[];
+extern const u8 gSystemText_BattleScene[];
+extern const u8 gSystemText_BattleStyle[];
+extern const u8 gSystemText_Sound[];
+extern const u8 gSystemText_Frame[];
+extern const u8 gSystemText_Cancel[];
+extern const u8 gSystemText_ButtonMode[];
+extern const u8 gSystemText_Slow[];
+extern const u8 gSystemText_Mid[];
+extern const u8 gSystemText_Fast[];
+extern const u8 gSystemText_On[];
+extern const u8 gSystemText_Off[];
+extern const u8 gSystemText_Shift[];
+extern const u8 gSystemText_Set[];
+extern const u8 gSystemText_Mono[];
+extern const u8 gSystemText_Stereo[];
+extern const u8 gSystemText_Type[];
+extern const u8 gSystemText_Terminator[];
+extern const u8 gSystemText_Normal[];
+extern const u8 gSystemText_LR[];
+extern const u8 gSystemText_LA[];
+
+// start_menu
+extern const u8 SystemText_Pokedex[];
+extern const u8 SystemText_Pokemon[];
+extern const u8 SystemText_BAG[];
+extern const u8 SystemText_Pokenav[];
+extern const u8 SystemText_Player[];
+extern const u8 SystemText_Save[];
+extern const u8 SystemText_Option[];
+extern const u8 SystemText_Exit[];
+extern const u8 SystemText_Retire[];
+extern const u8 gOtherText_SafariStock[];
+
+// mystery_event_menu
+extern const u8 gSystemText_LinkStandby[];
+extern const u8 gSystemText_LoadEventPressA[];
+extern const u8 gSystemText_LoadingEvent[];
+extern const u8 gSystemText_DontCutLink[];
+extern const u8 gSystemText_EventLoadSuccess[];
+extern const u8 gSystemText_LoadingError[];
+
+// field_region_map
+extern const u8 gOtherText_Hoenn[];
+
+// field_player_avatar
+extern const u8 gOtherText_OhABite[];
+extern const u8 gOtherText_PokeOnHook[];
+extern const u8 gOtherText_NotEvenANibble[];
+extern const u8 gOtherText_ItGotAway[];
+
+// trade
+extern const u8 gTradeText_WillBeSent[];
+extern const u8 gTradeText_ByeBye[];
+extern const u8 gTradeText_SentOverPoke[];
+extern const u8 gTradeText_TakeGoodCare[];
+extern const u8 TradeText_Cancel[];
+extern const u8 TradeText_ChoosePoke[];
+extern const u8 TradeText_Summary1[];
+extern const u8 TradeText_Trade1[];
+extern const u8 TradeText_CancelTradePrompt[];
+extern const u8 TradeText_PressBToExit[];
+extern const u8 TradeText_Summary2[];
+extern const u8 TradeText_Trade2[];
+extern const u8 TradeText_LinkStandby[];
+extern const u8 TradeText_TradeCancelled[];
+extern const u8 TradeText_OnlyPoke[];
+extern const u8 TradeText_NonTradablePoke[];
+extern const u8 TradeText_WaitingForFriend[];
+extern const u8 TradeText_WantToTrade[];
+extern const u8 gTradeText_TradeOkayPrompt[];
+extern const u8 gOtherText_Terminator2[];
+extern const u8 gOtherText_ControlAndMiscText[];
+extern const u8 gOtherText_FourQuestions[];
+
+// easy_chat
+extern const u8 gEasyChatGroupName_Pokemon[];
+extern const u8 gEasyChatGroupName_Trainer[];
+extern const u8 gEasyChatGroupName_Status[];
+extern const u8 gEasyChatGroupName_Battle[];
+extern const u8 gEasyChatGroupName_Greetings[];
+extern const u8 gEasyChatGroupName_People[];
+extern const u8 gEasyChatGroupName_Voices[];
+extern const u8 gEasyChatGroupName_Speech[];
+extern const u8 gEasyChatGroupName_Endings[];
+extern const u8 gEasyChatGroupName_Feelings[];
+extern const u8 gEasyChatGroupName_Conditions[];
+extern const u8 gEasyChatGroupName_Actions[];
+extern const u8 gEasyChatGroupName_Lifestyle[];
+extern const u8 gEasyChatGroupName_Hobbies[];
+extern const u8 gEasyChatGroupName_Time[];
+extern const u8 gEasyChatGroupName_Misc[];
+extern const u8 gEasyChatGroupName_Adjectives[];
+extern const u8 gEasyChatGroupName_Events[];
+extern const u8 gEasyChatGroupName_Move1[];
+extern const u8 gEasyChatGroupName_Move2[];
+extern const u8 gEasyChatGroupName_TrendySaying[];
+extern const u8 gEasyChatGroupName_Pokemon2[];
+extern const u8 gOtherText_ThreeQuestions[];
+
+// mail
+extern const u8 gOtherText_From[];
+
+// record_mixing
+extern const u8 gOtherText_MixingRecordsWithFriend[];
+extern const u8 gOtherText_MixingComplete[];
+
+// trainer_card
+extern const u8 gOtherText_TrainersTrainerCard[];
+extern const u8 gOtherText_FirstHOF[];
+extern const u8 gOtherText_LinkCableBattles[];
+extern const u8 gOtherText_BattleTowerWinRecord[];
+extern const u8 gOtherText_ContestRecord[];
+extern const u8 gOtherText_MixingRecord[];
+extern const u8 gOtherText_TradeRecord[];
+extern const u8 gOtherText_Boy[];
+extern const u8 gOtherText_Girl[];
+
+// save_menu_util
+extern const u8 gOtherText_Player[];
+extern const u8 gOtherText_Badges[];
+extern const u8 gOtherText_Pokedex[];
+extern const u8 gOtherText_PlayTime[];
+
+// naming_screen
+extern const u8 gOtherText_SentToPC[];
+extern const u8 OtherText_YourName[];
+extern const u8 OtherText_BoxName[];
+extern const u8 OtherText_PokeName[];
+
+// pokemon_size_record
+extern const u8 gOtherText_Marco[];
+
+// roulette
+extern const u8 gOtherText_Coins[];
+
+// battle_records
+extern const u8 gOtherText_BattleResults[];
+extern const u8 gOtherText_WinRecord[];
+extern const u8 gOtherText_WinLoseDraw[];
+extern const u8 gOtherText_SevenDashes[];
+extern const u8 gOtherText_FourDashes[];
+extern const u8 gOtherText_BattleTowerResults[];
+extern const u8 gOtherText_Lv50[];
+extern const u8 gOtherText_Lv100[];
+extern const u8 gOtherText_WinStreak[];
+extern const u8 gOtherText_Current[];
+extern const u8 gOtherText_Record[];
+extern const u8 gOtherText_Prev[];
+
+// slot_machine
+extern const u8 gOtherText_QuitGamePrompt[];
+extern const u8 gOtherText_MaxCoins[];
+extern const u8 gOtherText_OutOfCoins[];
+extern const u8 gOtherText_DontHaveThreeCoins[];
+extern const u8 gOtherText_ReelTime[];
+
+// daycare
+extern const u8 DaycareText_GetAlongVeryWell[];
+extern const u8 DaycareText_GetAlong[];
+extern const u8 DaycareText_DontLikeOther[];
+extern const u8 DaycareText_PlayOther[];
+extern const u8 gOtherText_NewLine2[];
+extern const u8 gOtherText_CancelAndLv[];
+
+// pokemon_2
+extern const u8 gEggNickname[];
+
+// egg_hatch
+extern const u8 gOtherText_HatchedFromEgg[];
+extern const u8 gOtherText_NickHatchPrompt[];
+
+// learn_move
+extern const u8 OtherText_Battle[];
+extern const u8 OtherText_Contest[];
+
+// ???
+extern const u8 OtherText_Type[];
+extern const u8 OtherText_PP[];
+
+// learn_move
+extern const u8 OtherText_Power[];
+extern const u8 OtherText_Accuracy[];
+extern const u8 OtherText_Appeal[];
+extern const u8 OtherText_Jam[];
+extern const u8 gOtherText_TeachWhichMove[];
+extern const u8 gOtherText_TeachSpecificMove[];
+extern const u8 gOtherText_PokeLearnedMove[];
+extern const u8 gOtherText_DeleteOlderMove[];
+extern const u8 gOtherText_StopLearningMove[];
+extern const u8 gOtherText_ForgotMove123[];
+extern const u8 gOtherText_ForgotOrDidNotLearnMove[];
+extern const u8 gOtherText_GiveUpTeachingMove[];
+extern const u8 gOtherText_WhichMoveToForget[];
+
+// clear_save_data_menu
+extern const u8 gSystemText_ClearAllSaveDataPrompt[];
+extern const u8 gSystemText_ClearingData[];
+
+// contest_link_80C2020
+extern const u8 gContestText_AnnounceResults[];
+extern const u8 gContestText_PreliminaryResults[];
+extern const u8 gContestText_Round2Results[];
+extern const u8 gContestText_PokeWon[];
+extern const u8 gOtherText_LinkStandby[];
+
+// landmark
+extern const u8 gLandmarkName_FlowerShop[];
+extern const u8 gLandmarkName_PetalburgWoods[];
+extern const u8 gLandmarkName_MrBrineysCottage[];
+extern const u8 gLandmarkName_AbandonedShip[];
+extern const u8 gLandmarkName_SeashoreHouse[];
+extern const u8 gLandmarkName_SlateportBeach[];
+extern const u8 gLandmarkName_CyclingRoad[];
+extern const u8 gLandmarkName_NewMauville[];
+extern const u8 gLandmarkName_TrickHouse[];
+extern const u8 gLandmarkName_OldLadysRestShop[];
+extern const u8 gLandmarkName_Desert[];
+extern const u8 gLandmarkName_WinstrateFamily[];
+extern const u8 gLandmarkName_CableCar[];
+extern const u8 gLandmarkName_GlassWorkshop[];
+extern const u8 gLandmarkName_WeatherInstitute[];
+extern const u8 gLandmarkName_MeteorFalls[];
+extern const u8 gLandmarkName_TunnelersRestHouse[];
+extern const u8 gLandmarkName_RusturfTunnel[];
+extern const u8 gLandmarkName_PokemonDayCare[];
+extern const u8 gLandmarkName_SafariZoneEntrance[];
+extern const u8 gLandmarkName_MtPyre[];
+extern const u8 gLandmarkName_ShoalCave[];
+extern const u8 gLandmarkName_SeafloorCavern[];
+extern const u8 gLandmarkName_GraniteCave[];
+extern const u8 gLandmarkName_OceanCurrent[];
+extern const u8 gLandmarkName_LanettesHouse[];
+extern const u8 gLandmarkName_FieryPath[];
+extern const u8 gLandmarkName_JaggedPass[];
+extern const u8 gLandmarkName_SkyPillar[];
+extern const u8 gLandmarkName_BerryMastersHouse[];
+extern const u8 gLandmarkName_IslandCave[];
+extern const u8 gLandmarkName_DesertRuins[];
+extern const u8 gLandmarkName_ScorchedSlab[];
+extern const u8 gLandmarkName_AncientTomb[];
+extern const u8 gLandmarkName_SealedChamber[];
+extern const u8 gLandmarkName_FossilManiacsHouse[];
+extern const u8 gLandmarkName_HuntersHouse[];
+
+// pokemon_summary_screen
+extern const u8 gOtherText_Terminator4[];
+extern const u8 gOtherText_Nature[];
+extern const u8 gOtherText_Comma[];
+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[];
+
+// evolution_scene, trade
+extern const u8 gOtherText_LinkStandby2[];
+
+// evolution_scene
+extern const u8 gOtherText_YesNoAndPlayer[];
+
+// diploma
+extern const u8 gOtherText_HoennDex[];
+extern const u8 gOtherText_NationalDex[];
+extern const u8 gOtherText_DiplomaCertificationGameFreak[];
+
+// cable_club
+extern const u8 gOtherText_PLink[];
+
+// berry_blender
+extern const u8 gOtherText_YesNoTerminating[];
+extern const u8 gOtherText_LinkNotFound[];
+extern const u8 gOtherText_BlenderChooseBerry[];
+extern const u8 gOtherText_PokeBlockMade[];
+extern const u8 gOtherText_PressAToStart[];
+extern const u8 gOtherText_PleaseWait[];
+extern const u8 gOtherText_LinkStandby3[];
+extern const u8 gOtherText_BlendAnotherBerryPrompt[];
+extern const u8 gOtherText_OutOfBerries[];
+extern const u8 gOtherText_CaseIsFull[];
+extern const u8 gOtherText_NoBerriesForBlend[];
+extern const u8 gOtherText_OtherCaseIsFull[];
+extern const u8 gOtherText_ResultsOfBlending[];
+extern const u8 gOtherText_Berry[];
+extern const u8 gOtherText_RequiredTime[];
+extern const u8 gOtherText_Min[];
+extern const u8 gOtherText_Sec[];
+extern const u8 gOtherText_MaxSpeed[];
+extern const u8 gOtherText_RPM[];
+extern const u8 gOtherText_Ranking[];
+extern const u8 gOtherText_BlockLevelIs[];
+extern const u8 gOtherText_BlockFeelIs[];
+extern const u8 gOtherText_Period[];
+
+// reset_rtc_screen
+extern const u8 gOtherText_Day[];
+extern const u8 gOtherText_OK[];
+
+// wallclock
+extern const u8 gOtherText_CorrectTimePrompt[];
+
+#endif // GUARD_STRINGS2_H
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[];