diff --git a/bugfixes.asm b/bugfixes.asm index f3ba207..951a85c 100644 --- a/bugfixes.asm +++ b/bugfixes.asm @@ -127,10 +127,9 @@ RTL ;-------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------- -;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 diff --git a/events.asm b/events.asm index 056ec02..afaaaad 100644 --- a/events.asm +++ b/events.asm @@ -37,7 +37,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 @@ -50,8 +50,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 ;-------------------------------------------------------------------------------- diff --git a/stats.asm b/stats.asm index 3a9e6a5..dab1e48 100644 --- a/stats.asm +++ b/stats.asm @@ -460,6 +460,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