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

Add toggle of bugnet-on-B

Browse Source
This commit is contained in:
Kara Alexandra
2023-09-01 16:55:45 -05:00
parent b52404469b
commit 13ccba90c3
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
inventory.asm
View File

@@ -103,6 +103,11 @@ RTL
STA FluteEquipment ; store set item STA FluteEquipment ; store set item
LDA.b #$20 : STA $012F ; menu select sound LDA.b #$20 : STA $012F ; menu select sound
BRA .captured BRA .captured
+ CMP.b #$0E : BNE + ; bugnet
LDA.l SpecialWeapons : CMP.b #$08 : BNE .error
LDA.l InventoryTracking+1 : EOR.b #$80 : STA.l InventoryTracking+1
LDA.b #$20 : STA.w $012F ; menu select sound
BRA .captured
+ +
CMP #$10 : BNE .error : JSL.l ProcessBottleMenu : BRA .captured : + CMP #$10 : BNE .error : JSL.l ProcessBottleMenu : BRA .captured : +
CLC CLC
@@ -784,6 +789,8 @@ AddYMarker:
LDA InventoryTracking : BIT.w #$04 : BEQ .drawNormal ; make sure we have shovel LDA InventoryTracking : BIT.w #$04 : BEQ .drawNormal ; make sure we have shovel
AND.w #$03 : BNE .drawYBubble ; make sure we have one of the flutes AND.w #$03 : BNE .drawYBubble ; make sure we have one of the flutes
BRA .drawNormal BRA .drawNormal
+ CMP.w #$000E : BNE + ; bugnet
LDA.l SpecialWeapons : AND.w #$00FF : CMP.w #$0008 : BEQ .drawYBubble : BRA .drawNormal
+ CMP.w #$10 : BEQ .drawJarMarker + CMP.w #$10 : BEQ .drawJarMarker
.drawNormal .drawNormal

3
special_weapons.asm
View File

@@ -466,7 +466,7 @@ CheckDetonateBomb:
.next_ancilla .next_ancilla
DEX DEX
BPL .check_ancilla BPL .check_ancilla
BRA .done JMP .done
.not_bomb_mode .not_bomb_mode
LDA.l SpecialWeapons : CMP.b #$06 : BEQ .release_bee LDA.l SpecialWeapons : CMP.b #$06 : BEQ .release_bee
CMP.b #$07 : BEQ .hammer CMP.b #$07 : BEQ .hammer
@@ -480,6 +480,7 @@ CheckDetonateBomb:
RTL RTL
.net .net
LDA.l BugNetEquipment : BEQ .done LDA.l BugNetEquipment : BEQ .done
LDA.l InventoryTracking+1 : BIT.b #$80 : BNE .done
LDA.b $3A : ORA.b #$40 : STA.b $3A LDA.b $3A : ORA.b #$40 : STA.b $3A
LDA.b #$07 : STA.w $0304 LDA.b #$07 : STA.w $0304
JSL Link_UseBugNetLong JSL Link_UseBugNetLong

9
sram.asm
View File

@@ -168,13 +168,14 @@ CurrentGenericKeys: skip 1 ; Generic small keys
;================================================================================ ;================================================================================
; Tracking & Indicators ($7EF38C - $7EF3F0) ; Tracking & Indicators ($7EF38C - $7EF3F0)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
InventoryTracking: skip 2 ; b r m p n s k f - - - - - - o q (bitfield) InventoryTracking: skip 2 ; 2 - - - - - o q b r m p n s k f (bitfield)
; b = Blue Boomerang | r = Red Boomerang | m = Mushroom Current ; b = Blue Boomerang | r = Red Boomerang | m = Mushroom Current
; 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 | 2 = Item on B
BowTracking: skip 1 ; b s p - - - - - (bitfield) BowTracking: skip 1 ; b s p f - - - - (bitfield)
; b = Bow | s = Silver Arrows Upgrade | p = Second Progressive Bow ; b = Any Bow | s = Silver Arrows Upgrade | p = Second 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
; indicates whether the "second" has been found independent of ; indicates whether the "second" has been found independent of
; the first ; the first