alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge branch 'DRUnstable' into DRVolatile

Browse Source
This commit is contained in:
aerinon
2022-04-13 13:32:31 -06:00
parent 281beeeb58 4239e7204e
commit d116249412
12 changed files with 643 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
menu/overworldmap.asm
View File

@@ -239,7 +239,7 @@ PHX
CLC : BRA .done
.checkAga2
LDA $7EF2DB : AND #$20 : BNE .fail
LDA $7EF01B : AND #$80 : BNE .fail
CLC : BRA .done
.fail
@@ -254,7 +254,9 @@ RTS
OverworldMap_CheckForCompass:
LDA.l CompassMode : AND #$80 : BEQ .unset ; should I check for compass logic
LDA.l CompassMode : AND #$40 : BEQ .set ; compasses aren't shuffled
LDA.l CompassExists, X : BEQ .set ; compass doesn't exits
LDA.l CompassMode : AND #$20 : BNE +
JSR OverworldMap_CheckForMap : BCC .unset : BRA .set
+ LDA.l CompassExists, X : BEQ .set ; compass doesn't exits
PHX
LDA.l MC_SRAM_Offsets, X : TAX ; put compass offset into X
LDA !INVENTORY_COMPASS, X : ORA !MAP_OVERLAY, X