Get sub_80C01D4 closer to matching

2 files changed, 146 insertions, 139 deletions

diff --git a/include/global.h b/include/global.h
index 2fad98eb4..9a95cf41f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -206,32 +206,6 @@ struct TVShowCommon {
 	/*0x23*/ u8 trainerIdHi;
 };
 
-struct TVShowPokemonToday {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
-    /*0x02*/ u8 language;
-    /*0x03*/ u8 language2;
-    /*0x04*/ u8 nickname[11];
-    /*0x0F*/ u8 ball;
-    /*0x10*/ u16 species;
-    /*0x12*/ u8 var12;
-    /*0x13*/ u8 playerName[8];
-};
-
-
-struct TVShowPokemonTodayFailed {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
-    /*0x02*/ u8 language;
-    /*0x03*/ u8 pad03[9];
-    /*0x0c*/ u16 species;
-    /*0x0e*/ u16 species2;
-    /*0x10*/ u8 var10;
-    /*0x11*/ u8 var11;
-    /*0x12*/ u8 var12;
-    /*0x13*/ u8 playerName[8];
-};
-
 struct TVShowFanClubLetter {
     /*0x00*/ u8 var00;
     /*0x01*/ u8 var01;
@@ -248,7 +222,7 @@ struct TVShowRecentHappenings {
 	/*0x04*/ u16 var04[6];
     /*0x10*/ u8 playerName[8];
     /*0x18*/ u8 language;
-    u8 pad19[10];
+    /*0x19*/ u8 pad19[10];
 };
 
 struct TVShowFanclubOpinions {
@@ -256,7 +230,7 @@ struct TVShowFanclubOpinions {
     /*0x01*/ u8 var01;
     /*0x02*/ u16 var02;
     /*0x04*/ u8 var04A:4;
-    u8 var04B:4;
+    /*0x04*/ u8 var04B:4;
     /*0x05*/ u8 playerName[8];
     /*0x0D*/ u8 language;
     /*0x0E*/ u8 var0E;
@@ -266,6 +240,13 @@ struct TVShowFanclubOpinions {
     /*0x1C*/ u16 var1C[4];
 };
 
+struct TVShowUnknownType04 {
+	/*0x00*/ u8 var00;
+	/*0x01*/ u8 var01;
+	/*0x02*/ u8 pad02[4];
+	/*0x06*/ u16 var06;
+};
+
 struct TVShowNameRaterShow {
     /*0x00*/ u8 var00;
     /*0x01*/ u8 var01;
@@ -279,23 +260,72 @@ struct TVShowNameRaterShow {
     /*0x1F*/ u8 pokemonNameLanguage;
 };
 
-struct TVShowMassOutbreak {
+struct TVShowBravoTrainerPokemonProfiles {
+	/*0x00*/ u8 var00;
+	/*0x01*/ u8 var01;
+	/*0x02*/ u16 species;
+	/*0x04*/ u16 var04[2];
+	/*0x08*/ u8 pokemonNickname[11];
+	/*0x13*/ u8 contestCategory:3;
+	/*0x13*/ u8 contestRank:2;
+	/*0x13*/ u8 contestResult:2;
+	/*0x13*/ u8 var13_7:1;
+	/*0x14*/ u16 var14;
+	/*0x16*/ u8 playerName[8];
+	/*0x1E*/ u8 language;
+	/*0x1F*/ u8 var1f;
+};
+
+struct TVShowBravoTrainerBattleTowerSpotlight {
+	/*0x00*/ u8 var00;
+	/*0x01*/ u8 var01;
+	/*0x02*/ u8 trainerName[8];
+	/*0x0A*/ u16 species;
+	/*0x0C*/ u8 pokemonName[8];
+	/*0x14*/ u16 defeatedSpecies;
+	/*0x16*/ u16 var16;
+	/*0x18*/ u16 var18[1];
+	/*0x1A*/ u8 btLevel;
+	/*0x1B*/ u8 var1b;
+	/*0x1C*/ u8 var1c;
+	/*0x1D*/ u8 language;
+};
+
+struct TVShowPokemonToday {
     /*0x00*/ u8 var00;
     /*0x01*/ u8 var01;
-    /*0x02*/ u8 var02;
-    /*0x03*/ u8 var03;
-    /*0x04*/ u16 moves[4];
-    /*0x0C*/ u16 species;
-    /*0x0E*/ u16 var0E;
-    /*0x10*/ u8 locationMapNum;
-    /*0x11*/ u8 locationMapGroup;
+    /*0x02*/ u8 language;
+    /*0x03*/ u8 language2;
+    /*0x04*/ u8 nickname[11];
+    /*0x0F*/ u8 ball;
+    /*0x10*/ u16 species;
     /*0x12*/ u8 var12;
-    /*0x13*/ u8 probability;
-    /*0x14*/ u8 level;
-    /*0x15*/ u8 var15;
-    /*0x16*/ u16 var16;
-    /*0x18*/ u8 language;
-    u8 pad19[11];
+    /*0x13*/ u8 playerName[8];
+};
+
+struct TVShowSmartShopper {
+	/*0x00*/ u8 var00;
+	/*0x01*/ u8 var01;
+	/*0x02*/ u8 priceReduced;
+	/*0x03*/ u8 language;
+	/*0x04*/ u8 pad04[2];
+	/*0x06*/ u16 itemIds[3];
+	/*0x0C*/ u16 itemAmounts[3];
+	/*0x12*/ u8 shopLocation;
+	/*0x13*/ u8 playerName[8];
+};
+
+struct TVShowPokemonTodayFailed {
+    /*0x00*/ u8 var00;
+    /*0x01*/ u8 var01;
+    /*0x02*/ u8 language;
+    /*0x03*/ u8 pad03[9];
+    /*0x0c*/ u16 species;
+    /*0x0e*/ u16 species2;
+    /*0x10*/ u8 var10;
+    /*0x11*/ u8 var11;
+    /*0x12*/ u8 var12;
+    /*0x13*/ u8 playerName[8];
 };
 
 struct TVShowPokemonAngler {
@@ -322,47 +352,23 @@ struct TVShowWorldOfMasters {
 	/*0x13*/ u8 playerName[8];
 };
 
-struct TVShowSmartShopper {
-	/*0x00*/ u8 var00;
-	/*0x01*/ u8 var01;
-	/*0x02*/ u8 priceReduced;
-	/*0x03*/ u8 language;
-	/*0x04*/ u8 pad04[2];
-	/*0x06*/ u16 itemIds[3];
-	/*0x0C*/ u16 itemAmounts[3];
-	/*0x12*/ u8 shopLocation;
-	/*0x13*/ u8 playerName[8];
-};
-
-struct TVShowBravoTrainerPokemonProfiles {
-	/*0x00*/ u8 var00;
-	/*0x01*/ u8 var01;
-	/*0x02*/ u16 species;
-	/*0x04*/ u16 var04[2];
-	/*0x08*/ u8 pokemonNickname[11];
-	/*0x13*/ u8 contestCategory:3;
-	/*0x13*/ u8 contestRank:2;
-	/*0x13*/ u8 contestResult:2;
-	/*0x13*/ u8 var13_7:1;
-	/*0x14*/ u16 var14;
-	/*0x16*/ u8 playerName[8];
-	/*0x1E*/ u8 language;
-	/*0x1F*/ u8 var1f;
-};
-
-struct TVShowBravoTrainerBattleTowerSpotlight {
-	/*0x00*/ u8 var00;
-	/*0x01*/ u8 var01;
-	/*0x02*/ u8 trainerName[8];
-	/*0x0A*/ u16 species;
-	/*0x0C*/ u8 pokemonName[8];
-	/*0x14*/ u16 winningMove;
-	/*0x16*/ u16 var16;
-	/*0x18*/ u16 var18[1];
-	/*0x1A*/ u8 btLevel;
-	/*0x1B*/ u8 var1b;
-	/*0x1C*/ u8 var1c;
-	/*0x1D*/ u8 language;
+struct TVShowMassOutbreak {
+    /*0x00*/ u8 var00;
+    /*0x01*/ u8 var01;
+    /*0x02*/ u8 var02;
+    /*0x03*/ u8 var03;
+    /*0x04*/ u16 moves[4];
+    /*0x0C*/ u16 species;
+    /*0x0E*/ u16 var0E;
+    /*0x10*/ u8 locationMapNum;
+    /*0x11*/ u8 locationMapGroup;
+    /*0x12*/ u8 var12;
+    /*0x13*/ u8 probability;
+    /*0x14*/ u8 level;
+    /*0x15*/ u8 var15;
+    /*0x16*/ u16 var16;
+    /*0x18*/ u8 language;
+    u8 pad19[11];
 };
 
 typedef union TVShow {
@@ -370,15 +376,16 @@ typedef union TVShow {
     struct TVShowFanClubLetter fanclubLetter;
     struct TVShowRecentHappenings recentHappenings;
     struct TVShowFanclubOpinions fanclubOpinions;
+	struct TVShowUnknownType04 unkShow04;
     struct TVShowNameRaterShow nameRaterShow;
-    struct TVShowMassOutbreak massOutbreak;
-	struct TVShowPokemonAngler pokemonAngler;
-	struct TVShowWorldOfMasters worldOfMasters;
-	struct TVShowSmartShopper smartshopperShow;
 	struct TVShowBravoTrainerPokemonProfiles bravoTrainer;
 	struct TVShowBravoTrainerBattleTowerSpotlight bravoTrainerTower;
     struct TVShowPokemonToday pokemonToday;
+	struct TVShowSmartShopper smartshopperShow;
     struct TVShowPokemonTodayFailed pokemonTodayFailed;
+	struct TVShowPokemonAngler pokemonAngler;
+	struct TVShowWorldOfMasters worldOfMasters;
+    struct TVShowMassOutbreak massOutbreak;
 } TVShow;
 
 struct MailStruct
diff --git a/src/tv.c b/src/tv.c
index 8352efb17..566d547a6 100755
--- a/src/tv.c
+++ b/src/tv.c
@@ -850,7 +850,7 @@ void sub_80BE320(void) {
     StringCopy(show->bravoTrainerTower.trainerName, gSaveBlock2.playerName);
     StringCopy(show->bravoTrainerTower.pokemonName, gSaveBlock2.filler_A8.filler_3DC);
     show->bravoTrainerTower.species = gSaveBlock2.filler_A8.var_480;
-    show->bravoTrainerTower.winningMove = gSaveBlock2.filler_A8.var_482;
+    show->bravoTrainerTower.defeatedSpecies = gSaveBlock2.filler_A8.var_482;
     show->bravoTrainerTower.var16 = sub_8135D3C(gSaveBlock2.filler_A8.var_4D0);
     show->bravoTrainerTower.var1c = gSaveBlock2.filler_A8.var_4AD;
     if (gSaveBlock2.filler_A8.var_4D0 == 0) {
@@ -2454,54 +2454,54 @@ void sub_80C03A8(u8 showidx);
 void sub_80C03C8(u16 species, u8 showidx);
 
 #ifdef NONMATCHING
-void sub_80C01D4(void) {
-    u8 i;
-    for (i=0; i<24; i++) {
-        switch (gSavegitBlock1.tvShows[i].common.var00) {
-        case 0:
-            break;
-        case TVSHOW_FAN_CLUB_LETTER:
-            sub_80C03C8(gSaveBlock1.tvShows[i].fanclubLetter.species, i);
-            break;
-        case TVSHOW_RECENT_HAPPENINGS:
-            break;
-        case TVSHOW_PKMN_FAN_CLUB_OPINIONS:
-            sub_80C03C8(gSaveBlock1.tvShows[i].fanclubOpinions.var02, i);
-            break;
-        case TVSHOW_UNKN_SHOWTYPE_04:
-            sub_80C03C8(gSaveBlock1.tvShows[i].worldOfMasters.var06, i);
-            break;
-        case TVSHOW_NAME_RATER_SHOW:
-            sub_80C03C8(gSaveBlock1.tvShows[i].nameRaterShow.species, i);
-            sub_80C03C8(gSaveBlock1.tvShows[i].nameRaterShow.var1C, i);
-            break;
-        case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE:
-            sub_80C03C8(gSaveBlock1.tvShows[i].bravoTrainer.species, i);
-            break;
-        case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE:
-            sub_80C03C8(gSaveBlock1.tvShows[i].bravoTrainerTower.var0a, i);
-            sub_80C03C8(gSaveBlock1.tvShows[i].bravoTrainerTower.var14, i);
-            break;
-        case TVSHOW_POKEMON_TODAY_CAUGHT:
-            sub_80C03C8(gSaveBlock1.tvShows[i].pokemonToday.species, i);
-            break;
-        case TVSHOW_SMART_SHOPPER:
-            break;
-        case TVSHOW_POKEMON_TODAY_FAILED:
-            sub_80C03C8(gSaveBlock1.tvShows[i].pokemonTodayFailed.species, i);
-            sub_80C03C8(gSaveBlock1.tvShows[i].pokemonTodayFailed.species2, i);
-            break;
-        case TVSHOW_FISHING_ADVICE:
-            sub_80C03C8(gSaveBlock1.tvShows[i].pokemonAngler.var04, i);
-            break;
-        case TVSHOW_WORLD_OF_MASTERS:
-            sub_80C03C8(gSaveBlock1.tvShows[i].worldOfMasters.var08, i);
-            sub_80C03C8(gSaveBlock1.tvShows[i].worldOfMasters.var04, i);
-            break;
-        case TVSHOW_MASS_OUTBREAK:
-            break;
-        default:
-            sub_80C03A8(i);
+void sub_80C01D4(void)
+{
+    u16 i;
+    for (i=0; i<24; i++)
+    {
+        switch (gSaveBlock1.tvShows[i].common.var00)
+        {
+            case 0:
+            case TVSHOW_RECENT_HAPPENINGS:
+            case TVSHOW_SMART_SHOPPER:
+            case TVSHOW_MASS_OUTBREAK:
+                break;
+            case TVSHOW_FAN_CLUB_LETTER:
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->fanclubLetter.species, i);
+                break;
+            case TVSHOW_PKMN_FAN_CLUB_OPINIONS:
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->fanclubOpinions.var02, i);
+                break;
+            case TVSHOW_UNKN_SHOWTYPE_04:
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->unkShow04.var06, i);
+                break;
+            case TVSHOW_NAME_RATER_SHOW:
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->nameRaterShow.species, i);
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->nameRaterShow.var1C, i);
+                break;
+            case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE:
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->bravoTrainer.species, i);
+                break;
+            case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE:
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->bravoTrainerTower.species, i);
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->bravoTrainerTower.defeatedSpecies, i);
+                break;
+            case TVSHOW_POKEMON_TODAY_CAUGHT:
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->pokemonToday.species, i);
+                break;
+            case TVSHOW_POKEMON_TODAY_FAILED:
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->pokemonTodayFailed.species, i);
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->pokemonTodayFailed.species2, i);
+                break;
+            case TVSHOW_FISHING_ADVICE:
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->pokemonAngler.var04, i);
+                break;
+            case TVSHOW_WORLD_OF_MASTERS:
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->worldOfMasters.var08, i);
+                sub_80C03C8((&gSaveBlock1.tvShows[i])->worldOfMasters.var04, i);
+                break;
+            default:
+                sub_80C03A8(i);
         }
     }
 }
@@ -2718,7 +2718,7 @@ void sub_80C03A8(u8 showidx) {
 }
 
 void sub_80C03C8(u16 species, u8 showidx) {
-    if (sub_8090D90(SpeciesToNationalPokedexNum(species), 0) == 0) {
+    if (!sub_8090D90(SpeciesToNationalPokedexNum(species), 0)) {
         gSaveBlock1.tvShows[showidx].common.var01 = 0;
     }
 }
@@ -3121,7 +3121,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
             break;
         case 3:
             TVShowConvertInternationalString(gStringVar1, tvShow->bravoTrainerTower.pokemonName, tvShow->bravoTrainerTower.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->bravoTrainerTower.winningMove]);
+            StringCopy(gStringVar2, gSpeciesNames[tvShow->bravoTrainerTower.defeatedSpecies]);
             if (tvShow->bravoTrainerTower.var1b == 0)
             {
                 gUnknown_020387E8 = 5;
@@ -3132,7 +3132,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
             break;
         case 4:
             TVShowConvertInternationalString(gStringVar1, tvShow->bravoTrainerTower.pokemonName, tvShow->bravoTrainerTower.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->bravoTrainerTower.winningMove]);
+            StringCopy(gStringVar2, gSpeciesNames[tvShow->bravoTrainerTower.defeatedSpecies]);
             if (tvShow->bravoTrainerTower.var1b == 0)
             {
                 gUnknown_020387E8 = 5;