diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-08-17 11:51:09 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-08-17 11:51:09 -0400 |
| commit | 4831b4429eab57f56cce4736b6930a54f07314f7 (patch) | |
| tree | 88304717494d0f3e617fb406e5cc4930f28b9086 | |
| parent | aa27080e29e04dadb9986cd4f1f73579a3b01e96 (diff) | |
Add radio_constants.asm, update "map" macro
| -rw-r--r-- | constants/radio_constants.asm | 18 | ||||
| -rw-r--r-- | macros/map.asm | 7 |
2 files changed, 18 insertions, 7 deletions
diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm new file mode 100644 index 000000000..76b48b1e7 --- /dev/null +++ b/constants/radio_constants.asm @@ -0,0 +1,18 @@ + const_def + const OAKS_POKEMON_TALK + const POKEDEX_SHOW + const POKEMON_MUSIC + const LUCKY_CHANNEL + const BUENAS_PASSWORD + const PLACES_AND_PEOPLE + const LETS_ALL_SING + const ROCKET_RADIO + const POKE_FLUTE_RADIO + const UNOWN_RADIO + const EVOLUTION_RADIO + + const_def + const BUENA_MON + const BUENA_ITEM + const BUENA_MOVE + const BUENA_STRING diff --git a/macros/map.asm b/macros/map.asm index 9f4d6ec26..a9d3209c1 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -1,12 +1,5 @@ map: MACRO -; This is a silly hack to get around an rgbds bug. - -; Ideally: db GROUP_\1, MAP_\1 - -; \1\@ EQUS "GROUP_\1" -; \1\@_2 EQUS "MAP_\1" - ; db \1\@, \1\@_2 ENDM roam_map: MACRO |