diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-03 00:04:30 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-03 00:04:30 -0400 |
| commit | 1966f65696215a09066f6da70920703d6f3fd870 (patch) | |
| tree | a77304e6d34ede3fa3d6c62b82859e6c12ba2f48 /src/field/choose_party.c | |
| parent | e08f3e4398d6c1dc21437e7b6462521ecfd299a6 (diff) | |
| parent | 08e6fb5382bb4e2104d370783d15b4a2a3c65a2a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into fix_setmondata
Diffstat (limited to 'src/field/choose_party.c')
| -rw-r--r-- | src/field/choose_party.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field/choose_party.c b/src/field/choose_party.c index f35dcdf56..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}; @@ -176,15 +176,15 @@ static bool8 IsMonAllowedInBattleTower(struct Pokemon *pkmn) return TRUE; } - if ((gSaveBlock2.filler_A8.var_4AC & 1) == 0 + if ((gSaveBlock2.battleTower.battleTowerLevelType) == 0 && GetMonData(pkmn, MON_DATA_LEVEL) > 50) return FALSE; // 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++; } |