diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 9fd1de3..815e6d4 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -1,7 +1,6 @@
 ;================================================================================
 ; The Legend of Zelda, A Link to the Past - Randomizer General Development & Bugfixes
 ;================================================================================
-
 lorom
 
 ;================================================================================
diff --git a/hooks.asm b/hooks.asm
index 26b7304..e4eff96 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -1013,6 +1013,9 @@ JSL.l CheckTabletSword
 org $05F40A ; <- 2F40A - sprite_medallion_tablet.asm:303 (LDA $7EF359 : BMI .show_hylian_script)
 JSL.l CheckTabletSword
 ;--------------------------------------------------------------------------------
+org $1DF086 ; <- EF086 - sprite_evil_barrier.asm:303 (LDA $7EF359 : CMP.b #$02 : BCS .anozap_from_player_attack)
+JSL.l GetSwordLevelForEvilBarrier
+;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Medallion Tablets
diff --git a/swordswap.asm b/swordswap.asm
index e7af5f6..5bb0cc3 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -122,6 +122,13 @@ CheckTabletSword:
 	LDA $7EF359 ; get actual sword value
 RTL
 ;================================================================================
+GetSwordLevelForEvilBarrier:
+	LDA.l AllowHammerEvilBarrierWithFighterSword : BEQ +
+	LDA #$FF : RTL
+	+
+	LDA $7EF359
+RTL
+;================================================================================
 CheckGanonHammerDamage:
 	LDA.l HammerableGanon : BEQ +
 	LDA $0E20, X : CMP.b #$D8 ; original behavior except ganon
diff --git a/tables.asm b/tables.asm
index 475b507..0aa5408 100644
--- a/tables.asm
+++ b/tables.asm
@@ -178,6 +178,10 @@ org $308044 ; PC 0x180044
 AllowHammerTablets:
 db #$00 ; #$00 = Off (default) - #$01 = On
 ;--------------------------------------------------------------------------------
+org $30805D ; PC 0x18005D
+AllowHammerEvilBarrierWithFighterSword:
+db #$00 ; #$00 = Off (default) - #$01 = On
+;--------------------------------------------------------------------------------
 org $308045 ; PC 0x180045
 HUDDungeonItems:
 db #$00 ; display ----dcba a: Small Keys, b: Big Key, c: Map, d: Compass
@@ -251,7 +255,7 @@ CrystalPendantFlags_2:
 ;Pendant: $00
 ;Crystal: $40
 ;--------------------------------------------------------------------------------
-; 0x18005D - 0x18005F (unused)
+; 0x18005E - 0x18005F (unused)
 ;--------------------------------------------------------------------------------
 org $308060 ; PC 0x180060 - 0x18007E
 ProgrammableItemLogicJump_1: