From 846ad798cf33e5457a289f61572e307e51089ddf Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Sat, 19 Nov 2022 10:06:37 -0800
Subject: [PATCH] Fix conflict between hammer-on-B code with bunny-pressing-A
 code

---
 LTTP_RND_GeneralBugfixes.asm | 4 ----
 hooks.asm                    | 6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 0f582b0..7a0033d 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -823,7 +823,3 @@ Sprite_GetEmptyBottleIndex: ; this is totally in sprite_bees.asm
 org $1EF4E7
 Sprite_PlayerCantPassThrough:
 ;================================================================================
-
-org $07FFF4
-Link_UseHammerLong:
-JSR Link_UseHammer : RTL
diff --git a/hooks.asm b/hooks.asm
index 56410b3..4703d0f 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2955,6 +2955,11 @@ NOP #48
 skip 11
 .bee_valid_target
 ;--------------------------------------------------------------------------------
+org $07F88C ; free rom from F877 - F88F; the starting part of this is used in quadrant glitch fix below, however.
+Link_UseHammerLong:
+JSR Link_UseHammer : RTL
+warnpc $07F890
+;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Variable Ganon Vulnerability
@@ -2993,6 +2998,7 @@ SwordSpinQuadrantFix:
 	JMP.w $07E8D9 ; HandleIndoorCameraAndDoors
 
 ++	RTS
+warnpc $07F88C ; hammer-on-B hook uses the end of this free rom section
 
 ;================================================================================