summaryrefslogtreecommitdiff
path: root/data/maps/badge_maps.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-15 12:26:16 -0400
committerGitHub <noreply@github.com>2020-07-15 12:26:16 -0400
commite18e5d50b5e154c1a7c94a2a1f39a3a99daa689a (patch)
treed8a157ae5aa323a00873efe79eb4693327b8bb70 /data/maps/badge_maps.asm
parentaa97e196dd5b37e89db5ddf154dc7aea9b02a045 (diff)
parent93d0697f37aca8ed7a21298a980876af6d43268b (diff)
Merge pull request #273 from Rangi42/master
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'data/maps/badge_maps.asm')
-rw-r--r--data/maps/badge_maps.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/badge_maps.asm b/data/maps/badge_maps.asm
index 81d95757..6b68be02 100644
--- a/data/maps/badge_maps.asm
+++ b/data/maps/badge_maps.asm
@@ -1,10 +1,10 @@
MapBadgeFlags:
- db PEWTER_GYM, %00000001
- db CERULEAN_GYM, %00000010
- db VERMILION_GYM,%00000100
- db CELADON_GYM, %00001000
- db FUCHSIA_GYM, %00010000
- db SAFFRON_GYM, %00100000
- db CINNABAR_GYM, %01000000
- db VIRIDIAN_GYM, %10000000
- db $ff
+ db PEWTER_GYM, 1 << BIT_BOULDERBADGE
+ db CERULEAN_GYM, 1 << BIT_CASCADEBADGE
+ db VERMILION_GYM, 1 << BIT_THUNDERBADGE
+ db CELADON_GYM, 1 << BIT_RAINBOWBADGE
+ db FUCHSIA_GYM, 1 << BIT_SOULBADGE
+ db SAFFRON_GYM, 1 << BIT_MARSHBADGE
+ db CINNABAR_GYM, 1 << BIT_VOLCANOBADGE
+ db VIRIDIAN_GYM, 1 << BIT_EARTHBADGE
+ db -1 ; end