From cdb748f4135c4ea525a9e51af2ef29a4b889fc22 Mon Sep 17 00:00:00 2001 From: scawful Date: Tue, 4 Jun 2024 22:11:49 -0400 Subject: [PATCH] fix goldstar damage class applying to other items --- Items/goldstar.asm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Items/goldstar.asm b/Items/goldstar.asm index 10dd780..71b3a8e 100644 --- a/Items/goldstar.asm +++ b/Items/goldstar.asm @@ -1027,10 +1027,16 @@ MaybeUploadBirdGraphicsToOam: ApplyGoldstarDamageClass: { - ; If the goldstar is active swap in the damage class - LDA GoldstarOrHookshot : CMP #$02 : BNE .return - LDA #$03 + PHA + LDA $0202 : CMP.b #$03 : BNE .return + ; If the goldstar is active swap in the damage class + LDA GoldstarOrHookshot : CMP #$02 : BNE .return + PLA + LDA #$03 + JMP .apply .return + PLA + .apply JSL $06ED25 ; .apply RTL }