diff --git a/events.asm b/events.asm index 9751046..913818f 100644 --- a/events.asm +++ b/events.asm @@ -198,8 +198,17 @@ RTL ;-------------------------------------------------------------------------------- OnLinkDamagedFromPit: JSL.l OHKOTimer - LDA.b #$14 : STA $11 ; thing we wrote over -RTL + + LDA.l AllowAccidentalMajorGlitch + BEQ ++ +-- LDA.b #$14 : STA $11 ; thing we wrote over + + RTL + +++ LDA.b $10 : CMP.b #$12 : BNE -- + + STZ.b $11 + RTL ;-------------------------------------------------------------------------------- OnLinkDamagedFromPitOutdoors: JML.l OHKOTimer ; make sure this is last diff --git a/hooks.asm b/hooks.asm index 356ddf3..7ffc693 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2790,19 +2790,6 @@ 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 AllowAccidentalMajorGlitch - BEQ ++ - JMP.w $07E8D9 ; HandleIndoorCameraAndDoors - -++ RTS - ;================================================================================ org $01C4B8 : JSL FixJingleGlitch