diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm
index 5cf350a0a..45f9c7076 100644
--- a/engine/overworld/map_setup.asm
+++ b/engine/overworld/map_setup.asm
@@ -178,13 +178,13 @@ CheckReplaceKrisSprite:
 	jr z, .surfing
 	call GetMapEnvironment
 	cp INDOOR
-	jr z, .checkbiking
+	jr z, .no_biking
 	cp ENVIRONMENT_5
-	jr z, .checkbiking
+	jr z, .no_biking
 	cp DUNGEON
-	jr z, .checkbiking
+	jr z, .no_biking
 	jr .nope
-.checkbiking
+.no_biking
 	ld a, [wPlayerState]
 	cp PLAYER_BIKE
 	jr nz, .nope
@@ -200,18 +200,19 @@ CheckReplaceKrisSprite:
 
 .CheckSurfing:
 	call CheckOnWater
-	jr nz, .ret_nc
+	jr nz, .nope2
 	ld a, [wPlayerState]
 	cp PLAYER_SURF
-	jr z, ._surfing
+	jr z, .is_surfing
 	cp PLAYER_SURF_PIKA
-	jr z, ._surfing
+	jr z, .is_surfing
 	ld a, PLAYER_SURF
 	ld [wPlayerState], a
-._surfing
+.is_surfing
 	scf
 	ret
-.ret_nc
+
+.nope2
 	and a
 	ret
 
diff --git a/home/map.asm b/home/map.asm
index 9e0c12e00..b7fdb55b8 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -369,6 +369,7 @@ CheckIndoorMap::
 	ret
 
 ; unused
+UnreferencedCheckEnvironment::
 	cp INDOOR
 	ret z
 	cp GATE