diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index 06b6697..dc89852 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -53,7 +53,6 @@
 	const TILESET_NIHON_WHITECITY	   ; 33
 	const TILESET_SEVII				   ; 34
 	const TILESET_LUSHCAVE			   ; 35
-	const TILESET_UNDERWATER		   ; 36
 DEF NUM_TILESETS EQU const_value - 1
 
 ; wTileset struct size
diff --git a/data/tilesets.asm b/data/tilesets.asm
index 36567ea..76b6733 100644
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@@ -65,5 +65,4 @@ Tilesets::
 	tileset TilesetNihonWhiteCity
 	tileset TilesetSevii
 	tileset TilesetLushCave
-	tileset TilesetUnderwater
 	assert_table_length NUM_TILESETS + 1
diff --git a/engine/tilesets/tileset_palettes.asm b/engine/tilesets/tileset_palettes.asm
index 0ffb0b2..6643cbc 100644
--- a/engine/tilesets/tileset_palettes.asm
+++ b/engine/tilesets/tileset_palettes.asm
@@ -226,60 +226,5 @@ LoadDesertPalette:
 	ld bc, 8 palettes
 	jp FarCopyWRAM
 	ret
-	
+
 INCLUDE "gfx/tilesets/desert.pal"
-	
-LoadUnderwaterPalette:
-	ld a, [wTimeOfDay]
-	and $7
-	cp NITE_F
-	jr z, .nite
-	cp DAY_F
-	jr z, .day
-	scf
-;morn
-	ld a, BANK(wBGPals1)
-	ld de, wBGPals1
-	ld hl, UnderwaterMornPalette
-	ld bc, 8 palettes
-	jp FarCopyWRAM
-	ret
-.day
-	ld a, BANK(wBGPals1)
-	ld de, wBGPals1
-	ld hl, UnderwaterDayPalette
-	ld bc, 8 palettes
-	jp FarCopyWRAM
-	ret
-.nite
-	ld a, BANK(wBGPals1)
-	ld de, wBGPals1
-	ld hl, UnderwaterNitePalette
-	ld bc, 8 palettes
-	jp FarCopyWRAM
-	ret
-	
-INCLUDE "gfx/tilesets/underwater.pal"
-
-
-LoadSpecialMapObjectPalette:
-	ld a, [wMapTileset]
-	cp TILESET_UNDERWATER
-	jr z, .underwater
-	jr .do_nothing
-.underwater
-	call LoadUnderwaterObjectPalette
-	scf
-	ret
-.do_nothing
-	and a
-	ret
-LoadUnderwaterObjectPalette:
-	ld a, BANK(wOBPals1)
-	ld de, wOBPals1
-	ld hl, UnderwaterObjectPalette
-	ld bc, 8 palettes
-	call FarCopyWRAM
-	ret
-UnderwaterObjectPalette:
-INCLUDE "gfx/tilesets/underwater_sprites.pal"
diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm
index 2c1a2e2..dbb4f7c 100644
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@@ -659,24 +659,3 @@ INCBIN "data/tilesets/players_room_metatiles.bin"
 
 TilesetPlayersRoomColl::
 INCLUDE "data/tilesets/players_room_collision.asm"
-
-TilesetUnderwaterGFX::
-INCBIN "gfx/tilesets/underwater.2bpp.lz"
-
-TilesetUnderwaterMeta::
-INCBIN "data/tilesets/underwater_metatiles.bin"
-
-TilesetUnderwaterColl::
-INCLUDE "data/tilesets/underwater_collision.asm"
-
-TilesetUnderwaterAttr::
-INCBIN "data/tilesets/underwater_attributes.bin"
-
-TilesetNihonFontGFX::
-INCBIN "gfx/tilesets/nihon_font.2bpp.lz"
-
-TilesetNihonFontMeta::
-INCBIN "data/tilesets/nihon_font_metatiles.bin"
-
-TilesetNihonFontColl::
-INCLUDE "data/tilesets/nihon_font_collision.asm"
\ No newline at end of file
diff --git a/gfx/tilesets/underwater_sprites.pal b/gfx/tilesets/underwater_sprites.pal
deleted file mode 100644
index d43bd12..0000000
--- a/gfx/tilesets/underwater_sprites.pal
+++ /dev/null
@@ -1,40 +0,0 @@
-; red
-	RGB 14, 17, 24
-	RGB 11, 19, 10
-	RGB 11, 07, 01
-	RGB 00, 00, 00
-; blue
-	RGB 14, 17, 24
-	RGB 11, 19, 10
-	RGB 10, 09, 29
-	RGB 00, 00, 00
-; green
-	RGB 14, 17, 24
-	RGB 11, 19, 10
-	RGB 07, 22, 03
-	RGB 00, 00, 00
-; brown
-	RGB 14, 17, 24
-	RGB 11, 19, 10
-	RGB 11, 10, 03
-	RGB 00, 00, 00
-; pink
-	RGB 14, 17, 24
-	RGB 11, 19, 10
-	RGB 10, 09, 02
-	RGB 00, 00, 00
-; silver
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 13, 13, 13
-	RGB 00, 00, 00
-; tree (bg green)
-	RGB 19, 31, 19
-	RGB 11, 21, 28
-	RGB 04, 16, 24
-	RGB 00, 00, 00
-; rock (bg brown)
-	RGB 14, 17, 24
-	RGB 08, 09, 16
-	RGB 04, 05, 10
-	RGB 02, 02, 04
\ No newline at end of file