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

Merge branch 'DRUnstable' into DRVolatile

Browse Source
This commit is contained in:
aerinon
2022-04-20 13:56:31 -06:00
parent e8f06f2da6 a017c98c4e
commit 4b68406be0
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hooks.asm
View File

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

7
menu/overworldmap.asm
View File

@@ -159,6 +159,7 @@ LDX.b #$FF
LDA.l WorldMapIcon_posy_located+1, X : STA.l $7EC109 LDA.l WorldMapIcon_posy_located+1, X : STA.l $7EC109
LDA.l WorldMapIcon_posy_located, X : STA.l $7EC108 LDA.l WorldMapIcon_posy_located, X : STA.l $7EC108
.adjustment .adjustment
LDA.l WorldMapIcon_tile, X : CMP #$FF : BEQ .skip_draw
LDA.l WorldMapIcon_tile+1, X : BEQ .dont_adjust LDA.l WorldMapIcon_tile+1, X : BEQ .dont_adjust
CMP.b #$64 : BEQ .is_crystal CMP.b #$64 : BEQ .is_crystal
LDA.b $1A : AND.b #$10 : BNE .skip_draw LDA.b $1A : AND.b #$10 : BNE .skip_draw
@@ -180,7 +181,7 @@ LDX.b #$FF
.continue .continue
STA.b $0B STA.b $0B
PLX : PHX PLX : PHX
JSR WorldMap_HandleSpriteBlink INX : JSR WorldMap_HandleSpriteBlink
.skip_draw .skip_draw
; end of loop ; end of loop
PLX : CPX #12 : BCS + : JMP .loopStart : + PLX : CPX #12 : BCS + : JMP .loopStart : +
@@ -253,10 +254,10 @@ RTS
; SEC - yep indicator can move ; SEC - yep indicator can move
OverworldMap_CheckForCompass: OverworldMap_CheckForCompass:
LDA.l CompassMode : AND #$80 : BEQ .unset ; should I check for compass logic 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 CompassMode : AND #$40 : BEQ .set ; compasses/maps aren't shuffled
LDA.l CompassMode : AND #$20 : BNE + LDA.l CompassMode : AND #$20 : BNE +
JSR OverworldMap_CheckForMap : BCC .unset : BRA .set JSR OverworldMap_CheckForMap : BCC .unset : BRA .set
+ LDA.l CompassExists, X : BEQ .set ; compass doesn't exits + LDA.l CompassExists, X : BEQ .set ; compass doesn't exist
PHX PHX
LDA.l MC_SRAM_Offsets, X : TAX ; put compass offset into X LDA.l MC_SRAM_Offsets, X : TAX ; put compass offset into X
LDA !INVENTORY_COMPASS, X : ORA !MAP_OVERLAY, X LDA !INVENTORY_COMPASS, X : ORA !MAP_OVERLAY, X