diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /tilesets/tilesets.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'tilesets/tilesets.asm')
| -rw-r--r-- | tilesets/tilesets.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tilesets/tilesets.asm b/tilesets/tilesets.asm index b63e962f1..06cbdb05d 100644 --- a/tilesets/tilesets.asm +++ b/tilesets/tilesets.asm @@ -1,9 +1,9 @@ -tileset: macro +tileset: MACRO dba \1GFX, \1Meta, \1Coll dw \1Anim dw NULL dw \1PalMap -endm +ENDM Tilesets:: ; 4d596 ; entries correspond to TILESET_* constants |