diff options
| -rwxr-xr-x | engine/color.asm | 20 | ||||
| -rwxr-xr-x | predef/cgb.asm | 2 | ||||
| -rw-r--r-- | tilesets/bg.pal | 209 | ||||
| -rw-r--r-- | tilesets/house.pal | 39 | ||||
| -rw-r--r-- | tilesets/ice_path.pal | 39 | ||||
| -rw-r--r-- | tilesets/ob.pal | 159 | ||||
| -rw-r--r-- | tilesets/radio_tower.pal | 39 | ||||
| -rw-r--r-- | tilesets/roof.pal | 134 |
8 files changed, 631 insertions, 10 deletions
diff --git a/engine/color.asm b/engine/color.asm index 6d6c9e66..bdcfca66 100755 --- a/engine/color.asm +++ b/engine/color.asm @@ -1430,7 +1430,7 @@ Functionb649: ; b649 (2:7649) ld a, [wTimeOfDayPal] and $3 ld bc, $40 - ld hl, Palettes_b8ae + ld hl, MapObjectPals call AddNTimes ld de, wTempOBPal0 ld bc, $40 @@ -1447,7 +1447,7 @@ Functionb649: ; b649 (2:7649) add hl, hl add hl, hl add hl, hl - ld de, Palettes_b9ae + ld de, RoofPals add hl, de ld a, [wTimeOfDayPal] and $3 @@ -1498,13 +1498,15 @@ Pointers_b6ce: db $10, $11, $12, $13, $14, $15, $16, $17 ; nite db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark - dr $b75e, $b796 -Palettes_b796: - dr $b796, $b8ae -Palettes_b8ae: - dr $b8ae, $b9ae -Palettes_b9ae: - dr $b9ae, $ba86 +TilesetBGPalette: ; b75e +INCLUDE "tilesets/bg.pal" + +MapObjectPals:: ; b8ae +INCLUDE "tilesets/ob.pal" + +RoofPals: ; b9ae +INCLUDE "tilesets/roof.pal" + Palettes_ba86: RGB 27, 31, 27 RGB 21, 21, 21 diff --git a/predef/cgb.asm b/predef/cgb.asm index 35efcc0a..e9273b7d 100755 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -111,7 +111,7 @@ Function9399: ; 9399 (2:5399) ld [wColorLayoutPredefID], a call Function9b28 asm_93e1 - ld hl, Palettes_b796 + ld hl, TilesetBGPalette + 7 * 8 ld de, wTempBGPal7 ld bc, $8 call CopyBytes diff --git a/tilesets/bg.pal b/tilesets/bg.pal new file mode 100644 index 00000000..0b088472 --- /dev/null +++ b/tilesets/bg.pal @@ -0,0 +1,209 @@ + RGB 28, 31, 16 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 7, 7, 7 + + RGB 28, 31, 16 + RGB 31, 19, 24 + RGB 30, 10, 6 + RGB 7, 7, 7 + + RGB 22, 31, 10 + RGB 12, 25, 1 + RGB 5, 14, 0 + RGB 7, 7, 7 + + RGB 31, 31, 31 + RGB 8, 12, 31 + RGB 1, 4, 31 + RGB 7, 7, 7 + + RGB 28, 31, 16 + RGB 31, 31, 7 + RGB 31, 16, 1 + RGB 7, 7, 7 + + RGB 28, 31, 16 + RGB 24, 18, 7 + RGB 20, 15, 3 + RGB 7, 7, 7 + + RGB 28, 31, 16 + RGB 15, 31, 31 + RGB 5, 17, 31 + RGB 7, 7, 7 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 0, 0, 0 + + RGB 27, 31, 27 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 7, 7, 7 + + RGB 27, 31, 27 + RGB 31, 19, 24 + RGB 30, 10, 6 + RGB 7, 7, 7 + + RGB 22, 31, 10 + RGB 12, 25, 1 + RGB 5, 14, 0 + RGB 7, 7, 7 + + RGB 31, 31, 31 + RGB 8, 12, 31 + RGB 1, 4, 31 + RGB 7, 7, 7 + + RGB 27, 31, 27 + RGB 31, 31, 7 + RGB 31, 16, 1 + RGB 7, 7, 7 + + RGB 27, 31, 27 + RGB 24, 18, 7 + RGB 20, 15, 3 + RGB 7, 7, 7 + + RGB 27, 31, 27 + RGB 15, 31, 31 + RGB 5, 17, 31 + RGB 7, 7, 7 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 0, 0, 0 + + RGB 15, 14, 24 + RGB 11, 11, 19 + RGB 7, 7, 12 + RGB 0, 0, 0 + + RGB 15, 14, 24 + RGB 14, 7, 17 + RGB 13, 0, 8 + RGB 0, 0, 0 + + RGB 15, 14, 24 + RGB 8, 13, 19 + RGB 0, 11, 13 + RGB 0, 0, 0 + + RGB 15, 14, 24 + RGB 5, 5, 17 + RGB 3, 3, 10 + RGB 0, 0, 0 + + RGB 30, 30, 11 + RGB 16, 14, 18 + RGB 16, 14, 10 + RGB 0, 0, 0 + + RGB 15, 14, 24 + RGB 12, 9, 15 + RGB 8, 4, 5 + RGB 0, 0, 0 + + RGB 15, 14, 24 + RGB 13, 12, 23 + RGB 11, 9, 20 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 0, 0, 0 + + RGB 1, 1, 2 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 1, 1, 2 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 1, 1, 2 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 1, 1, 2 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 30, 30, 11 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 1, 1, 2 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 1, 1, 2 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 0, 0, 0 + + RGB 30, 28, 26 + RGB 19, 19, 19 + RGB 13, 13, 13 + RGB 7, 7, 7 + + RGB 30, 28, 26 + RGB 31, 19, 24 + RGB 30, 10, 6 + RGB 7, 7, 7 + + RGB 18, 24, 9 + RGB 15, 20, 1 + RGB 9, 13, 0 + RGB 7, 7, 7 + + RGB 30, 28, 26 + RGB 15, 16, 31 + RGB 9, 9, 31 + RGB 7, 7, 7 + + RGB 30, 28, 26 + RGB 31, 31, 7 + RGB 31, 16, 1 + RGB 7, 7, 7 + + RGB 26, 24, 17 + RGB 21, 17, 7 + RGB 16, 13, 3 + RGB 7, 7, 7 + + RGB 30, 28, 26 + RGB 17, 19, 31 + RGB 14, 16, 31 + RGB 7, 7, 7 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 0, 0, 0 + + RGB 23, 23, 31 + RGB 18, 19, 31 + RGB 13, 12, 31 + RGB 7, 7, 7 + + RGB 15, 13, 27 + RGB 10, 9, 20 + RGB 4, 3, 18 + RGB 0, 0, 0 diff --git a/tilesets/house.pal b/tilesets/house.pal new file mode 100644 index 00000000..2d6d5179 --- /dev/null +++ b/tilesets/house.pal @@ -0,0 +1,39 @@ + RGB 30, 28, 26 + RGB 19, 19, 19 + RGB 13, 13, 13 + RGB 07, 07, 07 + + RGB 30, 28, 26 + RGB 31, 19, 24 + RGB 30, 10, 06 + RGB 07, 07, 07 + + RGB 30, 28, 26 + RGB 15, 20, 01 + RGB 09, 13, 00 + RGB 07, 07, 07 + + RGB 30, 28, 26 + RGB 15, 16, 31 + RGB 09, 09, 31 + RGB 07, 07, 07 + + RGB 30, 28, 26 + RGB 31, 31, 07 + RGB 31, 16, 01 + RGB 07, 07, 07 + + RGB 26, 24, 17 + RGB 21, 17, 07 + RGB 16, 13, 03 + RGB 07, 07, 07 + + RGB 30, 28, 26 + RGB 31, 19, 24 + RGB 16, 13, 03 + RGB 07, 07, 07 + + RGB 31, 31, 16 + RGB 31, 31, 16 + RGB 14, 09, 00 + RGB 00, 00, 00 diff --git a/tilesets/ice_path.pal b/tilesets/ice_path.pal new file mode 100644 index 00000000..f92281d7 --- /dev/null +++ b/tilesets/ice_path.pal @@ -0,0 +1,39 @@ + RGB 15, 14, 24 + RGB 11, 11, 19 + RGB 07, 07, 12 + RGB 00, 00, 00 + + RGB 15, 14, 24 + RGB 14, 07, 17 + RGB 13, 00, 08 + RGB 00, 00, 00 + + RGB 22, 29, 31 + RGB 10, 27, 31 + RGB 31, 31, 31 + RGB 05, 00, 09 + + RGB 15, 14, 24 + RGB 05, 05, 17 + RGB 03, 03, 10 + RGB 00, 00, 00 + + RGB 30, 30, 11 + RGB 16, 14, 18 + RGB 16, 14, 10 + RGB 00, 00, 00 + + RGB 15, 14, 24 + RGB 12, 09, 15 + RGB 08, 04, 05 + RGB 00, 00, 00 + + RGB 25, 31, 31 + RGB 09, 28, 31 + RGB 16, 11, 31 + RGB 05, 00, 09 + + RGB 31, 31, 16 + RGB 31, 31, 16 + RGB 14, 09, 00 + RGB 00, 00, 00 diff --git a/tilesets/ob.pal b/tilesets/ob.pal new file mode 100644 index 00000000..f9fa6699 --- /dev/null +++ b/tilesets/ob.pal @@ -0,0 +1,159 @@ + RGB 28, 31, 16 + RGB 31, 19, 10 + RGB 31, 07, 01 + RGB 00, 00, 00 + + RGB 28, 31, 16 + RGB 31, 19, 10 + RGB 10, 09, 31 + RGB 00, 00, 00 + + RGB 28, 31, 16 + RGB 31, 19, 10 + RGB 07, 23, 03 + RGB 00, 00, 00 + + RGB 28, 31, 16 + RGB 31, 19, 10 + RGB 15, 10, 03 + RGB 00, 00, 00 + + RGB 28, 31, 16 + RGB 31, 19, 10 + RGB 30, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 22, 31, 10 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 07, 07, 07 + + RGB 28, 31, 16 + RGB 24, 18, 07 + RGB 20, 15, 03 + RGB 07, 07, 07 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 01 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 10, 09, 31 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 07, 23, 03 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 15, 10, 03 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 30, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 22, 31, 10 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 07, 07, 07 + + RGB 27, 31, 27 + RGB 24, 18, 07 + RGB 20, 15, 03 + RGB 07, 07, 07 + + RGB 15, 14, 24 + RGB 31, 19, 10 + RGB 31, 07, 01 + RGB 00, 00, 00 + + RGB 15, 14, 24 + RGB 31, 19, 10 + RGB 10, 09, 31 + RGB 00, 00, 00 + + RGB 15, 14, 24 + RGB 31, 19, 10 + RGB 07, 23, 03 + RGB 00, 00, 00 + + RGB 15, 14, 24 + RGB 31, 19, 10 + RGB 15, 10, 03 + RGB 00, 00, 00 + + RGB 15, 14, 24 + RGB 31, 19, 10 + RGB 30, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 15, 14, 24 + RGB 08, 13, 19 + RGB 00, 11, 13 + RGB 00, 00, 00 + + RGB 15, 14, 24 + RGB 12, 09, 15 + RGB 08, 04, 05 + RGB 00, 00, 00 + + RGB 01, 01, 02 + RGB 31, 19, 10 + RGB 31, 07, 01 + RGB 00, 00, 00 + + RGB 01, 01, 02 + RGB 31, 19, 10 + RGB 10, 09, 31 + RGB 00, 00, 00 + + RGB 01, 01, 02 + RGB 31, 19, 10 + RGB 07, 23, 03 + RGB 00, 00, 00 + + RGB 01, 01, 02 + RGB 31, 19, 10 + RGB 15, 10, 03 + RGB 00, 00, 00 + + RGB 01, 01, 02 + RGB 31, 19, 10 + RGB 30, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 01, 01, 02 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 01, 01, 02 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 diff --git a/tilesets/radio_tower.pal b/tilesets/radio_tower.pal new file mode 100644 index 00000000..5799b6f7 --- /dev/null +++ b/tilesets/radio_tower.pal @@ -0,0 +1,39 @@ + RGB 27, 31, 27 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 07, 07, 07 + + RGB 27, 31, 27 + RGB 31, 19, 24 + RGB 30, 10, 06 + RGB 07, 07, 07 + + RGB 08, 12, 31 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 07, 07, 07 + + RGB 31, 31, 31 + RGB 08, 12, 31 + RGB 01, 04, 31 + RGB 07, 07, 07 + + RGB 27, 31, 27 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 07, 07, 07 + + RGB 27, 31, 27 + RGB 24, 18, 07 + RGB 20, 15, 03 + RGB 07, 07, 07 + + RGB 27, 31, 27 + RGB 15, 31, 31 + RGB 05, 17, 31 + RGB 07, 07, 07 + + RGB 31, 31, 16 + RGB 31, 31, 16 + RGB 14, 09, 00 + RGB 00, 00, 00 diff --git a/tilesets/roof.pal b/tilesets/roof.pal new file mode 100644 index 00000000..cef531c0 --- /dev/null +++ b/tilesets/roof.pal @@ -0,0 +1,134 @@ + RGB 21, 21, 21 + RGB 11, 11, 11 + RGB 21, 21, 21 + RGB 11, 11, 11 + + RGB 14, 17, 31 + RGB 07, 11, 15 + RGB 09, 09, 17 + RGB 05, 07, 13 + + RGB 12, 19, 00 + RGB 06, 10, 00 + RGB 06, 09, 07 + RGB 04, 05, 06 + + RGB 21, 21, 21 + RGB 11, 11, 11 + RGB 21, 21, 21 + RGB 17, 08, 07 + + RGB 31, 19, 00 + RGB 27, 10, 05 + RGB 15, 07, 02 + RGB 11, 04, 02 + + RGB 11, 10, 16 + RGB 05, 06, 07 + RGB 03, 04, 08 + RGB 00, 00, 00 + + RGB 31, 10, 00 + RGB 18, 06, 00 + RGB 18, 05, 09 + RGB 17, 08, 07 + + RGB 17, 27, 31 + RGB 05, 15, 31 + RGB 07, 08, 22 + RGB 07, 07, 16 + + RGB 22, 20, 10 + RGB 17, 14, 03 + RGB 11, 11, 05 + RGB 10, 09, 07 + + RGB 31, 08, 04 + RGB 09, 09, 08 + RGB 18, 05, 09 + RGB 09, 09, 08 + + RGB 24, 14, 31 + RGB 13, 07, 21 + RGB 12, 03, 18 + RGB 09, 03, 15 + + RGB 25, 25, 00 + RGB 20, 17, 08 + RGB 12, 12, 00 + RGB 10, 09, 05 + + RGB 27, 23, 01 + RGB 23, 11, 00 + RGB 15, 11, 01 + RGB 11, 10, 01 + + RGB 27, 28, 31 + RGB 17, 19, 22 + RGB 14, 14, 18 + RGB 10, 09, 13 + + RGB 19, 19, 16 + RGB 10, 12, 15 + RGB 09, 09, 11 + RGB 04, 05, 07 + + RGB 14, 17, 31 + RGB 07, 11, 15 + RGB 09, 13, 19 + RGB 07, 07, 16 + + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 11, 11, 19 + RGB 07, 07, 12 + + RGB 31, 18, 29 + RGB 17, 13, 20 + RGB 14, 06, 12 + RGB 11, 03, 10 + + RGB 23, 15, 31 + RGB 16, 05, 31 + RGB 12, 07, 17 + RGB 08, 06, 10 + + RGB 21, 21, 25 + RGB 16, 16, 16 + RGB 13, 13, 13 + RGB 07, 07, 07 + + RGB 21, 21, 21 + RGB 11, 11, 11 + RGB 21, 21, 21 + RGB 11, 11, 11 + + RGB 19, 31, 15 + RGB 31, 22, 02 + RGB 12, 13, 09 + RGB 09, 12, 03 + + RGB 15, 10, 31 + RGB 07, 05, 15 + RGB 06, 05, 17 + RGB 02, 02, 08 + + RGB 21, 31, 07 + RGB 13, 25, 04 + RGB 09, 14, 08 + RGB 06, 10, 04 + + RGB 20, 31, 14 + RGB 11, 23, 05 + RGB 09, 13, 08 + RGB 06, 09, 04 + + RGB 31, 26, 00 + RGB 31, 15, 00 + RGB 13, 13, 01 + RGB 08, 08, 01 + + RGB 31, 14, 28 + RGB 31, 05, 21 + RGB 14, 07, 17 + RGB 13, 00, 08 |