diff --git a/hooks.asm b/hooks.asm
index 3727695..4ff7432 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2725,3 +2725,16 @@ org $0AEEF2
 
 org $008BE5 ; hijack stripes for boss GFX transfer
 	JSL DoDungeonMapBossIcon
+
+;================================================================================
+; Fix quadrant glitch
+org $07A879
+	JSR SwordSpinQuadrantFix
+
+org $07F877 ; free rom
+SwordSpinQuadrantFix:
+	LDA.l AllowQuadrantGlitch
+	BEQ ++
+	JMP.w $07E8D9 ; HandleIndoorCameraAndDoors
+
+++	RTS
diff --git a/tables.asm b/tables.asm
index d5a6a32..a7f04b4 100644
--- a/tables.asm
+++ b/tables.asm
@@ -1082,8 +1082,15 @@ db $00, $00, $00, $00, $00, $00, $00, $00
 org $308350 ; PC 0x180350
 ShouldStartatExit:
 db $00, $00, $00
+;--------------------------------------------------------------------------------
+; $308358 (0x180358) fixes quadrant glitch
+; 0x00 - fix
+; otherwise dont fix quadrant glitch
+org $308358
+AllowQuadrantGlitch:
+db $00
 ;================================================================================
-; 0x180350 - 0x1814FF (unused)
+; 0x180359 - 0x1814FF (unused)
 ;================================================================================
 ; $309500 (0x181500) - $309FFF (0x181FFF) original 0x39C bytes
 ; Replacement Ending Sequence Text Data