dungeon prizes

This commit is contained in:
spannerisms
2021-07-03 09:06:17 -04:00
parent f403ca10da
commit bdd16bc20f
3 changed files with 50 additions and 9 deletions

View File

@@ -17,7 +17,7 @@ DrawDungeonCompassCounts:
LDX $040C : CPX.b #$FF : BEQ .done ; Skip if not in a dungeon LDX $040C : CPX.b #$FF : BEQ .done ; Skip if not in a dungeon
CMP.w #$0002 : BEQ ++ ; if CompassMode==2, we don't check for the compass CMP.w #$0002 : BEQ ++ ; if CompassMode==2, we don't check for the compass
LDA $7EF364 : AND.l .item_masks, X ; Load compass values to A, mask with dungeon item masks LDA $7EF364 : AND.l DungeonItemMasks, X ; Load compass values to A, mask with dungeon item masks
BEQ .done ; skip if we don't have compass BEQ .done ; skip if we don't have compass
++ ++
@@ -35,7 +35,7 @@ DrawDungeonCompassCounts:
.done .done
RTL RTL
.item_masks ; these are dungeon correlations to $7EF364 - $7EF369 so it knows where to store compasses, etc DungeonItemMasks: ; these are dungeon correlations to $7EF364 - $7EF369 so it knows where to store compasses, etc
dw $8000, $4000, $2000, $1000, $0800, $0400, $0200, $0100 dw $8000, $4000, $2000, $1000, $0800, $0400, $0200, $0100
dw $0080, $0040, $0020, $0010, $0008, $0004 dw $0080, $0040, $0020, $0010, $0008, $0004

View File

@@ -107,15 +107,14 @@ DoDungeonMapBossIcon:
LDX.b #$02 LDX.b #$02
STX.w $420B STX.w $420B
STA.w $4315
LDA.w #$A260>>1 LDA.w #$A260>>1
STA.w $2116 STA.w $2116
LDA.w #$0040
STA.w $4315
STX.w $420B STX.w $420B
; done ; done
SEP #$32 SEP #$30
RTL RTL
.boss_id .boss_id

View File

@@ -134,6 +134,48 @@ SEP #$30
;--------------------------------------------------------------------------------
; Draw pendant/crystal icon
;--------------------------------------------------------------------------------
!PRIZE_ICON = $7EC742
!P_ICON = $296C
!C_ICON = $295F
SEP #$20
LDA.b $1B : BEQ .noprize
LDX.w $040C : BMI .noprize
REP #$20
LDA.l MapMode
BEQ .drawprize
LDA.l $7EF368
AND.l DungeonItemMasks,X
BEQ .doneprize
.drawprize
LDA.l CrystalPendantFlags_2, X
AND.w #$0040 : BNE .is_crystal
LDA.w #!P_ICON
BRA .doneprize
.is_crystal
LDA.w #!C_ICON
BRA .doneprize
.noprize
REP #$20
LDA.w #$207F
.doneprize
STA.l !PRIZE_ICON
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; Draw Magic Meter ; Draw Magic Meter
!INFINITE_MAGIC = "$7F50CA" !INFINITE_MAGIC = "$7F50CA"