aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/badge_maps.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-14 10:21:18 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-14 13:32:09 -0400
commitf37cf959c930ae9595f9f71ce0d9b17dcf5421d0 (patch)
tree33cc0d34fec73e972f4fb040b8b31f59b7e69805 /data/maps/badge_maps.asm
parentMerge pull request #269 from Rangi42/master (diff)
downloadpokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.tar.gz
pokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.tar.xz
pokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.zip
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