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

Merge remote-tracking branch 'upstream/DRUnstable' into OWMain

Browse Source
This commit is contained in:
codemann8
2022-04-21 13:11:31 -05:00
parent 405edc51b5 a017c98c4e
commit a26b128b52
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hooks.asm
View File

@@ -1842,7 +1842,7 @@ LDA CrystalPendantFlags_2, X
;JSL.l OverworldMap_CheckObject : RTS
;================================================================================
org $0AC53e ; <- 5453E - Bank0A.asm:1771 - (LDA $0AC50D, X : STA $0D)
LDA.l CrystalNumberTable, X
LDA.l CrystalNumberTable-1, X
;================================================================================
; EVERY INSTANCE OF STA $7EF3C7 IN THE ENTIRE CODEBASE
org $029D51 ; <- 11D51

2
menu/overworldmap.asm
View File

@@ -181,7 +181,7 @@ LDX.b #$FF
.continue
STA.b $0B
PLX : PHX
JSR WorldMap_HandleSpriteBlink
INX : JSR WorldMap_HandleSpriteBlink
.skip_draw
; end of loop
PLX : CPX #12 : BCS + : JMP .loopStart : +