diff options
author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-15 12:31:18 -0500 |
---|---|---|
committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-15 12:31:18 -0500 |
commit | 94722aa8f08ceaef8233d73a87f534b6c3f0475f (patch) | |
tree | 5cf3287bec399ededa7e397812d1a06d7533641a /tilesets | |
parent | 2b6dd505c1674e0d99d649515a8efe868035db09 (diff) |
Move predef/ files into engine/
Get rid of single-file engine/ subdirectories
Move tilesets/ palettes unrelated to individual tilesets into data/palettes/ (more from engine/colors.asm can be moved here too)
Diffstat (limited to 'tilesets')
-rw-r--r-- | tilesets/bg.pal | 227 | ||||
-rw-r--r-- | tilesets/house_1.pal (renamed from tilesets/house.pal) | 0 | ||||
-rw-r--r-- | tilesets/ob.pal | 39 | ||||
-rw-r--r-- | tilesets/pokecom_center.pal (renamed from tilesets/pokecom.pal) | 0 | ||||
-rw-r--r-- | tilesets/roof.pal | 161 |
5 files changed, 0 insertions, 427 deletions
diff --git a/tilesets/bg.pal b/tilesets/bg.pal deleted file mode 100644 index 3cd14d142..000000000 --- a/tilesets/bg.pal +++ /dev/null @@ -1,227 +0,0 @@ -; morn - -; gray - RGB 28, 31, 16 - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 07, 07, 07 -; red - RGB 28, 31, 16 - RGB 31, 19, 24 - RGB 30, 10, 06 - RGB 07, 07, 07 -; green - RGB 22, 31, 10 - RGB 12, 25, 01 - RGB 05, 14, 00 - RGB 07, 07, 07 -; water - RGB 31, 31, 31 - RGB 08, 12, 31 - RGB 01, 04, 31 - RGB 07, 07, 07 -; yellow - RGB 28, 31, 16 - RGB 31, 31, 07 - RGB 31, 16, 01 - RGB 07, 07, 07 -; brown - RGB 28, 31, 16 - RGB 24, 18, 07 - RGB 20, 15, 03 - RGB 07, 07, 07 -; roof - RGB 28, 31, 16 - RGB 15, 31, 31 - RGB 05, 17, 31 - RGB 07, 07, 07 -; text - RGB 31, 31, 16 - RGB 31, 31, 16 - RGB 14, 09, 00 - RGB 00, 00, 00 - -; day - -; gray - RGB 27, 31, 27 - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 07, 07, 07 -; red - RGB 27, 31, 27 - RGB 31, 19, 24 - RGB 30, 10, 06 - RGB 07, 07, 07 -; green - RGB 22, 31, 10 - RGB 12, 25, 01 - RGB 05, 14, 00 - RGB 07, 07, 07 -; water - RGB 31, 31, 31 - RGB 08, 12, 31 - RGB 01, 04, 31 - RGB 07, 07, 07 -; yellow - RGB 27, 31, 27 - RGB 31, 31, 07 - RGB 31, 16, 01 - RGB 07, 07, 07 -; brown - RGB 27, 31, 27 - RGB 24, 18, 07 - RGB 20, 15, 03 - RGB 07, 07, 07 -; roof - RGB 27, 31, 27 - RGB 15, 31, 31 - RGB 05, 17, 31 - RGB 07, 07, 07 -; text - RGB 31, 31, 16 - RGB 31, 31, 16 - RGB 14, 09, 00 - RGB 00, 00, 00 - -; nite - -; gray - RGB 15, 14, 24 - RGB 11, 11, 19 - RGB 07, 07, 12 - RGB 00, 00, 00 -; red - RGB 15, 14, 24 - RGB 14, 07, 17 - RGB 13, 00, 08 - RGB 00, 00, 00 -; green - RGB 15, 14, 24 - RGB 08, 13, 19 - RGB 00, 11, 13 - RGB 00, 00, 00 -; water - RGB 15, 14, 24 - RGB 05, 05, 17 - RGB 03, 03, 10 - RGB 00, 00, 00 -; yellow - RGB 30, 30, 11 - RGB 16, 14, 18 - RGB 16, 14, 10 - RGB 00, 00, 00 -; brown - RGB 15, 14, 24 - RGB 12, 09, 15 - RGB 08, 04, 05 - RGB 00, 00, 00 -; roof - RGB 15, 14, 24 - RGB 13, 12, 23 - RGB 11, 09, 20 - RGB 00, 00, 00 -; text - RGB 31, 31, 16 - RGB 31, 31, 16 - RGB 14, 09, 00 - RGB 00, 00, 00 - -; dark - -; gray - RGB 01, 01, 02 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 -; red - RGB 01, 01, 02 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 -; green - RGB 01, 01, 02 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 -; water - RGB 01, 01, 02 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 -; yellow - RGB 30, 30, 11 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 -; brown - RGB 01, 01, 02 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 -; roof - RGB 01, 01, 02 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 -; text - RGB 31, 31, 16 - RGB 31, 31, 16 - RGB 14, 09, 00 - RGB 00, 00, 00 - -; indoor - -; gray - RGB 30, 28, 26 - RGB 19, 19, 19 - RGB 13, 13, 13 - RGB 07, 07, 07 -; red - RGB 30, 28, 26 - RGB 31, 19, 24 - RGB 30, 10, 06 - RGB 07, 07, 07 -; green - RGB 18, 24, 09 - RGB 15, 20, 01 - RGB 09, 13, 00 - RGB 07, 07, 07 -; water - RGB 30, 28, 26 - RGB 15, 16, 31 - RGB 09, 09, 31 - RGB 07, 07, 07 -; yellow - RGB 30, 28, 26 - RGB 31, 31, 07 - RGB 31, 16, 01 - RGB 07, 07, 07 -; brown - RGB 26, 24, 17 - RGB 21, 17, 07 - RGB 16, 13, 03 - RGB 07, 07, 07 -; roof - RGB 30, 28, 26 - RGB 17, 19, 31 - RGB 14, 16, 31 - RGB 07, 07, 07 -; text - RGB 31, 31, 16 - RGB 31, 31, 16 - RGB 14, 09, 00 - RGB 00, 00, 00 - -; overworld water - -; morn/day - RGB 23, 23, 31 - RGB 18, 19, 31 - RGB 13, 12, 31 - RGB 07, 07, 07 -; nite - RGB 15, 13, 27 - RGB 10, 09, 20 - RGB 04, 03, 18 - RGB 00, 00, 00 diff --git a/tilesets/house.pal b/tilesets/house_1.pal index a9f8b74b6..a9f8b74b6 100644 --- a/tilesets/house.pal +++ b/tilesets/house_1.pal diff --git a/tilesets/ob.pal b/tilesets/ob.pal deleted file mode 100644 index a6e20d7f0..000000000 --- a/tilesets/ob.pal +++ /dev/null @@ -1,39 +0,0 @@ - ; morn - RGB 28,31,16, 31,19,10, 31,07,01, 00,00,00 ; red - RGB 28,31,16, 31,19,10, 10,09,31, 00,00,00 ; blue - RGB 28,31,16, 31,19,10, 07,23,03, 00,00,00 ; green - RGB 28,31,16, 31,19,10, 15,10,03, 00,00,00 ; brown - RGB 28,31,16, 31,19,10, 30,10,06, 00,00,00 ; pink - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver - RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree - RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; rock - - ; day - RGB 27,31,27, 31,19,10, 31,07,01, 00,00,00 ; red - RGB 27,31,27, 31,19,10, 10,09,31, 00,00,00 ; blue - RGB 27,31,27, 31,19,10, 07,23,03, 00,00,00 ; green - RGB 27,31,27, 31,19,10, 15,10,03, 00,00,00 ; brown - RGB 27,31,27, 31,19,10, 30,10,06, 00,00,00 ; pink - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver - RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree - RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; rock - - ; nite - RGB 15,14,24, 31,19,10, 31,07,01, 00,00,00 ; red - RGB 15,14,24, 31,19,10, 10,09,31, 00,00,00 ; blue - RGB 15,14,24, 31,19,10, 07,23,03, 00,00,00 ; green - RGB 15,14,24, 31,19,10, 15,10,03, 00,00,00 ; brown - RGB 15,14,24, 31,19,10, 30,10,06, 00,00,00 ; pink - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver - RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree - RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; rock - - ; dark - RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red - RGB 01,01,02, 31,19,10, 10,09,31, 00,00,00 ; blue - RGB 01,01,02, 31,19,10, 07,23,03, 00,00,00 ; green - RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown - RGB 01,01,02, 31,19,10, 30,10,06, 00,00,00 ; pink - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver - RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; tree - RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; rock diff --git a/tilesets/pokecom.pal b/tilesets/pokecom_center.pal index 9fe7b765a..9fe7b765a 100644 --- a/tilesets/pokecom.pal +++ b/tilesets/pokecom_center.pal diff --git a/tilesets/roof.pal b/tilesets/roof.pal deleted file mode 100644 index ba65fc7d2..000000000 --- a/tilesets/roof.pal +++ /dev/null @@ -1,161 +0,0 @@ -; group 0 (unused) - RGB 21, 21, 21 - RGB 11, 11, 11 - RGB 21, 21, 21 - RGB 11, 11, 11 - -; group 1 (Olivine) - RGB 14, 17, 31 - RGB 07, 11, 15 - RGB 09, 09, 17 - RGB 05, 07, 13 - -; group 2 (Mahogany) - RGB 12, 19, 00 - RGB 06, 10, 00 - RGB 06, 09, 07 - RGB 04, 05, 06 - -; group 3 - RGB 21, 21, 21 - RGB 11, 11, 11 - RGB 21, 21, 21 - RGB 17, 08, 07 - -; group 4 (Ecruteak) - RGB 31, 19, 00 - RGB 27, 10, 05 - RGB 15, 07, 02 - RGB 11, 04, 02 - -; group 5 (Blackthorn) - RGB 11, 10, 16 - RGB 05, 06, 07 - RGB 03, 04, 08 - RGB 00, 00, 00 - -; group 6 (Cinnabar) - RGB 31, 10, 00 - RGB 18, 06, 00 - RGB 18, 05, 09 - RGB 17, 08, 07 - -; group 7 (Cerulean) - RGB 17, 27, 31 - RGB 05, 15, 31 - RGB 07, 08, 22 - RGB 07, 07, 16 - -; group 8 (Azalea) - RGB 22, 20, 10 - RGB 17, 14, 03 - RGB 11, 11, 05 - RGB 10, 09, 07 - -; group 9 (Lake of Rage) - RGB 31, 08, 04 - RGB 09, 09, 08 - RGB 18, 05, 09 - RGB 09, 09, 08 - -; group 10 (Violet) - RGB 24, 14, 31 - RGB 13, 07, 21 - RGB 12, 03, 18 - RGB 09, 03, 15 - -; group 11 (Goldenrod) - RGB 25, 25, 00 - RGB 20, 17, 08 - RGB 12, 12, 00 - RGB 10, 09, 05 - -; group 12 (Vermilion) - RGB 27, 23, 01 - RGB 23, 11, 00 - RGB 15, 11, 01 - RGB 11, 10, 01 - -; group 13 (Pallet) - RGB 27, 28, 31 - RGB 17, 19, 22 - RGB 14, 14, 18 - RGB 10, 09, 13 - -; group 14 (Pewter) - RGB 19, 19, 16 - RGB 10, 12, 15 - RGB 09, 09, 11 - RGB 04, 05, 07 - -; group 15 (Mount Moon Square) - RGB 14, 17, 31 - RGB 07, 11, 15 - RGB 09, 13, 19 - RGB 07, 07, 16 - -; group 16 (Route 23) - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 11, 11, 19 - RGB 07, 07, 12 - -; group 17 (Fuchsia) - RGB 31, 18, 29 - RGB 17, 13, 20 - RGB 14, 06, 12 - RGB 11, 03, 10 - -; group 18 (Lavender) - RGB 23, 15, 31 - RGB 16, 05, 31 - RGB 12, 07, 17 - RGB 08, 06, 10 - -; group 19 (Route 28) - RGB 21, 21, 25 - RGB 16, 16, 16 - RGB 13, 13, 13 - RGB 07, 07, 07 - -; group 20 - RGB 21, 21, 21 - RGB 11, 11, 11 - RGB 21, 21, 21 - RGB 11, 11, 11 - -; group 21 (Celadon) - RGB 19, 31, 15 - RGB 31, 22, 02 - RGB 12, 13, 09 - RGB 09, 12, 03 - -; group 22 (Cianwood) - RGB 15, 10, 31 - RGB 07, 05, 15 - RGB 06, 05, 17 - RGB 02, 02, 08 - -; group 23 (Viridian) - RGB 21, 31, 07 - RGB 13, 25, 04 - RGB 09, 14, 08 - RGB 06, 10, 04 - -; group 24 (New Bark) - RGB 20, 31, 14 - RGB 11, 23, 05 - RGB 09, 13, 08 - RGB 06, 09, 04 - -; group 25 (Saffron) - RGB 31, 26, 00 - RGB 31, 15, 00 - RGB 13, 13, 01 - RGB 08, 08, 01 - -; group 26 (Cherrygrove) - RGB 31, 14, 28 - RGB 31, 05, 21 - RGB 14, 07, 17 - RGB 13, 00, 08 |