diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-07 13:11:29 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-07 13:11:29 -0500 |
| commit | 6c20ff9e200499f7c245653a9e5aa269649c8639 (patch) | |
| tree | e5da46ba249d6a3e0d438a1345111dd063367500 /tilesets | |
| parent | bdd3a55333d0acd1d764327dcebb4a14d9586f05 (diff) | |
Reorganize some macros
* tileset data macros go atop their related files, like all the ones in data/
* charmaps are not macros
Diffstat (limited to 'tilesets')
| -rw-r--r-- | tilesets/data.asm | 6 | ||||
| -rw-r--r-- | tilesets/palette_maps.asm | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/tilesets/data.asm b/tilesets/data.asm index c26b7d3d1..2df9c0949 100644 --- a/tilesets/data.asm +++ b/tilesets/data.asm @@ -1,3 +1,9 @@ +tilecoll: MACRO +; used in tilesets/*_collision.asm + db COLL_\1, COLL_\2, COLL_\3, COLL_\4 +ENDM + + SECTION "Tileset Data 1", ROMX TilesetKantoGFX: ; 0x18000 diff --git a/tilesets/palette_maps.asm b/tilesets/palette_maps.asm index 55391aeac..c893c767c 100644 --- a/tilesets/palette_maps.asm +++ b/tilesets/palette_maps.asm @@ -1,3 +1,14 @@ +tilepal: MACRO +; vram bank, pals +x = \1 << OAM_TILE_BANK +rept (_NARG +- 1) / 2 + dn (x | PAL_BG_\3), (x | PAL_BG_\2) + shift + shift +endr +ENDM + + TilesetKantoPalMap: ; 0x4c075 INCLUDE "tilesets/kanto_palette_map.asm" ; 0x4c0e5 |