Merge pull request #340 from DizzyEggg/master

Battle header and moar labels

4 files changed, 242 insertions, 271 deletions

diff --git a/src/battle_2.c b/src/battle_2.c
index 2b13fc45d..d08f2b8df 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -26,6 +26,9 @@
 #include "trig.h"
 #include "unknown_task.h"
 #include "util.h"
+#include "items.h"
+#include "hold_effects.h"
+#include "battle_move_effects.h"
 
 struct UnknownStruct6
 {
@@ -70,30 +73,6 @@ struct UnknownStruct12
     u8 filler4[0x54];
 };
 
-struct UnknownStruct13
-{
-    u32 unk0_0:1;
-    u32 unk0_1:1;
-    u32 unk0_2:1;
-    u32 unk0_3:1;
-    u32 unk0_4:1;
-    u32 unk0_5:1;
-    u32 unk0_6:1;
-    u32 unk0_7:1;
-    u32 unk1_0:1;
-    u32 unk1_1:1;
-    u32 unk1_2:1;
-    u32 unk1_3:2;
-    u32 unk1_5:1;
-    u32 unk1_6:1;
-    u32 unk1_7:1;
-    u32 unk2_0:1;
-    u32 unk2_1:1;
-    u32 unk2_2:1;
-    u32 unk2_3:1;
-    u8 filler4[12];
-};
-
 extern const u16 gUnknown_08D004E0[];
 extern const struct MonCoords gCastformFrontSpriteCoords[];
 
@@ -166,7 +145,6 @@ extern u16 gChosenMovesByBanks[];
 extern u32 gHitMarker;
 extern u8 gUnknown_02024C70[];
 extern u16 gSideAffecting[];
-extern u8 gSideTimer[][12];
 extern u32 gStatuses3[];
 //extern u8 gDisableStructs[][0x1C];
 extern u16 gPauseCounterBattle;
@@ -175,8 +153,6 @@ extern u16 gRandomTurnNumber;
 extern u8 gBattleCommunication[];
 extern u8 gUnknown_02024D1F[];  // I don't actually know what type this is.
 extern u8 gBattleOutcome;
-extern struct UnknownStruct13 gProtectStructs[];
-extern u8 gWishFutureKnock[];
 extern u16 gUnknown_02024DE8;
 extern u8 gActionSelectionCursor[];
 extern u8 gMoveSelectionCursor[];
@@ -199,7 +175,6 @@ extern u16 gUnknown_030042C0;
 extern u16 gUnknown_030042C4;
 extern MainCallback gPreBattleCallback1;
 extern void (*gBattleMainFunc)(void);
-extern struct Struct30042E0 gBattleResults;
 extern u8 gLeveledUpInBattle;
 extern void (*gBattleBankFunc[])(void);
 extern u8 gHealthboxIDs[];
@@ -219,6 +194,7 @@ extern u32 gBattleMoveDamage;
 extern struct BattlePokemon gBattleMons[];
 extern u8 gBattleMoveFlags;
 
+static void BattlePrepIntroSlide(void);
 
 void sub_800E7C4(void)
 {
@@ -1495,43 +1471,43 @@ void sub_80105EC(struct Sprite *sprite)
     }
 }
 
-void dp11b_obj_instanciate(u8 a, u8 b, s8 c, s8 d)
+void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d)
 {
     u8 spriteId;
-    u8 r7;
+    u8 objectID;
 
     if (b)
     {
-        if (ewram17810[a].unk0_1)
+        if (ewram17810[bank].unk0_1)
             return;
     }
     else
     {
-        if (ewram17810[a].unk0_2)
+        if (ewram17810[bank].unk0_2)
             return;
     }
 
     spriteId = CreateInvisibleSpriteWithCallback(objc_dp11b_pingpong);
     if (b == TRUE)
     {
-        r7 = gHealthboxIDs[a];
-        ewram17810[a].unk2 = spriteId;
-        ewram17810[a].unk0_1 = 1;
+        objectID = gHealthboxIDs[bank];
+        ewram17810[bank].unk2 = spriteId;
+        ewram17810[bank].unk0_1 = 1;
         gSprites[spriteId].data0 = 0x80;
     }
     else
     {
-        r7 = gObjectBankIDs[a];
-        ewram17810[a].unk3 = spriteId;
-        ewram17810[a].unk0_2 = 1;
+        objectID = gObjectBankIDs[bank];
+        ewram17810[bank].unk3 = spriteId;
+        ewram17810[bank].unk0_2 = 1;
         gSprites[spriteId].data0 = 0xC0;
     }
     gSprites[spriteId].data1 = c;
     gSprites[spriteId].data2 = d;
-    gSprites[spriteId].data3 = r7;
+    gSprites[spriteId].data3 = objectID;
     gSprites[spriteId].data4 = b;
-    gSprites[r7].pos2.x = 0;
-    gSprites[r7].pos2.y = 0;
+    gSprites[objectID].pos2.x = 0;
+    gSprites[objectID].pos2.y = 0;
 }
 
 void dp11b_obj_free(u8 a, u8 b)
@@ -1586,7 +1562,6 @@ void sub_8010800(void)
 void sub_8010824(void)
 {
     gBattleMainFunc();
-    gActiveBank = 0;
 
     for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
         gBattleBankFunc[gActiveBank]();
@@ -1595,7 +1570,7 @@ void sub_8010824(void)
 void sub_8010874(void)
 {
     s32 i;
-    s32 j;
+    u32 j;
     u8 *r4;
 
     TurnValuesCleanUp(0);
@@ -1609,7 +1584,7 @@ void sub_8010874(void)
         for (j = 0; j < (u32)0x1C; j++)
             r4[j] = 0;
 
-        gDisableStructs[i].unk16 = 2;
+        gDisableStructs[i].IsFirstTurn = 2;
         gUnknown_02024C70[i] = 0;
         gLastUsedMove[i] = 0;
         gMoveHitWith[i] = 0;
@@ -1626,7 +1601,7 @@ void sub_8010874(void)
         gSideAffecting[i] = 0;
 
         r4 = (u8 *)&gSideTimer[i];
-        for (j = 0; j < (u32)12; j++)
+        for (j = 0; j < 12; j++)
             r4[j] = 0;
     }
 
@@ -1639,8 +1614,8 @@ void sub_8010874(void)
         r4[i] = 0;
 
     gHitMarker = 0;
-    if ((gBattleTypeFlags & 2) == 0 && gSaveBlock2.optionsBattleSceneOff == TRUE)
-        gHitMarker = 0x80;
+    if ((gBattleTypeFlags & BATTLE_TYPE_LINK) == 0 && gSaveBlock2.optionsBattleSceneOff == TRUE)
+        gHitMarker = HITMARKER_NO_ANIMATIONS;
     ewram16084 = gSaveBlock2.optionsBattleStyle;
     gMultiHitCounter = 0;
     gBattleOutcome = 0;
@@ -1680,36 +1655,36 @@ void sub_8010874(void)
     ewram16113 = 0;
     for (i = 0; i < 11; i++)
         gBattleResults.unk36[i] = 0;
-    gBattleResults.unk13 = 0;
-    gBattleResults.unk0 = 0;
-    gBattleResults.unk1 = 0;
+    gBattleResults.BattleTurnCounter = 0;
+    gBattleResults.PlayerFaintCounter = 0;
+    gBattleResults.OpponentFaintCounter = 0;
     gBattleResults.unk2 = 0;
     gBattleResults.unk3 = 0;
     gBattleResults.unk4 = 0;
     gBattleResults.unk5_0 = 0;
     gBattleResults.unk5_1 = 0;
-    gBattleResults.unk20 = 0;
-    gBattleResults.unk22 = 0;
-    gBattleResults.unk24 = 0;
-    gBattleResults.unk6 = 0;
-    gBattleResults.unk26 = 0;
-    gBattleResults.unk28 = 0;
+    gBattleResults.LastOpponentSpecies = 0;
+    gBattleResults.LastUsedMove = 0;
+    gBattleResults.OpponentMove = 0;
+    gBattleResults.Poke1Species = 0;
+    gBattleResults.OpponentSpecies = 0;
+    gBattleResults.CaughtPoke = 0;
     for (i = 0; i < 10; i++)
     {
-        gBattleResults.unk8[i] = 0;
-        gBattleResults.unk14[i] = 0;
-        gBattleResults.unk2A[i] = 0;
+        gBattleResults.PokeString1[i] = 0;
+        gBattleResults.PokeString2[i] = 0;
+        gBattleResults.CaughtNick[i] = 0;
     }
 }
 
-void sub_8010B88(void)
+void SwitchInClearStructs(void)
 {
-    struct UnkBattleStruct4 sp0 = gDisableStructs[gActiveBank];
+    struct DisableStruct sp0 = gDisableStructs[gActiveBank];
     s32 i;
     u8 *ptr;
     u32 *ptr2;
 
-    if (gBattleMoves[gCurrentMove].effect != 0x7F)
+    if (gBattleMoves[gCurrentMove].effect != EFFECT_BATON_PASS)
     {
         for (i = 0; i < 8; i++)
             gBattleMons[gActiveBank].statStages[i] = 6;
@@ -1717,27 +1692,27 @@ void sub_8010B88(void)
         {
             struct UnknownStruct12 *sp20 = &gUnknown_02024AD0[i];
 
-            if ((sp20->unk0 & 0x04000000) && gDisableStructs[i].unk14 == gActiveBank)
+            if ((sp20->unk0 & 0x04000000) && gDisableStructs[i].BankPreventingEscape == gActiveBank)
                 sp20->unk0 &= ~0x04000000;
-            if ((gStatuses3[i] & 0x18) && gDisableStructs[i].unk15 == gActiveBank)
+            if ((gStatuses3[i] & STATUS3_ALWAYS_HITS) && gDisableStructs[i].BankWithSureHit == gActiveBank)
             {
-                gStatuses3[i] &= ~0x18;
-                gDisableStructs[i].unk15 = 0;
+                gStatuses3[i] &= ~STATUS3_ALWAYS_HITS;
+                gDisableStructs[i].BankWithSureHit = 0;
             }
         }
     }
-    if (gBattleMoves[gCurrentMove].effect == 0x7F)
+    if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
     {
-        gBattleMons[gActiveBank].status2 &= 0x15100007;
-        gStatuses3[gActiveBank] &= 0x3043F;
+        gBattleMons[gActiveBank].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED);
+        gStatuses3[gActiveBank] &= (STATUS3_LEECHSEED_RECEIVER | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT);
 
         for (i = 0; i < gNoOfAllBanks; i++)
         {
             if (GetBankSide(gActiveBank) != GetBankSide(i)
-             && (gStatuses3[i] & 0x18) != 0
-             && (gDisableStructs[i].unk15 == gActiveBank))
+             && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
+             && (gDisableStructs[i].BankWithSureHit == gActiveBank))
             {
-                gStatuses3[i] &= ~0x18;
+                gStatuses3[i] &= ~STATUS3_ALWAYS_HITS;
                 gStatuses3[i] |= 0x10;
             }
         }
@@ -1763,15 +1738,15 @@ void sub_8010B88(void)
     for (i = 0; i < (u32)0x1C; i++)
         ptr[i] = 0;
 
-    if (gBattleMoves[gCurrentMove].effect == 0x7F)
+    if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
     {
-        gDisableStructs[gActiveBank].unkA = sp0.unkA;
-        gDisableStructs[gActiveBank].unk15 = sp0.unk15;
+        gDisableStructs[gActiveBank].SubstituteHP = sp0.SubstituteHP;
+        gDisableStructs[gActiveBank].BankWithSureHit = sp0.BankWithSureHit;
         gDisableStructs[gActiveBank].unkF_0 = sp0.unkF_0;
         gDisableStructs[gActiveBank].unkF_4 = sp0.unkF_4;
     }
 
-    gDisableStructs[gActiveBank].unk16 = 2;
+    gDisableStructs[gActiveBank].IsFirstTurn = 2;
     gLastUsedMove[gActiveBank] = 0;
     gMoveHitWith[gActiveBank] = 0;
     gUnknown_02024C44[gActiveBank] = 0;
@@ -1806,12 +1781,12 @@ void UndoEffectsAfterFainting(void)
     gStatuses3[gActiveBank] = 0;
     for (i = 0; i < gNoOfAllBanks; i++)
     {
-        if ((gBattleMons[i].status2 & 0x4000000) && gDisableStructs[i].unk14 == gActiveBank)
-            gBattleMons[i].status2 &= ~0x4000000;
+        if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].BankPreventingEscape == gActiveBank)
+            gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
         if (gBattleMons[i].status2 & (gBitTable[gActiveBank] << 16))
             gBattleMons[i].status2 &= ~(gBitTable[gActiveBank] << 16);
-        if ((gBattleMons[i].status2 & 0xE000) && ewram[0x16020 + i] == gActiveBank)
-            gBattleMons[i].status2 &= ~0xE000;
+        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && ewram[0x16020 + i] == gActiveBank)
+            gBattleMons[i].status2 &= ~STATUS2_WRAPPED;
     }
     gActionSelectionCursor[gActiveBank] = 0;
     gMoveSelectionCursor[gActiveBank] = 0;
@@ -1819,27 +1794,27 @@ void UndoEffectsAfterFainting(void)
     ptr = (u8 *)&gDisableStructs[gActiveBank];
     for (i = 0; i < (u32)0x1C; i++)
         ptr[i] = 0;
-    gProtectStructs[gActiveBank].unk0_0 = 0;
-    gProtectStructs[gActiveBank].unk0_1 = 0;
-    gProtectStructs[gActiveBank].unk0_2 = 0;
-    gProtectStructs[gActiveBank].unk0_3 = 0;
-    gProtectStructs[gActiveBank].unk0_4 = 0;
-    gProtectStructs[gActiveBank].unk0_5 = 0;
-    gProtectStructs[gActiveBank].unk0_6 = 0;
-    gProtectStructs[gActiveBank].unk0_7 = 0;
-    gProtectStructs[gActiveBank].unk1_0 = 0;
-    gProtectStructs[gActiveBank].unk1_1 = 0;
-    gProtectStructs[gActiveBank].unk1_2 = 0;
-    gProtectStructs[gActiveBank].unk1_3 = 0;
-    gProtectStructs[gActiveBank].unk1_5 = 0;
-    gProtectStructs[gActiveBank].unk1_6 = 0;
-    gProtectStructs[gActiveBank].unk1_7 = 0;
-    gProtectStructs[gActiveBank].unk2_0 = 0;
-    gProtectStructs[gActiveBank].unk2_1 = 0;
-    gProtectStructs[gActiveBank].unk2_2 = 0;
-    gProtectStructs[gActiveBank].unk2_3 = 0;
-
-    gDisableStructs[gActiveBank].unk16 = 2;
+    gProtectStructs[gActiveBank].Protected = 0;
+    gProtectStructs[gActiveBank].Endured = 0;
+    gProtectStructs[gActiveBank].OnlyStruggle = 0;
+    gProtectStructs[gActiveBank].HelpingHand = 0;
+    gProtectStructs[gActiveBank].BounceMove = 0;
+    gProtectStructs[gActiveBank].StealMove = 0;
+    gProtectStructs[gActiveBank].Flag0Unknown = 0;
+    gProtectStructs[gActiveBank].PrlzImmobility = 0;
+    gProtectStructs[gActiveBank].ConfusionSelfDmg = 0;
+    gProtectStructs[gActiveBank].NotEffective = 0;
+    gProtectStructs[gActiveBank].ChargingTurn = 0;
+    gProtectStructs[gActiveBank].FleeFlag = 0;
+    gProtectStructs[gActiveBank].UsedImprisionedMove = 0;
+    gProtectStructs[gActiveBank].LoveImmobility = 0;
+    gProtectStructs[gActiveBank].UsedDisabledMove = 0;
+    gProtectStructs[gActiveBank].UsedTauntedMove = 0;
+    gProtectStructs[gActiveBank].Flag2Unknown = 0;
+    gProtectStructs[gActiveBank].FlinchImmobility = 0;
+    gProtectStructs[gActiveBank].NotFirstStrike = 0;
+
+    gDisableStructs[gActiveBank].IsFirstTurn = 2;
     gLastUsedMove[gActiveBank] = 0;
     gMoveHitWith[gActiveBank] = 0;
     gUnknown_02024C44[gActiveBank] = 0;
@@ -1878,7 +1853,7 @@ void bc_8012FAC(void)
         {
             gBattleCommunication[1]++;
             if (gBattleCommunication[1] == gNoOfAllBanks)
-                gBattleMainFunc = bc_load_battlefield;
+                gBattleMainFunc = BattlePrepIntroSlide;
             else
                 gBattleCommunication[0] = 0;
         }
@@ -1886,7 +1861,7 @@ void bc_8012FAC(void)
     }
 }
 
-void bc_load_battlefield(void)
+static void BattlePrepIntroSlide(void)
 {
     if (gBattleExecBuffer == 0)
     {
@@ -2294,7 +2269,7 @@ void BattleTurnPassed(void)
     if (sub_80170DC() != 0)
         return;
     TurnValuesCleanUp(0);
-    gHitMarker &= ~0x200;
+    gHitMarker &= ~HITMARKER_NO_ATTACKSTRING;
     gHitMarker &= ~0x80000;
     gHitMarker &= ~0x400000;
     gHitMarker &= ~0x100000;
@@ -2311,8 +2286,8 @@ void BattleTurnPassed(void)
         gBattleMainFunc = sub_80138F0;
         return;
     }
-    if (gBattleResults.unk13 < 0xFF)
-        gBattleResults.unk13++;
+    if (gBattleResults.BattleTurnCounter < 0xFF)
+        gBattleResults.BattleTurnCounter++;
     for (i = 0; i < gNoOfAllBanks; i++)
     {
         gActionForBanks[i] = 0xFF;
@@ -2331,12 +2306,12 @@ u8 CanRunFromBattle(void)
     u8 r6;
     s32 i;
 
-    if (gBattleMons[gActiveBank].item == 0xAF)
+    if (gBattleMons[gActiveBank].item == ITEM_ENIGMA_BERRY)
         r2 = gEnigmaBerries[gActiveBank].holdEffect;
     else
         r2 = ItemId_GetHoldEffect(gBattleMons[gActiveBank].item);
     gStringBank = gActiveBank;
-    if (r2 == 0x25)
+    if (r2 == HOLD_EFFECT_CAN_ALWAYS_RUN)
         return 0;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         return 0;
@@ -2346,7 +2321,7 @@ u8 CanRunFromBattle(void)
     for (i = 0; i < gNoOfAllBanks; i++)
     {
         if (r6 != GetBankSide(i)
-         && gBattleMons[i].ability == 0x17)
+         && gBattleMons[i].ability == ABILITY_SHADOW_TAG)
         {
             ewram16003 = i;
             gLastUsedAbility = gBattleMons[i].ability;
@@ -2357,7 +2332,7 @@ u8 CanRunFromBattle(void)
          && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE
          && gBattleMons[gActiveBank].type1 != 2
          && gBattleMons[gActiveBank].type2 != 2
-         && gBattleMons[i].ability == 0x47)
+         && gBattleMons[i].ability == ABILITY_ARENA_TRAP)
         {
             ewram16003 = i;
             gLastUsedAbility = gBattleMons[i].ability;
@@ -2365,7 +2340,7 @@ u8 CanRunFromBattle(void)
             return 2;
         }
     }
-    i = AbilityBattleEffects(15, gActiveBank, 0x2A, 0, 0);
+    i = AbilityBattleEffects(15, gActiveBank, ABILITY_MAGNET_PULL, 0, 0);
     if (i != 0 && (gBattleMons[gActiveBank].type1 == 8 || gBattleMons[gActiveBank].type2 == 8))
     {
         ewram16003 = i - 1;
@@ -2373,7 +2348,7 @@ u8 CanRunFromBattle(void)
         gBattleCommunication[5] = 2;
         return 2;
     }
-    if ((gBattleMons[gActiveBank].status2 & 0x0400E000) || (gStatuses3[gActiveBank] & 0x400))
+    if ((gBattleMons[gActiveBank].status2 & (STATUS2_ESCAPE_PREVENTION | STATUS2_WRAPPED)) || (gStatuses3[gActiveBank] & STATUS3_ROOTED))
     {
         gBattleCommunication[5] = 0;
         return 1;
diff --git a/src/battle_ai.c b/src/battle_ai.c
index fabe0b61d..9f95d23f3 100644
--- a/src/battle_ai.c
+++ b/src/battle_ai.c
@@ -15,7 +15,7 @@
 extern u16 gBattleTypeFlags;
 extern u16 gBattleWeather;
 extern u8 gActiveBank;
-extern u8 gBattlePartyID[][2];
+extern u16 gBattlePartyID[MAX_BANKS_BATTLE];
 extern u16 gCurrentMove;
 extern int gBattleMoveDamage;
 extern u8 gBankAttacker;
@@ -23,13 +23,10 @@ extern u8 gBankTarget;
 extern u8 gAbsentBankFlags;
 extern u8 gBattleMoveFlags;
 extern u16 gDynamicBasePower;
-extern u16 gLastUsedMove[];
-extern u32 gUnknown_02024ACC[];
-extern u32 gStatuses3[];
-extern u16 gSideAffecting[];
-extern struct BattlePokemon gBattleMons[];
-extern struct BattlePokemon gUnknown_02024A8C[];
-extern u8 gBattleResults[];
+extern u16 gLastUsedMove[MAX_BANKS_BATTLE];
+extern u32 gStatuses3[MAX_BANKS_BATTLE];
+extern u16 gSideAffecting[2];
+extern struct BattlePokemon gBattleMons[MAX_BANKS_BATTLE];
 extern u8 gCritMultiplier;
 extern u16 gTrainerBattleOpponent;
 extern u8 *BattleAIs[];
@@ -120,7 +117,7 @@ static void BattleAICmd_get_gender(void);
 static void BattleAICmd_is_first_turn(void);
 static void BattleAICmd_get_stockpile_count(void);
 static void BattleAICmd_is_double_battle(void);
-static void BattleAICmd_get_item(void);
+static void BattleAICmd_get_used_item(void);
 static void BattleAICmd_get_move_type_from_result(void);
 static void BattleAICmd_get_move_power_from_result(void);
 static void BattleAICmd_get_move_effect_from_result(void);
@@ -142,100 +139,100 @@ typedef void (*BattleAICmdFunc)(void);
 
 static const BattleAICmdFunc sBattleAICmdTable[] =
 {
-    BattleAICmd_if_random_less_than,
-    BattleAICmd_if_random_greater_than,
-    BattleAICmd_if_random_equal,
-    BattleAICmd_if_random_not_equal,
-    BattleAICmd_score,
-    BattleAICmd_if_hp_less_than,
-    BattleAICmd_if_hp_more_than,
-    BattleAICmd_if_hp_equal,
-    BattleAICmd_if_hp_not_equal,
-    BattleAICmd_if_status,
-    BattleAICmd_if_not_status,
-    BattleAICmd_if_status2,
-    BattleAICmd_if_not_status2,
-    BattleAICmd_if_status3,
-    BattleAICmd_if_not_status3,
-    BattleAICmd_if_status4,
-    BattleAICmd_if_not_status4,
-    BattleAICmd_if_less_than,
-    BattleAICmd_if_more_than,
-    BattleAICmd_if_equal,
-    BattleAICmd_if_not_equal,
-    BattleAICmd_if_less_than_32,
-    BattleAICmd_if_more_than_32,
-    BattleAICmd_if_equal_32,
-    BattleAICmd_if_not_equal_32,
-    BattleAICmd_if_move,
-    BattleAICmd_if_not_move,
-    BattleAICmd_if_in_bytes,
-    BattleAICmd_if_not_in_bytes,
-    BattleAICmd_if_in_words,
-    BattleAICmd_if_not_in_words,
-    BattleAICmd_if_user_can_damage,
-    BattleAICmd_if_user_cant_damage,
-    BattleAICmd_get_turn_count,
-    BattleAICmd_get_type,
-    BattleAICmd_get_move_power,
-    BattleAICmd_is_most_powerful_move,
-    BattleAICmd_get_move,
-    BattleAICmd_if_arg_equal,
-    BattleAICmd_if_arg_not_equal,
-    BattleAICmd_if_would_go_first,
-    BattleAICmd_if_would_not_go_first,
-    BattleAICmd_nullsub_2A,
-    BattleAICmd_nullsub_2B,
-    BattleAICmd_count_alive_pokemon,
-    BattleAICmd_get_considered_move,
-    BattleAICmd_get_considered_move_effect,
-    BattleAICmd_get_ability,
-    BattleAICmd_get_highest_possible_damage,
-    BattleAICmd_if_damage_bonus,
-    BattleAICmd_nullsub_32,
-    BattleAICmd_nullsub_33,
-    BattleAICmd_if_status_in_party,
-    BattleAICmd_if_status_not_in_party,
-    BattleAICmd_get_weather,
-    BattleAICmd_if_effect,
-    BattleAICmd_if_not_effect,
-    BattleAICmd_if_stat_level_less_than,
-    BattleAICmd_if_stat_level_more_than,
-    BattleAICmd_if_stat_level_equal,
-    BattleAICmd_if_stat_level_not_equal,
-    BattleAICmd_if_can_faint,
-    BattleAICmd_if_cant_faint,
-    BattleAICmd_if_has_move,
-    BattleAICmd_if_dont_have_move,
-    BattleAICmd_if_move_effect,
-    BattleAICmd_if_not_move_effect,
-    BattleAICmd_if_last_move_did_damage,
-    BattleAICmd_if_encored,
-    BattleAICmd_flee,
-    BattleAICmd_if_random_100,
-    BattleAICmd_watch,
-    BattleAICmd_get_hold_effect,
-    BattleAICmd_get_gender,
-    BattleAICmd_is_first_turn,
-    BattleAICmd_get_stockpile_count,
-    BattleAICmd_is_double_battle,
-    BattleAICmd_get_item,
-    BattleAICmd_get_move_type_from_result,
-    BattleAICmd_get_move_power_from_result,
-    BattleAICmd_get_move_effect_from_result,
-    BattleAICmd_get_protect_count,
-    BattleAICmd_nullsub_52,
-    BattleAICmd_nullsub_53,
-    BattleAICmd_nullsub_54,
-    BattleAICmd_nullsub_55,
-    BattleAICmd_nullsub_56,
-    BattleAICmd_nullsub_57,
-    BattleAICmd_call,
-    BattleAICmd_jump,
-    BattleAICmd_end,
-    BattleAICmd_if_level_compare,
-    BattleAICmd_if_taunted,
-    BattleAICmd_if_not_taunted,
+    BattleAICmd_if_random_less_than,         // 0x0
+    BattleAICmd_if_random_greater_than,      // 0x1
+    BattleAICmd_if_random_equal,             // 0x2
+    BattleAICmd_if_random_not_equal,         // 0x3
+    BattleAICmd_score,                       // 0x4
+    BattleAICmd_if_hp_less_than,             // 0x5
+    BattleAICmd_if_hp_more_than,             // 0x6
+    BattleAICmd_if_hp_equal,                 // 0x7
+    BattleAICmd_if_hp_not_equal,             // 0x8
+    BattleAICmd_if_status,                   // 0x9
+    BattleAICmd_if_not_status,               // 0xA
+    BattleAICmd_if_status2,                  // 0xB
+    BattleAICmd_if_not_status2,              // 0xC
+    BattleAICmd_if_status3,                  // 0xD
+    BattleAICmd_if_not_status3,              // 0xE
+    BattleAICmd_if_status4,                  // 0xF
+    BattleAICmd_if_not_status4,              // 0x10
+    BattleAICmd_if_less_than,                // 0x11
+    BattleAICmd_if_more_than,                // 0x12
+    BattleAICmd_if_equal,                    // 0x13
+    BattleAICmd_if_not_equal,                // 0x14
+    BattleAICmd_if_less_than_32,             // 0x15
+    BattleAICmd_if_more_than_32,             // 0x16
+    BattleAICmd_if_equal_32,                 // 0x17
+    BattleAICmd_if_not_equal_32,             // 0x18
+    BattleAICmd_if_move,                     // 0x19
+    BattleAICmd_if_not_move,                 // 0x1A
+    BattleAICmd_if_in_bytes,                 // 0x1B
+    BattleAICmd_if_not_in_bytes,             // 0x1C
+    BattleAICmd_if_in_words,                 // 0x1D
+    BattleAICmd_if_not_in_words,             // 0x1E
+    BattleAICmd_if_user_can_damage,          // 0x1F
+    BattleAICmd_if_user_cant_damage,         // 0x20
+    BattleAICmd_get_turn_count,              // 0x21
+    BattleAICmd_get_type,                    // 0x22
+    BattleAICmd_get_move_power,              // 0x23
+    BattleAICmd_is_most_powerful_move,       // 0x24
+    BattleAICmd_get_move,                    // 0x25
+    BattleAICmd_if_arg_equal,                // 0x26
+    BattleAICmd_if_arg_not_equal,            // 0x27
+    BattleAICmd_if_would_go_first,           // 0x28
+    BattleAICmd_if_would_not_go_first,       // 0x29
+    BattleAICmd_nullsub_2A,                  // 0x2A
+    BattleAICmd_nullsub_2B,                  // 0x2B
+    BattleAICmd_count_alive_pokemon,         // 0x2C
+    BattleAICmd_get_considered_move,         // 0x2D
+    BattleAICmd_get_considered_move_effect,  // 0x2E
+    BattleAICmd_get_ability,                 // 0x2F
+    BattleAICmd_get_highest_possible_damage, // 0x30
+    BattleAICmd_if_damage_bonus,             // 0x31
+    BattleAICmd_nullsub_32,                  // 0x32
+    BattleAICmd_nullsub_33,                  // 0x33
+    BattleAICmd_if_status_in_party,          // 0x34
+    BattleAICmd_if_status_not_in_party,      // 0x35
+    BattleAICmd_get_weather,                 // 0x36
+    BattleAICmd_if_effect,                   // 0x37
+    BattleAICmd_if_not_effect,               // 0x38
+    BattleAICmd_if_stat_level_less_than,     // 0x39
+    BattleAICmd_if_stat_level_more_than,     // 0x3A
+    BattleAICmd_if_stat_level_equal,         // 0x3B
+    BattleAICmd_if_stat_level_not_equal,     // 0x3C
+    BattleAICmd_if_can_faint,                // 0x3D
+    BattleAICmd_if_cant_faint,               // 0x3E
+    BattleAICmd_if_has_move,                 // 0x3F
+    BattleAICmd_if_dont_have_move,           // 0x40
+    BattleAICmd_if_move_effect,              // 0x41
+    BattleAICmd_if_not_move_effect,          // 0x42
+    BattleAICmd_if_last_move_did_damage,     // 0x43
+    BattleAICmd_if_encored,                  // 0x44
+    BattleAICmd_flee,                        // 0x45
+    BattleAICmd_if_random_100,               // 0x46
+    BattleAICmd_watch,                       // 0x47
+    BattleAICmd_get_hold_effect,             // 0x48
+    BattleAICmd_get_gender,                  // 0x49
+    BattleAICmd_is_first_turn,               // 0x4A
+    BattleAICmd_get_stockpile_count,         // 0x4B
+    BattleAICmd_is_double_battle,            // 0x4C
+    BattleAICmd_get_used_item,               // 0x4D
+    BattleAICmd_get_move_type_from_result,   // 0x4E
+    BattleAICmd_get_move_power_from_result,  // 0x4F
+    BattleAICmd_get_move_effect_from_result, // 0x50
+    BattleAICmd_get_protect_count,           // 0x51
+    BattleAICmd_nullsub_52,                  // 0x52
+    BattleAICmd_nullsub_53,                  // 0x53
+    BattleAICmd_nullsub_54,                  // 0x54
+    BattleAICmd_nullsub_55,                  // 0x55
+    BattleAICmd_nullsub_56,                  // 0x56
+    BattleAICmd_nullsub_57,                  // 0x57
+    BattleAICmd_call,                        // 0x58
+    BattleAICmd_jump,                        // 0x59
+    BattleAICmd_end,                         // 0x5A
+    BattleAICmd_if_level_compare,            // 0x5B
+    BattleAICmd_if_taunted,                  // 0x5C
+    BattleAICmd_if_not_taunted,              // 0x5D
 };
 
 #ifdef NONMATCHING
@@ -449,13 +446,13 @@ void unref_sub_81074A0(u8 a)
         UNK_2016A00_STRUCT->movesUsed[a / 2][i] = 0;
 }
 
-void sub_81074C4(u8 a, u8 b)
+void RecordAbilityBattle(u8 a, u8 b)
 {
     if (GetBankSide(a) == 0)
         UNK_2016A00_STRUCT->unk20[GetBankIdentity(a) & 1] = b;
 }
 
-void sub_81074F8(u8 a, u8 b)
+void RecordItemBattle(u8 a, u8 b)
 {
     if (GetBankSide(a) == 0)
         UNK_2016A00_STRUCT->unk22[GetBankIdentity(a) & 1] = b;
@@ -899,7 +896,7 @@ static void BattleAICmd_if_user_cant_damage(void)
 
 static void BattleAICmd_get_turn_count(void)
 {
-    AI_THINKING_STRUCT->funcResult = gBattleResults[19];
+    AI_THINKING_STRUCT->funcResult = gBattleResults.BattleTurnCounter;
     gAIScriptPtr += 1;
 }
 
@@ -946,8 +943,8 @@ static void BattleAICmd_is_most_powerful_move(void)
      && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF)
     {
         gDynamicBasePower = 0;
-        unk_2000000[0x1601C] = 0; // why is this a manual array?
-        unk_2000000[0x1601F] = 1;
+        ewram[0x1601C] = 0; // why is this a manual array?
+        ewram[0x1601F] = 1;
         gBattleMoveFlags = 0;
         gCritMultiplier = 1;
 
@@ -965,8 +962,8 @@ static void BattleAICmd_is_most_powerful_move(void)
              && gBattleMoves[gBattleMons[gBankAttacker].moves[i]].power > 1)
             {
                 gCurrentMove = gBattleMons[gBankAttacker].moves[i];
-                sub_801CAF8(gBankAttacker, gBankTarget);
-                move_effectiveness_something(gCurrentMove, gBankAttacker, gBankTarget);
+                AI_CalcDmg(gBankAttacker, gBankTarget);
+                TypeCalc(gCurrentMove, gBankAttacker, gBankTarget);
                 damages[i] = (gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[i]) / 100;
 
                 if (damages[i] == 0) // moves always do at least 1 damage.
@@ -1135,11 +1132,11 @@ _081082BA:\n\
     ldrb r0, [r7]\n\
     ldr r4, _08108354 @ =gBankTarget\n\
     ldrb r1, [r4]\n\
-    bl sub_801CAF8\n\
+    bl AI_CalcDmg\n\
     ldrh r0, [r5]\n\
     ldrb r1, [r7]\n\
     ldrb r2, [r4]\n\
-    bl move_effectiveness_something\n\
+    bl TypeCalc\n\
     mov r4, sp\n\
     add r4, r8\n\
     ldr r2, _08108358 @ =gBattleMoveDamage\n\
@@ -1312,14 +1309,14 @@ static void BattleAICmd_count_alive_pokemon(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         u32 status;
-        var = gBattlePartyID[index][0];
+        var = gBattlePartyID[index];
         status = GetBankIdentity(index) ^ 2;
-        var2 = gBattlePartyID[GetBankByPlayerAI(status)][0];
+        var2 = gBattlePartyID[GetBankByPlayerAI(status)];
     }
     else
     {
-        var = gBattlePartyID[index][0];
-        var2 = gBattlePartyID[index][0];
+        var = gBattlePartyID[index];
+        var2 = gBattlePartyID[index];
     }
 
     for (i = 0; i < 6; i++)
@@ -1415,8 +1412,8 @@ static void BattleAICmd_get_highest_possible_damage(void)
     s32 i;
 
     gDynamicBasePower = 0;
-    BATTLE_STRUCT->unk.unk1 = 0;
-    BATTLE_STRUCT->unk.unk4 = 1;
+    BATTLE_STRUCT->DynamicMoveType = 0;
+    BATTLE_STRUCT->DmgMultiplier = 1;
     gBattleMoveFlags = 0;
     gCritMultiplier = 1;
     AI_THINKING_STRUCT->funcResult = 0;
@@ -1428,7 +1425,7 @@ static void BattleAICmd_get_highest_possible_damage(void)
 
         if (gCurrentMove)
         {
-            move_effectiveness_something(gCurrentMove, gBankAttacker, gBankTarget);
+            TypeCalc(gCurrentMove, gBankAttacker, gBankTarget);
 
             // reduce by 1/3.
             if (gBattleMoveDamage == 120)
@@ -1455,15 +1452,15 @@ static void BattleAICmd_if_damage_bonus(void)
     u8 damageVar;
 
     gDynamicBasePower = 0;
-    BATTLE_STRUCT->unk.unk1 = 0;
-    BATTLE_STRUCT->unk.unk4 = 1;
+    BATTLE_STRUCT->DynamicMoveType = 0;
+    BATTLE_STRUCT->DmgMultiplier = 1;
     gBattleMoveFlags = 0;
     gCritMultiplier = 1;
 
     gBattleMoveDamage = 40;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
 
-    move_effectiveness_something(gCurrentMove, gBankAttacker, gBankTarget);
+    TypeCalc(gCurrentMove, gBankAttacker, gBankTarget);
 
     if (gBattleMoveDamage == 120)
         gBattleMoveDamage = 80;
@@ -1565,13 +1562,13 @@ static void BattleAICmd_if_status_not_in_party(void)
 
 static void BattleAICmd_get_weather(void)
 {
-    if (gBattleWeather & 7)
+    if (gBattleWeather & WEATHER_RAINY)
         AI_THINKING_STRUCT->funcResult = WEATHER_RAIN;
-    if (gBattleWeather & 0x18)
+    if (gBattleWeather & WEATHER_SANDSTORMY)
         AI_THINKING_STRUCT->funcResult = WEATHER_SANDSTORM;
-    if (gBattleWeather & 0x60)
+    if (gBattleWeather & WEATHER_SUNNY)
         AI_THINKING_STRUCT->funcResult = WEATHER_SUN;
-    if (gBattleWeather & 0x80)
+    if (gBattleWeather & weather_hail)
         AI_THINKING_STRUCT->funcResult = WEATHER_HAIL;
 
     gAIScriptPtr += 1;
@@ -1662,13 +1659,13 @@ static void BattleAICmd_if_can_faint(void)
     }
 
     gDynamicBasePower = 0;
-    BATTLE_STRUCT->unk.unk1 = 0;
-    BATTLE_STRUCT->unk.unk4 = 1;
+    BATTLE_STRUCT->DynamicMoveType = 0;
+    BATTLE_STRUCT->DmgMultiplier = 1;
     gBattleMoveFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    sub_801CAF8(gBankAttacker, gBankTarget);
-    move_effectiveness_something(gCurrentMove, gBankAttacker, gBankTarget);
+    AI_CalcDmg(gBankAttacker, gBankTarget);
+    TypeCalc(gCurrentMove, gBankAttacker, gBankTarget);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
@@ -1691,13 +1688,13 @@ static void BattleAICmd_if_cant_faint(void)
     }
 
     gDynamicBasePower = 0;
-    BATTLE_STRUCT->unk.unk1 = 0;
-    BATTLE_STRUCT->unk.unk4 = 1;
+    BATTLE_STRUCT->DynamicMoveType = 0;
+    BATTLE_STRUCT->DmgMultiplier = 1;
     gBattleMoveFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    sub_801CAF8(gBankAttacker, gBankTarget);
-    move_effectiveness_something(gCurrentMove, gBankAttacker, gBankTarget);
+    AI_CalcDmg(gBankAttacker, gBankTarget);
+    TypeCalc(gCurrentMove, gBankAttacker, gBankTarget);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
@@ -1846,7 +1843,7 @@ static void BattleAICmd_if_last_move_did_damage(void)
 
     if (gAIScriptPtr[2] == 0)
     {
-        if (gDisableStructs[index].unk4 == 0)
+        if (gDisableStructs[index].DisabledMove == 0)
         {
             gAIScriptPtr += 7;
             return;
@@ -1859,7 +1856,7 @@ static void BattleAICmd_if_last_move_did_damage(void)
         gAIScriptPtr += 7;
         return;
     }
-    else if (gDisableStructs[index].unk6 != 0)
+    else if (gDisableStructs[index].EncoredMove != 0)
     {
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
         return;
@@ -1872,7 +1869,7 @@ static void BattleAICmd_if_encored(void)
     switch (gAIScriptPtr[1])
     {
     case 0: // _08109348
-        if (gDisableStructs[gActiveBank].unk4 == AI_THINKING_STRUCT->moveConsidered)
+        if (gDisableStructs[gActiveBank].DisabledMove == AI_THINKING_STRUCT->moveConsidered)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -1880,7 +1877,7 @@ static void BattleAICmd_if_encored(void)
         gAIScriptPtr += 6;
         return;
     case 1: // _08109370
-        if (gDisableStructs[gActiveBank].unk6 == AI_THINKING_STRUCT->moveConsidered)
+        if (gDisableStructs[gActiveBank].EncoredMove == AI_THINKING_STRUCT->moveConsidered)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -1957,7 +1954,7 @@ static void BattleAICmd_is_first_turn(void)
     else
         index = gBankTarget;
 
-    AI_THINKING_STRUCT->funcResult = gDisableStructs[index].unk16;
+    AI_THINKING_STRUCT->funcResult = gDisableStructs[index].IsFirstTurn;
 
     gAIScriptPtr += 2;
 }
@@ -1971,7 +1968,7 @@ static void BattleAICmd_get_stockpile_count(void)
     else
         index = gBankTarget;
 
-    AI_THINKING_STRUCT->funcResult = gDisableStructs[index].unk9;
+    AI_THINKING_STRUCT->funcResult = gDisableStructs[index].StockpileCounter;
 
     gAIScriptPtr += 2;
 }
@@ -1983,7 +1980,7 @@ static void BattleAICmd_is_double_battle(void)
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_item(void)
+static void BattleAICmd_get_used_item(void)
 {
     u8 index;
 
@@ -2028,7 +2025,7 @@ static void BattleAICmd_get_protect_count(void)
     else
         index = gBankTarget;
 
-    AI_THINKING_STRUCT->funcResult = gDisableStructs[index].unk8;
+    AI_THINKING_STRUCT->funcResult = gDisableStructs[index].ProtectUses;
 
     gAIScriptPtr += 2;
 }
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index c096e2e4b..f7ff98564 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1274,15 +1274,15 @@ void BoxMonRestorePP(struct BoxPokemon *boxMon)
 
 void sub_8040B8C(void)
 {
-    gLastUsedAbility = BATTLE_STRUCT->filler1_2[0x37];
+    gLastUsedAbility = BATTLE_STRUCT->unk160C0;;
     gBattleTextBuff1[0] = 0xFD;
     gBattleTextBuff1[1] = 4;
-    gBattleTextBuff1[2] = BATTLE_STRUCT->filler1[0x34];
+    gBattleTextBuff1[2] = BATTLE_STRUCT->unk16054;
     gBattleTextBuff1[4] = EOS;
-    if (!GetBankSide(BATTLE_STRUCT->filler1[0x34]))
-        gBattleTextBuff1[3] = pokemon_order_func(gBattlePartyID[BATTLE_STRUCT->filler1[0x34]]);
+    if (!GetBankSide(BATTLE_STRUCT->unk16054))
+        gBattleTextBuff1[3] = pokemon_order_func(gBattlePartyID[BATTLE_STRUCT->unk16054]);
     else
-        gBattleTextBuff1[3] = gBattlePartyID[BATTLE_STRUCT->filler1[0x34]];
+        gBattleTextBuff1[3] = gBattlePartyID[BATTLE_STRUCT->unk16054];
     gBattleTextBuff2[0] = 0xFD;
     gBattleTextBuff2[1] = 4;
     gBattleTextBuff2[2] = gBankInMenu;
diff --git a/src/tv.c b/src/tv.c
index 4bd11a9b9..27fe9b84c 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -44,7 +44,6 @@ struct UnkTvStruct
     s8 var0;
 };
 
-extern struct Struct30042E0 gBattleResults;
 extern u8 gUnknown_0300430A[11];
 
 struct OutbreakPokemon
@@ -430,15 +429,15 @@ void TakeTVShowInSearchOfTrainersOffTheAir(void);
 void GabbyAndTyBeforeInterview(void)
 {
     u8 i;
-    gSaveBlock1.gabbyAndTyData.mon1 = gBattleResults.unk6;
-    gSaveBlock1.gabbyAndTyData.mon2 = gBattleResults.unk26;
-    gSaveBlock1.gabbyAndTyData.lastMove = gBattleResults.unk22;
+    gSaveBlock1.gabbyAndTyData.mon1 = gBattleResults.Poke1Species;
+    gSaveBlock1.gabbyAndTyData.mon2 = gBattleResults.OpponentSpecies;
+    gSaveBlock1.gabbyAndTyData.lastMove = gBattleResults.LastUsedMove;
     if (gSaveBlock1.gabbyAndTyData.battleNum != 0xff)
     {
         gSaveBlock1.gabbyAndTyData.battleNum ++;
     }
     gSaveBlock1.gabbyAndTyData.valA_0 = gBattleResults.unk5_0;
-    if (gBattleResults.unk0)
+    if (gBattleResults.PlayerFaintCounter)
     {
         gSaveBlock1.gabbyAndTyData.valA_1 = 1;
     } else
@@ -612,11 +611,11 @@ void sub_80BDEC8(void) {
     total = 0;
     sub_80BEB20();
     sub_80BE778();
-    if (gBattleResults.unk28 == 0) {
+    if (gBattleResults.CaughtPoke == 0) {
         sub_80BE074();
     } else {
         sub_80BE028();
-        if (sub_80BF77C(0xffff) == 0 && StringCompareWithoutExtCtrlCodes(gSpeciesNames[gBattleResults.unk28], gBattleResults.unk2A) != 0) {
+        if (sub_80BF77C(0xffff) == 0 && StringCompareWithoutExtCtrlCodes(gSpeciesNames[gBattleResults.CaughtPoke], gBattleResults.CaughtNick) != 0) {
             gUnknown_03005D38.var0 = sub_80BF74C(gSaveBlock1.tvShows);
             if (gUnknown_03005D38.var0 != -1 && sub_80BF1B4(TVSHOW_POKEMON_TODAY_CAUGHT) != 1) {
                 for (i=0; i<11; i++) {
@@ -642,8 +641,8 @@ void sub_80BDEC8(void) {
                     show->pokemonToday.var12 = total;
                     show->pokemonToday.ball = item;
                     StringCopy(show->pokemonToday.playerName, gSaveBlock2.playerName);
-                    StringCopy(show->pokemonToday.nickname, gBattleResults.unk2A);
-                    show->pokemonToday.species = gBattleResults.unk28;
+                    StringCopy(show->pokemonToday.nickname, gBattleResults.CaughtNick);
+                    show->pokemonToday.species = gBattleResults.CaughtPoke;
                     sub_80BE138(show);
                     show->pokemonToday.language = GAME_LANGUAGE;
                     show->pokemonToday.language2 = sub_80BDEAC(show->pokemonToday.nickname);
@@ -663,8 +662,8 @@ void sub_80BE028(void) {
         buffer->worldOfMasters.var00 = TVSHOW_WORLD_OF_MASTERS;
     }
     buffer->worldOfMasters.var02++;
-    buffer->worldOfMasters.var04 = gBattleResults.unk28;
-    buffer->worldOfMasters.var08 = gBattleResults.unk6;
+    buffer->worldOfMasters.var04 = gBattleResults.CaughtPoke;
+    buffer->worldOfMasters.var08 = gBattleResults.Poke1Species;
     buffer->worldOfMasters.var0a = gMapHeader.name;
 }
 
@@ -689,7 +688,7 @@ void sub_80BE074(void) {
                 asm_comment("Here the wrong registers are used to hold the show ID and flag.");
                 show->pokemonTodayFailed.var00 = TVSHOW_POKEMON_TODAY_FAILED;
                 show->pokemonTodayFailed.var01 = flag;
-                show->pokemonTodayFailed.species = gBattleResults.unk6;
+                show->pokemonTodayFailed.species = gBattleResults.Poke1Species;
                 show->pokemonTodayFailed.species2 = gBattleResults.unk20;
                 show->pokemonTodayFailed.var10 = total;
                 show->pokemonTodayFailed.var11 = gBattleOutcome;