diff options
| -rw-r--r-- | data/tileset_headers.asm | 16 | ||||
| -rw-r--r-- | data/tilesets/tileset_00_collision.bin | bin | 0 -> 512 bytes | |||
| -rw-r--r-- | data/tilesets/tileset_00_metatiles.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | data/tilesets/tileset_01_collision.bin | bin | 0 -> 512 bytes | |||
| -rw-r--r-- | data/tilesets/tileset_01_metatiles.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | data/tilesets/tileset_02_collision.bin | bin | 0 -> 512 bytes | |||
| -rw-r--r-- | data/tilesets/tileset_02_metatiles.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | data/tilesets/tileset_09_collision.bin | bin | 0 -> 256 bytes | |||
| -rw-r--r-- | data/tilesets/tileset_09_metatiles.bin | bin | 0 -> 1024 bytes | |||
| -rw-r--r-- | data/tilesets/tileset_1b_collision.bin | bin | 0 -> 512 bytes | |||
| -rw-r--r-- | data/tilesets/tileset_1b_metatiles.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | gfx.asm | 22 | ||||
| -rw-r--r-- | layout.link | 2 |
13 files changed, 32 insertions, 8 deletions
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index bff24f4..0e93928 100644 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -6,9 +6,9 @@ Tilesets:: Tileset_00: db $06 ; bank - dw $4400 ; blocks + dw Tileset_00_Meta ; blocks dw Tileset_00_GFX ; graphics - dw $4c00 ; collisions + dw Tileset_00_Coll ; collisions db $77 ; talking over tile 1 db $40 ; talking over tile 2 db $00 ; talking over tile 3 @@ -16,9 +16,9 @@ Tileset_00: Tileset_01: db $06 ; bank - dw $5c00 ; blocks + dw Tileset_01_Meta ; blocks dw Tileset_01_GFX ; graphics - dw $6400 ; collisions + dw Tileset_01_Coll ; collisions db $4b ; talking over tile 1 db $40 ; talking over tile 2 db $00 ; talking over tile 3 @@ -26,9 +26,9 @@ Tileset_01: Tileset_02: db $06 ; bank - dw $6a00 ; blocks + dw Tileset_02_Meta ; blocks dw Tileset_02_GFX ; graphics - dw $7200 ; collisions + dw Tileset_02_Coll ; collisions db $1f ; talking over tile 1 db $40 ; talking over tile 2 db $00 ; talking over tile 3 @@ -277,9 +277,9 @@ Tileset_1a: ; uses tileset 00 graphics Tileset_1b: db $06 ; bank - dw $4e00 ; blocks + dw Tileset_1b_Meta ; blocks dw Tileset_00_GFX ; graphics - dw $5600 ; collisions + dw Tileset_1b_Coll ; collisions db $77 ; talking over tile 1 db $40 ; talking over tile 2 db $00 ; talking over tile 3 diff --git a/data/tilesets/tileset_00_collision.bin b/data/tilesets/tileset_00_collision.bin Binary files differnew file mode 100644 index 0000000..2856f83 --- /dev/null +++ b/data/tilesets/tileset_00_collision.bin diff --git a/data/tilesets/tileset_00_metatiles.bin b/data/tilesets/tileset_00_metatiles.bin Binary files differnew file mode 100644 index 0000000..b112ea0 --- /dev/null +++ b/data/tilesets/tileset_00_metatiles.bin diff --git a/data/tilesets/tileset_01_collision.bin b/data/tilesets/tileset_01_collision.bin Binary files differnew file mode 100644 index 0000000..cc7056e --- /dev/null +++ b/data/tilesets/tileset_01_collision.bin diff --git a/data/tilesets/tileset_01_metatiles.bin b/data/tilesets/tileset_01_metatiles.bin Binary files differnew file mode 100644 index 0000000..1911d1f --- /dev/null +++ b/data/tilesets/tileset_01_metatiles.bin diff --git a/data/tilesets/tileset_02_collision.bin b/data/tilesets/tileset_02_collision.bin Binary files differnew file mode 100644 index 0000000..f51cfd7 --- /dev/null +++ b/data/tilesets/tileset_02_collision.bin diff --git a/data/tilesets/tileset_02_metatiles.bin b/data/tilesets/tileset_02_metatiles.bin Binary files differnew file mode 100644 index 0000000..5643d74 --- /dev/null +++ b/data/tilesets/tileset_02_metatiles.bin diff --git a/data/tilesets/tileset_09_collision.bin b/data/tilesets/tileset_09_collision.bin Binary files differnew file mode 100644 index 0000000..fd9884c --- /dev/null +++ b/data/tilesets/tileset_09_collision.bin diff --git a/data/tilesets/tileset_09_metatiles.bin b/data/tilesets/tileset_09_metatiles.bin Binary files differnew file mode 100644 index 0000000..e277be5 --- /dev/null +++ b/data/tilesets/tileset_09_metatiles.bin diff --git a/data/tilesets/tileset_1b_collision.bin b/data/tilesets/tileset_1b_collision.bin Binary files differnew file mode 100644 index 0000000..2416093 --- /dev/null +++ b/data/tilesets/tileset_1b_collision.bin diff --git a/data/tilesets/tileset_1b_metatiles.bin b/data/tilesets/tileset_1b_metatiles.bin Binary files differnew file mode 100644 index 0000000..b57ff41 --- /dev/null +++ b/data/tilesets/tileset_1b_metatiles.bin @@ -105,18 +105,40 @@ Unreferenced_UnusedLeaderNameGFX:: INCBIN "gfx/trainer_card/unused_leader_name.2 SECTION "gfx.asm@Bank 6 Tilesets 00", ROMX Tileset_00_GFX: INCBIN "gfx/tilesets/tileset_00.2bpp" +Tileset_00_Meta: +INCBIN "data/tilesets/tileset_00_metatiles.bin" +Tileset_00_Coll: +INCBIN "data/tilesets/tileset_00_collision.bin" + +SECTION "gfx.asm@Bank 6 Tilesets 1b", ROMX +Tileset_1b_Meta: +INCBIN "data/tilesets/tileset_1b_metatiles.bin" +Tileset_1b_Coll: +INCBIN "data/tilesets/tileset_1b_collision.bin" SECTION "gfx.asm@Bank 6 Tilesets 01", ROMX Tileset_01_GFX: INCBIN "gfx/tilesets/tileset_01.2bpp" +Tileset_01_Meta: +INCBIN "data/tilesets/tileset_01_metatiles.bin" +Tileset_01_Coll: +INCBIN "data/tilesets/tileset_01_collision.bin" SECTION "gfx.asm@Bank 6 Tilesets 02", ROMX Tileset_02_GFX: INCBIN "gfx/tilesets/tileset_02.2bpp" +Tileset_02_Meta: +INCBIN "data/tilesets/tileset_02_metatiles.bin" +Tileset_02_Coll: +INCBIN "data/tilesets/tileset_02_collision.bin" SECTION "gfx.asm@Bank 6 Tilesets 09", ROMX Tileset_09_GFX: INCBIN "gfx/tilesets/tileset_09.2bpp" +Tileset_09_Meta: +INCBIN "data/tilesets/tileset_09_metatiles.bin" +Tileset_09_Coll: +INCBIN "data/tilesets/tileset_09_collision.bin" SECTION "gfx.asm@Bank 7 Tilesets 13", ROMX Tileset_13_GFX: diff --git a/layout.link b/layout.link index 5cd1c25..bdb22e0 100644 --- a/layout.link +++ b/layout.link @@ -184,6 +184,8 @@ ROMX $05 ROMX $06 org $4000 "gfx.asm@Bank 6 Tilesets 00" + org $4e00 + "gfx.asm@Bank 6 Tilesets 1b" org $5800 "gfx.asm@Bank 6 Tilesets 01" org $6600 |