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

More improvement to bee mode?

Browse Source
This commit is contained in:
karafruit
2022-04-30 14:04:22 -07:00
parent 103c41ae94
commit 4f4f46352d
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
special_weapons.asm
View File

@@ -10,6 +10,7 @@ DamageClassCalc:
JSL Ganon_CheckAncillaVulnerability JSL Ganon_CheckAncillaVulnerability
RTL RTL
+ +
LDA SpecialWeapons : CMP #$06 : BEQ .cane_immune ; only crystal switches in bee mode
PLA PLA
CMP #$01 : BEQ .red_cane CMP #$01 : BEQ .red_cane
CMP #$2C : BEQ .red_cane CMP #$2C : BEQ .red_cane
@@ -345,6 +346,7 @@ AllowBombingBarrier:
CMP #$03 : BEQ .no_disable_projectiles CMP #$03 : BEQ .no_disable_projectiles
CMP #$04 : BEQ .no_disable_projectiles CMP #$04 : BEQ .no_disable_projectiles
CMP #$05 : BEQ .no_disable_projectiles CMP #$05 : BEQ .no_disable_projectiles
CMP #$06 : BEQ .no_disable_projectiles
.disable_projectiles .disable_projectiles
INC $0BA0, X INC $0BA0, X
.no_disable_projectiles .no_disable_projectiles
@@ -434,11 +436,11 @@ StoreSwordDamage:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
BeeDamageClass: BeeDamageClass:
db $01 db $FF
db $06, $00, $07, $08, $0A db $06, $00, $07, $08, $0A
db $0B, $0C, $0D, $0E, $0F db $0B, $0C, $0D, $0E, $0F
db $01, $03, $01, $01, $01 db $FF, $03, $FF, $FF, $FF
db $01, $01, $01, $01, $01 db $FF, $01, $01, $FF, $FF
CheckDetonateBomb: CheckDetonateBomb:
LDA.l SpecialWeapons : CMP.b #$01 : BNE .not_bomb_mode LDA.l SpecialWeapons : CMP.b #$01 : BNE .not_bomb_mode
.detonate_bombs .detonate_bombs
@@ -455,13 +457,27 @@ CheckDetonateBomb:
BRA .done BRA .done
.not_bomb_mode .not_bomb_mode
LDA.l SpecialWeapons : CMP.b #$06 : BNE .done LDA.l SpecialWeapons : CMP.b #$06 : BNE .done
LDX.w $0202
LDA.l BeeDamageClass, X : CMP.b #$FF : BEQ .nope
JSL $1EDCC9 JSL $1EDCC9
BMI .done BMI .nope
PHX
LDX.w $0202 LDX.w $0202
LDA.l BeeDamageClass, X LDA.l BeeDamageClass, X
CMP.b #$06 : BNE .set_bee_class
LDA.l $7EF340 : CMP.b #$03 : !BGE .silver_arrows
LDA.b #$06
BRA .set_bee_class
.silver_arrows
LDA.b #$09
.set_bee_class
STA.w $0ED0, Y STA.w $0ED0, Y
PLX BRA .done
.nope
LDA.b #$3C
STA.w $0CF8
JSL $0DBB67
ORA.w $0CF8
STA.w $012E
.done .done
; what we wrote over ; what we wrote over
LDA.b #$80 LDA.b #$80