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

Fix checking tablets in bee mode

Browse Source
This commit is contained in:
karafruit
2022-05-14 11:45:38 -07:00
parent ffdb5e837a
commit bb35409bc8
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
swordswap.asm
View File

@@ -128,17 +128,18 @@ LoadModifiedIceFloorValue_a01:
;================================================================================ ;================================================================================
CheckTabletSword: CheckTabletSword:
LDA.l AllowHammerTablets : BEQ + LDA.l AllowHammerTablets : BEQ +
LDA $7EF34B : BEQ + ; check for hammer LDA $7EF34B : BNE .allow ; check for hammer
LDA.b #$02 : RTL
+ +
LDA.l SpecialWeapons : CMP #$01 : BEQ .check_special LDA.l SpecialWeapons : CMP #$01 : BEQ .check_special
CMP #$03 : BEQ .check_special CMP #$03 : BEQ .check_special
CMP #$04 : BEQ .check_special CMP #$04 : BEQ .check_special
CMP #$05 : BEQ .check_special CMP #$05 : BEQ .check_special
CMP #$06 : BEQ .allow
BRA .normal BRA .normal
.check_special .allow
LDA !WEAPON_LEVEL : CMP #$02 : !BLT + ; check for master bombs
LDA.b #$02 : RTL LDA.b #$02 : RTL
.check_special
LDA !WEAPON_LEVEL : CMP #$02 : !BGE .allow ; check for master bombs
.normal .normal
LDA $7EF359 ; get actual sword value LDA $7EF359 ; get actual sword value
RTL RTL