diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/palettes/tilesets/battle_tower.pal | 40 | ||||
| -rw-r--r-- | data/palettes/tilesets/house_1.pal | 40 | ||||
| -rw-r--r-- | data/palettes/tilesets/ice_path.pal | 40 | ||||
| -rw-r--r-- | data/palettes/tilesets/pokecom_center.pal | 40 | ||||
| -rw-r--r-- | data/palettes/tilesets/radio_tower.pal | 39 | ||||
| -rw-r--r-- | data/type_matchups.asm | 2 |
6 files changed, 200 insertions, 1 deletions
diff --git a/data/palettes/tilesets/battle_tower.pal b/data/palettes/tilesets/battle_tower.pal new file mode 100644 index 000000000..4e71a5575 --- /dev/null +++ b/data/palettes/tilesets/battle_tower.pal @@ -0,0 +1,40 @@ +; 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 (blue) + 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 05, 05, 16 + RGB 08, 19, 28 + RGB 00, 00, 00 + RGB 31, 31, 31 +; text + RGB 31, 31, 16 + RGB 31, 31, 16 + RGB 14, 09, 00 + RGB 00, 00, 00 diff --git a/data/palettes/tilesets/house_1.pal b/data/palettes/tilesets/house_1.pal new file mode 100644 index 000000000..a9f8b74b6 --- /dev/null +++ b/data/palettes/tilesets/house_1.pal @@ -0,0 +1,40 @@ +; 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 30, 28, 26 + RGB 15, 20, 01 + RGB 09, 13, 00 + RGB 07, 07, 07 +; water (blue) + 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 (glass) + RGB 30, 28, 26 + RGB 31, 19, 24 + RGB 16, 13, 03 + RGB 07, 07, 07 +; text + RGB 31, 31, 16 + RGB 31, 31, 16 + RGB 14, 09, 00 + RGB 00, 00, 00 diff --git a/data/palettes/tilesets/ice_path.pal b/data/palettes/tilesets/ice_path.pal new file mode 100644 index 000000000..cb7659f50 --- /dev/null +++ b/data/palettes/tilesets/ice_path.pal @@ -0,0 +1,40 @@ +; 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 (ice) + RGB 22, 29, 31 + RGB 10, 27, 31 + RGB 31, 31, 31 + RGB 05, 00, 09 +; 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 (snow) + RGB 25, 31, 31 + RGB 09, 28, 31 + RGB 16, 11, 31 + RGB 05, 00, 09 +; text + RGB 31, 31, 16 + RGB 31, 31, 16 + RGB 14, 09, 00 + RGB 00, 00, 00 diff --git a/data/palettes/tilesets/pokecom_center.pal b/data/palettes/tilesets/pokecom_center.pal new file mode 100644 index 000000000..9fe7b765a --- /dev/null +++ b/data/palettes/tilesets/pokecom_center.pal @@ -0,0 +1,40 @@ +; 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 (blue) + RGB 30, 28, 26 + RGB 17, 19, 31 + RGB 14, 16, 31 + RGB 07, 07, 07 +; yellow + RGB 31, 26, 21 + RGB 31, 20, 01 + RGB 14, 16, 31 + RGB 07, 07, 07 +; brown + RGB 21, 17, 07 + RGB 17, 19, 31 + RGB 16, 13, 03 + RGB 07, 07, 07 +; roof + RGB 05, 05, 16 + RGB 08, 19, 28 + RGB 00, 00, 00 + RGB 31, 31, 31 +; text + RGB 31, 31, 16 + RGB 31, 31, 16 + RGB 14, 09, 00 + RGB 00, 00, 00 diff --git a/data/palettes/tilesets/radio_tower.pal b/data/palettes/tilesets/radio_tower.pal new file mode 100644 index 000000000..5799b6f77 --- /dev/null +++ b/data/palettes/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/data/type_matchups.asm b/data/type_matchups.asm index b1e06c6f7..61fd19078 100644 --- a/data/type_matchups.asm +++ b/data/type_matchups.asm @@ -5,7 +5,7 @@ NOT_VERY_EFFECTIVE EQU 05 NO_EFFECT EQU 00 TypeMatchups: ; 34bb1 - ; attacker defender*= + ; attacker, defender, *= db NORMAL, ROCK, NOT_VERY_EFFECTIVE db NORMAL, STEEL, NOT_VERY_EFFECTIVE db FIRE, FIRE, NOT_VERY_EFFECTIVE |