8 files changed, 3 insertions, 29 deletions
diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm
index f6ca177f5..6928a3a83 100644
--- a/engine/battle/ai/scoring.asm
+++ b/engine/battle/ai/scoring.asm
@@ -594,7 +594,6 @@ AI_Smart_DreamEater:
 	ret
 
 AI_Smart_EvasionUp:
-
 ; Dismiss this move if enemy's evasion can't raise anymore.
 	ld a, [wEnemyEvaLevel]
 	cp $d
@@ -725,7 +724,6 @@ AI_Smart_AlwaysHit:
 	ret
 
 AI_Smart_MirrorMove:
-
 ; If the player did not use any move last turn...
 	ld a, [wLastPlayerCounterMove]
 	and a
@@ -767,7 +765,6 @@ AI_Smart_MirrorMove:
 	ret
 
 AI_Smart_AccuracyDown:
-
 ; If player's HP is full...
 	call AICheckPlayerMaxHP
 	jr nc, .asm_389a0
@@ -872,7 +869,6 @@ AI_Smart_AccuracyDown:
 	ret
 
 AI_Smart_ResetStats:
-
 ; 85% chance to encourage this move if any of enemy's stat levels is lower than -2.
 	push hl
 	ld hl, wEnemyAtkLevel
@@ -1090,7 +1086,6 @@ AI_Smart_Unused2B:
 	ret
 
 AI_Smart_Confuse:
-
 ; 90% chance to discourage this move if player's HP is between 25% and 50%.
 	call AICheckPlayerHalfHP
 	ret c
@@ -1107,7 +1102,6 @@ AI_Smart_Confuse:
 	ret
 
 AI_Smart_SpDefenseUp2:
-
 ; Discourage this move if enemy's HP is lower than 50%.
 	call AICheckEnemyHalfHP
 	jr nc, .asm_38b10
@@ -1167,7 +1161,6 @@ AI_Smart_SuperFang:
 	ret
 
 AI_Smart_Paralyze:
-
 ; 50% chance to discourage this move if player's HP is below 25%.
 	call AICheckPlayerQuarterHP
 	jr nc, .asm_38b3a
@@ -2025,7 +2018,6 @@ AI_Smart_PerishSong:
 	ret
 
 AI_Smart_Sandstorm:
-
 ; Greatly discourage this move if the player is immune to Sandstorm damage.
 	ld a, [wBattleMonType1]
 	push hl
@@ -2207,7 +2199,6 @@ AI_Smart_Safeguard:
 
 AI_Smart_Magnitude:
 AI_Smart_Earthquake:
-
 ; Greatly encourage this move if the player is underground and the enemy is faster.
 	ld a, [wLastPlayerCounterMove]
 	cp DIG
@@ -2330,7 +2321,6 @@ AI_Smart_HiddenPower:
 	ret
 
 AI_Smart_RainDance:
-
 ; Greatly discourage this move if it would favour the player type-wise.
 ; Particularly, if the player is a Water-type.
 	ld a, [wBattleMonType1]
@@ -2352,7 +2342,6 @@ AI_Smart_RainDance:
 INCLUDE "data/battle/ai/rain_dance_moves.asm"
 
 AI_Smart_SunnyDay:
-
 ; Greatly discourage this move if it would favour the player type-wise.
 ; Particularly, if the player is a Fire-type.
 	ld a, [wBattleMonType1]
@@ -2566,7 +2555,6 @@ AI_Smart_MirrorCoat:
 
 AI_Smart_Twister:
 AI_Smart_Gust:
-
 ; Greatly encourage this move if the player is flying and the enemy is faster.
 	ld a, [wLastPlayerCounterMove]
 	cp FLY
diff --git a/engine/battle/ai/switch.asm b/engine/battle/ai/switch.asm
index 85179d2ed..b9bd2ea60 100644
--- a/engine/battle/ai/switch.asm
+++ b/engine/battle/ai/switch.asm
@@ -435,8 +435,9 @@ FindAliveEnemyMonsWithASuperEffectiveMove:
 
 	and c
 	ld c, a
-FindEnemyMonsWithASuperEffectiveMove:
+	; fallthrough
 
+FindEnemyMonsWithASuperEffectiveMove:
 	ld a, -1
 	ld [wEnemyAISwitchScore], a
 	ld hl, wOTPartyMon1Moves
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 40ba6964d..c3c7e9867 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -6036,7 +6036,6 @@ LoadEnemyMon:
 	jp .Happiness
 
 .InitDVs:
-
 ; Trainer DVs
 
 ; All trainers have preset DVs, determined by class
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index 35e94ee2d..3e6d928d2 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -68,7 +68,6 @@ DoMove:
 	ld [wBattleScriptBufferAddress + 1], a
 
 .ReadMoveEffectCommand:
-
 ; ld a, [wBattleScriptBufferAddress++]
 	ld a, [wBattleScriptBufferAddress]
 	ld l, a
@@ -136,7 +135,6 @@ BattleCommand_CheckTurn:
 	jp nz, CheckEnemyTurn
 
 CheckPlayerTurn:
-
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_RECHARGE, [hl]
 	jr z, .no_recharge
@@ -366,7 +364,6 @@ OpponentCantMove:
 	jp BattleCommand_SwitchTurn
 
 CheckEnemyTurn:
-
 	ld hl, wEnemySubStatus4
 	bit SUBSTATUS_RECHARGE, [hl]
 	jr z, .no_recharge
@@ -589,7 +586,6 @@ EndTurn:
 	jp ResetDamage
 
 MoveDisabled:
-
 	; Make sure any charged moves fail
 	ld a, BATTLE_VARS_SUBSTATUS3
 	call GetBattleVarAddr
@@ -604,7 +600,6 @@ MoveDisabled:
 	jp StdBattleTextBox
 
 HitConfusion:
-
 	ld hl, HurtItselfText
 	call StdBattleTextBox
 
@@ -811,7 +806,6 @@ BattleCommand_CheckObedience:
 	jp .EndDisobedience
 
 .UseInstead:
-
 ; Can't use another move if the monster only has one!
 	ld a, [wBattleMonMoves + 1]
 	and a
@@ -919,7 +913,6 @@ BattleCommand_CheckObedience:
 	jp EndMoveEffect
 
 IgnoreSleepOnly:
-
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 
@@ -952,7 +945,6 @@ BattleCommand_UsedMoveText:
 	ret
 
 CheckUserIsCharging:
-
 	ld a, [hBattleTurn]
 	and a
 	ld a, [wPlayerCharging] ; player
@@ -1775,7 +1767,6 @@ BattleCommand_CheckHit:
 	ret
 
 .StatModifiers:
-
 	ld a, [hBattleTurn]
 	and a
 
@@ -3066,8 +3057,8 @@ BattleCommand_DamageCalc:
 	ld [hDivisor], a
 	ld b, 4
 	call Divide
-.DoneItem:
 
+.DoneItem:
 ; Critical hits
 	call .CriticalMultiplier
 
@@ -3583,7 +3574,6 @@ DoSubstituteDamage:
 	jp ResetDamage
 
 UpdateMoveData:
-
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVarAddr
 	ld d, h
diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm
index 74b942743..48062f643 100644
--- a/engine/battle/misc.asm
+++ b/engine/battle/misc.asm
@@ -50,7 +50,6 @@ GetPlayerBackpicCoords:
 	ret
 
 DoWeatherModifiers:
-
 	ld de, WeatherTypeModifiers
 	ld a, [wBattleWeather]
 	ld b, a
diff --git a/engine/battle/move_effects/baton_pass.asm b/engine/battle/move_effects/baton_pass.asm
index cdb4bb75f..5d9f19838 100644
--- a/engine/battle/move_effects/baton_pass.asm
+++ b/engine/battle/move_effects/baton_pass.asm
@@ -45,7 +45,6 @@ BattleCommand_BatonPass:
 	ret
 
 .Enemy:
-
 ; Wildmons don't have anything to switch to
 	ld a, [wBattleMode]
 	dec a ; WILDMON
diff --git a/engine/battle/move_effects/fury_cutter.asm b/engine/battle/move_effects/fury_cutter.asm
index 8d6a5597b..6aa6b7838 100644
--- a/engine/battle/move_effects/fury_cutter.asm
+++ b/engine/battle/move_effects/fury_cutter.asm
@@ -39,7 +39,6 @@ BattleCommand_FuryCutter:
 	ret
 
 ResetFuryCutterCount:
-
 	push hl
 
 	ld hl, wPlayerFuryCutterCount
diff --git a/engine/battle/move_effects/protect.asm b/engine/battle/move_effects/protect.asm
index 92652109d..9025d2f4b 100644
--- a/engine/battle/move_effects/protect.asm
+++ b/engine/battle/move_effects/protect.asm
@@ -13,7 +13,6 @@ BattleCommand_Protect:
 	jp StdBattleTextBox
 
 ProtectChance:
-
 	ld de, wPlayerProtectCount
 	ld a, [hBattleTurn]
 	and a