Merge branch 'main' into kara

bugfixes.asm

@@ -127,10 +127,9 @@ RTS
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------
-;Fix for PoD causing accidental Exploration Glitch
-PodEGFix:
+;Fix for SQ jumping causing accidental Exploration Glitch
+SQEGFix:
     LDA Bugfix_PodEG : BNE .done
-    LDA $040C : CMP.b #$0C : BNE .done ;check if we are in PoD
         STZ $047A ;disarm exploration glitch
     .done
 RTL

events.asm

@@ -36,7 +36,7 @@ RTL
 OnDungeonExit:
 	PHA : PHP
 		SEP #$20 ; set 8-bit accumulator
-		JSL.l PodEGFix
+		JSL.l SQEGFix
 	PLP : PLA
 
 	STA $040C : STZ $04AC ; thing we wrote over
@@ -49,8 +49,8 @@ OnDungeonExit:
 RTL
 ;--------------------------------------------------------------------------------
 OnQuit:
-	JSL.l PodEGFix
-
+	JSL.l SQEGFix
+	LDA.b #$00 : STA $7F5035 ; bandaid patch bug with mirroring away from text
 	LDA.b #$10 : STA $1C ; thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------

stats.asm

@@ -455,6 +455,7 @@ JMP StatTransitionCounter
 !UW_MIRROR_COUNTER = "$7EF43B"
 IncrementUWMirror:
 	PHA
+		LDA.b #$00 : STA $7F5035 ; bandaid patch bug with mirroring away from text
 		LDA !LOCK_STATS : BNE +
 		LDA $040C : CMP #$FF : BEQ + ; skip if we're in a cave or house
 			LDA !UW_MIRROR_COUNTER : INC : STA !UW_MIRROR_COUNTER