migrate battle_message data to src (TODO, german)

5 files changed, 302 insertions, 176 deletions

diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 6f3be7804..cff81396d 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -81,7 +81,7 @@ extern u8 gBattleTextBuff3[];
 extern u8 gLeveledUpInBattle;
 extern void (*gBattleMainFunc)(void);
 extern struct Window gUnknown_03004210;
-extern const u8 gUnknown_08400D7A[];
+extern const u8 BattleText_YesNo[];
 extern u8 gPlayerPartyCount;
 extern u16 gMoveToLearn; //move to learn
 extern const u8 gTrainerMoney[];
@@ -10952,7 +10952,7 @@ void atk59_learnmove_inbattle(void)
 void sub_8023A80(void)
 {
     sub_802BBD4(0x18, 8, 0x1D, 0xD, 0);
-    InitWindow(&gUnknown_03004210, gUnknown_08400D7A, 0x100, 0x19, 0x9);
+    InitWindow(&gUnknown_03004210, BattleText_YesNo, 0x100, 0x19, 0x9);
     sub_8002F44(&gUnknown_03004210);
     sub_814A5C0(0, 0xFFFF, 0xC, 0x2D9F, 0x20);
 }
@@ -11660,7 +11660,7 @@ static void atk6C_lvlbox_display(void)
     {
     case 0:
         sub_802BBD4(0xB, 0, 0x1D, 0x7, r1);
-        StringCopy(gStringVar4, gUnknown_08400D9F);
+        StringCopy(gStringVar4, BattleText_Format2);
 
     }
 }
@@ -11670,7 +11670,7 @@ __attribute__((naked))
 static void atk6C_lvlbox_display(void)
 {
     asm(".syntax unified\n\
-            push {r4-r7,lr}\n\
+    push {r4-r7,lr}\n\
     mov r7, r10\n\
     mov r6, r9\n\
     mov r5, r8\n\
@@ -11713,7 +11713,7 @@ _0802493E:\n\
     movs r3, 0x7\n\
     bl sub_802BBD4\n\
     ldr r0, _0802499C @ =gStringVar4\n\
-    ldr r1, _080249A0 @ =gUnknown_08400D9F\n\
+    ldr r1, _080249A0 @ =BattleText_Format2\n\
     bl StringCopy\n\
     adds r5, r0, 0\n\
     movs r1, 0\n\
@@ -11752,7 +11752,7 @@ _0802495A:\n\
     mov pc, r0\n\
     .align 2, 0\n\
 _0802499C: .4byte gStringVar4\n\
-_080249A0: .4byte gUnknown_08400D9F\n\
+_080249A0: .4byte BattleText_Format2\n\
 _080249A4: .4byte gUnknown_0840165C\n\
 _080249A8: .4byte gSharedMem\n\
 _080249AC: .4byte 0x00016018\n\
@@ -11832,13 +11832,13 @@ _08024A2C:\n\
     mov r0, r9\n\
     cmp r0, 0\n\
     beq _08024A5C\n\
-    ldr r1, _08024A58 @ =gUnknown_08400DAC\n\
+    ldr r1, _08024A58 @ =BattleText_Dash\n\
     b _08024A5E\n\
     .align 2, 0\n\
 _08024A54: .4byte gSharedMem + 0x17180\n\
-_08024A58: .4byte gUnknown_08400DAC\n\
+_08024A58: .4byte BattleText_Dash\n\
 _08024A5C:\n\
-    ldr r1, _08024AA4 @ =gUnknown_08400DAA\n\
+    ldr r1, _08024AA4 @ =BattleText_Plus\n\
 _08024A5E:\n\
     adds r0, r5, 0\n\
     bl StringCopy\n\
@@ -11874,7 +11874,7 @@ _08024A5E:\n\
     adds r5, 0x1\n\
     b _08024AB8\n\
     .align 2, 0\n\
-_08024AA4: .4byte gUnknown_08400DAA\n\
+_08024AA4: .4byte BattleText_Plus\n\
 _08024AA8:\n\
     strb r6, [r5]\n\
     movs r0, 0x11\n\
@@ -11921,7 +11921,7 @@ _08024AFE:\n\
     movs r0, 0x5\n\
     bl PlaySE\n\
     ldr r0, _08024B98 @ =gStringVar4\n\
-    ldr r1, _08024B9C @ =gUnknown_08400D9F\n\
+    ldr r1, _08024B9C @ =BattleText_Format2\n\
     bl StringCopy\n\
     adds r5, r0, 0\n\
     movs r0, 0\n\
@@ -11992,7 +11992,7 @@ _08024B1C:\n\
     .align 2, 0\n\
 _08024B94: .4byte gMain\n\
 _08024B98: .4byte gStringVar4\n\
-_08024B9C: .4byte gUnknown_08400D9F\n\
+_08024B9C: .4byte BattleText_Format2\n\
 _08024BA0: .4byte 0x00016018\n\
 _08024BA4: .4byte gUnknown_0840165C\n\
 _08024BA8: .4byte gPlayerParty\n\
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 1aa73e90c..f2004c9b7 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -78,9 +78,9 @@ extern u16 gUnknown_030042C0;
 extern u8 gUnknown_03004344;
 extern u8 gUnknown_0300434C[];
 
-extern const u8 gUnknown_08400CA8[];
-extern const u8 gUnknown_08400CF3[];
-extern const u8 gUnknown_08400D38[];
+extern const u8 BattleText_OtherMenu[];
+extern const u8 BattleText_MenuOptions[];
+extern const u8 BattleText_PP[];
 
 extern void sub_802C68C(void);
 extern void sub_802E1B0(void);
@@ -152,7 +152,7 @@ extern u16 gBattlePartyID[];
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
 extern struct Window gUnknown_03004210;
-extern const u8 gUnknown_08400D89[];
+extern const u8 BattleText_SwitchWhich[];
 extern u8 gUnknown_03004348;
 extern struct BattlePokemon gBattleMons[];
 extern MainCallback gPreBattleCallback1;
@@ -164,7 +164,7 @@ extern u8 gUnknown_0202E8F5;
 extern u8 gUnknown_02038470[];
 extern u16 gScriptItemId;
 extern u8 gDisplayedStringBattle[];
-extern const u8 gUnknown_08400CE0[];
+extern const u8 BattleText_LinkStandby[];
 
 extern void dp11b_obj_instanciate(u8, u8, s8, s8);
 extern u8 GetBankIdentity(u8);
@@ -746,15 +746,14 @@ void sub_802C68C(void)
                 gUnknown_03004344 = gMoveSelectionCursor[gActiveBank] + 1;
             sub_802E3B4(gUnknown_03004344, 27);
             FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A);
-            InitWindow(&gUnknown_03004210, gUnknown_08400D89, 0x290, 0x17, 0x37);
+            InitWindow(&gUnknown_03004210, BattleText_SwitchWhich, 0x290, 0x17, 0x37);
             sub_8002F44(&gUnknown_03004210);
             gBattleBankFunc[gActiveBank] = sub_802CA60;
         }
     }
 }
 
-extern const u8 gUnknown_08400D49[];
-extern const u8 gUnknown_08400D38[];
+extern const u8 BattleText_Format[];
 
 void sub_802CA60(void)
 {
@@ -850,13 +849,13 @@ void sub_802CA60(void)
         }
         else
         {
-            sub_802E12C(gUnknown_03004344, gUnknown_08400D49);
+            sub_802E12C(gUnknown_03004344, BattleText_Format);
         }
         gBattleBankFunc[gActiveBank] = sub_802C68C;
         gMoveSelectionCursor[gActiveBank] = gUnknown_03004344;
         sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0);
         FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A);
-        InitWindow(&gUnknown_03004210, gUnknown_08400D38, 0x290, 0x17, 0x37);
+        InitWindow(&gUnknown_03004210, BattleText_PP, 0x290, 0x17, 0x37);
         sub_8002F44(&gUnknown_03004210);
         sub_802E220();
         sub_802E2D4();
@@ -866,10 +865,10 @@ void sub_802CA60(void)
         PlaySE(SE_SELECT);
         nullsub_7(gUnknown_03004344);
         sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0);
-        sub_802E12C(gMoveSelectionCursor[gActiveBank], gUnknown_08400D49);
+        sub_802E12C(gMoveSelectionCursor[gActiveBank], BattleText_Format);
         gBattleBankFunc[gActiveBank] = sub_802C68C;
         FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A);
-        InitWindow(&gUnknown_03004210, gUnknown_08400D38, 0x290, 0x17, 0x37);
+        InitWindow(&gUnknown_03004210, BattleText_PP, 0x290, 0x17, 0x37);
         sub_8002F44(&gUnknown_03004210);
         sub_802E220();
         sub_802E2D4();
@@ -1578,7 +1577,7 @@ void sub_802E1B0(void)
     for (i = 0; i < 4; i++)
     {
         nullsub_7(i);
-        sub_802E12C(i, gUnknown_08400D49);
+        sub_802E12C(i, BattleText_Format);
         if (r4->moves[i] != 0)
             gUnknown_03004348++;
     }
@@ -1591,7 +1590,7 @@ void sub_802E220(void)
         struct UnknownStruct1 *r4 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4];
         u8 *str = gDisplayedStringBattle;
 
-        str = StringCopy(str, gUnknown_08400D49);
+        str = StringCopy(str, BattleText_Format);
         str[0] = EXT_CTRL_CODE_BEGIN;
         str[1] = 0x11;
         str[2] = 2;
@@ -1608,7 +1607,7 @@ void sub_802E220(void)
     }
 }
 
-extern const u8 gUnknown_08400D52[];
+extern const u8 BattleText_ForgetMove[];
 extern const u8 gTypeNames[][7];
 
 void sub_802E2D4(void)
@@ -1616,14 +1615,14 @@ void sub_802E2D4(void)
     if (gBattleBufferA[gActiveBank][2] == 1)
     {
         FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A);
-        InitWindow(&gUnknown_03004210, gUnknown_08400D52, 0x290, 0x13, 0x37);
+        InitWindow(&gUnknown_03004210, BattleText_ForgetMove, 0x290, 0x13, 0x37);
     }
     else
     {
         struct UnknownStruct1 *r4 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4];
         u8 *str = gDisplayedStringBattle;
 
-        str = StringCopy(str, gUnknown_08400D49);
+        str = StringCopy(str, BattleText_Format);
         StringCopy(str, gTypeNames[gBattleMoves[r4->moves[gMoveSelectionCursor[gActiveBank]]].type]);
         FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x39, 0x1C, 0x3A);
         InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 0x2C0, 0x17, 0x39);
@@ -1699,7 +1698,7 @@ void b_link_standby_message(void)
     {
         gUnknown_030042A4 = 0;
         gUnknown_030042A0 = 0;
-        sub_8002EB0(&gUnknown_03004210, gUnknown_08400CE0, 0x90, 2, 15);
+        sub_8002EB0(&gUnknown_03004210, BattleText_LinkStandby, 0x90, 2, 15);
     }
 }
 
@@ -2587,7 +2586,7 @@ void PlayerHandlecmd18(void)
 
     gBattleBankFunc[gActiveBank] = sub_802C098;
 
-    InitWindow(&gUnknown_03004210, gUnknown_08400CF3, 400, 18, 35);
+    InitWindow(&gUnknown_03004210, BattleText_MenuOptions, 400, 18, 35);
     sub_8002F44(&gUnknown_03004210);
     sub_814A5C0(0, 0xFFFF, 12, 11679, 0);
 
@@ -2596,7 +2595,7 @@ void PlayerHandlecmd18(void)
 
     sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
 
-    StrCpyDecodeToDisplayedStringBattle(gUnknown_08400CA8);
+    StrCpyDecodeToDisplayedStringBattle(BattleText_OtherMenu);
     InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_803037C_TILE_DATA_OFFSET, 2, 35);
     sub_8002F44(&gUnknown_03004210);
 }
@@ -2621,7 +2620,7 @@ void sub_80304A8(void)
     sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0);
     if (gBattleBufferA[gActiveBank][2] != 1)
     {
-        InitWindow(&gUnknown_03004210, gUnknown_08400D38, 656, 23, 55);
+        InitWindow(&gUnknown_03004210, BattleText_PP, 656, 23, 55);
         sub_8002F44(&gUnknown_03004210);
     }
     sub_802E220();
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index 5b89cf9ba..8a8515fc7 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -18,9 +18,9 @@ extern struct Window gUnknown_03004210;
 extern u8 gDisplayedStringBattle[];
 extern u8 gActionSelectionCursor[];
 
-extern const u8 gUnknown_08400CBB[];
+extern const u8 BattleText_PlayerMenu[];
 extern u8 gActiveBank;
-extern const u8 gUnknown_08400D15[];
+extern const u8 BattleText_MenuOptionsSafari[];
 
 extern void *gBattleBankFunc[];
 extern u16 gUnknown_030042A0;
@@ -476,7 +476,7 @@ void SafariHandlecmd18(void)
     FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36);
     gBattleBankFunc[gActiveBank] = bx_battle_menu_t6_2;
 
-    InitWindow(&gUnknown_03004210, gUnknown_08400D15, 400, 18, 35);
+    InitWindow(&gUnknown_03004210, BattleText_MenuOptionsSafari, 400, 18, 35);
     sub_8002F44(&gUnknown_03004210);
     sub_814A5C0(0, 0xFFFF, 12, 11679, 0);
 
@@ -484,7 +484,7 @@ void SafariHandlecmd18(void)
         nullsub_8(i);
 
     sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
-    StrCpyDecodeToDisplayedStringBattle(gUnknown_08400CBB);
+    StrCpyDecodeToDisplayedStringBattle(BattleText_PlayerMenu);
 
     InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_812BB10_TILE_DATA_OFFSET, 2, 35);
     sub_8002F44(&gUnknown_03004210);
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 9392832d7..05fd8e583 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -57,8 +57,8 @@ extern struct Window gUnknown_03004210;
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
 extern u8 gUnknown_0300434C[];
-extern const u8 gUnknown_08400CCC[];
-extern const u8 gUnknown_08400CF3[];
+extern const u8 BattleText_WallyMenu[];
+extern const u8 BattleText_MenuOptions[];
 
 // TODO: include rom3.h when my other PR gets merged
 extern void Emitcmd33(u8, u8, u16);
@@ -1269,13 +1269,13 @@ void WallyHandlecmd18(void)
     FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 15, 27, 18);
     FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36);
     gBattleBankFunc[gActiveBank] = sub_81372BC;
-    InitWindow(&gUnknown_03004210, gUnknown_08400CF3, 400, 18, 35);
+    InitWindow(&gUnknown_03004210, BattleText_MenuOptions, 400, 18, 35);
     sub_8002F44(&gUnknown_03004210);
     sub_814A5C0(0, 0xFFFF, 12, 0x2D9F, 0);
     for (i = 0; i < 4; i++)
         nullsub_8(i);
     sub_802E3E4(0, 0);
-    StrCpyDecodeToDisplayedStringBattle(gUnknown_08400CCC);
+    StrCpyDecodeToDisplayedStringBattle(BattleText_WallyMenu);
 #ifdef ENGLISH
     InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 440, 2, 35);
 #else
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index 4e8067a49..962c5de7b 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -18,6 +18,136 @@
 #define BATTLESTRINGS_NO    351
 #define BATTLESTRINGS_MAX   BATTLESTRINGS_NO + BATTLESTRING_TO_SUB
 
+#ifdef GERMAN
+#include "../data/battle_strings_en.h" // TODO: German
+#else
+#include "../data/battle_strings_en.h"
+#endif
+
+const u16 gUnknown_084016BC[] =
+{
+    MOVE_SWORDS_DANCE,
+    MOVE_STRENGTH,
+    MOVE_GROWTH,
+    MOVE_HARDEN,
+    MOVE_MINIMIZE,
+    MOVE_SMOKESCREEN,
+    MOVE_WITHDRAW,
+    MOVE_DEFENSE_CURL,
+    MOVE_EGG_BOMB,
+    MOVE_SMOG,
+    MOVE_BONE_CLUB,
+    MOVE_FLASH,
+    MOVE_SPLASH,
+    MOVE_ACID_ARMOR,
+    MOVE_BONEMERANG,
+    MOVE_REST,
+    MOVE_SHARPEN,
+    MOVE_SUBSTITUTE,
+    MOVE_MIND_READER,
+    MOVE_SNORE,
+    MOVE_PROTECT,
+    MOVE_SPIKES,
+    MOVE_ENDURE,
+    MOVE_ROLLOUT,
+    MOVE_SWAGGER,
+    MOVE_SLEEP_TALK,
+    MOVE_HIDDEN_POWER,
+    MOVE_PSYCH_UP,
+    MOVE_EXTREME_SPEED,
+    MOVE_FOLLOW_ME,
+    MOVE_TRICK,
+    MOVE_ASSIST,
+    MOVE_INGRAIN,
+    MOVE_KNOCK_OFF,
+    MOVE_CAMOUFLAGE,
+    MOVE_ASTONISH,
+    MOVE_ODOR_SLEUTH,
+    MOVE_GRASS_WHISTLE,
+    MOVE_SHEER_COLD,
+    MOVE_MUDDY_WATER,
+    MOVE_IRON_DEFENSE,
+    MOVE_BOUNCE,
+    MOVE_NONE,
+    MOVE_TELEPORT,
+    MOVE_RECOVER,
+    MOVE_BIDE,
+    MOVE_AMNESIA,
+    MOVE_FLAIL,
+    MOVE_TAUNT,
+    MOVE_BULK_UP,
+    MOVE_NONE,
+    MOVE_MEDITATE,
+    MOVE_AGILITY,
+    MOVE_MIMIC,
+    MOVE_DOUBLE_TEAM,
+    MOVE_BARRAGE,
+    MOVE_TRANSFORM,
+    MOVE_STRUGGLE,
+    MOVE_SCARY_FACE,
+    MOVE_CHARGE,
+    MOVE_WISH,
+    MOVE_BRICK_BREAK,
+    MOVE_YAWN,
+    MOVE_FEATHER_DANCE,
+    MOVE_TEETER_DANCE,
+    MOVE_MUD_SPORT,
+    MOVE_FAKE_TEARS,
+    MOVE_WATER_SPORT,
+    MOVE_CALM_MIND,
+    MOVE_NONE,
+    MOVE_POUND,
+    MOVE_SCRATCH,
+    MOVE_VICE_GRIP,
+    MOVE_WING_ATTACK,
+    MOVE_FLY,
+    MOVE_BIND,
+    MOVE_SLAM,
+    MOVE_HORN_ATTACK,
+    MOVE_WRAP,
+    MOVE_THRASH,
+    MOVE_TAIL_WHIP,
+    MOVE_LEER,
+    MOVE_BITE,
+    MOVE_GROWL,
+    MOVE_ROAR,
+    MOVE_SING,
+    MOVE_PECK,
+    MOVE_ABSORB,
+    MOVE_STRING_SHOT,
+    MOVE_EARTHQUAKE,
+    MOVE_FISSURE,
+    MOVE_DIG,
+    MOVE_TOXIC,
+    MOVE_SCREECH,
+    MOVE_METRONOME,
+    MOVE_LICK,
+    MOVE_CLAMP,
+    MOVE_CONSTRICT,
+    MOVE_POISON_GAS,
+    MOVE_BUBBLE,
+    MOVE_SLASH,
+    MOVE_SPIDER_WEB,
+    MOVE_NIGHTMARE,
+    MOVE_CURSE,
+    MOVE_FORESIGHT,
+    MOVE_CHARM,
+    MOVE_ATTRACT,
+    MOVE_ROCK_SMASH,
+    MOVE_UPROAR,
+    MOVE_SPIT_UP,
+    MOVE_SWALLOW,
+    MOVE_TORMENT,
+    MOVE_FLATTER,
+    MOVE_ROLE_PLAY,
+    MOVE_ENDEAVOR,
+    MOVE_TICKLE,
+    MOVE_COVET,
+    MOVE_NONE,
+};
+
+const u8 gUnknown_084017A8[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; // empty flags
+
 extern const u8* const gBattleStringsTable[BATTLESTRINGS_NO];
 
 extern u16 gLastUsedItem;
@@ -44,66 +174,64 @@ extern u16 gBattlePartyID[4];
 extern struct BattleEnigmaBerry gEnigmaBerries[4];
 extern u8 gBattleBufferA[4][0x200];
 
-extern const u8 gUnknown_084005DB[];
-extern const u8 gUnknown_084005C7[];
-extern const u8 gUnknown_084005AA[];
-extern const u8 gUnknown_08400568[];
-extern const u8 gUnknown_08400590[];
-extern const u8 gUnknown_0840057B[];
-extern const u8 gUnknown_08400555[];
-extern const u8 gUnknown_084006F1[];
-extern const u8 gUnknown_084006A4[];
-extern const u8 gUnknown_0840069C[];
-extern const u8 gUnknown_0840065C[];
-extern const u8 gUnknown_08400645[];
-extern const u8 gUnknown_08400608[];
-extern const u8 gUnknown_08400635[];
-extern const u8 gUnknown_084005F5[];
-extern const u8 gUnknown_08400709[];
-extern const u8 gUnknown_08400727[];
-extern const u8 gUnknown_08400736[];
-extern const u8 gUnknown_08400749[];
-extern const u8 gUnknown_08400781[];
-extern const u8 gUnknown_08400771[];
-extern const u8 gUnknown_0840075E[];
-extern const u8 gUnknown_084006B3[];
-extern const u8 gUnknown_084006BB[];
-extern const u8 gUnknown_084006C6[];
-extern const u8 gUnknown_084006D5[];
-extern const u8 gUnknown_0840068C[];
-extern const u8 gUnknown_0840067C[];
-extern const u8 gUnknown_08400622[];
-extern const u8 gUnknown_084007BD[];
-extern const u8 gUnknown_083FFEFC[];
-extern const u8 gUnknown_083FFFF7[];
-extern const u8 gUnknown_083FFFEA[];
-extern const u8 gUnknown_083FFF6A[];
-extern const u8 gUnknown_083FFF99[];
-extern const u8 gUnknown_083FFFCB[];
-extern const u8 gUnknown_083FFF56[];
-extern const u8 gUnknown_083FFF81[];
-extern const u8 gUnknown_083FFFB3[];
-extern const u8 gUnknown_08400A78[];
-extern const u8 gUnknown_08400A85[];
-extern const u8 gUnknown_08400797[];
-extern const u8 gUnknown_08400791[];
-extern const u8 gUnknown_084007B7[];
-extern const u8 gUnknown_084007B2[];
-extern const u8 gUnknown_0840079C[];
-extern const u8 gUnknown_084007A1[];
-extern const u8 gUnknown_084007A7[];
-extern const u8 gUnknown_084007AC[];
-extern const u8 gUnknown_084009ED[];
-extern const u8 gUnknown_084009F7[];
-extern const u8 gUnknown_084007C8[];
-extern const u8 gUnknown_084007CA[];
-extern const u8 gUnknown_084007CC[];
-extern const u8 gUnknown_084007CE[];
-extern const u8 gUnknown_084007D0[];
-extern const u8 gUnknown_08400E5E[];
-extern const u8 gUnknown_08400E62[];
-
-extern const u16 gUnknown_084016BC[]; // a table of moves
+extern const u8 BattleText_DoubleWantToBattle[];
+extern const u8 BattleText_SingleWantToBattle2[];
+extern const u8 BattleText_SingleWantToBattle1[];
+extern const u8 BattleText_WildAppeared2[];
+extern const u8 BattleText_WildDoubleAppeared[];
+extern const u8 BattleText_WildAppeared3[];
+extern const u8 BattleText_WildAppeared1[];
+extern const u8 BattleText_SentOutSingle11[];
+extern const u8 BattleText_SentOutDouble4[];
+extern const u8 BattleText_SentOutSingle6[];
+extern const u8 BattleText_SentOutDouble3[];
+extern const u8 BattleText_SentOutDouble2[];
+extern const u8 BattleText_SentOutDouble1[];
+extern const u8 BattleText_SentOutSingle3[];
+extern const u8 BattleText_SentOutSingle1[];
+extern const u8 BattleText_ComeBackSingle1[];
+extern const u8 BattleText_ComeBackSingle2[];
+extern const u8 BattleText_ComeBackSingle3[];
+extern const u8 BattleText_ComeBackSingle4[];
+extern const u8 BattleText_WithdrewPoke3[];
+extern const u8 BattleText_WithdrewPoke2[];
+extern const u8 BattleText_WithdrewPoke1[];
+extern const u8 BattleText_SentOutSingle7[];
+extern const u8 BattleText_SentOutSingle8[];
+extern const u8 BattleText_SentOutSingle9[];
+extern const u8 BattleText_SentOutSingle10[];
+extern const u8 BattleText_SentOutSingle5[];
+extern const u8 BattleText_SentOutSingle4[];
+extern const u8 BattleText_SentOutSingle2[];
+extern const u8 BattleText_OpponentUsedMove[];
+extern const u8 BattleText_GotAwaySafely[];
+extern const u8 BattleText_FledDouble[];
+extern const u8 BattleText_FledSingle[];
+extern const u8 BattleText_PlayerDefeatedTrainers[];
+extern const u8 BattleText_PlayerLostTrainers[];
+extern const u8 BattleText_PlayerTiedTrainers[];
+extern const u8 BattleText_PlayerDefeatedTrainer[];
+extern const u8 BattleText_PlayerLostTrainer[];
+extern const u8 BattleText_PlayerTiedTrainer[];
+extern const u8 BattleText_EnigmaBerry[];
+extern const u8 BattleText_Berry[];
+extern const u8 BattleText_Foe[];
+extern const u8 BattleText_Wild[];
+extern const u8 BattleText_Ally3[];
+extern const u8 BattleText_Foe4[];
+extern const u8 BattleText_Foe2[];
+extern const u8 BattleText_Ally[];
+extern const u8 BattleText_Foe3[];
+extern const u8 BattleText_Ally2[];
+extern const u8 BattleText_Someone[];
+extern const u8 BattleText_Lanette[];
+extern const u8 BattleText_Exclamation2[];
+extern const u8 BattleText_Exclamation3[];
+extern const u8 BattleText_Exclamation4[];
+extern const u8 BattleText_Exclamation5[];
+extern const u8 BattleText_Exclamation[];
+extern const u8 BattleText_Format10[];
+extern const u8 BattleText_Format11[];
 
 extern const u8* const gUnknown_08401674[]; // table of pointers to 'a -TYPE' strings
 extern const u8* const gUnknown_08400F58[]; // table of pointers to stat strings
@@ -116,7 +244,6 @@ struct StatusFlagString
 };
 
 extern const struct StatusFlagString gUnknown_081FA6D4[7]; // status flag/text
-extern const u8 gUnknown_084017A8[8]; // empty flags
 
 extern struct StringInfoBattle* gSelectedOrderFromParty;
 #define gStringInfo gSelectedOrderFromParty
@@ -168,13 +295,13 @@ void BufferStringBattle(u16 stringID)
             if (gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
                 if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-                    stringPtr = gUnknown_084005DB;
+                    stringPtr = BattleText_DoubleWantToBattle;
                 else
-                    stringPtr = gUnknown_084005C7;
+                    stringPtr = BattleText_SingleWantToBattle2;
             }
             else
             {
-                stringPtr = gUnknown_084005AA;
+                stringPtr = BattleText_SingleWantToBattle1;
 #ifdef GERMAN
                 stringPtr = de_sub_804110C(0xFFFF, stringPtr);
 #endif
@@ -183,13 +310,13 @@ void BufferStringBattle(u16 stringID)
         else
         {
             if (gBattleTypeFlags & BATTLE_TYPE_LEGENDARY)
-                stringPtr = gUnknown_08400568;
+                stringPtr = BattleText_WildAppeared2;
             else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) // interesting, looks like they had something planned for wild double battles
-                stringPtr = gUnknown_08400590;
+                stringPtr = BattleText_WildDoubleAppeared;
             else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL)
-                stringPtr = gUnknown_0840057B;
+                stringPtr = BattleText_WildAppeared3;
             else
-                stringPtr = gUnknown_08400555;
+                stringPtr = BattleText_WildAppeared1;
         }
         break;
     case 1: // poke first send-out
@@ -198,34 +325,34 @@ void BufferStringBattle(u16 stringID)
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
             {
                 if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-                    stringPtr = gUnknown_084006F1;
+                    stringPtr = BattleText_SentOutSingle11;
                 else
-                    stringPtr = gUnknown_084006A4;
+                    stringPtr = BattleText_SentOutDouble4;
             }
             else
-                stringPtr = gUnknown_0840069C;
+                stringPtr = BattleText_SentOutSingle6;
         }
         else
         {
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
             {
                 if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-                    stringPtr = gUnknown_0840065C;
+                    stringPtr = BattleText_SentOutDouble3;
                 else if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-                    stringPtr = gUnknown_08400645;
+                    stringPtr = BattleText_SentOutDouble2;
                 else
                 {
-                    stringPtr = gUnknown_08400608;
+                    stringPtr = BattleText_SentOutDouble1;
 #ifdef GERMAN
                     stringPtr = de_sub_804110C(0xFFFF, stringPtr);
 #endif
                 }
             }
             else if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-                stringPtr = gUnknown_08400635;
+                stringPtr = BattleText_SentOutSingle3;
             else
             {
-                stringPtr = gUnknown_084005F5;
+                stringPtr = BattleText_SentOutSingle1;
 #ifdef GERMAN
                 stringPtr = de_sub_804110C(0xFFFF, stringPtr);
 #endif
@@ -236,26 +363,26 @@ void BufferStringBattle(u16 stringID)
         if (GetBankSide(gActiveBank) == 0)
         {
             if (BATTLE_STRUCT->hpScale == 0)
-                stringPtr = gUnknown_08400709;
+                stringPtr = BattleText_ComeBackSingle1;
             else if (BATTLE_STRUCT->hpScale == 1 || gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                stringPtr = gUnknown_08400727;
+                stringPtr = BattleText_ComeBackSingle2;
             else if (BATTLE_STRUCT->hpScale == 2)
-                stringPtr = gUnknown_08400736;
+                stringPtr = BattleText_ComeBackSingle3;
             else
-                stringPtr = gUnknown_08400749;
+                stringPtr = BattleText_ComeBackSingle4;
         }
         else
         {
             if (gTrainerBattleOpponent == 0x800)
             {
                 if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-                    stringPtr = gUnknown_08400781;
+                    stringPtr = BattleText_WithdrewPoke3;
                 else
-                    stringPtr = gUnknown_08400771;
+                    stringPtr = BattleText_WithdrewPoke2;
             }
             else
             {
-                stringPtr = gUnknown_0840075E;
+                stringPtr = BattleText_WithdrewPoke1;
 #ifdef GERMAN
                 stringPtr = de_sub_804110C(0xFFFF, stringPtr);
 #endif
@@ -266,26 +393,26 @@ void BufferStringBattle(u16 stringID)
         if (GetBankSide(BATTLE_STRUCT->scriptingActive) == 0)
         {
             if (BATTLE_STRUCT->hpScale == 0 || gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                stringPtr = gUnknown_084006B3;
+                stringPtr = BattleText_SentOutSingle7;
             else if (BATTLE_STRUCT->hpScale == 1)
-                stringPtr = gUnknown_084006BB;
+                stringPtr = BattleText_SentOutSingle8;
             else if (BATTLE_STRUCT->hpScale == 2)
-                stringPtr = gUnknown_084006C6;
+                stringPtr = BattleText_SentOutSingle9;
             else
-                stringPtr = gUnknown_084006D5;
+                stringPtr = BattleText_SentOutSingle10;
         }
         else
         {
             if (gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
                 if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-                    stringPtr = gUnknown_0840068C;
+                    stringPtr = BattleText_SentOutSingle5;
                 else
-                    stringPtr = gUnknown_0840067C;
+                    stringPtr = BattleText_SentOutSingle4;
             }
             else
             {
-                stringPtr = gUnknown_08400622;
+                stringPtr = BattleText_SentOutSingle2;
 #ifdef GERMAN
                 stringPtr = de_sub_804110C(0xFFFF, stringPtr);
 #endif
@@ -299,7 +426,7 @@ void BufferStringBattle(u16 stringID)
         else
             StringCopy(gBattleTextBuff2, gMoveNames[gStringInfo->currentMove]);
         sub_8121D74(gBattleTextBuff2);
-        stringPtr = gUnknown_084007BD;
+        stringPtr = BattleText_OpponentUsedMove;
         break;
     case 5: // battle end
         if (gBattleTextBuff1[0] & 0x80)
@@ -308,13 +435,13 @@ void BufferStringBattle(u16 stringID)
             if (GetBankSide(gActiveBank) == 1 && gBattleTextBuff1[0] != 3)
                 gBattleTextBuff1[0] ^= 3;
             if (gBattleTextBuff1[0] == BATTLE_LOST || gBattleTextBuff1[0] == BATTLE_DREW)
-                stringPtr = gUnknown_083FFEFC;
+                stringPtr = BattleText_GotAwaySafely;
             else
             {
                 if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-                    stringPtr = gUnknown_083FFFF7;
+                    stringPtr = BattleText_FledDouble;
                 else
-                    stringPtr = gUnknown_083FFFEA;
+                    stringPtr = BattleText_FledSingle;
             }
         }
         else
@@ -326,13 +453,13 @@ void BufferStringBattle(u16 stringID)
                 switch (gBattleTextBuff1[0])
                 {
                 case BATTLE_WON:
-                    stringPtr = gUnknown_083FFF6A;
+                    stringPtr = BattleText_PlayerDefeatedTrainers;
                     break;
                 case BATTLE_LOST:
-                    stringPtr = gUnknown_083FFF99;
+                    stringPtr = BattleText_PlayerLostTrainers;
                     break;
                 case BATTLE_DREW:
-                    stringPtr = gUnknown_083FFFCB;
+                    stringPtr = BattleText_PlayerTiedTrainers;
                     break;
                 }
             }
@@ -341,13 +468,13 @@ void BufferStringBattle(u16 stringID)
                 switch (gBattleTextBuff1[0])
                 {
                 case BATTLE_WON:
-                    stringPtr = gUnknown_083FFF56;
+                    stringPtr = BattleText_PlayerDefeatedTrainer;
                     break;
                 case BATTLE_LOST:
-                    stringPtr = gUnknown_083FFF81;
+                    stringPtr = BattleText_PlayerLostTrainer;
                     break;
                 case BATTLE_DREW:
-                    stringPtr = gUnknown_083FFFB3;
+                    stringPtr = BattleText_PlayerTiedTrainer;
                     break;
                 }
             }
@@ -414,9 +541,9 @@ extern u8 *de_sub_8041024(s32, u32);
     if (GetBankSide(bank) != 0)                                         \
     {                                                                   \
         if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)                     \
-            toCpy = gUnknown_08400797;                                  \
+            toCpy = BattleText_Foe;                                  \
         else                                                            \
-            toCpy = gUnknown_08400791;                                  \
+            toCpy = BattleText_Wild;                                  \
         while (*toCpy != EOS)                                           \
         {                                                               \
             dst[dstID] = *toCpy;                                        \
@@ -445,9 +572,9 @@ extern u8 *de_sub_8041024(s32, u32);
             toCpy++;                                                    \
         }                                                               \
         if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)                     \
-            toCpy = gUnknown_08400797;                                  \
+            toCpy = BattleText_Foe;                                  \
         else                                                            \
-            toCpy = gUnknown_08400791;                                  \
+            toCpy = BattleText_Wild;                                  \
     }                                                                   \
     else                                                                \
     {                                                                   \
@@ -590,14 +717,14 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst)
                         {
                             StringCopy(text, gEnigmaBerries[gStringBank].name);
 #ifdef ENGLISH
-                            StringAppend(text, gUnknown_08400A85);
+                            StringAppend(text, BattleText_Berry);
 #else
-                            de_sub_8073174(text, gUnknown_08400A85);
+                            de_sub_8073174(text, BattleText_Berry);
 #endif
                             toCpy = text;
                         }
                         else
-                            toCpy = gUnknown_08400A78;
+                            toCpy = BattleText_EnigmaBerry;
                     }
                     else
                     {
@@ -694,45 +821,45 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst)
                 break;
             case 35: // lanette pc
                 if (FlagGet(SYS_PC_LANETTE))
-                    toCpy = gUnknown_084009F7;
+                    toCpy = BattleText_Lanette;
                 else
-                    toCpy = gUnknown_084009ED;
+                    toCpy = BattleText_Someone;
                 break;
             case 38:
                 if (GetBankSide(gBankAttacker) == 0)
-                    toCpy = gUnknown_084007AC;
+                    toCpy = BattleText_Ally2;
                 else
-                    toCpy = gUnknown_084007A7;
+                    toCpy = BattleText_Foe3;
                 break;
             case 39:
                 if (GetBankSide(gBankTarget) == 0)
-                    toCpy = gUnknown_084007AC;
+                    toCpy = BattleText_Ally2;
                 else
-                    toCpy = gUnknown_084007A7;
+                    toCpy = BattleText_Foe3;
                 break;
             case 36:
                 if (GetBankSide(gBankAttacker) == 0)
-                    toCpy = gUnknown_084007A1;
+                    toCpy = BattleText_Ally;
                 else
-                    toCpy = gUnknown_0840079C;
+                    toCpy = BattleText_Foe2;
                 break;
             case 37:
                 if (GetBankSide(gBankTarget) == 0)
-                    toCpy = gUnknown_084007A1;
+                    toCpy = BattleText_Ally;
                 else
-                    toCpy = gUnknown_0840079C;
+                    toCpy = BattleText_Foe2;
                 break;
             case 40:
                 if (GetBankSide(gBankAttacker) == 0)
-                    toCpy = gUnknown_084007B7;
+                    toCpy = BattleText_Ally3;
                 else
-                    toCpy = gUnknown_084007B2;
+                    toCpy = BattleText_Foe4;
                 break;
             case 41:
                 if (GetBankSide(gBankTarget) == 0)
-                    toCpy = gUnknown_084007B7;
+                    toCpy = BattleText_Ally3;
                 else
-                    toCpy = gUnknown_084007B2;
+                    toCpy = BattleText_Foe4;
                 break;
             }
             //if (toCpy != NULL) really GF, why did you forget about this?
@@ -819,9 +946,9 @@ void StrCpyDecodeBattleTextBuff(u8* src, u8* dst)
             else
             {
                 if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
-                    StringAppend(dst, gUnknown_08400797);
+                    StringAppend(dst, BattleText_Foe);
                 else
-                    StringAppend(dst, gUnknown_08400791);
+                    StringAppend(dst, BattleText_Wild);
                 GetMonData(&gEnemyParty[src[srcID + 2]], MON_DATA_NICKNAME, text);
             }
             StringGetEnd10(text);
@@ -839,9 +966,9 @@ void StrCpyDecodeBattleTextBuff(u8* src, u8* dst)
                 StringGetEnd10(text);
                 StringAppend(dst, text);
                 if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
-                    StringAppend(dst, gUnknown_08400797);
+                    StringAppend(dst, BattleText_Foe);
                 else
-                    StringAppend(dst, gUnknown_08400791);
+                    StringAppend(dst, BattleText_Wild);
             }
 #endif
             srcID += 3;
@@ -881,13 +1008,13 @@ void StrCpyDecodeBattleTextBuff(u8* src, u8* dst)
                         {
                             StringCopy(dst, gEnigmaBerries[gStringBank].name);
 #ifdef ENGLISH
-                            StringAppend(dst, gUnknown_08400A85);
+                            StringAppend(dst, BattleText_Berry);
 #else
-                            de_sub_8073174(dst, gUnknown_08400A85);
+                            de_sub_8073174(dst, BattleText_Berry);
 #endif
                         }
                         else
-                            StringAppend(dst, gUnknown_08400A78);
+                            StringAppend(dst, BattleText_EnigmaBerry);
                     }
                     else
                         CopyItemName(hword, dst);
@@ -917,9 +1044,9 @@ void sub_8121D1C(u8* textBuff)
     if (counter >= 0)
     {
         if (counter <= 2)
-            StringCopy(textBuff, gUnknown_08400E5E); // is
+            StringCopy(textBuff, BattleText_Format10); // is
         else if (counter <= 4)
-            StringCopy(textBuff, gUnknown_08400E62); // 's
+            StringCopy(textBuff, BattleText_Format11); // 's
     }
 }
 
@@ -942,19 +1069,19 @@ void sub_8121D74(u8* dst)
     switch (counter)
     {
     case 0:
-        StringCopy(dst, gUnknown_084007C8);
+        StringCopy(dst, BattleText_Exclamation2);
         break;
     case 1:
-        StringCopy(dst, gUnknown_084007CA);
+        StringCopy(dst, BattleText_Exclamation3);
         break;
     case 2:
-        StringCopy(dst, gUnknown_084007CC);
+        StringCopy(dst, BattleText_Exclamation4);
         break;
     case 3:
-        StringCopy(dst, gUnknown_084007CE);
+        StringCopy(dst, BattleText_Exclamation5);
         break;
     case 4:
-        StringCopy(dst, gUnknown_084007D0);
+        StringCopy(dst, BattleText_Exclamation);
         break;
     }
 }