summaryrefslogtreecommitdiff
path: root/src/field
diff options
context:
space:
mode:
Diffstat (limited to 'src/field')
-rw-r--r--src/field/choose_party.c6
-rw-r--r--src/field/field_specials.c2
-rw-r--r--src/field/tv.c3
3 files changed, 5 insertions, 6 deletions
diff --git a/src/field/choose_party.c b/src/field/choose_party.c
index fd90a9199..adb210e7b 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -24,7 +24,7 @@ extern u8 gUnknown_020384F0;
extern struct UnknownPokemonStruct2 gUnknown_02023A00[];
extern u8 gUnknown_0202E8F6;
extern struct Pokemon gUnknown_030042FC[];
-extern const u16 gBattleTowerBanlist[];
+extern const u16 gBattleTowerBannedSpecies[];
EWRAM_DATA u8 gSelectedOrderFromParty[3] = {0};
@@ -182,9 +182,9 @@ static bool8 IsMonAllowedInBattleTower(struct Pokemon *pkmn)
// Check if the pkmn is in the ban list
species = GetMonData(pkmn, MON_DATA_SPECIES);
- while (gBattleTowerBanlist[i] != 0xFFFF)
+ while (gBattleTowerBannedSpecies[i] != 0xFFFF)
{
- if (gBattleTowerBanlist[i] == species)
+ if (gBattleTowerBannedSpecies[i] == species)
return FALSE;
i++;
}
diff --git a/src/field/field_specials.c b/src/field/field_specials.c
index 36362d098..ea0c2bd6a 100644
--- a/src/field/field_specials.c
+++ b/src/field/field_specials.c
@@ -1789,7 +1789,7 @@ u16 sub_810F404(void)
void sub_810F414(void)
{
- sub_8135FF4(gStringVar1);
+ SetEReaderTrainerName(gStringVar1);
}
const u8 gUnknown_083F83E0[] = {12, 2, 4, 5, 1, 8, 7, 11, 3, 10, 9, 6};
diff --git a/src/field/tv.c b/src/field/tv.c
index fcbd734a9..87fc03065 100644
--- a/src/field/tv.c
+++ b/src/field/tv.c
@@ -123,7 +123,6 @@ void ClearTVShowData(void)
bool8 sub_80BF1B4(u8);
void sub_80BF20C(void);
-extern u16 sub_8135D3C(u8);
extern u8 gScriptContestCategory;
extern u8 gScriptContestRank;
extern u8 gUnknown_03004316[11];
@@ -677,7 +676,7 @@ void sub_80BE320(void)
StringCopy(bravoTrainerTower->pokemonName, gSaveBlock2.battleTower.defeatedByTrainerName);
bravoTrainerTower->species = gSaveBlock2.battleTower.firstMonSpecies;
bravoTrainerTower->defeatedSpecies = gSaveBlock2.battleTower.defeatedBySpecies;
- bravoTrainerTower->var16 = sub_8135D3C(gSaveBlock2.battleTower.lastStreakLevelType);
+ bravoTrainerTower->var16 = GetCurrentBattleTowerWinStreak(gSaveBlock2.battleTower.lastStreakLevelType);
bravoTrainerTower->var1c = gSaveBlock2.battleTower.battleOutcome;
if (gSaveBlock2.battleTower.lastStreakLevelType == 0)
bravoTrainerTower->btLevel = 50;