clean up some tileset sections

also found unused metatile/collision data for a 128-block tileset

tilesets/data_2.asm

@@ -52,11 +52,11 @@ INCBIN "gfx/tilesets/24.lz"
 
 Tileset24Meta: ; 0x1ee1c
 Tileset30Meta: ; 0x1ee1c
-INCBIN "tilesets/30_metatiles.bin"
+INCBIN "tilesets/24_metatiles.bin"
 ; 0x1f21c
 
 Tileset24Coll: ; 0x1f21c
 Tileset30Coll: ; 0x1f21c
-INCBIN "tilesets/30_collision.bin"
+INCBIN "tilesets/24_collision.bin"
 ; 0x1f31c
 

tilesets/data_4.asm

@@ -50,3 +50,11 @@ Tileset30GFX: ; 0x326b0
 INCBIN "gfx/tilesets/30.lz"
 ; 0x329f0
 
+UnusedTileset30Meta: ; 0x329f0
+INCBIN "tilesets/unused_30_metatiles.bin"
+; 0x331f0
+
+UnusedTileset30Coll: ; 0x331f0
+INCBIN "tilesets/unused_30_collision.bin"
+; 0x333f0
+

tilesets/data_7.asm

@@ -4,7 +4,7 @@ Tileset33GFX: ; 0x1dc5a1
 Tileset34GFX: ; 0x1dc5a1
 Tileset35GFX: ; 0x1dc5a1
 Tileset36GFX: ; 0x1dc5a1
-INCBIN "gfx/tilesets/36.lz"
+INCBIN "gfx/tilesets/26.lz"
 ; 0x1dd1a9
 
 Tileset26Meta: ; 0x1dd1a9

tilesets/roofs.asm

@@ -0,0 +1,56 @@
+
+LoadMapGroupRoof: ; 1c000
+	ld a, [MapGroup]
+	ld e, a
+	ld d, 0
+	ld hl, MapGroupRoofs
+	add hl, de
+	ld a, [hl]
+	cp $ff
+	ret z
+	ld hl, Roofs
+	ld bc, $90
+	call AddNTimes
+	ld de, $90a0
+	ld bc, $90
+	call CopyBytes
+	ret
+; 1c021
+
+MapGroupRoofs: ; 1c021i
+	db -1 ; group 1
+	db  3 ; group 2
+	db  2 ; group 3
+	db -1 ; group 4
+	db  1 ; group 5
+	db  2 ; group 6
+	db -1 ; group 7
+	db -1 ; group 8
+	db  2 ; group 9
+	db  2 ; group 10
+	db  1 ; group 11
+	db  4 ; group 12
+	db -1 ; group 13
+	db -1 ; group 14
+	db -1 ; group 15
+	db -1 ; group 16
+	db -1 ; group 17
+	db -1 ; group 18
+	db -1 ; group 19
+	db  0 ; group 20
+	db -1 ; group 21
+	db -1 ; group 22
+	db  3 ; group 23
+	db -1 ; group 24
+	db  0 ; group 25
+	db -1 ; group 26
+	db  0 ; group 27
+; 1c03c
+
+Roofs: ; 1c03c
+INCBIN "gfx/tilesets/roofs/0.2bpp"
+INCBIN "gfx/tilesets/roofs/1.2bpp"
+INCBIN "gfx/tilesets/roofs/2.2bpp"
+INCBIN "gfx/tilesets/roofs/3.2bpp"
+INCBIN "gfx/tilesets/roofs/4.2bpp"
+; 1c30c