1 files changed, 6 insertions, 49 deletions

diff --git a/src/battle_2.c b/src/battle_2.c
index 4beb0a46f..451c4f108 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -64,48 +64,6 @@ struct UnknownPokemonStruct2
     /*0x1D*/ u8 language;
 };
 
-struct UnknownStruct9
-{
-    u8 unk0;
-    u16 unk2;
-};
-
-struct UnknownStruct10
-{
-    u8 unk0_0:1;
-    u8 unk0_1:1;
-    u8 unk0_2:1;
-    u8 filler1[1];
-    u8 unk2;
-    u8 unk3;
-    u8 filler4[8];
-};
-
-struct UnknownStruct11
-{
-    u8 unk0;
-    u8 unk1;
-    u8 unk2;
-    u8 unk3;
-    u8 unk4;
-    u8 unk5_0:1;
-    u8 unk5_1:1;
-    u16 unk6;
-    u8 unk8[10];
-    u8 unk12;
-    u8 unk13;
-    u8 unk14[10];
-    u8 filler1E[2];
-    u16 unk20;
-    u16 unk22;
-    u16 unk24;
-    u16 unk26;
-    u16 unk28;
-    u8 unk2A[10];
-    u8 filler34[2];
-    u8 unk36[10];
-};
-
 struct UnknownStruct12
 {
     u32 unk0;
@@ -179,8 +137,6 @@ extern u8 ewram[];
 #define ewram17100 ((u32 *)(ewram + 0x17100))
 #define ewram17130 (ewram[0x17130])
 #define ewram17160 (ewram[0x17160])
-#define ewram17800 ((struct UnknownStruct9 *)(ewram + 0x17800))
-#define ewram17810 ((struct UnknownStruct10 *)(ewram + 0x17810))
 #define ewram1D000 ((struct Pokemon *)(ewram + 0x1D000))
 
 extern struct UnknownPokemonStruct2 gUnknown_02023A00[];
@@ -243,7 +199,7 @@ extern u16 gUnknown_030042C0;
 extern u16 gUnknown_030042C4;
 extern MainCallback gUnknown_030042D0;
 extern void (*gUnknown_030042D4)(void);
-extern struct UnknownStruct11 gUnknown_030042E0;
+extern struct Struct30042E0 gUnknown_030042E0;
 extern u8 gUnknown_03004324;
 extern void (*gUnknown_03004330[])(void);
 extern u8 gUnknown_03004340[];
@@ -263,6 +219,7 @@ extern u32 gBattleMoveDamage;
 extern struct BattlePokemon gBattleMons[];
 extern u8 gBattleMoveFlags;
 
+
 void sub_800E7C4(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
@@ -1747,7 +1704,7 @@ void sub_8010874(void)
 
 void sub_8010B88(void)
 {
-    struct UnknownStruct4 sp0 = gUnknown_02024CA8[gUnknown_02024A60];
+    struct UnkBattleStruct4 sp0 = gUnknown_02024CA8[gUnknown_02024A60];
     s32 i;
     u8 *ptr;
     u32 *ptr2;
@@ -1991,14 +1948,14 @@ void sub_8011384(void)
                 }
                 if (battle_side_get_owner(gUnknown_02024A60) == 1
                  && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)))
-                    sub_8090D90(SpeciesToNationalPokedexNum(gBattleMons[gUnknown_02024A60].species), 2);
+                    GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gUnknown_02024A60].species), 2);
             }
             else
             {
                 if (battle_side_get_owner(gUnknown_02024A60) == 1
                  && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)))
                 {
-                    sub_8090D90(SpeciesToNationalPokedexNum(gBattleMons[gUnknown_02024A60].species), 2);
+                    GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gUnknown_02024A60].species), 2);
                     dp01_build_cmdbuf_x04_4_4_4(0);
                     dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60);
                 }
@@ -2153,7 +2110,7 @@ void bc_801362C(void)
         {
             if (battle_side_get_owner(gUnknown_02024A60) == 1
              && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)))
-                sub_8090D90(SpeciesToNationalPokedexNum(gBattleMons[gUnknown_02024A60].species), 2);
+                GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gUnknown_02024A60].species), 2);
         }
         gUnknown_030042D4 = sub_8011970;
     }