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

Fix bugnet on aga not reflecting balls

Browse Source
This commit is contained in:
karafruit
2023-09-03 23:27:06 -05:00
parent 0b01f75f80
commit 5ad699f731
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inventory.asm
View File

@@ -52,7 +52,7 @@ RTL
RTL RTL
.b_pressed .b_pressed
JSR CanPressB : BCC .b_error JSR CanPressB : BCC .b_error
LDA.w ItemCursor : CMP.l ItemOnB : BNE .set_b LDA.w $0202 : CMP.l ItemOnB : BNE .set_b
LDA.b #$00 LDA.b #$00
.set_b .set_b
STA.l ItemOnB STA.l ItemOnB
@@ -132,10 +132,10 @@ CanPressB:
PHY : PHP : SEP #$30 PHY : PHP : SEP #$30
LDA.l AllowedItemOnB : BEQ .no LDA.l AllowedItemOnB : BEQ .no
CMP.b #$FF : BEQ .skip_allow_check CMP.b #$FF : BEQ .skip_allow_check
CMP.w ItemCursor : BNE .no CMP.w $0202 : BNE .no
.skip_allow_check .skip_allow_check
PHX PHX
LDA.w ItemCursor : TAX LDA.w $0202 : TAX
LDA.l ValidItemOnB, X : BNE .plx_and_no LDA.l ValidItemOnB, X : BNE .plx_and_no
PLX PLX
PLP : PLY PLP : PLY
@@ -831,7 +831,7 @@ AddYMarker:
.drawYBubble .drawYBubble
JSR CanPressB : BCC .drawY JSR CanPressB : BCC .drawY
LDA.w MenuBlink : AND.w #$0020 : BNE .drawBBubble LDA.w $0207 : AND.w #$0020 : BNE .drawBBubble
.drawY .drawY
LDA.w #$3D4F LDA.w #$3D4F
BRA .drawTile BRA .drawTile

5
special_weapons.asm
View File

@@ -595,14 +595,15 @@ RTS
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
CheckBugNet: CheckBugNet:
LDA.w $037A : AND.b #$10 : BEQ .done ; normal behavior if not bugnet LDA.w $037A : AND.b #$10 : BEQ .done ; normal behavior if not bugnet
PHP ; we want to preserve the carry bit
LDA.l SpecialWeapons : CMP.b #$08 : BNE .return_10 ; normal behavior if not bugnet mode LDA.l SpecialWeapons : CMP.b #$08 : BNE .return_10 ; normal behavior if not bugnet mode
.bugnet_mode .bugnet_mode
LDA.w $0E20, X : CMP.b #$E3 : BEQ .return_10 ; normal behavior if fairy LDA.w $0E20, X : CMP.b #$E3 : BEQ .return_10 ; normal behavior if fairy
CMP.b #$79 : BEQ .return_10 ; normal behavior if bee CMP.b #$79 : BEQ .return_10 ; normal behavior if bee
CMP.b #$B2 : BEQ .return_10 ; normal behavior if bee CMP.b #$B2 : BEQ .return_10 ; normal behavior if bee
LDA.b #$00 : BRA .done PLP : LDA.b #$00 : RTL
.return_10 .return_10
LDA.b #$10 PLP : LDA.b #$10
.done .done
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------