diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-02-14 21:17:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-14 21:17:44 -0500 |
| commit | 759f373d3153afb0e9dcf5050a700aeca036a919 (patch) | |
| tree | b43e8d72d1886eb1c38dadd67113bec77ef41a26 /src/battle_setup.c | |
| parent | 8d85ff1683437897cb0c06dd84fa2d927f560090 (diff) | |
| parent | 59695b82210cb2c95c10b52efc1a88e18c67dea9 (diff) | |
Merge pull request #488 from GriffinRichards/map-constants
Sync roamer.c, 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 |