From f800c1bd3605f0e68ad6c6e8b50cd011060e0881 Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 25 Oct 2024 10:49:35 -0400 Subject: [PATCH] Update Rock Sirloin pickup logic --- Sprites/Objects/collectible.asm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Sprites/Objects/collectible.asm b/Sprites/Objects/collectible.asm index 8955029..978102d 100644 --- a/Sprites/Objects/collectible.asm +++ b/Sprites/Objects/collectible.asm @@ -129,9 +129,11 @@ Sprite_Collectible_Main: { JSL Sprite_Move LDA.l $7EF354 : BEQ .do_you_even_lift_bro - JSL ThrownSprite_TileAndSpriteInteraction_long - LDA.l RockMeat : INC A : STA.l RockMeat - STZ.w SprState, X + JSL Sprite_CheckDamageToPlayer : BCC + + JSL ThrownSprite_TileAndSpriteInteraction_long + LDA.l RockMeat : INC A : STA.l RockMeat + STZ.w SprState, X + + .do_you_even_lift_bro RTS } @@ -357,4 +359,4 @@ Sprite_RockSirloin_Draw: db $37 .sizes db $02 -} \ No newline at end of file +}