From d7970f749ac23786728926109be430ab732f19e6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 18:49:25 +0100 Subject: Consistent predef function names --- gfx/load_pics.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gfx') diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm index 1d685f1dd..b60dab5c3 100755 --- a/gfx/load_pics.asm +++ b/gfx/load_pics.asm @@ -1,4 +1,4 @@ -GetUnownLetter: ; 51040 +Predef_GetUnownLetter: ; 51040 ; Return Unown letter in UnownLetter based on DVs at hl ; Take the middle 2 bits of each DV and place them in order: @@ -48,7 +48,7 @@ GetUnownLetter: ; 51040 ld [UnownLetter], a ret -GetMonFrontpic: ; 51077 +Predef_GetMonFrontpic: ; 51077 ld a, [CurPartySpecies] ld [CurSpecies], a call IsAPokemon @@ -60,7 +60,7 @@ GetMonFrontpic: ; 51077 ld [rSVBK], a ret -GetAnimatedFrontpicPredef: ; 5108b +Predef_GetAnimatedFrontpic: ; 5108b ld a, [CurPartySpecies] ld [CurSpecies], a call IsAPokemon @@ -195,7 +195,7 @@ LoadFrontpicTiles: ; 5114f jr nz, .loop ret -GetMonBackpic: ; 5116c +Predef_GetMonBackpic: ; 5116c ld a, [CurPartySpecies] call IsAPokemon ret c @@ -311,7 +311,7 @@ Function511ec: ; 511ec call FarDecompress ret -GetTrainerPic: ; 5120d +Predef_GetTrainerPic: ; 5120d ld a, [TrainerClass] and a ret z @@ -353,7 +353,7 @@ GetTrainerPic: ; 5120d ld [hBGMapMode], a ret -DecompressPredef: ; 5125d +Predef_Decompress: ; 5125d ; Decompress lz data from b:hl to scratch space at 6:d000, then copy it to address de. ld a, [rSVBK] -- cgit v1.2.3 From b4e087167f3263342bbe01b5256f42fcf2d726af Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 19:38:56 +0100 Subject: More unreferenced labels and unused text --- gfx/font.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gfx') diff --git a/gfx/font.asm b/gfx/font.asm index 9da7eaafc..349f8facc 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -84,18 +84,18 @@ INCLUDE "gfx/footprints.asm" ; This and the following two functions are unreferenced. ; Debug, perhaps? -Unknown_fb434: +Unreferenced_fb434: db 0 -Functionfb435: ; 4b435 - ld a, [Unknown_fb434] +Unreferenced_Functionfb435: ; 4b435 + ld a, [Unreferenced_fb434] and a jp nz, Get1bpp_2 jp Get1bpp ; fb43f -Functionfb43f: ; fb43f - ld a, [Unknown_fb434] +Unreferenced_Functionfb43f: ; fb43f + ld a, [Unreferenced_fb434] and a jp nz, Get2bpp_2 jp Get2bpp -- cgit v1.2.3 From e6778f931d929c1d4d867d58267aadb92ea4e129 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 2 Jan 2018 16:45:39 -0500 Subject: town_map.png matches pokegear.png --- gfx/pokegear/town_map.png | Bin 464 -> 944 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'gfx') diff --git a/gfx/pokegear/town_map.png b/gfx/pokegear/town_map.png index 6e7af59d0..a7ff9abfb 100644 Binary files a/gfx/pokegear/town_map.png and b/gfx/pokegear/town_map.png differ -- cgit v1.2.3 From eb110edae399f3d8ecada3a036c671290c8af342 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 2 Jan 2018 19:00:22 -0500 Subject: Arrange pichu.png like the rest --- gfx/credits/pichu.png | Bin 388 -> 1202 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'gfx') diff --git a/gfx/credits/pichu.png b/gfx/credits/pichu.png index 529973d29..bb7141db4 100644 Binary files a/gfx/credits/pichu.png and b/gfx/credits/pichu.png differ -- cgit v1.2.3 From e3e885aad855a7f0fb05d046a95ae3ce0be52dad Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 2 Jan 2018 19:19:23 -0500 Subject: pngcrush -noreduce --- gfx/credits/pichu.png | Bin 1202 -> 690 bytes gfx/pokegear/town_map.png | Bin 944 -> 681 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'gfx') diff --git a/gfx/credits/pichu.png b/gfx/credits/pichu.png index bb7141db4..1d46ea807 100644 Binary files a/gfx/credits/pichu.png and b/gfx/credits/pichu.png differ diff --git a/gfx/pokegear/town_map.png b/gfx/pokegear/town_map.png index a7ff9abfb..899379826 100644 Binary files a/gfx/pokegear/town_map.png and b/gfx/pokegear/town_map.png differ -- cgit v1.2.3 From 41feb29680da2740a1c7c8c781a6ca535037e12d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 2 Jan 2018 19:33:27 -0500 Subject: Make some graphics easier to edit --- gfx/credits/theend.png | Bin 195 -> 282 bytes gfx/overworld/chris_fish.png | Bin 190 -> 318 bytes gfx/overworld/kris_fish.png | Bin 193 -> 446 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'gfx') diff --git a/gfx/credits/theend.png b/gfx/credits/theend.png index 1f10e16df..eaaf393b7 100644 Binary files a/gfx/credits/theend.png and b/gfx/credits/theend.png differ diff --git a/gfx/overworld/chris_fish.png b/gfx/overworld/chris_fish.png index ea0730151..81e05279a 100644 Binary files a/gfx/overworld/chris_fish.png and b/gfx/overworld/chris_fish.png differ diff --git a/gfx/overworld/kris_fish.png b/gfx/overworld/kris_fish.png index a47b89042..c0fe37544 100644 Binary files a/gfx/overworld/kris_fish.png and b/gfx/overworld/kris_fish.png differ -- cgit v1.2.3 From bc83768d8115810d581a5195a829d04e07af5c4a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 3 Jan 2018 02:02:15 -0500 Subject: Tileset images are 128px wide --- gfx/tilesets/aerodactyl_word_room.png | Bin 1909 -> 1884 bytes gfx/tilesets/battle_tower.png | Bin 993 -> 1004 bytes gfx/tilesets/battle_tower_outside.png | Bin 2341 -> 2324 bytes gfx/tilesets/beta_word_room.png | Bin 1909 -> 1884 bytes gfx/tilesets/cave.png | Bin 1044 -> 1031 bytes gfx/tilesets/celadon_mansion.png | Bin 2047 -> 2047 bytes gfx/tilesets/game_corner.png | Bin 1583 -> 1562 bytes gfx/tilesets/gate.png | Bin 1146 -> 1141 bytes gfx/tilesets/gym_1.png | Bin 1282 -> 1272 bytes gfx/tilesets/ho_oh_word_room.png | Bin 1909 -> 1884 bytes gfx/tilesets/house_1.png | Bin 1264 -> 1254 bytes gfx/tilesets/ice_path.png | Bin 2592 -> 2566 bytes gfx/tilesets/ilex_forest.png | Bin 1264 -> 1214 bytes gfx/tilesets/johto_1.png | Bin 2084 -> 2044 bytes gfx/tilesets/johto_2.png | Bin 2341 -> 2324 bytes gfx/tilesets/kabuto_word_room.png | Bin 1909 -> 1884 bytes gfx/tilesets/kanto.png | Bin 1316 -> 1301 bytes gfx/tilesets/kurts_house.png | Bin 1203 -> 1181 bytes gfx/tilesets/lab.png | Bin 2041 -> 2022 bytes gfx/tilesets/lighthouse.png | Bin 1226 -> 1226 bytes gfx/tilesets/mart.png | Bin 1773 -> 1751 bytes gfx/tilesets/olivine_gym.png | Bin 2284 -> 2267 bytes gfx/tilesets/omanyte_word_room.png | Bin 1909 -> 1884 bytes gfx/tilesets/park.png | Bin 1334 -> 1310 bytes gfx/tilesets/players_house.png | Bin 1005 -> 999 bytes gfx/tilesets/players_house_2f.png | Bin 1250 -> 1221 bytes gfx/tilesets/pokecenter.png | Bin 1195 -> 1189 bytes gfx/tilesets/pokecom_center.png | Bin 2498 -> 2485 bytes gfx/tilesets/port.png | Bin 1062 -> 1048 bytes gfx/tilesets/power_plant.png | Bin 1131 -> 1123 bytes gfx/tilesets/radio_tower.png | Bin 1419 -> 1381 bytes gfx/tilesets/ruins_of_alph.png | Bin 1909 -> 1884 bytes gfx/tilesets/sprout_tower.png | Bin 1505 -> 1489 bytes gfx/tilesets/train_station.png | Bin 1156 -> 1162 bytes gfx/tilesets/underground.png | Bin 1143 -> 1111 bytes gfx/tilesets/whirl_islands.png | Bin 851 -> 840 bytes 36 files changed, 0 insertions(+), 0 deletions(-) (limited to 'gfx') diff --git a/gfx/tilesets/aerodactyl_word_room.png b/gfx/tilesets/aerodactyl_word_room.png index f41866c58..7ae272358 100644 Binary files a/gfx/tilesets/aerodactyl_word_room.png and b/gfx/tilesets/aerodactyl_word_room.png differ diff --git a/gfx/tilesets/battle_tower.png b/gfx/tilesets/battle_tower.png index 1cd57402d..cf9e12d53 100644 Binary files a/gfx/tilesets/battle_tower.png and b/gfx/tilesets/battle_tower.png differ diff --git a/gfx/tilesets/battle_tower_outside.png b/gfx/tilesets/battle_tower_outside.png index 126573b7b..1c080ff45 100644 Binary files a/gfx/tilesets/battle_tower_outside.png and b/gfx/tilesets/battle_tower_outside.png differ diff --git a/gfx/tilesets/beta_word_room.png b/gfx/tilesets/beta_word_room.png index f41866c58..7ae272358 100644 Binary files a/gfx/tilesets/beta_word_room.png and b/gfx/tilesets/beta_word_room.png differ diff --git a/gfx/tilesets/cave.png b/gfx/tilesets/cave.png index 0e5bdee7e..fe15a740e 100644 Binary files a/gfx/tilesets/cave.png and b/gfx/tilesets/cave.png differ diff --git a/gfx/tilesets/celadon_mansion.png b/gfx/tilesets/celadon_mansion.png index 7dde8574e..44e697a1b 100644 Binary files a/gfx/tilesets/celadon_mansion.png and b/gfx/tilesets/celadon_mansion.png differ diff --git a/gfx/tilesets/game_corner.png b/gfx/tilesets/game_corner.png index 776900638..d519dd636 100644 Binary files a/gfx/tilesets/game_corner.png and b/gfx/tilesets/game_corner.png differ diff --git a/gfx/tilesets/gate.png b/gfx/tilesets/gate.png index b8f2db2d2..5036f9066 100644 Binary files a/gfx/tilesets/gate.png and b/gfx/tilesets/gate.png differ diff --git a/gfx/tilesets/gym_1.png b/gfx/tilesets/gym_1.png index 582b9365d..27f64afa2 100644 Binary files a/gfx/tilesets/gym_1.png and b/gfx/tilesets/gym_1.png differ diff --git a/gfx/tilesets/ho_oh_word_room.png b/gfx/tilesets/ho_oh_word_room.png index f41866c58..7ae272358 100644 Binary files a/gfx/tilesets/ho_oh_word_room.png and b/gfx/tilesets/ho_oh_word_room.png differ diff --git a/gfx/tilesets/house_1.png b/gfx/tilesets/house_1.png index 3ab7b5ce8..ce3547bb8 100644 Binary files a/gfx/tilesets/house_1.png and b/gfx/tilesets/house_1.png differ diff --git a/gfx/tilesets/ice_path.png b/gfx/tilesets/ice_path.png index d70eb53be..70dea39f5 100644 Binary files a/gfx/tilesets/ice_path.png and b/gfx/tilesets/ice_path.png differ diff --git a/gfx/tilesets/ilex_forest.png b/gfx/tilesets/ilex_forest.png index a85cc0394..853625944 100644 Binary files a/gfx/tilesets/ilex_forest.png and b/gfx/tilesets/ilex_forest.png differ diff --git a/gfx/tilesets/johto_1.png b/gfx/tilesets/johto_1.png index 0fc2db12f..62ceb23a0 100644 Binary files a/gfx/tilesets/johto_1.png and b/gfx/tilesets/johto_1.png differ diff --git a/gfx/tilesets/johto_2.png b/gfx/tilesets/johto_2.png index 126573b7b..1c080ff45 100644 Binary files a/gfx/tilesets/johto_2.png and b/gfx/tilesets/johto_2.png differ diff --git a/gfx/tilesets/kabuto_word_room.png b/gfx/tilesets/kabuto_word_room.png index f41866c58..7ae272358 100644 Binary files a/gfx/tilesets/kabuto_word_room.png and b/gfx/tilesets/kabuto_word_room.png differ diff --git a/gfx/tilesets/kanto.png b/gfx/tilesets/kanto.png index 08b2cbeea..a3036406e 100644 Binary files a/gfx/tilesets/kanto.png and b/gfx/tilesets/kanto.png differ diff --git a/gfx/tilesets/kurts_house.png b/gfx/tilesets/kurts_house.png index 3d6f1b511..bda1f7983 100644 Binary files a/gfx/tilesets/kurts_house.png and b/gfx/tilesets/kurts_house.png differ diff --git a/gfx/tilesets/lab.png b/gfx/tilesets/lab.png index 418a068fa..75301c7e2 100644 Binary files a/gfx/tilesets/lab.png and b/gfx/tilesets/lab.png differ diff --git a/gfx/tilesets/lighthouse.png b/gfx/tilesets/lighthouse.png index 920ee30ec..0da4b3919 100644 Binary files a/gfx/tilesets/lighthouse.png and b/gfx/tilesets/lighthouse.png differ diff --git a/gfx/tilesets/mart.png b/gfx/tilesets/mart.png index 4053283bc..d4ef69d2a 100644 Binary files a/gfx/tilesets/mart.png and b/gfx/tilesets/mart.png differ diff --git a/gfx/tilesets/olivine_gym.png b/gfx/tilesets/olivine_gym.png index 350c04932..e32c2fb28 100644 Binary files a/gfx/tilesets/olivine_gym.png and b/gfx/tilesets/olivine_gym.png differ diff --git a/gfx/tilesets/omanyte_word_room.png b/gfx/tilesets/omanyte_word_room.png index f41866c58..7ae272358 100644 Binary files a/gfx/tilesets/omanyte_word_room.png and b/gfx/tilesets/omanyte_word_room.png differ diff --git a/gfx/tilesets/park.png b/gfx/tilesets/park.png index 7a4a5f8eb..830affef7 100644 Binary files a/gfx/tilesets/park.png and b/gfx/tilesets/park.png differ diff --git a/gfx/tilesets/players_house.png b/gfx/tilesets/players_house.png index b49f799d8..76e470781 100644 Binary files a/gfx/tilesets/players_house.png and b/gfx/tilesets/players_house.png differ diff --git a/gfx/tilesets/players_house_2f.png b/gfx/tilesets/players_house_2f.png index e46a847b9..a0f268eb5 100644 Binary files a/gfx/tilesets/players_house_2f.png and b/gfx/tilesets/players_house_2f.png differ diff --git a/gfx/tilesets/pokecenter.png b/gfx/tilesets/pokecenter.png index d4084ebd4..69cacdb7b 100644 Binary files a/gfx/tilesets/pokecenter.png and b/gfx/tilesets/pokecenter.png differ diff --git a/gfx/tilesets/pokecom_center.png b/gfx/tilesets/pokecom_center.png index 889b02727..fbbf270b3 100644 Binary files a/gfx/tilesets/pokecom_center.png and b/gfx/tilesets/pokecom_center.png differ diff --git a/gfx/tilesets/port.png b/gfx/tilesets/port.png index 6990a7d7b..3e05e0da7 100644 Binary files a/gfx/tilesets/port.png and b/gfx/tilesets/port.png differ diff --git a/gfx/tilesets/power_plant.png b/gfx/tilesets/power_plant.png index b72e3f401..e2e501077 100644 Binary files a/gfx/tilesets/power_plant.png and b/gfx/tilesets/power_plant.png differ diff --git a/gfx/tilesets/radio_tower.png b/gfx/tilesets/radio_tower.png index 8d2d32e1f..4f823f756 100644 Binary files a/gfx/tilesets/radio_tower.png and b/gfx/tilesets/radio_tower.png differ diff --git a/gfx/tilesets/ruins_of_alph.png b/gfx/tilesets/ruins_of_alph.png index f41866c58..7ae272358 100644 Binary files a/gfx/tilesets/ruins_of_alph.png and b/gfx/tilesets/ruins_of_alph.png differ diff --git a/gfx/tilesets/sprout_tower.png b/gfx/tilesets/sprout_tower.png index 268fc998f..05484b5d9 100644 Binary files a/gfx/tilesets/sprout_tower.png and b/gfx/tilesets/sprout_tower.png differ diff --git a/gfx/tilesets/train_station.png b/gfx/tilesets/train_station.png index 0c148f95d..b0704b9df 100644 Binary files a/gfx/tilesets/train_station.png and b/gfx/tilesets/train_station.png differ diff --git a/gfx/tilesets/underground.png b/gfx/tilesets/underground.png index 0a83d2043..c33c3fd5b 100644 Binary files a/gfx/tilesets/underground.png and b/gfx/tilesets/underground.png differ diff --git a/gfx/tilesets/whirl_islands.png b/gfx/tilesets/whirl_islands.png index 9dc74c45b..1d0a91e5e 100644 Binary files a/gfx/tilesets/whirl_islands.png and b/gfx/tilesets/whirl_islands.png differ -- cgit v1.2.3 From 0b6857b1a9c3e170e78f65695e437150ab1e500f Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 3 Jan 2018 02:16:25 -0500 Subject: lava in gym_1 > fountain in unused safari zone --- gfx/tilesets/lava/1.png | Bin 0 -> 89 bytes gfx/tilesets/lava/2.png | Bin 0 -> 89 bytes gfx/tilesets/lava/3.png | Bin 0 -> 87 bytes gfx/tilesets/lava/4.png | Bin 0 -> 79 bytes gfx/tilesets/safari/1.png | Bin 89 -> 0 bytes gfx/tilesets/safari/2.png | Bin 89 -> 0 bytes gfx/tilesets/safari/3.png | Bin 87 -> 0 bytes gfx/tilesets/safari/4.png | Bin 79 -> 0 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 gfx/tilesets/lava/1.png create mode 100644 gfx/tilesets/lava/2.png create mode 100644 gfx/tilesets/lava/3.png create mode 100644 gfx/tilesets/lava/4.png delete mode 100644 gfx/tilesets/safari/1.png delete mode 100644 gfx/tilesets/safari/2.png delete mode 100644 gfx/tilesets/safari/3.png delete mode 100644 gfx/tilesets/safari/4.png (limited to 'gfx') diff --git a/gfx/tilesets/lava/1.png b/gfx/tilesets/lava/1.png new file mode 100644 index 000000000..c5b500ccc Binary files /dev/null and b/gfx/tilesets/lava/1.png differ diff --git a/gfx/tilesets/lava/2.png b/gfx/tilesets/lava/2.png new file mode 100644 index 000000000..1512e35ad Binary files /dev/null and b/gfx/tilesets/lava/2.png differ diff --git a/gfx/tilesets/lava/3.png b/gfx/tilesets/lava/3.png new file mode 100644 index 000000000..449c2a317 Binary files /dev/null and b/gfx/tilesets/lava/3.png differ diff --git a/gfx/tilesets/lava/4.png b/gfx/tilesets/lava/4.png new file mode 100644 index 000000000..8e4c8e0e5 Binary files /dev/null and b/gfx/tilesets/lava/4.png differ diff --git a/gfx/tilesets/safari/1.png b/gfx/tilesets/safari/1.png deleted file mode 100644 index c5b500ccc..000000000 Binary files a/gfx/tilesets/safari/1.png and /dev/null differ diff --git a/gfx/tilesets/safari/2.png b/gfx/tilesets/safari/2.png deleted file mode 100644 index 1512e35ad..000000000 Binary files a/gfx/tilesets/safari/2.png and /dev/null differ diff --git a/gfx/tilesets/safari/3.png b/gfx/tilesets/safari/3.png deleted file mode 100644 index 449c2a317..000000000 Binary files a/gfx/tilesets/safari/3.png and /dev/null differ diff --git a/gfx/tilesets/safari/4.png b/gfx/tilesets/safari/4.png deleted file mode 100644 index 8e4c8e0e5..000000000 Binary files a/gfx/tilesets/safari/4.png and /dev/null differ -- cgit v1.2.3 From 9d0ba6bfd3b2f10fae9969a784aa7b2b573e8411 Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Wed, 3 Jan 2018 19:12:45 -0500 Subject: Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). --- gfx/load_pics.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gfx') diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm index 1d685f1dd..2cd169508 100755 --- a/gfx/load_pics.asm +++ b/gfx/load_pics.asm @@ -206,7 +206,7 @@ GetMonBackpic: ; 5116c ld c, a ld a, [rSVBK] push af - ld a, $6 + ld a, BANK(wDecompressScratch) ld [rSVBK], a push de @@ -327,7 +327,7 @@ GetTrainerPic: ; 5120d call AddNTimes ld a, [rSVBK] push af - ld a, $6 + ld a, BANK(wDecompressScratch) ld [rSVBK], a push de ld a, BANK(TrainerPicPointers) @@ -358,7 +358,7 @@ DecompressPredef: ; 5125d ld a, [rSVBK] push af - ld a, 6 + ld a, BANK(wDecompressScratch) ld [rSVBK], a push de -- cgit v1.2.3 From d0a8e8e7441a5ac4eee6e40cfeb6c3e77d6aace4 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 00:36:15 -0500 Subject: =?UTF-8?q?includes.asm=20=E2=86=92=20constants.asm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gfx/pics.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gfx') diff --git a/gfx/pics.asm b/gfx/pics.asm index fc2d46a77..198569a76 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -1,4 +1,4 @@ -INCLUDE "includes.asm" +INCLUDE "constants.asm" ; PokemonPicPointers and UnownPicPointers are assumed to start at the same -- cgit v1.2.3 From fbc353f206ad457f32493b061b83e9067109e504 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 18:08:40 -0500 Subject: Replace some hex constants --- gfx/load_pics.asm | 2 +- gfx/overworld_font.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gfx') diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm index 1d685f1dd..6c2b3a765 100755 --- a/gfx/load_pics.asm +++ b/gfx/load_pics.asm @@ -188,7 +188,7 @@ LoadFrontpicTiles: ; 5114f pop bc .loop push bc - ld c, $0 + ld c, 0 call LoadFrontpic pop bc dec b diff --git a/gfx/overworld_font.asm b/gfx/overworld_font.asm index 43dd08c66..a1657c8fb 100644 --- a/gfx/overworld_font.asm +++ b/gfx/overworld_font.asm @@ -4,7 +4,7 @@ LoadOverworldFont:: ; 106594 lb bc, BANK(.font), $80 call Get2bpp ld de, .space - ld hl, vTiles2 tile $7f + ld hl, vTiles2 tile " " lb bc, BANK(.space), 1 call Get2bpp ret -- cgit v1.2.3 From f22485b08d5378015f3248b7a758ea0d25eb0c7d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 22:44:06 -0500 Subject: Binary tilemaps --- gfx/sgb/sgb_border.tilemap | 2 ++ gfx/title/old_bg.tilemap | Bin 0 -> 2048 bytes 2 files changed, 2 insertions(+) create mode 100644 gfx/sgb/sgb_border.tilemap create mode 100644 gfx/title/old_bg.tilemap (limited to 'gfx') diff --git a/gfx/sgb/sgb_border.tilemap b/gfx/sgb/sgb_border.tilemap new file mode 100644 index 000000000..362eae929 --- /dev/null +++ b/gfx/sgb/sgb_border.tilemap @@ -0,0 +1,2 @@ +TTTTTTT$%&T&T%T$TTTTTTTTT$455T4T3TTTT!"##T"T!T T  +      ) !"##T"T!T122T688888888888888888888'2TT2T1TTT7TTTTT7TTT%&T&T7&T&T%T3455T4T7455T4T3T7TTT7TTT7"T!T T7 !"2T1T0T7012TTT7TTT7&T%T$T7$%&4T3TT7347TT7TTTTT7TTT!"##T"T7"##T"T!T122T72TT2T1TTT.////////////////////-TTTTTTT9 ( )*+,9TTT%&T&T%T$TTTT$%&T&T%T3455T4T$TTTTTT$455T4T3T !"##T"T!T T \ No newline at end of file diff --git a/gfx/title/old_bg.tilemap b/gfx/title/old_bg.tilemap new file mode 100644 index 000000000..58f448c38 Binary files /dev/null and b/gfx/title/old_bg.tilemap differ -- cgit v1.2.3 From 5c5f8b325fe5900a3800a976a1a31e99934f6815 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 23:21:32 -0500 Subject: Move data/palettes/ .pal files into gfx/ --- gfx/battle/exp_bar.pal | 3 + gfx/battle/hp_bar.pal | 9 + gfx/battle_anims/battle_anims.pal | 30 +++ gfx/card_flip/card_flip.pal | 44 ++++ gfx/credits/credits.pal | 19 ++ gfx/debug/bg.pal | 43 ++++ gfx/debug/ob.pal | 42 ++++ gfx/diploma/diploma.pal | 39 ++++ gfx/font/bg_text.pal | 4 + gfx/icon/bat.png | Bin 169 -> 0 bytes gfx/icon/bigmon.png | Bin 185 -> 0 bytes gfx/icon/bird.png | Bin 176 -> 0 bytes gfx/icon/blob.png | Bin 174 -> 0 bytes gfx/icon/bug.png | Bin 185 -> 0 bytes gfx/icon/bulbasaur.png | Bin 166 -> 0 bytes gfx/icon/caterpillar.png | Bin 159 -> 0 bytes gfx/icon/charmander.png | Bin 166 -> 0 bytes gfx/icon/clefairy.png | Bin 165 -> 0 bytes gfx/icon/diglett.png | Bin 129 -> 0 bytes gfx/icon/egg.png | Bin 155 -> 0 bytes gfx/icon/equine.png | Bin 159 -> 0 bytes gfx/icon/fighter.png | Bin 179 -> 0 bytes gfx/icon/fish.png | Bin 173 -> 0 bytes gfx/icon/fox.png | Bin 188 -> 0 bytes gfx/icon/geodude.png | Bin 173 -> 0 bytes gfx/icon/ghost.png | Bin 143 -> 0 bytes gfx/icon/gyarados.png | Bin 208 -> 0 bytes gfx/icon/ho_oh.png | Bin 204 -> 0 bytes gfx/icon/humanshape.png | Bin 161 -> 0 bytes gfx/icon/item.png | Bin 82 -> 0 bytes gfx/icon/jellyfish.png | Bin 172 -> 0 bytes gfx/icon/jigglypuff.png | Bin 165 -> 0 bytes gfx/icon/lapras.png | Bin 165 -> 0 bytes gfx/icon/lugia.png | Bin 185 -> 0 bytes gfx/icon/mail.png | Bin 85 -> 0 bytes gfx/icon/mail2.png | Bin 135 -> 0 bytes gfx/icon/monster.png | Bin 179 -> 0 bytes gfx/icon/moth.png | Bin 185 -> 0 bytes gfx/icon/oddish.png | Bin 157 -> 0 bytes gfx/icon/pikachu.png | Bin 172 -> 0 bytes gfx/icon/poliwag.png | Bin 158 -> 0 bytes gfx/icon/serpent.png | Bin 145 -> 0 bytes gfx/icon/shell.png | Bin 170 -> 0 bytes gfx/icon/slowpoke.png | Bin 183 -> 0 bytes gfx/icon/snorlax.png | Bin 165 -> 0 bytes gfx/icon/squirtle.png | Bin 170 -> 0 bytes gfx/icon/staryu.png | Bin 166 -> 0 bytes gfx/icon/sudowoodo.png | Bin 195 -> 0 bytes gfx/icon/unown.png | Bin 112 -> 0 bytes gfx/icon/voltorb.png | Bin 127 -> 0 bytes gfx/icons.asm | 76 +++---- gfx/icons/bat.png | Bin 0 -> 169 bytes gfx/icons/bigmon.png | Bin 0 -> 185 bytes gfx/icons/bird.png | Bin 0 -> 176 bytes gfx/icons/blob.png | Bin 0 -> 174 bytes gfx/icons/bug.png | Bin 0 -> 185 bytes gfx/icons/bulbasaur.png | Bin 0 -> 166 bytes gfx/icons/caterpillar.png | Bin 0 -> 159 bytes gfx/icons/charmander.png | Bin 0 -> 166 bytes gfx/icons/clefairy.png | Bin 0 -> 165 bytes gfx/icons/diglett.png | Bin 0 -> 129 bytes gfx/icons/egg.png | Bin 0 -> 155 bytes gfx/icons/equine.png | Bin 0 -> 159 bytes gfx/icons/fighter.png | Bin 0 -> 179 bytes gfx/icons/fish.png | Bin 0 -> 173 bytes gfx/icons/fox.png | Bin 0 -> 188 bytes gfx/icons/geodude.png | Bin 0 -> 173 bytes gfx/icons/ghost.png | Bin 0 -> 143 bytes gfx/icons/gyarados.png | Bin 0 -> 208 bytes gfx/icons/ho_oh.png | Bin 0 -> 204 bytes gfx/icons/humanshape.png | Bin 0 -> 161 bytes gfx/icons/item.png | Bin 0 -> 82 bytes gfx/icons/jellyfish.png | Bin 0 -> 172 bytes gfx/icons/jigglypuff.png | Bin 0 -> 165 bytes gfx/icons/lapras.png | Bin 0 -> 165 bytes gfx/icons/lugia.png | Bin 0 -> 185 bytes gfx/icons/mail.png | Bin 0 -> 85 bytes gfx/icons/mail2.png | Bin 0 -> 135 bytes gfx/icons/monster.png | Bin 0 -> 179 bytes gfx/icons/moth.png | Bin 0 -> 185 bytes gfx/icons/oddish.png | Bin 0 -> 157 bytes gfx/icons/party_menu.pal | 69 ++++++ gfx/icons/pikachu.png | Bin 0 -> 172 bytes gfx/icons/poliwag.png | Bin 0 -> 158 bytes gfx/icons/serpent.png | Bin 0 -> 145 bytes gfx/icons/shell.png | Bin 0 -> 170 bytes gfx/icons/slowpoke.png | Bin 0 -> 183 bytes gfx/icons/snorlax.png | Bin 0 -> 165 bytes gfx/icons/squirtle.png | Bin 0 -> 170 bytes gfx/icons/staryu.png | Bin 0 -> 166 bytes gfx/icons/sudowoodo.png | Bin 0 -> 195 bytes gfx/icons/unown.png | Bin 0 -> 112 bytes gfx/icons/voltorb.png | Bin 0 -> 127 bytes gfx/intro/fade.pal | 41 ++++ gfx/intro/gamefreak_logo.pal | 23 ++ gfx/intro/intro_1.pal | 79 +++++++ gfx/intro/intro_2.pal | 79 +++++++ gfx/intro/intro_3.pal | 79 +++++++ gfx/intro/intro_4.pal | 79 +++++++ gfx/intro/intro_5.pal | 79 +++++++ gfx/mail/mail.pal | 49 +++++ gfx/mystery_gift/mg_mobile.pal | 24 +++ gfx/pack/pack.pal | 29 +++ gfx/pack/pack_f.pal | 29 +++ gfx/pokegear/pokegear.pal | 29 +++ gfx/pokegear/pokegear_f.pal | 29 +++ gfx/pokegear/town_map_palette_map.asm | 30 +++ gfx/sgb/blk_packets.asm | 40 ++++ gfx/sgb/pal_packets.asm | 115 ++++++++++ gfx/sgb/predef.pal | 395 ++++++++++++++++++++++++++++++++++ gfx/sgb/sgb_border.pal | 79 +++++++ gfx/slots/slots.pal | 79 +++++++ gfx/sprites/map_objects.pal | 39 ++++ gfx/tilesets/battle_tower.pal | 40 ++++ gfx/tilesets/bg_tiles.pal | 61 ++++++ gfx/tilesets/house_1.pal | 40 ++++ gfx/tilesets/ice_path.pal | 40 ++++ gfx/tilesets/pokecom_center.pal | 40 ++++ gfx/tilesets/radio_tower.pal | 39 ++++ gfx/tilesets/roofs.pal | 161 ++++++++++++++ gfx/title/old_bg.pal | 56 +++++ gfx/title/old_fg.pal | 319 +++++++++++++++++++++++++++ gfx/title/title.pal | 81 +++++++ gfx/trade/border.pal | 29 +++ gfx/unknown/49757.pal | 39 ++++ gfx/unknown/4985a.asm | 8 + gfx/unknown/b6f1.pal | 24 +++ gfx/unknown/b719.pal | 9 + gfx/unknown/b789.pal | 19 ++ 129 files changed, 2770 insertions(+), 38 deletions(-) create mode 100644 gfx/battle/exp_bar.pal create mode 100644 gfx/battle/hp_bar.pal create mode 100644 gfx/battle_anims/battle_anims.pal create mode 100644 gfx/card_flip/card_flip.pal create mode 100644 gfx/credits/credits.pal create mode 100644 gfx/debug/bg.pal create mode 100644 gfx/debug/ob.pal create mode 100644 gfx/diploma/diploma.pal create mode 100644 gfx/font/bg_text.pal delete mode 100644 gfx/icon/bat.png delete mode 100644 gfx/icon/bigmon.png delete mode 100644 gfx/icon/bird.png delete mode 100644 gfx/icon/blob.png delete mode 100644 gfx/icon/bug.png delete mode 100644 gfx/icon/bulbasaur.png delete mode 100644 gfx/icon/caterpillar.png delete mode 100644 gfx/icon/charmander.png delete mode 100644 gfx/icon/clefairy.png delete mode 100644 gfx/icon/diglett.png delete mode 100644 gfx/icon/egg.png delete mode 100644 gfx/icon/equine.png delete mode 100644 gfx/icon/fighter.png delete mode 100644 gfx/icon/fish.png delete mode 100644 gfx/icon/fox.png delete mode 100644 gfx/icon/geodude.png delete mode 100644 gfx/icon/ghost.png delete mode 100644 gfx/icon/gyarados.png delete mode 100644 gfx/icon/ho_oh.png delete mode 100644 gfx/icon/humanshape.png delete mode 100644 gfx/icon/item.png delete mode 100644 gfx/icon/jellyfish.png delete mode 100644 gfx/icon/jigglypuff.png delete mode 100644 gfx/icon/lapras.png delete mode 100644 gfx/icon/lugia.png delete mode 100644 gfx/icon/mail.png delete mode 100644 gfx/icon/mail2.png delete mode 100644 gfx/icon/monster.png delete mode 100644 gfx/icon/moth.png delete mode 100644 gfx/icon/oddish.png delete mode 100644 gfx/icon/pikachu.png delete mode 100644 gfx/icon/poliwag.png delete mode 100644 gfx/icon/serpent.png delete mode 100644 gfx/icon/shell.png delete mode 100644 gfx/icon/slowpoke.png delete mode 100644 gfx/icon/snorlax.png delete mode 100644 gfx/icon/squirtle.png delete mode 100644 gfx/icon/staryu.png delete mode 100644 gfx/icon/sudowoodo.png delete mode 100644 gfx/icon/unown.png delete mode 100644 gfx/icon/voltorb.png create mode 100644 gfx/icons/bat.png create mode 100644 gfx/icons/bigmon.png create mode 100644 gfx/icons/bird.png create mode 100644 gfx/icons/blob.png create mode 100644 gfx/icons/bug.png create mode 100644 gfx/icons/bulbasaur.png create mode 100644 gfx/icons/caterpillar.png create mode 100644 gfx/icons/charmander.png create mode 100644 gfx/icons/clefairy.png create mode 100644 gfx/icons/diglett.png create mode 100644 gfx/icons/egg.png create mode 100644 gfx/icons/equine.png create mode 100644 gfx/icons/fighter.png create mode 100644 gfx/icons/fish.png create mode 100644 gfx/icons/fox.png create mode 100644 gfx/icons/geodude.png create mode 100644 gfx/icons/ghost.png create mode 100644 gfx/icons/gyarados.png create mode 100644 gfx/icons/ho_oh.png create mode 100644 gfx/icons/humanshape.png create mode 100644 gfx/icons/item.png create mode 100644 gfx/icons/jellyfish.png create mode 100644 gfx/icons/jigglypuff.png create mode 100644 gfx/icons/lapras.png create mode 100644 gfx/icons/lugia.png create mode 100644 gfx/icons/mail.png create mode 100644 gfx/icons/mail2.png create mode 100644 gfx/icons/monster.png create mode 100644 gfx/icons/moth.png create mode 100644 gfx/icons/oddish.png create mode 100644 gfx/icons/party_menu.pal create mode 100644 gfx/icons/pikachu.png create mode 100644 gfx/icons/poliwag.png create mode 100644 gfx/icons/serpent.png create mode 100644 gfx/icons/shell.png create mode 100644 gfx/icons/slowpoke.png create mode 100644 gfx/icons/snorlax.png create mode 100644 gfx/icons/squirtle.png create mode 100644 gfx/icons/staryu.png create mode 100644 gfx/icons/sudowoodo.png create mode 100644 gfx/icons/unown.png create mode 100644 gfx/icons/voltorb.png create mode 100644 gfx/intro/fade.pal create mode 100644 gfx/intro/gamefreak_logo.pal create mode 100644 gfx/intro/intro_1.pal create mode 100644 gfx/intro/intro_2.pal create mode 100644 gfx/intro/intro_3.pal create mode 100644 gfx/intro/intro_4.pal create mode 100644 gfx/intro/intro_5.pal create mode 100644 gfx/mail/mail.pal create mode 100644 gfx/mystery_gift/mg_mobile.pal create mode 100644 gfx/pack/pack.pal create mode 100644 gfx/pack/pack_f.pal create mode 100644 gfx/pokegear/pokegear.pal create mode 100644 gfx/pokegear/pokegear_f.pal create mode 100644 gfx/pokegear/town_map_palette_map.asm create mode 100644 gfx/sgb/blk_packets.asm create mode 100644 gfx/sgb/pal_packets.asm create mode 100644 gfx/sgb/predef.pal create mode 100644 gfx/sgb/sgb_border.pal create mode 100644 gfx/slots/slots.pal create mode 100644 gfx/sprites/map_objects.pal create mode 100644 gfx/tilesets/battle_tower.pal create mode 100644 gfx/tilesets/bg_tiles.pal create mode 100644 gfx/tilesets/house_1.pal create mode 100644 gfx/tilesets/ice_path.pal create mode 100644 gfx/tilesets/pokecom_center.pal create mode 100644 gfx/tilesets/radio_tower.pal create mode 100644 gfx/tilesets/roofs.pal create mode 100644 gfx/title/old_bg.pal create mode 100644 gfx/title/old_fg.pal create mode 100644 gfx/title/title.pal create mode 100644 gfx/trade/border.pal create mode 100644 gfx/unknown/49757.pal create mode 100644 gfx/unknown/4985a.asm create mode 100644 gfx/unknown/b6f1.pal create mode 100644 gfx/unknown/b719.pal create mode 100644 gfx/unknown/b789.pal (limited to 'gfx') diff --git a/gfx/battle/exp_bar.pal b/gfx/battle/exp_bar.pal new file mode 100644 index 000000000..831bbda95 --- /dev/null +++ b/gfx/battle/exp_bar.pal @@ -0,0 +1,3 @@ +; blue + RGB 30, 26, 15 + RGB 04, 17, 31 diff --git a/gfx/battle/hp_bar.pal b/gfx/battle/hp_bar.pal new file mode 100644 index 000000000..909be8efd --- /dev/null +++ b/gfx/battle/hp_bar.pal @@ -0,0 +1,9 @@ +; green + RGB 30, 26, 15 + RGB 00, 23, 00 +; yellow + RGB 30, 26, 15 + RGB 31, 21, 00 +; red + RGB 30, 26, 15 + RGB 31, 00, 00 diff --git a/gfx/battle_anims/battle_anims.pal b/gfx/battle_anims/battle_anims.pal new file mode 100644 index 000000000..d2ebb6cef --- /dev/null +++ b/gfx/battle_anims/battle_anims.pal @@ -0,0 +1,30 @@ +; gray + RGB 31, 31, 31 + RGB 25, 25, 25 + RGB 13, 13, 13 + RGB 00, 00, 00 +; yellow + RGB 31, 31, 31 + RGB 31, 31, 07 + RGB 31, 16, 01 + RGB 00, 00, 00 +; red + RGB 31, 31, 31 + RGB 31, 19, 24 + RGB 30, 10, 06 + RGB 00, 00, 00 +; green + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 00, 00, 00 +; blue + RGB 31, 31, 31 + RGB 08, 12, 31 + RGB 01, 04, 31 + RGB 00, 00, 00 +; brown + RGB 31, 31, 31 + RGB 24, 18, 07 + RGB 20, 15, 03 + RGB 00, 00, 00 diff --git a/gfx/card_flip/card_flip.pal b/gfx/card_flip/card_flip.pal new file mode 100644 index 000000000..24c5566f8 --- /dev/null +++ b/gfx/card_flip/card_flip.pal @@ -0,0 +1,44 @@ + RGB 31, 31, 31 + RGB 17, 07, 31 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 29, 25, 00 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 13, 30 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 08, 17, 30 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 08, 31, 08 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 17, 07, 31 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 17, 07, 31 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 17, 07, 31 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 00, 00 + RGB 31, 00, 00 diff --git a/gfx/credits/credits.pal b/gfx/credits/credits.pal new file mode 100644 index 000000000..c473f0414 --- /dev/null +++ b/gfx/credits/credits.pal @@ -0,0 +1,19 @@ +; pichu + RGB 31,00,31, 31,25,00, 11,14,31, 07,07,07 + RGB 31,05,05, 11,14,31, 11,14,31, 31,31,31 + RGB 31,05,05, 00,00,00, 31,31,31, 31,31,31 + +; smoochum + RGB 31,31,31, 31,27,00, 26,06,31, 07,07,07 + RGB 03,13,31, 20,00,24, 26,06,31, 31,31,31 + RGB 03,13,31, 00,00,00, 31,31,31, 31,31,31 + +; ditto + RGB 31,31,31, 23,12,28, 31,22,00, 07,07,07 + RGB 03,20,00, 31,22,00, 31,22,00, 31,31,31 + RGB 03,20,00, 00,00,00, 31,31,31, 31,31,31 + +; igglybuff + RGB 31,31,31, 31,10,31, 31,00,09, 07,07,07 + RGB 31,14,00, 31,00,09, 31,00,09, 31,31,31 + RGB 31,14,00, 31,31,31, 31,31,31, 31,31,31 diff --git a/gfx/debug/bg.pal b/gfx/debug/bg.pal new file mode 100644 index 000000000..d0b573598 --- /dev/null +++ b/gfx/debug/bg.pal @@ -0,0 +1,43 @@ + ; white + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + ; red + RGB 31, 00, 00 + RGB 31, 00, 00 + RGB 31, 00, 00 + RGB 00, 00, 00 + + ; green + RGB 00, 31, 00 + RGB 00, 31, 00 + RGB 00, 31, 00 + RGB 00, 00, 00 + + ; blue + RGB 00, 00, 31 + RGB 00, 00, 31 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 diff --git a/gfx/debug/ob.pal b/gfx/debug/ob.pal new file mode 100644 index 000000000..2a03f4e8f --- /dev/null +++ b/gfx/debug/ob.pal @@ -0,0 +1,42 @@ + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + ; red + RGB 31, 31, 31 + RGB 31, 00, 00 + RGB 31, 00, 00 + RGB 00, 00, 00 + + ; green + RGB 31, 31, 31 + RGB 00, 31, 00 + RGB 00, 31, 00 + RGB 00, 00, 00 + + ; blue + RGB 31, 31, 31 + RGB 00, 00, 31 + RGB 00, 00, 31 + RGB 00, 00, 00 diff --git a/gfx/diploma/diploma.pal b/gfx/diploma/diploma.pal new file mode 100644 index 000000000..2c9ec6453 --- /dev/null +++ b/gfx/diploma/diploma.pal @@ -0,0 +1,39 @@ + RGB 27, 31, 27 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 07, 06 + RGB 20, 02, 03 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 10, 31, 09 + RGB 04, 14, 01 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 08, 12, 31 + RGB 01, 04, 31 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 31, 07 + RGB 31, 16, 01 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 22, 16, 08 + RGB 13, 07, 01 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 15, 31, 31 + RGB 05, 17, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 11, 11, 19 + RGB 07, 07, 12 + RGB 00, 00, 00 diff --git a/gfx/font/bg_text.pal b/gfx/font/bg_text.pal new file mode 100644 index 000000000..39a4a194c --- /dev/null +++ b/gfx/font/bg_text.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 08, 19, 28 + RGB 05, 05, 16 + RGB 00, 00, 00 diff --git a/gfx/icon/bat.png b/gfx/icon/bat.png deleted file mode 100644 index 3ea2ea832..000000000 Binary files a/gfx/icon/bat.png and /dev/null differ diff --git a/gfx/icon/bigmon.png b/gfx/icon/bigmon.png deleted file mode 100644 index 4a77f1ece..000000000 Binary files a/gfx/icon/bigmon.png and /dev/null differ diff --git a/gfx/icon/bird.png b/gfx/icon/bird.png deleted file mode 100644 index e13bc6cba..000000000 Binary files a/gfx/icon/bird.png and /dev/null differ diff --git a/gfx/icon/blob.png b/gfx/icon/blob.png deleted file mode 100644 index aef74ae64..000000000 Binary files a/gfx/icon/blob.png and /dev/null differ diff --git a/gfx/icon/bug.png b/gfx/icon/bug.png deleted file mode 100644 index 97504f721..000000000 Binary files a/gfx/icon/bug.png and /dev/null differ diff --git a/gfx/icon/bulbasaur.png b/gfx/icon/bulbasaur.png deleted file mode 100644 index 1de6636f8..000000000 Binary files a/gfx/icon/bulbasaur.png and /dev/null differ diff --git a/gfx/icon/caterpillar.png b/gfx/icon/caterpillar.png deleted file mode 100644 index 85558104b..000000000 Binary files a/gfx/icon/caterpillar.png and /dev/null differ diff --git a/gfx/icon/charmander.png b/gfx/icon/charmander.png deleted file mode 100644 index 3d85f1316..000000000 Binary files a/gfx/icon/charmander.png and /dev/null differ diff --git a/gfx/icon/clefairy.png b/gfx/icon/clefairy.png deleted file mode 100644 index 0017d9ddb..000000000 Binary files a/gfx/icon/clefairy.png and /dev/null differ diff --git a/gfx/icon/diglett.png b/gfx/icon/diglett.png deleted file mode 100644 index 307181f71..000000000 Binary files a/gfx/icon/diglett.png and /dev/null differ diff --git a/gfx/icon/egg.png b/gfx/icon/egg.png deleted file mode 100644 index 129346fd9..000000000 Binary files a/gfx/icon/egg.png and /dev/null differ diff --git a/gfx/icon/equine.png b/gfx/icon/equine.png deleted file mode 100644 index b3da7181b..000000000 Binary files a/gfx/icon/equine.png and /dev/null differ diff --git a/gfx/icon/fighter.png b/gfx/icon/fighter.png deleted file mode 100644 index 9deab976f..000000000 Binary files a/gfx/icon/fighter.png and /dev/null differ diff --git a/gfx/icon/fish.png b/gfx/icon/fish.png deleted file mode 100644 index 35dbb1d2f..000000000 Binary files a/gfx/icon/fish.png and /dev/null differ diff --git a/gfx/icon/fox.png b/gfx/icon/fox.png deleted file mode 100644 index 0419c87c7..000000000 Binary files a/gfx/icon/fox.png and /dev/null differ diff --git a/gfx/icon/geodude.png b/gfx/icon/geodude.png deleted file mode 100644 index 02db8771d..000000000 Binary files a/gfx/icon/geodude.png and /dev/null differ diff --git a/gfx/icon/ghost.png b/gfx/icon/ghost.png deleted file mode 100644 index 7ecf8ed0f..000000000 Binary files a/gfx/icon/ghost.png and /dev/null differ diff --git a/gfx/icon/gyarados.png b/gfx/icon/gyarados.png deleted file mode 100644 index fad5d8ae3..000000000 Binary files a/gfx/icon/gyarados.png and /dev/null differ diff --git a/gfx/icon/ho_oh.png b/gfx/icon/ho_oh.png deleted file mode 100644 index 6ee91781e..000000000 Binary files a/gfx/icon/ho_oh.png and /dev/null differ diff --git a/gfx/icon/humanshape.png b/gfx/icon/humanshape.png deleted file mode 100644 index f5d0b9290..000000000 Binary files a/gfx/icon/humanshape.png and /dev/null differ diff --git a/gfx/icon/item.png b/gfx/icon/item.png deleted file mode 100644 index a47d55009..000000000 Binary files a/gfx/icon/item.png and /dev/null differ diff --git a/gfx/icon/jellyfish.png b/gfx/icon/jellyfish.png deleted file mode 100644 index 8583d5cdc..000000000 Binary files a/gfx/icon/jellyfish.png and /dev/null differ diff --git a/gfx/icon/jigglypuff.png b/gfx/icon/jigglypuff.png deleted file mode 100644 index 70f87b0df..000000000 Binary files a/gfx/icon/jigglypuff.png and /dev/null differ diff --git a/gfx/icon/lapras.png b/gfx/icon/lapras.png deleted file mode 100644 index 89ad063d0..000000000 Binary files a/gfx/icon/lapras.png and /dev/null differ diff --git a/gfx/icon/lugia.png b/gfx/icon/lugia.png deleted file mode 100644 index 56dbf283b..000000000 Binary files a/gfx/icon/lugia.png and /dev/null differ diff --git a/gfx/icon/mail.png b/gfx/icon/mail.png deleted file mode 100644 index 53db461e5..000000000 Binary files a/gfx/icon/mail.png and /dev/null differ diff --git a/gfx/icon/mail2.png b/gfx/icon/mail2.png deleted file mode 100644 index 7ad25edbf..000000000 Binary files a/gfx/icon/mail2.png and /dev/null differ diff --git a/gfx/icon/monster.png b/gfx/icon/monster.png deleted file mode 100644 index f97c67b64..000000000 Binary files a/gfx/icon/monster.png and /dev/null differ diff --git a/gfx/icon/moth.png b/gfx/icon/moth.png deleted file mode 100644 index f44440f5c..000000000 Binary files a/gfx/icon/moth.png and /dev/null differ diff --git a/gfx/icon/oddish.png b/gfx/icon/oddish.png deleted file mode 100644 index c069bd444..000000000 Binary files a/gfx/icon/oddish.png and /dev/null differ diff --git a/gfx/icon/pikachu.png b/gfx/icon/pikachu.png deleted file mode 100644 index 7b7d23dbd..000000000 Binary files a/gfx/icon/pikachu.png and /dev/null differ diff --git a/gfx/icon/poliwag.png b/gfx/icon/poliwag.png deleted file mode 100644 index b6b63a81e..000000000 Binary files a/gfx/icon/poliwag.png and /dev/null differ diff --git a/gfx/icon/serpent.png b/gfx/icon/serpent.png deleted file mode 100644 index de575f088..000000000 Binary files a/gfx/icon/serpent.png and /dev/null differ diff --git a/gfx/icon/shell.png b/gfx/icon/shell.png deleted file mode 100644 index 4daf27634..000000000 Binary files a/gfx/icon/shell.png and /dev/null differ diff --git a/gfx/icon/slowpoke.png b/gfx/icon/slowpoke.png deleted file mode 100644 index 221f3f7a5..000000000 Binary files a/gfx/icon/slowpoke.png and /dev/null differ diff --git a/gfx/icon/snorlax.png b/gfx/icon/snorlax.png deleted file mode 100644 index f2c1b0b74..000000000 Binary files a/gfx/icon/snorlax.png and /dev/null differ diff --git a/gfx/icon/squirtle.png b/gfx/icon/squirtle.png deleted file mode 100644 index 614aa21b2..000000000 Binary files a/gfx/icon/squirtle.png and /dev/null differ diff --git a/gfx/icon/staryu.png b/gfx/icon/staryu.png deleted file mode 100644 index 52361c780..000000000 Binary files a/gfx/icon/staryu.png and /dev/null differ diff --git a/gfx/icon/sudowoodo.png b/gfx/icon/sudowoodo.png deleted file mode 100644 index d115356bb..000000000 Binary files a/gfx/icon/sudowoodo.png and /dev/null differ diff --git a/gfx/icon/unown.png b/gfx/icon/unown.png deleted file mode 100644 index 0a4d0e426..000000000 Binary files a/gfx/icon/unown.png and /dev/null differ diff --git a/gfx/icon/voltorb.png b/gfx/icon/voltorb.png deleted file mode 100644 index ef289541a..000000000 Binary files a/gfx/icon/voltorb.png and /dev/null differ diff --git a/gfx/icons.asm b/gfx/icons.asm index 5b28a99cd..0733c26f6 100644 --- a/gfx/icons.asm +++ b/gfx/icons.asm @@ -1,40 +1,40 @@ Icons: NullIcon: -PoliwagIcon: INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d -JigglypuffIcon: INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d -DiglettIcon: INCBIN "gfx/icon/diglett.2bpp" ; 0x8ed0d -PikachuIcon: INCBIN "gfx/icon/pikachu.2bpp" ; 0x8ed8d -StaryuIcon: INCBIN "gfx/icon/staryu.2bpp" ; 0x8ee0d -FishIcon: INCBIN "gfx/icon/fish.2bpp" ; 0x8ee8d -BirdIcon: INCBIN "gfx/icon/bird.2bpp" ; 0x8ef0d -MonsterIcon: INCBIN "gfx/icon/monster.2bpp" ; 0x8ef8d -ClefairyIcon: INCBIN "gfx/icon/clefairy.2bpp" ; 0x8f00d -OddishIcon: INCBIN "gfx/icon/oddish.2bpp" ; 0x8f08d -BugIcon: INCBIN "gfx/icon/bug.2bpp" ; 0x8f10d -GhostIcon: INCBIN "gfx/icon/ghost.2bpp" ; 0x8f18d -LaprasIcon: INCBIN "gfx/icon/lapras.2bpp" ; 0x8f20d -HumanshapeIcon: INCBIN "gfx/icon/humanshape.2bpp" ; 0x8f28d -FoxIcon: INCBIN "gfx/icon/fox.2bpp" ; 0x8f30d -EquineIcon: INCBIN "gfx/icon/equine.2bpp" ; 0x8f38d -ShellIcon: INCBIN "gfx/icon/shell.2bpp" ; 0x8f40d -BlobIcon: INCBIN "gfx/icon/blob.2bpp" ; 0x8f48d -SerpentIcon: INCBIN "gfx/icon/serpent.2bpp" ; 0x8f50d -VoltorbIcon: INCBIN "gfx/icon/voltorb.2bpp" ; 0x8f58d -SquirtleIcon: INCBIN "gfx/icon/squirtle.2bpp" ; 0x8f60d -BulbasaurIcon: INCBIN "gfx/icon/bulbasaur.2bpp" ; 0x8f68d -CharmanderIcon: INCBIN "gfx/icon/charmander.2bpp" ; 0x8f70d -CaterpillarIcon: INCBIN "gfx/icon/caterpillar.2bpp" ; 0x8f78d -UnownIcon: INCBIN "gfx/icon/unown.2bpp" ; 0x8f80d -GeodudeIcon: INCBIN "gfx/icon/geodude.2bpp" ; 0x8f88d -FighterIcon: INCBIN "gfx/icon/fighter.2bpp" ; 0x8f90d -EggIcon: INCBIN "gfx/icon/egg.2bpp" ; 0x8f98d -JellyfishIcon: INCBIN "gfx/icon/jellyfish.2bpp" ; 0x8fa0d -MothIcon: INCBIN "gfx/icon/moth.2bpp" ; 0x8fa8d -BatIcon: INCBIN "gfx/icon/bat.2bpp" ; 0x8fb0d -SnorlaxIcon: INCBIN "gfx/icon/snorlax.2bpp" ; 0x8fb8d -HoOhIcon: INCBIN "gfx/icon/ho_oh.2bpp" ; 0x8fc0d -LugiaIcon: INCBIN "gfx/icon/lugia.2bpp" ; 0x8fc8d -GyaradosIcon: INCBIN "gfx/icon/gyarados.2bpp" ; 0x8fd0d -SlowpokeIcon: INCBIN "gfx/icon/slowpoke.2bpp" ; 0x8fd8d -SudowoodoIcon: INCBIN "gfx/icon/sudowoodo.2bpp" ; 0x8fe0d -BigmonIcon: INCBIN "gfx/icon/bigmon.2bpp" ; 0x8fe8d +PoliwagIcon: INCBIN "gfx/icons/poliwag.2bpp" ; 0x8ec0d +JigglypuffIcon: INCBIN "gfx/icons/jigglypuff.2bpp" ; 0x8ec8d +DiglettIcon: INCBIN "gfx/icons/diglett.2bpp" ; 0x8ed0d +PikachuIcon: INCBIN "gfx/icons/pikachu.2bpp" ; 0x8ed8d +StaryuIcon: INCBIN "gfx/icons/staryu.2bpp" ; 0x8ee0d +FishIcon: INCBIN "gfx/icons/fish.2bpp" ; 0x8ee8d +BirdIcon: INCBIN "gfx/icons/bird.2bpp" ; 0x8ef0d +MonsterIcon: INCBIN "gfx/icons/monster.2bpp" ; 0x8ef8d +ClefairyIcon: INCBIN "gfx/icons/clefairy.2bpp" ; 0x8f00d +OddishIcon: INCBIN "gfx/icons/oddish.2bpp" ; 0x8f08d +BugIcon: INCBIN "gfx/icons/bug.2bpp" ; 0x8f10d +GhostIcon: INCBIN "gfx/icons/ghost.2bpp" ; 0x8f18d +LaprasIcon: INCBIN "gfx/icons/lapras.2bpp" ; 0x8f20d +HumanshapeIcon: INCBIN "gfx/icons/humanshape.2bpp" ; 0x8f28d +FoxIcon: INCBIN "gfx/icons/fox.2bpp" ; 0x8f30d +EquineIcon: INCBIN "gfx/icons/equine.2bpp" ; 0x8f38d +ShellIcon: INCBIN "gfx/icons/shell.2bpp" ; 0x8f40d +BlobIcon: INCBIN "gfx/icons/blob.2bpp" ; 0x8f48d +SerpentIcon: INCBIN "gfx/icons/serpent.2bpp" ; 0x8f50d +VoltorbIcon: INCBIN "gfx/icons/voltorb.2bpp" ; 0x8f58d +SquirtleIcon: INCBIN "gfx/icons/squirtle.2bpp" ; 0x8f60d +BulbasaurIcon: INCBIN "gfx/icons/bulbasaur.2bpp" ; 0x8f68d +CharmanderIcon: INCBIN "gfx/icons/charmander.2bpp" ; 0x8f70d +CaterpillarIcon: INCBIN "gfx/icons/caterpillar.2bpp" ; 0x8f78d +UnownIcon: INCBIN "gfx/icons/unown.2bpp" ; 0x8f80d +GeodudeIcon: INCBIN "gfx/icons/geodude.2bpp" ; 0x8f88d +FighterIcon: INCBIN "gfx/icons/fighter.2bpp" ; 0x8f90d +EggIcon: INCBIN "gfx/icons/egg.2bpp" ; 0x8f98d +JellyfishIcon: INCBIN "gfx/icons/jellyfish.2bpp" ; 0x8fa0d +MothIcon: INCBIN "gfx/icons/moth.2bpp" ; 0x8fa8d +BatIcon: INCBIN "gfx/icons/bat.2bpp" ; 0x8fb0d +SnorlaxIcon: INCBIN "gfx/icons/snorlax.2bpp" ; 0x8fb8d +HoOhIcon: INCBIN "gfx/icons/ho_oh.2bpp" ; 0x8fc0d +LugiaIcon: INCBIN "gfx/icons/lugia.2bpp" ; 0x8fc8d +GyaradosIcon: INCBIN "gfx/icons/gyarados.2bpp" ; 0x8fd0d +SlowpokeIcon: INCBIN "gfx/icons/slowpoke.2bpp" ; 0x8fd8d +SudowoodoIcon: INCBIN "gfx/icons/sudowoodo.2bpp" ; 0x8fe0d +BigmonIcon: INCBIN "gfx/icons/bigmon.2bpp" ; 0x8fe8d diff --git a/gfx/icons/bat.png b/gfx/icons/bat.png new file mode 100644 index 000000000..3ea2ea832 Binary files /dev/null and b/gfx/icons/bat.png differ diff --git a/gfx/icons/bigmon.png b/gfx/icons/bigmon.png new file mode 100644 index 000000000..4a77f1ece Binary files /dev/null and b/gfx/icons/bigmon.png differ diff --git a/gfx/icons/bird.png b/gfx/icons/bird.png new file mode 100644 index 000000000..e13bc6cba Binary files /dev/null and b/gfx/icons/bird.png differ diff --git a/gfx/icons/blob.png b/gfx/icons/blob.png new file mode 100644 index 000000000..aef74ae64 Binary files /dev/null and b/gfx/icons/blob.png differ diff --git a/gfx/icons/bug.png b/gfx/icons/bug.png new file mode 100644 index 000000000..97504f721 Binary files /dev/null and b/gfx/icons/bug.png differ diff --git a/gfx/icons/bulbasaur.png b/gfx/icons/bulbasaur.png new file mode 100644 index 000000000..1de6636f8 Binary files /dev/null and b/gfx/icons/bulbasaur.png differ diff --git a/gfx/icons/caterpillar.png b/gfx/icons/caterpillar.png new file mode 100644 index 000000000..85558104b Binary files /dev/null and b/gfx/icons/caterpillar.png differ diff --git a/gfx/icons/charmander.png b/gfx/icons/charmander.png new file mode 100644 index 000000000..3d85f1316 Binary files /dev/null and b/gfx/icons/charmander.png differ diff --git a/gfx/icons/clefairy.png b/gfx/icons/clefairy.png new file mode 100644 index 000000000..0017d9ddb Binary files /dev/null and b/gfx/icons/clefairy.png differ diff --git a/gfx/icons/diglett.png b/gfx/icons/diglett.png new file mode 100644 index 000000000..307181f71 Binary files /dev/null and b/gfx/icons/diglett.png differ diff --git a/gfx/icons/egg.png b/gfx/icons/egg.png new file mode 100644 index 000000000..129346fd9 Binary files /dev/null and b/gfx/icons/egg.png differ diff --git a/gfx/icons/equine.png b/gfx/icons/equine.png new file mode 100644 index 000000000..b3da7181b Binary files /dev/null and b/gfx/icons/equine.png differ diff --git a/gfx/icons/fighter.png b/gfx/icons/fighter.png new file mode 100644 index 000000000..9deab976f Binary files /dev/null and b/gfx/icons/fighter.png differ diff --git a/gfx/icons/fish.png b/gfx/icons/fish.png new file mode 100644 index 000000000..35dbb1d2f Binary files /dev/null and b/gfx/icons/fish.png differ diff --git a/gfx/icons/fox.png b/gfx/icons/fox.png new file mode 100644 index 000000000..0419c87c7 Binary files /dev/null and b/gfx/icons/fox.png differ diff --git a/gfx/icons/geodude.png b/gfx/icons/geodude.png new file mode 100644 index 000000000..02db8771d Binary files /dev/null and b/gfx/icons/geodude.png differ diff --git a/gfx/icons/ghost.png b/gfx/icons/ghost.png new file mode 100644 index 000000000..7ecf8ed0f Binary files /dev/null and b/gfx/icons/ghost.png differ diff --git a/gfx/icons/gyarados.png b/gfx/icons/gyarados.png new file mode 100644 index 000000000..fad5d8ae3 Binary files /dev/null and b/gfx/icons/gyarados.png differ diff --git a/gfx/icons/ho_oh.png b/gfx/icons/ho_oh.png new file mode 100644 index 000000000..6ee91781e Binary files /dev/null and b/gfx/icons/ho_oh.png differ diff --git a/gfx/icons/humanshape.png b/gfx/icons/humanshape.png new file mode 100644 index 000000000..f5d0b9290 Binary files /dev/null and b/gfx/icons/humanshape.png differ diff --git a/gfx/icons/item.png b/gfx/icons/item.png new file mode 100644 index 000000000..a47d55009 Binary files /dev/null and b/gfx/icons/item.png differ diff --git a/gfx/icons/jellyfish.png b/gfx/icons/jellyfish.png new file mode 100644 index 000000000..8583d5cdc Binary files /dev/null and b/gfx/icons/jellyfish.png differ diff --git a/gfx/icons/jigglypuff.png b/gfx/icons/jigglypuff.png new file mode 100644 index 000000000..70f87b0df Binary files /dev/null and b/gfx/icons/jigglypuff.png differ diff --git a/gfx/icons/lapras.png b/gfx/icons/lapras.png new file mode 100644 index 000000000..89ad063d0 Binary files /dev/null and b/gfx/icons/lapras.png differ diff --git a/gfx/icons/lugia.png b/gfx/icons/lugia.png new file mode 100644 index 000000000..56dbf283b Binary files /dev/null and b/gfx/icons/lugia.png differ diff --git a/gfx/icons/mail.png b/gfx/icons/mail.png new file mode 100644 index 000000000..53db461e5 Binary files /dev/null and b/gfx/icons/mail.png differ diff --git a/gfx/icons/mail2.png b/gfx/icons/mail2.png new file mode 100644 index 000000000..7ad25edbf Binary files /dev/null and b/gfx/icons/mail2.png differ diff --git a/gfx/icons/monster.png b/gfx/icons/monster.png new file mode 100644 index 000000000..f97c67b64 Binary files /dev/null and b/gfx/icons/monster.png differ diff --git a/gfx/icons/moth.png b/gfx/icons/moth.png new file mode 100644 index 000000000..f44440f5c Binary files /dev/null and b/gfx/icons/moth.png differ diff --git a/gfx/icons/oddish.png b/gfx/icons/oddish.png new file mode 100644 index 000000000..c069bd444 Binary files /dev/null and b/gfx/icons/oddish.png differ diff --git a/gfx/icons/party_menu.pal b/gfx/icons/party_menu.pal new file mode 100644 index 000000000..70af517be --- /dev/null +++ b/gfx/icons/party_menu.pal @@ -0,0 +1,69 @@ + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 10, 14, 20 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 07, 07, 07 + + RGB 31, 31, 31 + RGB 31, 31, 07 + RGB 31, 16, 01 + RGB 07, 07, 07 + + RGB 31, 31, 31 + RGB 31, 19, 24 + RGB 30, 10, 06 + RGB 07, 07, 07 + + RGB 31, 31, 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 31, 31, 31 + RGB 24, 18, 07 + RGB 20, 15, 03 + RGB 07, 07, 07 diff --git a/gfx/icons/pikachu.png b/gfx/icons/pikachu.png new file mode 100644 index 000000000..7b7d23dbd Binary files /dev/null and b/gfx/icons/pikachu.png differ diff --git a/gfx/icons/poliwag.png b/gfx/icons/poliwag.png new file mode 100644 index 000000000..b6b63a81e Binary files /dev/null and b/gfx/icons/poliwag.png differ diff --git a/gfx/icons/serpent.png b/gfx/icons/serpent.png new file mode 100644 index 000000000..de575f088 Binary files /dev/null and b/gfx/icons/serpent.png differ diff --git a/gfx/icons/shell.png b/gfx/icons/shell.png new file mode 100644 index 000000000..4daf27634 Binary files /dev/null and b/gfx/icons/shell.png differ diff --git a/gfx/icons/slowpoke.png b/gfx/icons/slowpoke.png new file mode 100644 index 000000000..221f3f7a5 Binary files /dev/null and b/gfx/icons/slowpoke.png differ diff --git a/gfx/icons/snorlax.png b/gfx/icons/snorlax.png new file mode 100644 index 000000000..f2c1b0b74 Binary files /dev/null and b/gfx/icons/snorlax.png differ diff --git a/gfx/icons/squirtle.png b/gfx/icons/squirtle.png new file mode 100644 index 000000000..614aa21b2 Binary files /dev/null and b/gfx/icons/squirtle.png differ diff --git a/gfx/icons/staryu.png b/gfx/icons/staryu.png new file mode 100644 index 000000000..52361c780 Binary files /dev/null and b/gfx/icons/staryu.png differ diff --git a/gfx/icons/sudowoodo.png b/gfx/icons/sudowoodo.png new file mode 100644 index 000000000..d115356bb Binary files /dev/null and b/gfx/icons/sudowoodo.png differ diff --git a/gfx/icons/unown.png b/gfx/icons/unown.png new file mode 100644 index 000000000..0a4d0e426 Binary files /dev/null and b/gfx/icons/unown.png differ diff --git a/gfx/icons/voltorb.png b/gfx/icons/voltorb.png new file mode 100644 index 000000000..ef289541a Binary files /dev/null and b/gfx/icons/voltorb.png differ diff --git a/gfx/intro/fade.pal b/gfx/intro/fade.pal new file mode 100644 index 000000000..8e03cbc43 --- /dev/null +++ b/gfx/intro/fade.pal @@ -0,0 +1,41 @@ +; Fade to white. + + RGB 24, 12, 09 + RGB 31, 31, 31 + RGB 12, 00, 31 + RGB 00, 00, 00 + + RGB 31, 19, 05 + RGB 31, 31, 31 + RGB 15, 05, 31 + RGB 07, 07, 07 + + RGB 31, 21, 09 + RGB 31, 31, 31 + RGB 18, 09, 31 + RGB 11, 11, 11 + + RGB 31, 23, 13 + RGB 31, 31, 31 + RGB 21, 13, 31 + RGB 15, 15, 15 + + RGB 31, 25, 17 + RGB 31, 31, 31 + RGB 25, 17, 31 + RGB 19, 19, 19 + + RGB 31, 27, 21 + RGB 31, 31, 31 + RGB 27, 21, 31 + RGB 23, 23, 23 + + RGB 31, 29, 25 + RGB 31, 31, 31 + RGB 29, 26, 31 + RGB 27, 27, 27 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 diff --git a/gfx/intro/gamefreak_logo.pal b/gfx/intro/gamefreak_logo.pal new file mode 100644 index 000000000..c3a526b82 --- /dev/null +++ b/gfx/intro/gamefreak_logo.pal @@ -0,0 +1,23 @@ +; Ditto's color as it turns into the Game Freak logo. +; Fade from pink to orange. +; One color per step. + + RGB 23, 12, 28 + RGB 23, 12, 27 + RGB 23, 13, 26 + RGB 23, 13, 24 + + RGB 24, 14, 22 + RGB 24, 14, 20 + RGB 24, 15, 18 + RGB 24, 15, 16 + + RGB 25, 16, 14 + RGB 25, 16, 12 + RGB 25, 17, 10 + RGB 25, 17, 08 + + RGB 26, 18, 06 + RGB 26, 18, 04 + RGB 26, 19, 02 + RGB 26, 19, 00 diff --git a/gfx/intro/intro_1.pal b/gfx/intro/intro_1.pal new file mode 100644 index 000000000..ae0faadac --- /dev/null +++ b/gfx/intro/intro_1.pal @@ -0,0 +1,79 @@ + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 0, 4, 5 + RGB 1, 8, 5 + RGB 4, 12, 9 + RGB 24, 12, 9 + + RGB 0, 4, 5 + RGB 9, 6, 8 + RGB 8, 16, 5 + RGB 5, 10, 4 + + RGB 31, 31, 31 + RGB 9, 6, 8 + RGB 18, 9, 9 + RGB 13, 8, 9 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 2, 5, 22 + RGB 1, 5, 12 + + RGB 31, 31, 31 + RGB 31, 10, 25 + RGB 31, 21, 0 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 21, 31 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 diff --git a/gfx/intro/intro_2.pal b/gfx/intro/intro_2.pal new file mode 100644 index 000000000..5f83df020 --- /dev/null +++ b/gfx/intro/intro_2.pal @@ -0,0 +1,79 @@ + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 10, 0, 10 + RGB 19, 0, 19 + RGB 31, 0, 31 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 diff --git a/gfx/intro/intro_3.pal b/gfx/intro/intro_3.pal new file mode 100644 index 000000000..95f3e052a --- /dev/null +++ b/gfx/intro/intro_3.pal @@ -0,0 +1,79 @@ + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 diff --git a/gfx/intro/intro_4.pal b/gfx/intro/intro_4.pal new file mode 100644 index 000000000..fdcf058de --- /dev/null +++ b/gfx/intro/intro_4.pal @@ -0,0 +1,79 @@ + RGB 24, 12, 9 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 24, 12, 9 + RGB 31, 31, 31 + RGB 8, 9, 31 + RGB 0, 0, 0 + + RGB 24, 12, 9 + RGB 12, 20, 31 + RGB 19, 8, 31 + RGB 0, 0, 0 + + RGB 12, 20, 31 + RGB 8, 9, 31 + RGB 19, 8, 31 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 12, 20, 31 + RGB 8, 9, 31 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 diff --git a/gfx/intro/intro_5.pal b/gfx/intro/intro_5.pal new file mode 100644 index 000000000..5b1be1a5f --- /dev/null +++ b/gfx/intro/intro_5.pal @@ -0,0 +1,79 @@ + RGB 24, 12, 9 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 24, 12, 9 + RGB 31, 31, 31 + RGB 8, 9, 31 + RGB 0, 0, 0 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 12, 0, 31 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 21, 9, 0 + RGB 21, 9, 0 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 diff --git a/gfx/mail/mail.pal b/gfx/mail/mail.pal new file mode 100644 index 000000000..4096ffae1 --- /dev/null +++ b/gfx/mail/mail.pal @@ -0,0 +1,49 @@ + RGB 20, 31, 11 + RGB 31, 19, 00 + RGB 31, 10, 09 + RGB 00, 00, 00 + + RGB 15, 20, 31 + RGB 30, 26, 00 + RGB 31, 12, 00 + RGB 00, 00, 00 + + RGB 24, 17, 31 + RGB 30, 26, 00 + RGB 08, 11, 31 + RGB 00, 00, 00 + + RGB 31, 25, 17 + RGB 31, 18, 04 + RGB 28, 12, 05 + RGB 00, 00, 00 + + RGB 19, 26, 31 + RGB 31, 05, 08 + RGB 31, 09, 31 + RGB 00, 00, 00 + + RGB 31, 19, 28 + RGB 31, 21, 00 + RGB 12, 22, 00 + RGB 00, 00, 00 + + RGB 19, 17, 23 + RGB 30, 26, 00 + RGB 31, 12, 00 + RGB 00, 00, 00 + + RGB 07, 26, 31 + RGB 26, 26, 27 + RGB 31, 11, 11 + RGB 00, 00, 00 + + RGB 21, 31, 21 + RGB 30, 26, 00 + RGB 31, 12, 00 + RGB 00, 00, 00 + + RGB 07, 26, 31 + RGB 31, 31, 00 + RGB 00, 21, 00 + RGB 00, 00, 00 diff --git a/gfx/mystery_gift/mg_mobile.pal b/gfx/mystery_gift/mg_mobile.pal new file mode 100644 index 000000000..c77e8c63f --- /dev/null +++ b/gfx/mystery_gift/mg_mobile.pal @@ -0,0 +1,24 @@ + RGB 03, 07, 09 + RGB 26, 31, 00 + RGB 20, 16, 03 + RGB 31, 31, 31 + + RGB 13, 24, 29 + RGB 11, 16, 30 + RGB 07, 11, 22 + RGB 05, 06, 18 + + RGB 31, 31, 31 + RGB 20, 26, 31 + RGB 13, 24, 29 + RGB 11, 16, 30 + + RGB 31, 31, 31 + RGB 20, 26, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 20, 16, 08 + RGB 31, 00, 00 + RGB 00, 00, 00 diff --git a/gfx/pack/pack.pal b/gfx/pack/pack.pal new file mode 100644 index 000000000..e8b4979bb --- /dev/null +++ b/gfx/pack/pack.pal @@ -0,0 +1,29 @@ + RGB 31, 31, 31 + RGB 15, 15, 31 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 15, 31 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 31, 11, 31 + RGB 15, 15, 31 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 15, 31 + RGB 00, 00, 31 + RGB 31, 00, 00 + + RGB 31, 31, 31 + RGB 15, 15, 31 + RGB 31, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 07, 19, 07 + RGB 07, 19, 07 + RGB 00, 00, 00 diff --git a/gfx/pack/pack_f.pal b/gfx/pack/pack_f.pal new file mode 100644 index 000000000..a962d97d1 --- /dev/null +++ b/gfx/pack/pack_f.pal @@ -0,0 +1,29 @@ + RGB 31, 31, 31 + RGB 31, 14, 31 + RGB 31, 07, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 14, 31 + RGB 31, 07, 31 + RGB 00, 00, 00 + + RGB 15, 15, 31 + RGB 31, 14, 31 + RGB 31, 07, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 14, 31 + RGB 31, 07, 31 + RGB 31, 00, 00 + + RGB 31, 31, 31 + RGB 31, 14, 31 + RGB 31, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 07, 19, 07 + RGB 07, 19, 07 + RGB 00, 00, 00 diff --git a/gfx/pokegear/pokegear.pal b/gfx/pokegear/pokegear.pal new file mode 100644 index 000000000..397986dec --- /dev/null +++ b/gfx/pokegear/pokegear.pal @@ -0,0 +1,29 @@ + RGB 28, 31, 20 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 15, 07, 00 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 31, 15, 00 + RGB 15, 07, 00 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 00, 00, 31 + RGB 31, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 15, 07, 00 + RGB 31, 00, 00 diff --git a/gfx/pokegear/pokegear_f.pal b/gfx/pokegear/pokegear_f.pal new file mode 100644 index 000000000..3f797c866 --- /dev/null +++ b/gfx/pokegear/pokegear_f.pal @@ -0,0 +1,29 @@ + RGB 28, 31, 20 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 15, 07, 00 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 10, 18, 31 + RGB 13, 06, 31 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 00, 00, 31 + RGB 31, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 15, 07, 00 + RGB 31, 00, 00 diff --git a/gfx/pokegear/town_map_palette_map.asm b/gfx/pokegear/town_map_palette_map.asm new file mode 100644 index 000000000..67ca7fbdd --- /dev/null +++ b/gfx/pokegear/town_map_palette_map.asm @@ -0,0 +1,30 @@ + const_def + const PAL_TOWNMAP_BORDER ; 0 + const PAL_TOWNMAP_EARTH ; 1 + const PAL_TOWNMAP_MOUNTAIN ; 2 + const PAL_TOWNMAP_CITY ; 3 + const PAL_TOWNMAP_POI ; 4 + const PAL_TOWNMAP_POI_MTN ; 5 + +townmappals: MACRO +rept _NARG / 2 + dn PAL_TOWNMAP_\2, PAL_TOWNMAP_\1 + shift + shift +endr +ENDM + +; gfx/pokegear/town_map.png + townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN, BORDER, BORDER + townmappals EARTH, EARTH, CITY, EARTH, POI, POI_MTN, POI, POI_MTN + townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN, BORDER, BORDER + townmappals EARTH, EARTH, BORDER, EARTH, EARTH, BORDER, BORDER, BORDER + townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN, BORDER, BORDER + townmappals BORDER, BORDER, BORDER, BORDER, BORDER, BORDER, BORDER, BORDER +; gfx/pokegear/pokegear.png + townmappals BORDER, BORDER, BORDER, BORDER, POI, POI, POI, BORDER + townmappals BORDER, BORDER, BORDER, BORDER, BORDER, BORDER, BORDER, BORDER + townmappals CITY, CITY, CITY, CITY, CITY, CITY, CITY, CITY + townmappals CITY, CITY, CITY, CITY, CITY, CITY, CITY, BORDER + townmappals CITY, CITY, CITY, CITY, CITY, CITY, CITY, CITY + townmappals BORDER, BORDER, BORDER, BORDER, BORDER, BORDER, BORDER, BORDER diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm new file mode 100644 index 000000000..38f68ad1d --- /dev/null +++ b/gfx/sgb/blk_packets.asm @@ -0,0 +1,40 @@ +BlkPacket_9a86: + db $21, $01, $03, $00, $00, $00, $13, $11, $00, $00, $00, $00, $00, $00, $00, $00 + +BlkPacket_9a96: + db $21, $01, $07, $05, $00, $0a, $13, $0d, $00, $00, $00, $00, $00, $00, $00, $00 + +BlkPacket_9aa6: + db $22, $05, $07, $0a, $00, $0c, $13, $11, $03, $05, $01, $00, $0a, $03, $03, $00 + db $0a, $08, $13, $0a, $03, $0a, $00, $04, $08, $0b, $03, $0f, $0b, $00, $13, $07 + +BlkPacket_9ac6: + db $21, $01, $07, $05, $00, $01, $07, $07, $00, $00, $00, $00, $00, $00, $00, $00 + +BlkPacket_9ad6: + db $21, $01, $07, $05, $0b, $01, $13, $02, $00, $00, $00, $00, $00, $00, $00, $00 + +BlkPacket_9ae6: + db $21, $01, $07, $05, $01, $01, $08, $08, $00, $00, $00, $00, $00, $00, $00, $00 + +BlkPacket_9af6: + db $21, $01, $07, $05, $07, $05, $0d, $0b, $00, $00, $00, $00, $00, $00, $00, $00 + +BlkPacket_9b06: + db $22, $05, $03, $05, $00, $00, $13, $0b, $03, $0a, $00, $04, $13, $09, $02, $0f + db $00, $06, $13, $07, $03, $00, $04, $04, $0f, $09, $03, $00, $00, $0c, $13, $11 + +BlkPacket_9b26: + db $23, $07, $07, $10, $00, $00, $02, $0c, $02, $00, $0c, $00, $12, $01, $02, $00 + db $0c, $02, $12, $03, $02, $00, $0c, $04, $12, $05, $02, $00, $0c, $06, $12, $07 + db $02, $00, $0c, $08, $12, $09, $02, $00, $0c, $0a, $12, $0b, $00, $00, $00, $00 + +BlkPacket_9b56: + db $22, $03, $07, $20, $00, $00, $13, $04, $03, $0f, $00, $06, $13, $11, $03, $05 + db $0f, $01, $12, $04, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +BlkPacket_9b76: + db $21, $01, $07, $10, $00, $00, $13, $05, $00, $00, $00, $00, $00, $00, $00, $00 + +BlkPacket_9b86: + db $21, $02, $07, $0a, $00, $04, $13, $0d, $03, $05, $00, $06, $13, $0b, $00, $00 diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm new file mode 100644 index 000000000..7ab27d359 --- /dev/null +++ b/gfx/sgb/pal_packets.asm @@ -0,0 +1,115 @@ +; indexes correspond to PredefPals palettes (see gfx/sgb/predef.pal) + +PalPacket_9b96: + db $51, $48, $00, $49, $00, $4a, $00, $4b, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9ba6: + db $51, $2b, $00, $24, $00, $20, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9bb6: + db $51, $41, $00, $42, $00, $43, $00, $44, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9bc6: + db $51, $4c, $00, $4c, $00, $4c, $00, $4c, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9bd6: + db $51, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9be6: + db $51, $36, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9bf6: + db $51, $37, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9c06: + db $51, $38, $00, $39, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9c16: + db $51, $3a, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9c26: + db $51, $3b, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9c36: + db $51, $3c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9c46: + db $51, $39, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9c56: + db $51, $2e, $00, $2f, $00, $30, $00, $31, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9c66: + db $51, $1a, $00, $1a, $00, $1a, $00, $1a, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9c76: + db $51, $32, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9c86: + db $51, $3c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9c96: + db $51, $3d, $00, $3e, $00, $3f, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9ca6: + db $51, $33, $00, $34, $00, $1b, $00, $1f, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9cb6: + db $51, $1b, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9cc6: + db $51, $1c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9cd6: + db $51, $35, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9ce6: + db $01, $ff, $7f, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9cf6: + db $09, $ff, $7f, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9d06: + db $59, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9d16: + db $89, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9d26: + db $89, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9d36: + db $99, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9d46: + db $a1, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9d56: + db $b9, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9d66: + db $b9, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9d76: + db $79, $5d, $08, $00, $0b, $8c, $d0, $f4, $60, $00, $00, $00, $00, $00, $00, $00 + +PalPacket_9d86: + db $79, $52, $08, $00, $0b, $a9, $e7, $9f, $01, $c0, $7e, $e8, $e8, $e8, $e8, $e0 + +PalPacket_9d96: + db $79, $47, $08, $00, $0b, $c4, $d0, $16, $a5, $cb, $c9, $05, $d0, $10, $a2, $28 + +PalPacket_9da6: + db $79, $3c, $08, $00, $0b, $f0, $12, $a5, $c9, $c9, $c8, $d0, $1c, $a5, $ca, $c9 + +PalPacket_9db6: + db $79, $31, $08, $00, $0b, $0c, $a5, $ca, $c9, $7e, $d0, $06, $a5, $cb, $c9, $7e + +PalPacket_9dc6: + db $79, $26, $08, $00, $0b, $39, $cd, $48, $0c, $d0, $34, $a5, $c9, $c9, $80, $d0 + +PalPacket_9dd6: + db $79, $1b, $08, $00, $0b, $ea, $ea, $ea, $ea, $ea, $a9, $01, $cd, $4f, $0c, $d0 + +PalPacket_9de6: + db $79, $10, $08, $00, $0b, $4c, $20, $08, $ea, $ea, $ea, $ea, $ea, $60, $ea, $ea diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal new file mode 100644 index 000000000..15d9000fb --- /dev/null +++ b/gfx/sgb/predef.pal @@ -0,0 +1,395 @@ +; $00 + RGB 31, 31, 31 + RGB 22, 25, 19 + RGB 16, 21, 30 + RGB 00, 00, 00 +; $01 + RGB 31, 31, 31 + RGB 27, 28, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $02 + RGB 31, 31, 31 + RGB 24, 28, 19 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $03 + RGB 31, 31, 31 + RGB 24, 24, 24 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $04 + RGB 31, 31, 31 + RGB 21, 23, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $05 + RGB 31, 31, 31 + RGB 24, 21, 27 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $06 + RGB 31, 31, 31 + RGB 31, 24, 16 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $07 + RGB 31, 31, 31 + RGB 25, 30, 26 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $08 + RGB 31, 31, 31 + RGB 31, 25, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $09 + RGB 31, 31, 31 + RGB 31, 20, 19 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $0a + RGB 31, 31, 31 + RGB 31, 26, 19 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $0b + RGB 31, 31, 31 + RGB 27, 28, 27 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $0c + RGB 31, 31, 31 + RGB 24, 30, 23 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $0d + RGB 31, 31, 31 + RGB 29, 24, 29 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $0e + RGB 31, 31, 31 + RGB 26, 23, 29 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $0f + RGB 31, 31, 31 + RGB 25, 23, 20 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $10 + RGB 31, 31, 31 + RGB 29, 26, 18 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $11 + RGB 31, 31, 31 + RGB 31, 21, 18 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $12 + RGB 31, 31, 31 + RGB 26, 25, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $13 + RGB 31, 31, 31 + RGB 22, 21, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $14 + RGB 31, 31, 31 + RGB 22, 25, 21 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $15 + RGB 31, 31, 31 + RGB 21, 21, 22 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $16 + RGB 31, 31, 31 + RGB 31, 20, 20 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $17 + RGB 31, 31, 31 + RGB 26, 26, 26 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $18 + RGB 31, 31, 31 + RGB 21, 14, 09 + RGB 15, 20, 20 + RGB 00, 00, 00 +; $19 + RGB 31, 31, 31 + RGB 12, 28, 22 + RGB 15, 20, 20 + RGB 00, 00, 00 +; $1a + RGB 31, 31, 31 + RGB 07, 07, 07 + RGB 02, 03, 03 + RGB 00, 00, 00 +; $1b + RGB 31, 31, 31 + RGB 30, 22, 17 + RGB 16, 14, 19 + RGB 00, 00, 00 +; $1c + RGB 31, 31, 31 + RGB 18, 20, 27 + RGB 11, 15, 23 + RGB 00, 00, 00 +; $1d + RGB 31, 31, 31 + RGB 31, 20, 10 + RGB 26, 10, 06 + RGB 00, 00, 00 +; $1e + RGB 31, 31, 31 + RGB 21, 25, 29 + RGB 14, 19, 25 + RGB 00, 00, 00 +; $1f + RGB 31, 31, 31 + RGB 27, 22, 24 + RGB 21, 15, 23 + RGB 00, 00, 00 +; $20 + RGB 31, 31, 31 + RGB 28, 20, 15 + RGB 21, 14, 09 + RGB 00, 00, 00 +; $21 + RGB 31, 31, 31 + RGB 20, 26, 16 + RGB 09, 20, 11 + RGB 00, 00, 00 +; $22 + RGB 31, 31, 31 + RGB 30, 22, 24 + RGB 28, 15, 21 + RGB 00, 00, 00 +; $23 + RGB 31, 31, 31 + RGB 31, 28, 14 + RGB 26, 20, 00 + RGB 00, 00, 00 +; $24 + RGB 31, 31, 31 + RGB 26, 21, 22 + RGB 15, 15, 18 + RGB 00, 00, 00 +; $25 + RGB 31, 31, 31 + RGB 23, 19, 13 + RGB 14, 12, 17 + RGB 00, 00, 00 +; $26 + RGB 31, 31, 31 + RGB 16, 18, 21 + RGB 10, 12, 18 + RGB 00, 00, 00 +; $27 + RGB 31, 31, 31 + RGB 22, 15, 16 + RGB 17, 02, 05 + RGB 00, 00, 00 +; $28 + RGB 31, 31, 31 + RGB 15, 20, 20 + RGB 05, 16, 16 + RGB 00, 00, 00 +; $29 + RGB 31, 31, 31 + RGB 23, 15, 19 + RGB 14, 04, 12 + RGB 00, 00, 00 +; $2a + RGB 31, 31, 31 + RGB 20, 17, 18 + RGB 18, 13, 11 + RGB 00, 00, 00 +; $2b + RGB 31, 31, 31 + RGB 23, 21, 16 + RGB 12, 12, 10 + RGB 00, 00, 00 +; $2c + RGB 31, 31, 31 + RGB 21, 25, 29 + RGB 30, 22, 24 + RGB 00, 00, 00 +; $2d + RGB 31, 31, 31 + RGB 26, 23, 16 + RGB 29, 14, 09 + RGB 00, 00, 00 +; $2e + RGB 31, 31, 31 + RGB 18, 18, 18 + RGB 10, 10, 10 + RGB 00, 00, 00 +; $2f + RGB 31, 31, 31 + RGB 30, 26, 15 + RGB 00, 23, 00 + RGB 00, 00, 00 +; $30 + RGB 31, 31, 31 + RGB 30, 26, 15 + RGB 31, 23, 00 + RGB 00, 00, 00 +; $31 + RGB 31, 31, 31 + RGB 30, 26, 15 + RGB 31, 00, 00 + RGB 00, 00, 00 +; $32 + RGB 31, 31, 31 + RGB 29, 26, 19 + RGB 27, 20, 14 + RGB 00, 00, 00 +; $33 + RGB 31, 31, 31 + RGB 24, 20, 10 + RGB 21, 00, 04 + RGB 00, 00, 00 +; $34 + RGB 31, 31, 31 + RGB 31, 20, 10 + RGB 21, 00, 04 + RGB 00, 00, 00 +; $35 + RGB 31, 31, 31 + RGB 30, 26, 16 + RGB 16, 12, 09 + RGB 00, 00, 00 +; $36 + RGB 31, 31, 31 + RGB 15, 28, 26 + RGB 12, 22, 26 + RGB 03, 16, 14 +; $37 + RGB 31, 31, 31 + RGB 15, 28, 26 + RGB 23, 24, 24 + RGB 00, 00, 00 +; $38 + RGB 31, 31, 24 + RGB 07, 27, 19 + RGB 26, 20, 10 + RGB 19, 12, 08 +; $39 + RGB 31, 31, 31 + RGB 31, 28, 14 + RGB 31, 13, 31 + RGB 00, 00, 00 +; $3a + RGB 31, 31, 31 + RGB 16, 18, 21 + RGB 10, 12, 18 + RGB 00, 00, 00 +; $3b + RGB 31, 31, 31 + RGB 23, 21, 16 + RGB 12, 12, 10 + RGB 00, 00, 00 +; $3c + RGB 31, 31, 31 + RGB 31, 14, 00 + RGB 07, 11, 15 + RGB 00, 00, 00 +; $3d + RGB 31, 31, 31 + RGB 26, 21, 22 + RGB 26, 10, 06 + RGB 00, 00, 00 +; $3e + RGB 31, 31, 31 + RGB 30, 27, 04 + RGB 24, 20, 11 + RGB 00, 00, 00 +; $3f + RGB 31, 31, 31 + RGB 31, 13, 25 + RGB 24, 20, 11 + RGB 00, 00, 00 +; $40 + RGB 31, 31, 31 + RGB 16, 19, 29 + RGB 24, 20, 11 + RGB 00, 00, 00 +; $41 + RGB 31, 31, 31 + RGB 30, 22, 24 + RGB 18, 18, 18 + RGB 16, 10, 07 +; $42 + RGB 31, 31, 31 + RGB 21, 25, 29 + RGB 18, 18, 18 + RGB 16, 10, 07 +; $43 + RGB 31, 31, 31 + RGB 20, 26, 16 + RGB 18, 18, 18 + RGB 16, 10, 07 +; $44 + RGB 31, 31, 31 + RGB 31, 28, 14 + RGB 18, 18, 18 + RGB 16, 10, 07 +; $45 + RGB 31, 31, 31 + RGB 18, 18, 18 + RGB 26, 10, 06 + RGB 00, 00, 00 +; $46 + RGB 31, 31, 31 + RGB 30, 22, 24 + RGB 28, 15, 21 + RGB 00, 00, 00 +; $47 + RGB 31, 31, 31 + RGB 26, 20, 00 + RGB 16, 19, 29 + RGB 00, 00, 00 +; $48 + RGB 31, 31, 31 + RGB 16, 02, 30 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $49 + RGB 31, 31, 31 + RGB 16, 13, 04 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $4a + RGB 31, 31, 31 + RGB 28, 04, 02 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $4b + RGB 31, 31, 31 + RGB 18, 23, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 +; $4c + RGB 31, 31, 31 + RGB 24, 20, 11 + RGB 18, 13, 11 + RGB 00, 00, 00 +; $4d + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 25, 30, 00 + RGB 25, 30, 00 +; $4e + RGB 00, 00, 00 + RGB 08, 11, 11 + RGB 21, 21, 21 + RGB 31, 31, 31 diff --git a/gfx/sgb/sgb_border.pal b/gfx/sgb/sgb_border.pal new file mode 100644 index 000000000..fd5aec402 --- /dev/null +++ b/gfx/sgb/sgb_border.pal @@ -0,0 +1,79 @@ + RGB 24, 06, 06 + RGB 24, 24, 26 + RGB 14, 15, 20 + RGB 04, 07, 10 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 24, 18 + RGB 31, 26, 15 + RGB 26, 19, 10 + RGB 12, 07, 05 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 06, 31 + RGB 31, 31, 29 + RGB 31, 12, 00 + RGB 00, 00, 00 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 12, 31, 06 + RGB 22, 26, 30 + RGB 16, 17, 21 + RGB 00, 03, 00 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 diff --git a/gfx/slots/slots.pal b/gfx/slots/slots.pal new file mode 100644 index 000000000..0eec479f2 --- /dev/null +++ b/gfx/slots/slots.pal @@ -0,0 +1,79 @@ + RGB 31, 31, 31 + RGB 24, 25, 28 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 10, 06 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 31, 00 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 15, 31 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 21, 31 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 11 + RGB 31, 31, 06 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 16, 19, 29 + RGB 25, 22, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 10, 06 + RGB 31, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 30, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 20, 15, 03 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 15, 21, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 20, 15, 03 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 24, 21 + RGB 31, 13, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 diff --git a/gfx/sprites/map_objects.pal b/gfx/sprites/map_objects.pal new file mode 100644 index 000000000..b0f33479a --- /dev/null +++ b/gfx/sprites/map_objects.pal @@ -0,0 +1,39 @@ +; 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/gfx/tilesets/battle_tower.pal b/gfx/tilesets/battle_tower.pal new file mode 100644 index 000000000..4e71a5575 --- /dev/null +++ b/gfx/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/gfx/tilesets/bg_tiles.pal b/gfx/tilesets/bg_tiles.pal new file mode 100644 index 000000000..e56746536 --- /dev/null +++ b/gfx/tilesets/bg_tiles.pal @@ -0,0 +1,61 @@ +; morn + RGB 28,31,16, 21,21,21, 13,13,13, 07,07,07 ; gray + RGB 28,31,16, 31,19,24, 30,10,06, 07,07,07 ; red + RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; green + RGB 31,31,31, 08,12,31, 01,04,31, 07,07,07 ; water + RGB 28,31,16, 31,31,07, 31,16,01, 07,07,07 ; yellow + RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; brown + RGB 28,31,16, 15,31,31, 05,17,31, 07,07,07 ; roof + RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text + +; day + RGB 27,31,27, 21,21,21, 13,13,13, 07,07,07 ; gray + RGB 27,31,27, 31,19,24, 30,10,06, 07,07,07 ; red + RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; green + RGB 31,31,31, 08,12,31, 01,04,31, 07,07,07 ; water + RGB 27,31,27, 31,31,07, 31,16,01, 07,07,07 ; yellow + RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; brown + RGB 27,31,27, 15,31,31, 05,17,31, 07,07,07 ; roof + RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text + +; nite + RGB 15,14,24, 11,11,19, 07,07,12, 00,00,00 ; gray + RGB 15,14,24, 14,07,17, 13,00,08, 00,00,00 ; red + RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; green + RGB 15,14,24, 05,05,17, 03,03,10, 00,00,00 ; water + RGB 30,30,11, 16,14,18, 16,14,10, 00,00,00 ; yellow + RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; brown + RGB 15,14,24, 13,12,23, 11,09,20, 00,00,00 ; roof + RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text + +; dark + RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; gray + RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; red + RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; green + RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; water + RGB 30,30,11, 00,00,00, 00,00,00, 00,00,00 ; yellow + RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; brown + RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; roof + RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text + +; indoor + RGB 30,28,26, 19,19,19, 13,13,13, 07,07,07 ; gray + RGB 30,28,26, 31,19,24, 30,10,06, 07,07,07 ; red + RGB 18,24,09, 15,20,01, 09,13,00, 07,07,07 ; green + RGB 30,28,26, 15,16,31, 09,09,31, 07,07,07 ; water + RGB 30,28,26, 31,31,07, 31,16,01, 07,07,07 ; yellow + RGB 26,24,17, 21,17,07, 16,13,03, 07,07,07 ; brown + RGB 30,28,26, 17,19,31, 14,16,31, 07,07,07 ; roof + RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text + +; 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 \ No newline at end of file diff --git a/gfx/tilesets/house_1.pal b/gfx/tilesets/house_1.pal new file mode 100644 index 000000000..a9f8b74b6 --- /dev/null +++ b/gfx/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/gfx/tilesets/ice_path.pal b/gfx/tilesets/ice_path.pal new file mode 100644 index 000000000..cb7659f50 --- /dev/null +++ b/gfx/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/gfx/tilesets/pokecom_center.pal b/gfx/tilesets/pokecom_center.pal new file mode 100644 index 000000000..9fe7b765a --- /dev/null +++ b/gfx/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/gfx/tilesets/radio_tower.pal b/gfx/tilesets/radio_tower.pal new file mode 100644 index 000000000..5799b6f77 --- /dev/null +++ b/gfx/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/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal new file mode 100644 index 000000000..ba65fc7d2 --- /dev/null +++ b/gfx/tilesets/roofs.pal @@ -0,0 +1,161 @@ +; 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 diff --git a/gfx/title/old_bg.pal b/gfx/title/old_bg.pal new file mode 100644 index 000000000..307eb76a1 --- /dev/null +++ b/gfx/title/old_bg.pal @@ -0,0 +1,56 @@ + RGB 00, 00, 00 + RGB 25, 15, 28 + RGB 22, 11, 28 + RGB 19, 08, 26 + + RGB 00, 00, 00 + RGB 17, 07, 22 + RGB 13, 07, 16 + RGB 19, 08, 26 + + RGB 25, 15, 28 + RGB 22, 11, 28 + RGB 19, 08, 26 + RGB 17, 07, 22 + + RGB 22, 11, 28 + RGB 19, 08, 26 + RGB 17, 07, 22 + RGB 13, 07, 16 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 12, 12, 12 + + RGB 00, 00, 00 + RGB 01, 11, 23 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 22, 10, 31 + RGB 19, 08, 26 + RGB 17, 07, 22 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 20, 04, 20 + RGB 16, 08, 16 + RGB 24, 00, 24 + +rept 54 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 +endr diff --git a/gfx/title/old_fg.pal b/gfx/title/old_fg.pal new file mode 100644 index 000000000..80e7d9896 --- /dev/null +++ b/gfx/title/old_fg.pal @@ -0,0 +1,319 @@ + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 12, 12, 12 + + RGB 00, 00, 00 + RGB 01, 11, 23 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 31, 22, 00 + RGB 31, 27, 00 + RGB 31, 31, 00 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 12, 12, 12 + + RGB 00, 00, 00 + RGB 01, 11, 23 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 16, 31, 00 + RGB 22, 31, 00 + RGB 27, 31, 00 + RGB 31, 31, 00 + + RGB 31, 00, 18 + RGB 31, 31, 31 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 12, 12, 12 + + RGB 00, 00, 00 + RGB 01, 11, 23 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 16, 31, 00 + RGB 22, 31, 00 + RGB 27, 31, 00 + RGB 31, 31, 00 + + RGB 24, 18, 31 + RGB 31, 31, 00 + RGB 31, 31, 01 + RGB 31, 31, 03 + + RGB 31, 31, 05 + RGB 31, 31, 08 + RGB 31, 31, 10 + RGB 31, 31, 12 + + RGB 31, 31, 14 + RGB 31, 31, 16 + RGB 31, 31, 18 + RGB 31, 31, 20 + + RGB 31, 31, 22 + RGB 31, 31, 25 + RGB 31, 31, 27 + RGB 31, 31, 29 + + RGB 24, 06, 06 + RGB 01, 01, 01 + RGB 03, 03, 03 + RGB 05, 05, 05 + + RGB 08, 08, 08 + RGB 10, 10, 10 + RGB 12, 12, 12 + RGB 14, 14, 14 + + RGB 16, 16, 16 + RGB 18, 18, 18 + RGB 20, 20, 20 + RGB 22, 22, 22 + + RGB 25, 25, 25 + RGB 27, 27, 27 + RGB 29, 29, 29 + RGB 31, 31, 31 + + RGB 18, 24, 18 + RGB 31, 29, 01 + RGB 31, 27, 03 + RGB 31, 25, 05 + + RGB 31, 22, 08 + RGB 31, 20, 10 + RGB 31, 18, 12 + RGB 31, 16, 14 + + RGB 31, 14, 16 + RGB 31, 12, 18 + RGB 31, 10, 20 + RGB 31, 08, 22 + + RGB 31, 05, 25 + RGB 31, 03, 27 + RGB 31, 01, 29 + RGB 31, 00, 31 + + RGB 18, 06, 31 + RGB 00, 31, 31 + RGB 00, 31, 29 + RGB 00, 31, 27 + + RGB 00, 31, 25 + RGB 00, 31, 22 + RGB 00, 31, 20 + RGB 00, 31, 18 + + RGB 00, 31, 16 + RGB 00, 31, 14 + RGB 00, 31, 12 + RGB 00, 31, 10 + + RGB 00, 31, 08 + RGB 00, 31, 05 + RGB 00, 31, 03 + RGB 00, 31, 01 + + RGB 12, 31, 06 + RGB 00, 00, 31 + RGB 00, 01, 31 + RGB 00, 03, 31 + + RGB 00, 05, 31 + RGB 00, 08, 31 + RGB 00, 10, 31 + RGB 00, 12, 31 + + RGB 00, 14, 31 + RGB 00, 16, 31 + RGB 00, 18, 31 + RGB 00, 20, 31 + + RGB 00, 22, 31 + RGB 00, 25, 31 + RGB 00, 27, 31 + RGB 00, 29, 31 + + RGB 00, 00, 00 + RGB 06, 00, 04 + RGB 19, 02, 09 + RGB 28, 04, 11 + + RGB 31, 07, 16 + RGB 31, 17, 23 + RGB 31, 26, 30 + RGB 07, 05, 10 + + RGB 14, 10, 18 + RGB 20, 20, 25 + RGB 25, 27, 31 + RGB 09, 05, 06 + + RGB 23, 16, 13 + RGB 30, 23, 22 + RGB 31, 28, 28 + RGB 31, 31, 31 + + RGB 06, 31, 31 + RGB 04, 00, 04 + RGB 11, 02, 04 + RGB 17, 02, 04 + + RGB 24, 05, 04 + RGB 28, 07, 04 + RGB 31, 11, 04 + RGB 02, 01, 15 + + RGB 04, 11, 22 + RGB 12, 25, 25 + RGB 20, 31, 31 + RGB 09, 04, 03 + + RGB 22, 11, 08 + RGB 27, 19, 16 + RGB 30, 28, 26 + RGB 31, 31, 31 + + RGB 06, 18, 06 + RGB 04, 04, 02 + RGB 07, 07, 02 + RGB 18, 18, 04 + + RGB 24, 24, 06 + RGB 27, 27, 11 + RGB 31, 31, 20 + RGB 02, 03, 10 + + RGB 04, 05, 13 + RGB 06, 10, 25 + RGB 08, 15, 31 + RGB 04, 00, 06 + + RGB 11, 07, 14 + RGB 21, 16, 23 + RGB 29, 26, 31 + RGB 31, 31, 31 + + RGB 06, 00, 18 + RGB 00, 04, 03 + RGB 02, 09, 05 + RGB 11, 19, 07 + + RGB 16, 24, 08 + RGB 22, 31, 09 + RGB 24, 31, 18 + RGB 03, 01, 03 + + RGB 10, 04, 10 + RGB 20, 08, 20 + RGB 31, 17, 31 + RGB 01, 03, 06 + + RGB 05, 09, 10 + RGB 15, 21, 21 + RGB 23, 25, 25 + RGB 31, 31, 31 + + RGB 00, 18, 31 + RGB 00, 05, 07 + RGB 00, 08, 13 + RGB 00, 12, 17 + + RGB 01, 20, 24 + RGB 04, 27, 31 + RGB 14, 31, 31 + RGB 04, 02, 02 + + RGB 15, 01, 03 + RGB 26, 04, 07 + RGB 31, 13, 16 + RGB 00, 05, 02 + + RGB 01, 11, 03 + RGB 06, 21, 06 + RGB 13, 31, 16 + RGB 31, 31, 31 + + RGB 00, 06, 06 + RGB 00, 01, 08 + RGB 00, 05, 14 + RGB 00, 08, 19 + + RGB 02, 14, 26 + RGB 04, 21, 31 + RGB 06, 26, 31 + RGB 13, 00, 00 + + RGB 27, 07, 00 + RGB 31, 17, 05 + RGB 31, 25, 16 + RGB 02, 04, 00 + + RGB 07, 11, 03 + RGB 17, 19, 05 + RGB 27, 31, 16 + RGB 31, 31, 31 + + RGB 02, 00, 00 + RGB 04, 01, 06 + RGB 11, 03, 14 + RGB 16, 04, 19 + + RGB 20, 07, 22 + RGB 26, 12, 27 + RGB 26, 20, 31 + RGB 04, 07, 00 + + RGB 16, 20, 07 + RGB 24, 28, 15 + RGB 29, 31, 24 + RGB 05, 02, 02 + + RGB 15, 04, 02 + RGB 24, 11, 10 + RGB 31, 22, 20 + RGB 31, 31, 31 + + RGB 00, 00, 14 + RGB 12, 00, 00 + RGB 27, 05, 00 + RGB 31, 15, 05 + + RGB 31, 26, 13 + RGB 31, 30, 21 + RGB 05, 07, 16 + RGB 04, 16, 20 + + RGB 04, 24, 26 + RGB 08, 31, 31 + RGB 23, 31, 31 + RGB 00, 00, 00 + + RGB 05, 05, 05 + RGB 17, 17, 15 + RGB 28, 28, 24 + RGB 31, 31, 31 diff --git a/gfx/title/title.pal b/gfx/title/title.pal new file mode 100644 index 000000000..95bc2a394 --- /dev/null +++ b/gfx/title/title.pal @@ -0,0 +1,81 @@ +; BG + RGB 00, 00, 00 + RGB 19, 00, 00 + RGB 15, 08, 31 + RGB 15, 08, 31 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 15, 16, 31 + RGB 31, 01, 13 + + RGB 00, 00, 00 + RGB 07, 07, 07 + RGB 31, 31, 31 + RGB 02, 03, 30 + + RGB 00, 00, 00 + RGB 13, 13, 13 + RGB 31, 31, 18 + RGB 02, 03, 30 + + RGB 00, 00, 00 + RGB 19, 19, 19 + RGB 29, 28, 12 + RGB 02, 03, 30 + + RGB 00, 00, 00 + RGB 25, 25, 25 + RGB 28, 25, 06 + RGB 02, 03, 30 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 26, 21, 00 + RGB 02, 03, 30 + + RGB 00, 00, 00 + RGB 11, 11, 19 + RGB 31, 31, 31 + RGB 00, 00, 00 + +; OBJ + RGB 00, 00, 00 + RGB 10, 00, 15 + RGB 17, 05, 22 + RGB 19, 09, 31 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 diff --git a/gfx/trade/border.pal b/gfx/trade/border.pal new file mode 100644 index 000000000..b5615248e --- /dev/null +++ b/gfx/trade/border.pal @@ -0,0 +1,29 @@ + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 31, 00, 00 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 15, 23, 30 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 16, 16, 16 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 25, 07, 04 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 03, 22, 08 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 29, 28, 09 + RGB 31, 31, 31 diff --git a/gfx/unknown/49757.pal b/gfx/unknown/49757.pal new file mode 100644 index 000000000..93e884046 --- /dev/null +++ b/gfx/unknown/49757.pal @@ -0,0 +1,39 @@ + RGB 31, 31, 63 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 63 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 31, 00, 00 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 30, 16, 26 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 16, 16, 16 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 31, 12, 12 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 07, 08, 31 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 29, 28, 09 + RGB 31, 31, 31 diff --git a/gfx/unknown/4985a.asm b/gfx/unknown/4985a.asm new file mode 100644 index 000000000..8449d6a1a --- /dev/null +++ b/gfx/unknown/4985a.asm @@ -0,0 +1,8 @@ + db $ab,$03, $57,$24, $ac,$0e, $13,$32 + db $be,$30, $5b,$4c, $47,$60, $ed,$f2 + db $ab,$03, $55,$26, $aa,$0a, $13,$3a + db $be,$28, $33,$24, $6e,$71, $df,$b0 + db $a8,$00, $e5,$e0, $9a,$fc, $f4,$2c + db $fe,$4c, $a3,$5e, $c6,$3a, $ab,$4d + db $a8,$00, $b5,$b0, $de,$e8, $fc,$1c + db $ba,$66, $f7,$0e, $ba,$5e, $43,$bd diff --git a/gfx/unknown/b6f1.pal b/gfx/unknown/b6f1.pal new file mode 100644 index 000000000..1dd56f50f --- /dev/null +++ b/gfx/unknown/b6f1.pal @@ -0,0 +1,24 @@ + RGB 31, 31, 31 + RGB 18, 23, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 22, 00, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 00, 00 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 25, 22, 00 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 23, 26, 31 + RGB 18, 23, 31 + RGB 00, 00, 00 diff --git a/gfx/unknown/b719.pal b/gfx/unknown/b719.pal new file mode 100644 index 000000000..09dd9a364 --- /dev/null +++ b/gfx/unknown/b719.pal @@ -0,0 +1,9 @@ + RGB 31, 31, 31 + RGB 07, 06, 03 + RGB 07, 06, 03 + RGB 07, 06, 03 + + RGB 31, 31, 31 + RGB 31, 31, 00 + RGB 26, 22, 00 + RGB 00, 00, 00 diff --git a/gfx/unknown/b789.pal b/gfx/unknown/b789.pal new file mode 100644 index 000000000..cce760662 --- /dev/null +++ b/gfx/unknown/b789.pal @@ -0,0 +1,19 @@ + RGB 31, 31, 31 + RGB 30, 22, 24 + RGB 18, 18, 18 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 10, 11, 31 + RGB 18, 18, 18 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 31, 11 + RGB 18, 18, 18 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 29, 26, 05 + RGB 18, 18, 18 + RGB 00, 00, 00 -- cgit v1.2.3 From 9af6d8d0f1cdfe13d5b6b028b7da2965fddaab67 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 23:53:58 -0500 Subject: Split tilesets/ into gfx/tilesets and data/tilesets/ --- gfx/tilesets/aerodactyl_word_room_palette_map.asm | 29 +++++ gfx/tilesets/battle_tower_outside_palette_map.asm | 29 +++++ gfx/tilesets/battle_tower_palette_map.asm | 29 +++++ gfx/tilesets/beta_word_room_palette_map.asm | 29 +++++ gfx/tilesets/cave_palette_map.asm | 29 +++++ gfx/tilesets/celadon_mansion_palette_map.asm | 29 +++++ gfx/tilesets/game_corner_palette_map.asm | 29 +++++ gfx/tilesets/gate_palette_map.asm | 29 +++++ gfx/tilesets/gym_1_palette_map.asm | 29 +++++ gfx/tilesets/ho_oh_word_room_palette_map.asm | 29 +++++ gfx/tilesets/house_1_palette_map.asm | 29 +++++ gfx/tilesets/ice_path_palette_map.asm | 29 +++++ gfx/tilesets/ilex_forest_palette_map.asm | 29 +++++ gfx/tilesets/johto_1_palette_map.asm | 29 +++++ gfx/tilesets/johto_2_palette_map.asm | 29 +++++ gfx/tilesets/kabuto_word_room_palette_map.asm | 29 +++++ gfx/tilesets/kanto_palette_map.asm | 29 +++++ gfx/tilesets/kurts_house_palette_map.asm | 29 +++++ gfx/tilesets/lab_palette_map.asm | 29 +++++ gfx/tilesets/lighthouse_palette_map.asm | 29 +++++ gfx/tilesets/mart_palette_map.asm | 29 +++++ gfx/tilesets/olivine_gym_palette_map.asm | 29 +++++ gfx/tilesets/omanyte_word_room_palette_map.asm | 29 +++++ gfx/tilesets/palette_maps.asm | 141 ++++++++++++++++++++++ gfx/tilesets/park_palette_map.asm | 29 +++++ gfx/tilesets/players_house_2f_palette_map.asm | 29 +++++ gfx/tilesets/players_house_palette_map.asm | 29 +++++ gfx/tilesets/pokecenter_palette_map.asm | 29 +++++ gfx/tilesets/pokecom_center_palette_map.asm | 29 +++++ gfx/tilesets/port_palette_map.asm | 29 +++++ gfx/tilesets/power_plant_palette_map.asm | 29 +++++ gfx/tilesets/radio_tower_palette_map.asm | 29 +++++ gfx/tilesets/ruins_of_alph_palette_map.asm | 29 +++++ gfx/tilesets/sprout_tower_palette_map.asm | 29 +++++ gfx/tilesets/train_station_palette_map.asm | 29 +++++ gfx/tilesets/underground_palette_map.asm | 29 +++++ gfx/tilesets/unused_museum_palette_map.asm | 32 +++++ gfx/tilesets/whirl_islands_palette_map.asm | 29 +++++ 38 files changed, 1217 insertions(+) create mode 100644 gfx/tilesets/aerodactyl_word_room_palette_map.asm create mode 100644 gfx/tilesets/battle_tower_outside_palette_map.asm create mode 100644 gfx/tilesets/battle_tower_palette_map.asm create mode 100644 gfx/tilesets/beta_word_room_palette_map.asm create mode 100644 gfx/tilesets/cave_palette_map.asm create mode 100644 gfx/tilesets/celadon_mansion_palette_map.asm create mode 100644 gfx/tilesets/game_corner_palette_map.asm create mode 100644 gfx/tilesets/gate_palette_map.asm create mode 100644 gfx/tilesets/gym_1_palette_map.asm create mode 100644 gfx/tilesets/ho_oh_word_room_palette_map.asm create mode 100644 gfx/tilesets/house_1_palette_map.asm create mode 100644 gfx/tilesets/ice_path_palette_map.asm create mode 100644 gfx/tilesets/ilex_forest_palette_map.asm create mode 100644 gfx/tilesets/johto_1_palette_map.asm create mode 100644 gfx/tilesets/johto_2_palette_map.asm create mode 100644 gfx/tilesets/kabuto_word_room_palette_map.asm create mode 100644 gfx/tilesets/kanto_palette_map.asm create mode 100644 gfx/tilesets/kurts_house_palette_map.asm create mode 100644 gfx/tilesets/lab_palette_map.asm create mode 100644 gfx/tilesets/lighthouse_palette_map.asm create mode 100644 gfx/tilesets/mart_palette_map.asm create mode 100644 gfx/tilesets/olivine_gym_palette_map.asm create mode 100644 gfx/tilesets/omanyte_word_room_palette_map.asm create mode 100644 gfx/tilesets/palette_maps.asm create mode 100644 gfx/tilesets/park_palette_map.asm create mode 100644 gfx/tilesets/players_house_2f_palette_map.asm create mode 100644 gfx/tilesets/players_house_palette_map.asm create mode 100644 gfx/tilesets/pokecenter_palette_map.asm create mode 100644 gfx/tilesets/pokecom_center_palette_map.asm create mode 100644 gfx/tilesets/port_palette_map.asm create mode 100644 gfx/tilesets/power_plant_palette_map.asm create mode 100644 gfx/tilesets/radio_tower_palette_map.asm create mode 100644 gfx/tilesets/ruins_of_alph_palette_map.asm create mode 100644 gfx/tilesets/sprout_tower_palette_map.asm create mode 100644 gfx/tilesets/train_station_palette_map.asm create mode 100644 gfx/tilesets/underground_palette_map.asm create mode 100644 gfx/tilesets/unused_museum_palette_map.asm create mode 100644 gfx/tilesets/whirl_islands_palette_map.asm (limited to 'gfx') diff --git a/gfx/tilesets/aerodactyl_word_room_palette_map.asm b/gfx/tilesets/aerodactyl_word_room_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/gfx/tilesets/aerodactyl_word_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/battle_tower_outside_palette_map.asm b/gfx/tilesets/battle_tower_outside_palette_map.asm new file mode 100644 index 000000000..dfc74a9c0 --- /dev/null +++ b/gfx/tilesets/battle_tower_outside_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED + tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN + tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, BROWN + tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW + tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN + tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, RED, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, RED, RED, RED, ROOF, RED, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED, RED + tilepal 1, RED, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED + tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED + tilepal 1, RED, RED, RED, RED, RED, YELLOW, YELLOW, YELLOW + tilepal 1, YELLOW, RED, RED, RED, WATER, WATER, WATER, RED + tilepal 1, RED, RED, ROOF, RED, RED, ROOF, RED, RED + tilepal 1, RED, ROOF, ROOF, RED, RED, RED, ROOF, ROOF + tilepal 1, RED, RED, RED, RED, YELLOW, RED, GREEN, RED + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF diff --git a/gfx/tilesets/battle_tower_palette_map.asm b/gfx/tilesets/battle_tower_palette_map.asm new file mode 100644 index 000000000..1abce2a16 --- /dev/null +++ b/gfx/tilesets/battle_tower_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, RED, WATER, WATER, GRAY, GRAY, WATER, WATER + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN + tilepal 0, WATER, RED, WATER, WATER, GRAY, GRAY, WATER, WATER + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN + tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, GRAY + tilepal 0, WATER, WATER, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, WATER + tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, BROWN, BROWN, BROWN + tilepal 0, RED, BROWN, RED, BROWN, BROWN, BROWN, RED, RED + tilepal 0, WATER, WATER, WATER, RED, RED, RED, RED, WATER + tilepal 0, BROWN, YELLOW, RED, BROWN, BROWN, BROWN, RED, RED + tilepal 0, WATER, RED, RED, RED, RED, GRAY, RED, WATER + +rept 16 + db $ff +endr + + tilepal 1, GRAY, WATER, GRAY, WATER, WATER, WATER, ROOF, ROOF + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, WATER, WATER, RED, RED + tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER + tilepal 1, RED, GRAY, GRAY, GRAY, GREEN, YELLOW, RED, RED + tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, BROWN, YELLOW, WATER, WATER, YELLOW, RED + tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER + tilepal 1, GRAY, GRAY, BROWN, YELLOW, RED, RED, YELLOW, RED + tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER + tilepal 1, GRAY, GRAY, YELLOW, BROWN, WATER, WATER, GRAY, BROWN + tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/beta_word_room_palette_map.asm b/gfx/tilesets/beta_word_room_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/gfx/tilesets/beta_word_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/cave_palette_map.asm b/gfx/tilesets/cave_palette_map.asm new file mode 100644 index 000000000..73c09ebe5 --- /dev/null +++ b/gfx/tilesets/cave_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/celadon_mansion_palette_map.asm b/gfx/tilesets/celadon_mansion_palette_map.asm new file mode 100644 index 000000000..2bd27ad22 --- /dev/null +++ b/gfx/tilesets/celadon_mansion_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER + tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN + tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN + tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW + tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW + tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN + tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW + tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW diff --git a/gfx/tilesets/game_corner_palette_map.asm b/gfx/tilesets/game_corner_palette_map.asm new file mode 100644 index 000000000..34bb9f6f0 --- /dev/null +++ b/gfx/tilesets/game_corner_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, GREEN, GREEN, GREEN + tilepal 0, GREEN, GREEN, GRAY, GRAY, RED, RED, GREEN, BROWN + tilepal 0, GRAY, GRAY, GRAY, RED, BROWN, GREEN, GRAY, GRAY + tilepal 0, GRAY, GREEN, GRAY, GRAY, RED, RED, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, BROWN, BROWN, GRAY, GRAY + tilepal 0, GRAY, GREEN, RED, RED, GREEN, GRAY, RED, RED + tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, GREEN, BROWN, RED, RED + tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED + tilepal 0, RED, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER + +rept 16 + db $ff +endr + + tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, BROWN + tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF + tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, RED, ROOF, ROOF + tilepal 1, YELLOW, RED, YELLOW, RED, WATER, WATER, RED, RED + tilepal 1, RED, RED, RED, RED, GREEN, GRAY, RED, RED + tilepal 1, RED, RED, YELLOW, YELLOW, WATER, WATER, BROWN, BROWN + tilepal 1, BROWN, BROWN, RED, RED, GREEN, ROOF, RED, RED + tilepal 1, RED, RED, YELLOW, YELLOW, ROOF, ROOF, RED, RED + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED + tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 1, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER diff --git a/gfx/tilesets/gate_palette_map.asm b/gfx/tilesets/gate_palette_map.asm new file mode 100644 index 000000000..7854d3a81 --- /dev/null +++ b/gfx/tilesets/gate_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, WATER, WATER, RED, GREEN, GREEN, GREEN + tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN + tilepal 0, WATER, GRAY, WATER, WATER, RED, BROWN, BROWN, WATER + tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, WATER + tilepal 0, GREEN, GREEN, GRAY, GRAY, GREEN, GREEN, WATER, WATER + tilepal 0, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 0, GREEN, GREEN, GREEN, GREEN, GRAY, WATER, WATER, WATER + tilepal 0, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN + tilepal 1, GRAY, GRAY, GRAY, GRAY, ROOF, RED, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, WATER + tilepal 1, GRAY, ROOF, RED, GRAY, GRAY, WATER, GRAY, GRAY + tilepal 1, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, WATER, WATER, WATER + tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY diff --git a/gfx/tilesets/gym_1_palette_map.asm b/gfx/tilesets/gym_1_palette_map.asm new file mode 100644 index 000000000..b20f49195 --- /dev/null +++ b/gfx/tilesets/gym_1_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN + tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN + tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN + tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN + tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF + tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF + +rept 16 + db $ff +endr + + tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN + tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN + tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN + tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN + tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF + tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF diff --git a/gfx/tilesets/ho_oh_word_room_palette_map.asm b/gfx/tilesets/ho_oh_word_room_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/gfx/tilesets/ho_oh_word_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/house_1_palette_map.asm b/gfx/tilesets/house_1_palette_map.asm new file mode 100644 index 000000000..ce7b988b7 --- /dev/null +++ b/gfx/tilesets/house_1_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER + tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER + tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN + tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN + tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER + tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER + tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN + tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN + tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER + tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN + tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/ice_path_palette_map.asm b/gfx/tilesets/ice_path_palette_map.asm new file mode 100644 index 000000000..985844071 --- /dev/null +++ b/gfx/tilesets/ice_path_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, BROWN, ROOF, ROOF, BROWN, BROWN, WATER, WATER + tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, BROWN, BROWN, WATER, WATER + tilepal 0, WATER, ROOF, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY + tilepal 0, WATER, WATER, ROOF, ROOF, WATER, WATER, WATER, WATER + tilepal 0, BROWN, WATER, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 0, WATER, WATER, ROOF, ROOF, GRAY, GRAY, WATER, WATER + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, GREEN, GRAY, GRAY, WATER + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, WATER + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + +rept 16 + db $ff +endr + + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF diff --git a/gfx/tilesets/ilex_forest_palette_map.asm b/gfx/tilesets/ilex_forest_palette_map.asm new file mode 100644 index 000000000..696788084 --- /dev/null +++ b/gfx/tilesets/ilex_forest_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW + tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW + tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/johto_1_palette_map.asm b/gfx/tilesets/johto_1_palette_map.asm new file mode 100644 index 000000000..62fbd2d00 --- /dev/null +++ b/gfx/tilesets/johto_1_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED + tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN + tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW + tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN + tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED + tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED + tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/johto_2_palette_map.asm b/gfx/tilesets/johto_2_palette_map.asm new file mode 100644 index 000000000..f2af7a92d --- /dev/null +++ b/gfx/tilesets/johto_2_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF + tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN + tilepal 0, RED, RED, BROWN, BROWN, BROWN, GRAY, GREEN, GREEN + tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED + tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW + tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF + tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF + tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN + tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED + tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW + tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN + tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF diff --git a/gfx/tilesets/kabuto_word_room_palette_map.asm b/gfx/tilesets/kabuto_word_room_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/gfx/tilesets/kabuto_word_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/kanto_palette_map.asm b/gfx/tilesets/kanto_palette_map.asm new file mode 100644 index 000000000..e3e497fb9 --- /dev/null +++ b/gfx/tilesets/kanto_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY + tilepal 0, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN + tilepal 0, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY + tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED + tilepal 0, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY + tilepal 1, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN + tilepal 1, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY + tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED + tilepal 1, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/kurts_house_palette_map.asm b/gfx/tilesets/kurts_house_palette_map.asm new file mode 100644 index 000000000..5daa0da6b --- /dev/null +++ b/gfx/tilesets/kurts_house_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY + tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY + tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY + tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY + tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY + tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN diff --git a/gfx/tilesets/lab_palette_map.asm b/gfx/tilesets/lab_palette_map.asm new file mode 100644 index 000000000..24399c6ea --- /dev/null +++ b/gfx/tilesets/lab_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, WATER, WATER, WATER, ROOF, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN + tilepal 0, WATER, WATER, WATER, WATER, RED, BROWN, BROWN, GRAY + tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN + tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, BROWN, GREEN, GREEN, GREEN + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, RED, RED, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER diff --git a/gfx/tilesets/lighthouse_palette_map.asm b/gfx/tilesets/lighthouse_palette_map.asm new file mode 100644 index 000000000..5f80e3a4d --- /dev/null +++ b/gfx/tilesets/lighthouse_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, WATER, WATER, WATER, BROWN, WATER, WATER, RED + tilepal 0, RED, ROOF, ROOF, BROWN, ROOF, RED, RED, RED + tilepal 0, ROOF, WATER, ROOF, BROWN, ROOF, WATER, WATER, RED + tilepal 0, RED, ROOF, ROOF, WATER, ROOF, RED, RED, RED + tilepal 0, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY + tilepal 0, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, GRAY, GRAY + tilepal 0, ROOF, ROOF, WATER, WATER, RED, ROOF, BROWN, GRAY + tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER + tilepal 0, YELLOW, YELLOW, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN + tilepal 0, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF + tilepal 0, YELLOW, YELLOW, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY + tilepal 0, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, ROOF, GRAY, GRAY, BROWN, BROWN, RED + tilepal 1, RED, RED, RED, BROWN, RED, RED, RED, RED + tilepal 1, ROOF, WATER, ROOF, BROWN, RED, WATER, WATER, RED + tilepal 1, RED, RED, RED, WATER, RED, RED, RED, RED + tilepal 1, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY + tilepal 1, GRAY, GRAY, GRAY, BROWN, RED, ROOF, GRAY, GRAY + tilepal 1, ROOF, ROOF, WATER, WATER, RED, RED, BROWN, GRAY + tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER + tilepal 1, RED, RED, ROOF, ROOF, BROWN, BROWN, GRAY, GRAY + tilepal 1, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF + tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY + tilepal 1, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY diff --git a/gfx/tilesets/mart_palette_map.asm b/gfx/tilesets/mart_palette_map.asm new file mode 100644 index 000000000..991510d12 --- /dev/null +++ b/gfx/tilesets/mart_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GREEN, GREEN, WATER, RED, GRAY, GRAY, ROOF, ROOF + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, RED, ROOF, ROOF, GRAY, YELLOW + tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER + tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER + tilepal 0, WATER, WATER, RED, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED, RED + tilepal 0, GREEN, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, YELLOW, YELLOW, YELLOW, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, RED, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN, GRAY + tilepal 1, GRAY, GREEN, GREEN, RED, RED, WATER, WATER, ROOF + tilepal 1, GRAY, GRAY, GRAY, YELLOW, YELLOW, YELLOW, ROOF, GRAY + tilepal 1, GRAY, GRAY, WATER, GRAY, GRAY, GRAY, YELLOW, YELLOW + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, RED, WATER, RED + tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED + tilepal 1, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN + tilepal 1, GRAY, GRAY, WATER, GRAY, WATER, RED, BROWN, BROWN diff --git a/gfx/tilesets/olivine_gym_palette_map.asm b/gfx/tilesets/olivine_gym_palette_map.asm new file mode 100644 index 000000000..551a09351 --- /dev/null +++ b/gfx/tilesets/olivine_gym_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN + tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED + tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY diff --git a/gfx/tilesets/omanyte_word_room_palette_map.asm b/gfx/tilesets/omanyte_word_room_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/gfx/tilesets/omanyte_word_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tilesets/palette_maps.asm new file mode 100644 index 000000000..a0efab45d --- /dev/null +++ b/gfx/tilesets/palette_maps.asm @@ -0,0 +1,141 @@ +tilepal: MACRO +; vram bank, pals +x = \1 << OAM_TILE_BANK +rept (_NARG +- 1) / 2 + dn (x | PAL_BG_\3), (x | PAL_BG_\2) + shift + shift +endr +ENDM + + +TilesetKantoPalMap: ; 0x4c075 +INCLUDE "gfx/tilesets/kanto_palette_map.asm" +; 0x4c0e5 + +Tileset0PalMap: ; 0x4c0e5 +TilesetJohto1PalMap: ; 0x4c0e5 +INCLUDE "gfx/tilesets/johto_1_palette_map.asm" +; 0x4c155 + +TilesetJohto2PalMap: ; 0x4c155 +INCLUDE "gfx/tilesets/johto_2_palette_map.asm" +; 0x4c1c5 + +TilesetHouse1PalMap: ; 0x4c1c5 +INCLUDE "gfx/tilesets/house_1_palette_map.asm" +; 0x4c235 + +TilesetPlayersHousePalMap: ; 0x4c235 +INCLUDE "gfx/tilesets/players_house_palette_map.asm" +; 0x4c2a5 + +TilesetPokecenterPalMap: ; 0x4c2a5 +INCLUDE "gfx/tilesets/pokecenter_palette_map.asm" +; 0x4c315 + +TilesetGatePalMap: ; 0x4c315 +INCLUDE "gfx/tilesets/gate_palette_map.asm" +; 0x4c385 + +TilesetPortPalMap: ; 0x4c385 +INCLUDE "gfx/tilesets/port_palette_map.asm" +; 0x4c3f5 + +TilesetLabPalMap: ; 0x4c3f5 +INCLUDE "gfx/tilesets/lab_palette_map.asm" +; 0x4c465 + +TilesetPowerPlantPalMap: ; 0x4c465 +INCLUDE "gfx/tilesets/power_plant_palette_map.asm" +; 0x4c4d5 + +TilesetMartPalMap: ; 0x4c4d5 +INCLUDE "gfx/tilesets/mart_palette_map.asm" +; 0x4c545 + +TilesetCeladonMansionPalMap: ; 0x4c545 +INCLUDE "gfx/tilesets/celadon_mansion_palette_map.asm" +; 0x4c5b5 + +TilesetGameCornerPalMap: ; 0x4c5b5 +INCLUDE "gfx/tilesets/game_corner_palette_map.asm" +; 0x4c625 + +TilesetGym1PalMap: ; 0x4c625 +INCLUDE "gfx/tilesets/gym_1_palette_map.asm" +; 0x4c695 + +TilesetKurtsHousePalMap: ; 0x4c695 +INCLUDE "gfx/tilesets/kurts_house_palette_map.asm" +; 0x4c705 + +TilesetSproutTowerPalMap: ; 0x4c705 +INCLUDE "gfx/tilesets/sprout_tower_palette_map.asm" +; 0x4c775 + +TilesetCavePalMap: ; 0x4c775 +TilesetWhirlIslandsPalMap: ; 0x4c775 +INCLUDE "gfx/tilesets/cave_palette_map.asm" +; 0x4c7e5 + +TilesetParkPalMap: ; 0x4c7e5 +INCLUDE "gfx/tilesets/park_palette_map.asm" +; 0x4c855 + +TilesetRuinsOfAlphPalMap: ; 0x4c855 +TilesetBetaWordRoomPalMap: ; 0x4c855 +TilesetHoOhWordRoomPalMap: ; 0x4c855 +TilesetKabutoWordRoomPalMap: ; 0x4c855 +TilesetOmanyteWordRoomPalMap: ; 0x4c855 +TilesetAerodactylWordRoomPalMap: ; 0x4c855 +INCLUDE "gfx/tilesets/ruins_of_alph_palette_map.asm" +; 0x4c8c5 + +TilesetRadioTowerPalMap: ; 0x4c8c5 +INCLUDE "gfx/tilesets/radio_tower_palette_map.asm" +; 0x4c935 + +TilesetTrainStationPalMap: ; 0x4c935 +INCLUDE "gfx/tilesets/train_station_palette_map.asm" +; 0x4c9a5 + +TilesetUndergroundPalMap: ; 0x4c9a5 +INCLUDE "gfx/tilesets/underground_palette_map.asm" +; 0x4ca15 + +TilesetOlivineGymPalMap: ; 0x4ca15 +INCLUDE "gfx/tilesets/olivine_gym_palette_map.asm" +; 0x4ca85 + +TilesetLighthousePalMap: ; 0x4ca85 +INCLUDE "gfx/tilesets/lighthouse_palette_map.asm" +; 0x4caf5 + +TilesetPlayersHouse2FPalMap: ; 0x4caf5 +INCLUDE "gfx/tilesets/players_house_2f_palette_map.asm" +; 0x4cb65 + +UnusedMuseumPalMap: ; 0x4cb65 +INCLUDE "gfx/tilesets/unused_museum_palette_map.asm" +; 4cbd5 + +TilesetIcePathPalMap: ; 0x4cbd5 +INCLUDE "gfx/tilesets/ice_path_palette_map.asm" +; 0x4cc45 + +TilesetIlexForestPalMap: ; 0x4cc45 +INCLUDE "gfx/tilesets/ilex_forest_palette_map.asm" +; 0x4ccb5 + +TilesetPokeComCenterPalMap: ; 0x4ccb5 +INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm" +; 0x4cd25 + +TilesetBattleTowerPalMap: ; 0x4cd25 +INCLUDE "gfx/tilesets/battle_tower_palette_map.asm" +; 0x4cd95 + +TilesetBattleTowerOutsidePalMap: ; 0x4cd95 +INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm" +; 0x4ce05 diff --git a/gfx/tilesets/park_palette_map.asm b/gfx/tilesets/park_palette_map.asm new file mode 100644 index 000000000..f9c65ef89 --- /dev/null +++ b/gfx/tilesets/park_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GREEN, BROWN, RED, GREEN, BROWN, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN + tilepal 0, RED, RED, RED, GRAY, WATER, ROOF, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN + tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN + tilepal 0, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN + tilepal 0, BROWN, BROWN, GREEN, GREEN, GRAY, GRAY, GRAY, RED + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, WATER + +rept 16 + db $ff +endr + + tilepal 1, WATER, WATER, GRAY, RED, GREEN, BROWN, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN + tilepal 1, WATER, WATER, RED, GRAY, WATER, ROOF, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN + tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN + tilepal 1, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, BROWN, GREEN, GREEN, WATER, WATER, WATER, RED + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, GRAY diff --git a/gfx/tilesets/players_house_2f_palette_map.asm b/gfx/tilesets/players_house_2f_palette_map.asm new file mode 100644 index 000000000..1c0cb1f08 --- /dev/null +++ b/gfx/tilesets/players_house_2f_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED + tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW + tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW diff --git a/gfx/tilesets/players_house_palette_map.asm b/gfx/tilesets/players_house_palette_map.asm new file mode 100644 index 000000000..5d089835b --- /dev/null +++ b/gfx/tilesets/players_house_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER + tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER + tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN + tilepal 0, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER + tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER + tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/pokecenter_palette_map.asm b/gfx/tilesets/pokecenter_palette_map.asm new file mode 100644 index 000000000..78508b59e --- /dev/null +++ b/gfx/tilesets/pokecenter_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER + tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY + tilepal 0, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER + tilepal 0, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY + tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER + tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY + tilepal 0, RED, RED, RED, RED, RED, RED, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER + tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY + tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY + tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY + tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/pokecom_center_palette_map.asm b/gfx/tilesets/pokecom_center_palette_map.asm new file mode 100644 index 000000000..75ee649f9 --- /dev/null +++ b/gfx/tilesets/pokecom_center_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 0, WATER, WATER, GRAY, GRAY, RED, GRAY, WATER, WATER + tilepal 0, RED, WATER, GRAY, WATER, WATER, WATER, RED, RED + tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY + tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER + tilepal 0, RED, RED, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY + tilepal 0, GRAY, GRAY, WATER, WATER, WATER, WATER, RED, WATER + tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, RED, RED, GRAY + tilepal 0, RED, RED, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, GRAY, YELLOW, YELLOW + +rept 16 + db $ff +endr + + tilepal 1, GRAY, GRAY, GRAY, WATER, RED, RED, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GRAY, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, RED, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, RED, RED, GRAY, GRAY, RED, RED, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN + tilepal 1, WATER, RED, WATER, BROWN, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN + tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN + tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN diff --git a/gfx/tilesets/port_palette_map.asm b/gfx/tilesets/port_palette_map.asm new file mode 100644 index 000000000..6bfdf4686 --- /dev/null +++ b/gfx/tilesets/port_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN + tilepal 0, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN + tilepal 0, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF + tilepal 0, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + +rept 16 + db $ff +endr + + tilepal 1, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN + tilepal 1, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN + tilepal 1, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF + tilepal 1, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF diff --git a/gfx/tilesets/power_plant_palette_map.asm b/gfx/tilesets/power_plant_palette_map.asm new file mode 100644 index 000000000..f79f9c01b --- /dev/null +++ b/gfx/tilesets/power_plant_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN + tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN + tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED + tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER + tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF + tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN + tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN + tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED + tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER + tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF + tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/radio_tower_palette_map.asm b/gfx/tilesets/radio_tower_palette_map.asm new file mode 100644 index 000000000..3530f7479 --- /dev/null +++ b/gfx/tilesets/radio_tower_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, RED, RED, WATER, WATER, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, WATER, RED, WATER, WATER, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, ROOF, ROOF, GRAY, GRAY, BROWN, GRAY, GRAY, BROWN + tilepal 0, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN + tilepal 0, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GREEN, GREEN + tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, YELLOW, YELLOW, RED + tilepal 1, ROOF, RED, RED, ROOF, GRAY, GRAY, GRAY, GRAY + tilepal 1, ROOF, ROOF, GRAY, GRAY, WATER, GRAY, GRAY, BROWN + tilepal 1, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN + tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, RED, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/ruins_of_alph_palette_map.asm b/gfx/tilesets/ruins_of_alph_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/gfx/tilesets/ruins_of_alph_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/sprout_tower_palette_map.asm b/gfx/tilesets/sprout_tower_palette_map.asm new file mode 100644 index 000000000..6e3c10115 --- /dev/null +++ b/gfx/tilesets/sprout_tower_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED + tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED + tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED + tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED + tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/train_station_palette_map.asm b/gfx/tilesets/train_station_palette_map.asm new file mode 100644 index 000000000..f52f5bbe7 --- /dev/null +++ b/gfx/tilesets/train_station_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY + tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY + tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER + tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER + tilepal 0, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN + tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER + +rept 16 + db $ff +endr + + tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY + tilepal 1, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY + tilepal 1, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER + tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER + tilepal 1, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN + tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER diff --git a/gfx/tilesets/underground_palette_map.asm b/gfx/tilesets/underground_palette_map.asm new file mode 100644 index 000000000..6b9b5546d --- /dev/null +++ b/gfx/tilesets/underground_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED + tilepal 0, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED + tilepal 0, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED + tilepal 1, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED + tilepal 1, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/unused_museum_palette_map.asm b/gfx/tilesets/unused_museum_palette_map.asm new file mode 100644 index 000000000..cfbe6dbcd --- /dev/null +++ b/gfx/tilesets/unused_museum_palette_map.asm @@ -0,0 +1,32 @@ +; Matches pokered's "gate" tileset (notable for its Pewter Museum tiles) +; https://tcrf.net/Pok%C3%A9mon_Gold_and_Silver#Unused_Tile_Palette_Assignment_Data + + tilepal 0, WATER, RED, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN + tilepal 0, BROWN, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF + tilepal 0, ROOF, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF + tilepal 0, ROOF, GRAY, ROOF, BROWN, ROOF, ROOF, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, ROOF + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, WATER, RED, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN + tilepal 1, BROWN, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF + tilepal 1, ROOF, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF + tilepal 1, ROOF, GRAY, ROOF, BROWN, ROOF, ROOF, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, ROOF + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/whirl_islands_palette_map.asm b/gfx/tilesets/whirl_islands_palette_map.asm new file mode 100644 index 000000000..73c09ebe5 --- /dev/null +++ b/gfx/tilesets/whirl_islands_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY -- cgit v1.2.3 From 8334c3c998d36fab79ff0e1ce5a262ed5f9f1e51 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 00:18:06 -0500 Subject: Newline --- gfx/tilesets/bg_tiles.pal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gfx') diff --git a/gfx/tilesets/bg_tiles.pal b/gfx/tilesets/bg_tiles.pal index e56746536..e21561c74 100644 --- a/gfx/tilesets/bg_tiles.pal +++ b/gfx/tilesets/bg_tiles.pal @@ -58,4 +58,4 @@ RGB 15, 13, 27 RGB 10, 09, 20 RGB 04, 03, 18 - RGB 00, 00, 00 \ No newline at end of file + RGB 00, 00, 00 -- cgit v1.2.3 From ee4ec65fc17a802425b606eeef59e92a9a6c9b81 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 02:30:17 -0500 Subject: map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/ --- gfx/overworld/map_objects.pal | 39 +++++++++++++++++++++++++++++++++++++++ gfx/sprites/map_objects.pal | 39 --------------------------------------- 2 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 gfx/overworld/map_objects.pal delete mode 100644 gfx/sprites/map_objects.pal (limited to 'gfx') diff --git a/gfx/overworld/map_objects.pal b/gfx/overworld/map_objects.pal new file mode 100644 index 000000000..b0f33479a --- /dev/null +++ b/gfx/overworld/map_objects.pal @@ -0,0 +1,39 @@ +; 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/gfx/sprites/map_objects.pal b/gfx/sprites/map_objects.pal deleted file mode 100644 index b0f33479a..000000000 --- a/gfx/sprites/map_objects.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 -- cgit v1.2.3 From 7de7441e72f12ba1518504055acdec741bf4db74 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 02:38:45 -0500 Subject: gfx/*.asm files have INCBINs --- gfx/tilesets.asm | 435 ++++++++++++++++++++++++++++++++++++++++++ gfx/tilesets/palette_maps.asm | 1 + 2 files changed, 436 insertions(+) create mode 100644 gfx/tilesets.asm (limited to 'gfx') diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm new file mode 100644 index 000000000..0f4dcbb34 --- /dev/null +++ b/gfx/tilesets.asm @@ -0,0 +1,435 @@ +tilecoll: MACRO +; used in data/tilesets/*_collision.asm + db COLL_\1, COLL_\2, COLL_\3, COLL_\4 +ENDM + + +SECTION "Tileset Data 1", ROMX + +TilesetKantoGFX: ; 0x18000 +INCBIN "gfx/tilesets/kanto.2bpp.lz" +; 0x18606 + +TilesetKantoMeta: ; 0x18606 +INCBIN "data/tilesets/kanto_metatiles.bin" +; 0x18e06 + +TilesetKantoColl: ; 0x18e06 +INCLUDE "data/tilesets/kanto_collision.asm" +; 0x19006 + +Tileset0GFX: ; 0x19006 +TilesetJohto1GFX: ; 0x19006 +INCBIN "gfx/tilesets/johto_1.2bpp.lz" +; 0x19c0e + +Tileset0Meta: ; 0x19c0e +TilesetJohto1Meta: ; 0x19c0e +INCBIN "data/tilesets/johto_1_metatiles.bin" +; 0x1a40e + +Tileset0Coll: ; 0x1a40e +TilesetJohto1Coll: ; 0x1a40e +INCLUDE "data/tilesets/johto_1_collision.asm" +; 0x1a60e + +TilesetIcePathGFX: ; 0x1a60e +INCBIN "gfx/tilesets/ice_path.2bpp.lz" +; 0x1af3e + +TilesetIcePathMeta: ; 0x1af3e +INCBIN "data/tilesets/ice_path_metatiles.bin" +; 0x1b33e + +TilesetIcePathColl: ; 0x1b33e +INCLUDE "data/tilesets/ice_path_collision.asm" +; 0x1b43e + +TilesetPlayersHouse2FGFX: ; 0x1b43e +INCBIN "gfx/tilesets/players_house_2f.2bpp.lz" +; 0x1b8fe + +TilesetPlayersHouse2FMeta: ; 0x1b8fe +INCBIN "data/tilesets/players_house_2f_metatiles.bin" +; 0x1bcfe + +TilesetPlayersHouse2FColl: ; 0x1bcfe +INCLUDE "data/tilesets/players_house_2f_collision.asm" +; 0x1bdfe + + +SECTION "Tileset Data 2", ROMX + +TilesetPokecenterGFX: ; 0x1c30c +INCBIN "gfx/tilesets/pokecenter.2bpp.lz" +; 0x1c73c + +TilesetPokecenterMeta: ; 0x1c73c +INCBIN "data/tilesets/pokecenter_metatiles.bin" +; 0x1cb3c + +TilesetPokecenterColl: ; 0x1cb3c +INCLUDE "data/tilesets/pokecenter_collision.asm" +; 0x1cc3c + +TilesetPortGFX: ; 0x1cc3c +INCBIN "gfx/tilesets/port.2bpp.lz" +; 0x1d04c + +TilesetPortMeta: ; 0x1d04c +INCBIN "data/tilesets/port_metatiles.bin" +; 0x1d44c + +TilesetPortColl: ; 0x1d44c +INCLUDE "data/tilesets/port_collision.asm" +; 0x1d54c + +TilesetPlayersHouseGFX: ; 0x1d54c +INCBIN "gfx/tilesets/players_house.2bpp.lz" +; 0x1d92c + +TilesetPlayersHouseMeta: ; 0x1d92c +INCBIN "data/tilesets/players_house_metatiles.bin" +; 0x1dd2c + +TilesetPlayersHouseColl: ; 0x1dd2c +INCLUDE "data/tilesets/players_house_collision.asm" +; 0x1de2c + +TilesetCeladonMansionGFX: ; 0x1de2c +INCBIN "gfx/tilesets/celadon_mansion.2bpp.lz" +; 0x1e58c + +TilesetCeladonMansionMeta: ; 0x1e58c +INCBIN "data/tilesets/celadon_mansion_metatiles.bin" +; 0x1e98c + +TilesetCeladonMansionColl: ; 0x1e98c +INCLUDE "data/tilesets/celadon_mansion_collision.asm" +; 0x1ea8c + +TilesetCaveGFX: ; 0x1ea8c +INCBIN "gfx/tilesets/cave.2bpp.lz" +; 0x1ee1c + +TilesetCaveMeta: ; 0x1ee1c +TilesetWhirlIslandsMeta: ; 0x1ee1c +INCBIN "data/tilesets/cave_metatiles.bin" +; 0x1f21c + +TilesetCaveColl: ; 0x1f21c +TilesetWhirlIslandsColl: ; 0x1f21c +INCLUDE "data/tilesets/cave_collision.asm" +; 0x1f31c + + +SECTION "Tileset Data 3", ROMX + +TilesetSproutTowerGFX: ; 0x20181 +INCBIN "gfx/tilesets/sprout_tower.2bpp.lz" +; 0x206e1 + +TilesetSproutTowerMeta: ; 0x206e1 +INCBIN "data/tilesets/sprout_tower_metatiles.bin" +; 0x20ae1 + +TilesetSproutTowerColl: ; 0x20ae1 +INCLUDE "data/tilesets/sprout_tower_collision.asm" +; 0x20be1 + +TilesetLabGFX: ; 0x20be1 +INCBIN "gfx/tilesets/lab.2bpp.lz" +; 0x213e1 + +TilesetLabMeta: ; 0x213e1 +INCBIN "data/tilesets/lab_metatiles.bin" +; 0x217e1 + +TilesetLabColl: ; 0x217e1 +INCLUDE "data/tilesets/lab_collision.asm" +; 0x218e1 + +TilesetMartGFX: ; 0x218e1 +INCBIN "gfx/tilesets/mart.2bpp.lz" +; 0x22031 + +TilesetMartMeta: ; 0x22031 +INCBIN "data/tilesets/mart_metatiles.bin" +; 0x22431 + +TilesetMartColl: ; 0x22431 +INCLUDE "data/tilesets/mart_collision.asm" +; 0x22531 + +TilesetGameCornerGFX: ; 0x22531 +INCBIN "gfx/tilesets/game_corner.2bpp.lz" +; 0x22af1 + +TilesetGameCornerMeta: ; 0x22af1 +INCBIN "data/tilesets/game_corner_metatiles.bin" +; 0x22ef1 + +TilesetGameCornerColl: ; 0x22ef1 +INCLUDE "data/tilesets/game_corner_collision.asm" +; 0x22ff1 + +TilesetTrainStationGFX: ; 0x22ff1 +INCBIN "gfx/tilesets/train_station.2bpp.lz" +; 0x23391 + +TilesetTrainStationMeta: ; 0x23391 +INCBIN "data/tilesets/train_station_metatiles.bin" +; 0x23791 + +TilesetTrainStationColl: ; 0x23791 +INCLUDE "data/tilesets/train_station_collision.asm" +; 0x23891 + +TilesetIlexForestMeta: ; 0x23891 +INCBIN "data/tilesets/ilex_forest_metatiles.bin" +; 0x23b11 + + +SECTION "Tileset Data 4", ROMX + +TilesetGym1GFX: ; 0x30000 +INCBIN "gfx/tilesets/gym_1.2bpp.lz" +; 0x304e0 + +TilesetGym1Meta: ; 0x304e0 +INCBIN "data/tilesets/gym_1_metatiles.bin" +; 0x308e0 + +TilesetGym1Coll: ; 0x308e0 +INCLUDE "data/tilesets/gym_1_collision.asm" +; 0x309e0 + +TilesetParkGFX: ; 0x309e0 +INCBIN "gfx/tilesets/park.2bpp.lz" +; 0x30e80 + +TilesetParkMeta: ; 0x30e80 +INCBIN "data/tilesets/park_metatiles.bin" +; 0x31280 + +TilesetParkColl: ; 0x31280 +INCLUDE "data/tilesets/park_collision.asm" +; 0x31380 + +TilesetRadioTowerGFX: ; 0x31380 +INCBIN "gfx/tilesets/radio_tower.2bpp.lz" +; 0x318e0 + +TilesetRadioTowerMeta: ; 0x318e0 +INCBIN "data/tilesets/radio_tower_metatiles.bin" +; 0x31ce0 + +TilesetRadioTowerColl: ; 0x31ce0 +INCLUDE "data/tilesets/radio_tower_collision.asm" +; 0x31de0 + +TilesetUndergroundGFX: ; 0x31de0 +INCBIN "gfx/tilesets/underground.2bpp.lz" +; 0x321b0 + +TilesetUndergroundMeta: ; 0x321b0 +INCBIN "data/tilesets/underground_metatiles.bin" +; 0x325b0 + +TilesetUndergroundColl: ; 0x325b0 +INCLUDE "data/tilesets/underground_collision.asm" +; 0x326b0 + +TilesetWhirlIslandsGFX: ; 0x326b0 +INCBIN "gfx/tilesets/whirl_islands.2bpp.lz" +; 0x329f0 + +UnusedTilesetWhirlIslandsMeta: ; 0x329f0 +INCBIN "data/tilesets/unused_whirl_islands_metatiles.bin" +; 0x331f0 + +UnusedTilesetWhirlIslandsColl: ; 0x331f0 +INCLUDE "data/tilesets/unused_whirl_islands_collision.asm" +; 0x333f0 + + +SECTION "Tileset Data 5", ROMX + +TilesetPokeComCenterGFX: ; 0xb4000 +INCBIN "gfx/tilesets/pokecom_center.2bpp.lz" +; 0xb48a0 + +TilesetPokeComCenterMeta: ; 0xb48a0 +INCBIN "data/tilesets/pokecom_center_metatiles.bin" +; 0xb4ca0 + +TilesetPokeComCenterColl: ; 0xb4ca0 +INCLUDE "data/tilesets/pokecom_center_collision.asm" +; 0xb4da0 + +TilesetBattleTowerGFX: ; 0xb4da0 +INCBIN "gfx/tilesets/battle_tower.2bpp.lz" +; 0xb50e0 + +TilesetBattleTowerMeta: ; 0xb50e0 +INCBIN "data/tilesets/battle_tower_metatiles.bin" +; 0xb54e0 + +TilesetBattleTowerColl: ; 0xb54e0 +INCLUDE "data/tilesets/battle_tower_collision.asm" +; 0xb55e0 + +TilesetGateGFX: ; 0xb55e0 +INCBIN "gfx/tilesets/gate.2bpp.lz" +; 0xb59e0 + +TilesetGateMeta: ; 0xb59e0 +INCBIN "data/tilesets/gate_metatiles.bin" +; 0xb5de0 + +TilesetGateColl: ; 0xb5de0 +INCLUDE "data/tilesets/gate_collision.asm" +; 0xb5ee0 + +TilesetJohto2GFX: ; 0xb5ee0 +TilesetBattleTowerOutsideGFX: ; 0xb5ee0 +INCBIN "gfx/tilesets/johto_2.2bpp.lz" +; 0xb6ae8 + +TilesetJohto2Meta: ; 0xb6ae8 +INCBIN "data/tilesets/johto_2_metatiles.bin" +; 0xb72e8 + +TilesetJohto2Coll: ; 0xb72e8 +INCLUDE "data/tilesets/johto_2_collision.asm" +; 0xb74e8 + +TilesetKurtsHouseGFX: ; 0xb74e8 +INCBIN "gfx/tilesets/kurts_house.2bpp.lz" +; 0xb79a8 + +TilesetKurtsHouseMeta: ; 0xb79a8 +INCBIN "data/tilesets/kurts_house_metatiles.bin" +; 0xb7da8 + +TilesetKurtsHouseColl: ; 0xb7da8 +INCLUDE "data/tilesets/kurts_house_collision.asm" +; 0xb7ea8 + + +SECTION "Tileset Data 6", ROMX + +TilesetIlexForestGFX: ; 0xdc000 +INCBIN "gfx/tilesets/ilex_forest.2bpp.lz" +; 0xdc3d0 + +TilesetOlivineGymGFX: ; 0xdc3d0 +INCBIN "gfx/tilesets/olivine_gym.2bpp.lz" +; 0xdcc50 + +TilesetOlivineGymMeta: ; 0xdcc50 +INCBIN "data/tilesets/olivine_gym_metatiles.bin" +; 0xdd050 + +TilesetOlivineGymColl: ; 0xdd050 +INCLUDE "data/tilesets/olivine_gym_collision.asm" +; 0xdd150 + +TilesetHouse1GFX: ; 0xdd150 +INCBIN "gfx/tilesets/house_1.2bpp.lz" +; 0xdd600 + +TilesetHouse1Meta: ; 0xdd600 +INCBIN "data/tilesets/house_1_metatiles.bin" +; 0xdda00 + +TilesetHouse1Coll: ; 0xdda00 +INCLUDE "data/tilesets/house_1_collision.asm" +; 0xddb00 + +TilesetLighthouseGFX: ; 0xddb00 +INCBIN "gfx/tilesets/lighthouse.2bpp.lz" +; 0xddf70 + +TilesetLighthouseMeta: ; 0xddf70 +INCBIN "data/tilesets/lighthouse_metatiles.bin" +; 0xde370 + +TilesetLighthouseColl: ; 0xde370 +INCLUDE "data/tilesets/lighthouse_collision.asm" +; 0xde470 + +TilesetIlexForestColl: ; 0xde470 +INCLUDE "data/tilesets/ilex_forest_collision.asm" +; 0xde570 + +TilesetPowerPlantGFX: ; 0xde570 +INCBIN "gfx/tilesets/power_plant.2bpp.lz" +; 0xde990 + +TilesetPowerPlantMeta: ; 0xde990 +INCBIN "data/tilesets/power_plant_metatiles.bin" +; 0xded90 + +TilesetPowerPlantColl: ; 0xded90 +INCLUDE "data/tilesets/power_plant_collision.asm" +; 0xdee90 + +TilesetBattleTowerOutsideMeta: ; 0xdee90 +INCBIN "data/tilesets/battle_tower_outside_metatiles.bin" +; 0xdf690 + +TilesetBattleTowerOutsideColl: ; 0xdf690 +INCLUDE "data/tilesets/battle_tower_outside_collision.asm" +; 0xdf890 + +TilesetBetaWordRoomMeta: ; 0xdf890 +INCBIN "data/tilesets/beta_word_room_metatiles.bin" +; 0xdfc90 + +TilesetBetaWordRoomColl: ; 0xdfc90 +TilesetHoOhWordRoomColl: ; 0xdfc90 +TilesetKabutoWordRoomColl: ; 0xdfc90 +TilesetOmanyteWordRoomColl: ; 0xdfc90 +TilesetAerodactylWordRoomColl: ; 0xdfc90 +INCLUDE "data/tilesets/beta_word_room_collision.asm" +; 0xdfd90 + + +SECTION "Tileset Data 7", ROMX + +TilesetRuinsOfAlphGFX: ; 0x1dc5a1 +TilesetBetaWordRoomGFX: ; 0x1dc5a1 +TilesetHoOhWordRoomGFX: ; 0x1dc5a1 +TilesetKabutoWordRoomGFX: ; 0x1dc5a1 +TilesetOmanyteWordRoomGFX: ; 0x1dc5a1 +TilesetAerodactylWordRoomGFX: ; 0x1dc5a1 +INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz" +; 0x1dd1a9 + +TilesetRuinsOfAlphMeta: ; 0x1dd1a9 +INCBIN "data/tilesets/ruins_of_alph_metatiles.bin" +; 0x1dd5a9 + +TilesetRuinsOfAlphColl: ; 0x1dd5a9 +INCLUDE "data/tilesets/ruins_of_alph_collision.asm" +; 0x1dd6a9 + + +SECTION "Tileset Data 8", ROMX + +TilesetHoOhWordRoomMeta: ; 0x1e0000 +INCBIN "data/tilesets/ho_oh_word_room_metatiles.bin" +; 0x1e0400 + +TilesetKabutoWordRoomMeta: ; 0x1e0400 +INCBIN "data/tilesets/kabuto_word_room_metatiles.bin" +; 0x1e0800 + +TilesetOmanyteWordRoomMeta: ; 0x1e0800 +INCBIN "data/tilesets/omanyte_word_room_metatiles.bin" +; 0x1e0c00 + +TilesetAerodactylWordRoomMeta: ; 0x1e0c00 +INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin" +; 0x1e1000 diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tilesets/palette_maps.asm index a0efab45d..2b6564e7b 100644 --- a/gfx/tilesets/palette_maps.asm +++ b/gfx/tilesets/palette_maps.asm @@ -1,4 +1,5 @@ tilepal: MACRO +; used in gfx/tilesets/*_palette_map.asm ; vram bank, pals x = \1 << OAM_TILE_BANK rept (_NARG +- 1) / 2 -- cgit v1.2.3 From d91e42ca5e3796108b01df9e6535e84892cbf9cc Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 18:10:01 -0500 Subject: Group some mutually edited files in data/sprites/ --- gfx/overworld/map_objects.pal | 39 --------------------------------------- gfx/overworld/map_sprites.pal | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 gfx/overworld/map_objects.pal create mode 100644 gfx/overworld/map_sprites.pal (limited to 'gfx') diff --git a/gfx/overworld/map_objects.pal b/gfx/overworld/map_objects.pal deleted file mode 100644 index b0f33479a..000000000 --- a/gfx/overworld/map_objects.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/gfx/overworld/map_sprites.pal b/gfx/overworld/map_sprites.pal new file mode 100644 index 000000000..b0f33479a --- /dev/null +++ b/gfx/overworld/map_sprites.pal @@ -0,0 +1,39 @@ +; 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 -- cgit v1.2.3 From b45f89f80c62d22cbc2a4b38ae63a2da67878ee4 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 01:45:27 -0500 Subject: More constants and data tables --- gfx/tilesets/roofs.pal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gfx') diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal index ba65fc7d2..2b0c3895a 100644 --- a/gfx/tilesets/roofs.pal +++ b/gfx/tilesets/roofs.pal @@ -16,7 +16,7 @@ RGB 06, 09, 07 RGB 04, 05, 06 -; group 3 +; group 3 (dungeons) RGB 21, 21, 21 RGB 11, 11, 11 RGB 21, 21, 21 @@ -94,7 +94,7 @@ RGB 09, 13, 19 RGB 07, 07, 16 -; group 16 (Route 23) +; group 16 (Indigo) RGB 21, 21, 21 RGB 13, 13, 13 RGB 11, 11, 19 @@ -112,13 +112,13 @@ RGB 12, 07, 17 RGB 08, 06, 10 -; group 19 (Route 28) +; group 19 (Silver Cave) RGB 21, 21, 25 RGB 16, 16, 16 RGB 13, 13, 13 RGB 07, 07, 07 -; group 20 +; group 20 (Cable Club) RGB 21, 21, 21 RGB 11, 11, 11 RGB 21, 21, 21 -- cgit v1.2.3 From 68e5a703cbf37597a729834b74b7545c9b0636cc Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 02:10:06 -0500 Subject: Resize SGB graphics --- gfx/sgb/sgb_border.png | Bin 632 -> 608 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'gfx') diff --git a/gfx/sgb/sgb_border.png b/gfx/sgb/sgb_border.png index 867c36b10..054ab4880 100644 Binary files a/gfx/sgb/sgb_border.png and b/gfx/sgb/sgb_border.png differ -- cgit v1.2.3 From 163f3e0c3f56831b5255b31045798ac950098faa Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 22:16:17 -0500 Subject: Local UI tiles don't belong in charmap Separate 1bpp font tiles from gfx/mobile/phone_tiles.png --- gfx/font.asm | 58 ++++++++++++++++++++++---------------- gfx/font/black.png | Bin 0 -> 68 bytes gfx/font/font_battle_extra.png | Bin 280 -> 264 bytes gfx/font/font_extra.png | Bin 293 -> 281 bytes gfx/font/overworld_phone_icon.png | Bin 82 -> 0 bytes gfx/font/overworld_space.png | Bin 0 -> 71 bytes gfx/font/phone_icon.png | Bin 0 -> 82 bytes gfx/font/space.png | Bin 71 -> 0 bytes gfx/font/unused_arrow.png | Bin 0 -> 86 bytes gfx/mobile/phone_tiles.png | Bin 264 -> 245 bytes gfx/overworld_font.asm | 14 ++++----- 11 files changed, 40 insertions(+), 32 deletions(-) create mode 100644 gfx/font/black.png delete mode 100644 gfx/font/overworld_phone_icon.png create mode 100644 gfx/font/overworld_space.png create mode 100644 gfx/font/phone_icon.png delete mode 100644 gfx/font/space.png create mode 100644 gfx/font/unused_arrow.png (limited to 'gfx') diff --git a/gfx/font.asm b/gfx/font.asm index 9da7eaafc..64ff86caf 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -54,8 +54,8 @@ UnusedWeekdayKanjiGFX: ; unused kanji INCBIN "gfx/font/unused_weekday_kanji.2bpp" ; f8f24 -OverworldPhoneIconGFX: ; f8f24 -INCBIN "gfx/font/overworld_phone_icon.2bpp" +PokegearPhoneIconGFX: ; f8f24 +INCBIN "gfx/font/phone_icon.2bpp" ; f8f34 UnusedBoldFontGFX: ; unused bold letters + unown chars @@ -66,7 +66,15 @@ TextBoxSpaceGFX: ; f9204 INCBIN "gfx/frames/space.1bpp" ; f9214 -MobilePhoneTilesGFX: ; f9214 +FontsExtra_SolidBlackGFX: ; f9214 +INCBIN "gfx/font/black.1bpp" +; f921c + +UnusedUpArrowGFX: ; unused up arrow + whitespace +INCBIN "gfx/font/unused_arrow.1bpp" +; f9234 + +MobilePhoneTilesGFX: ; f9234 INCBIN "gfx/mobile/phone_tiles.2bpp" ; f9344 @@ -105,42 +113,42 @@ Functionfb43f: ; fb43f _LoadStandardFont:: ; fb449 ld de, Font ld hl, vTiles1 - lb bc, BANK(Font), $80 + lb bc, BANK(Font), 128 ; "A" to "9" ld a, [rLCDC] bit rLCDC_ENABLE, a jp z, Copy1bpp ld de, Font ld hl, vTiles1 - lb bc, BANK(Font), $20 + lb bc, BANK(Font), 32 ; "A" to "]" call Get1bpp_2 - ld de, Font + $20 * LEN_1BPP_TILE + ld de, Font + 32 * LEN_1BPP_TILE ld hl, vTiles1 tile $20 - lb bc, BANK(Font), $20 + lb bc, BANK(Font), 32 ; "a" to $bf call Get1bpp_2 - ld de, Font + $40 * LEN_1BPP_TILE + ld de, Font + 64 * LEN_1BPP_TILE ld hl, vTiles1 tile $40 - lb bc, BANK(Font), $20 + lb bc, BANK(Font), 32 ; "Ä" to "←" call Get1bpp_2 - ld de, Font + $60 * LEN_1BPP_TILE + ld de, Font + 96 * LEN_1BPP_TILE ld hl, vTiles1 tile $60 - lb bc, BANK(Font), $20 + lb bc, BANK(Font), 32 ; "'" to "9" call Get1bpp_2 ret ; fb48a _LoadFontsExtra1:: ; fb48a - ld de, MobilePhoneTilesGFX + ld de, FontsExtra_SolidBlackGFX ld hl, vTiles2 tile "" ; $60 - lb bc, BANK(MobilePhoneTilesGFX), 1 + lb bc, BANK(FontsExtra_SolidBlackGFX), 1 call Get1bpp_2 - ld de, OverworldPhoneIconGFX + ld de, PokegearPhoneIconGFX ld hl, vTiles2 tile "" ; $62 - lb bc, BANK(OverworldPhoneIconGFX), 1 + lb bc, BANK(PokegearPhoneIconGFX), 1 call Get2bpp_2 - ld de, FontExtra + 3 * LEN_2BPP_TILE - ld hl, vTiles2 tile $63 - lb bc, BANK(FontExtra), $16 + ld de, FontExtra tile 3 + ld hl, vTiles2 tile "" + lb bc, BANK(FontExtra), 22 ; "" to "ぉ" call Get2bpp_2 jr LoadFrame ; fb4b0 @@ -157,7 +165,7 @@ _LoadFontsExtra2:: ; fb4b0 _LoadFontsBattleExtra:: ; fb4be ld de, FontBattleExtra ld hl, vTiles2 tile $60 - lb bc, BANK(FontBattleExtra), $19 + lb bc, BANK(FontBattleExtra), 25 call Get2bpp_2 jr LoadFrame ; fb4cc @@ -165,13 +173,13 @@ _LoadFontsBattleExtra:: ; fb4be LoadFrame: ; fb4cc ld a, [TextBoxFrame] and 7 - ld bc, LEN_1BPP_TILE * 6 + ld bc, 6 * LEN_1BPP_TILE ld hl, Frames call AddNTimes ld d, h ld e, l ld hl, vTiles2 tile "┌" ; $79 - lb bc, BANK(Frames), 6 + lb bc, BANK(Frames), 6 ; "┌" to "┘" call Get1bpp_2 ld hl, vTiles2 tile " " ; $7f ld de, TextBoxSpaceGFX @@ -183,11 +191,11 @@ LoadFrame: ; fb4cc LoadBattleFontsHPBar: ; fb4f2 ld de, FontBattleExtra ld hl, vTiles2 tile $60 - lb bc, BANK(FontBattleExtra), $c + lb bc, BANK(FontBattleExtra), 12 call Get2bpp_2 ld hl, vTiles2 tile $70 - ld de, FontBattleExtra tile $10 - lb bc, BANK(FontBattleExtra), 3 + ld de, FontBattleExtra tile 16 + lb bc, BANK(FontBattleExtra), 3 ; "<ど>" to "『" call Get2bpp_2 call LoadFrame @@ -204,7 +212,7 @@ LoadHPBar: ; fb50d ld hl, vTiles2 tile $55 lb bc, BANK(ExpBarGFX), 9 call Get2bpp_2 - ld de, MobilePhoneTilesGFX + 9 * LEN_2BPP_TILE + ld de, MobilePhoneTilesGFX tile 7 ; mobile phone icon ld hl, vTiles2 tile $5e lb bc, BANK(MobilePhoneTilesGFX), 2 call Get2bpp_2 diff --git a/gfx/font/black.png b/gfx/font/black.png new file mode 100644 index 000000000..e2bd6299c Binary files /dev/null and b/gfx/font/black.png differ diff --git a/gfx/font/font_battle_extra.png b/gfx/font/font_battle_extra.png index 15e25a40c..2472048d9 100644 Binary files a/gfx/font/font_battle_extra.png and b/gfx/font/font_battle_extra.png differ diff --git a/gfx/font/font_extra.png b/gfx/font/font_extra.png index 7ca840c3a..b9fbf811e 100644 Binary files a/gfx/font/font_extra.png and b/gfx/font/font_extra.png differ diff --git a/gfx/font/overworld_phone_icon.png b/gfx/font/overworld_phone_icon.png deleted file mode 100644 index 9e13a121b..000000000 Binary files a/gfx/font/overworld_phone_icon.png and /dev/null differ diff --git a/gfx/font/overworld_space.png b/gfx/font/overworld_space.png new file mode 100644 index 000000000..726178132 Binary files /dev/null and b/gfx/font/overworld_space.png differ diff --git a/gfx/font/phone_icon.png b/gfx/font/phone_icon.png new file mode 100644 index 000000000..9e13a121b Binary files /dev/null and b/gfx/font/phone_icon.png differ diff --git a/gfx/font/space.png b/gfx/font/space.png deleted file mode 100644 index 726178132..000000000 Binary files a/gfx/font/space.png and /dev/null differ diff --git a/gfx/font/unused_arrow.png b/gfx/font/unused_arrow.png new file mode 100644 index 000000000..24a5a5c41 Binary files /dev/null and b/gfx/font/unused_arrow.png differ diff --git a/gfx/mobile/phone_tiles.png b/gfx/mobile/phone_tiles.png index 5450c15f8..3aa8a68ef 100644 Binary files a/gfx/mobile/phone_tiles.png and b/gfx/mobile/phone_tiles.png differ diff --git a/gfx/overworld_font.asm b/gfx/overworld_font.asm index a1657c8fb..f23f01c4e 100644 --- a/gfx/overworld_font.asm +++ b/gfx/overworld_font.asm @@ -1,17 +1,17 @@ LoadOverworldFont:: ; 106594 - ld de, .font + ld de, .OverworldFontGFX ld hl, vTiles1 - lb bc, BANK(.font), $80 + lb bc, BANK(.OverworldFontGFX), $80 call Get2bpp - ld de, .space + ld de, .OverworldFontSpaceGFX ld hl, vTiles2 tile " " - lb bc, BANK(.space), 1 + lb bc, BANK(.OverworldFontSpaceGFX), 1 call Get2bpp ret ; 1065ad -.font +.OverworldFontGFX: INCBIN "gfx/font/overworld.2bpp" -.space -INCBIN "gfx/font/space.2bpp" +.OverworldFontSpaceGFX: +INCBIN "gfx/font/overworld_space.2bpp" -- cgit v1.2.3 From 2085ebcc617fdd78cc8194dc4a9a34e9fb8e8b51 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 23:04:50 -0500 Subject: maskbits for NUM_FRAMES --- gfx/font.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gfx') diff --git a/gfx/font.asm b/gfx/font.asm index 64ff86caf..3b7ec39e9 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -172,7 +172,7 @@ _LoadFontsBattleExtra:: ; fb4be LoadFrame: ; fb4cc ld a, [TextBoxFrame] - and 7 + maskbits NUM_FRAMES +- 1 ld bc, 6 * LEN_1BPP_TILE ld hl, Frames call AddNTimes -- cgit v1.2.3 From b23085f526fab9c72d8851e1aba41a27f8ba7e14 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 23:51:43 -0500 Subject: Missed graphics --- gfx/fishing.asm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 gfx/fishing.asm (limited to 'gfx') diff --git a/gfx/fishing.asm b/gfx/fishing.asm new file mode 100644 index 000000000..f67c51d8b --- /dev/null +++ b/gfx/fishing.asm @@ -0,0 +1,46 @@ +LoadFishingGFX: ; b84b3 + ld a, [rVBK] + push af + ld a, $1 + ld [rVBK], a + + ld de, FishingGFX + ld a, [wPlayerGender] + bit 0, a + jr z, .got_gender + ld de, KrisFishingGFX +.got_gender + + ld hl, vTiles0 tile $02 + call .LoadGFX + ld hl, vTiles0 tile $06 + call .LoadGFX + ld hl, vTiles0 tile $0a + call .LoadGFX + ld hl, vTiles1 tile $7c + call .LoadGFX + + pop af + ld [rVBK], a + ret +; b84e3 + +.LoadGFX: ; b84e3 + lb bc, BANK(FishingGFX), 2 + push de + call Get2bpp + pop de + ld hl, 2 tiles + add hl, de + ld d, h + ld e, l + ret +; b84f2 + +FishingGFX: ; b84f2 +INCBIN "gfx/overworld/chris_fish.2bpp" +; b8582 + +KrisFishingGFX: ; b8582 +INCBIN "gfx/overworld/kris_fish.2bpp" +; b8612 -- cgit v1.2.3 From c6a4d35d57670e73d5011bf09e6ee6345dd77f3f Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 02:56:14 -0500 Subject: npc_sprites.pal matches PAL_NPC constants --- gfx/overworld/map_sprites.pal | 39 --------------------------------------- gfx/overworld/npc_sprites.pal | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 gfx/overworld/map_sprites.pal create mode 100644 gfx/overworld/npc_sprites.pal (limited to 'gfx') diff --git a/gfx/overworld/map_sprites.pal b/gfx/overworld/map_sprites.pal deleted file mode 100644 index b0f33479a..000000000 --- a/gfx/overworld/map_sprites.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/gfx/overworld/npc_sprites.pal b/gfx/overworld/npc_sprites.pal new file mode 100644 index 000000000..b0f33479a --- /dev/null +++ b/gfx/overworld/npc_sprites.pal @@ -0,0 +1,39 @@ +; 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 -- cgit v1.2.3 From bdc95598d7796d2802295f221d08eef3abb68cec Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 03:07:48 -0500 Subject: Easier to find palette data --- gfx/sgb/roof_pal_inds.asm | 32 +++++++++ gfx/tilesets/roofs.pal | 162 ++++++++++++++++------------------------------ 2 files changed, 86 insertions(+), 108 deletions(-) create mode 100644 gfx/sgb/roof_pal_inds.asm (limited to 'gfx') diff --git a/gfx/sgb/roof_pal_inds.asm b/gfx/sgb/roof_pal_inds.asm new file mode 100644 index 000000000..5692c880a --- /dev/null +++ b/gfx/sgb/roof_pal_inds.asm @@ -0,0 +1,32 @@ +; Crystal does not support SGB, so this is unused. + +MapGroupRoofSGBPalInds: ; 8a45 +; entries correspond to map groups + db $00 ; group 0 (unused) + db $12 ; group 1 (Olivine) + db $14 ; group 2 (Mahogany) + db $18 ; group 3 (dungeons) + db $11 ; group 4 (Ecruteak) + db $15 ; group 5 (Blackthorn) + db $09 ; group 6 (Cinnabar) + db $04 ; group 7 (Cerulean) + db $0f ; group 8 (Azalea) + db $16 ; group 9 (Lake of Rage) + db $0e ; group 10 (Violet) + db $10 ; group 11 (Goldenrod) + db $06 ; group 12 (Vermilion) + db $01 ; group 13 (Pallet) + db $03 ; group 14 (Pewter) + db $06 ; group 15 (Mount Moon Square) + db $0b ; group 16 (Indigo) + db $08 ; group 17 (Fuchsia) + db $05 ; group 18 (Lavender) + db $17 ; group 19 (Silver Cave) + db $08 ; group 20 (Cable Club) + db $07 ; group 21 (Celadon) + db $13 ; group 22 (Cianwood) + db $02 ; group 23 (Viridian) + db $0c ; group 24 (New Bark) + db $0a ; group 25 (Saffron) + db $0d ; group 26 (Cherrygrove) +; 8a60 diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal index 2b0c3895a..6daf87cb6 100644 --- a/gfx/tilesets/roofs.pal +++ b/gfx/tilesets/roofs.pal @@ -1,161 +1,107 @@ ; group 0 (unused) - RGB 21, 21, 21 - RGB 11, 11, 11 - RGB 21, 21, 21 - RGB 11, 11, 11 + RGB 21,21,21, 11,11,11 ; morn/day + RGB 21,21,21, 11,11,11; nite ; group 1 (Olivine) - RGB 14, 17, 31 - RGB 07, 11, 15 - RGB 09, 09, 17 - RGB 05, 07, 13 + RGB 14,17,31, 07,11,15 ; morn/day + RGB 09,09,17, 05,07,13; nite ; group 2 (Mahogany) - RGB 12, 19, 00 - RGB 06, 10, 00 - RGB 06, 09, 07 - RGB 04, 05, 06 + RGB 12,19,00, 06,10,00 ; morn/day + RGB 06,09,07, 04,05,06; nite ; group 3 (dungeons) - RGB 21, 21, 21 - RGB 11, 11, 11 - RGB 21, 21, 21 - RGB 17, 08, 07 + RGB 21,21,21, 11,11,11 ; morn/day + RGB 21,21,21, 17,08,07; nite ; group 4 (Ecruteak) - RGB 31, 19, 00 - RGB 27, 10, 05 - RGB 15, 07, 02 - RGB 11, 04, 02 + RGB 31,19,00, 27,10,05 ; morn/day + RGB 15,07,02, 11,04,02; nite ; group 5 (Blackthorn) - RGB 11, 10, 16 - RGB 05, 06, 07 - RGB 03, 04, 08 - RGB 00, 00, 00 + RGB 11,10,16, 05,06,07 ; morn/day + RGB 03,04,08, 00,00,00; nite ; group 6 (Cinnabar) - RGB 31, 10, 00 - RGB 18, 06, 00 - RGB 18, 05, 09 - RGB 17, 08, 07 + RGB 31,10,00, 18,06,00 ; morn/day + RGB 18,05,09, 17,08,07; nite ; group 7 (Cerulean) - RGB 17, 27, 31 - RGB 05, 15, 31 - RGB 07, 08, 22 - RGB 07, 07, 16 + RGB 17,27,31, 05,15,31 ; morn/day + RGB 07,08,22, 07,07,16; nite ; group 8 (Azalea) - RGB 22, 20, 10 - RGB 17, 14, 03 - RGB 11, 11, 05 - RGB 10, 09, 07 + RGB 22,20,10, 17,14,03 ; morn/day + RGB 11,11,05, 10,09,07; nite ; group 9 (Lake of Rage) - RGB 31, 08, 04 - RGB 09, 09, 08 - RGB 18, 05, 09 - RGB 09, 09, 08 + RGB 31,08,04, 09,09,08 ; morn/day + RGB 18,05,09, 09,09,08; nite ; group 10 (Violet) - RGB 24, 14, 31 - RGB 13, 07, 21 - RGB 12, 03, 18 - RGB 09, 03, 15 + RGB 24,14,31, 13,07,21 ; morn/day + RGB 12,03,18, 09,03,15; nite ; group 11 (Goldenrod) - RGB 25, 25, 00 - RGB 20, 17, 08 - RGB 12, 12, 00 - RGB 10, 09, 05 + RGB 25,25,00, 20,17,08 ; morn/day + RGB 12,12,00, 10,09,05; nite ; group 12 (Vermilion) - RGB 27, 23, 01 - RGB 23, 11, 00 - RGB 15, 11, 01 - RGB 11, 10, 01 + RGB 27,23,01, 23,11,00 ; morn/day + RGB 15,11,01, 11,10,01; nite ; group 13 (Pallet) - RGB 27, 28, 31 - RGB 17, 19, 22 - RGB 14, 14, 18 - RGB 10, 09, 13 + RGB 27,28,31, 17,19,22 ; morn/day + RGB 14,14,18, 10,09,13; nite ; group 14 (Pewter) - RGB 19, 19, 16 - RGB 10, 12, 15 - RGB 09, 09, 11 - RGB 04, 05, 07 + RGB 19,19,16, 10,12,15 ; morn/day + RGB 09,09,11, 04,05,07; nite ; group 15 (Mount Moon Square) - RGB 14, 17, 31 - RGB 07, 11, 15 - RGB 09, 13, 19 - RGB 07, 07, 16 + RGB 14,17,31, 07,11,15 ; morn/day + RGB 09,13,19, 07,07,16; nite ; group 16 (Indigo) - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 11, 11, 19 - RGB 07, 07, 12 + RGB 21,21,21, 13,13,13 ; morn/day + RGB 11,11,19, 07,07,12; nite ; group 17 (Fuchsia) - RGB 31, 18, 29 - RGB 17, 13, 20 - RGB 14, 06, 12 - RGB 11, 03, 10 + RGB 31,18,29, 17,13,20 ; morn/day + RGB 14,06,12, 11,03,10; nite ; group 18 (Lavender) - RGB 23, 15, 31 - RGB 16, 05, 31 - RGB 12, 07, 17 - RGB 08, 06, 10 + RGB 23,15,31, 16,05,31 ; morn/day + RGB 12,07,17, 08,06,10; nite ; group 19 (Silver Cave) - RGB 21, 21, 25 - RGB 16, 16, 16 - RGB 13, 13, 13 - RGB 07, 07, 07 + RGB 21,21,25, 16,16,16 ; morn/day + RGB 13,13,13, 07,07,07; nite ; group 20 (Cable Club) - RGB 21, 21, 21 - RGB 11, 11, 11 - RGB 21, 21, 21 - RGB 11, 11, 11 + RGB 21,21,21, 11,11,11 ; morn/day + RGB 21,21,21, 11,11,11; nite ; group 21 (Celadon) - RGB 19, 31, 15 - RGB 31, 22, 02 - RGB 12, 13, 09 - RGB 09, 12, 03 + RGB 19,31,15, 31,22,02 ; morn/day + RGB 12,13,09, 09,12,03; nite ; group 22 (Cianwood) - RGB 15, 10, 31 - RGB 07, 05, 15 - RGB 06, 05, 17 - RGB 02, 02, 08 + RGB 15,10,31, 07,05,15 ; morn/day + RGB 06,05,17, 02,02,08; nite ; group 23 (Viridian) - RGB 21, 31, 07 - RGB 13, 25, 04 - RGB 09, 14, 08 - RGB 06, 10, 04 + RGB 21,31,07, 13,25,04 ; morn/day + RGB 09,14,08, 06,10,04; nite ; group 24 (New Bark) - RGB 20, 31, 14 - RGB 11, 23, 05 - RGB 09, 13, 08 - RGB 06, 09, 04 + RGB 20,31,14, 11,23,05 ; morn/day + RGB 09,13,08, 06,09,04; nite ; group 25 (Saffron) - RGB 31, 26, 00 - RGB 31, 15, 00 - RGB 13, 13, 01 - RGB 08, 08, 01 + RGB 31,26,00, 31,15,00 ; morn/day + RGB 13,13,01, 08,08,01; nite ; group 26 (Cherrygrove) - RGB 31, 14, 28 - RGB 31, 05, 21 - RGB 14, 07, 17 - RGB 13, 00, 08 + RGB 31,14,28, 31,05,21 ; morn/day + RGB 14,07,17, 13,00,08; nite -- cgit v1.2.3 From 31caeeba3c85821fa733c3e714ede2f62ed89517 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 14:41:42 -0500 Subject: Separate more palettes into gfx/**/*.pal files --- gfx/pc/orange.pal | 4 ++++ gfx/pokedex/cursor.pal | 4 ++++ gfx/pokedex/question_mark.pal | 4 ++++ gfx/splash/logo.pal | 4 ++++ gfx/stats/pages.pal | 15 +++++++++++++ gfx/stats/stats.pal | 6 ++++++ gfx/tilesets/celadon_mansion_1.pal | 44 ++++++++++++++++++++++++++++++++++++++ gfx/tilesets/celadon_mansion_2.pal | 4 ++++ 8 files changed, 85 insertions(+) create mode 100644 gfx/pc/orange.pal create mode 100644 gfx/pokedex/cursor.pal create mode 100644 gfx/pokedex/question_mark.pal create mode 100644 gfx/splash/logo.pal create mode 100644 gfx/stats/pages.pal create mode 100644 gfx/stats/stats.pal create mode 100644 gfx/tilesets/celadon_mansion_1.pal create mode 100644 gfx/tilesets/celadon_mansion_2.pal (limited to 'gfx') diff --git a/gfx/pc/orange.pal b/gfx/pc/orange.pal new file mode 100644 index 000000000..299c6b221 --- /dev/null +++ b/gfx/pc/orange.pal @@ -0,0 +1,4 @@ + RGB 31, 15, 00 + RGB 23, 12, 00 + RGB 15, 07, 00 + RGB 00, 00, 00 diff --git a/gfx/pokedex/cursor.pal b/gfx/pokedex/cursor.pal new file mode 100644 index 000000000..5b202a1bf --- /dev/null +++ b/gfx/pokedex/cursor.pal @@ -0,0 +1,4 @@ + RGB 00, 00, 00 + RGB 11, 23, 00 + RGB 07, 17, 00 + RGB 00, 00, 00 diff --git a/gfx/pokedex/question_mark.pal b/gfx/pokedex/question_mark.pal new file mode 100644 index 000000000..76519ba22 --- /dev/null +++ b/gfx/pokedex/question_mark.pal @@ -0,0 +1,4 @@ + RGB 11, 23, 00 + RGB 07, 17, 00 + RGB 06, 16, 03 + RGB 05, 12, 01 diff --git a/gfx/splash/logo.pal b/gfx/splash/logo.pal new file mode 100644 index 000000000..b1712efc1 --- /dev/null +++ b/gfx/splash/logo.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 13, 11, 00 + RGB 23, 12, 28 + RGB 00, 00, 00 diff --git a/gfx/stats/pages.pal b/gfx/stats/pages.pal new file mode 100644 index 000000000..837e10cb0 --- /dev/null +++ b/gfx/stats/pages.pal @@ -0,0 +1,15 @@ +; pink + RGB 31, 31, 31 + RGB 31, 19, 31 + RGB 31, 15, 31 + RGB 00, 00, 00 +; green + RGB 31, 31, 31 + RGB 21, 31, 14 + RGB 17, 31, 00 + RGB 00, 00, 00 +; blue + RGB 31, 31, 31 + RGB 17, 31, 31 + RGB 17, 31, 31 + RGB 00, 00, 00 diff --git a/gfx/stats/stats.pal b/gfx/stats/stats.pal new file mode 100644 index 000000000..5b12e02b9 --- /dev/null +++ b/gfx/stats/stats.pal @@ -0,0 +1,6 @@ +; pink + RGB 31, 19, 31 +; green + RGB 21, 31, 14 +; blue + RGB 17, 31, 31 diff --git a/gfx/tilesets/celadon_mansion_1.pal b/gfx/tilesets/celadon_mansion_1.pal new file mode 100644 index 000000000..1ed1de75f --- /dev/null +++ b/gfx/tilesets/celadon_mansion_1.pal @@ -0,0 +1,44 @@ + 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 18, 24, 09 + 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 17, 19, 31 + RGB 14, 16, 31 + RGB 07, 07, 07 + + RGB 31, 31, 16 + RGB 31, 31, 16 + RGB 14, 09, 00 + RGB 00, 00, 00 + + RGB 05, 05, 16 + RGB 08, 19, 28 + RGB 00, 00, 00 + RGB 31, 31, 31 diff --git a/gfx/tilesets/celadon_mansion_2.pal b/gfx/tilesets/celadon_mansion_2.pal new file mode 100644 index 000000000..ad5c5e4db --- /dev/null +++ b/gfx/tilesets/celadon_mansion_2.pal @@ -0,0 +1,4 @@ + RGB 25, 24, 23 + RGB 20, 19, 19 + RGB 14, 16, 31 + RGB 07, 07, 07 -- cgit v1.2.3 From f1e1b26138daabc15b83f5a8ce7f6e513749f5a8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 14:54:00 -0500 Subject: More gfx/**/*.pal files --- gfx/intro/gender_screen.pal | 4 ++++ gfx/overworld/heal_machine.pal | 4 ++++ gfx/overworld/trainer_battle_day.pal | 4 ++++ gfx/overworld/trainer_battle_nite.pal | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 gfx/intro/gender_screen.pal create mode 100644 gfx/overworld/heal_machine.pal create mode 100644 gfx/overworld/trainer_battle_day.pal create mode 100644 gfx/overworld/trainer_battle_nite.pal (limited to 'gfx') diff --git a/gfx/intro/gender_screen.pal b/gfx/intro/gender_screen.pal new file mode 100644 index 000000000..ca8ae04aa --- /dev/null +++ b/gfx/intro/gender_screen.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 09, 30, 31 + RGB 01, 11, 31 + RGB 00, 00, 00 diff --git a/gfx/overworld/heal_machine.pal b/gfx/overworld/heal_machine.pal new file mode 100644 index 000000000..28a76de40 --- /dev/null +++ b/gfx/overworld/heal_machine.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 31, 19, 10 + RGB 31, 07, 01 + RGB 00, 00, 00 diff --git a/gfx/overworld/trainer_battle_day.pal b/gfx/overworld/trainer_battle_day.pal new file mode 100644 index 000000000..b7d67891e --- /dev/null +++ b/gfx/overworld/trainer_battle_day.pal @@ -0,0 +1,4 @@ + RGB 31, 18, 29 + RGB 31, 11, 15 + RGB 31, 05, 05 + RGB 07, 07, 07 diff --git a/gfx/overworld/trainer_battle_nite.pal b/gfx/overworld/trainer_battle_nite.pal new file mode 100644 index 000000000..d1a35f33b --- /dev/null +++ b/gfx/overworld/trainer_battle_nite.pal @@ -0,0 +1,4 @@ + RGB 31, 18, 29 + RGB 31, 05, 05 + RGB 31, 05, 05 + RGB 31, 05, 05 -- cgit v1.2.3 From bc22bf26271d6e07b462b0fa77657dd1cb4eb6b5 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 15:06:25 -0500 Subject: =?UTF-8?q?Egg=20palette=20works=20like=20other=20Pok=C3=A9mon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gfx/pokemon/egg/front.png | Bin 435 -> 444 bytes gfx/pokemon/egg/shiny.pal | 4 ++++ 2 files changed, 4 insertions(+) create mode 100644 gfx/pokemon/egg/shiny.pal (limited to 'gfx') diff --git a/gfx/pokemon/egg/front.png b/gfx/pokemon/egg/front.png index be8e9d4a4..a2d8d4cc3 100644 Binary files a/gfx/pokemon/egg/front.png and b/gfx/pokemon/egg/front.png differ diff --git a/gfx/pokemon/egg/shiny.pal b/gfx/pokemon/egg/shiny.pal new file mode 100644 index 000000000..6c9c075f7 --- /dev/null +++ b/gfx/pokemon/egg/shiny.pal @@ -0,0 +1,4 @@ + + RGB 30, 26, 11 + RGB 23, 16, 00 + -- cgit v1.2.3 From 9b198178548c4436b01fb39fca73f42571608586 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 15:26:06 -0500 Subject: Comments explain colors --- gfx/pokegear/pokegear.pal | 11 ++++++----- gfx/pokegear/pokegear_f.pal | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'gfx') diff --git a/gfx/pokegear/pokegear.pal b/gfx/pokegear/pokegear.pal index 397986dec..75cf2cf2d 100644 --- a/gfx/pokegear/pokegear.pal +++ b/gfx/pokegear/pokegear.pal @@ -1,28 +1,29 @@ +; border RGB 28, 31, 20 RGB 21, 21, 21 RGB 13, 13, 13 RGB 00, 00, 00 - +; earth RGB 28, 31, 20 RGB 00, 31, 00 RGB 00, 00, 31 RGB 00, 00, 00 - +; mountain RGB 28, 31, 20 RGB 00, 31, 00 RGB 15, 07, 00 RGB 00, 00, 00 - +; city (boy) RGB 28, 31, 20 RGB 31, 15, 00 RGB 15, 07, 00 RGB 00, 00, 00 - +; point of interest RGB 28, 31, 20 RGB 00, 31, 00 RGB 00, 00, 31 RGB 31, 00, 00 - +; mountain point of interest RGB 28, 31, 20 RGB 00, 31, 00 RGB 15, 07, 00 diff --git a/gfx/pokegear/pokegear_f.pal b/gfx/pokegear/pokegear_f.pal index 3f797c866..78f48fb0c 100644 --- a/gfx/pokegear/pokegear_f.pal +++ b/gfx/pokegear/pokegear_f.pal @@ -1,28 +1,29 @@ +; border RGB 28, 31, 20 RGB 21, 21, 21 RGB 13, 13, 13 RGB 00, 00, 00 - +; earth RGB 28, 31, 20 RGB 00, 31, 00 RGB 00, 00, 31 RGB 00, 00, 00 - +; mountain RGB 28, 31, 20 RGB 00, 31, 00 RGB 15, 07, 00 RGB 00, 00, 00 - +; city (girl) RGB 28, 31, 20 RGB 10, 18, 31 RGB 13, 06, 31 RGB 00, 00, 00 - +; point of interest RGB 28, 31, 20 RGB 00, 31, 00 RGB 00, 00, 31 RGB 31, 00, 00 - +; mountain point of interest RGB 28, 31, 20 RGB 00, 31, 00 RGB 15, 07, 00 -- cgit v1.2.3 From be4510659a8404b31b74c11f65c6c3d09078e560 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 15:30:46 -0500 Subject: Mystery Gift graphics match --- gfx/mystery_gift/mystery_gift.png | Bin 747 -> 698 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'gfx') diff --git a/gfx/mystery_gift/mystery_gift.png b/gfx/mystery_gift/mystery_gift.png index 0fd458dec..83908847a 100644 Binary files a/gfx/mystery_gift/mystery_gift.png and b/gfx/mystery_gift/mystery_gift.png differ -- cgit v1.2.3 From 5a8700c56a24f59eb181221456b3c8a75b60c068 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 16:47:42 -0500 Subject: Add missing file --- gfx/mystery_gift/mystery_gift.pal | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 gfx/mystery_gift/mystery_gift.pal (limited to 'gfx') diff --git a/gfx/mystery_gift/mystery_gift.pal b/gfx/mystery_gift/mystery_gift.pal new file mode 100644 index 000000000..caa44f734 --- /dev/null +++ b/gfx/mystery_gift/mystery_gift.pal @@ -0,0 +1,9 @@ + RGB 31, 31, 31 + RGB 16, 31, 14 + RGB 05, 14, 21 + RGB 05, 13, 10 + + RGB 31, 31, 31 + RGB 11, 21, 25 + RGB 05, 14, 21 + RGB 00, 03, 19 -- cgit v1.2.3 From 0197e6f23c0db6baf11aa1e610521f78b6352605 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 13 Jan 2018 15:22:16 -0500 Subject: Don't split stats gfx in three --- gfx/font.asm | 9 --------- gfx/stats/exp_bar_ends.png | Bin 76 -> 0 bytes gfx/stats/shiny.png | Bin 89 -> 0 bytes gfx/stats/stats_tiles.png | Bin 195 -> 201 bytes 4 files changed, 9 deletions(-) delete mode 100644 gfx/stats/exp_bar_ends.png delete mode 100644 gfx/stats/shiny.png (limited to 'gfx') diff --git a/gfx/font.asm b/gfx/font.asm index 3b7ec39e9..e376e8afd 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -23,15 +23,6 @@ INCBIN "gfx/frames/9.1bpp" StatsScreenPageTilesGFX: ; f89b0 INCBIN "gfx/stats/stats_tiles.2bpp" -; f8a90 - -ShinyIconGFX: ; f8a90 -; also part of StatsScreenPageTilesGFX -INCBIN "gfx/stats/shiny.2bpp" - -ExpBarEndsGFX: ; f8aa0 -; not referenced on its own, but part of StatsScreenPageTilesGFX -INCBIN "gfx/stats/exp_bar_ends.2bpp" ; f8ac0 EnemyHPBarBorderGFX: ; f8ac0 diff --git a/gfx/stats/exp_bar_ends.png b/gfx/stats/exp_bar_ends.png deleted file mode 100644 index 252bdd990..000000000 Binary files a/gfx/stats/exp_bar_ends.png and /dev/null differ diff --git a/gfx/stats/shiny.png b/gfx/stats/shiny.png deleted file mode 100644 index 010aeafbf..000000000 Binary files a/gfx/stats/shiny.png and /dev/null differ diff --git a/gfx/stats/stats_tiles.png b/gfx/stats/stats_tiles.png index 151704af5..5da4a008e 100644 Binary files a/gfx/stats/stats_tiles.png and b/gfx/stats/stats_tiles.png differ -- cgit v1.2.3 From 7a09fc9f750aec50dd568226083b279004ffe155 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 14 Jan 2018 19:43:35 -0500 Subject: GFX tile sizes in decimal --- gfx/font.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gfx') diff --git a/gfx/font.asm b/gfx/font.asm index e376e8afd..fd95c9434 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -231,7 +231,7 @@ StatsScreen_LoadFont: ; fb53e LoadStatsScreenPageTilesGFX: ; fb571 ld de, StatsScreenPageTilesGFX ld hl, vTiles2 tile $31 - lb bc, BANK(StatsScreenPageTilesGFX), $11 + lb bc, BANK(StatsScreenPageTilesGFX), 17 call Get2bpp_2 ret ; fb57e -- cgit v1.2.3 From 911c1320a29b7fd746fd7573ec562d8e21ca3001 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 15 Jan 2018 01:10:56 -0500 Subject: Document PredefPals still used by CGB layouts --- gfx/sgb/predef.pal | 86 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'gfx') diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 15d9000fb..d37fb8c3a 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -1,124 +1,124 @@ -; $00 +; $00 (_CGB_BattleGrayscale via PalPacket_9c66) RGB 31, 31, 31 RGB 22, 25, 19 RGB 16, 21, 30 RGB 00, 00, 00 -; $01 +; $01 (Pallet map group) RGB 31, 31, 31 RGB 27, 28, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $02 +; $02 (Viridian map group) RGB 31, 31, 31 RGB 24, 28, 19 RGB 15, 20, 31 RGB 00, 00, 00 -; $03 +; $03 (Pewter map group) RGB 31, 31, 31 RGB 24, 24, 24 RGB 15, 20, 31 RGB 00, 00, 00 -; $04 +; $04 (Cerulean map group) RGB 31, 31, 31 RGB 21, 23, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $05 +; $05 (Lavender map group) RGB 31, 31, 31 RGB 24, 21, 27 RGB 15, 20, 31 RGB 00, 00, 00 -; $06 +; $06 (Vermilion map group) RGB 31, 31, 31 RGB 31, 24, 16 RGB 15, 20, 31 RGB 00, 00, 00 -; $07 +; $07 (Celadon map group) RGB 31, 31, 31 RGB 25, 30, 26 RGB 15, 20, 31 RGB 00, 00, 00 -; $08 +; $08 (Fuchsia map group) RGB 31, 31, 31 RGB 31, 25, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $09 +; $09 (Cinnabar map group) RGB 31, 31, 31 RGB 31, 20, 19 RGB 15, 20, 31 RGB 00, 00, 00 -; $0a +; $0a (Saffron map group) RGB 31, 31, 31 RGB 31, 26, 19 RGB 15, 20, 31 RGB 00, 00, 00 -; $0b +; $0b (Indigo map group) RGB 31, 31, 31 RGB 27, 28, 27 RGB 15, 20, 31 RGB 00, 00, 00 -; $0c +; $0c (New Bark map group) RGB 31, 31, 31 RGB 24, 30, 23 RGB 15, 20, 31 RGB 00, 00, 00 -; $0d +; $0d (Cherrygrove map group) RGB 31, 31, 31 RGB 29, 24, 29 RGB 15, 20, 31 RGB 00, 00, 00 -; $0e +; $0e (Violet map group) RGB 31, 31, 31 RGB 26, 23, 29 RGB 15, 20, 31 RGB 00, 00, 00 -; $0f +; $0f (Azalea map group) RGB 31, 31, 31 RGB 25, 23, 20 RGB 15, 20, 31 RGB 00, 00, 00 -; $10 +; $10 (Goldenrod map group, _CGB_MoveList) RGB 31, 31, 31 RGB 29, 26, 18 RGB 15, 20, 31 RGB 00, 00, 00 -; $11 +; $11 (Ecruteak map group) RGB 31, 31, 31 RGB 31, 21, 18 RGB 15, 20, 31 RGB 00, 00, 00 -; $12 +; $12 (Olivine map group) RGB 31, 31, 31 RGB 26, 25, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $13 +; $13 (Cianwood map group) RGB 31, 31, 31 RGB 22, 21, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $14 +; $14 (Mahogany map group) RGB 31, 31, 31 RGB 22, 25, 21 RGB 15, 20, 31 RGB 00, 00, 00 -; $15 +; $15 (Blackthorn map group) RGB 31, 31, 31 RGB 21, 21, 22 RGB 15, 20, 31 RGB 00, 00, 00 -; $16 +; $16 (Lake of Rage map group) RGB 31, 31, 31 RGB 31, 20, 20 RGB 15, 20, 31 RGB 00, 00, 00 -; $17 +; $17 (Silver Cave map group) RGB 31, 31, 31 RGB 26, 26, 26 RGB 15, 20, 31 RGB 00, 00, 00 -; $18 +; $18 (dungeon map group) RGB 31, 31, 31 RGB 21, 14, 09 RGB 15, 20, 20 @@ -128,22 +128,22 @@ RGB 12, 28, 22 RGB 15, 20, 20 RGB 00, 00, 00 -; $1a +; $1a (_CGB_Evolution, _CGB_BattleGrayscale via PalPacket_9c66) RGB 31, 31, 31 RGB 07, 07, 07 RGB 02, 03, 03 RGB 00, 00, 00 -; $1b +; $1b (_CGB_Diploma via PalPacket_9cb6, _CGB0d via PalPacket_9cb6) RGB 31, 31, 31 RGB 30, 22, 17 RGB 16, 14, 19 RGB 00, 00, 00 -; $1c +; $1c (_CGB_TradeTube, Unreferenced_Function97cc) RGB 31, 31, 31 RGB 18, 20, 27 RGB 11, 15, 23 RGB 00, 00, 00 -; $1d +; $1d (_CGB_Pokedex, _CGB_BillsPC, _CGB_PokedexUnownMode, _CGB_PokedexSearchOption) RGB 31, 31, 31 RGB 31, 20, 10 RGB 26, 10, 06 @@ -163,7 +163,7 @@ RGB 28, 20, 15 RGB 21, 14, 09 RGB 00, 00, 00 -; $21 +; $21 (Unreferenced_Function97cc) RGB 31, 31, 31 RGB 20, 26, 16 RGB 09, 20, 11 @@ -178,7 +178,7 @@ RGB 31, 28, 14 RGB 26, 20, 00 RGB 00, 00, 00 -; $24 +; $24 (_CGB_TrainerCard, _CGB13 via PalPacket_9ba6) RGB 31, 31, 31 RGB 26, 21, 22 RGB 15, 15, 18 @@ -213,7 +213,7 @@ RGB 20, 17, 18 RGB 18, 13, 11 RGB 00, 00, 00 -; $2b +; $2b (_CGB13 via PalPacket_9ba6) RGB 31, 31, 31 RGB 23, 21, 16 RGB 12, 12, 10 @@ -228,12 +228,12 @@ RGB 26, 23, 16 RGB 29, 14, 09 RGB 00, 00, 00 -; $2e +; $2e (_CGB_PartyMenu via PalPacket_9c56) RGB 31, 31, 31 RGB 18, 18, 18 RGB 10, 10, 10 RGB 00, 00, 00 -; $2f +; $2f (_CGB_PartyMenu via PalPacket_9c56) RGB 31, 31, 31 RGB 30, 26, 15 RGB 00, 23, 00 @@ -253,12 +253,12 @@ RGB 29, 26, 19 RGB 27, 20, 14 RGB 00, 00, 00 -; $33 +; $33 (_CGB06 via PalPacket_9ca6) RGB 31, 31, 31 RGB 24, 20, 10 RGB 21, 00, 04 RGB 00, 00, 00 -; $34 +; $34 (_CGB06 via PalPacket_9ca6) RGB 31, 31, 31 RGB 31, 20, 10 RGB 21, 00, 04 @@ -278,27 +278,27 @@ RGB 15, 28, 26 RGB 23, 24, 24 RGB 00, 00, 00 -; $38 +; $38 (_CGB07.Function9166) RGB 31, 31, 24 RGB 07, 27, 19 RGB 26, 20, 10 RGB 19, 12, 08 -; $39 +; $39 (_CGB07.Function9166, _CGB0f via PalPacket_9c46) RGB 31, 31, 31 RGB 31, 28, 14 RGB 31, 13, 31 RGB 00, 00, 00 -; $3a +; $3a (_CGB07.Function9180) RGB 31, 31, 31 RGB 16, 18, 21 RGB 10, 12, 18 RGB 00, 00, 00 -; $3b +; $3b (Unreferenced_Function8b4d) RGB 31, 31, 31 RGB 23, 21, 16 RGB 12, 12, 10 RGB 00, 00, 00 -; $3c +; $3c (_CGB06, Unreferenced_Function8b67, _CGB07.Function9180 via PalPacket_9c36) RGB 31, 31, 31 RGB 31, 14, 00 RGB 07, 11, 15 @@ -378,7 +378,7 @@ RGB 18, 23, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $4c +; $4c (_CGB_UnownPuzzle) RGB 31, 31, 31 RGB 24, 20, 11 RGB 18, 13, 11 @@ -388,7 +388,7 @@ RGB 31, 31, 31 RGB 25, 30, 00 RGB 25, 30, 00 -; $4e +; $4e (_CGB_GamefreakLogo) RGB 00, 00, 00 RGB 08, 11, 11 RGB 21, 21, 21 -- cgit v1.2.3 From 9180362211cf465c52798124baa5c5c06ba1d332 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 15 Jan 2018 11:06:17 -0500 Subject: Move code out of gfx/ (close #474) --- gfx/fishing.asm | 46 ----- gfx/font.asm | 155 ---------------- gfx/load_pics.asm | 494 ------------------------------------------------- gfx/overworld_font.asm | 17 -- 4 files changed, 712 deletions(-) delete mode 100644 gfx/fishing.asm delete mode 100755 gfx/load_pics.asm delete mode 100644 gfx/overworld_font.asm (limited to 'gfx') diff --git a/gfx/fishing.asm b/gfx/fishing.asm deleted file mode 100644 index f67c51d8b..000000000 --- a/gfx/fishing.asm +++ /dev/null @@ -1,46 +0,0 @@ -LoadFishingGFX: ; b84b3 - ld a, [rVBK] - push af - ld a, $1 - ld [rVBK], a - - ld de, FishingGFX - ld a, [wPlayerGender] - bit 0, a - jr z, .got_gender - ld de, KrisFishingGFX -.got_gender - - ld hl, vTiles0 tile $02 - call .LoadGFX - ld hl, vTiles0 tile $06 - call .LoadGFX - ld hl, vTiles0 tile $0a - call .LoadGFX - ld hl, vTiles1 tile $7c - call .LoadGFX - - pop af - ld [rVBK], a - ret -; b84e3 - -.LoadGFX: ; b84e3 - lb bc, BANK(FishingGFX), 2 - push de - call Get2bpp - pop de - ld hl, 2 tiles - add hl, de - ld d, h - ld e, l - ret -; b84f2 - -FishingGFX: ; b84f2 -INCBIN "gfx/overworld/chris_fish.2bpp" -; b8582 - -KrisFishingGFX: ; b8582 -INCBIN "gfx/overworld/kris_fish.2bpp" -; b8612 diff --git a/gfx/font.asm b/gfx/font.asm index e525df85b..bd7b60c3c 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -80,158 +80,3 @@ INCBIN "gfx/font/up_arrow.2bpp" Footprints: ; f9434 INCLUDE "gfx/footprints.asm" ; fb434 - -; This and the following two functions are unreferenced. -; Debug, perhaps? -Unreferenced_fb434: - db 0 - -Unreferenced_Functionfb435: ; 4b435 - ld a, [Unreferenced_fb434] - and a - jp nz, Get1bpp_2 - jp Get1bpp -; fb43f - -Unreferenced_Functionfb43f: ; fb43f - ld a, [Unreferenced_fb434] - and a - jp nz, Get2bpp_2 - jp Get2bpp -; End unreferenced block -; fb449 - -_LoadStandardFont:: ; fb449 - ld de, Font - ld hl, vTiles1 - lb bc, BANK(Font), 128 ; "A" to "9" - ld a, [rLCDC] - bit rLCDC_ENABLE, a - jp z, Copy1bpp - - ld de, Font - ld hl, vTiles1 - lb bc, BANK(Font), 32 ; "A" to "]" - call Get1bpp_2 - ld de, Font + 32 * LEN_1BPP_TILE - ld hl, vTiles1 tile $20 - lb bc, BANK(Font), 32 ; "a" to $bf - call Get1bpp_2 - ld de, Font + 64 * LEN_1BPP_TILE - ld hl, vTiles1 tile $40 - lb bc, BANK(Font), 32 ; "Ä" to "←" - call Get1bpp_2 - ld de, Font + 96 * LEN_1BPP_TILE - ld hl, vTiles1 tile $60 - lb bc, BANK(Font), 32 ; "'" to "9" - call Get1bpp_2 - ret -; fb48a - -_LoadFontsExtra1:: ; fb48a - ld de, FontsExtra_SolidBlackGFX - ld hl, vTiles2 tile "" ; $60 - lb bc, BANK(FontsExtra_SolidBlackGFX), 1 - call Get1bpp_2 - ld de, PokegearPhoneIconGFX - ld hl, vTiles2 tile "" ; $62 - lb bc, BANK(PokegearPhoneIconGFX), 1 - call Get2bpp_2 - ld de, FontExtra tile 3 - ld hl, vTiles2 tile "" - lb bc, BANK(FontExtra), 22 ; "" to "ぉ" - call Get2bpp_2 - jr LoadFrame -; fb4b0 - -_LoadFontsExtra2:: ; fb4b0 - ld de, FontsExtra2_UpArrowGFX - ld hl, vTiles2 tile "▲" ; $61 - ld b, BANK(FontsExtra2_UpArrowGFX) - ld c, 1 - call Get2bpp_2 - ret -; fb4be - -_LoadFontsBattleExtra:: ; fb4be - ld de, FontBattleExtra - ld hl, vTiles2 tile $60 - lb bc, BANK(FontBattleExtra), 25 - call Get2bpp_2 - jr LoadFrame -; fb4cc - -LoadFrame: ; fb4cc - ld a, [TextBoxFrame] - maskbits NUM_FRAMES +- 1 - ld bc, 6 * LEN_1BPP_TILE - ld hl, Frames - call AddNTimes - ld d, h - ld e, l - ld hl, vTiles2 tile "┌" ; $79 - lb bc, BANK(Frames), 6 ; "┌" to "┘" - call Get1bpp_2 - ld hl, vTiles2 tile " " ; $7f - ld de, TextBoxSpaceGFX - lb bc, BANK(TextBoxSpaceGFX), 1 - call Get1bpp_2 - ret -; fb4f2 - -LoadBattleFontsHPBar: ; fb4f2 - ld de, FontBattleExtra - ld hl, vTiles2 tile $60 - lb bc, BANK(FontBattleExtra), 12 - call Get2bpp_2 - ld hl, vTiles2 tile $70 - ld de, FontBattleExtra tile 16 - lb bc, BANK(FontBattleExtra), 3 ; "<ど>" to "『" - call Get2bpp_2 - call LoadFrame - -LoadHPBar: ; fb50d - ld de, EnemyHPBarBorderGFX - ld hl, vTiles2 tile $6c - lb bc, BANK(EnemyHPBarBorderGFX), 4 - call Get1bpp_2 - ld de, HPExpBarBorderGFX - ld hl, vTiles2 tile $73 - lb bc, BANK(HPExpBarBorderGFX), 6 - call Get1bpp_2 - ld de, ExpBarGFX - ld hl, vTiles2 tile $55 - lb bc, BANK(ExpBarGFX), 9 - call Get2bpp_2 - ld de, MobilePhoneTilesGFX tile 7 ; mobile phone icon - ld hl, vTiles2 tile $5e - lb bc, BANK(MobilePhoneTilesGFX), 2 - call Get2bpp_2 - ret -; fb53e - -StatsScreen_LoadFont: ; fb53e - call _LoadFontsBattleExtra - ld de, EnemyHPBarBorderGFX - ld hl, vTiles2 tile $6c - lb bc, BANK(EnemyHPBarBorderGFX), 4 - call Get1bpp_2 - ld de, HPExpBarBorderGFX - ld hl, vTiles2 tile $78 - lb bc, BANK(HPExpBarBorderGFX), 1 - call Get1bpp_2 - ld de, HPExpBarBorderGFX + 3 * LEN_1BPP_TILE - ld hl, vTiles2 tile $76 - lb bc, BANK(HPExpBarBorderGFX), 2 - call Get1bpp_2 - ld de, ExpBarGFX - ld hl, vTiles2 tile $55 - lb bc, BANK(ExpBarGFX), 8 - call Get2bpp_2 -LoadStatsScreenPageTilesGFX: ; fb571 - ld de, StatsScreenPageTilesGFX - ld hl, vTiles2 tile $31 - lb bc, BANK(StatsScreenPageTilesGFX), 17 - call Get2bpp_2 - ret -; fb57e diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm deleted file mode 100755 index e58ecb615..000000000 --- a/gfx/load_pics.asm +++ /dev/null @@ -1,494 +0,0 @@ -Predef_GetUnownLetter: ; 51040 -; Return Unown letter in UnownLetter based on DVs at hl - -; Take the middle 2 bits of each DV and place them in order: -; atk def spd spc -; .ww..xx. .yy..zz. - - ; atk - ld a, [hl] - and %01100000 - sla a - ld b, a - ; def - ld a, [hli] - and %00000110 - swap a - srl a - or b - ld b, a - - ; spd - ld a, [hl] - and %01100000 - swap a - sla a - or b - ld b, a - ; spc - ld a, [hl] - and %00000110 - srl a - or b - -; Divide by 10 to get 0-25 - ld [hDividend + 3], a - xor a - ld [hDividend], a - ld [hDividend + 1], a - ld [hDividend + 2], a - ld a, 10 - ld [hDivisor], a - ld b, 4 - call Divide - -; Increment to get 1-26 - ld a, [hQuotient + 2] - inc a - ld [UnownLetter], a - ret - -Predef_GetMonFrontpic: ; 51077 - ld a, [CurPartySpecies] - ld [CurSpecies], a - call IsAPokemon - ret c - ld a, [rSVBK] - push af - call _GetFrontpic - pop af - ld [rSVBK], a - ret - -Predef_GetAnimatedFrontpic: ; 5108b - ld a, [CurPartySpecies] - ld [CurSpecies], a - call IsAPokemon - ret c - ld a, [rSVBK] - push af - xor a - ld [hBGMapMode], a - call _GetFrontpic - call GetAnimatedFrontpic - pop af - ld [rSVBK], a - ret - -_GetFrontpic: ; 510a5 - push de - call GetBaseData - ld a, [BasePicSize] - and $f - ld b, a - push bc - call GetFrontpicPointer - ld a, BANK(wDecompressEnemyFrontpic) - ld [rSVBK], a - ld a, b - ld de, wDecompressEnemyFrontpic - call FarDecompress - pop bc - ld hl, wDecompressScratch - ld de, wDecompressEnemyFrontpic - call PadFrontpic - pop hl - push hl - ld de, wDecompressScratch - ld c, 7 * 7 - ld a, [hROMBank] - ld b, a - call Get2bpp - pop hl - ret - -GetFrontpicPointer: ; 510d7 -GLOBAL PokemonPicPointers, UnownPicPointers - - ld a, [CurPartySpecies] - cp UNOWN - jr z, .unown - ld a, [CurPartySpecies] - ld d, BANK(PokemonPicPointers) - jr .ok - -.unown - ld a, [UnownLetter] - ld d, BANK(UnownPicPointers) - -.ok - ld hl, PokemonPicPointers ; UnownPicPointers - dec a - ld bc, 6 - call AddNTimes - ld a, d - call GetFarByte - call FixPicBank - push af - inc hl - ld a, d - call GetFarHalfword - pop bc - ret - -GetAnimatedFrontpic: ; 51103 - ld a, BANK(vTiles3) - ld [rVBK], a - push hl - ld de, wDecompressScratch - ld c, 7 * 7 - ld a, [hROMBank] - ld b, a - call Get2bpp - pop hl - ld de, 7 * 7 tiles - add hl, de - push hl - ld a, BANK(BasePicSize) - ld hl, BasePicSize - call GetFarWRAMByte - pop hl - and $f - ld de, wDecompressEnemyFrontpic + 5 * 5 tiles - ld c, 5 * 5 - cp 5 - jr z, .got_dims - ld de, wDecompressEnemyFrontpic + 6 * 6 tiles - ld c, 6 * 6 - cp 6 - jr z, .got_dims - ld de, wDecompressEnemyFrontpic + 7 * 7 tiles - ld c, 7 * 7 -.got_dims - - push hl - push bc - call LoadFrontpicTiles - pop bc - pop hl - ld de, wDecompressScratch - ld a, [hROMBank] - ld b, a - call Get2bpp - xor a - ld [rVBK], a - ret - -LoadFrontpicTiles: ; 5114f - ld hl, wDecompressScratch - swap c - ld a, c - and $f - ld b, a - ld a, c - and $f0 - ld c, a - push bc - call LoadFrontpic - pop bc -.loop - push bc - ld c, 0 - call LoadFrontpic - pop bc - dec b - jr nz, .loop - ret - -Predef_GetMonBackpic: ; 5116c - ld a, [CurPartySpecies] - call IsAPokemon - ret c - - ld a, [CurPartySpecies] - ld b, a - ld a, [UnownLetter] - ld c, a - ld a, [rSVBK] - push af - ld a, BANK(wDecompressScratch) - ld [rSVBK], a - push de - - ; These are assumed to be at the same - ; address in their respective banks. - GLOBAL PokemonPicPointers, UnownPicPointers - ld hl, PokemonPicPointers ; UnownPicPointers - ld a, b - ld d, BANK(PokemonPicPointers) - cp UNOWN - jr nz, .ok - ld a, c - ld d, BANK(UnownPicPointers) -.ok - dec a - ld bc, 6 - call AddNTimes - ld bc, 3 - add hl, bc - ld a, d - call GetFarByte - call FixPicBank - push af - inc hl - ld a, d - call GetFarHalfword - ld de, wDecompressScratch - pop af - call FarDecompress - ld hl, wDecompressScratch - ld c, 6 * 6 - call FixBackpicAlignment - pop hl - ld de, wDecompressScratch - ld a, [hROMBank] - ld b, a - call Get2bpp - pop af - ld [rSVBK], a - ret - -FixPicBank: ; 511c5 -; This is a thing for some reason. - -PICS_FIX EQU $36 -GLOBAL PICS_FIX - - push hl - push bc - sub BANK(Pics_1) - PICS_FIX - ld c, a - ld b, 0 - ld hl, .PicsBanks - add hl, bc - ld a, [hl] - pop bc - pop hl - ret - -.PicsBanks: ; 511d4 - db BANK(Pics_1) + 0 - db BANK(Pics_1) + 1 - db BANK(Pics_1) + 2 - db BANK(Pics_1) + 3 - db BANK(Pics_1) + 4 - db BANK(Pics_1) + 5 - db BANK(Pics_1) + 6 - db BANK(Pics_1) + 7 - db BANK(Pics_1) + 8 - db BANK(Pics_1) + 9 - db BANK(Pics_1) + 10 - db BANK(Pics_1) + 11 - db BANK(Pics_1) + 12 - db BANK(Pics_1) + 13 - db BANK(Pics_1) + 14 - db BANK(Pics_1) + 15 - db BANK(Pics_1) + 16 - db BANK(Pics_1) + 17 - db BANK(Pics_1) + 18 - db BANK(Pics_1) + 19 - db BANK(Pics_1) + 20 - db BANK(Pics_1) + 21 - db BANK(Pics_1) + 22 - db BANK(Pics_1) + 23 - -Function511ec: ; 511ec - ld a, c - push de - ld hl, PokemonPicPointers - dec a - ld bc, 6 - call AddNTimes - ld a, BANK(PokemonPicPointers) - call GetFarByte - call FixPicBank - push af - inc hl - ld a, BANK(PokemonPicPointers) - call GetFarHalfword - pop af - pop de - call FarDecompress - ret - -Predef_GetTrainerPic: ; 5120d - ld a, [TrainerClass] - and a - ret z - cp NUM_TRAINER_CLASSES - ret nc - call WaitBGMap - xor a - ld [hBGMapMode], a - ld hl, TrainerPicPointers - ld a, [TrainerClass] - dec a - ld bc, 3 - call AddNTimes - ld a, [rSVBK] - push af - ld a, BANK(wDecompressScratch) - ld [rSVBK], a - push de - ld a, BANK(TrainerPicPointers) - call GetFarByte - call FixPicBank - push af - inc hl - ld a, BANK(TrainerPicPointers) - call GetFarHalfword - pop af - ld de, wDecompressScratch - call FarDecompress - pop hl - ld de, wDecompressScratch - ld c, 7 * 7 - ld a, [hROMBank] - ld b, a - call Get2bpp - pop af - ld [rSVBK], a - call WaitBGMap - ld a, $1 - ld [hBGMapMode], a - ret - -Predef_Decompress: ; 5125d -; Decompress lz data from b:hl to scratch space at 6:d000, then copy it to address de. - - ld a, [rSVBK] - push af - ld a, BANK(wDecompressScratch) - ld [rSVBK], a - - push de - push bc - ld a, b - ld de, wDecompressScratch - call FarDecompress - pop bc - ld de, wDecompressScratch - pop hl - ld a, [hROMBank] - ld b, a - call Get2bpp - - pop af - ld [rSVBK], a - ret - -FixBackpicAlignment: ; 5127c - push de - push bc - ld a, [wBoxAlignment] - and a - jr z, .keep_dims - ld a, c - cp 7 * 7 - ld de, 7 * 7 tiles - jr z, .got_dims - cp 6 * 6 - ld de, 6 * 6 tiles - jr z, .got_dims - ld de, 5 * 5 tiles - -.got_dims - ld a, [hl] - ld b, $0 - ld c, $8 -.loop - rra - rl b - dec c - jr nz, .loop - ld a, b - ld [hli], a - dec de - ld a, e - or d - jr nz, .got_dims - -.keep_dims - pop bc - pop de - ret - -PadFrontpic: ; 512ab - ld a, b - cp 6 - jr z, .six - cp 5 - jr z, .five - -.seven_loop - ld c, $70 - call LoadFrontpic - dec b - jr nz, .seven_loop - ret - -.six - ld c, $70 - xor a - call .Fill -.six_loop - ld c, $10 - xor a - call .Fill - ld c, $60 - call LoadFrontpic - dec b - jr nz, .six_loop - ret - -.five - ld c, $70 - xor a - call .Fill -.five_loop - ld c, $20 - xor a - call .Fill - ld c, $50 - call LoadFrontpic - dec b - jr nz, .five_loop - ld c, $70 - xor a - call .Fill - ret - -.Fill: - ld [hli], a - dec c - jr nz, .Fill - ret - -LoadFrontpic: ; 512f2 - ld a, [wBoxAlignment] - and a - jr nz, .x_flip -.left_loop - ld a, [de] - inc de - ld [hli], a - dec c - jr nz, .left_loop - ret - -.x_flip - push bc -.right_loop - ld a, [de] - inc de - ld b, a - xor a - rept 8 - rr b - rla - endr - ld [hli], a - dec c - jr nz, .right_loop - pop bc - ret diff --git a/gfx/overworld_font.asm b/gfx/overworld_font.asm deleted file mode 100644 index f23f01c4e..000000000 --- a/gfx/overworld_font.asm +++ /dev/null @@ -1,17 +0,0 @@ -LoadOverworldFont:: ; 106594 - ld de, .OverworldFontGFX - ld hl, vTiles1 - lb bc, BANK(.OverworldFontGFX), $80 - call Get2bpp - ld de, .OverworldFontSpaceGFX - ld hl, vTiles2 tile " " - lb bc, BANK(.OverworldFontSpaceGFX), 1 - call Get2bpp - ret -; 1065ad - -.OverworldFontGFX: -INCBIN "gfx/font/overworld.2bpp" - -.OverworldFontSpaceGFX: -INCBIN "gfx/font/overworld_space.2bpp" -- cgit v1.2.3 From b1c808f9f85c215340daccf7dc8eaa3832f15ba6 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 17 Jan 2018 14:50:34 -0500 Subject: Rename some tilesets (close #467) --- gfx/tilesets.asm | 148 ++++++++++++------------ gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 | Bin 1888 -> 0 bytes gfx/tilesets/celadon_mansion.png | Bin 2047 -> 0 bytes gfx/tilesets/celadon_mansion_1.pal | 44 ------- gfx/tilesets/celadon_mansion_2.pal | 4 - gfx/tilesets/celadon_mansion_palette_map.asm | 29 ----- gfx/tilesets/champions_room.2bpp.lz.93800351 | Bin 0 -> 2176 bytes gfx/tilesets/champions_room.png | Bin 0 -> 2267 bytes gfx/tilesets/champions_room_palette_map.asm | 29 +++++ gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6 | Bin 0 -> 832 bytes gfx/tilesets/dark_cave.png | Bin 0 -> 840 bytes gfx/tilesets/dark_cave_palette_map.asm | 29 +++++ gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f | Bin 0 -> 1248 bytes gfx/tilesets/elite_four_room.png | Bin 0 -> 1272 bytes gfx/tilesets/elite_four_room_palette_map.asm | 29 +++++ gfx/tilesets/facility.2bpp.lz.454cfd8b | Bin 0 -> 1056 bytes gfx/tilesets/facility.png | Bin 0 -> 1123 bytes gfx/tilesets/facility_palette_map.asm | 29 +++++ gfx/tilesets/forest.2bpp.lz.6b0ac896 | Bin 0 -> 976 bytes gfx/tilesets/forest.png | Bin 0 -> 1214 bytes gfx/tilesets/forest_palette_map.asm | 29 +++++ gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f | Bin 1248 -> 0 bytes gfx/tilesets/gym_1.png | Bin 1272 -> 0 bytes gfx/tilesets/gym_1_palette_map.asm | 29 ----- gfx/tilesets/house.2bpp.lz.c848ef13 | Bin 0 -> 1200 bytes gfx/tilesets/house.pal | 40 +++++++ gfx/tilesets/house.png | Bin 0 -> 1254 bytes gfx/tilesets/house_1.2bpp.lz.c848ef13 | Bin 1200 -> 0 bytes gfx/tilesets/house_1.pal | 40 ------- gfx/tilesets/house_1.png | Bin 1254 -> 0 bytes gfx/tilesets/house_1_palette_map.asm | 29 ----- gfx/tilesets/house_palette_map.asm | 29 +++++ gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 | Bin 976 -> 0 bytes gfx/tilesets/ilex_forest.png | Bin 1214 -> 0 bytes gfx/tilesets/ilex_forest_palette_map.asm | 29 ----- gfx/tilesets/johto.2bpp.lz.0c7e555a | Bin 0 -> 3080 bytes gfx/tilesets/johto.png | Bin 0 -> 2044 bytes gfx/tilesets/johto_1.2bpp.lz.0c7e555a | Bin 3080 -> 0 bytes gfx/tilesets/johto_1.png | Bin 2044 -> 0 bytes gfx/tilesets/johto_1_palette_map.asm | 29 ----- gfx/tilesets/johto_2.2bpp.lz.391603fb | Bin 3080 -> 0 bytes gfx/tilesets/johto_2.png | Bin 2324 -> 0 bytes gfx/tilesets/johto_2_palette_map.asm | 29 ----- gfx/tilesets/johto_modern.2bpp.lz.391603fb | Bin 0 -> 3080 bytes gfx/tilesets/johto_modern.png | Bin 0 -> 2324 bytes gfx/tilesets/johto_modern_palette_map.asm | 29 +++++ gfx/tilesets/johto_palette_map.asm | 29 +++++ gfx/tilesets/kurts_house.2bpp.lz.dd51d079 | Bin 1216 -> 0 bytes gfx/tilesets/kurts_house.png | Bin 1181 -> 0 bytes gfx/tilesets/kurts_house_palette_map.asm | 29 ----- gfx/tilesets/mansion.2bpp.lz.63b414d4 | Bin 0 -> 1888 bytes gfx/tilesets/mansion.png | Bin 0 -> 2047 bytes gfx/tilesets/mansion_1.pal | 44 +++++++ gfx/tilesets/mansion_2.pal | 4 + gfx/tilesets/mansion_palette_map.asm | 29 +++++ gfx/tilesets/olivine_gym.2bpp.lz.93800351 | Bin 2176 -> 0 bytes gfx/tilesets/olivine_gym.png | Bin 2267 -> 0 bytes gfx/tilesets/olivine_gym_palette_map.asm | 29 ----- gfx/tilesets/palette_maps.asm | 46 ++++---- gfx/tilesets/players_house_2f.2bpp.lz.35e51007 | Bin 1216 -> 0 bytes gfx/tilesets/players_house_2f.png | Bin 1221 -> 0 bytes gfx/tilesets/players_house_2f_palette_map.asm | 29 ----- gfx/tilesets/players_room.2bpp.lz.35e51007 | Bin 0 -> 1216 bytes gfx/tilesets/players_room.png | Bin 0 -> 1221 bytes gfx/tilesets/players_room_palette_map.asm | 29 +++++ gfx/tilesets/power_plant.2bpp.lz.454cfd8b | Bin 1056 -> 0 bytes gfx/tilesets/power_plant.png | Bin 1123 -> 0 bytes gfx/tilesets/power_plant_palette_map.asm | 29 ----- gfx/tilesets/sprout-pillar/1.png | Bin 137 -> 0 bytes gfx/tilesets/sprout-pillar/10.png | Bin 118 -> 0 bytes gfx/tilesets/sprout-pillar/2.png | Bin 133 -> 0 bytes gfx/tilesets/sprout-pillar/3.png | Bin 127 -> 0 bytes gfx/tilesets/sprout-pillar/4.png | Bin 130 -> 0 bytes gfx/tilesets/sprout-pillar/5.png | Bin 117 -> 0 bytes gfx/tilesets/sprout-pillar/6.png | Bin 116 -> 0 bytes gfx/tilesets/sprout-pillar/7.png | Bin 115 -> 0 bytes gfx/tilesets/sprout-pillar/8.png | Bin 115 -> 0 bytes gfx/tilesets/sprout-pillar/9.png | Bin 127 -> 0 bytes gfx/tilesets/sprout_tower.2bpp.lz.bc56789c | Bin 1376 -> 0 bytes gfx/tilesets/sprout_tower.png | Bin 1489 -> 0 bytes gfx/tilesets/sprout_tower_palette_map.asm | 29 ----- gfx/tilesets/tower-pillar/1.png | Bin 0 -> 137 bytes gfx/tilesets/tower-pillar/10.png | Bin 0 -> 118 bytes gfx/tilesets/tower-pillar/2.png | Bin 0 -> 133 bytes gfx/tilesets/tower-pillar/3.png | Bin 0 -> 127 bytes gfx/tilesets/tower-pillar/4.png | Bin 0 -> 130 bytes gfx/tilesets/tower-pillar/5.png | Bin 0 -> 117 bytes gfx/tilesets/tower-pillar/6.png | Bin 0 -> 116 bytes gfx/tilesets/tower-pillar/7.png | Bin 0 -> 115 bytes gfx/tilesets/tower-pillar/8.png | Bin 0 -> 115 bytes gfx/tilesets/tower-pillar/9.png | Bin 0 -> 127 bytes gfx/tilesets/tower.2bpp.lz.bc56789c | Bin 0 -> 1376 bytes gfx/tilesets/tower.png | Bin 0 -> 1489 bytes gfx/tilesets/tower_palette_map.asm | 29 +++++ gfx/tilesets/traditional_house.2bpp.lz.dd51d079 | Bin 0 -> 1216 bytes gfx/tilesets/traditional_house.png | Bin 0 -> 1181 bytes gfx/tilesets/traditional_house_palette_map.asm | 29 +++++ gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 | Bin 832 -> 0 bytes gfx/tilesets/whirl_islands.png | Bin 840 -> 0 bytes gfx/tilesets/whirl_islands_palette_map.asm | 29 ----- 100 files changed, 533 insertions(+), 533 deletions(-) delete mode 100644 gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 delete mode 100644 gfx/tilesets/celadon_mansion.png delete mode 100644 gfx/tilesets/celadon_mansion_1.pal delete mode 100644 gfx/tilesets/celadon_mansion_2.pal delete mode 100644 gfx/tilesets/celadon_mansion_palette_map.asm create mode 100644 gfx/tilesets/champions_room.2bpp.lz.93800351 create mode 100644 gfx/tilesets/champions_room.png create mode 100644 gfx/tilesets/champions_room_palette_map.asm create mode 100644 gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6 create mode 100644 gfx/tilesets/dark_cave.png create mode 100644 gfx/tilesets/dark_cave_palette_map.asm create mode 100644 gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f create mode 100644 gfx/tilesets/elite_four_room.png create mode 100644 gfx/tilesets/elite_four_room_palette_map.asm create mode 100644 gfx/tilesets/facility.2bpp.lz.454cfd8b create mode 100644 gfx/tilesets/facility.png create mode 100644 gfx/tilesets/facility_palette_map.asm create mode 100644 gfx/tilesets/forest.2bpp.lz.6b0ac896 create mode 100644 gfx/tilesets/forest.png create mode 100644 gfx/tilesets/forest_palette_map.asm delete mode 100644 gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f delete mode 100644 gfx/tilesets/gym_1.png delete mode 100644 gfx/tilesets/gym_1_palette_map.asm create mode 100644 gfx/tilesets/house.2bpp.lz.c848ef13 create mode 100644 gfx/tilesets/house.pal create mode 100644 gfx/tilesets/house.png delete mode 100644 gfx/tilesets/house_1.2bpp.lz.c848ef13 delete mode 100644 gfx/tilesets/house_1.pal delete mode 100644 gfx/tilesets/house_1.png delete mode 100644 gfx/tilesets/house_1_palette_map.asm create mode 100644 gfx/tilesets/house_palette_map.asm delete mode 100644 gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 delete mode 100644 gfx/tilesets/ilex_forest.png delete mode 100644 gfx/tilesets/ilex_forest_palette_map.asm create mode 100644 gfx/tilesets/johto.2bpp.lz.0c7e555a create mode 100644 gfx/tilesets/johto.png delete mode 100644 gfx/tilesets/johto_1.2bpp.lz.0c7e555a delete mode 100644 gfx/tilesets/johto_1.png delete mode 100644 gfx/tilesets/johto_1_palette_map.asm delete mode 100644 gfx/tilesets/johto_2.2bpp.lz.391603fb delete mode 100644 gfx/tilesets/johto_2.png delete mode 100644 gfx/tilesets/johto_2_palette_map.asm create mode 100644 gfx/tilesets/johto_modern.2bpp.lz.391603fb create mode 100644 gfx/tilesets/johto_modern.png create mode 100644 gfx/tilesets/johto_modern_palette_map.asm create mode 100644 gfx/tilesets/johto_palette_map.asm delete mode 100644 gfx/tilesets/kurts_house.2bpp.lz.dd51d079 delete mode 100644 gfx/tilesets/kurts_house.png delete mode 100644 gfx/tilesets/kurts_house_palette_map.asm create mode 100644 gfx/tilesets/mansion.2bpp.lz.63b414d4 create mode 100644 gfx/tilesets/mansion.png create mode 100644 gfx/tilesets/mansion_1.pal create mode 100644 gfx/tilesets/mansion_2.pal create mode 100644 gfx/tilesets/mansion_palette_map.asm delete mode 100644 gfx/tilesets/olivine_gym.2bpp.lz.93800351 delete mode 100644 gfx/tilesets/olivine_gym.png delete mode 100644 gfx/tilesets/olivine_gym_palette_map.asm delete mode 100644 gfx/tilesets/players_house_2f.2bpp.lz.35e51007 delete mode 100644 gfx/tilesets/players_house_2f.png delete mode 100644 gfx/tilesets/players_house_2f_palette_map.asm create mode 100644 gfx/tilesets/players_room.2bpp.lz.35e51007 create mode 100644 gfx/tilesets/players_room.png create mode 100644 gfx/tilesets/players_room_palette_map.asm delete mode 100644 gfx/tilesets/power_plant.2bpp.lz.454cfd8b delete mode 100644 gfx/tilesets/power_plant.png delete mode 100644 gfx/tilesets/power_plant_palette_map.asm delete mode 100644 gfx/tilesets/sprout-pillar/1.png delete mode 100644 gfx/tilesets/sprout-pillar/10.png delete mode 100644 gfx/tilesets/sprout-pillar/2.png delete mode 100644 gfx/tilesets/sprout-pillar/3.png delete mode 100644 gfx/tilesets/sprout-pillar/4.png delete mode 100644 gfx/tilesets/sprout-pillar/5.png delete mode 100644 gfx/tilesets/sprout-pillar/6.png delete mode 100644 gfx/tilesets/sprout-pillar/7.png delete mode 100644 gfx/tilesets/sprout-pillar/8.png delete mode 100644 gfx/tilesets/sprout-pillar/9.png delete mode 100644 gfx/tilesets/sprout_tower.2bpp.lz.bc56789c delete mode 100644 gfx/tilesets/sprout_tower.png delete mode 100644 gfx/tilesets/sprout_tower_palette_map.asm create mode 100644 gfx/tilesets/tower-pillar/1.png create mode 100644 gfx/tilesets/tower-pillar/10.png create mode 100644 gfx/tilesets/tower-pillar/2.png create mode 100644 gfx/tilesets/tower-pillar/3.png create mode 100644 gfx/tilesets/tower-pillar/4.png create mode 100644 gfx/tilesets/tower-pillar/5.png create mode 100644 gfx/tilesets/tower-pillar/6.png create mode 100644 gfx/tilesets/tower-pillar/7.png create mode 100644 gfx/tilesets/tower-pillar/8.png create mode 100644 gfx/tilesets/tower-pillar/9.png create mode 100644 gfx/tilesets/tower.2bpp.lz.bc56789c create mode 100644 gfx/tilesets/tower.png create mode 100644 gfx/tilesets/tower_palette_map.asm create mode 100644 gfx/tilesets/traditional_house.2bpp.lz.dd51d079 create mode 100644 gfx/tilesets/traditional_house.png create mode 100644 gfx/tilesets/traditional_house_palette_map.asm delete mode 100644 gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 delete mode 100644 gfx/tilesets/whirl_islands.png delete mode 100644 gfx/tilesets/whirl_islands_palette_map.asm (limited to 'gfx') diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 0f4dcbb34..f6d6b465f 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -19,18 +19,18 @@ INCLUDE "data/tilesets/kanto_collision.asm" ; 0x19006 Tileset0GFX: ; 0x19006 -TilesetJohto1GFX: ; 0x19006 -INCBIN "gfx/tilesets/johto_1.2bpp.lz" +TilesetJohtoGFX: ; 0x19006 +INCBIN "gfx/tilesets/johto.2bpp.lz" ; 0x19c0e Tileset0Meta: ; 0x19c0e -TilesetJohto1Meta: ; 0x19c0e -INCBIN "data/tilesets/johto_1_metatiles.bin" +TilesetJohtoMeta: ; 0x19c0e +INCBIN "data/tilesets/johto_metatiles.bin" ; 0x1a40e Tileset0Coll: ; 0x1a40e -TilesetJohto1Coll: ; 0x1a40e -INCLUDE "data/tilesets/johto_1_collision.asm" +TilesetJohtoColl: ; 0x1a40e +INCLUDE "data/tilesets/johto_collision.asm" ; 0x1a60e TilesetIcePathGFX: ; 0x1a60e @@ -45,16 +45,16 @@ TilesetIcePathColl: ; 0x1b33e INCLUDE "data/tilesets/ice_path_collision.asm" ; 0x1b43e -TilesetPlayersHouse2FGFX: ; 0x1b43e -INCBIN "gfx/tilesets/players_house_2f.2bpp.lz" +TilesetPlayersRoomGFX: ; 0x1b43e +INCBIN "gfx/tilesets/players_room.2bpp.lz" ; 0x1b8fe -TilesetPlayersHouse2FMeta: ; 0x1b8fe -INCBIN "data/tilesets/players_house_2f_metatiles.bin" +TilesetPlayersRoomMeta: ; 0x1b8fe +INCBIN "data/tilesets/players_room_metatiles.bin" ; 0x1bcfe -TilesetPlayersHouse2FColl: ; 0x1bcfe -INCLUDE "data/tilesets/players_house_2f_collision.asm" +TilesetPlayersRoomColl: ; 0x1bcfe +INCLUDE "data/tilesets/players_room_collision.asm" ; 0x1bdfe @@ -96,16 +96,16 @@ TilesetPlayersHouseColl: ; 0x1dd2c INCLUDE "data/tilesets/players_house_collision.asm" ; 0x1de2c -TilesetCeladonMansionGFX: ; 0x1de2c -INCBIN "gfx/tilesets/celadon_mansion.2bpp.lz" +TilesetMansionGFX: ; 0x1de2c +INCBIN "gfx/tilesets/mansion.2bpp.lz" ; 0x1e58c -TilesetCeladonMansionMeta: ; 0x1e58c -INCBIN "data/tilesets/celadon_mansion_metatiles.bin" +TilesetMansionMeta: ; 0x1e58c +INCBIN "data/tilesets/mansion_metatiles.bin" ; 0x1e98c -TilesetCeladonMansionColl: ; 0x1e98c -INCLUDE "data/tilesets/celadon_mansion_collision.asm" +TilesetMansionColl: ; 0x1e98c +INCLUDE "data/tilesets/mansion_collision.asm" ; 0x1ea8c TilesetCaveGFX: ; 0x1ea8c @@ -113,28 +113,28 @@ INCBIN "gfx/tilesets/cave.2bpp.lz" ; 0x1ee1c TilesetCaveMeta: ; 0x1ee1c -TilesetWhirlIslandsMeta: ; 0x1ee1c +TilesetDarkCaveMeta: ; 0x1ee1c INCBIN "data/tilesets/cave_metatiles.bin" ; 0x1f21c TilesetCaveColl: ; 0x1f21c -TilesetWhirlIslandsColl: ; 0x1f21c +TilesetDarkCaveColl: ; 0x1f21c INCLUDE "data/tilesets/cave_collision.asm" ; 0x1f31c SECTION "Tileset Data 3", ROMX -TilesetSproutTowerGFX: ; 0x20181 -INCBIN "gfx/tilesets/sprout_tower.2bpp.lz" +TilesetTowerGFX: ; 0x20181 +INCBIN "gfx/tilesets/tower.2bpp.lz" ; 0x206e1 -TilesetSproutTowerMeta: ; 0x206e1 -INCBIN "data/tilesets/sprout_tower_metatiles.bin" +TilesetTowerMeta: ; 0x206e1 +INCBIN "data/tilesets/tower_metatiles.bin" ; 0x20ae1 -TilesetSproutTowerColl: ; 0x20ae1 -INCLUDE "data/tilesets/sprout_tower_collision.asm" +TilesetTowerColl: ; 0x20ae1 +INCLUDE "data/tilesets/tower_collision.asm" ; 0x20be1 TilesetLabGFX: ; 0x20be1 @@ -185,23 +185,23 @@ TilesetTrainStationColl: ; 0x23791 INCLUDE "data/tilesets/train_station_collision.asm" ; 0x23891 -TilesetIlexForestMeta: ; 0x23891 -INCBIN "data/tilesets/ilex_forest_metatiles.bin" +TilesetForestMeta: ; 0x23891 +INCBIN "data/tilesets/forest_metatiles.bin" ; 0x23b11 SECTION "Tileset Data 4", ROMX -TilesetGym1GFX: ; 0x30000 -INCBIN "gfx/tilesets/gym_1.2bpp.lz" +TilesetEliteFourRoomGFX: ; 0x30000 +INCBIN "gfx/tilesets/elite_four_room.2bpp.lz" ; 0x304e0 -TilesetGym1Meta: ; 0x304e0 -INCBIN "data/tilesets/gym_1_metatiles.bin" +TilesetEliteFourRoomMeta: ; 0x304e0 +INCBIN "data/tilesets/elite_four_room_metatiles.bin" ; 0x308e0 -TilesetGym1Coll: ; 0x308e0 -INCLUDE "data/tilesets/gym_1_collision.asm" +TilesetEliteFourRoomColl: ; 0x308e0 +INCLUDE "data/tilesets/elite_four_room_collision.asm" ; 0x309e0 TilesetParkGFX: ; 0x309e0 @@ -240,16 +240,16 @@ TilesetUndergroundColl: ; 0x325b0 INCLUDE "data/tilesets/underground_collision.asm" ; 0x326b0 -TilesetWhirlIslandsGFX: ; 0x326b0 -INCBIN "gfx/tilesets/whirl_islands.2bpp.lz" +TilesetDarkCaveGFX: ; 0x326b0 +INCBIN "gfx/tilesets/dark_cave.2bpp.lz" ; 0x329f0 -UnusedTilesetWhirlIslandsMeta: ; 0x329f0 -INCBIN "data/tilesets/unused_whirl_islands_metatiles.bin" +UnusedTilesetDarkCaveMeta: ; 0x329f0 +INCBIN "data/tilesets/unused_dark_cave_metatiles.bin" ; 0x331f0 -UnusedTilesetWhirlIslandsColl: ; 0x331f0 -INCLUDE "data/tilesets/unused_whirl_islands_collision.asm" +UnusedTilesetDarkCaveColl: ; 0x331f0 +INCLUDE "data/tilesets/unused_dark_cave_collision.asm" ; 0x333f0 @@ -291,60 +291,60 @@ TilesetGateColl: ; 0xb5de0 INCLUDE "data/tilesets/gate_collision.asm" ; 0xb5ee0 -TilesetJohto2GFX: ; 0xb5ee0 +TilesetJohtoModernGFX: ; 0xb5ee0 TilesetBattleTowerOutsideGFX: ; 0xb5ee0 -INCBIN "gfx/tilesets/johto_2.2bpp.lz" +INCBIN "gfx/tilesets/johto_modern.2bpp.lz" ; 0xb6ae8 -TilesetJohto2Meta: ; 0xb6ae8 -INCBIN "data/tilesets/johto_2_metatiles.bin" +TilesetJohtoModernMeta: ; 0xb6ae8 +INCBIN "data/tilesets/johto_modern_metatiles.bin" ; 0xb72e8 -TilesetJohto2Coll: ; 0xb72e8 -INCLUDE "data/tilesets/johto_2_collision.asm" +TilesetJohtoModernColl: ; 0xb72e8 +INCLUDE "data/tilesets/johto_modern_collision.asm" ; 0xb74e8 -TilesetKurtsHouseGFX: ; 0xb74e8 -INCBIN "gfx/tilesets/kurts_house.2bpp.lz" +TilesetTraditionalHouseGFX: ; 0xb74e8 +INCBIN "gfx/tilesets/traditional_house.2bpp.lz" ; 0xb79a8 -TilesetKurtsHouseMeta: ; 0xb79a8 -INCBIN "data/tilesets/kurts_house_metatiles.bin" +TilesetTraditionalHouseMeta: ; 0xb79a8 +INCBIN "data/tilesets/traditional_house_metatiles.bin" ; 0xb7da8 -TilesetKurtsHouseColl: ; 0xb7da8 -INCLUDE "data/tilesets/kurts_house_collision.asm" +TilesetTraditionalHouseColl: ; 0xb7da8 +INCLUDE "data/tilesets/traditional_house_collision.asm" ; 0xb7ea8 SECTION "Tileset Data 6", ROMX -TilesetIlexForestGFX: ; 0xdc000 -INCBIN "gfx/tilesets/ilex_forest.2bpp.lz" +TilesetForestGFX: ; 0xdc000 +INCBIN "gfx/tilesets/forest.2bpp.lz" ; 0xdc3d0 -TilesetOlivineGymGFX: ; 0xdc3d0 -INCBIN "gfx/tilesets/olivine_gym.2bpp.lz" +TilesetChampionsRoomGFX: ; 0xdc3d0 +INCBIN "gfx/tilesets/champions_room.2bpp.lz" ; 0xdcc50 -TilesetOlivineGymMeta: ; 0xdcc50 -INCBIN "data/tilesets/olivine_gym_metatiles.bin" +TilesetChampionsRoomMeta: ; 0xdcc50 +INCBIN "data/tilesets/champions_room_metatiles.bin" ; 0xdd050 -TilesetOlivineGymColl: ; 0xdd050 -INCLUDE "data/tilesets/olivine_gym_collision.asm" +TilesetChampionsRoomColl: ; 0xdd050 +INCLUDE "data/tilesets/champions_room_collision.asm" ; 0xdd150 -TilesetHouse1GFX: ; 0xdd150 -INCBIN "gfx/tilesets/house_1.2bpp.lz" +TilesetHouseGFX: ; 0xdd150 +INCBIN "gfx/tilesets/house.2bpp.lz" ; 0xdd600 -TilesetHouse1Meta: ; 0xdd600 -INCBIN "data/tilesets/house_1_metatiles.bin" +TilesetHouseMeta: ; 0xdd600 +INCBIN "data/tilesets/house_metatiles.bin" ; 0xdda00 -TilesetHouse1Coll: ; 0xdda00 -INCLUDE "data/tilesets/house_1_collision.asm" +TilesetHouseColl: ; 0xdda00 +INCLUDE "data/tilesets/house_collision.asm" ; 0xddb00 TilesetLighthouseGFX: ; 0xddb00 @@ -359,20 +359,20 @@ TilesetLighthouseColl: ; 0xde370 INCLUDE "data/tilesets/lighthouse_collision.asm" ; 0xde470 -TilesetIlexForestColl: ; 0xde470 -INCLUDE "data/tilesets/ilex_forest_collision.asm" +TilesetForestColl: ; 0xde470 +INCLUDE "data/tilesets/forest_collision.asm" ; 0xde570 -TilesetPowerPlantGFX: ; 0xde570 -INCBIN "gfx/tilesets/power_plant.2bpp.lz" +TilesetFacilityGFX: ; 0xde570 +INCBIN "gfx/tilesets/facility.2bpp.lz" ; 0xde990 -TilesetPowerPlantMeta: ; 0xde990 -INCBIN "data/tilesets/power_plant_metatiles.bin" +TilesetFacilityMeta: ; 0xde990 +INCBIN "data/tilesets/facility_metatiles.bin" ; 0xded90 -TilesetPowerPlantColl: ; 0xded90 -INCLUDE "data/tilesets/power_plant_collision.asm" +TilesetFacilityColl: ; 0xded90 +INCLUDE "data/tilesets/facility_collision.asm" ; 0xdee90 TilesetBattleTowerOutsideMeta: ; 0xdee90 diff --git a/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 b/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 deleted file mode 100644 index b68f147d0..000000000 Binary files a/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 and /dev/null differ diff --git a/gfx/tilesets/celadon_mansion.png b/gfx/tilesets/celadon_mansion.png deleted file mode 100644 index 44e697a1b..000000000 Binary files a/gfx/tilesets/celadon_mansion.png and /dev/null differ diff --git a/gfx/tilesets/celadon_mansion_1.pal b/gfx/tilesets/celadon_mansion_1.pal deleted file mode 100644 index 1ed1de75f..000000000 --- a/gfx/tilesets/celadon_mansion_1.pal +++ /dev/null @@ -1,44 +0,0 @@ - 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 18, 24, 09 - 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 17, 19, 31 - RGB 14, 16, 31 - RGB 07, 07, 07 - - RGB 31, 31, 16 - RGB 31, 31, 16 - RGB 14, 09, 00 - RGB 00, 00, 00 - - RGB 05, 05, 16 - RGB 08, 19, 28 - RGB 00, 00, 00 - RGB 31, 31, 31 diff --git a/gfx/tilesets/celadon_mansion_2.pal b/gfx/tilesets/celadon_mansion_2.pal deleted file mode 100644 index ad5c5e4db..000000000 --- a/gfx/tilesets/celadon_mansion_2.pal +++ /dev/null @@ -1,4 +0,0 @@ - RGB 25, 24, 23 - RGB 20, 19, 19 - RGB 14, 16, 31 - RGB 07, 07, 07 diff --git a/gfx/tilesets/celadon_mansion_palette_map.asm b/gfx/tilesets/celadon_mansion_palette_map.asm deleted file mode 100644 index 2bd27ad22..000000000 --- a/gfx/tilesets/celadon_mansion_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER - tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN - tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN - tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN - -rept 16 - db $ff -endr - - tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW - tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW - tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN - tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW - tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN - tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW diff --git a/gfx/tilesets/champions_room.2bpp.lz.93800351 b/gfx/tilesets/champions_room.2bpp.lz.93800351 new file mode 100644 index 000000000..e19994f37 Binary files /dev/null and b/gfx/tilesets/champions_room.2bpp.lz.93800351 differ diff --git a/gfx/tilesets/champions_room.png b/gfx/tilesets/champions_room.png new file mode 100644 index 000000000..e32c2fb28 Binary files /dev/null and b/gfx/tilesets/champions_room.png differ diff --git a/gfx/tilesets/champions_room_palette_map.asm b/gfx/tilesets/champions_room_palette_map.asm new file mode 100644 index 000000000..551a09351 --- /dev/null +++ b/gfx/tilesets/champions_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN + tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED + tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY diff --git a/gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6 b/gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6 new file mode 100644 index 000000000..50a5ab9ac Binary files /dev/null and b/gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6 differ diff --git a/gfx/tilesets/dark_cave.png b/gfx/tilesets/dark_cave.png new file mode 100644 index 000000000..1d0a91e5e Binary files /dev/null and b/gfx/tilesets/dark_cave.png differ diff --git a/gfx/tilesets/dark_cave_palette_map.asm b/gfx/tilesets/dark_cave_palette_map.asm new file mode 100644 index 000000000..73c09ebe5 --- /dev/null +++ b/gfx/tilesets/dark_cave_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f b/gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f new file mode 100644 index 000000000..6b45c769d Binary files /dev/null and b/gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f differ diff --git a/gfx/tilesets/elite_four_room.png b/gfx/tilesets/elite_four_room.png new file mode 100644 index 000000000..27f64afa2 Binary files /dev/null and b/gfx/tilesets/elite_four_room.png differ diff --git a/gfx/tilesets/elite_four_room_palette_map.asm b/gfx/tilesets/elite_four_room_palette_map.asm new file mode 100644 index 000000000..b20f49195 --- /dev/null +++ b/gfx/tilesets/elite_four_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN + tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN + tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN + tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN + tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF + tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF + +rept 16 + db $ff +endr + + tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN + tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN + tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN + tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN + tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF + tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF diff --git a/gfx/tilesets/facility.2bpp.lz.454cfd8b b/gfx/tilesets/facility.2bpp.lz.454cfd8b new file mode 100644 index 000000000..584e54dd2 Binary files /dev/null and b/gfx/tilesets/facility.2bpp.lz.454cfd8b differ diff --git a/gfx/tilesets/facility.png b/gfx/tilesets/facility.png new file mode 100644 index 000000000..e2e501077 Binary files /dev/null and b/gfx/tilesets/facility.png differ diff --git a/gfx/tilesets/facility_palette_map.asm b/gfx/tilesets/facility_palette_map.asm new file mode 100644 index 000000000..f79f9c01b --- /dev/null +++ b/gfx/tilesets/facility_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN + tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN + tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED + tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER + tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF + tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN + tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN + tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED + tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER + tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF + tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/forest.2bpp.lz.6b0ac896 b/gfx/tilesets/forest.2bpp.lz.6b0ac896 new file mode 100644 index 000000000..7b5355705 Binary files /dev/null and b/gfx/tilesets/forest.2bpp.lz.6b0ac896 differ diff --git a/gfx/tilesets/forest.png b/gfx/tilesets/forest.png new file mode 100644 index 000000000..853625944 Binary files /dev/null and b/gfx/tilesets/forest.png differ diff --git a/gfx/tilesets/forest_palette_map.asm b/gfx/tilesets/forest_palette_map.asm new file mode 100644 index 000000000..696788084 --- /dev/null +++ b/gfx/tilesets/forest_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW + tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW + tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f b/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f deleted file mode 100644 index 6b45c769d..000000000 Binary files a/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f and /dev/null differ diff --git a/gfx/tilesets/gym_1.png b/gfx/tilesets/gym_1.png deleted file mode 100644 index 27f64afa2..000000000 Binary files a/gfx/tilesets/gym_1.png and /dev/null differ diff --git a/gfx/tilesets/gym_1_palette_map.asm b/gfx/tilesets/gym_1_palette_map.asm deleted file mode 100644 index b20f49195..000000000 --- a/gfx/tilesets/gym_1_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN - tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN - tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN - tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN - tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY - tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN - tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY - tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN - tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF - tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF - -rept 16 - db $ff -endr - - tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN - tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN - tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN - tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN - tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY - tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN - tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY - tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF - tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF diff --git a/gfx/tilesets/house.2bpp.lz.c848ef13 b/gfx/tilesets/house.2bpp.lz.c848ef13 new file mode 100644 index 000000000..f9afaf70d Binary files /dev/null and b/gfx/tilesets/house.2bpp.lz.c848ef13 differ diff --git a/gfx/tilesets/house.pal b/gfx/tilesets/house.pal new file mode 100644 index 000000000..a9f8b74b6 --- /dev/null +++ b/gfx/tilesets/house.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/gfx/tilesets/house.png b/gfx/tilesets/house.png new file mode 100644 index 000000000..ce3547bb8 Binary files /dev/null and b/gfx/tilesets/house.png differ diff --git a/gfx/tilesets/house_1.2bpp.lz.c848ef13 b/gfx/tilesets/house_1.2bpp.lz.c848ef13 deleted file mode 100644 index f9afaf70d..000000000 Binary files a/gfx/tilesets/house_1.2bpp.lz.c848ef13 and /dev/null differ diff --git a/gfx/tilesets/house_1.pal b/gfx/tilesets/house_1.pal deleted file mode 100644 index a9f8b74b6..000000000 --- a/gfx/tilesets/house_1.pal +++ /dev/null @@ -1,40 +0,0 @@ -; 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/gfx/tilesets/house_1.png b/gfx/tilesets/house_1.png deleted file mode 100644 index ce3547bb8..000000000 Binary files a/gfx/tilesets/house_1.png and /dev/null differ diff --git a/gfx/tilesets/house_1_palette_map.asm b/gfx/tilesets/house_1_palette_map.asm deleted file mode 100644 index ce7b988b7..000000000 --- a/gfx/tilesets/house_1_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER - tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN - tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER - tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN - tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN - tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER - tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER - tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN - tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER - tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN - tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER - tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN - tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/house_palette_map.asm b/gfx/tilesets/house_palette_map.asm new file mode 100644 index 000000000..ce7b988b7 --- /dev/null +++ b/gfx/tilesets/house_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER + tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER + tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN + tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN + tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER + tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER + tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN + tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN + tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER + tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN + tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 b/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 deleted file mode 100644 index 7b5355705..000000000 Binary files a/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 and /dev/null differ diff --git a/gfx/tilesets/ilex_forest.png b/gfx/tilesets/ilex_forest.png deleted file mode 100644 index 853625944..000000000 Binary files a/gfx/tilesets/ilex_forest.png and /dev/null differ diff --git a/gfx/tilesets/ilex_forest_palette_map.asm b/gfx/tilesets/ilex_forest_palette_map.asm deleted file mode 100644 index 696788084..000000000 --- a/gfx/tilesets/ilex_forest_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW - tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW - tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/johto.2bpp.lz.0c7e555a b/gfx/tilesets/johto.2bpp.lz.0c7e555a new file mode 100644 index 000000000..9821e1433 Binary files /dev/null and b/gfx/tilesets/johto.2bpp.lz.0c7e555a differ diff --git a/gfx/tilesets/johto.png b/gfx/tilesets/johto.png new file mode 100644 index 000000000..62ceb23a0 Binary files /dev/null and b/gfx/tilesets/johto.png differ diff --git a/gfx/tilesets/johto_1.2bpp.lz.0c7e555a b/gfx/tilesets/johto_1.2bpp.lz.0c7e555a deleted file mode 100644 index 9821e1433..000000000 Binary files a/gfx/tilesets/johto_1.2bpp.lz.0c7e555a and /dev/null differ diff --git a/gfx/tilesets/johto_1.png b/gfx/tilesets/johto_1.png deleted file mode 100644 index 62ceb23a0..000000000 Binary files a/gfx/tilesets/johto_1.png and /dev/null differ diff --git a/gfx/tilesets/johto_1_palette_map.asm b/gfx/tilesets/johto_1_palette_map.asm deleted file mode 100644 index 62fbd2d00..000000000 --- a/gfx/tilesets/johto_1_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED - tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN - tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN - tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW - tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN - tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED - tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED - tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN - tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN - tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN - tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN - tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/johto_2.2bpp.lz.391603fb b/gfx/tilesets/johto_2.2bpp.lz.391603fb deleted file mode 100644 index 64f23e23b..000000000 Binary files a/gfx/tilesets/johto_2.2bpp.lz.391603fb and /dev/null differ diff --git a/gfx/tilesets/johto_2.png b/gfx/tilesets/johto_2.png deleted file mode 100644 index 1c080ff45..000000000 Binary files a/gfx/tilesets/johto_2.png and /dev/null differ diff --git a/gfx/tilesets/johto_2_palette_map.asm b/gfx/tilesets/johto_2_palette_map.asm deleted file mode 100644 index f2af7a92d..000000000 --- a/gfx/tilesets/johto_2_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF - tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN - tilepal 0, RED, RED, BROWN, BROWN, BROWN, GRAY, GREEN, GREEN - tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED - tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW - tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY - tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF - tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF - tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN - tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED - tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW - tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN - tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF diff --git a/gfx/tilesets/johto_modern.2bpp.lz.391603fb b/gfx/tilesets/johto_modern.2bpp.lz.391603fb new file mode 100644 index 000000000..64f23e23b Binary files /dev/null and b/gfx/tilesets/johto_modern.2bpp.lz.391603fb differ diff --git a/gfx/tilesets/johto_modern.png b/gfx/tilesets/johto_modern.png new file mode 100644 index 000000000..1c080ff45 Binary files /dev/null and b/gfx/tilesets/johto_modern.png differ diff --git a/gfx/tilesets/johto_modern_palette_map.asm b/gfx/tilesets/johto_modern_palette_map.asm new file mode 100644 index 000000000..f2af7a92d --- /dev/null +++ b/gfx/tilesets/johto_modern_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF + tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN + tilepal 0, RED, RED, BROWN, BROWN, BROWN, GRAY, GREEN, GREEN + tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED + tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW + tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF + tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF + tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN + tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED + tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW + tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN + tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF diff --git a/gfx/tilesets/johto_palette_map.asm b/gfx/tilesets/johto_palette_map.asm new file mode 100644 index 000000000..62fbd2d00 --- /dev/null +++ b/gfx/tilesets/johto_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED + tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN + tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW + tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN + tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED + tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED + tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 b/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 deleted file mode 100644 index 28f025413..000000000 Binary files a/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 and /dev/null differ diff --git a/gfx/tilesets/kurts_house.png b/gfx/tilesets/kurts_house.png deleted file mode 100644 index bda1f7983..000000000 Binary files a/gfx/tilesets/kurts_house.png and /dev/null differ diff --git a/gfx/tilesets/kurts_house_palette_map.asm b/gfx/tilesets/kurts_house_palette_map.asm deleted file mode 100644 index 5daa0da6b..000000000 --- a/gfx/tilesets/kurts_house_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY - tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY - tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER - tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN - -rept 16 - db $ff -endr - - tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY - tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY - tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY - tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER - tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN diff --git a/gfx/tilesets/mansion.2bpp.lz.63b414d4 b/gfx/tilesets/mansion.2bpp.lz.63b414d4 new file mode 100644 index 000000000..b68f147d0 Binary files /dev/null and b/gfx/tilesets/mansion.2bpp.lz.63b414d4 differ diff --git a/gfx/tilesets/mansion.png b/gfx/tilesets/mansion.png new file mode 100644 index 000000000..44e697a1b Binary files /dev/null and b/gfx/tilesets/mansion.png differ diff --git a/gfx/tilesets/mansion_1.pal b/gfx/tilesets/mansion_1.pal new file mode 100644 index 000000000..1ed1de75f --- /dev/null +++ b/gfx/tilesets/mansion_1.pal @@ -0,0 +1,44 @@ + 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 18, 24, 09 + 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 17, 19, 31 + RGB 14, 16, 31 + RGB 07, 07, 07 + + RGB 31, 31, 16 + RGB 31, 31, 16 + RGB 14, 09, 00 + RGB 00, 00, 00 + + RGB 05, 05, 16 + RGB 08, 19, 28 + RGB 00, 00, 00 + RGB 31, 31, 31 diff --git a/gfx/tilesets/mansion_2.pal b/gfx/tilesets/mansion_2.pal new file mode 100644 index 000000000..ad5c5e4db --- /dev/null +++ b/gfx/tilesets/mansion_2.pal @@ -0,0 +1,4 @@ + RGB 25, 24, 23 + RGB 20, 19, 19 + RGB 14, 16, 31 + RGB 07, 07, 07 diff --git a/gfx/tilesets/mansion_palette_map.asm b/gfx/tilesets/mansion_palette_map.asm new file mode 100644 index 000000000..2bd27ad22 --- /dev/null +++ b/gfx/tilesets/mansion_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER + tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN + tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN + tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW + tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW + tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN + tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW + tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW diff --git a/gfx/tilesets/olivine_gym.2bpp.lz.93800351 b/gfx/tilesets/olivine_gym.2bpp.lz.93800351 deleted file mode 100644 index e19994f37..000000000 Binary files a/gfx/tilesets/olivine_gym.2bpp.lz.93800351 and /dev/null differ diff --git a/gfx/tilesets/olivine_gym.png b/gfx/tilesets/olivine_gym.png deleted file mode 100644 index e32c2fb28..000000000 Binary files a/gfx/tilesets/olivine_gym.png and /dev/null differ diff --git a/gfx/tilesets/olivine_gym_palette_map.asm b/gfx/tilesets/olivine_gym_palette_map.asm deleted file mode 100644 index 551a09351..000000000 --- a/gfx/tilesets/olivine_gym_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN - tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED - tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tilesets/palette_maps.asm index b67daeb8d..5e8f9f4eb 100644 --- a/gfx/tilesets/palette_maps.asm +++ b/gfx/tilesets/palette_maps.asm @@ -15,16 +15,16 @@ INCLUDE "gfx/tilesets/kanto_palette_map.asm" ; 0x4c0e5 Tileset0PalMap: ; 0x4c0e5 -TilesetJohto1PalMap: ; 0x4c0e5 -INCLUDE "gfx/tilesets/johto_1_palette_map.asm" +TilesetJohtoPalMap: ; 0x4c0e5 +INCLUDE "gfx/tilesets/johto_palette_map.asm" ; 0x4c155 -TilesetJohto2PalMap: ; 0x4c155 -INCLUDE "gfx/tilesets/johto_2_palette_map.asm" +TilesetJohtoModernPalMap: ; 0x4c155 +INCLUDE "gfx/tilesets/johto_modern_palette_map.asm" ; 0x4c1c5 -TilesetHouse1PalMap: ; 0x4c1c5 -INCLUDE "gfx/tilesets/house_1_palette_map.asm" +TilesetHousePalMap: ; 0x4c1c5 +INCLUDE "gfx/tilesets/house_palette_map.asm" ; 0x4c235 TilesetPlayersHousePalMap: ; 0x4c235 @@ -47,36 +47,36 @@ TilesetLabPalMap: ; 0x4c3f5 INCLUDE "gfx/tilesets/lab_palette_map.asm" ; 0x4c465 -TilesetPowerPlantPalMap: ; 0x4c465 -INCLUDE "gfx/tilesets/power_plant_palette_map.asm" +TilesetFacilityPalMap: ; 0x4c465 +INCLUDE "gfx/tilesets/facility_palette_map.asm" ; 0x4c4d5 TilesetMartPalMap: ; 0x4c4d5 INCLUDE "gfx/tilesets/mart_palette_map.asm" ; 0x4c545 -TilesetCeladonMansionPalMap: ; 0x4c545 -INCLUDE "gfx/tilesets/celadon_mansion_palette_map.asm" +TilesetMansionPalMap: ; 0x4c545 +INCLUDE "gfx/tilesets/mansion_palette_map.asm" ; 0x4c5b5 TilesetGameCornerPalMap: ; 0x4c5b5 INCLUDE "gfx/tilesets/game_corner_palette_map.asm" ; 0x4c625 -TilesetGym1PalMap: ; 0x4c625 -INCLUDE "gfx/tilesets/gym_1_palette_map.asm" +TilesetEliteFourRoomPalMap: ; 0x4c625 +INCLUDE "gfx/tilesets/elite_four_room_palette_map.asm" ; 0x4c695 -TilesetKurtsHousePalMap: ; 0x4c695 -INCLUDE "gfx/tilesets/kurts_house_palette_map.asm" +TilesetTraditionalHousePalMap: ; 0x4c695 +INCLUDE "gfx/tilesets/traditional_house_palette_map.asm" ; 0x4c705 -TilesetSproutTowerPalMap: ; 0x4c705 -INCLUDE "gfx/tilesets/sprout_tower_palette_map.asm" +TilesetTowerPalMap: ; 0x4c705 +INCLUDE "gfx/tilesets/tower_palette_map.asm" ; 0x4c775 TilesetCavePalMap: ; 0x4c775 -TilesetWhirlIslandsPalMap: ; 0x4c775 +TilesetDarkCavePalMap: ; 0x4c775 INCLUDE "gfx/tilesets/cave_palette_map.asm" ; 0x4c7e5 @@ -105,16 +105,16 @@ TilesetUndergroundPalMap: ; 0x4c9a5 INCLUDE "gfx/tilesets/underground_palette_map.asm" ; 0x4ca15 -TilesetOlivineGymPalMap: ; 0x4ca15 -INCLUDE "gfx/tilesets/olivine_gym_palette_map.asm" +TilesetChampionsRoomPalMap: ; 0x4ca15 +INCLUDE "gfx/tilesets/champions_room_palette_map.asm" ; 0x4ca85 TilesetLighthousePalMap: ; 0x4ca85 INCLUDE "gfx/tilesets/lighthouse_palette_map.asm" ; 0x4caf5 -TilesetPlayersHouse2FPalMap: ; 0x4caf5 -INCLUDE "gfx/tilesets/players_house_2f_palette_map.asm" +TilesetPlayersRoomPalMap: ; 0x4caf5 +INCLUDE "gfx/tilesets/players_room_palette_map.asm" ; 0x4cb65 UnusedMuseumPalMap: ; 0x4cb65 @@ -125,8 +125,8 @@ TilesetIcePathPalMap: ; 0x4cbd5 INCLUDE "gfx/tilesets/ice_path_palette_map.asm" ; 0x4cc45 -TilesetIlexForestPalMap: ; 0x4cc45 -INCLUDE "gfx/tilesets/ilex_forest_palette_map.asm" +TilesetForestPalMap: ; 0x4cc45 +INCLUDE "gfx/tilesets/forest_palette_map.asm" ; 0x4ccb5 TilesetPokeComCenterPalMap: ; 0x4ccb5 diff --git a/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 b/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 deleted file mode 100644 index b458a501d..000000000 Binary files a/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 and /dev/null differ diff --git a/gfx/tilesets/players_house_2f.png b/gfx/tilesets/players_house_2f.png deleted file mode 100644 index a0f268eb5..000000000 Binary files a/gfx/tilesets/players_house_2f.png and /dev/null differ diff --git a/gfx/tilesets/players_house_2f_palette_map.asm b/gfx/tilesets/players_house_2f_palette_map.asm deleted file mode 100644 index 1c0cb1f08..000000000 --- a/gfx/tilesets/players_house_2f_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED - tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED - tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED - tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN - tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN - tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW - -rept 16 - db $ff -endr - - tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED - tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED - tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED - tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED - tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN - tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW - tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN - tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW diff --git a/gfx/tilesets/players_room.2bpp.lz.35e51007 b/gfx/tilesets/players_room.2bpp.lz.35e51007 new file mode 100644 index 000000000..b458a501d Binary files /dev/null and b/gfx/tilesets/players_room.2bpp.lz.35e51007 differ diff --git a/gfx/tilesets/players_room.png b/gfx/tilesets/players_room.png new file mode 100644 index 000000000..a0f268eb5 Binary files /dev/null and b/gfx/tilesets/players_room.png differ diff --git a/gfx/tilesets/players_room_palette_map.asm b/gfx/tilesets/players_room_palette_map.asm new file mode 100644 index 000000000..1c0cb1f08 --- /dev/null +++ b/gfx/tilesets/players_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED + tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW + tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW diff --git a/gfx/tilesets/power_plant.2bpp.lz.454cfd8b b/gfx/tilesets/power_plant.2bpp.lz.454cfd8b deleted file mode 100644 index 584e54dd2..000000000 Binary files a/gfx/tilesets/power_plant.2bpp.lz.454cfd8b and /dev/null differ diff --git a/gfx/tilesets/power_plant.png b/gfx/tilesets/power_plant.png deleted file mode 100644 index e2e501077..000000000 Binary files a/gfx/tilesets/power_plant.png and /dev/null differ diff --git a/gfx/tilesets/power_plant_palette_map.asm b/gfx/tilesets/power_plant_palette_map.asm deleted file mode 100644 index f79f9c01b..000000000 --- a/gfx/tilesets/power_plant_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN - tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN - tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED - tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN - tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED - tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER - tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF - tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN - tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN - tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED - tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN - tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED - tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER - tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF - tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/sprout-pillar/1.png b/gfx/tilesets/sprout-pillar/1.png deleted file mode 100644 index c22fb2a13..000000000 Binary files a/gfx/tilesets/sprout-pillar/1.png and /dev/null differ diff --git a/gfx/tilesets/sprout-pillar/10.png b/gfx/tilesets/sprout-pillar/10.png deleted file mode 100644 index 01dbe1afc..000000000 Binary files a/gfx/tilesets/sprout-pillar/10.png and /dev/null differ diff --git a/gfx/tilesets/sprout-pillar/2.png b/gfx/tilesets/sprout-pillar/2.png deleted file mode 100644 index 76fae403b..000000000 Binary files a/gfx/tilesets/sprout-pillar/2.png and /dev/null differ diff --git a/gfx/tilesets/sprout-pillar/3.png b/gfx/tilesets/sprout-pillar/3.png deleted file mode 100644 index 80ce4657c..000000000 Binary files a/gfx/tilesets/sprout-pillar/3.png and /dev/null differ diff --git a/gfx/tilesets/sprout-pillar/4.png b/gfx/tilesets/sprout-pillar/4.png deleted file mode 100644 index 9d523c4bc..000000000 Binary files a/gfx/tilesets/sprout-pillar/4.png and /dev/null differ diff --git a/gfx/tilesets/sprout-pillar/5.png b/gfx/tilesets/sprout-pillar/5.png deleted file mode 100644 index b7796c8d6..000000000 Binary files a/gfx/tilesets/sprout-pillar/5.png and /dev/null differ diff --git a/gfx/tilesets/sprout-pillar/6.png b/gfx/tilesets/sprout-pillar/6.png deleted file mode 100644 index 0ca0e5936..000000000 Binary files a/gfx/tilesets/sprout-pillar/6.png and /dev/null differ diff --git a/gfx/tilesets/sprout-pillar/7.png b/gfx/tilesets/sprout-pillar/7.png deleted file mode 100644 index 3aa4b4e94..000000000 Binary files a/gfx/tilesets/sprout-pillar/7.png and /dev/null differ diff --git a/gfx/tilesets/sprout-pillar/8.png b/gfx/tilesets/sprout-pillar/8.png deleted file mode 100644 index e81475618..000000000 Binary files a/gfx/tilesets/sprout-pillar/8.png and /dev/null differ diff --git a/gfx/tilesets/sprout-pillar/9.png b/gfx/tilesets/sprout-pillar/9.png deleted file mode 100644 index da74607be..000000000 Binary files a/gfx/tilesets/sprout-pillar/9.png and /dev/null differ diff --git a/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c b/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c deleted file mode 100644 index 2033306e3..000000000 Binary files a/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c and /dev/null differ diff --git a/gfx/tilesets/sprout_tower.png b/gfx/tilesets/sprout_tower.png deleted file mode 100644 index 05484b5d9..000000000 Binary files a/gfx/tilesets/sprout_tower.png and /dev/null differ diff --git a/gfx/tilesets/sprout_tower_palette_map.asm b/gfx/tilesets/sprout_tower_palette_map.asm deleted file mode 100644 index 6e3c10115..000000000 --- a/gfx/tilesets/sprout_tower_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED - tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED - tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED - tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED - tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/tower-pillar/1.png b/gfx/tilesets/tower-pillar/1.png new file mode 100644 index 000000000..c22fb2a13 Binary files /dev/null and b/gfx/tilesets/tower-pillar/1.png differ diff --git a/gfx/tilesets/tower-pillar/10.png b/gfx/tilesets/tower-pillar/10.png new file mode 100644 index 000000000..01dbe1afc Binary files /dev/null and b/gfx/tilesets/tower-pillar/10.png differ diff --git a/gfx/tilesets/tower-pillar/2.png b/gfx/tilesets/tower-pillar/2.png new file mode 100644 index 000000000..76fae403b Binary files /dev/null and b/gfx/tilesets/tower-pillar/2.png differ diff --git a/gfx/tilesets/tower-pillar/3.png b/gfx/tilesets/tower-pillar/3.png new file mode 100644 index 000000000..80ce4657c Binary files /dev/null and b/gfx/tilesets/tower-pillar/3.png differ diff --git a/gfx/tilesets/tower-pillar/4.png b/gfx/tilesets/tower-pillar/4.png new file mode 100644 index 000000000..9d523c4bc Binary files /dev/null and b/gfx/tilesets/tower-pillar/4.png differ diff --git a/gfx/tilesets/tower-pillar/5.png b/gfx/tilesets/tower-pillar/5.png new file mode 100644 index 000000000..b7796c8d6 Binary files /dev/null and b/gfx/tilesets/tower-pillar/5.png differ diff --git a/gfx/tilesets/tower-pillar/6.png b/gfx/tilesets/tower-pillar/6.png new file mode 100644 index 000000000..0ca0e5936 Binary files /dev/null and b/gfx/tilesets/tower-pillar/6.png differ diff --git a/gfx/tilesets/tower-pillar/7.png b/gfx/tilesets/tower-pillar/7.png new file mode 100644 index 000000000..3aa4b4e94 Binary files /dev/null and b/gfx/tilesets/tower-pillar/7.png differ diff --git a/gfx/tilesets/tower-pillar/8.png b/gfx/tilesets/tower-pillar/8.png new file mode 100644 index 000000000..e81475618 Binary files /dev/null and b/gfx/tilesets/tower-pillar/8.png differ diff --git a/gfx/tilesets/tower-pillar/9.png b/gfx/tilesets/tower-pillar/9.png new file mode 100644 index 000000000..da74607be Binary files /dev/null and b/gfx/tilesets/tower-pillar/9.png differ diff --git a/gfx/tilesets/tower.2bpp.lz.bc56789c b/gfx/tilesets/tower.2bpp.lz.bc56789c new file mode 100644 index 000000000..2033306e3 Binary files /dev/null and b/gfx/tilesets/tower.2bpp.lz.bc56789c differ diff --git a/gfx/tilesets/tower.png b/gfx/tilesets/tower.png new file mode 100644 index 000000000..05484b5d9 Binary files /dev/null and b/gfx/tilesets/tower.png differ diff --git a/gfx/tilesets/tower_palette_map.asm b/gfx/tilesets/tower_palette_map.asm new file mode 100644 index 000000000..6e3c10115 --- /dev/null +++ b/gfx/tilesets/tower_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED + tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED + tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED + tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED + tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN diff --git a/gfx/tilesets/traditional_house.2bpp.lz.dd51d079 b/gfx/tilesets/traditional_house.2bpp.lz.dd51d079 new file mode 100644 index 000000000..28f025413 Binary files /dev/null and b/gfx/tilesets/traditional_house.2bpp.lz.dd51d079 differ diff --git a/gfx/tilesets/traditional_house.png b/gfx/tilesets/traditional_house.png new file mode 100644 index 000000000..bda1f7983 Binary files /dev/null and b/gfx/tilesets/traditional_house.png differ diff --git a/gfx/tilesets/traditional_house_palette_map.asm b/gfx/tilesets/traditional_house_palette_map.asm new file mode 100644 index 000000000..5daa0da6b --- /dev/null +++ b/gfx/tilesets/traditional_house_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY + tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY + tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY + tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY + tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY + tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN diff --git a/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 b/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 deleted file mode 100644 index 50a5ab9ac..000000000 Binary files a/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 and /dev/null differ diff --git a/gfx/tilesets/whirl_islands.png b/gfx/tilesets/whirl_islands.png deleted file mode 100644 index 1d0a91e5e..000000000 Binary files a/gfx/tilesets/whirl_islands.png and /dev/null differ diff --git a/gfx/tilesets/whirl_islands_palette_map.asm b/gfx/tilesets/whirl_islands_palette_map.asm deleted file mode 100644 index 73c09ebe5..000000000 --- a/gfx/tilesets/whirl_islands_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY -- cgit v1.2.3 From 4161ec98b4ab19863ae35502c9959892effbf6ea Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 17 Jan 2018 22:37:04 -0500 Subject: Partially document SGB data from pokered --- gfx/sgb/blk_packets.asm | 81 ++++++++++++++---- gfx/sgb/data_snd_packets.asm | 104 +++++++++++++++++++++++ gfx/sgb/pal_packets.asm | 191 ++++++++++++++++++------------------------- gfx/sgb/roof_pal_inds.asm | 54 ++++++------ 4 files changed, 275 insertions(+), 155 deletions(-) create mode 100644 gfx/sgb/data_snd_packets.asm (limited to 'gfx') diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm index 38f68ad1d..e3c883549 100644 --- a/gfx/sgb/blk_packets.asm +++ b/gfx/sgb/blk_packets.asm @@ -1,40 +1,87 @@ +; macros taken from pokered's data/sgb_packets.asm + +attr_blk: MACRO + db (SGB_ATTR_BLK << 3) + ((\1 * 6) / 16 + 1) + db \1 +ENDM + +attr_blk_data: MACRO + db \1 ; which regions are affected + db \2 + (\3 << 2) + (\4 << 4) ; palette for each region + db \5, \6, \7, \8 ; x1, y1, x2, y2 +ENDM + BlkPacket_9a86: - db $21, $01, $03, $00, $00, $00, $13, $11, $00, $00, $00, $00, $00, $00, $00, $00 + attr_blk 1 + attr_blk_data %011, 0,0,0, 00,00, 19,17 + ds 8 BlkPacket_9a96: - db $21, $01, $07, $05, $00, $0a, $13, $0d, $00, $00, $00, $00, $00, $00, $00, $00 + attr_blk 1 + attr_blk_data %111, 1,1,0, 00,10, 19,13 + ds 8 BlkPacket_9aa6: - db $22, $05, $07, $0a, $00, $0c, $13, $11, $03, $05, $01, $00, $0a, $03, $03, $00 - db $0a, $08, $13, $0a, $03, $0a, $00, $04, $08, $0b, $03, $0f, $0b, $00, $13, $07 + attr_blk 5 + attr_blk_data %111, 2,2,0, 00,12, 19,17 + attr_blk_data %011, 1,1,0, 01,00, 10,03 + attr_blk_data %011, 0,0,0, 10,08, 19,10 + attr_blk_data %011, 2,2,0, 00,04, 08,11 + attr_blk_data %011, 3,3,0, 11,00, 19,07 BlkPacket_9ac6: - db $21, $01, $07, $05, $00, $01, $07, $07, $00, $00, $00, $00, $00, $00, $00, $00 + attr_blk 1 + attr_blk_data %111, 1,1,0, 00,01, 07,07 + ds 8 BlkPacket_9ad6: - db $21, $01, $07, $05, $0b, $01, $13, $02, $00, $00, $00, $00, $00, $00, $00, $00 + attr_blk 1 + attr_blk_data %111, 1,1,0, 11,01, 19,02 + ds 8 BlkPacket_9ae6: - db $21, $01, $07, $05, $01, $01, $08, $08, $00, $00, $00, $00, $00, $00, $00, $00 + attr_blk 1 + attr_blk_data %111, 1,1,0, 01,01, 08,08 + ds 8 BlkPacket_9af6: - db $21, $01, $07, $05, $07, $05, $0d, $0b, $00, $00, $00, $00, $00, $00, $00, $00 + attr_blk 1 + attr_blk_data %111, 1,1,0, 07,05, 13,11 + ds 8 BlkPacket_9b06: - db $22, $05, $03, $05, $00, $00, $13, $0b, $03, $0a, $00, $04, $13, $09, $02, $0f - db $00, $06, $13, $07, $03, $00, $04, $04, $0f, $09, $03, $00, $00, $0c, $13, $11 + attr_blk 5 + attr_blk_data %011, 1,1,0, 00,00, 19,11 + attr_blk_data %011, 2,2,0, 00,04, 19,09 + attr_blk_data %010, 3,3,0, 00,06, 19,07 + attr_blk_data %011, 0,0,0, 04,04, 15,09 + attr_blk_data %011, 0,0,0, 00,12, 19,17 BlkPacket_9b26: - db $23, $07, $07, $10, $00, $00, $02, $0c, $02, $00, $0c, $00, $12, $01, $02, $00 - db $0c, $02, $12, $03, $02, $00, $0c, $04, $12, $05, $02, $00, $0c, $06, $12, $07 - db $02, $00, $0c, $08, $12, $09, $02, $00, $0c, $0a, $12, $0b, $00, $00, $00, $00 + attr_blk 7 + attr_blk_data %111, 0,0,1, 00,00, 02,12 + attr_blk_data %010, 0,0,0, 12,00, 18,01 + attr_blk_data %010, 0,0,0, 12,02, 18,03 + attr_blk_data %010, 0,0,0, 12,04, 18,05 + attr_blk_data %010, 0,0,0, 12,06, 18,07 + attr_blk_data %010, 0,0,0, 12,08, 18,09 + attr_blk_data %010, 0,0,0, 12,10, 18,11 + ds 4 BlkPacket_9b56: - db $22, $03, $07, $20, $00, $00, $13, $04, $03, $0f, $00, $06, $13, $11, $03, $05 - db $0f, $01, $12, $04, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + attr_blk 3 + attr_blk_data %111, 0,0,2, 00,00, 19,04 + attr_blk_data %011, 3,3,0, 00,06, 19,17 + attr_blk_data %011, 1,1,0, 15,01, 18,04 + ds 12 BlkPacket_9b76: - db $21, $01, $07, $10, $00, $00, $13, $05, $00, $00, $00, $00, $00, $00, $00, $00 + attr_blk 1 + attr_blk_data %111, 0,0,1, 00,00, 19,05 + ds 8 BlkPacket_9b86: - db $21, $02, $07, $0a, $00, $04, $13, $0d, $03, $05, $00, $06, $13, $0b, $00, $00 + attr_blk 2 + attr_blk_data %111, 2,2,0, 00,04, 19,13 + attr_blk_data %011, 1,1,0, 00,06, 19,11 + ds 2 diff --git a/gfx/sgb/data_snd_packets.asm b/gfx/sgb/data_snd_packets.asm new file mode 100644 index 000000000..cfa799f0c --- /dev/null +++ b/gfx/sgb/data_snd_packets.asm @@ -0,0 +1,104 @@ +; macros taken from pokered's data/sgb_packets.asm +; names taken from pandocs +; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_Palette_Commands + +sgb_mask_en: MACRO + db ($17 << 3) + 1 + db \1 + ds 14 +ENDM + +sgb_data_snd: MACRO + db ($0f << 3) + 1 + dw \1 ; address + db \2 ; bank + db \3 ; length (1-11) +ENDM + + +MaskEnFreezePacket: sgb_mask_en 1 +MaskEnCancelPacket: sgb_mask_en 0 + +; These are packets containing SNES code. +; This set of packets is found in several Japanese SGB-compatible titles. +; It appears to be part of NCL's SGB devkit. + +DataSndPacket1: + sgb_data_snd $085d, $0, 11 + db $8c ; cpx #$8c (2) + db $d0, $f4 ; bne -$0c + db $60 ; rts + ds 7 + +DataSndPacket2: + sgb_data_snd $0852, $0, 11 + db $a9, $e7 ; lda #$e7 + db $9f, $01, $c0, $7e ; sta $7ec001, x + db $e8 ; inx + db $e8 ; inx + db $e8 ; inx + db $e8 ; inx + db $e0 ; cpx #$8c (1) + +DataSndPacket3: + sgb_data_snd $0847, $0, 11 + db $c4 ; cmp #$c4 (2) + db $d0, $16 ; bne +$16 + db $a5 ; lda dp + db $cb ; wai + db $c9, $05 ; cmp #$05 + db $d0, $10 ; bne +$10 + db $a2, $28 ; ldx #$28 + +DataSndPacket4: + sgb_data_snd $083c, $0, 11 + db $f0, $12 ; beq +$12 + db $a5 ; lda dp + db $c9, $c9 ; cmp #$c9 + db $c8 ; iny + db $d0, $1c ; bne +$1c + db $a5 ; lda dp + db $ca ; dex + db $c9 ; cmp #$c4 (1) + +DataSndPacket5: + sgb_data_snd $0831, $0, 11 + dbw $0c, $caa5 ; tsb $caa5 + db $c9, $7e ; cmp #$7e + db $d0, $06 ; bne +$06 + db $a5 ; lda dp + db $cb ; wai + db $c9, $7e ; cmp #$7e + +DataSndPacket6: + sgb_data_snd $0826, $0, 11 + db $39 ; bne +$39 (2) + dbw $cd, $0c48 ; cmp $0c48 + db $d0, $34 ; bne +$34 + db $a5 ; lda dp + db $c9, $c9 ; cmp #$c9 + db $80, $d0 ; bra -$30 + +DataSndPacket7: + sgb_data_snd $081b, $0, 11 + db $ea ; nop + db $ea ; nop + db $ea ; nop + db $ea ; nop + db $ea ; nop + ; $0820: + db $a9, $01 ; lda #01 + dbw $cd, $0c4f ; cmp $c4f + db $d0 ; bne +$39 (1) + +DataSndPacket8: + sgb_data_snd $0810, $0, 11 + dbw $4c, $0820 ; jmp $0820 + db $ea ; nop + db $ea ; nop + db $ea ; nop + db $ea ; nop + db $ea ; nop + db $60 ; rts + db $ea ; nop + db $ea ; nop diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index 7ab27d359..6cecd40af 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -1,115 +1,84 @@ -; indexes correspond to PredefPals palettes (see gfx/sgb/predef.pal) - -PalPacket_9b96: - db $51, $48, $00, $49, $00, $4a, $00, $4b, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9ba6: - db $51, $2b, $00, $24, $00, $20, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9bb6: - db $51, $41, $00, $42, $00, $43, $00, $44, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9bc6: - db $51, $4c, $00, $4c, $00, $4c, $00, $4c, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9bd6: - db $51, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9be6: - db $51, $36, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9bf6: - db $51, $37, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9c06: - db $51, $38, $00, $39, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9c16: - db $51, $3a, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9c26: - db $51, $3b, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9c36: - db $51, $3c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9c46: - db $51, $39, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9c56: - db $51, $2e, $00, $2f, $00, $30, $00, $31, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9c66: - db $51, $1a, $00, $1a, $00, $1a, $00, $1a, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9c76: - db $51, $32, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9c86: - db $51, $3c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9c96: - db $51, $3d, $00, $3e, $00, $3f, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9ca6: - db $51, $33, $00, $34, $00, $1b, $00, $1f, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9cb6: - db $51, $1b, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9cc6: - db $51, $1c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9cd6: - db $51, $35, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 +; macros taken from pokered's data/sgb_packets.asm +; names taken from pandocs +; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_Palette_Commands + +sgb_pal_set: MACRO + db (SGB_PAL_SET << 3) + 1 + dw PREDEFPAL_\1, PREDEFPAL_\2, PREDEFPAL_\3, PREDEFPAL_\4 + ds 7 +ENDM + +sgb_pal01: MACRO + db (SGB_PAL01 << 3) + 1 +ENDM + +sgb_pal23: MACRO + db (SGB_PAL23 << 3) + 1 +ENDM + +sgb_pal_trn: MACRO + db (SGB_PAL_TRN << 3) + 1 + ds 15 +ENDM + +sgb_mlt_req: MACRO + db (SGB_MLT_REG << 3) + 1 + db \1 - 1 + ds 14 +ENDM + +sgb_chr_trn: MACRO + db (SGB_CHR_TRN << 3) + 1 + db \1 + (\2 << 1) + ds 14 +ENDM + +sgb_pct_trn: MACRO + db (SGB_PCT_TRN << 3) + 1 + ds 15 +ENDM + + +PalPacket_9b96: sgb_pal_set 48, 49, 4A, 4B +PalPacket_9ba6: sgb_pal_set 2B, 24, 20, 00 +PalPacket_9bb6: sgb_pal_set 41, 42, 43, 44 +PalPacket_9bc6: sgb_pal_set 4C, 4C, 4C, 4C +PalPacket_9bd6: sgb_pal_set 00, 00, 00, 00 +PalPacket_9be6: sgb_pal_set 36, 00, 00, 00 +PalPacket_9bf6: sgb_pal_set 37, 00, 00, 00 +PalPacket_9c06: sgb_pal_set 38, 39, 00, 00 +PalPacket_9c16: sgb_pal_set 3A, 00, 00, 00 +PalPacket_9c26: sgb_pal_set 3B, 00, 00, 00 +PalPacket_9c36: sgb_pal_set 3C, 00, 00, 00 +PalPacket_9c46: sgb_pal_set 39, 00, 00, 00 +PalPacket_9c56: sgb_pal_set 2E, 2F, 30, 31 +PalPacket_9c66: sgb_pal_set 1A, 1A, 1A, 1A +PalPacket_9c76: sgb_pal_set 32, 00, 00, 00 +PalPacket_9c86: sgb_pal_set 3C, 00, 00, 00 +PalPacket_9c96: sgb_pal_set 3D, 3E, 3F, 40 +PalPacket_9ca6: sgb_pal_set 33, 34, 1B, 1F +PalPacket_9cb6: sgb_pal_set 1B, 00, 00, 00 +PalPacket_9cc6: sgb_pal_set 1C, 00, 00, 00 +PalPacket_9cd6: sgb_pal_set 35, 00, 00, 00 PalPacket_9ce6: - db $01, $ff, $7f, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + sgb_pal01 + RGB 31, 31, 31 +rept 6 + RGB 00, 00, 00 +endr + ds 1 PalPacket_9cf6: - db $09, $ff, $7f, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9d06: - db $59, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9d16: - db $89, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9d26: - db $89, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9d36: - db $99, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9d46: - db $a1, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9d56: - db $b9, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9d66: - db $b9, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9d76: - db $79, $5d, $08, $00, $0b, $8c, $d0, $f4, $60, $00, $00, $00, $00, $00, $00, $00 - -PalPacket_9d86: - db $79, $52, $08, $00, $0b, $a9, $e7, $9f, $01, $c0, $7e, $e8, $e8, $e8, $e8, $e0 - -PalPacket_9d96: - db $79, $47, $08, $00, $0b, $c4, $d0, $16, $a5, $cb, $c9, $05, $d0, $10, $a2, $28 - -PalPacket_9da6: - db $79, $3c, $08, $00, $0b, $f0, $12, $a5, $c9, $c9, $c8, $d0, $1c, $a5, $ca, $c9 - -PalPacket_9db6: - db $79, $31, $08, $00, $0b, $0c, $a5, $ca, $c9, $7e, $d0, $06, $a5, $cb, $c9, $7e - -PalPacket_9dc6: - db $79, $26, $08, $00, $0b, $39, $cd, $48, $0c, $d0, $34, $a5, $c9, $c9, $80, $d0 - -PalPacket_9dd6: - db $79, $1b, $08, $00, $0b, $ea, $ea, $ea, $ea, $ea, $a9, $01, $cd, $4f, $0c, $d0 - -PalPacket_9de6: - db $79, $10, $08, $00, $0b, $4c, $20, $08, $ea, $ea, $ea, $ea, $ea, $60, $ea, $ea + sgb_pal23 + RGB 31, 31, 31 +rept 6 + RGB 00, 00, 00 +endr + ds 1 + +PalTrnPacket: sgb_pal_trn +MltReq1Packet: sgb_mlt_req 1 +MltReq2Packet: sgb_mlt_req 2 +ChrTrnPacket: sgb_chr_trn 0, 0 +PctTrnPacket: sgb_pct_trn diff --git a/gfx/sgb/roof_pal_inds.asm b/gfx/sgb/roof_pal_inds.asm index 5692c880a..7b696fd3f 100644 --- a/gfx/sgb/roof_pal_inds.asm +++ b/gfx/sgb/roof_pal_inds.asm @@ -2,31 +2,31 @@ MapGroupRoofSGBPalInds: ; 8a45 ; entries correspond to map groups - db $00 ; group 0 (unused) - db $12 ; group 1 (Olivine) - db $14 ; group 2 (Mahogany) - db $18 ; group 3 (dungeons) - db $11 ; group 4 (Ecruteak) - db $15 ; group 5 (Blackthorn) - db $09 ; group 6 (Cinnabar) - db $04 ; group 7 (Cerulean) - db $0f ; group 8 (Azalea) - db $16 ; group 9 (Lake of Rage) - db $0e ; group 10 (Violet) - db $10 ; group 11 (Goldenrod) - db $06 ; group 12 (Vermilion) - db $01 ; group 13 (Pallet) - db $03 ; group 14 (Pewter) - db $06 ; group 15 (Mount Moon Square) - db $0b ; group 16 (Indigo) - db $08 ; group 17 (Fuchsia) - db $05 ; group 18 (Lavender) - db $17 ; group 19 (Silver Cave) - db $08 ; group 20 (Cable Club) - db $07 ; group 21 (Celadon) - db $13 ; group 22 (Cianwood) - db $02 ; group 23 (Viridian) - db $0c ; group 24 (New Bark) - db $0a ; group 25 (Saffron) - db $0d ; group 26 (Cherrygrove) + db PREDEFPAL_00 ; group 0 (unused) + db PREDEFPAL_12 ; group 1 (Olivine) + db PREDEFPAL_14 ; group 2 (Mahogany) + db PREDEFPAL_18 ; group 3 (dungeons) + db PREDEFPAL_11 ; group 4 (Ecruteak) + db PREDEFPAL_15 ; group 5 (Blackthorn) + db PREDEFPAL_09 ; group 6 (Cinnabar) + db PREDEFPAL_04 ; group 7 (Cerulean) + db PREDEFPAL_0F ; group 8 (Azalea) + db PREDEFPAL_16 ; group 9 (Lake of Rage) + db PREDEFPAL_0E ; group 10 (Violet) + db PREDEFPAL_10 ; group 11 (Goldenrod) + db PREDEFPAL_06 ; group 12 (Vermilion) + db PREDEFPAL_01 ; group 13 (Pallet) + db PREDEFPAL_03 ; group 14 (Pewter) + db PREDEFPAL_06 ; group 15 (Mount Moon Square) + db PREDEFPAL_0B ; group 16 (Indigo) + db PREDEFPAL_08 ; group 17 (Fuchsia) + db PREDEFPAL_05 ; group 18 (Lavender) + db PREDEFPAL_17 ; group 19 (Silver Cave) + db PREDEFPAL_08 ; group 20 (Cable Club) + db PREDEFPAL_07 ; group 21 (Celadon) + db PREDEFPAL_13 ; group 22 (Cianwood) + db PREDEFPAL_02 ; group 23 (Viridian) + db PREDEFPAL_0C ; group 24 (New Bark) + db PREDEFPAL_0A ; group 25 (Saffron) + db PREDEFPAL_0D ; group 26 (Cherrygrove) ; 8a60 -- cgit v1.2.3 From c5d9ecae9c343677150273b810703a1fd8d9d87a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 17 Jan 2018 22:48:57 -0500 Subject: More SGB documentation --- gfx/sgb/blk_packets.asm | 3 + gfx/sgb/data_snd_packets.asm | 11 +-- gfx/sgb/pal_packets.asm | 9 +++ gfx/sgb/predef.pal | 158 +++++++++++++++++++++---------------------- gfx/sgb/roof_pal_inds.asm | 54 +++++++-------- 5 files changed, 119 insertions(+), 116 deletions(-) (limited to 'gfx') diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm index e3c883549..fd01ab3d0 100644 --- a/gfx/sgb/blk_packets.asm +++ b/gfx/sgb/blk_packets.asm @@ -1,4 +1,6 @@ ; macros taken from pokered's data/sgb_packets.asm +; names taken from pandocs +; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_Palette_Commands attr_blk: MACRO db (SGB_ATTR_BLK << 3) + ((\1 * 6) / 16 + 1) @@ -11,6 +13,7 @@ attr_blk_data: MACRO db \5, \6, \7, \8 ; x1, y1, x2, y2 ENDM + BlkPacket_9a86: attr_blk 1 attr_blk_data %011, 0,0,0, 00,00, 19,17 diff --git a/gfx/sgb/data_snd_packets.asm b/gfx/sgb/data_snd_packets.asm index cfa799f0c..c2521b845 100644 --- a/gfx/sgb/data_snd_packets.asm +++ b/gfx/sgb/data_snd_packets.asm @@ -2,23 +2,14 @@ ; names taken from pandocs ; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_Palette_Commands -sgb_mask_en: MACRO - db ($17 << 3) + 1 - db \1 - ds 14 -ENDM - sgb_data_snd: MACRO - db ($0f << 3) + 1 + db (SGB_DATA_SND << 3) + 1 dw \1 ; address db \2 ; bank db \3 ; length (1-11) ENDM -MaskEnFreezePacket: sgb_mask_en 1 -MaskEnCancelPacket: sgb_mask_en 0 - ; These are packets containing SNES code. ; This set of packets is found in several Japanese SGB-compatible titles. ; It appears to be part of NCL's SGB devkit. diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index 6cecd40af..c66ffed86 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -38,6 +38,12 @@ sgb_pct_trn: MACRO ds 15 ENDM +sgb_mask_en: MACRO + db (SGB_MASK_EN << 3) + 1 + db \1 + ds 14 +ENDM + PalPacket_9b96: sgb_pal_set 48, 49, 4A, 4B PalPacket_9ba6: sgb_pal_set 2B, 24, 20, 00 @@ -82,3 +88,6 @@ MltReq1Packet: sgb_mlt_req 1 MltReq2Packet: sgb_mlt_req 2 ChrTrnPacket: sgb_chr_trn 0, 0 PctTrnPacket: sgb_pct_trn + +MaskEnFreezePacket: sgb_mask_en 1 +MaskEnCancelPacket: sgb_mask_en 0 diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index d37fb8c3a..e31ba24f8 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -1,394 +1,394 @@ -; $00 (_CGB_BattleGrayscale via PalPacket_9c66) +; PREDEFPAL_00 (_CGB_BattleGrayscale via PalPacket_9c66) RGB 31, 31, 31 RGB 22, 25, 19 RGB 16, 21, 30 RGB 00, 00, 00 -; $01 (Pallet map group) +; PREDEFPAL_PALLET RGB 31, 31, 31 RGB 27, 28, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $02 (Viridian map group) +; PREDEFPAL_VIRIDIAN RGB 31, 31, 31 RGB 24, 28, 19 RGB 15, 20, 31 RGB 00, 00, 00 -; $03 (Pewter map group) +; PREDEFPAL_PEWTER RGB 31, 31, 31 RGB 24, 24, 24 RGB 15, 20, 31 RGB 00, 00, 00 -; $04 (Cerulean map group) +; PREDEFPAL_CERULEAN RGB 31, 31, 31 RGB 21, 23, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $05 (Lavender map group) +; PREDEFPAL_LAVENDER RGB 31, 31, 31 RGB 24, 21, 27 RGB 15, 20, 31 RGB 00, 00, 00 -; $06 (Vermilion map group) +; PREDEFPAL_VERMILION RGB 31, 31, 31 RGB 31, 24, 16 RGB 15, 20, 31 RGB 00, 00, 00 -; $07 (Celadon map group) +; PREDEFPAL_CELADON RGB 31, 31, 31 RGB 25, 30, 26 RGB 15, 20, 31 RGB 00, 00, 00 -; $08 (Fuchsia map group) +; PREDEFPAL_FUCHSIA RGB 31, 31, 31 RGB 31, 25, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $09 (Cinnabar map group) +; PREDEFPAL_CINNABAR RGB 31, 31, 31 RGB 31, 20, 19 RGB 15, 20, 31 RGB 00, 00, 00 -; $0a (Saffron map group) +; PREDEFPAL_SAFFRON RGB 31, 31, 31 RGB 31, 26, 19 RGB 15, 20, 31 RGB 00, 00, 00 -; $0b (Indigo map group) +; PREDEFPAL_INDIGO RGB 31, 31, 31 RGB 27, 28, 27 RGB 15, 20, 31 RGB 00, 00, 00 -; $0c (New Bark map group) +; PREDEFPAL_NEW_BARK RGB 31, 31, 31 RGB 24, 30, 23 RGB 15, 20, 31 RGB 00, 00, 00 -; $0d (Cherrygrove map group) +; PREDEFPAL_CHERRYGROVE RGB 31, 31, 31 RGB 29, 24, 29 RGB 15, 20, 31 RGB 00, 00, 00 -; $0e (Violet map group) +; PREDEFPAL_VIOLET RGB 31, 31, 31 RGB 26, 23, 29 RGB 15, 20, 31 RGB 00, 00, 00 -; $0f (Azalea map group) +; PREDEFPAL_AZALEA RGB 31, 31, 31 RGB 25, 23, 20 RGB 15, 20, 31 RGB 00, 00, 00 -; $10 (Goldenrod map group, _CGB_MoveList) +; PREDEFPAL_GOLDENROD RGB 31, 31, 31 RGB 29, 26, 18 RGB 15, 20, 31 RGB 00, 00, 00 -; $11 (Ecruteak map group) +; PREDEFPAL_ECRUTEAK RGB 31, 31, 31 RGB 31, 21, 18 RGB 15, 20, 31 RGB 00, 00, 00 -; $12 (Olivine map group) +; PREDEFPAL_OLIVINE RGB 31, 31, 31 RGB 26, 25, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $13 (Cianwood map group) +; PREDEFPAL_CIANWOOD RGB 31, 31, 31 RGB 22, 21, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $14 (Mahogany map group) +; PREDEFPAL_MAHOGANY RGB 31, 31, 31 RGB 22, 25, 21 RGB 15, 20, 31 RGB 00, 00, 00 -; $15 (Blackthorn map group) +; PREDEFPAL_BLACKTHORN RGB 31, 31, 31 RGB 21, 21, 22 RGB 15, 20, 31 RGB 00, 00, 00 -; $16 (Lake of Rage map group) +; PREDEFPAL_LAKE_OF_RAGE RGB 31, 31, 31 RGB 31, 20, 20 RGB 15, 20, 31 RGB 00, 00, 00 -; $17 (Silver Cave map group) +; PREDEFPAL_SILVER_CAVE RGB 31, 31, 31 RGB 26, 26, 26 RGB 15, 20, 31 RGB 00, 00, 00 -; $18 (dungeon map group) +; PREDEFPAL_DUNGEONS RGB 31, 31, 31 RGB 21, 14, 09 RGB 15, 20, 20 RGB 00, 00, 00 -; $19 +; PREDEFPAL_NITE RGB 31, 31, 31 RGB 12, 28, 22 RGB 15, 20, 20 RGB 00, 00, 00 -; $1a (_CGB_Evolution, _CGB_BattleGrayscale via PalPacket_9c66) +; PREDEFPAL_1A (_CGB_Evolution, _CGB_BattleGrayscale via PalPacket_9c66) RGB 31, 31, 31 RGB 07, 07, 07 RGB 02, 03, 03 RGB 00, 00, 00 -; $1b (_CGB_Diploma via PalPacket_9cb6, _CGB0d via PalPacket_9cb6) +; PREDEFPAL_1B (_CGB_Diploma via PalPacket_9cb6, _CGB0d via PalPacket_9cb6) RGB 31, 31, 31 RGB 30, 22, 17 RGB 16, 14, 19 RGB 00, 00, 00 -; $1c (_CGB_TradeTube, Unreferenced_Function97cc) +; PREDEFPAL_1C (_CGB_TradeTube, Unreferenced_Function97cc) RGB 31, 31, 31 RGB 18, 20, 27 RGB 11, 15, 23 RGB 00, 00, 00 -; $1d (_CGB_Pokedex, _CGB_BillsPC, _CGB_PokedexUnownMode, _CGB_PokedexSearchOption) +; PREDEFPAL_1D (_CGB_Pokedex, _CGB_BillsPC, _CGB_PokedexUnownMode, _CGB_PokedexSearchOption) RGB 31, 31, 31 RGB 31, 20, 10 RGB 26, 10, 06 RGB 00, 00, 00 -; $1e +; PREDEFPAL_1E RGB 31, 31, 31 RGB 21, 25, 29 RGB 14, 19, 25 RGB 00, 00, 00 -; $1f +; PREDEFPAL_1F RGB 31, 31, 31 RGB 27, 22, 24 RGB 21, 15, 23 RGB 00, 00, 00 -; $20 +; PREDEFPAL_20 RGB 31, 31, 31 RGB 28, 20, 15 RGB 21, 14, 09 RGB 00, 00, 00 -; $21 (Unreferenced_Function97cc) +; PREDEFPAL_21 (Unreferenced_Function97cc) RGB 31, 31, 31 RGB 20, 26, 16 RGB 09, 20, 11 RGB 00, 00, 00 -; $22 +; PREDEFPAL_22 RGB 31, 31, 31 RGB 30, 22, 24 RGB 28, 15, 21 RGB 00, 00, 00 -; $23 +; PREDEFPAL_23 RGB 31, 31, 31 RGB 31, 28, 14 RGB 26, 20, 00 RGB 00, 00, 00 -; $24 (_CGB_TrainerCard, _CGB13 via PalPacket_9ba6) +; PREDEFPAL_24 (_CGB_TrainerCard, _CGB13 via PalPacket_9ba6) RGB 31, 31, 31 RGB 26, 21, 22 RGB 15, 15, 18 RGB 00, 00, 00 -; $25 +; PREDEFPAL_25 RGB 31, 31, 31 RGB 23, 19, 13 RGB 14, 12, 17 RGB 00, 00, 00 -; $26 +; PREDEFPAL_26 RGB 31, 31, 31 RGB 16, 18, 21 RGB 10, 12, 18 RGB 00, 00, 00 -; $27 +; PREDEFPAL_27 RGB 31, 31, 31 RGB 22, 15, 16 RGB 17, 02, 05 RGB 00, 00, 00 -; $28 +; PREDEFPAL_28 RGB 31, 31, 31 RGB 15, 20, 20 RGB 05, 16, 16 RGB 00, 00, 00 -; $29 +; PREDEFPAL_29 RGB 31, 31, 31 RGB 23, 15, 19 RGB 14, 04, 12 RGB 00, 00, 00 -; $2a +; PREDEFPAL_2A RGB 31, 31, 31 RGB 20, 17, 18 RGB 18, 13, 11 RGB 00, 00, 00 -; $2b (_CGB13 via PalPacket_9ba6) +; PREDEFPAL_2B (_CGB13 via PalPacket_9ba6) RGB 31, 31, 31 RGB 23, 21, 16 RGB 12, 12, 10 RGB 00, 00, 00 -; $2c +; PREDEFPAL_2C RGB 31, 31, 31 RGB 21, 25, 29 RGB 30, 22, 24 RGB 00, 00, 00 -; $2d +; PREDEFPAL_2D RGB 31, 31, 31 RGB 26, 23, 16 RGB 29, 14, 09 RGB 00, 00, 00 -; $2e (_CGB_PartyMenu via PalPacket_9c56) +; PREDEFPAL_2E (_CGB_PartyMenu via PalPacket_9c56) RGB 31, 31, 31 RGB 18, 18, 18 RGB 10, 10, 10 RGB 00, 00, 00 -; $2f (_CGB_PartyMenu via PalPacket_9c56) +; PREDEFPAL_2F (_CGB_PartyMenu via PalPacket_9c56) RGB 31, 31, 31 RGB 30, 26, 15 RGB 00, 23, 00 RGB 00, 00, 00 -; $30 +; PREDEFPAL_30 RGB 31, 31, 31 RGB 30, 26, 15 RGB 31, 23, 00 RGB 00, 00, 00 -; $31 +; PREDEFPAL_31 RGB 31, 31, 31 RGB 30, 26, 15 RGB 31, 00, 00 RGB 00, 00, 00 -; $32 +; PREDEFPAL_32 RGB 31, 31, 31 RGB 29, 26, 19 RGB 27, 20, 14 RGB 00, 00, 00 -; $33 (_CGB06 via PalPacket_9ca6) +; PREDEFPAL_33 (_CGB06 via PalPacket_9ca6) RGB 31, 31, 31 RGB 24, 20, 10 RGB 21, 00, 04 RGB 00, 00, 00 -; $34 (_CGB06 via PalPacket_9ca6) +; PREDEFPAL_34 (_CGB06 via PalPacket_9ca6) RGB 31, 31, 31 RGB 31, 20, 10 RGB 21, 00, 04 RGB 00, 00, 00 -; $35 +; PREDEFPAL_35 RGB 31, 31, 31 RGB 30, 26, 16 RGB 16, 12, 09 RGB 00, 00, 00 -; $36 +; PREDEFPAL_36 RGB 31, 31, 31 RGB 15, 28, 26 RGB 12, 22, 26 RGB 03, 16, 14 -; $37 +; PREDEFPAL_37 RGB 31, 31, 31 RGB 15, 28, 26 RGB 23, 24, 24 RGB 00, 00, 00 -; $38 (_CGB07.Function9166) +; PREDEFPAL_38 (_CGB07.Function9166) RGB 31, 31, 24 RGB 07, 27, 19 RGB 26, 20, 10 RGB 19, 12, 08 -; $39 (_CGB07.Function9166, _CGB0f via PalPacket_9c46) +; PREDEFPAL_39 (_CGB07.Function9166, _CGB0f via PalPacket_9c46) RGB 31, 31, 31 RGB 31, 28, 14 RGB 31, 13, 31 RGB 00, 00, 00 -; $3a (_CGB07.Function9180) +; PREDEFPAL_3A (_CGB07.Function9180) RGB 31, 31, 31 RGB 16, 18, 21 RGB 10, 12, 18 RGB 00, 00, 00 -; $3b (Unreferenced_Function8b4d) +; PREDEFPAL_3B (Unreferenced_Function8b4d) RGB 31, 31, 31 RGB 23, 21, 16 RGB 12, 12, 10 RGB 00, 00, 00 -; $3c (_CGB06, Unreferenced_Function8b67, _CGB07.Function9180 via PalPacket_9c36) +; PREDEFPAL_3C (_CGB06, Unreferenced_Function8b67, _CGB07.Function9180 via PalPacket_9c36) RGB 31, 31, 31 RGB 31, 14, 00 RGB 07, 11, 15 RGB 00, 00, 00 -; $3d +; PREDEFPAL_3D RGB 31, 31, 31 RGB 26, 21, 22 RGB 26, 10, 06 RGB 00, 00, 00 -; $3e +; PREDEFPAL_3E RGB 31, 31, 31 RGB 30, 27, 04 RGB 24, 20, 11 RGB 00, 00, 00 -; $3f +; PREDEFPAL_3F RGB 31, 31, 31 RGB 31, 13, 25 RGB 24, 20, 11 RGB 00, 00, 00 -; $40 +; PREDEFPAL_40 RGB 31, 31, 31 RGB 16, 19, 29 RGB 24, 20, 11 RGB 00, 00, 00 -; $41 +; PREDEFPAL_41 RGB 31, 31, 31 RGB 30, 22, 24 RGB 18, 18, 18 RGB 16, 10, 07 -; $42 +; PREDEFPAL_42 RGB 31, 31, 31 RGB 21, 25, 29 RGB 18, 18, 18 RGB 16, 10, 07 -; $43 +; PREDEFPAL_43 RGB 31, 31, 31 RGB 20, 26, 16 RGB 18, 18, 18 RGB 16, 10, 07 -; $44 +; PREDEFPAL_44 RGB 31, 31, 31 RGB 31, 28, 14 RGB 18, 18, 18 RGB 16, 10, 07 -; $45 +; PREDEFPAL_45 RGB 31, 31, 31 RGB 18, 18, 18 RGB 26, 10, 06 RGB 00, 00, 00 -; $46 +; PREDEFPAL_46 RGB 31, 31, 31 RGB 30, 22, 24 RGB 28, 15, 21 RGB 00, 00, 00 -; $47 +; PREDEFPAL_47 RGB 31, 31, 31 RGB 26, 20, 00 RGB 16, 19, 29 RGB 00, 00, 00 -; $48 +; PREDEFPAL_48 RGB 31, 31, 31 RGB 16, 02, 30 RGB 15, 20, 31 RGB 00, 00, 00 -; $49 +; PREDEFPAL_49 RGB 31, 31, 31 RGB 16, 13, 04 RGB 15, 20, 31 RGB 00, 00, 00 -; $4a +; PREDEFPAL_4A RGB 31, 31, 31 RGB 28, 04, 02 RGB 15, 20, 31 RGB 00, 00, 00 -; $4b +; PREDEFPAL_4B RGB 31, 31, 31 RGB 18, 23, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; $4c (_CGB_UnownPuzzle) +; PREDEFPAL_4C (_CGB_UnownPuzzle) RGB 31, 31, 31 RGB 24, 20, 11 RGB 18, 13, 11 RGB 00, 00, 00 -; $4d +; PREDEFPAL_4D RGB 31, 31, 31 RGB 31, 31, 31 RGB 25, 30, 00 RGB 25, 30, 00 -; $4e (_CGB_GamefreakLogo) +; PREDEFPAL_4E (_CGB_GamefreakLogo) RGB 00, 00, 00 RGB 08, 11, 11 RGB 21, 21, 21 diff --git a/gfx/sgb/roof_pal_inds.asm b/gfx/sgb/roof_pal_inds.asm index 7b696fd3f..c56ddaf7d 100644 --- a/gfx/sgb/roof_pal_inds.asm +++ b/gfx/sgb/roof_pal_inds.asm @@ -2,31 +2,31 @@ MapGroupRoofSGBPalInds: ; 8a45 ; entries correspond to map groups - db PREDEFPAL_00 ; group 0 (unused) - db PREDEFPAL_12 ; group 1 (Olivine) - db PREDEFPAL_14 ; group 2 (Mahogany) - db PREDEFPAL_18 ; group 3 (dungeons) - db PREDEFPAL_11 ; group 4 (Ecruteak) - db PREDEFPAL_15 ; group 5 (Blackthorn) - db PREDEFPAL_09 ; group 6 (Cinnabar) - db PREDEFPAL_04 ; group 7 (Cerulean) - db PREDEFPAL_0F ; group 8 (Azalea) - db PREDEFPAL_16 ; group 9 (Lake of Rage) - db PREDEFPAL_0E ; group 10 (Violet) - db PREDEFPAL_10 ; group 11 (Goldenrod) - db PREDEFPAL_06 ; group 12 (Vermilion) - db PREDEFPAL_01 ; group 13 (Pallet) - db PREDEFPAL_03 ; group 14 (Pewter) - db PREDEFPAL_06 ; group 15 (Mount Moon Square) - db PREDEFPAL_0B ; group 16 (Indigo) - db PREDEFPAL_08 ; group 17 (Fuchsia) - db PREDEFPAL_05 ; group 18 (Lavender) - db PREDEFPAL_17 ; group 19 (Silver Cave) - db PREDEFPAL_08 ; group 20 (Cable Club) - db PREDEFPAL_07 ; group 21 (Celadon) - db PREDEFPAL_13 ; group 22 (Cianwood) - db PREDEFPAL_02 ; group 23 (Viridian) - db PREDEFPAL_0C ; group 24 (New Bark) - db PREDEFPAL_0A ; group 25 (Saffron) - db PREDEFPAL_0D ; group 26 (Cherrygrove) + db PREDEFPAL_00 + db PREDEFPAL_OLIVINE + db PREDEFPAL_MAHOGANY + db PREDEFPAL_DUNGEONS + db PREDEFPAL_ECRUTEAK + db PREDEFPAL_BLACKTHORN + db PREDEFPAL_CINNABAR + db PREDEFPAL_CERULEAN + db PREDEFPAL_AZALEA + db PREDEFPAL_LAKE_OF_RAGE + db PREDEFPAL_VIOLET + db PREDEFPAL_GOLDENROD + db PREDEFPAL_VERMILION + db PREDEFPAL_PALLET + db PREDEFPAL_PEWTER + db PREDEFPAL_VERMILION + db PREDEFPAL_INDIGO + db PREDEFPAL_FUCHSIA + db PREDEFPAL_LAVENDER + db PREDEFPAL_SILVER_CAVE + db PREDEFPAL_FUCHSIA + db PREDEFPAL_CELADON + db PREDEFPAL_CIANWOOD + db PREDEFPAL_VIRIDIAN + db PREDEFPAL_NEW_BARK + db PREDEFPAL_SAFFRON + db PREDEFPAL_CHERRYGROVE ; 8a60 -- cgit v1.2.3 From 0306e94cc3365fb7b28e3bb6e1ccccb1e6b8b449 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 00:16:03 -0500 Subject: More SGB documentation --- gfx/sgb/blk_packets.asm | 22 ++++++------ gfx/sgb/pal_packets.asm | 83 ++++++++++++++++++++++++++++++++++------------ gfx/sgb/predef.pal | 64 +++++++++++++++++------------------ gfx/title/unused_gs_bg.pal | 24 ++++++++++++++ gfx/title/unused_gs_fg.pal | 9 +++++ gfx/unknown/b6f1.pal | 24 -------------- gfx/unknown/b719.pal | 9 ----- 7 files changed, 138 insertions(+), 97 deletions(-) create mode 100644 gfx/title/unused_gs_bg.pal create mode 100644 gfx/title/unused_gs_fg.pal delete mode 100644 gfx/unknown/b6f1.pal delete mode 100644 gfx/unknown/b719.pal (limited to 'gfx') diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm index fd01ab3d0..4886a4854 100644 --- a/gfx/sgb/blk_packets.asm +++ b/gfx/sgb/blk_packets.asm @@ -19,12 +19,12 @@ BlkPacket_9a86: attr_blk_data %011, 0,0,0, 00,00, 19,17 ds 8 -BlkPacket_9a96: +BlkPacket_GSIntroJigglypuffPikachu: attr_blk 1 attr_blk_data %111, 1,1,0, 00,10, 19,13 ds 8 -BlkPacket_9aa6: +BlkPacket_Battle: attr_blk 5 attr_blk_data %111, 2,2,0, 00,12, 19,17 attr_blk_data %011, 1,1,0, 01,00, 10,03 @@ -32,27 +32,27 @@ BlkPacket_9aa6: attr_blk_data %011, 2,2,0, 00,04, 08,11 attr_blk_data %011, 3,3,0, 11,00, 19,07 -BlkPacket_9ac6: +BlkPacket_StatsScreen: attr_blk 1 attr_blk_data %111, 1,1,0, 00,01, 07,07 ds 8 -BlkPacket_9ad6: +BlkPacket_MoveList: attr_blk 1 attr_blk_data %111, 1,1,0, 11,01, 19,02 ds 8 -BlkPacket_9ae6: +BlkPacket_Pokedex_PC: attr_blk 1 attr_blk_data %111, 1,1,0, 01,01, 08,08 ds 8 -BlkPacket_9af6: +BlkPacket_PokedexUnownMode: attr_blk 1 attr_blk_data %111, 1,1,0, 07,05, 13,11 ds 8 -BlkPacket_9b06: +BlkPacket_SlotMachine: attr_blk 5 attr_blk_data %011, 1,1,0, 00,00, 19,11 attr_blk_data %011, 2,2,0, 00,04, 19,09 @@ -60,7 +60,7 @@ BlkPacket_9b06: attr_blk_data %011, 0,0,0, 04,04, 15,09 attr_blk_data %011, 0,0,0, 00,12, 19,17 -BlkPacket_9b26: +UnreferencedBlkPacket_9b26: attr_blk 7 attr_blk_data %111, 0,0,1, 00,00, 02,12 attr_blk_data %010, 0,0,0, 12,00, 18,01 @@ -71,19 +71,19 @@ BlkPacket_9b26: attr_blk_data %010, 0,0,0, 12,10, 18,11 ds 4 -BlkPacket_9b56: +BlkPacket_GSTitleScreen: attr_blk 3 attr_blk_data %111, 0,0,2, 00,00, 19,04 attr_blk_data %011, 3,3,0, 00,06, 19,17 attr_blk_data %011, 1,1,0, 15,01, 18,04 ds 12 -BlkPacket_9b76: +BlkPacket_SCGB_06: attr_blk 1 attr_blk_data %111, 0,0,1, 00,00, 19,05 ds 8 -BlkPacket_9b86: +BlkPacket_SCGB_13: attr_blk 2 attr_blk_data %111, 2,2,0, 00,04, 19,13 attr_blk_data %011, 1,1,0, 00,06, 19,11 diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index c66ffed86..d9a4e5225 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -45,27 +45,68 @@ sgb_mask_en: MACRO ENDM -PalPacket_9b96: sgb_pal_set 48, 49, 4A, 4B -PalPacket_9ba6: sgb_pal_set 2B, 24, 20, 00 -PalPacket_9bb6: sgb_pal_set 41, 42, 43, 44 -PalPacket_9bc6: sgb_pal_set 4C, 4C, 4C, 4C -PalPacket_9bd6: sgb_pal_set 00, 00, 00, 00 -PalPacket_9be6: sgb_pal_set 36, 00, 00, 00 -PalPacket_9bf6: sgb_pal_set 37, 00, 00, 00 -PalPacket_9c06: sgb_pal_set 38, 39, 00, 00 -PalPacket_9c16: sgb_pal_set 3A, 00, 00, 00 -PalPacket_9c26: sgb_pal_set 3B, 00, 00, 00 -PalPacket_9c36: sgb_pal_set 3C, 00, 00, 00 -PalPacket_9c46: sgb_pal_set 39, 00, 00, 00 -PalPacket_9c56: sgb_pal_set 2E, 2F, 30, 31 -PalPacket_9c66: sgb_pal_set 1A, 1A, 1A, 1A -PalPacket_9c76: sgb_pal_set 32, 00, 00, 00 -PalPacket_9c86: sgb_pal_set 3C, 00, 00, 00 -PalPacket_9c96: sgb_pal_set 3D, 3E, 3F, 40 -PalPacket_9ca6: sgb_pal_set 33, 34, 1B, 1F -PalPacket_9cb6: sgb_pal_set 1B, 00, 00, 00 -PalPacket_9cc6: sgb_pal_set 1C, 00, 00, 00 -PalPacket_9cd6: sgb_pal_set 35, 00, 00, 00 +PalPacket_GSTitleScreen: + sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3 + +PalPacket_SCGB_13: + sgb_pal_set 2B, BADGE, 20, 00 + +PalPacket_SCGB_11: + sgb_pal_set 41, 42, 43, 44 + +PalPacket_UnownPuzzle: + sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE + +PalPacket_9bd6: + sgb_pal_set 00, 00, 00, 00 + +PalPacket_GSIntroShellderLapras: + sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, 00, 00, 00 + +UnreferencedPalPacket_9bf6: + sgb_pal_set 37, 00, 00, 00 + +PalPacket_GSIntroJigglypuffPikachu: + sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00 + +PalPacket_GSIntroCharizard: + sgb_pal_set GS_INTRO_CHARIZARD_OB, 00, 00, 00 + +PalPacket_Function8b4d: + sgb_pal_set 3B, 00, 00, 00 + +PalPacket_Pack: + sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00 + +PalPacket_SCGB_0F: + sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00 + +PalPacket_PartyMenu: + sgb_pal_set PARTY_ICON, HP_GREEN, HP_YELLOW, HP_RED + +PalPacket_BattleGrayscale: + sgb_pal_set BLACKOUT, BLACKOUT, BLACKOUT, BLACKOUT + +PalPacket_Pokegear: + sgb_pal_set POKEGEAR, 00, 00, 00 + +UnreferencedPalPacket_9c86: + sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00 + +PalPacket_SlotMachine: + sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3 + +PalPacket_SCGB_06: + sgb_pal_set 33, 34, DIPLOMA, 1F + +PalPacket_Diploma: + sgb_pal_set DIPLOMA, 00, 00, 00 + +PalPacket_TradeTube: + sgb_pal_set TRADE_TUBE, 00, 00, 00 + +PalPacket_GamefreakLogo: + sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, 00, 00, 00 PalPacket_9ce6: sgb_pal01 diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index e31ba24f8..79db349e7 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -1,4 +1,4 @@ -; PREDEFPAL_00 (_CGB_BattleGrayscale via PalPacket_9c66) +; PREDEFPAL_00 RGB 31, 31, 31 RGB 22, 25, 19 RGB 16, 21, 30 @@ -128,22 +128,22 @@ RGB 12, 28, 22 RGB 15, 20, 20 RGB 00, 00, 00 -; PREDEFPAL_1A (_CGB_Evolution, _CGB_BattleGrayscale via PalPacket_9c66) +; PREDEFPAL_BLACKOUT RGB 31, 31, 31 RGB 07, 07, 07 RGB 02, 03, 03 RGB 00, 00, 00 -; PREDEFPAL_1B (_CGB_Diploma via PalPacket_9cb6, _CGB0d via PalPacket_9cb6) +; PREDEFPAL_DIPLOMA RGB 31, 31, 31 RGB 30, 22, 17 RGB 16, 14, 19 RGB 00, 00, 00 -; PREDEFPAL_1C (_CGB_TradeTube, Unreferenced_Function97cc) +; PREDEFPAL_TRADE_TUBE RGB 31, 31, 31 RGB 18, 20, 27 RGB 11, 15, 23 RGB 00, 00, 00 -; PREDEFPAL_1D (_CGB_Pokedex, _CGB_BillsPC, _CGB_PokedexUnownMode, _CGB_PokedexSearchOption) +; PREDEFPAL_POKEDEX RGB 31, 31, 31 RGB 31, 20, 10 RGB 26, 10, 06 @@ -163,7 +163,7 @@ RGB 28, 20, 15 RGB 21, 14, 09 RGB 00, 00, 00 -; PREDEFPAL_21 (Unreferenced_Function97cc) +; PREDEFPAL_21 RGB 31, 31, 31 RGB 20, 26, 16 RGB 09, 20, 11 @@ -178,7 +178,7 @@ RGB 31, 28, 14 RGB 26, 20, 00 RGB 00, 00, 00 -; PREDEFPAL_24 (_CGB_TrainerCard, _CGB13 via PalPacket_9ba6) +; PREDEFPAL_BADGE RGB 31, 31, 31 RGB 26, 21, 22 RGB 15, 15, 18 @@ -213,7 +213,7 @@ RGB 20, 17, 18 RGB 18, 13, 11 RGB 00, 00, 00 -; PREDEFPAL_2B (_CGB13 via PalPacket_9ba6) +; PREDEFPAL_2B RGB 31, 31, 31 RGB 23, 21, 16 RGB 12, 12, 10 @@ -228,47 +228,47 @@ RGB 26, 23, 16 RGB 29, 14, 09 RGB 00, 00, 00 -; PREDEFPAL_2E (_CGB_PartyMenu via PalPacket_9c56) +; PREDEFPAL_PARTY_ICON RGB 31, 31, 31 RGB 18, 18, 18 RGB 10, 10, 10 RGB 00, 00, 00 -; PREDEFPAL_2F (_CGB_PartyMenu via PalPacket_9c56) +; PREDEFPAL_HP_GREEN RGB 31, 31, 31 RGB 30, 26, 15 RGB 00, 23, 00 RGB 00, 00, 00 -; PREDEFPAL_30 +; PREDEFPAL_HP_YELLOW RGB 31, 31, 31 RGB 30, 26, 15 RGB 31, 23, 00 RGB 00, 00, 00 -; PREDEFPAL_31 +; PREDEFPAL_HP_RED RGB 31, 31, 31 RGB 30, 26, 15 RGB 31, 00, 00 RGB 00, 00, 00 -; PREDEFPAL_32 +; PREDEFPAL_POKEGEAR RGB 31, 31, 31 RGB 29, 26, 19 RGB 27, 20, 14 RGB 00, 00, 00 -; PREDEFPAL_33 (_CGB06 via PalPacket_9ca6) +; PREDEFPAL_33 RGB 31, 31, 31 RGB 24, 20, 10 RGB 21, 00, 04 RGB 00, 00, 00 -; PREDEFPAL_34 (_CGB06 via PalPacket_9ca6) +; PREDEFPAL_34 RGB 31, 31, 31 RGB 31, 20, 10 RGB 21, 00, 04 RGB 00, 00, 00 -; PREDEFPAL_35 +; PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO RGB 31, 31, 31 RGB 30, 26, 16 RGB 16, 12, 09 RGB 00, 00, 00 -; PREDEFPAL_36 +; PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS RGB 31, 31, 31 RGB 15, 28, 26 RGB 12, 22, 26 @@ -278,47 +278,47 @@ RGB 15, 28, 26 RGB 23, 24, 24 RGB 00, 00, 00 -; PREDEFPAL_38 (_CGB07.Function9166) +; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG RGB 31, 31, 24 RGB 07, 27, 19 RGB 26, 20, 10 RGB 19, 12, 08 -; PREDEFPAL_39 (_CGB07.Function9166, _CGB0f via PalPacket_9c46) +; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB RGB 31, 31, 31 RGB 31, 28, 14 RGB 31, 13, 31 RGB 00, 00, 00 -; PREDEFPAL_3A (_CGB07.Function9180) +; PREDEFPAL_GS_INTRO_CHARIZARD_OB RGB 31, 31, 31 RGB 16, 18, 21 RGB 10, 12, 18 RGB 00, 00, 00 -; PREDEFPAL_3B (Unreferenced_Function8b4d) +; PREDEFPAL_3B RGB 31, 31, 31 RGB 23, 21, 16 RGB 12, 12, 10 RGB 00, 00, 00 -; PREDEFPAL_3C (_CGB06, Unreferenced_Function8b67, _CGB07.Function9180 via PalPacket_9c36) +; PREDEFPAL_GS_INTRO_CHARIZARD RGB 31, 31, 31 RGB 31, 14, 00 RGB 07, 11, 15 RGB 00, 00, 00 -; PREDEFPAL_3D +; PREDEFPAL_SLOT_MACHINE_0 RGB 31, 31, 31 RGB 26, 21, 22 RGB 26, 10, 06 RGB 00, 00, 00 -; PREDEFPAL_3E +; PREDEFPAL_SLOT_MACHINE_1 RGB 31, 31, 31 RGB 30, 27, 04 RGB 24, 20, 11 RGB 00, 00, 00 -; PREDEFPAL_3F +; PREDEFPAL_SLOT_MACHINE_2 RGB 31, 31, 31 RGB 31, 13, 25 RGB 24, 20, 11 RGB 00, 00, 00 -; PREDEFPAL_40 +; PREDEFPAL_SLOT_MACHINE_3 RGB 31, 31, 31 RGB 16, 19, 29 RGB 24, 20, 11 @@ -358,27 +358,27 @@ RGB 26, 20, 00 RGB 16, 19, 29 RGB 00, 00, 00 -; PREDEFPAL_48 +; PREDEFPAL_GS_TITLE_SCREEN_0 RGB 31, 31, 31 RGB 16, 02, 30 RGB 15, 20, 31 RGB 00, 00, 00 -; PREDEFPAL_49 +; PREDEFPAL_GS_TITLE_SCREEN_1 RGB 31, 31, 31 RGB 16, 13, 04 RGB 15, 20, 31 RGB 00, 00, 00 -; PREDEFPAL_4A +; PREDEFPAL_GS_TITLE_SCREEN_2 RGB 31, 31, 31 RGB 28, 04, 02 RGB 15, 20, 31 RGB 00, 00, 00 -; PREDEFPAL_4B +; PREDEFPAL_GS_TITLE_SCREEN_3 RGB 31, 31, 31 RGB 18, 23, 31 RGB 15, 20, 31 RGB 00, 00, 00 -; PREDEFPAL_4C (_CGB_UnownPuzzle) +; PREDEFPAL_UNOWN_PUZZLE RGB 31, 31, 31 RGB 24, 20, 11 RGB 18, 13, 11 @@ -388,7 +388,7 @@ RGB 31, 31, 31 RGB 25, 30, 00 RGB 25, 30, 00 -; PREDEFPAL_4E (_CGB_GamefreakLogo) +; PREDEFPAL_GAMEFREAK_LOGO RGB 00, 00, 00 RGB 08, 11, 11 RGB 21, 21, 21 diff --git a/gfx/title/unused_gs_bg.pal b/gfx/title/unused_gs_bg.pal new file mode 100644 index 000000000..1dd56f50f --- /dev/null +++ b/gfx/title/unused_gs_bg.pal @@ -0,0 +1,24 @@ + RGB 31, 31, 31 + RGB 18, 23, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 22, 00, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 00, 00 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 25, 22, 00 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 23, 26, 31 + RGB 18, 23, 31 + RGB 00, 00, 00 diff --git a/gfx/title/unused_gs_fg.pal b/gfx/title/unused_gs_fg.pal new file mode 100644 index 000000000..09dd9a364 --- /dev/null +++ b/gfx/title/unused_gs_fg.pal @@ -0,0 +1,9 @@ + RGB 31, 31, 31 + RGB 07, 06, 03 + RGB 07, 06, 03 + RGB 07, 06, 03 + + RGB 31, 31, 31 + RGB 31, 31, 00 + RGB 26, 22, 00 + RGB 00, 00, 00 diff --git a/gfx/unknown/b6f1.pal b/gfx/unknown/b6f1.pal deleted file mode 100644 index 1dd56f50f..000000000 --- a/gfx/unknown/b6f1.pal +++ /dev/null @@ -1,24 +0,0 @@ - RGB 31, 31, 31 - RGB 18, 23, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 22, 00, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 00, 00 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 25, 22, 00 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 23, 26, 31 - RGB 18, 23, 31 - RGB 00, 00, 00 diff --git a/gfx/unknown/b719.pal b/gfx/unknown/b719.pal deleted file mode 100644 index 09dd9a364..000000000 --- a/gfx/unknown/b719.pal +++ /dev/null @@ -1,9 +0,0 @@ - RGB 31, 31, 31 - RGB 07, 06, 03 - RGB 07, 06, 03 - RGB 07, 06, 03 - - RGB 31, 31, 31 - RGB 31, 31, 00 - RGB 26, 22, 00 - RGB 00, 00, 00 -- cgit v1.2.3 From ac5072849f8af7ddab67b9eddda5ffeb05a80626 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 00:22:10 -0500 Subject: Compact predef.pal --- gfx/sgb/predef.pal | 474 +++++++++-------------------------------------------- 1 file changed, 79 insertions(+), 395 deletions(-) (limited to 'gfx') diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 79db349e7..9ba598d94 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -1,395 +1,79 @@ -; PREDEFPAL_00 - RGB 31, 31, 31 - RGB 22, 25, 19 - RGB 16, 21, 30 - RGB 00, 00, 00 -; PREDEFPAL_PALLET - RGB 31, 31, 31 - RGB 27, 28, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_VIRIDIAN - RGB 31, 31, 31 - RGB 24, 28, 19 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_PEWTER - RGB 31, 31, 31 - RGB 24, 24, 24 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_CERULEAN - RGB 31, 31, 31 - RGB 21, 23, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_LAVENDER - RGB 31, 31, 31 - RGB 24, 21, 27 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_VERMILION - RGB 31, 31, 31 - RGB 31, 24, 16 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_CELADON - RGB 31, 31, 31 - RGB 25, 30, 26 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_FUCHSIA - RGB 31, 31, 31 - RGB 31, 25, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_CINNABAR - RGB 31, 31, 31 - RGB 31, 20, 19 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_SAFFRON - RGB 31, 31, 31 - RGB 31, 26, 19 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_INDIGO - RGB 31, 31, 31 - RGB 27, 28, 27 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_NEW_BARK - RGB 31, 31, 31 - RGB 24, 30, 23 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_CHERRYGROVE - RGB 31, 31, 31 - RGB 29, 24, 29 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_VIOLET - RGB 31, 31, 31 - RGB 26, 23, 29 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_AZALEA - RGB 31, 31, 31 - RGB 25, 23, 20 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_GOLDENROD - RGB 31, 31, 31 - RGB 29, 26, 18 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_ECRUTEAK - RGB 31, 31, 31 - RGB 31, 21, 18 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_OLIVINE - RGB 31, 31, 31 - RGB 26, 25, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_CIANWOOD - RGB 31, 31, 31 - RGB 22, 21, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_MAHOGANY - RGB 31, 31, 31 - RGB 22, 25, 21 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_BLACKTHORN - RGB 31, 31, 31 - RGB 21, 21, 22 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_LAKE_OF_RAGE - RGB 31, 31, 31 - RGB 31, 20, 20 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_SILVER_CAVE - RGB 31, 31, 31 - RGB 26, 26, 26 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_DUNGEONS - RGB 31, 31, 31 - RGB 21, 14, 09 - RGB 15, 20, 20 - RGB 00, 00, 00 -; PREDEFPAL_NITE - RGB 31, 31, 31 - RGB 12, 28, 22 - RGB 15, 20, 20 - RGB 00, 00, 00 -; PREDEFPAL_BLACKOUT - RGB 31, 31, 31 - RGB 07, 07, 07 - RGB 02, 03, 03 - RGB 00, 00, 00 -; PREDEFPAL_DIPLOMA - RGB 31, 31, 31 - RGB 30, 22, 17 - RGB 16, 14, 19 - RGB 00, 00, 00 -; PREDEFPAL_TRADE_TUBE - RGB 31, 31, 31 - RGB 18, 20, 27 - RGB 11, 15, 23 - RGB 00, 00, 00 -; PREDEFPAL_POKEDEX - RGB 31, 31, 31 - RGB 31, 20, 10 - RGB 26, 10, 06 - RGB 00, 00, 00 -; PREDEFPAL_1E - RGB 31, 31, 31 - RGB 21, 25, 29 - RGB 14, 19, 25 - RGB 00, 00, 00 -; PREDEFPAL_1F - RGB 31, 31, 31 - RGB 27, 22, 24 - RGB 21, 15, 23 - RGB 00, 00, 00 -; PREDEFPAL_20 - RGB 31, 31, 31 - RGB 28, 20, 15 - RGB 21, 14, 09 - RGB 00, 00, 00 -; PREDEFPAL_21 - RGB 31, 31, 31 - RGB 20, 26, 16 - RGB 09, 20, 11 - RGB 00, 00, 00 -; PREDEFPAL_22 - RGB 31, 31, 31 - RGB 30, 22, 24 - RGB 28, 15, 21 - RGB 00, 00, 00 -; PREDEFPAL_23 - RGB 31, 31, 31 - RGB 31, 28, 14 - RGB 26, 20, 00 - RGB 00, 00, 00 -; PREDEFPAL_BADGE - RGB 31, 31, 31 - RGB 26, 21, 22 - RGB 15, 15, 18 - RGB 00, 00, 00 -; PREDEFPAL_25 - RGB 31, 31, 31 - RGB 23, 19, 13 - RGB 14, 12, 17 - RGB 00, 00, 00 -; PREDEFPAL_26 - RGB 31, 31, 31 - RGB 16, 18, 21 - RGB 10, 12, 18 - RGB 00, 00, 00 -; PREDEFPAL_27 - RGB 31, 31, 31 - RGB 22, 15, 16 - RGB 17, 02, 05 - RGB 00, 00, 00 -; PREDEFPAL_28 - RGB 31, 31, 31 - RGB 15, 20, 20 - RGB 05, 16, 16 - RGB 00, 00, 00 -; PREDEFPAL_29 - RGB 31, 31, 31 - RGB 23, 15, 19 - RGB 14, 04, 12 - RGB 00, 00, 00 -; PREDEFPAL_2A - RGB 31, 31, 31 - RGB 20, 17, 18 - RGB 18, 13, 11 - RGB 00, 00, 00 -; PREDEFPAL_2B - RGB 31, 31, 31 - RGB 23, 21, 16 - RGB 12, 12, 10 - RGB 00, 00, 00 -; PREDEFPAL_2C - RGB 31, 31, 31 - RGB 21, 25, 29 - RGB 30, 22, 24 - RGB 00, 00, 00 -; PREDEFPAL_2D - RGB 31, 31, 31 - RGB 26, 23, 16 - RGB 29, 14, 09 - RGB 00, 00, 00 -; PREDEFPAL_PARTY_ICON - RGB 31, 31, 31 - RGB 18, 18, 18 - RGB 10, 10, 10 - RGB 00, 00, 00 -; PREDEFPAL_HP_GREEN - RGB 31, 31, 31 - RGB 30, 26, 15 - RGB 00, 23, 00 - RGB 00, 00, 00 -; PREDEFPAL_HP_YELLOW - RGB 31, 31, 31 - RGB 30, 26, 15 - RGB 31, 23, 00 - RGB 00, 00, 00 -; PREDEFPAL_HP_RED - RGB 31, 31, 31 - RGB 30, 26, 15 - RGB 31, 00, 00 - RGB 00, 00, 00 -; PREDEFPAL_POKEGEAR - RGB 31, 31, 31 - RGB 29, 26, 19 - RGB 27, 20, 14 - RGB 00, 00, 00 -; PREDEFPAL_33 - RGB 31, 31, 31 - RGB 24, 20, 10 - RGB 21, 00, 04 - RGB 00, 00, 00 -; PREDEFPAL_34 - RGB 31, 31, 31 - RGB 31, 20, 10 - RGB 21, 00, 04 - RGB 00, 00, 00 -; PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO - RGB 31, 31, 31 - RGB 30, 26, 16 - RGB 16, 12, 09 - RGB 00, 00, 00 -; PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS - RGB 31, 31, 31 - RGB 15, 28, 26 - RGB 12, 22, 26 - RGB 03, 16, 14 -; PREDEFPAL_37 - RGB 31, 31, 31 - RGB 15, 28, 26 - RGB 23, 24, 24 - RGB 00, 00, 00 -; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG - RGB 31, 31, 24 - RGB 07, 27, 19 - RGB 26, 20, 10 - RGB 19, 12, 08 -; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB - RGB 31, 31, 31 - RGB 31, 28, 14 - RGB 31, 13, 31 - RGB 00, 00, 00 -; PREDEFPAL_GS_INTRO_CHARIZARD_OB - RGB 31, 31, 31 - RGB 16, 18, 21 - RGB 10, 12, 18 - RGB 00, 00, 00 -; PREDEFPAL_3B - RGB 31, 31, 31 - RGB 23, 21, 16 - RGB 12, 12, 10 - RGB 00, 00, 00 -; PREDEFPAL_GS_INTRO_CHARIZARD - RGB 31, 31, 31 - RGB 31, 14, 00 - RGB 07, 11, 15 - RGB 00, 00, 00 -; PREDEFPAL_SLOT_MACHINE_0 - RGB 31, 31, 31 - RGB 26, 21, 22 - RGB 26, 10, 06 - RGB 00, 00, 00 -; PREDEFPAL_SLOT_MACHINE_1 - RGB 31, 31, 31 - RGB 30, 27, 04 - RGB 24, 20, 11 - RGB 00, 00, 00 -; PREDEFPAL_SLOT_MACHINE_2 - RGB 31, 31, 31 - RGB 31, 13, 25 - RGB 24, 20, 11 - RGB 00, 00, 00 -; PREDEFPAL_SLOT_MACHINE_3 - RGB 31, 31, 31 - RGB 16, 19, 29 - RGB 24, 20, 11 - RGB 00, 00, 00 -; PREDEFPAL_41 - RGB 31, 31, 31 - RGB 30, 22, 24 - RGB 18, 18, 18 - RGB 16, 10, 07 -; PREDEFPAL_42 - RGB 31, 31, 31 - RGB 21, 25, 29 - RGB 18, 18, 18 - RGB 16, 10, 07 -; PREDEFPAL_43 - RGB 31, 31, 31 - RGB 20, 26, 16 - RGB 18, 18, 18 - RGB 16, 10, 07 -; PREDEFPAL_44 - RGB 31, 31, 31 - RGB 31, 28, 14 - RGB 18, 18, 18 - RGB 16, 10, 07 -; PREDEFPAL_45 - RGB 31, 31, 31 - RGB 18, 18, 18 - RGB 26, 10, 06 - RGB 00, 00, 00 -; PREDEFPAL_46 - RGB 31, 31, 31 - RGB 30, 22, 24 - RGB 28, 15, 21 - RGB 00, 00, 00 -; PREDEFPAL_47 - RGB 31, 31, 31 - RGB 26, 20, 00 - RGB 16, 19, 29 - RGB 00, 00, 00 -; PREDEFPAL_GS_TITLE_SCREEN_0 - RGB 31, 31, 31 - RGB 16, 02, 30 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_GS_TITLE_SCREEN_1 - RGB 31, 31, 31 - RGB 16, 13, 04 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_GS_TITLE_SCREEN_2 - RGB 31, 31, 31 - RGB 28, 04, 02 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_GS_TITLE_SCREEN_3 - RGB 31, 31, 31 - RGB 18, 23, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 -; PREDEFPAL_UNOWN_PUZZLE - RGB 31, 31, 31 - RGB 24, 20, 11 - RGB 18, 13, 11 - RGB 00, 00, 00 -; PREDEFPAL_4D - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 25, 30, 00 - RGB 25, 30, 00 -; PREDEFPAL_GAMEFREAK_LOGO - RGB 00, 00, 00 - RGB 08, 11, 11 - RGB 21, 21, 21 - RGB 31, 31, 31 + RGB 31,31,31, 22,25,19, 16,21,30, 00,00,00 ; PREDEFPAL_00 + RGB 31,31,31, 27,28,31, 15,20,31, 00,00,00 ; PREDEFPAL_PALLET + RGB 31,31,31, 24,28,19, 15,20,31, 00,00,00 ; PREDEFPAL_VIRIDIAN + RGB 31,31,31, 24,24,24, 15,20,31, 00,00,00 ; PREDEFPAL_PEWTER + RGB 31,31,31, 21,23,31, 15,20,31, 00,00,00 ; PREDEFPAL_CERULEAN + RGB 31,31,31, 24,21,27, 15,20,31, 00,00,00 ; PREDEFPAL_LAVENDER + RGB 31,31,31, 31,24,16, 15,20,31, 00,00,00 ; PREDEFPAL_VERMILION + RGB 31,31,31, 25,30,26, 15,20,31, 00,00,00 ; PREDEFPAL_CELADON + RGB 31,31,31, 31,25,31, 15,20,31, 00,00,00 ; PREDEFPAL_FUCHSIA + RGB 31,31,31, 31,20,19, 15,20,31, 00,00,00 ; PREDEFPAL_CINNABAR + RGB 31,31,31, 31,26,19, 15,20,31, 00,00,00 ; PREDEFPAL_SAFFRON + RGB 31,31,31, 27,28,27, 15,20,31, 00,00,00 ; PREDEFPAL_INDIGO + RGB 31,31,31, 24,30,23, 15,20,31, 00,00,00 ; PREDEFPAL_NEW_BARK + RGB 31,31,31, 29,24,29, 15,20,31, 00,00,00 ; PREDEFPAL_CHERRYGROVE + RGB 31,31,31, 26,23,29, 15,20,31, 00,00,00 ; PREDEFPAL_VIOLET + RGB 31,31,31, 25,23,20, 15,20,31, 00,00,00 ; PREDEFPAL_AZALEA + RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_GOLDENROD + RGB 31,31,31, 31,21,18, 15,20,31, 00,00,00 ; PREDEFPAL_ECRUTEAK + RGB 31,31,31, 26,25,31, 15,20,31, 00,00,00 ; PREDEFPAL_OLIVINE + RGB 31,31,31, 22,21,31, 15,20,31, 00,00,00 ; PREDEFPAL_CIANWOOD + RGB 31,31,31, 22,25,21, 15,20,31, 00,00,00 ; PREDEFPAL_MAHOGANY + RGB 31,31,31, 21,21,22, 15,20,31, 00,00,00 ; PREDEFPAL_BLACKTHORN + RGB 31,31,31, 31,20,20, 15,20,31, 00,00,00 ; PREDEFPAL_LAKE_OF_RAGE + RGB 31,31,31, 26,26,26, 15,20,31, 00,00,00 ; PREDEFPAL_SILVER_CAVE + RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_DUNGEONS + RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_NITE + RGB 31,31,31, 07,07,07, 02,03,03, 00,00,00 ; PREDEFPAL_BLACKOUT + RGB 31,31,31, 30,22,17, 16,14,19, 00,00,00 ; PREDEFPAL_DIPLOMA + RGB 31,31,31, 18,20,27, 11,15,23, 00,00,00 ; PREDEFPAL_TRADE_TUBE + RGB 31,31,31, 31,20,10, 26,10,06, 00,00,00 ; PREDEFPAL_POKEDEX + RGB 31,31,31, 21,25,29, 14,19,25, 00,00,00 ; PREDEFPAL_1E + RGB 31,31,31, 27,22,24, 21,15,23, 00,00,00 ; PREDEFPAL_1F + RGB 31,31,31, 28,20,15, 21,14,09, 00,00,00 ; PREDEFPAL_20 + RGB 31,31,31, 20,26,16, 09,20,11, 00,00,00 ; PREDEFPAL_21 + RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_22 + RGB 31,31,31, 31,28,14, 26,20,00, 00,00,00 ; PREDEFPAL_23 + RGB 31,31,31, 26,21,22, 15,15,18, 00,00,00 ; PREDEFPAL_BADGE + RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_25 + RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_26 + RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_27 + RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_28 + RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_29 + RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_2A + RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_2B + RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_2C + RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_2D + RGB 31,31,31, 18,18,18, 10,10,10, 00,00,00 ; PREDEFPAL_PARTY_ICON + RGB 31,31,31, 30,26,15, 00,23,00, 00,00,00 ; PREDEFPAL_HP_GREEN + RGB 31,31,31, 30,26,15, 31,23,00, 00,00,00 ; PREDEFPAL_HP_YELLOW + RGB 31,31,31, 30,26,15, 31,00,00, 00,00,00 ; PREDEFPAL_HP_RED + RGB 31,31,31, 29,26,19, 27,20,14, 00,00,00 ; PREDEFPAL_POKEGEAR + RGB 31,31,31, 24,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_33 + RGB 31,31,31, 31,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_34 + RGB 31,31,31, 30,26,16, 16,12,09, 00,00,00 ; PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO + RGB 31,31,31, 15,28,26, 12,22,26, 03,16,14 ; PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS + RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_37 + RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG + RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB + RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD_OB + RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B + RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD + RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0 + RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1 + RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2 + RGB 31,31,31, 16,19,29, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_3 + RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_41 + RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_42 + RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_43 + RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_44 + RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_45 + RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_46 + RGB 31,31,31, 26,20,00, 16,19,29, 00,00,00 ; PREDEFPAL_47 + RGB 31,31,31, 16,02,30, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_0 + RGB 31,31,31, 16,13,04, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_1 + RGB 31,31,31, 28,04,02, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_2 + RGB 31,31,31, 18,23,31, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_3 + RGB 31,31,31, 24,20,11, 18,13,11, 00,00,00 ; PREDEFPAL_UNOWN_PUZZLE + RGB 31,31,31, 31,31,31, 25,30,00, 25,30,00 ; PREDEFPAL_4D + RGB 00,00,00, 08,11,11, 21,21,21, 31,31,31 ; PREDEFPAL_GAMEFREAK_LOGO -- cgit v1.2.3 From a4f387017517cf95ace045746268d6dbe823b21b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 00:41:34 -0500 Subject: BlkPacket comments --- gfx/sgb/blk_packets.asm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gfx') diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm index 4886a4854..a50decd34 100644 --- a/gfx/sgb/blk_packets.asm +++ b/gfx/sgb/blk_packets.asm @@ -26,15 +26,15 @@ BlkPacket_GSIntroJigglypuffPikachu: BlkPacket_Battle: attr_blk 5 - attr_blk_data %111, 2,2,0, 00,12, 19,17 - attr_blk_data %011, 1,1,0, 01,00, 10,03 - attr_blk_data %011, 0,0,0, 10,08, 19,10 - attr_blk_data %011, 2,2,0, 00,04, 08,11 - attr_blk_data %011, 3,3,0, 11,00, 19,07 + attr_blk_data %111, 2,2,0, 00,12, 19,17 ; text box: pal 2 + attr_blk_data %011, 1,1,0, 01,00, 10,03 ; enemy HP bar: pal 1 + attr_blk_data %011, 0,0,0, 10,08, 19,10 ; player HP+exp bar: pal 0 + attr_blk_data %011, 2,2,0, 00,04, 08,11 ; player mon: pal 2 + attr_blk_data %011, 3,3,0, 11,00, 19,07 ; enemy mon : pal 3 BlkPacket_StatsScreen: attr_blk 1 - attr_blk_data %111, 1,1,0, 00,01, 07,07 + attr_blk_data %111, 1,1,0, 00,01, 07,07 ; mon: pal 1 ds 8 BlkPacket_MoveList: @@ -44,21 +44,21 @@ BlkPacket_MoveList: BlkPacket_Pokedex_PC: attr_blk 1 - attr_blk_data %111, 1,1,0, 01,01, 08,08 + attr_blk_data %111, 1,1,0, 01,01, 08,08 ; mon: pal 1 ds 8 BlkPacket_PokedexUnownMode: attr_blk 1 - attr_blk_data %111, 1,1,0, 07,05, 13,11 + attr_blk_data %111, 1,1,0, 07,05, 13,11 ; unown: pal 1 ds 8 BlkPacket_SlotMachine: attr_blk 5 - attr_blk_data %011, 1,1,0, 00,00, 19,11 - attr_blk_data %011, 2,2,0, 00,04, 19,09 - attr_blk_data %010, 3,3,0, 00,06, 19,07 - attr_blk_data %011, 0,0,0, 04,04, 15,09 - attr_blk_data %011, 0,0,0, 00,12, 19,17 + attr_blk_data %011, 1,1,0, 00,00, 19,11 ; "3" rows and top of screen: pal 1 + attr_blk_data %011, 2,2,0, 00,04, 19,09 ; "2" rows: pal 2 + attr_blk_data %010, 3,3,0, 00,06, 19,07 ; "1" row: pal 3 + attr_blk_data %011, 0,0,0, 04,04, 15,09 ; slot reels: pal 0 + attr_blk_data %011, 0,0,0, 00,12, 19,17 ; text box: pal 0 UnreferencedBlkPacket_9b26: attr_blk 7 -- cgit v1.2.3 From 226d1812b34dad7ee0bb758c4c4970a731c9c79e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 11:16:24 -0500 Subject: Only graphics data goes in gfx/ Introduce PALRGB_WHITE constant for $7fff --- gfx/sgb/data_snd_packets.asm | 95 -------------------------------------------- gfx/sgb/pal_packets.asm | 38 +----------------- gfx/sgb/roof_pal_inds.asm | 32 --------------- 3 files changed, 1 insertion(+), 164 deletions(-) delete mode 100644 gfx/sgb/data_snd_packets.asm delete mode 100644 gfx/sgb/roof_pal_inds.asm (limited to 'gfx') diff --git a/gfx/sgb/data_snd_packets.asm b/gfx/sgb/data_snd_packets.asm deleted file mode 100644 index c2521b845..000000000 --- a/gfx/sgb/data_snd_packets.asm +++ /dev/null @@ -1,95 +0,0 @@ -; macros taken from pokered's data/sgb_packets.asm -; names taken from pandocs -; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_Palette_Commands - -sgb_data_snd: MACRO - db (SGB_DATA_SND << 3) + 1 - dw \1 ; address - db \2 ; bank - db \3 ; length (1-11) -ENDM - - -; These are packets containing SNES code. -; This set of packets is found in several Japanese SGB-compatible titles. -; It appears to be part of NCL's SGB devkit. - -DataSndPacket1: - sgb_data_snd $085d, $0, 11 - db $8c ; cpx #$8c (2) - db $d0, $f4 ; bne -$0c - db $60 ; rts - ds 7 - -DataSndPacket2: - sgb_data_snd $0852, $0, 11 - db $a9, $e7 ; lda #$e7 - db $9f, $01, $c0, $7e ; sta $7ec001, x - db $e8 ; inx - db $e8 ; inx - db $e8 ; inx - db $e8 ; inx - db $e0 ; cpx #$8c (1) - -DataSndPacket3: - sgb_data_snd $0847, $0, 11 - db $c4 ; cmp #$c4 (2) - db $d0, $16 ; bne +$16 - db $a5 ; lda dp - db $cb ; wai - db $c9, $05 ; cmp #$05 - db $d0, $10 ; bne +$10 - db $a2, $28 ; ldx #$28 - -DataSndPacket4: - sgb_data_snd $083c, $0, 11 - db $f0, $12 ; beq +$12 - db $a5 ; lda dp - db $c9, $c9 ; cmp #$c9 - db $c8 ; iny - db $d0, $1c ; bne +$1c - db $a5 ; lda dp - db $ca ; dex - db $c9 ; cmp #$c4 (1) - -DataSndPacket5: - sgb_data_snd $0831, $0, 11 - dbw $0c, $caa5 ; tsb $caa5 - db $c9, $7e ; cmp #$7e - db $d0, $06 ; bne +$06 - db $a5 ; lda dp - db $cb ; wai - db $c9, $7e ; cmp #$7e - -DataSndPacket6: - sgb_data_snd $0826, $0, 11 - db $39 ; bne +$39 (2) - dbw $cd, $0c48 ; cmp $0c48 - db $d0, $34 ; bne +$34 - db $a5 ; lda dp - db $c9, $c9 ; cmp #$c9 - db $80, $d0 ; bra -$30 - -DataSndPacket7: - sgb_data_snd $081b, $0, 11 - db $ea ; nop - db $ea ; nop - db $ea ; nop - db $ea ; nop - db $ea ; nop - ; $0820: - db $a9, $01 ; lda #01 - dbw $cd, $0c4f ; cmp $c4f - db $d0 ; bne +$39 (1) - -DataSndPacket8: - sgb_data_snd $0810, $0, 11 - dbw $4c, $0820 ; jmp $0820 - db $ea ; nop - db $ea ; nop - db $ea ; nop - db $ea ; nop - db $ea ; nop - db $60 ; rts - db $ea ; nop - db $ea ; nop diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index d9a4e5225..237909159 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -16,34 +16,6 @@ sgb_pal23: MACRO db (SGB_PAL23 << 3) + 1 ENDM -sgb_pal_trn: MACRO - db (SGB_PAL_TRN << 3) + 1 - ds 15 -ENDM - -sgb_mlt_req: MACRO - db (SGB_MLT_REG << 3) + 1 - db \1 - 1 - ds 14 -ENDM - -sgb_chr_trn: MACRO - db (SGB_CHR_TRN << 3) + 1 - db \1 + (\2 << 1) - ds 14 -ENDM - -sgb_pct_trn: MACRO - db (SGB_PCT_TRN << 3) + 1 - ds 15 -ENDM - -sgb_mask_en: MACRO - db (SGB_MASK_EN << 3) + 1 - db \1 - ds 14 -ENDM - PalPacket_GSTitleScreen: sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3 @@ -108,6 +80,7 @@ PalPacket_TradeTube: PalPacket_GamefreakLogo: sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, 00, 00, 00 + PalPacket_9ce6: sgb_pal01 RGB 31, 31, 31 @@ -123,12 +96,3 @@ rept 6 RGB 00, 00, 00 endr ds 1 - -PalTrnPacket: sgb_pal_trn -MltReq1Packet: sgb_mlt_req 1 -MltReq2Packet: sgb_mlt_req 2 -ChrTrnPacket: sgb_chr_trn 0, 0 -PctTrnPacket: sgb_pct_trn - -MaskEnFreezePacket: sgb_mask_en 1 -MaskEnCancelPacket: sgb_mask_en 0 diff --git a/gfx/sgb/roof_pal_inds.asm b/gfx/sgb/roof_pal_inds.asm deleted file mode 100644 index c56ddaf7d..000000000 --- a/gfx/sgb/roof_pal_inds.asm +++ /dev/null @@ -1,32 +0,0 @@ -; Crystal does not support SGB, so this is unused. - -MapGroupRoofSGBPalInds: ; 8a45 -; entries correspond to map groups - db PREDEFPAL_00 - db PREDEFPAL_OLIVINE - db PREDEFPAL_MAHOGANY - db PREDEFPAL_DUNGEONS - db PREDEFPAL_ECRUTEAK - db PREDEFPAL_BLACKTHORN - db PREDEFPAL_CINNABAR - db PREDEFPAL_CERULEAN - db PREDEFPAL_AZALEA - db PREDEFPAL_LAKE_OF_RAGE - db PREDEFPAL_VIOLET - db PREDEFPAL_GOLDENROD - db PREDEFPAL_VERMILION - db PREDEFPAL_PALLET - db PREDEFPAL_PEWTER - db PREDEFPAL_VERMILION - db PREDEFPAL_INDIGO - db PREDEFPAL_FUCHSIA - db PREDEFPAL_LAVENDER - db PREDEFPAL_SILVER_CAVE - db PREDEFPAL_FUCHSIA - db PREDEFPAL_CELADON - db PREDEFPAL_CIANWOOD - db PREDEFPAL_VIRIDIAN - db PREDEFPAL_NEW_BARK - db PREDEFPAL_SAFFRON - db PREDEFPAL_CHERRYGROVE -; 8a60 -- cgit v1.2.3 From 22fd1221f5189e9d1d4e1ebd2146f7aaf77f2e3a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 11:37:05 -0500 Subject: More .pal files --- gfx/icons/party_menu.pal | 69 -------------------------------------- gfx/sgb/pal_packets.asm | 2 +- gfx/sgb/predef.pal | 8 ++--- gfx/stats/party_menu_bg.pal | 4 +++ gfx/stats/party_menu_bg_mobile.pal | 4 +++ gfx/stats/party_menu_ob.pal | 69 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 82 insertions(+), 74 deletions(-) delete mode 100644 gfx/icons/party_menu.pal create mode 100644 gfx/stats/party_menu_bg.pal create mode 100644 gfx/stats/party_menu_bg_mobile.pal create mode 100644 gfx/stats/party_menu_ob.pal (limited to 'gfx') diff --git a/gfx/icons/party_menu.pal b/gfx/icons/party_menu.pal deleted file mode 100644 index 70af517be..000000000 --- a/gfx/icons/party_menu.pal +++ /dev/null @@ -1,69 +0,0 @@ - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 10, 14, 20 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 31, 31, 07 - RGB 31, 16, 01 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 31, 19, 24 - RGB 30, 10, 06 - RGB 07, 07, 07 - - RGB 31, 31, 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 31, 31, 31 - RGB 24, 18, 07 - RGB 20, 15, 03 - RGB 07, 07, 07 diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index 237909159..95a224f2b 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -24,7 +24,7 @@ PalPacket_SCGB_13: sgb_pal_set 2B, BADGE, 20, 00 PalPacket_SCGB_11: - sgb_pal_set 41, 42, 43, 44 + sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3 PalPacket_UnownPuzzle: sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 9ba598d94..27094f292 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -63,10 +63,10 @@ RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1 RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2 RGB 31,31,31, 16,19,29, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_3 - RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_41 - RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_42 - RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_43 - RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_44 + RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_0 + RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_1 + RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_2 + RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_3 RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_45 RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_46 RGB 31,31,31, 26,20,00, 16,19,29, 00,00,00 ; PREDEFPAL_47 diff --git a/gfx/stats/party_menu_bg.pal b/gfx/stats/party_menu_bg.pal new file mode 100644 index 000000000..324109a2b --- /dev/null +++ b/gfx/stats/party_menu_bg.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 17, 19, 31 + RGB 14, 16, 31 + RGB 00, 00, 00 diff --git a/gfx/stats/party_menu_bg_mobile.pal b/gfx/stats/party_menu_bg_mobile.pal new file mode 100644 index 000000000..016eee5a1 --- /dev/null +++ b/gfx/stats/party_menu_bg_mobile.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 31, 19, 24 + RGB 30, 10, 06 + RGB 00, 00, 00 diff --git a/gfx/stats/party_menu_ob.pal b/gfx/stats/party_menu_ob.pal new file mode 100644 index 000000000..70af517be --- /dev/null +++ b/gfx/stats/party_menu_ob.pal @@ -0,0 +1,69 @@ + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 10, 14, 20 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 07, 07, 07 + + RGB 31, 31, 31 + RGB 31, 31, 07 + RGB 31, 16, 01 + RGB 07, 07, 07 + + RGB 31, 31, 31 + RGB 31, 19, 24 + RGB 30, 10, 06 + RGB 07, 07, 07 + + RGB 31, 31, 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 31, 31, 31 + RGB 24, 18, 07 + RGB 20, 15, 03 + RGB 07, 07, 07 -- cgit v1.2.3 From 69ace7f48d441a0af3360a991ace8f70379e48dc Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 12:31:19 -0500 Subject: Identify leftover SGB palettes from R/B --- gfx/sgb/pal_packets.asm | 4 ++-- gfx/sgb/predef.pal | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'gfx') diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index 95a224f2b..ec97bca3d 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -21,7 +21,7 @@ PalPacket_GSTitleScreen: sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3 PalPacket_SCGB_13: - sgb_pal_set 2B, BADGE, 20, 00 + sgb_pal_set 2B, CGB_BADGE, RB_BROWNMON, 00 PalPacket_SCGB_11: sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3 @@ -69,7 +69,7 @@ PalPacket_SlotMachine: sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3 PalPacket_SCGB_06: - sgb_pal_set 33, 34, DIPLOMA, 1F + sgb_pal_set 33, 34, DIPLOMA, RB_PURPLEMON PalPacket_Diploma: sgb_pal_set DIPLOMA, 00, 00, 00 diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 27094f292..1f18f9efe 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -28,19 +28,19 @@ RGB 31,31,31, 30,22,17, 16,14,19, 00,00,00 ; PREDEFPAL_DIPLOMA RGB 31,31,31, 18,20,27, 11,15,23, 00,00,00 ; PREDEFPAL_TRADE_TUBE RGB 31,31,31, 31,20,10, 26,10,06, 00,00,00 ; PREDEFPAL_POKEDEX - RGB 31,31,31, 21,25,29, 14,19,25, 00,00,00 ; PREDEFPAL_1E - RGB 31,31,31, 27,22,24, 21,15,23, 00,00,00 ; PREDEFPAL_1F - RGB 31,31,31, 28,20,15, 21,14,09, 00,00,00 ; PREDEFPAL_20 - RGB 31,31,31, 20,26,16, 09,20,11, 00,00,00 ; PREDEFPAL_21 - RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_22 - RGB 31,31,31, 31,28,14, 26,20,00, 00,00,00 ; PREDEFPAL_23 - RGB 31,31,31, 26,21,22, 15,15,18, 00,00,00 ; PREDEFPAL_BADGE - RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_25 - RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_26 - RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_27 - RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_28 - RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_29 - RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_2A + RGB 31,31,31, 21,25,29, 14,19,25, 00,00,00 ; PREDEFPAL_RB_CYANMON + RGB 31,31,31, 27,22,24, 21,15,23, 00,00,00 ; PREDEFPAL_RB_PURPLEMON + RGB 31,31,31, 28,20,15, 21,14,09, 00,00,00 ; PREDEFPAL_RB_BROWNMON + RGB 31,31,31, 20,26,16, 09,20,11, 00,00,00 ; PREDEFPAL_RB_GREENMON + RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_RB_PINKMON + RGB 31,31,31, 31,28,14, 26,20,00, 00,00,00 ; PREDEFPAL_RB_YELLOWMON + RGB 31,31,31, 26,21,22, 15,15,18, 00,00,00 ; PREDEFPAL_CGB_BADGE + RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_DARK_MEW + RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_DARK_BLUE + RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_DARK_RED + RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_DARK_CYAN + RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_DARK_PURPLE + RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_DARK_BROWN RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_2B RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_2C RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_2D @@ -58,7 +58,7 @@ RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD_OB RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B - RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD + RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD_BG (PACK) RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0 RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1 RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2 -- cgit v1.2.3 From 3bf8325edddb03753fa63f0dfb39cedcd1d2faca Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 15:06:43 -0500 Subject: More accurate constant/label names --- gfx/sgb/pal_packets.asm | 8 ++++---- gfx/sgb/predef.pal | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gfx') diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index ec97bca3d..7028d24ae 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -41,14 +41,14 @@ UnreferencedPalPacket_9bf6: PalPacket_GSIntroJigglypuffPikachu: sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00 -PalPacket_GSIntroCharizard: - sgb_pal_set GS_INTRO_CHARIZARD_OB, 00, 00, 00 +PalPacket_GSIntroStartersTransition: + sgb_pal_set GS_INTRO_STARTERS_TRANSITION, 00, 00, 00 PalPacket_Function8b4d: sgb_pal_set 3B, 00, 00, 00 PalPacket_Pack: - sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00 + sgb_pal_set PACK, 00, 00, 00 PalPacket_SCGB_0F: sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00 @@ -63,7 +63,7 @@ PalPacket_Pokegear: sgb_pal_set POKEGEAR, 00, 00, 00 UnreferencedPalPacket_9c86: - sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00 + sgb_pal_set PACK, 00, 00, 00 PalPacket_SlotMachine: sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3 diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 1f18f9efe..f0e6f3693 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -56,9 +56,9 @@ RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_37 RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB - RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD_OB + RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_STARTERS_TRANSITION RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B - RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD_BG (PACK) + RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD (PACK) RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0 RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1 RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2 -- cgit v1.2.3 From d82127b23cb16e80e3216a5d9c26f864375441b0 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 16:19:09 -0500 Subject: SGB MON_NITE colors --- gfx/sgb/pal_packets.asm | 2 +- gfx/sgb/predef.pal | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'gfx') diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index 7028d24ae..fa3b386da 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -21,7 +21,7 @@ PalPacket_GSTitleScreen: sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3 PalPacket_SCGB_13: - sgb_pal_set 2B, CGB_BADGE, RB_BROWNMON, 00 + sgb_pal_set GREENMON_NITE, CGB_BADGE, RB_BROWNMON, 00 PalPacket_SCGB_11: sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3 diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index f0e6f3693..1faa115bf 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -35,15 +35,15 @@ RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_RB_PINKMON RGB 31,31,31, 31,28,14, 26,20,00, 00,00,00 ; PREDEFPAL_RB_YELLOWMON RGB 31,31,31, 26,21,22, 15,15,18, 00,00,00 ; PREDEFPAL_CGB_BADGE - RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_DARK_MEW - RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_DARK_BLUE - RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_DARK_RED - RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_DARK_CYAN - RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_DARK_PURPLE - RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_DARK_BROWN - RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_2B - RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_2C - RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_2D + RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_MEWMON_NITE + RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_BLUEMON_NITE + RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_REDMON_NITE + RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_CYANMON_NITE + RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_PURPLEMON_NITE + RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_BROWNMON_NITE + RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_GREENMON_NITE + RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_PINKMON_NITE + RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_YELLOWMON_NITE RGB 31,31,31, 18,18,18, 10,10,10, 00,00,00 ; PREDEFPAL_PARTY_ICON RGB 31,31,31, 30,26,15, 00,23,00, 00,00,00 ; PREDEFPAL_HP_GREEN RGB 31,31,31, 30,26,15, 31,23,00, 00,00,00 ; PREDEFPAL_HP_YELLOW -- cgit v1.2.3 From 676b585375522127d3d1e134c8761d55ede32739 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 16:21:38 -0500 Subject: Correct comment --- gfx/sgb/predef.pal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gfx') diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 1faa115bf..67d19baec 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -58,7 +58,7 @@ RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_STARTERS_TRANSITION RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B - RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD (PACK) + RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_PACK RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0 RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1 RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2 -- cgit v1.2.3 From 80dd085dbc618e14b77b6cb29afb0bd695e516e2 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 23:53:20 -0500 Subject: unused_up_arrow.png --- gfx/font.asm | 2 +- gfx/font/unused_arrow.png | Bin 86 -> 0 bytes gfx/font/unused_up_arrow.png | Bin 0 -> 86 bytes 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 gfx/font/unused_arrow.png create mode 100644 gfx/font/unused_up_arrow.png (limited to 'gfx') diff --git a/gfx/font.asm b/gfx/font.asm index bd7b60c3c..bf5741074 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -62,7 +62,7 @@ INCBIN "gfx/font/black.1bpp" ; f921c UnusedUpArrowGFX: ; unused up arrow + whitespace -INCBIN "gfx/font/unused_arrow.1bpp" +INCBIN "gfx/font/unused_up_arrow.1bpp" ; f9234 MobilePhoneTilesGFX: ; f9234 diff --git a/gfx/font/unused_arrow.png b/gfx/font/unused_arrow.png deleted file mode 100644 index 24a5a5c41..000000000 Binary files a/gfx/font/unused_arrow.png and /dev/null differ diff --git a/gfx/font/unused_up_arrow.png b/gfx/font/unused_up_arrow.png new file mode 100644 index 000000000..cb62087aa Binary files /dev/null and b/gfx/font/unused_up_arrow.png differ -- cgit v1.2.3 From fdb81d0a04a38ee384cd233db8e07009c60742f9 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 00:02:58 -0500 Subject: One leader per line --- gfx/trainer_card/leaders.png | Bin 958 -> 923 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'gfx') diff --git a/gfx/trainer_card/leaders.png b/gfx/trainer_card/leaders.png index 6e7eb0f8d..874135436 100644 Binary files a/gfx/trainer_card/leaders.png and b/gfx/trainer_card/leaders.png differ -- cgit v1.2.3 From ddec0ee305f25bc9941e19e16c79f499c5e95c23 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 20:48:33 -0500 Subject: More Japanese characters --- gfx/mobile/mobile_adapter.png | Bin 1633 -> 1517 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'gfx') diff --git a/gfx/mobile/mobile_adapter.png b/gfx/mobile/mobile_adapter.png index fa5965e92..f02e3b614 100644 Binary files a/gfx/mobile/mobile_adapter.png and b/gfx/mobile/mobile_adapter.png differ -- cgit v1.2.3 From 05382d3e3c03616d6edf21833e89a8264a8cd10a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 20 Jan 2018 12:25:55 -0500 Subject: PARTY_LENGTH; MON_NAME; sgb_border.bin --- gfx/sgb/sgb_border.bin | 2 ++ gfx/sgb/sgb_border.tilemap | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 gfx/sgb/sgb_border.bin delete mode 100644 gfx/sgb/sgb_border.tilemap (limited to 'gfx') diff --git a/gfx/sgb/sgb_border.bin b/gfx/sgb/sgb_border.bin new file mode 100644 index 000000000..362eae929 --- /dev/null +++ b/gfx/sgb/sgb_border.bin @@ -0,0 +1,2 @@ +TTTTTTT$%&T&T%T$TTTTTTTTT$455T4T3TTTT!"##T"T!T T  +      ) !"##T"T!T122T688888888888888888888'2TT2T1TTT7TTTTT7TTT%&T&T7&T&T%T3455T4T7455T4T3T7TTT7TTT7"T!T T7 !"2T1T0T7012TTT7TTT7&T%T$T7$%&4T3TT7347TT7TTTTT7TTT!"##T"T7"##T"T!T122T72TT2T1TTT.////////////////////-TTTTTTT9 ( )*+,9TTT%&T&T%T$TTTT$%&T&T%T3455T4T$TTTTTT$455T4T3T !"##T"T!T T \ No newline at end of file diff --git a/gfx/sgb/sgb_border.tilemap b/gfx/sgb/sgb_border.tilemap deleted file mode 100644 index 362eae929..000000000 --- a/gfx/sgb/sgb_border.tilemap +++ /dev/null @@ -1,2 +0,0 @@ -TTTTTTT$%&T&T%T$TTTTTTTTT$455T4T3TTTT!"##T"T!T T  -      ) !"##T"T!T122T688888888888888888888'2TT2T1TTT7TTTTT7TTT%&T&T7&T&T%T3455T4T7455T4T3T7TTT7TTT7"T!T T7 !"2T1T0T7012TTT7TTT7&T%T$T7$%&4T3TT7347TT7TTTTT7TTT!"##T"T7"##T"T!T122T72TT2T1TTT.////////////////////-TTTTTTT9 ( )*+,9TTT%&T&T%T$TTTT$%&T&T%T3455T4T$TTTTTT$455T4T3T !"##T"T!T T \ No newline at end of file -- cgit v1.2.3 From a8eb44b6e3b2e376491c68efe4a67e8f1badb0e8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 21 Jan 2018 13:58:16 -0500 Subject: Separate new_game graphics --- gfx/icons/mail2.png | Bin 135 -> 0 bytes gfx/icons/mail_big.png | Bin 0 -> 135 bytes gfx/intro/gender_screen.pal | 4 ---- gfx/intro/gender_screen.png | Bin 71 -> 0 bytes gfx/naming_screen/border.png | Bin 0 -> 82 bytes gfx/naming_screen/cursor.png | Bin 0 -> 78 bytes gfx/naming_screen/end.png | Bin 0 -> 82 bytes gfx/naming_screen/middle_line.png | Bin 0 -> 76 bytes gfx/naming_screen/underline.png | Bin 0 -> 74 bytes gfx/namingscreen/border.png | Bin 82 -> 0 bytes gfx/namingscreen/cursor.png | Bin 78 -> 0 bytes gfx/namingscreen/end.png | Bin 82 -> 0 bytes gfx/namingscreen/middle_line.png | Bin 76 -> 0 bytes gfx/namingscreen/underline.png | Bin 74 -> 0 bytes gfx/new_game/down_arrow.png | Bin 0 -> 82 bytes gfx/new_game/gender_screen.pal | 4 ++++ gfx/new_game/gender_screen.png | Bin 0 -> 71 bytes gfx/new_game/shrink1.2bpp.lz.d4443930 | Bin 0 -> 144 bytes gfx/new_game/shrink1.png | Bin 0 -> 188 bytes gfx/new_game/shrink2.2bpp.lz.3f58480a | Bin 0 -> 64 bytes gfx/new_game/shrink2.png | Bin 0 -> 156 bytes gfx/new_game/timeset_bg.png | Bin 0 -> 68 bytes gfx/new_game/up_arrow.png | Bin 0 -> 82 bytes gfx/shrink/shrink1.2bpp.lz.d4443930 | Bin 144 -> 0 bytes gfx/shrink/shrink1.png | Bin 188 -> 0 bytes gfx/shrink/shrink2.2bpp.lz.3f58480a | Bin 64 -> 0 bytes gfx/shrink/shrink2.png | Bin 156 -> 0 bytes gfx/timeset/background.png | Bin 68 -> 0 bytes gfx/timeset/down_arrow.png | Bin 82 -> 0 bytes gfx/timeset/up_arrow.png | Bin 82 -> 0 bytes 30 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 gfx/icons/mail2.png create mode 100644 gfx/icons/mail_big.png delete mode 100644 gfx/intro/gender_screen.pal delete mode 100644 gfx/intro/gender_screen.png create mode 100644 gfx/naming_screen/border.png create mode 100644 gfx/naming_screen/cursor.png create mode 100644 gfx/naming_screen/end.png create mode 100644 gfx/naming_screen/middle_line.png create mode 100644 gfx/naming_screen/underline.png delete mode 100644 gfx/namingscreen/border.png delete mode 100644 gfx/namingscreen/cursor.png delete mode 100644 gfx/namingscreen/end.png delete mode 100644 gfx/namingscreen/middle_line.png delete mode 100644 gfx/namingscreen/underline.png create mode 100644 gfx/new_game/down_arrow.png create mode 100644 gfx/new_game/gender_screen.pal create mode 100644 gfx/new_game/gender_screen.png create mode 100644 gfx/new_game/shrink1.2bpp.lz.d4443930 create mode 100644 gfx/new_game/shrink1.png create mode 100644 gfx/new_game/shrink2.2bpp.lz.3f58480a create mode 100644 gfx/new_game/shrink2.png create mode 100644 gfx/new_game/timeset_bg.png create mode 100644 gfx/new_game/up_arrow.png delete mode 100644 gfx/shrink/shrink1.2bpp.lz.d4443930 delete mode 100644 gfx/shrink/shrink1.png delete mode 100644 gfx/shrink/shrink2.2bpp.lz.3f58480a delete mode 100644 gfx/shrink/shrink2.png delete mode 100644 gfx/timeset/background.png delete mode 100644 gfx/timeset/down_arrow.png delete mode 100644 gfx/timeset/up_arrow.png (limited to 'gfx') diff --git a/gfx/icons/mail2.png b/gfx/icons/mail2.png deleted file mode 100644 index 7ad25edbf..000000000 Binary files a/gfx/icons/mail2.png and /dev/null differ diff --git a/gfx/icons/mail_big.png b/gfx/icons/mail_big.png new file mode 100644 index 000000000..7ad25edbf Binary files /dev/null and b/gfx/icons/mail_big.png differ diff --git a/gfx/intro/gender_screen.pal b/gfx/intro/gender_screen.pal deleted file mode 100644 index ca8ae04aa..000000000 --- a/gfx/intro/gender_screen.pal +++ /dev/null @@ -1,4 +0,0 @@ - RGB 31, 31, 31 - RGB 09, 30, 31 - RGB 01, 11, 31 - RGB 00, 00, 00 diff --git a/gfx/intro/gender_screen.png b/gfx/intro/gender_screen.png deleted file mode 100644 index 726178132..000000000 Binary files a/gfx/intro/gender_screen.png and /dev/null differ diff --git a/gfx/naming_screen/border.png b/gfx/naming_screen/border.png new file mode 100644 index 000000000..36935ab82 Binary files /dev/null and b/gfx/naming_screen/border.png differ diff --git a/gfx/naming_screen/cursor.png b/gfx/naming_screen/cursor.png new file mode 100644 index 000000000..a0429a3ad Binary files /dev/null and b/gfx/naming_screen/cursor.png differ diff --git a/gfx/naming_screen/end.png b/gfx/naming_screen/end.png new file mode 100644 index 000000000..c8e132b92 Binary files /dev/null and b/gfx/naming_screen/end.png differ diff --git a/gfx/naming_screen/middle_line.png b/gfx/naming_screen/middle_line.png new file mode 100644 index 000000000..a34e82bf1 Binary files /dev/null and b/gfx/naming_screen/middle_line.png differ diff --git a/gfx/naming_screen/underline.png b/gfx/naming_screen/underline.png new file mode 100644 index 000000000..e92cd4d6a Binary files /dev/null and b/gfx/naming_screen/underline.png differ diff --git a/gfx/namingscreen/border.png b/gfx/namingscreen/border.png deleted file mode 100644 index 36935ab82..000000000 Binary files a/gfx/namingscreen/border.png and /dev/null differ diff --git a/gfx/namingscreen/cursor.png b/gfx/namingscreen/cursor.png deleted file mode 100644 index a0429a3ad..000000000 Binary files a/gfx/namingscreen/cursor.png and /dev/null differ diff --git a/gfx/namingscreen/end.png b/gfx/namingscreen/end.png deleted file mode 100644 index c8e132b92..000000000 Binary files a/gfx/namingscreen/end.png and /dev/null differ diff --git a/gfx/namingscreen/middle_line.png b/gfx/namingscreen/middle_line.png deleted file mode 100644 index a34e82bf1..000000000 Binary files a/gfx/namingscreen/middle_line.png and /dev/null differ diff --git a/gfx/namingscreen/underline.png b/gfx/namingscreen/underline.png deleted file mode 100644 index e92cd4d6a..000000000 Binary files a/gfx/namingscreen/underline.png and /dev/null differ diff --git a/gfx/new_game/down_arrow.png b/gfx/new_game/down_arrow.png new file mode 100644 index 000000000..33803e197 Binary files /dev/null and b/gfx/new_game/down_arrow.png differ diff --git a/gfx/new_game/gender_screen.pal b/gfx/new_game/gender_screen.pal new file mode 100644 index 000000000..ca8ae04aa --- /dev/null +++ b/gfx/new_game/gender_screen.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 09, 30, 31 + RGB 01, 11, 31 + RGB 00, 00, 00 diff --git a/gfx/new_game/gender_screen.png b/gfx/new_game/gender_screen.png new file mode 100644 index 000000000..726178132 Binary files /dev/null and b/gfx/new_game/gender_screen.png differ diff --git a/gfx/new_game/shrink1.2bpp.lz.d4443930 b/gfx/new_game/shrink1.2bpp.lz.d4443930 new file mode 100644 index 000000000..284bee8c2 Binary files /dev/null and b/gfx/new_game/shrink1.2bpp.lz.d4443930 differ diff --git a/gfx/new_game/shrink1.png b/gfx/new_game/shrink1.png new file mode 100644 index 000000000..6cf5b8077 Binary files /dev/null and b/gfx/new_game/shrink1.png differ diff --git a/gfx/new_game/shrink2.2bpp.lz.3f58480a b/gfx/new_game/shrink2.2bpp.lz.3f58480a new file mode 100644 index 000000000..df14d5ed4 Binary files /dev/null and b/gfx/new_game/shrink2.2bpp.lz.3f58480a differ diff --git a/gfx/new_game/shrink2.png b/gfx/new_game/shrink2.png new file mode 100644 index 000000000..276b4e7c7 Binary files /dev/null and b/gfx/new_game/shrink2.png differ diff --git a/gfx/new_game/timeset_bg.png b/gfx/new_game/timeset_bg.png new file mode 100644 index 000000000..e2bd6299c Binary files /dev/null and b/gfx/new_game/timeset_bg.png differ diff --git a/gfx/new_game/up_arrow.png b/gfx/new_game/up_arrow.png new file mode 100644 index 000000000..d8cfc7f3f Binary files /dev/null and b/gfx/new_game/up_arrow.png differ diff --git a/gfx/shrink/shrink1.2bpp.lz.d4443930 b/gfx/shrink/shrink1.2bpp.lz.d4443930 deleted file mode 100644 index 284bee8c2..000000000 Binary files a/gfx/shrink/shrink1.2bpp.lz.d4443930 and /dev/null differ diff --git a/gfx/shrink/shrink1.png b/gfx/shrink/shrink1.png deleted file mode 100644 index 6cf5b8077..000000000 Binary files a/gfx/shrink/shrink1.png and /dev/null differ diff --git a/gfx/shrink/shrink2.2bpp.lz.3f58480a b/gfx/shrink/shrink2.2bpp.lz.3f58480a deleted file mode 100644 index df14d5ed4..000000000 Binary files a/gfx/shrink/shrink2.2bpp.lz.3f58480a and /dev/null differ diff --git a/gfx/shrink/shrink2.png b/gfx/shrink/shrink2.png deleted file mode 100644 index 276b4e7c7..000000000 Binary files a/gfx/shrink/shrink2.png and /dev/null differ diff --git a/gfx/timeset/background.png b/gfx/timeset/background.png deleted file mode 100644 index e2bd6299c..000000000 Binary files a/gfx/timeset/background.png and /dev/null differ diff --git a/gfx/timeset/down_arrow.png b/gfx/timeset/down_arrow.png deleted file mode 100644 index 33803e197..000000000 Binary files a/gfx/timeset/down_arrow.png and /dev/null differ diff --git a/gfx/timeset/up_arrow.png b/gfx/timeset/up_arrow.png deleted file mode 100644 index d8cfc7f3f..000000000 Binary files a/gfx/timeset/up_arrow.png and /dev/null differ -- cgit v1.2.3