WE BUILD AGAIN

data/moves/animations.asm

@@ -5060,12 +5060,12 @@ BattleAnim_WaterSport:
 	anim_2gfx ANIM_GFX_SAND, ANIM_GFX_WATER
 	anim_if_param_equal $0, .hit
 	anim_if_param_equal $2, .fail
-	anim_call BattleAnim_FollowPlayerHead_0
+	anim_call BattleAnim_TargetObj_2Row
 	anim_bgeffect ANIM_BG_DIG, $0, $1, $1
-	anim_obj ANIM_OBJ_DIVE_2, 72, 104, $0
+	anim_obj ANIM_OBJ_WATER_SPORT_2, 72, 104, $0
 	anim_sound 0, 0, SFX_BUBBLEBEAM
 .loop
-	anim_obj ANIM_OBJ_DIVE_1, 56, 104, $0
+	anim_obj ANIM_OBJ_WATER_SPORT_1, 56, 104, $0
 	anim_wait 16
 	anim_loop 6, .loop
 	anim_wait 32
@@ -5075,7 +5075,7 @@ BattleAnim_WaterSport:
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
 .hit
-	anim_bgeffect ANIM_BG_30, $0, $0, $0
+	anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $0, $0, $0
 	anim_sound 0, 1, SFX_HYDRO_PUMP
 	anim_obj ANIM_OBJ_HYDRO_PUMP, 124, 72, $0
 	anim_obj ANIM_OBJ_HYDRO_PUMP, 140, 72, $0

engine/battle/effect_commands.asm

@@ -6121,7 +6121,13 @@ BattleCommand_DoubleUndergroundDamage:
 	call GetBattleVar
 	bit SUBSTATUS_UNDERGROUND, a
 	ret z
+	jr DoubleDamage
 
+BattleCommand_DoubleUnderwaterDamage:
+; doubleunderwaterdamage
+	ld a, BATTLE_VARS_SUBSTATUS4_OPP
+	call GetBattleVar
+	bit SUBSTATUS_UNDERWATER, a
 	; fallthrough
 
 DoubleDamage:
@@ -6136,6 +6142,10 @@ DoubleDamage:
 	ld [hl], a
 .quit
 	ret
+	
+BattleCommand_Unused3C:
+BattleCommand_Unused5D:	; Just stuffing these here for now because I'm unsure of if I can just axe them from the effect command pointers?? Probably can but :V
+	ret
 
 INCLUDE "engine/battle/move_effects/mimic.asm"
 

engine/events/overworld.asm

@@ -2115,7 +2115,7 @@ WaterSportFunction:
 
 .FailWaterSport:
 	ld hl, CantWaterSportText
-	call MenuTextBoxBackup
+	call MenuTextboxBackup
 	ld a, $80
 	ret
 
@@ -2176,7 +2176,7 @@ CanWaterSportText:
 
 AskWaterSportScript:
 	opentext
-	copybytetovar wPlayerStandingTile
+	copybytetovar wPlayerTile
 	ifequal COLL_DIVE_UP, .up
 	writetext AskWaterSportDownText
 	jump .continue