battle_h update, labelling battle2.c

1 files changed, 11 insertions, 12 deletions

diff --git a/src/tv.c b/src/tv.c
index 14e7cf143..ffc70f12a 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;