From 39854cabf8847e748355f55aedd3f523a565c3d8 Mon Sep 17 00:00:00 2001 From: scawful Date: Mon, 2 Dec 2024 11:46:59 -0500 Subject: [PATCH] Update Goron sprite interaction logic --- Sprites/NPCs/goron.asm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Sprites/NPCs/goron.asm b/Sprites/NPCs/goron.asm index 5196373..7c9428d 100644 --- a/Sprites/NPCs/goron.asm +++ b/Sprites/NPCs/goron.asm @@ -51,6 +51,13 @@ Sprite_Goron_Prep: { PHB : PHK : PLB LDA.w WORLDFLAG : BEQ + + LDA AreaIndex : CMP.b #$55 : BNE .not_sing + LDA.b #$04 : STA.w SprAction, X + .not_sing + JSL GetRandomInt : AND.b #$01 : BEQ .rand + LDA.b #$05 : STA.w SprAction, X + JMP ++ + .rand LDA.b #$03 : STA.w SprAction, X JMP ++ + @@ -116,18 +123,21 @@ Sprite_Goron_Main: EonGoron_Main: { %PlayAnimation(0, 1, 10) + %ShowSolicitedMessage($01B0) RTS } EonGoron_Sing: { %PlayAnimation(2, 3, 10) + %ShowSolicitedMessage($01B2) RTS } EonGoron_Punch: { %PlayAnimation(4, 5, 10) + %ShowSolicitedMessage($01B1) RTS } }