summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjd-0 <44876081+jd-0@users.noreply.github.com>2020-09-21 11:53:45 -0700
committerjd-0 <44876081+jd-0@users.noreply.github.com>2020-09-21 11:53:45 -0700
commit4657f35e552d12935db7c2d2d2020a73f477aa5b (patch)
treef974faa4581f09896a712de211d286892fd16d88
parent5d27a2f2e8b27d1478392444d7a0e0cdb8c65708 (diff)
Extract bank $0C tilesets' metatiles and collision data
Are collisions always 1/4 the metatile size?? Build: OK
-rw-r--r--data/tileset_headers.asm20
-rw-r--r--data/tilesets/tileset_0b_collision.binbin0 -> 256 bytes
-rw-r--r--data/tilesets/tileset_0b_metatiles.binbin0 -> 1024 bytes
-rw-r--r--data/tilesets/tileset_0c_collision.binbin0 -> 256 bytes
-rw-r--r--data/tilesets/tileset_0c_metatiles.binbin0 -> 1024 bytes
-rw-r--r--data/tilesets/tileset_0d_collision.binbin0 -> 256 bytes
-rw-r--r--data/tilesets/tileset_0d_metatiles.binbin0 -> 1024 bytes
-rw-r--r--data/tilesets/tileset_12_collision.binbin0 -> 256 bytes
-rw-r--r--data/tilesets/tileset_12_metatiles.binbin0 -> 1024 bytes
-rw-r--r--data/tilesets/tileset_14_collision.binbin0 -> 512 bytes
-rw-r--r--data/tilesets/tileset_14_metatiles.binbin0 -> 2048 bytes
-rw-r--r--gfx.asm20
12 files changed, 30 insertions, 10 deletions
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm
index 0e93928..bfbaa50 100644
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -116,9 +116,9 @@ Tileset_0a:
Tileset_0b:
db $0c ; bank
- dw $5100 ; blocks
+ dw Tileset_0b_Meta ; blocks
dw Tileset_0b_GFX ; graphics
- dw $5500 ; collisions
+ dw Tileset_0b_Coll ; collisions
db $07 ; talking over tile 1
db $41 ; talking over tile 2
db $00 ; talking over tile 3
@@ -126,9 +126,9 @@ Tileset_0b:
Tileset_0c:
db $0c ; bank
- dw $7700 ; blocks
+ dw Tileset_0c_Meta ; blocks
dw Tileset_0c_GFX ; graphics
- dw $7b00 ; collisions
+ dw Tileset_0c_Coll ; collisions
db $07 ; talking over tile 1
db $41 ; talking over tile 2
db $00 ; talking over tile 3
@@ -136,9 +136,9 @@ Tileset_0c:
Tileset_0d:
db $0c ; bank
- dw $5c00 ; blocks
+ dw Tileset_0d_Meta ; blocks
dw Tileset_0d_GFX ; graphics
- dw $6000 ; collisions
+ dw Tileset_0d_Coll ; collisions
db $07 ; talking over tile 1
db $41 ; talking over tile 2
db $00 ; talking over tile 3
@@ -186,9 +186,9 @@ Tileset_11:
Tileset_12:
db $0c ; bank
- dw $4600 ; blocks
+ dw Tileset_12_Meta ; blocks
dw Tileset_12_GFX ; graphics
- dw $4a00 ; collisions
+ dw Tileset_12_Coll ; collisions
db $07 ; talking over tile 1
db $41 ; talking over tile 2
db $00 ; talking over tile 3
@@ -206,9 +206,9 @@ Tileset_13:
Tileset_14:
db $0c ; bank
- dw $6700 ; blocks
+ dw Tileset_14_Meta ; blocks
dw Tileset_14_GFX ; graphics
- dw $6f00 ; collisions
+ dw Tileset_14_Coll ; collisions
db $07 ; talking over tile 1
db $41 ; talking over tile 2
db $00 ; talking over tile 3
diff --git a/data/tilesets/tileset_0b_collision.bin b/data/tilesets/tileset_0b_collision.bin
new file mode 100644
index 0000000..dd77897
--- /dev/null
+++ b/data/tilesets/tileset_0b_collision.bin
Binary files differ
diff --git a/data/tilesets/tileset_0b_metatiles.bin b/data/tilesets/tileset_0b_metatiles.bin
new file mode 100644
index 0000000..33f0410
--- /dev/null
+++ b/data/tilesets/tileset_0b_metatiles.bin
Binary files differ
diff --git a/data/tilesets/tileset_0c_collision.bin b/data/tilesets/tileset_0c_collision.bin
new file mode 100644
index 0000000..a378b1a
--- /dev/null
+++ b/data/tilesets/tileset_0c_collision.bin
Binary files differ
diff --git a/data/tilesets/tileset_0c_metatiles.bin b/data/tilesets/tileset_0c_metatiles.bin
new file mode 100644
index 0000000..c7906dc
--- /dev/null
+++ b/data/tilesets/tileset_0c_metatiles.bin
Binary files differ
diff --git a/data/tilesets/tileset_0d_collision.bin b/data/tilesets/tileset_0d_collision.bin
new file mode 100644
index 0000000..9bc75fb
--- /dev/null
+++ b/data/tilesets/tileset_0d_collision.bin
Binary files differ
diff --git a/data/tilesets/tileset_0d_metatiles.bin b/data/tilesets/tileset_0d_metatiles.bin
new file mode 100644
index 0000000..b949568
--- /dev/null
+++ b/data/tilesets/tileset_0d_metatiles.bin
Binary files differ
diff --git a/data/tilesets/tileset_12_collision.bin b/data/tilesets/tileset_12_collision.bin
new file mode 100644
index 0000000..ea516bd
--- /dev/null
+++ b/data/tilesets/tileset_12_collision.bin
Binary files differ
diff --git a/data/tilesets/tileset_12_metatiles.bin b/data/tilesets/tileset_12_metatiles.bin
new file mode 100644
index 0000000..ce50593
--- /dev/null
+++ b/data/tilesets/tileset_12_metatiles.bin
Binary files differ
diff --git a/data/tilesets/tileset_14_collision.bin b/data/tilesets/tileset_14_collision.bin
new file mode 100644
index 0000000..82309c4
--- /dev/null
+++ b/data/tilesets/tileset_14_collision.bin
Binary files differ
diff --git a/data/tilesets/tileset_14_metatiles.bin b/data/tilesets/tileset_14_metatiles.bin
new file mode 100644
index 0000000..9ba1a00
--- /dev/null
+++ b/data/tilesets/tileset_14_metatiles.bin
Binary files differ
diff --git a/gfx.asm b/gfx.asm
index 473b820..5a0e5f3 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -187,22 +187,42 @@ INCBIN "gfx/trade/gameboy.2bpp"
SECTION "gfx.asm@Bank C Tilesets 12", ROMX
Tileset_12_GFX:
INCBIN "gfx/tilesets/tileset_12.2bpp"
+Tileset_12_Meta:
+INCBIN "data/tilesets/tileset_12_metatiles.bin"
+Tileset_12_Coll:
+INCBIN "data/tilesets/tileset_12_collision.bin"
SECTION "gfx.asm@Bank C Tilesets 0b", ROMX
Tileset_0b_GFX:
INCBIN "gfx/tilesets/tileset_0b.2bpp"
+Tileset_0b_Meta:
+INCBIN "data/tilesets/tileset_0b_metatiles.bin"
+Tileset_0b_Coll:
+INCBIN "data/tilesets/tileset_0b_collision.bin"
SECTION "gfx.asm@Bank C Tilesets 0d", ROMX
Tileset_0d_GFX:
INCBIN "gfx/tilesets/tileset_0d.2bpp"
+Tileset_0d_Meta:
+INCBIN "data/tilesets/tileset_0d_metatiles.bin"
+Tileset_0d_Coll:
+INCBIN "data/tilesets/tileset_0d_collision.bin"
SECTION "gfx.asm@Bank C Tilesets 14", ROMX
Tileset_14_GFX:
INCBIN "gfx/tilesets/tileset_14.2bpp"
+Tileset_14_Meta:
+INCBIN "data/tilesets/tileset_14_metatiles.bin"
+Tileset_14_Coll:
+INCBIN "data/tilesets/tileset_14_collision.bin"
SECTION "gfx.asm@Bank C Tilesets 0c", ROMX
Tileset_0c_GFX:
INCBIN "gfx/tilesets/tileset_0c.2bpp"
+Tileset_0c_Meta:
+INCBIN "data/tilesets/tileset_0c_metatiles.bin"
+Tileset_0c_Coll:
+INCBIN "data/tilesets/tileset_0c_collision.bin"
SECTION "gfx.asm@Bank C Tilesets Common", ROMX
CommonExteriorTilesGFX: