Merge branch 'main' into kara

This commit is contained in:
2021-07-08 19:26:55 -07:00

View File

@@ -145,9 +145,10 @@ SEP #$30
SEP #$20 SEP #$20
LDA.b $1B : BEQ .noprize LDA.b $1B : BEQ .noprize
LDX.w $040C
CPX #$1A : !BGE .noprize
LDX.w $040C : BMI .noprize CPX #$04 : !BLT .noprize
CPX #$08 : BEQ .noprize
REP #$20 REP #$20
@@ -156,9 +157,10 @@ SEP #$30
LDA.l $7EF368 LDA.l $7EF368
AND.l DungeonItemMasks,X AND.l DungeonItemMasks,X
BEQ .doneprize BEQ .noprize
.drawprize .drawprize
TXA : LSR : TAX
LDA.l CrystalPendantFlags_2, X LDA.l CrystalPendantFlags_2, X
AND.w #$0040 : BNE .is_crystal AND.w #$0040 : BNE .is_crystal