diff options
| -rw-r--r-- | main.asm | 6 | ||||
| -rw-r--r-- | tilesets/palette_maps.asm | 8 | ||||
| -rw-r--r-- | tilesets/unused_museum_palette_map.asm | 32 | ||||
| -rw-r--r-- | tilesets/unused_palette_map_1.bin | bin | 112 -> 0 bytes | |||
| -rw-r--r-- | tilesets/unused_palette_map_2.bin | 1 |
5 files changed, 40 insertions, 7 deletions
@@ -1941,6 +1941,12 @@ ScrollBGMapPalettes:: ; 4c03f INCLUDE "tilesets/palette_maps.asm" +Unknown_4ce05: ; unreferenced +rept 26 + db $06 +endr +; 0x4ce1f + INCLUDE "data/collision_permissions.asm" EmptyAllSRAMBanks: ; 4cf1f diff --git a/tilesets/palette_maps.asm b/tilesets/palette_maps.asm index fb7da4cf4..55391aeac 100644 --- a/tilesets/palette_maps.asm +++ b/tilesets/palette_maps.asm @@ -105,8 +105,8 @@ TilesetPlayersHouse2FPalMap: ; 0x4caf5 INCLUDE "tilesets/players_house_2f_palette_map.asm" ; 0x4cb65 -UnusedPalMap1: -INCBIN "tilesets/unused_palette_map_1.bin" +UnusedMuseumPalMap: ; 0x4cb65 +INCLUDE "tilesets/unused_museum_palette_map.asm" ; 4cbd5 TilesetIcePathPalMap: ; 0x4cbd5 @@ -128,7 +128,3 @@ INCLUDE "tilesets/battle_tower_palette_map.asm" TilesetBattleTowerOutsidePalMap: ; 0x4cd95 INCLUDE "tilesets/battle_tower_outside_palette_map.asm" ; 0x4ce05 - -UnusedPalMap2: -INCBIN "tilesets/unused_palette_map_2.bin" -; 4ce1f diff --git a/tilesets/unused_museum_palette_map.asm b/tilesets/unused_museum_palette_map.asm new file mode 100644 index 000000000..cfbe6dbcd --- /dev/null +++ b/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/tilesets/unused_palette_map_1.bin b/tilesets/unused_palette_map_1.bin Binary files differdeleted file mode 100644 index 04cb3ff2d..000000000 --- a/tilesets/unused_palette_map_1.bin +++ /dev/null diff --git a/tilesets/unused_palette_map_2.bin b/tilesets/unused_palette_map_2.bin deleted file mode 100644 index aba1b3cbf..000000000 --- a/tilesets/unused_palette_map_2.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file |