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

Merged in DR v1.4.1.9

Browse Source
This commit is contained in:
codemann8
2024-03-30 04:30:56 -05:00
parent 9178309286 f25c9dd4c4
commit 9cfeb18fef
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doorrando/hudadditions.asm
View File

@@ -55,9 +55,8 @@ DRHUD_BossIndicator:
DRHUD_EnemyDropIndicator: DRHUD_EnemyDropIndicator:
REP #$30 REP #$30
LDA.l DRFlags : BIT.w #$0800 : BEQ +
LDA.w EnemyDropIndicator : STA.w HUDMultiIndicator LDA.w EnemyDropIndicator : STA.w HUDMultiIndicator
+ SEP #$20 SEP #$20
LDA.w DungeonID : CMP.b #$1B : BCS DRHUD_Finished LDA.w DungeonID : CMP.b #$1B : BCS DRHUD_Finished
SEP #$10 : TAX : REP #$10 SEP #$10 : TAX : REP #$10

13
keydrop/standing_items.asm
View File

@@ -347,16 +347,19 @@ SetupEnemyDropIndicator:
REP #$20 REP #$20
LDA.w #!BlankTile : STA.w EnemyDropIndicator LDA.w #!BlankTile : STA.w EnemyDropIndicator
LDX.b IndoorsFlag : BEQ .done LDX.b IndoorsFlag : BEQ .done
LDA.l DRFlags : BIT.w #$0800 : BEQ .done
; Skipping the compass checks, could make this a toggle later?
; do we have a flag for enemy drops on? could check it here ; do we have a flag for enemy drops on? could check it here
LDA.w DungeonID : AND.w #$00FF : CMP.w #$00FF : BEQ .skipCompassChecks ; LDA.w DungeonID : AND.w #$00FF : CMP.w #$00FF : BEQ .skipCompassChecks
; compass checks ; compass checks
; does compass for dungeon exist? ; does compass for dungeon exist?
LSR : TAX : LDA.l ExistsTransfer, X : TAX : LDA.l CompassExists, X : BEQ .skipCompassChecks ; LSR : TAX : LDA.l ExistsTransfer, X : TAX : LDA.l CompassExists, X : BEQ .skipCompassChecks
; do we have the compass ; do we have the compass
; todo: sewers? ; sewers? outstanding?
LDA.l CompassField : LDX.w DungeonID : AND.l DungeonMask, X : BEQ .done ; LDA.l CompassField : LDX.w DungeonID : AND.l DungeonMask, X : BEQ .done
.skipCompassChecks ;.skipCompassChecks
; either we're in a cave ($040C: $FF), compass doesn't exist, or we have the compass ; either we're in a cave ($040C: $FF), compass doesn't exist, or we have the compass
; check if there are enemy drops ; check if there are enemy drops
LDA.b Scrap02 : PHA : REP #$10 ; store 02/03 for later LDA.b Scrap02 : PHA : REP #$10 ; store 02/03 for later