Extract bank 07, 08,13, & 37 tilesets' metatiles and collision data

data/tileset_headers.asm

@@ -36,9 +36,9 @@ Tileset_02:
 
 Tileset_03:
 	db $07 ; bank
-	dw $7600 ; blocks
+	dw Tileset_03_Meta ; blocks
 	dw Tileset_03_GFX ; graphics
-	dw $7e00 ; collisions
+	dw Tileset_03_Coll ; collisions
 	db $1f ; talking over tile 1
 	db $40 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -46,9 +46,9 @@ Tileset_03:
 
 Tileset_04:
 	db $08 ; bank
-	dw $4400 ; blocks
+	dw Tileset_04_Meta ; blocks
 	dw Tileset_04_GFX ; graphics
-	dw $4c00 ; collisions
+	dw Tileset_04_Coll ; collisions
 	db $4b ; talking over tile 1
 	db $40 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -56,9 +56,9 @@ Tileset_04:
 
 Tileset_05:
 	db $07 ; bank
-	dw $6800 ; blocks
+	dw Tileset_05_Meta ; blocks
 	dw Tileset_05_GFX ; graphics
-	dw $7000 ; collisions
+	dw Tileset_05_Coll ; collisions
 	db $a7 ; talking over tile 1
 	db $40 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -66,9 +66,9 @@ Tileset_05:
 
 Tileset_06:
 	db $07 ; bank
-	dw $5a00 ; blocks
+	dw Tileset_06_Meta ; blocks
 	dw Tileset_06_GFX ; graphics
-	dw $6200 ; collisions
+	dw Tileset_06_Coll ; collisions
 	db $4b ; talking over tile 1
 	db $40 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -76,9 +76,9 @@ Tileset_06:
 
 Tileset_07:
 	db $08 ; bank
-	dw $5200 ; blocks
+	dw Tileset_07_Meta ; blocks
 	dw Tileset_07_GFX ; graphics
-	dw $5a00 ; collisions
+	dw Tileset_07_Coll ; collisions
 	db $1f ; talking over tile 1
 	db $40 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -86,9 +86,9 @@ Tileset_07:
 
 Tileset_08:
 	db $08 ; bank
-	dw $6000 ; blocks
+	dw Tileset_08_Meta ; blocks
 	dw Tileset_08_GFX ; graphics
-	dw $6800 ; collisions
+	dw Tileset_08_Coll ; collisions
 	db $4b ; talking over tile 1
 	db $40 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -96,9 +96,9 @@ Tileset_08:
 
 Tileset_09:
 	db $06 ; bank
-	dw $7a00 ; blocks
+	dw Tileset_09_Meta ; blocks
 	dw Tileset_09_GFX ; graphics
-	dw $7e00 ; collisions
+	dw Tileset_09_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -106,9 +106,9 @@ Tileset_09:
 
 Tileset_0a:
 	db $13 ; bank
-	dw $4600 ; blocks
+	dw Tileset_0a_Meta ; blocks
 	dw Tileset_0a_GFX ; graphics
-	dw $4a00 ; collisions
+	dw Tileset_0a_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -146,9 +146,9 @@ Tileset_0d:
 
 Tileset_0e:
 	db $07 ; bank
-	dw $5100 ; blocks
+	dw Tileset_0e_Meta ; blocks
 	dw Tileset_0e_GFX ; graphics
-	dw $5500 ; collisions
+	dw Tileset_0e_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -156,9 +156,9 @@ Tileset_0e:
 
 Tileset_0f:
 	db $08 ; bank
-	dw $7000 ; blocks
+	dw Tileset_0f_Meta ; blocks
 	dw Tileset_0f_GFX ; graphics
-	dw $7400 ; collisions
+	dw Tileset_0f_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -166,9 +166,9 @@ Tileset_0f:
 
 Tileset_10:
 	db $37 ; bank
-	dw $4600 ; blocks
+	dw Tileset_10_Meta ; blocks
 	dw Tileset_10_GFX ; graphics
-	dw $4a00 ; collisions
+	dw Tileset_10_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -176,9 +176,9 @@ Tileset_10:
 
 Tileset_11:
 	db $08 ; bank
-	dw $7b00 ; blocks
+	dw Tileset_11_Meta ; blocks
 	dw Tileset_11_GFX ; graphics
-	dw $7f00 ; collisions
+	dw Tileset_11_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -196,9 +196,9 @@ Tileset_12:
 
 Tileset_13:
 	db $07 ; bank
-	dw $4600 ; blocks
+	dw Tileset_13_Meta ; blocks
 	dw Tileset_13_GFX ; graphics
-	dw $4a00 ; collisions
+	dw Tileset_13_Coll ; collisions
 	db $df ; talking over tile 1
 	db $40 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -216,9 +216,9 @@ Tileset_14:
 
 Tileset_15:
 	db $37 ; bank
-	dw $5100 ; blocks
+	dw Tileset_15_Meta ; blocks
 	dw Tileset_15_GFX ; graphics
-	dw $5900 ; collisions
+	dw Tileset_15_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -226,9 +226,9 @@ Tileset_15:
 
 Tileset_16:
 	db $13 ; bank
-	dw $5100 ; blocks
+	dw Tileset_16_Meta ; blocks
 	dw Tileset_16_GFX ; graphics
-	dw $5900 ; collisions
+	dw Tileset_16_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -236,9 +236,9 @@ Tileset_16:
 
 Tileset_17:
 	db $37 ; bank
-	dw $6100 ; blocks
+	dw Tileset_17_Meta ; blocks
 	dw Tileset_17_GFX ; graphics
-	dw $6900 ; collisions
+	dw Tileset_17_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -246,9 +246,9 @@ Tileset_17:
 
 Tileset_18:
 	db $37 ; bank
-	dw $7100 ; blocks
+	dw Tileset_18_Meta ; blocks
 	dw Tileset_18_GFX ; graphics
-	dw $7900 ; collisions
+	dw Tileset_18_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -256,9 +256,9 @@ Tileset_18:
 
 Tileset_19:
 	db $13 ; bank
-	dw $5f00 ; blocks
+	dw Tileset_19_Meta ; blocks
 	dw Tileset_19_GFX ; graphics
-	dw $6700 ; collisions
+	dw Tileset_19_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3
@@ -266,9 +266,9 @@ Tileset_19:
 
 Tileset_1a:
 	db $13 ; bank
-	dw $6d00 ; blocks
+	dw Tileset_1a_Meta ; blocks
 	dw Tileset_1a_GFX ; graphics
-	dw $7500 ; collisions
+	dw Tileset_1a_Coll ; collisions
 	db $07 ; talking over tile 1
 	db $41 ; talking over tile 2
 	db $00 ; talking over tile 3

gfx.asm

@@ -143,42 +143,82 @@ INCBIN "data/tilesets/tileset_09_collision.bin"
 SECTION "gfx.asm@Bank 7 Tilesets 13", ROMX
 Tileset_13_GFX:
 INCBIN "gfx/tilesets/tileset_13.2bpp"
+Tileset_13_Meta:
+INCBIN "data/tilesets/tileset_13_metatiles.bin"
+Tileset_13_Coll:
+INCBIN "data/tilesets/tileset_13_collision.bin"
 
 SECTION "gfx.asm@Bank 7 Tilesets 0e", ROMX
 Tileset_0e_GFX:
 INCBIN "gfx/tilesets/tileset_0e.2bpp"
+Tileset_0e_Meta:
+INCBIN "data/tilesets/tileset_0e_metatiles.bin"
+Tileset_0e_Coll:
+INCBIN "data/tilesets/tileset_0e_collision.bin"
 
 SECTION "gfx.asm@Bank 7 Tilesets 06", ROMX
 Tileset_06_GFX:
 INCBIN "gfx/tilesets/tileset_06.2bpp"
+Tileset_06_Meta:
+INCBIN "data/tilesets/tileset_06_metatiles.bin"
+Tileset_06_Coll:
+INCBIN "data/tilesets/tileset_06_collision.bin"
 
 SECTION "gfx.asm@Bank 7 Tilesets 05", ROMX
 Tileset_05_GFX:
 INCBIN "gfx/tilesets/tileset_05.2bpp"
+Tileset_05_Meta:
+INCBIN "data/tilesets/tileset_05_metatiles.bin"
+Tileset_05_Coll:
+INCBIN "data/tilesets/tileset_05_collision.bin"
 
 SECTION "gfx.asm@Bank 7 Tilesets 03", ROMX
 Tileset_03_GFX:
 INCBIN "gfx/tilesets/tileset_03.2bpp"
+Tileset_03_Meta:
+INCBIN "data/tilesets/tileset_03_metatiles.bin"
+Tileset_03_Coll:
+INCBIN "data/tilesets/tileset_03_collision.bin"
 
 SECTION "gfx.asm@Bank 8 Tilesets 04", ROMX
 Tileset_04_GFX:
 INCBIN "gfx/tilesets/tileset_04.2bpp"
+Tileset_04_Meta:
+INCBIN "data/tilesets/tileset_04_metatiles.bin"
+Tileset_04_Coll:
+INCBIN "data/tilesets/tileset_04_collision.bin"
 
 SECTION "gfx.asm@Bank 8 Tilesets 07", ROMX
 Tileset_07_GFX:
 INCBIN "gfx/tilesets/tileset_07.2bpp"
+Tileset_07_Meta:
+INCBIN "data/tilesets/tileset_07_metatiles.bin"
+Tileset_07_Coll:
+INCBIN "data/tilesets/tileset_07_collision.bin"
 
 SECTION "gfx.asm@Bank 8 Tilesets 08", ROMX
 Tileset_08_GFX:
 INCBIN "gfx/tilesets/tileset_08.2bpp"
+Tileset_08_Meta:
+INCBIN "data/tilesets/tileset_08_metatiles.bin"
+Tileset_08_Coll:
+INCBIN "data/tilesets/tileset_08_collision.bin"
 
 SECTION "gfx.asm@Bank 8 Tilesets 0f", ROMX
 Tileset_0f_GFX:
 INCBIN "gfx/tilesets/tileset_0f.2bpp"
+Tileset_0f_Meta:
+INCBIN "data/tilesets/tileset_0f_metatiles.bin"
+Tileset_0f_Coll:
+INCBIN "data/tilesets/tileset_0f_collision.bin"
 
 SECTION "gfx.asm@Bank 8 Tilesets 11", ROMX
 Tileset_11_GFX:
 INCBIN "gfx/tilesets/tileset_11.2bpp"
+Tileset_11_Meta:
+INCBIN "data/tilesets/tileset_11_metatiles.bin"
+Tileset_11_Coll:
+INCBIN "data/tilesets/tileset_11_collision.bin"
 
 SECTION "gfx.asm@Gameboy GFX", ROMX
 TradeGameBoyGFX::
@@ -290,18 +330,34 @@ TwinsPic:: INCBIN "gfx/trainer/twins.pic"
 SECTION "gfx.asm@Bank 13 Tilesets 0a", ROMX
 Tileset_0a_GFX:
 INCBIN "gfx/tilesets/tileset_0a.2bpp"
+Tileset_0a_Meta:
+INCBIN "data/tilesets/tileset_0a_metatiles.bin"
+Tileset_0a_Coll:
+INCBIN "data/tilesets/tileset_0a_collision.bin"
 
 SECTION "gfx.asm@Bank 13 Tilesets 16", ROMX
 Tileset_16_GFX:
 INCBIN "gfx/tilesets/tileset_16.2bpp"
+Tileset_16_Meta:
+INCBIN "data/tilesets/tileset_16_metatiles.bin"
+Tileset_16_Coll:
+INCBIN "data/tilesets/tileset_16_collision.bin"
 
 SECTION "gfx.asm@Bank 13 Tilesets 19", ROMX
 Tileset_19_GFX:
 INCBIN "gfx/tilesets/tileset_19.2bpp"
+Tileset_19_Meta:
+INCBIN "data/tilesets/tileset_19_metatiles.bin"
+Tileset_19_Coll:
+INCBIN "data/tilesets/tileset_19_collision.bin"
 
 SECTION "gfx.asm@Bank 13 Tilesets 1a", ROMX
 Tileset_1a_GFX:
 INCBIN "gfx/tilesets/tileset_1a.2bpp"
+Tileset_1a_Meta:
+INCBIN "data/tilesets/tileset_1a_metatiles.bin"
+Tileset_1a_Coll:
+INCBIN "data/tilesets/tileset_1a_collision.bin"
 
 SECTION "gfx.asm@PKMN Sprite Bank List", ROMX
 INCLUDE "gfx/pokemon/pkmn_pic_banks.asm"
@@ -441,18 +497,34 @@ BoulderSpriteGFX:: INCBIN "gfx/sprites/boulder.2bpp"
 SECTION "gfx.asm@Bank 37 Tilesets 10", ROMX
 Tileset_10_GFX:
 INCBIN "gfx/tilesets/tileset_10.2bpp"
+Tileset_10_Meta:
+INCBIN "data/tilesets/tileset_10_metatiles.bin"
+Tileset_10_Coll:
+INCBIN "data/tilesets/tileset_10_collision.bin"
 
 SECTION "gfx.asm@Bank 37 Tilesets 15", ROMX
 Tileset_15_GFX:
 INCBIN "gfx/tilesets/tileset_15.2bpp"
+Tileset_15_Meta:
+INCBIN "data/tilesets/tileset_15_metatiles.bin"
+Tileset_15_Coll:
+INCBIN "data/tilesets/tileset_15_collision.bin"
 
 SECTION "gfx.asm@Bank 37 Tilesets 17", ROMX
 Tileset_17_GFX:
 INCBIN "gfx/tilesets/tileset_17.2bpp"
+Tileset_17_Meta:
+INCBIN "data/tilesets/tileset_17_metatiles.bin"
+Tileset_17_Coll:
+INCBIN "data/tilesets/tileset_17_collision.bin"
 
 SECTION "gfx.asm@Bank 37 Tilesets 18", ROMX
 Tileset_18_GFX:
 INCBIN "gfx/tilesets/tileset_18.2bpp"
+Tileset_18_Meta:
+INCBIN "data/tilesets/tileset_18_metatiles.bin"
+Tileset_18_Coll:
+INCBIN "data/tilesets/tileset_18_collision.bin"
 
 SECTION "gfx.asm@Poker GFX", ROMX
 PokerGFX::