Fix some moves always missing

lwelyk · Jul 22, 2016 · effb1e6 · effb1e6
1 parent 94450ee
commit effb1e6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
@@ -1781,6 +1781,8 @@ BattleCommand_CheckHit: ; 34d32
 
 .Substitute:
 ; Return nz if the opponent is behind a Substitute for certain moves
+	call CheckSubstituteOpp
+	jr z, .not_blocked
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 	cp SWAGGER
@@ -1789,6 +1791,7 @@ BattleCommand_CheckHit: ; 34d32
 	call GetBattleVar
 	cp EFFECT_TRAP
 	jr z, .blocked
+.not_blocked
 	xor a
 	and a
 	ret