From bfbe46861f7a22a944fa212769f9b8b8e3d0b41a Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 28 Jun 2024 15:15:54 -0400 Subject: [PATCH] add interactable helmet chuchu subtypes, wip --- Sprites/Enemies/helmet_chuchu.asm | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/Sprites/Enemies/helmet_chuchu.asm b/Sprites/Enemies/helmet_chuchu.asm index dd5cfc9..14bb4a3 100644 --- a/Sprites/Enemies/helmet_chuchu.asm +++ b/Sprites/Enemies/helmet_chuchu.asm @@ -81,11 +81,14 @@ Sprite_HelmetChuchu_Main: LDA.w SprAction, X JSL UseImplicitRegIndexedLocalJumpTable - dw HelmetGreen - dw NoHelmetGreen - dw MaskRed + dw GreenChuchu_Helmet + dw GreenChuchu_NoHelmet + dw RedChuchu_Masked + ; TODO: Add subtypes of just the helmet/mask gfx which can be hookshoted/hammered/lifted + dw HelmetSubtype + dw MaskSubtype - HelmetGreen: + GreenChuchu_Helmet: { %StartOnFrame(4) %PlayAnimation(4, 5, 16) @@ -96,7 +99,7 @@ Sprite_HelmetChuchu_Main: RTS } - NoHelmetGreen: + GreenChuchu_NoHelmet: { %StartOnFrame(0) %PlayAnimation(0, 1, 16) @@ -105,7 +108,7 @@ Sprite_HelmetChuchu_Main: RTS } - MaskRed: + RedChuchu_Masked: { %StartOnFrame(2) %PlayAnimation(2, 3, 16) @@ -113,6 +116,16 @@ Sprite_HelmetChuchu_Main: JSR Sprite_Chuchu_Move RTS } + + HelmetSubtype: + { + RTS + } + + MaskSubtype: + { + RTS + } } Sprite_Chuchu_Move: