diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-02-11 14:43:38 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2022-02-11 14:43:38 -0500 |
| commit | 24f18af338cd8608719e6b7b87424286331c6bba (patch) | |
| tree | 80e5869b68368bd7ec9d11b3825f9d66610ee4ed /src/battle_setup.c | |
| parent | 91076d9408ecf7546cae522b014ead6f31f7a9dd (diff) | |
Add missing map constant usage
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 |