From df66369f1744dd3717a589bb454ebab7d517695d Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Thu, 29 Jul 2021 09:43:08 -0400 Subject: [PATCH 1/2] hopefully fix that text bug --- events.asm | 2 +- stats.asm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/events.asm b/events.asm index e843d2a..e284140 100644 --- a/events.asm +++ b/events.asm @@ -50,7 +50,7 @@ RTL ;-------------------------------------------------------------------------------- OnQuit: JSL.l PodEGFix - + 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 e73dd80..40df03a 100644 --- a/stats.asm +++ b/stats.asm @@ -438,6 +438,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 From 187c2aa4a26604253f37435b5eee7771fa1682df Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Thu, 29 Jul 2021 09:44:21 -0400 Subject: [PATCH 2/2] always fix --- bugfixes.asm | 5 ++--- events.asm | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bugfixes.asm b/bugfixes.asm index 1ca6cb6..0d5117f 100644 --- a/bugfixes.asm +++ b/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 diff --git a/events.asm b/events.asm index e284140..b5947ce 100644 --- a/events.asm +++ b/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,7 +49,7 @@ 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