diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2020-08-29 00:17:28 +0100 |
|---|---|---|
| committer | SatoMew <SatoMew@users.noreply.github.com> | 2020-08-29 00:17:28 +0100 |
| commit | 2bf30e571aa8d7268250a845784098df4c30f531 (patch) | |
| tree | 2378ea3077fe12b6eb3eb33c4e281a405c45dc97 /data/tileset_headers.asm | |
| parent | e4f053e312b7cce44e2b4e9b8449f3e724dda0bc (diff) | |
| parent | e9e60965a8ebe4939eb226832e21449c188d8e46 (diff) | |
Resolved conflict caused by my changes.
Diffstat (limited to 'data/tileset_headers.asm')
| -rw-r--r-- | data/tileset_headers.asm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index f739d1b..2c00ffe 100644 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,10 +1,7 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "data/tileset_headers.asm", ROMX -; else -; SECTION "Tileset Headers", ROMX[$4875], BANK[$03] -; endc + Tilesets:: Tileset_00: ; 0xc88d |