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

Check Aga2's boss defeat flag instead of pyramid hole

Browse Source 
New flag on compass mode to indicate maps should be used instead for showing the location
This commit is contained in:
aerinon
2022-04-13 13:30:15 -06:00
parent 57dec5651f
commit 4239e7204e
2 changed files with 6 additions and 3 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 CLC : BRA .done
.checkAga2 .checkAga2
LDA $7EF2DB : AND #$20 : BNE .fail LDA $7EF01B : AND #$80 : BNE .fail
CLC : BRA .done CLC : BRA .done
.fail .fail
@@ -254,7 +254,9 @@ RTS
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 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 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

3
tables.asm
View File

@@ -140,7 +140,8 @@ db #$00 ; #$00 = Always On (default) - #$01 = Require Map Item
CompassMode: CompassMode:
db #$00 ; #$00 = Off (default) - #$01 = Display Dungeon Count w/Compass - #$02 = Display Dungeon Count Always db #$00 ; #$00 = Off (default) - #$01 = Display Dungeon Count w/Compass - #$02 = Display Dungeon Count Always
; #$8x = Moves prize indicator to a special position if bit on ; #$8x = Moves prize indicator to a special position if bit on
; #$4x = Compasses are shuffled and must be obtained to show position if bit on ; #$4x = Compasses or Maps are shuffled and must be obtained to show position if bit on
; #$2x = Use Compass for position if bit on, otherwise use Map
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $30803D ; PC 0x18003D org $30803D ; PC 0x18003D
PersistentFloodgate: PersistentFloodgate: