From 0ad65c87da6502af77be818f14d02bef5096af56 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sat, 1 Aug 2020 20:21:44 -0700
Subject: [PATCH] Made collision particles Luigi-aware

---
 src/game/behaviors/collide_particles.inc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game/behaviors/collide_particles.inc.c b/src/game/behaviors/collide_particles.inc.c
index ff93a5119..d99dd74cb 100644
--- a/src/game/behaviors/collide_particles.inc.c
+++ b/src/game/behaviors/collide_particles.inc.c
@@ -11,7 +11,7 @@ void bhv_punch_tiny_triangle_loop(void) {
     if (o->oTimer == 0) {
         sp1E = o->oMoveAngleYaw;
         o->oCollisionParticleUnkF4 = 1.28f;
-        cur_obj_set_pos_relative(gMarioObject, 0.0f, 60.0f, 100.0f);
+        cur_obj_set_pos_relative(o->parentObj, 0.0f, 60.0f, 100.0f);
         o->oMoveAngleYaw = sp1E;
     }
     cur_obj_move_using_fvel_and_gravity();
@@ -28,7 +28,7 @@ void bhv_punch_tiny_triangle_init(void) {
     struct Object *triangle;
     for (i = 0; i < 6; i++) {
         triangle = spawn_object(o, MODEL_DIRT_ANIMATION, bhvPunchTinyTriangle);
-        triangle->oMoveAngleYaw = gMarioObject->oMoveAngleYaw + D_8032F2CC[2 * i] + 0x8000;
+        triangle->oMoveAngleYaw = o->parentObj->oMoveAngleYaw + D_8032F2CC[2 * i] + 0x8000;
         triangle->oVelY = sins(D_8032F2CC[2 * i + 1]) * 25.0f;
         triangle->oForwardVel = coss(D_8032F2CC[2 * i + 1]) * 25.0f;
     }
@@ -39,7 +39,7 @@ void bhv_wall_tiny_star_particle_loop(void) {
     if (o->oTimer == 0) {
         sp1E = o->oMoveAngleYaw;
         o->oCollisionParticleUnkF4 = 0.28f;
-        cur_obj_set_pos_relative(gMarioObject, 0.0f, 30.0f, 110.0f);
+        cur_obj_set_pos_relative(o->parentObj, 0.0f, 30.0f, 110.0f);
         o->oMoveAngleYaw = sp1E;
     }
     cur_obj_move_using_fvel_and_gravity();
@@ -54,7 +54,7 @@ void bhv_tiny_star_particles_init(void) {
     struct Object *particle;
     for (i = 0; i < 7; i++) {
         particle = spawn_object(o, MODEL_CARTOON_STAR, bhvWallTinyStarParticle);
-        particle->oMoveAngleYaw = gMarioObject->oMoveAngleYaw + D_8032F2E4[2 * i] + 0x8000;
+        particle->oMoveAngleYaw = o->parentObj->oMoveAngleYaw + D_8032F2E4[2 * i] + 0x8000;
         particle->oVelY = sins(D_8032F2E4[2 * i + 1]) * 25.0f;
         particle->oForwardVel = coss(D_8032F2E4[2 * i + 1]) * 25.0f;
     }