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

Small fixes

Browse Source
This commit is contained in:
cassidoxa
2023-08-15 23:55:53 -04:00
parent 1b115ebb50
commit e206d6f368
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
heartpieces.asm
View File

@@ -84,6 +84,7 @@ NormalItemSkipSound:
JSL.l CheckIfBossRoom : BCS .boss_room JSL.l CheckIfBossRoom : BCS .boss_room
TDC TDC
CPY #$17 : BEQ .skip CPY #$17 : BEQ .skip
CLC
RTL RTL
.boss_room .boss_room
LDA.w ItemReceiptMethod : CMP.b #$03 : BEQ + LDA.w ItemReceiptMethod : CMP.b #$03 : BEQ +

8
tables.asm
View File

@@ -88,9 +88,6 @@ db $01 ; #$00 = Classic Tempering Process - #$01 = Quick Item Get (default)
SmithItem: SmithItem:
db $02 ; #$02 = Tempered Sword (default) db $02 ; #$02 = Tempered Sword (default)
;org $86B48E ; PC 0x3348E ; sprite_smithy_bros.asm : 473
;SmithSwordCheck:
;db $03 ; #$03 = Tempered Sword (default) ; THESE VALUES ARE +1
org $86B55C ; PC 0x3355C ; sprite_smithy_bros.asm : 634 org $86B55C ; PC 0x3355C ; sprite_smithy_bros.asm : 634
SmithSword: SmithSword:
db $02 ; #$02 = Tempered Sword (default) db $02 ; #$02 = Tempered Sword (default)
@@ -939,9 +936,12 @@ org $B08195 ; PC 0x180195
ByrnaCaveSpikeDamage: ByrnaCaveSpikeDamage:
db $08 ; #$08 = 1 Heart (default) - #$02 = 1/4 Heart db $08 ; #$08 = 1 Heart (default) - #$02 = 1/4 Heart
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $308196 ; PC 0x180196-0x180197 org $B08196 ; PC 0x180196-0x180197
TotalItemCount: ; Total item count for HUD. Only counts items that use "item get" animation. TotalItemCount: ; Total item count for HUD. Only counts items that use "item get" animation.
dw $00D8 ; 216 dw $00D8 ; 216
org $B08198 ; PC 0x180198-0x180199
GanonsTowerOpenAddress: ; Target address for GT open check
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; 0x180196 - 0x1801FF (unused) ; 0x180196 - 0x1801FF (unused)
;================================================================================ ;================================================================================