[RANDO]: Stop spawn overrides from pretending to be jiggies

src/core2/fx/effect_jiggy_list.c

@@ -334,6 +334,9 @@ void func_80333388(enum jiggy_e jiggy_id) {
 void func_803333DC(Struct81s *arg0, Actor *arg1) {
     s32 jiggy_id;
 
+    if (EventSystem_Should(VB_OVERRIDE_JIGGY_ACTOR_LINK, false, arg0, arg1)) {
+        return;
+    }
     arg0->marker = arg1->marker;
     if (arg0->unk14 != NULL) {
         arg0->unk14(arg1, arg0->unk18);

src/core2/fx/effect_jiggy_spawn.c

@@ -7,6 +7,10 @@
 void func_80347B10(Struct81s *arg0){
     Actor *actor;
     actor = bundle_spawn_f32(BUNDLE_10__JIGGY, arg0->position);
+    // [port] VB_OVERRIDE_BUNDLE_SPAWN can consume the spawn and yield no actor
+    if (actor == NULL) {
+        return;
+    }
     actor->unk54 = 3.0f;
     func_803333DC(arg0, actor);
 }

src/port/Enhancements/Events/Hooks/Events.h

@@ -52,6 +52,7 @@ typedef enum VBehaviorID {
     VB_OVERRIDE_BOTTLES_TEXT_CALLBACK,
     VB_OVERRIDE_MOLEHILL_ABILITY,
     VB_OVERRIDE_JIGGY_SPAWN,
+    VB_OVERRIDE_JIGGY_ACTOR_LINK,
     VB_OVERRIDE_PROP_SPAWN,
     VB_OVERRIDE_BUNDLE_SPAWN,
     VB_BUNDLE_SPAWN_SET_ACTOR_DATA,

src/port/Rando/ObjectBehavior/Jiggy.cpp

@@ -28,6 +28,15 @@ static void MarkWorldStateFromJiggySpawn(RandoCheckId randoCheckId) {
 }
 
 void Rando::ObjectBehavior::InitJiggyBehavior() {
+    COND_VB_SHOULD(VB_OVERRIDE_JIGGY_ACTOR_LINK, EVENT_PRIORITY_NORMAL, true, {
+        (void)va_arg(args, Struct81s*);
+        Actor* actor = va_arg(args, Actor*);
+
+        if (actor == NULL || actor->marker == NULL || actor->marker->id != MARKER_52_JIGGY) {
+            *should = true;
+        }
+    })
+
     COND_VB_SHOULD(VB_NAPPER_SET_JIGGY_POSITION, EVENT_PRIORITY_NORMAL, true, {
         if (!IS_RANDO && !OPTION_ENABLED) {
             return;