alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into overworld_kara

Browse Source
This commit is contained in:
Kara Alexandra
2021-08-02 19:00:13 -07:00
parent 07f0ee9962 39441eb0a6
commit f14fea3699
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bugfixes.asm
View File

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

6
events.asm
View File

@@ -37,7 +37,7 @@ RTL
OnDungeonExit: OnDungeonExit:
PHA : PHP PHA : PHP
SEP #$20 ; set 8-bit accumulator SEP #$20 ; set 8-bit accumulator
JSL.l PodEGFix JSL.l SQEGFix
PLP : PLA PLP : PLA
STA $040C : STZ $04AC ; thing we wrote over STA $040C : STZ $04AC ; thing we wrote over
@@ -50,8 +50,8 @@ OnDungeonExit:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnQuit: 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 LDA.b #$10 : STA $1C ; thing we wrote over
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

1
stats.asm
View File

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