revert 093bda0

engine/overworld/events.asm

@@ -1143,22 +1143,13 @@ TryTileCollisionEvent::
 .headbutt
 	ld a, [wFacingTileID]
 	call CheckHeadbuttTreeTile
-	jr nz, .strong_arm
+	jr nz, .surf
 	farcall TryHeadbuttOW
 	jr c, .done
 	jr .noevent
 
-.strong_arm
-	ld a, [wFacingTileID]
-	call CheckRockyWallTile
-	jr nz, .surf
-	farcall TryStrongArmOW
-	jr .done
-
 .surf
 	farcall TrySurfOW
-	jr c, .done
-	farcall TryWaterSportOW
 	jr nc, .noevent
 	jr .done
 

engine/overworld/map_setup.asm

@@ -98,8 +98,6 @@ CheckUpdatePlayerSprite:
 	jr c, .ok
 	call .CheckSurfing
 	jr c, .ok
-	call .CheckDiving
-	jr c, .ok
 	call .CheckSurfing2
 	jr c, .ok
 	ret
@@ -118,18 +116,6 @@ CheckUpdatePlayerSprite:
 	scf
 	ret
 
-.CheckDiving:
-	ld a, [wMapTileset]
-	cp TILESET_UNDERWATER
-	jr nz, .not_underwater
-	ld a, PLAYER_WATER_SPORT
-	ld [wPlayerState], a
-	scf
-	ret
-.not_underwater
-	and a
-	ret
-
 .CheckSurfing2:
 	ld a, [wPlayerState]
 	cp PLAYER_NORMAL

engine/overworld/player_movement.asm

@@ -33,8 +33,6 @@ DoPlayerMovement::
 	ld a, [wPlayerState]
 	cp PLAYER_NORMAL
 	jr z, .Normal
-	cp PLAYER_WATER_SPORT
-	jr z, .Normal
 	cp PLAYER_SURF
 	jr z, .Surf
 	cp PLAYER_SURF_PIKA

engine/overworld/scripting.asm

@@ -237,8 +237,6 @@ ScriptCommandTable:
 	dw Script_trainerpic				 ; aa
 	dw Script_loadmonindex               ; ab
 	dw Script_checkmaplockedmons         ; ac
-	dw Script_divemap
-	dw Script_divewarp
 	assert_table_length NUM_EVENT_COMMANDS
 
 StartScript:
@@ -2416,38 +2414,3 @@ LoadScriptPokemonID:
 	jp nz, GetPokemonIDFromIndex
 	ld a, [wScriptVar]
 	ret
-
-Script_divemap:
-	call GetScriptByte
-	ld [wDiveMapGroup], a
-	call GetScriptByte
-	ld [wDiveMapNumber], a
-	call GetScriptByte
-	ld [wDiveDeltaX], a
-	call GetScriptByte
-	ld [wDiveDeltaY], a
-	ret
-
-Script_divewarp:
-	ld a, [wDiveMapGroup]
-	ld [wMapGroup], a
-	ld a, [wDiveMapNumber]
-	ld [wMapNumber], a
-	ld a, [wXCoord]
-	ld b, a
-	ld a, [wDiveDeltaX]
-	add b
-	ld [wXCoord], a
-	ld a, [wYCoord]
-	ld b, a
-	ld a, [wDiveDeltaY]
-	add b
-	ld [wYCoord], a
-	ld a, -1
-	ld [wDefaultSpawnpoint], a
-	ld a, MAPSETUP_WARP
-	ld [hMapEntryMethod], a
-	ld a, 1
-	call LoadMapStatus
-	call StopScript
-	ret

engine/overworld/tile_events.asm

@@ -64,7 +64,6 @@ CheckGrassCollision::
 	db COLL_LONG_GRASS
 	db COLL_CUT_28
 	db COLL_WATER
-	db COLL_DIVE_DOWN
 	db COLL_GRASS_48
 	db COLL_GRASS_49
 	db COLL_GRASS_4A

engine/overworld/warp_connection.asm

@@ -4,7 +4,6 @@ HandleNewMap:
 	call ResetFlashIfOutOfCave
 	call GetCurrentMapSceneID
 	call ResetBikeFlags
-	call ResetDiveMap
 	call ResetMapLockedIDs
 	ld a, MAPCALLBACK_NEWMAP
 	call RunMapCallback