alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'baserom/master' into MergeDecompression

Browse Source 
# Conflicts:
#	npcitems.asm
This commit is contained in:
aerinon
2023-09-09 13:13:18 -06:00
parent a723fe2865 fcbde59a1e
commit b67e5c8433
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hooks.asm
View File

@@ -1459,18 +1459,24 @@ org $8DFB29 : BRA UpdateHUDBuffer_update_item_check_arrows
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $8DF1AB : JSR.w RebuildHUD_update org $8DF1AB : JSR.w RebuildHUD_update
org $8DDFC8 : JSR.w RebuildHUD_update org $8DDFC8 : JSR.w RebuildHUD_update
org $8DDB85 org $8DDB85 : JSR.w RefreshIcon_UpdateHUD : BRA + : NOP : +
JSR.w RebuildHUD : BRA + : NOP : +
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $87A205 : JSL.l RebuildHUD_update_long org $87A205 : JSL.l RebuildHUD_update_long
org $8AEF62 : JSL.l RebuildHUD_update_long
org $87A1A4 : JSL.l RebuildHUD_update_long org $87A1A4 : JSL.l RebuildHUD_update_long
org $87A1CF : JSL.l RebuildHUD_update_long org $87A1CF : JSL.l RebuildHUD_update_long
org $87A21D : JSL.l RebuildHUD_update_long
org $87A235 : JSL.l RebuildHUD_update_long org $87A235 : JSL.l RebuildHUD_update_long
org $8AEF62 : JSL.l RebuildHUD_update_long
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $8DFFE1 org $8DFFE1
RebuildHUD_update_long: RebuildHUD_update_long:
JSR.w RebuildHUD_update : RTL JSR.w RebuildHUD_update : RTL
RefreshIcon_UpdateHUD:
INC.w UpdateHUDFlag
JSR.w RebuildHUD
JSR.w UpdateEquippedItem
RTS
warnpc $8E8000 warnpc $8E8000
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $8DEDE8 org $8DEDE8

6
newitems.asm
View File

@@ -271,8 +271,8 @@ ItemBehavior:
RTS RTS
.silversbow .silversbow
LDA.l SilverArrowsUseRestriction : BNE +
LDA.l BowTracking : ORA.b #$40 : STA.l BowTracking 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 #03 : STA.l BowEquipment ; set bow to silver
+ +
LDA.b #$01 : STA.l BowEquipment LDA.b #$01 : STA.l BowEquipment
@@ -333,8 +333,8 @@ ItemBehavior:
RTS RTS
.silver_bow .silver_bow
LDA.l SilverArrowsUseRestriction : BNE .noequip
LDA.b #$40 : ORA.l BowTracking : STA.l BowTracking LDA.b #$40 : ORA.l BowTracking : STA.l BowTracking
LDA.l SilverArrowsUseRestriction : BNE .noequip
LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ .noequip LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ .noequip
LDA.l CurrentArrows : BNE + ; check arrows LDA.l CurrentArrows : BNE + ; check arrows
LDA.b #$03 : BRA ++ ; bow without arrow LDA.b #$03 : BRA ++ ; bow without arrow
@@ -409,8 +409,8 @@ ItemBehavior:
RTS RTS
.silver_arrows .silver_arrows
LDA.l SilverArrowsUseRestriction : BNE ++
LDA.l BowTracking : ORA.b #$40 : STA.l BowTracking LDA.l BowTracking : ORA.b #$40 : STA.l BowTracking
LDA.l SilverArrowsUseRestriction : BNE ++
LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ ++ LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ ++
LDA.l BowEquipment : BEQ ++ : CMP.b #$03 : !BGE + LDA.l BowEquipment : BEQ ++ : CMP.b #$03 : !BGE +
!ADD.b #$02 : STA.l BowEquipment ; switch to silver bow !ADD.b #$02 : STA.l BowEquipment ; switch to silver bow

2
sram.asm
View File

@@ -179,7 +179,7 @@ InventoryTracking: skip 2 ; - - - - - - o q b r m p n s k f (bitfield)
; p = Magic Powder | n = Mushroom Past | s = Shovel ; p = Magic Powder | n = Mushroom Past | s = Shovel
; k = Inactive Flute | f = Active Flute | o = Any bomb acquired ; k = Inactive Flute | f = Active Flute | o = Any bomb acquired
; q = Quickswap locked ; q = Quickswap locked
BowTracking: skip 2 ; b s p f - - - - - - - - - - - - (bitfield) BowTracking: skip 2 ; - - - - - - - - b s p f - - - - (bitfield)
; b = Any Bow | s = Silver Arrows Upgrade | p = Second Progressive Bow ; b = Any Bow | s = Silver Arrows Upgrade | p = Second Progressive Bow
; f = First progressive bow ; f = First progressive bow
; The front end writes two distinct progressive bow items. p ; The front end writes two distinct progressive bow items. p

1
vanillalabels.asm
View File

@@ -153,6 +153,7 @@ Ancilla29_MilestoneItemReceipt_no_sparkle = $88CB2E
Ancilla_SetOAM_XY = $88F6F3 Ancilla_SetOAM_XY = $88F6F3
Ancilla_AddAncilla = $899CCE Ancilla_AddAncilla = $899CCE
UpdateHUD = $8DDFA9 UpdateHUD = $8DDFA9
UpdateEquippedItem = $8DDFAF
DrawProgressIcons = $8DE9C8 DrawProgressIcons = $8DE9C8
ItemMenu_DrawEquippedYItem = $8DEB3A ItemMenu_DrawEquippedYItem = $8DEB3A
ItemMenu_DrawEquippedYItem_exit = $8DECE6 ItemMenu_DrawEquippedYItem_exit = $8DECE6