revert 093bda0

gfx/sprites.asm

@@ -151,4 +151,3 @@ ChannelerGFX::             INCBIN "gfx/sprites/channeler.2bpp"
 BaldingGuyGFX::             INCBIN "gfx/sprites/balding_guy.2bpp"
 GameboyGirlGFX::             INCBIN "gfx/sprites/gameboy_girl.2bpp"
 OverworldPikachuGFX::             INCBIN "gfx/sprites/pikachu.2bpp"
-DiveSpriteGFX::                INCBIN "gfx/sprites/dive.2bpp"

gfx/tileset_palette_maps.asm

@@ -111,9 +111,6 @@ INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
 TilesetLavenderCryptPalMap:
 INCLUDE "gfx/tilesets/lavendercrypt_palette_map.asm"
 
-TilesetUnderwaterPalMap:
-INCLUDE "gfx/tilesets/underwater_palette_map.asm"
-
 MapGroupPalettes: ; unreferenced
 ; entries correspond to MAPGROUP_* constants
 rept NUM_MAP_GROUPS

gfx/tilesets/johto_palette_map.asm

@@ -9,10 +9,11 @@
 	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, WATER, BROWN, BROWN, GRAY, GRAY
-rept 16
-	db $ff
-endr
+	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
+	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, TEXT
 	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