shithub: zelda3

Info  •  Files  •  Log  •  Branches

Don't grab fairys under a rock with the hookshot (#126)

--- a/sprite_main.c

+++ b/sprite_main.c

@@ -11806,8 +11806,13 @@

   if (!sprite_ai_state[k]) {

     if (!player_is_indoors)

       sprite_obj_prio[k] = 48;

-    if (SpriteDraw_AbsorbableTransient(k, true))

+    if (SpriteDraw_AbsorbableTransient(k, true)) {

+      // sprite_B holds the sprite that grabbed us. 

+      // Cancel the grab if we're hidden under a rock.

+      if (enhanced_features0 & kFeatures0_MiscBugFixes)

+        sprite_B[k] = 0;

       return;

+    }

   }

   Fairy_CheckIfTouchable(k);

   if (Sprite_ReturnIfInactive(k))