diff options
Diffstat (limited to 'tilesets')
| -rw-r--r-- | tilesets/dark.pal | bin | 64 -> 512 bytes | |||
| -rw-r--r-- | tilesets/data_2.asm | 4 | ||||
| -rw-r--r-- | tilesets/data_4.asm | 8 | ||||
| -rw-r--r-- | tilesets/data_7.asm | 2 | ||||
| -rw-r--r-- | tilesets/day.pal | bin | 64 -> 512 bytes | |||
| -rw-r--r-- | tilesets/morn.pal | bin | 64 -> 512 bytes | |||
| -rw-r--r-- | tilesets/nite.pal | bin | 64 -> 512 bytes | |||
| -rw-r--r-- | tilesets/palette_maps.asm | 4 | ||||
| -rw-r--r-- | tilesets/roofs.asm | 56 | ||||
| -rw-r--r-- | tilesets/unused_30_collision.bin | bin | 0 -> 512 bytes | |||
| -rw-r--r-- | tilesets/unused_30_metatiles.bin | bin | 0 -> 2048 bytes |
11 files changed, 70 insertions, 4 deletions
diff --git a/tilesets/dark.pal b/tilesets/dark.pal Binary files differindex bdfd30645..4c4f7700d 100644 --- a/tilesets/dark.pal +++ b/tilesets/dark.pal diff --git a/tilesets/data_2.asm b/tilesets/data_2.asm index a04f0c56b..ab02b8b7f 100644 --- a/tilesets/data_2.asm +++ b/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 diff --git a/tilesets/data_4.asm b/tilesets/data_4.asm index 9b05877cb..f6e490f77 100644 --- a/tilesets/data_4.asm +++ b/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 + diff --git a/tilesets/data_7.asm b/tilesets/data_7.asm index 206551811..418ecec98 100644 --- a/tilesets/data_7.asm +++ b/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 diff --git a/tilesets/day.pal b/tilesets/day.pal Binary files differindex 969fe230d..9535caedd 100644 --- a/tilesets/day.pal +++ b/tilesets/day.pal diff --git a/tilesets/morn.pal b/tilesets/morn.pal Binary files differindex 279a064e2..0ba286f36 100644 --- a/tilesets/morn.pal +++ b/tilesets/morn.pal diff --git a/tilesets/nite.pal b/tilesets/nite.pal Binary files differindex 8c1079f09..0e2fea242 100644 --- a/tilesets/nite.pal +++ b/tilesets/nite.pal diff --git a/tilesets/palette_maps.asm b/tilesets/palette_maps.asm index a7ef63c43..9f2f76676 100644 --- a/tilesets/palette_maps.asm +++ b/tilesets/palette_maps.asm @@ -105,7 +105,7 @@ Tileset20PalMap: ; 0x4caf5 INCBIN "tilesets/20_palette_map.bin" ; 0x4cb65 -INCBIN "baserom.gbc", $4cb65, $4cbd5-$4cb65 +INCBIN "baserom.gbc", $4cb65, $4cbd5 - $4cb65 Tileset29PalMap: ; 0x4cbd5 INCBIN "tilesets/29_palette_map.bin" @@ -127,3 +127,5 @@ Tileset04PalMap: ; 0x4cd95 INCBIN "tilesets/04_palette_map.bin" ; 0x4ce05 +INCBIN "baserom.gbc", $4ce05, $4ce1f - $4ce05 + diff --git a/tilesets/roofs.asm b/tilesets/roofs.asm new file mode 100644 index 000000000..ebf92b6c1 --- /dev/null +++ b/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 diff --git a/tilesets/unused_30_collision.bin b/tilesets/unused_30_collision.bin Binary files differnew file mode 100644 index 000000000..559aad109 --- /dev/null +++ b/tilesets/unused_30_collision.bin diff --git a/tilesets/unused_30_metatiles.bin b/tilesets/unused_30_metatiles.bin Binary files differnew file mode 100644 index 000000000..b70f1a0e6 --- /dev/null +++ b/tilesets/unused_30_metatiles.bin |