From ecbeec32026368e78f70dd576dd31fa905c6bba7 Mon Sep 17 00:00:00 2001
From: IIMarckus <iimarckus@gmail.com>
Date: Thu, 29 Dec 2011 18:16:50 -0700
Subject: Flinch check.

hg-commit-id: e6166d4407ef
---
 pokered.asm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 66bcdd5b..f0008596 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -10303,13 +10303,23 @@ Function5854: ; 5854
 .HeldInPlaceCheck\@
 	ld a,[W_CURMONBATTSTATUS]
 	bit 5,a
-	jp z,$58AC
+	jp z,FlinchedCheck
 	ld hl,CantMoveText
 	call PrintText
 	ld hl,Function580A
 	jp $5A37
 
-INCBIN "baserom.gbc",$3D8AC,$3DA3D - $3D8AC
+FlinchedCheck: ; 58AC
+	ld hl,$D062
+	bit 3,[hl]
+	jp z,$58C2
+	res 3,[hl]
+	ld hl,FlinchedText
+	call PrintText
+	ld hl,Function580A
+	jp $5A37
+
+INCBIN "baserom.gbc",$3D8C2,$3DA3D - $3D8C2
 
 FastAsleepText:
 	TX_FAR _FastAsleepText
-- 
cgit v1.2.3