fix name of TVShow.bravoTrainerTower.pokemonName

3 files changed, 9 insertions, 9 deletions

diff --git a/include/global.h b/include/global.h
index 3270b6c25..38ba50a2c 100644
--- a/include/global.h
+++ b/include/global.h
@@ -337,7 +337,7 @@ struct TVShowBravoTrainerBattleTowerSpotlight
     /*0x01*/ bool8 active;
     /*0x02*/ u8 trainerName[8];
     /*0x0A*/ u16 species;
-    /*0x0C*/ u8 pokemonName[8]; // TODO: rename this
+    /*0x0C*/ u8 enemyTrainerName[8];
     /*0x14*/ u16 defeatedSpecies;
     /*0x16*/ u16 var16;
     /*0x18*/ u16 var18[1];
diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c
index 0e6a1418e..349e5111f 100644
--- a/src/debug/nohara_debug_menu.c
+++ b/src/debug/nohara_debug_menu.c
@@ -543,7 +543,7 @@ void debug_sub_808FA88(u8 a0, u8 a1)
             show->bravoTrainerTower.species = SPECIES_BULBASAUR;
             show->bravoTrainerTower.defeatedSpecies = SPECIES_BULBASAUR;
             StringCopy(gSaveBlock1.tvShows[a0].bravoTrainerTower.trainerName, gSaveBlock2.playerName);
-            StringCopy(gSaveBlock1.tvShows[a0].bravoTrainerTower.pokemonName, gSaveBlock2.playerName);
+            StringCopy(gSaveBlock1.tvShows[a0].bravoTrainerTower.enemyTrainerName, gSaveBlock2.playerName);
             show->bravoTrainerTower.language = GAME_LANGUAGE;
             break;
         }
diff --git a/src/tv.c b/src/tv.c
index b195c1e99..7cf549802 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1004,7 +1004,7 @@ void InterviewAfter_BravoTrainerBattleTowerProfile(void)
     bravoTrainerTower->kind = TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE;
     bravoTrainerTower->active = 1;
     StringCopy(bravoTrainerTower->trainerName, gSaveBlock2.playerName);
-    StringCopy(bravoTrainerTower->pokemonName, gSaveBlock2.battleTower.defeatedByTrainerName);
+    StringCopy(bravoTrainerTower->enemyTrainerName, gSaveBlock2.battleTower.defeatedByTrainerName);
     bravoTrainerTower->species = gSaveBlock2.battleTower.firstMonSpecies;
     bravoTrainerTower->defeatedSpecies = gSaveBlock2.battleTower.defeatedBySpecies;
     bravoTrainerTower->var16 = GetCurrentBattleTowerWinStreak(gSaveBlock2.battleTower.lastStreakLevelType);
@@ -2968,7 +2968,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
             sTVShowState = 4;
         break;
     case 2:
-        TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->pokemonName, bravoTrainerTower->language);
+        TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->enemyTrainerName, bravoTrainerTower->language);
         sub_80BF088(1, bravoTrainerTower->var16 + 1);
         if (bravoTrainerTower->var1b == 0)
             sTVShowState = 5;
@@ -2976,7 +2976,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
             sTVShowState = 6;
         break;
     case 3:
-        TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->pokemonName, bravoTrainerTower->language);
+        TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->enemyTrainerName, bravoTrainerTower->language);
         StringCopy(gStringVar2, gSpeciesNames[bravoTrainerTower->defeatedSpecies]);
         if (bravoTrainerTower->var1b == 0)
             sTVShowState = 5;
@@ -2984,7 +2984,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
             sTVShowState = 6;
         break;
     case 4:
-        TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->pokemonName, bravoTrainerTower->language);
+        TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->enemyTrainerName, bravoTrainerTower->language);
         StringCopy(gStringVar2, gSpeciesNames[bravoTrainerTower->defeatedSpecies]);
         if (bravoTrainerTower->var1b == 0)
             sTVShowState = 5;
@@ -2992,11 +2992,11 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
             sTVShowState = 6;
         break;
     case 5:
-        TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->pokemonName, bravoTrainerTower->language);
+        TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->enemyTrainerName, bravoTrainerTower->language);
         sTVShowState = 11;
         break;
     case 6:
-        TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->pokemonName, bravoTrainerTower->language);
+        TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->enemyTrainerName, bravoTrainerTower->language);
         sTVShowState = 11;
         break;
     case 7:
@@ -3019,7 +3019,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
     case 13:
         EasyChat_GetWordText(gStringVar1, bravoTrainerTower->var18[0]);
         TVShowConvertInternationalString(gStringVar2, bravoTrainerTower->trainerName, bravoTrainerTower->language);
-        TVShowConvertInternationalString(gStringVar3, bravoTrainerTower->pokemonName, bravoTrainerTower->language);
+        TVShowConvertInternationalString(gStringVar3, bravoTrainerTower->enemyTrainerName, bravoTrainerTower->language);
         sTVShowState = 14;
         break;
     case 14: