diff --git a/data/collision/collision_permissions.asm b/data/collision/collision_permissions.asm
index b726697..a543e69 100644
--- a/data/collision/collision_permissions.asm
+++ b/data/collision/collision_permissions.asm
@@ -43,8 +43,8 @@ TileCollisionTable::
 	db WALL_TILE         ; COLL_BUOY
 	db WATER_TILE        ; COLL_CUT_28
 	db WATER_TILE        ; COLL_WATER
-	db WATERTILE | TALK  ; COLL_DIVE_DOWN
-	db LANDTILE | TALK	 ; COLL_DIVE_UP
+	db WATER_TILE | TALK  ; COLL_DIVE_DOWN
+	db LAND_TILE | TALK	 ; COLL_DIVE_UP
 	db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C
 	db WATER_TILE        ; 2d
 	db WATER_TILE        ; 2e
diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm
index 18faae1..b569961 100644
--- a/engine/battle/ai/scoring.asm
+++ b/engine/battle/ai/scoring.asm
@@ -1677,7 +1677,7 @@ AI_Smart_Surf:
 AI_Smart_Whirlpool:
 ; Greatly encourage this move if the player is underwater and the enemy is faster.
 	ld a, [wLastPlayerCounterMove]
-	cp DIVE
+	cp WATER_SPORT
 	ret nz
 	ld a, [wPlayerSubStatus4]
 	bit SUBSTATUS_UNDERWATER, a
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index de6bfb2..795466e 100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -2124,14 +2124,14 @@ CantWaterSportText:
 	db "@"
 
 CheckMapCanWaterSport:
-	ld a, [wWaterSportMapGroup]
+	ld a, [wDiveMapGroup]
 	and a
 	jr z, .failed
-	ld a, [wWaterSportMapNumber]
+	ld a, [wDiveMapNumber]
 	and a
 	jr z, .failed
-	ld a, [wPlayerStandingTile]
-	call CheckWaterSportTile
+	ld a, [wPlayerTile]
+	call CheckDiveTile
 	jr nz, .failed
 	xor a
 	ret
@@ -2146,10 +2146,10 @@ TryWaterSportOW::
 	ld de, ENGINE_CASCADEBADGE
 	call CheckEngineFlag
 	jr c, .cant
-	ld d, DIVE
+	ld d, WATER_SPORT
 	call CheckPartyMove
 	jr c, .cant
-	call GetPartyNick
+	call GetPartyNickname
 	ld a, BANK(AskWaterSportScript)
 	ld hl, AskWaterSportScript
 	call CallScript