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

Merge branch 'main' into kara

Browse Source
This commit is contained in:
karafruit
2023-09-09 11:06:13 -05:00
parent 468d1e3ec4 fcbde59a1e
commit 13e558b8eb
16 changed files with 170 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
newitems.asm
View File

@@ -276,8 +276,8 @@ ItemBehavior:
RTS
.silversbow
LDA.l SilverArrowsUseRestriction : BNE +
LDA.l BowTracking : ORA.b #$40 : STA.l BowTracking
LDA.l SilverArrowsUseRestriction : BNE +
LDA.b #03 : STA.l BowEquipment ; set bow to silver
+
LDA.b #$01 : STA.l BowEquipment
@@ -338,8 +338,8 @@ ItemBehavior:
RTS
.silver_bow
LDA.l SilverArrowsUseRestriction : BNE .noequip
LDA.b #$40 : ORA.l BowTracking : STA.l BowTracking
LDA.l SilverArrowsUseRestriction : BNE .noequip
LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ .noequip
LDA.l CurrentArrows : BNE + ; check arrows
LDA.b #$03 : BRA ++ ; bow without arrow
@@ -414,8 +414,8 @@ ItemBehavior:
RTS
.silver_arrows
LDA.l SilverArrowsUseRestriction : BNE ++
LDA.l BowTracking : ORA.b #$40 : STA.l BowTracking
LDA.l SilverArrowsUseRestriction : BNE ++
LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ ++
LDA.l BowEquipment : BEQ ++ : CMP.b #$03 : !BGE +
!ADD.b #$02 : STA.l BowEquipment ; switch to silver bow
@@ -429,7 +429,7 @@ ItemBehavior:
.single_arrow
LDA.l ArrowMode : BEQ +
LDA.l CurrentArrows : INC : STA.l CurrentArrows ; Should be sole write to this address
INC.w UpdateHUD ; in retro/rupee bow mode.
INC.w UpdateHUDFlag ; in retro/rupee bow mode.
+
RTS