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

Generalize item-on-B approach

Browse Source
This commit is contained in:
karafruit
2023-09-02 12:51:35 -05:00
parent 2fad63d6af
commit 5a3277dbaf
10 changed files with 168 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
hooks.asm
View File

@@ -2487,10 +2487,6 @@ org $8DE4BF ; equipment.asm@1247 (LDA $7EF343 : AND.w #$00FF : BEQ .gotNoBombs :
JSL DrawBombInMenu
BRA + : NOP #13 : +
;--------------------------------------------------------------------------------
org $8DE5A0 ; bank_0D@15415 (LDA $7EF34D : AND.w #$00FF : STA.b $02 : ...)
JSL DrawBugNetInMenu
BRA + : NOP #8 : +
;--------------------------------------------------------------------------------
org $8DFB6A ; headsup_display@727 (CPX #$0004 : BNE .bombsNotEquipped : LDA #$0001)
JSL DrawBombInYBox
BRA + : NOP #2 : +
@@ -2524,15 +2520,8 @@ db $B2, $24, $B3, $24, $C2, $24, $C2, $64
db $B2, $28, $B3, $28, $C2, $28, $C2, $68
db $B2, $28, $B3, $28, $C2, $28, $C2, $68
; bugnet icon with B
; $8DFCB1
db $40, $3C, $41, $3C, $42, $28, $3F, $3D
warnpc $8DFC51+197 ; we only filled in 197 NOPs so don't overwrite past that
;--------------------------------------------------------------------------------
org $879CE6 ; Bank07.asm@4632 (LDA #$80 : TSB $3A)
JSL CheckDetonateBomb
;--------------------------------------------------------------------------------
org $1EDCF8 ; bank_1E.asm@16086 (LDX $0202 : ...)
JSL SetBeeType
BRA + : NOP #15 : +
@@ -2549,11 +2538,12 @@ NOP #48
skip 11
.bee_valid_target
;--------------------------------------------------------------------------------
org $87F888 ; free rom from F877 - F88F; the starting part of this is used in quadrant glitch fix in overworld fork, however.
Link_UseBugNetLong:
JSR Link_UseBugNet : RTL
Link_UseHammerLong:
JSR Link_UseHammer : RTL
org $87F889 ; free rom from F877 - F88F; the starting part of this is used in quadrant glitch fix in overworld fork, however.
Link_UseItemLong:
PER .done-1
JMP.w ($0000)
.done
RTL
warnpc $87F890
;--------------------------------------------------------------------------------
org $86F2DC ; bank_06.asm@22763 (LDA.w $037A : AND.b #$10)
@@ -2592,6 +2582,19 @@ NOP
org $86ED70 ; Bank06.asm@4842 (LDA $06ED39, X : STA $0CF2)
JSL StoreSwordDamage
;================================================================================
; Item-On-B
;--------------------------------------------------------------------------------
org $8DEB3C
JSL DrawBIndicator : BRA + : NOP #3 : +
;--------------------------------------------------------------------------------
org $879CE6 ; Bank07.asm@4632 (LDA #$80 : TSB $3A : ...)
JSL UseItem
BCC + : RTS : +
JSR $9C56
NOP #1
;--------------------------------------------------------------------------------
;================================================================================
; Text Renderer
;--------------------------------------------------------------------------------