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

Merge branch 'DRMain' into overworld_kara

Browse Source
This commit is contained in:
karafruit
2021-07-08 19:39:10 -07:00
parent 8b173ac27b 02e66ba9e3
commit 2c931527e9
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
events.asm
View File

@@ -57,7 +57,6 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnUncleItemGet: OnUncleItemGet:
PHA PHA
LDA.l EscapeAssist LDA.l EscapeAssist
BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : + BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : + BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : +

10
newhud.asm
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

1
stats.asm
View File

@@ -147,7 +147,6 @@
; $7EF4FEw[2] - Save Checksum ; $7EF4FEw[2] - Save Checksum
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!LOCK_STATS = "$7EF443" !LOCK_STATS = "$7EF443"
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------