Water Sport doesnt seem to work correctly?

data/maps/attributes.asm

@@ -920,6 +920,8 @@ ENDM
 
 	map_attributes SunglowCity, SUNGLOW_CITY, $03, SOUTH ; this is missing a route connection
 	connection south, Route57, ROUTE_57, 0
+	
+	map_attributes SunglowWell, SUNGLOW_WELL, $03, SOUTH ; this is missing a route connection
 
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
 	

data/maps/blocks.asm

@@ -1342,5 +1342,8 @@ Route57_Blocks:
 SunglowCity_Blocks:
 	INCBIN "maps/SunglowCity.ablk"
 	
+SunglowWell_Blocks:
+	INCBIN "maps/SunglowWell.ablk"
+	
 AventurineCity_Blocks:
 	INCBIN "maps/AventurineCity.ablk"

data/maps/maps.asm

@@ -763,6 +763,7 @@ MapGroup_SunglowCity:
 	table_width MAP_LENGTH, MapGroup_SunglowCity
 	map Route57, TILESET_NIHON_BIRDON, ROUTE, LANDMARK_ROUTE_57, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map SunglowCity, TILESET_NIHON_BIRDON, TOWN, LANDMARK_SUNGLOW_CITY, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map SunglowWell, TILESET_UNDERWATER, ROUTE, LANDMARK_SUNGLOW_CITY, MUSIC_MOBILE_ADAPTER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_SUNGLOW_CITY_MAPS
 
 MapGroup_BlueForest:

data/maps/scripts.asm

@@ -649,4 +649,5 @@ INCLUDE "maps/Route52.asm"
 INCLUDE "maps/RuddyTown.asm"
 INCLUDE "maps/Route57.asm"
 INCLUDE "maps/SunglowCity.asm"
-INCLUDE "maps/AventurineCity.asm"
+INCLUDE "maps/AventurineCity.asm"
+INCLUDE "maps/SunglowWell.asm"

data/tilesets/nihon_birdon_collision.asm

@@ -34,11 +34,11 @@
 	tilecoll WALL, WALL, DOOR, WALL ; 21
 	tilecoll WALL, WALL, WALL, WALL ; 22
 	tilecoll WALL, WALL, WALL, WALL ; 23
-	tilecoll WALL, WALL, WALL, WALL ; 24
+	tilecoll WALL, WALL, WALL, DIVE_DOWN ; 24
 	tilecoll WALL, WALL, WALL, WALL ; 25
 	tilecoll WALL, DOOR, FLOOR, FLOOR ; 26
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 28
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 29
 	tilecoll WALL, WALL, WALL, WALL ; 2a
 	tilecoll WALL, WALL, WALL, WALL ; 2b

data/tilesets/underwater_collision.asm

@@ -0,0 +1,32 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 02
+	tilecoll WALL, WALL, WALL, WALL ; 03
+	tilecoll DIVE_UP, DIVE_UP, DIVE_UP, DIVE_UP ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll WALL, WALL, WALL, WALL ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, DIVE_UP ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+	tilecoll WALL, WALL, WALL, WALL ; 0d
+	tilecoll WALL, WALL, WALL, WALL ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 13
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
+	tilecoll WALL, WALL, WALL, WALL ; 1b
+	tilecoll WALL, WALL, WALL, WALL ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
+	tilecoll WALL, WALL, WALL, WALL ; 1e
+	tilecoll WALL, WALL, WALL, WALL ; 1f