jingle jangle

2021-08-11 06:30:52 -04:00
parent 910d63e886
commit 03c287a988
3 changed files with 26 additions and 4 deletions
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -199,3 +199,18 @@ LDA $1B : BNE +
 		LDA $8C : CMP.b #$97
 +
 RTL
+
+;--------------------------------------------------------------------------------
+FixJingleGlitch:
+	LDA.b $11
+	BEQ .set_doors
+
+	LDA.l AllowAccidentalMajorGlitch
+	BEQ .exit
+
+.set_doors
+	LDA.b #$05
+	STA.b $11
+
+.exit
+	RTL
--- a/hooks.asm
+++ b/hooks.asm
@@ -2733,8 +2733,15 @@ org $07A879

 org $07F877 ; free rom
 SwordSpinQuadrantFix:
-	LDA.l AllowQuadrantGlitch
+	LDA.l AllowAccidentalMajorGlitch
 	BEQ ++
 	JMP.w $07E8D9 ; HandleIndoorCameraAndDoors

 ++	RTS
+
+;================================================================================
+
+org $01C4B8 : JSL FixJingleGlitch
+org $01C536 : JSL FixJingleGlitch
+org $01C592 : JSL FixJingleGlitch
+org $01C65F : JSL FixJingleGlitch
--- a/tables.asm
+++ b/tables.asm
@@ -1083,11 +1083,11 @@ org $308350 ; PC 0x180350
 ShouldStartatExit:
 db $00, $00, $00
 ;--------------------------------------------------------------------------------
-; $308358 (0x180358) fixes quadrant glitch
+; $308358 (0x180358) fixes major glitches
 ; 0x00 - fix
-; otherwise dont fix quadrant glitch
+; otherwise dont fix various major glitches
 org $308358
-AllowQuadrantGlitch:
+AllowAccidentalMajorGlitch:
 db $00
 ;================================================================================
 ; 0x180359 - 0x1814FF (unused)