From 8a25dc9d5259eb3fb60bdd9529f43031edd4d73a Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Tue, 21 Dec 2021 01:40:23 -0800 Subject: [PATCH] Prevent hitting stunned ganon in cane-mode with default vulnerability --- special_weapons.asm | 1 - variable_ganon_vulnerability.asm | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/special_weapons.asm b/special_weapons.asm index 087cda7..99cf1ae 100644 --- a/special_weapons.asm +++ b/special_weapons.asm @@ -35,7 +35,6 @@ DamageClassCalc: .special_cane PLA LDA $0E20, X : CMP.b #$D6 : BEQ .unstunned_ganon - CMP.b #$D7 : BEQ .stunned_ganon CMP.b #$88 : BEQ .mothula BRA .special_level .impervious diff --git a/variable_ganon_vulnerability.asm b/variable_ganon_vulnerability.asm index 64aadef..ac610e1 100644 --- a/variable_ganon_vulnerability.asm +++ b/variable_ganon_vulnerability.asm @@ -45,8 +45,8 @@ Ganon_CheckAncillaVulnerability: PLA .not_vulnerable PHX : TAX - LDA.l !ANCILLA_DAMAGE, X - PLX + LDA.l !ANCILLA_DAMAGE, X + PLX RTL ; end with X = sprite index, A = damage class ;--------------------------------------------------------------------------------