From 9c3d85e360c7716f5cf2b6fbbf3808d589d0c205 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Mon, 13 Dec 2021 23:16:29 -0600
Subject: [PATCH] Improvement to FF damage fix to insta-warp Link to
 destination once Link has exceeded the bounds of the current screen

---
 flipperkill.asm | 19 ++++++++++++++++++-
 hooks.asm       |  3 +++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/flipperkill.asm b/flipperkill.asm
index 6f8c420..67b84be 100644
--- a/flipperkill.asm
+++ b/flipperkill.asm
@@ -134,4 +134,21 @@ protectff:
 
 .spow
 	db $80, $81, $81, $FF, $FF, $FF, $FF, $FF
-	db $FF, $81, $81, $FF, $FF, $FF, $FF, $FF
\ No newline at end of file
+	db $FF, $81, $81, $FF, $FF, $FF, $FF, $FF
+
+FlipperScrollWarp:
+	STZ $00 : STZ $02 ; what we wrote over
+	LDA $308358 : BEQ .checkX : RTL
+	.checkX
+		LDA $22 : CMP.w $0604 : BCC +
+		CMP.w $0616 : BCS +
+		BRA .checkY
+		+ LDA $7EC186
+		STA $22
+	.checkY
+		LDA $20 : CMP.w $0600 : BCC +
+		CMP.w $0612 : BCS +
+			RTL
+		+ LDA $7EC184
+		STA $20
+RTL
\ No newline at end of file
diff --git a/hooks.asm b/hooks.asm
index 7155833..3064e4a 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2328,6 +2328,9 @@ FakeFlipperProtection:
 	JSL protectff
 	RTS
 ;--------------------------------------------------------------------------------
+org $02B46C ; <- bank_02.asm:9722 (STZ.b $00 : STZ.b $02)
+JSL FlipperScrollWarp
+;--------------------------------------------------------------------------------
 ;org $078F27 ; <- 38F27
 ;JSL.l FlipperReset
 ;--------------------------------------------------------------------------------