diff options
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 49e2d9e01..6b87edd69 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -211,7 +211,13 @@ static void CreateBattleStartTask(u8 transition, u16 song) // song == 0 means de static bool8 CheckSilphScopeInPokemonTower(u16 mapGroup, u16 mapNum) { if (mapGroup == MAP_GROUP(POKEMON_TOWER_1F) - && ((u16)(mapNum - MAP_NUM(POKEMON_TOWER_1F)) <= 6) + && (mapNum == MAP_NUM(POKEMON_TOWER_1F) + || mapNum == MAP_NUM(POKEMON_TOWER_2F) + || mapNum == MAP_NUM(POKEMON_TOWER_3F) + || mapNum == MAP_NUM(POKEMON_TOWER_4F) + || mapNum == MAP_NUM(POKEMON_TOWER_5F) + || mapNum == MAP_NUM(POKEMON_TOWER_6F) + || mapNum == MAP_NUM(POKEMON_TOWER_7F)) && !(CheckBagHasItem(ITEM_SILPH_SCOPE, 1))) return TRUE; else |