From 90d9e255e4e67663e3692ddd55d2fdfec28b423c Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Thu, 13 Aug 2020 18:34:27 -0700
Subject: [PATCH] Fixed exclamation box double item spawning when traffic is
 bad

---
 src/game/behaviors/exclamation_box.inc.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/game/behaviors/exclamation_box.inc.c b/src/game/behaviors/exclamation_box.inc.c
index 4c8d892c..a885a406 100644
--- a/src/game/behaviors/exclamation_box.inc.c
+++ b/src/game/behaviors/exclamation_box.inc.c
@@ -71,14 +71,16 @@ void exclamation_box_act_2(void) {
         o->oPosY = o->oHomeY;
         o->oGraphYOffset = 0.0f;
     }
-    if (o->oExclamationBoxForce || o->oExclamationBoxUnkFC == 0x4000 || cur_obj_was_attacked_or_ground_pounded()) {
-        cur_obj_become_intangible();
-        o->oExclamationBoxUnkFC = 0x4000;
-        o->oVelY = 30.0f;
-        o->oGravity = -8.0f;
-        o->oFloorHeight = o->oPosY;
-        o->oAction = 3;
-        queue_rumble_data(5, 80);
+    if (o->oExclamationBoxForce || nearest_mario_state_to_object(o) == &gMarioStates[0]) {
+        if (o->oExclamationBoxForce || o->oExclamationBoxUnkFC == 0x4000 || cur_obj_was_attacked_or_ground_pounded()) {
+            cur_obj_become_intangible();
+            o->oExclamationBoxUnkFC = 0x4000;
+            o->oVelY = 30.0f;
+            o->oGravity = -8.0f;
+            o->oFloorHeight = o->oPosY;
+            o->oAction = 3;
+            queue_rumble_data(5, 80);
+        }
     }
     load_object_collision_model();
 }
@@ -145,6 +147,7 @@ void exclamation_box_act_4(void) {
 }
 
 void exclamation_box_act_5(void) {
+    o->oExclamationBoxForce = FALSE;
     if (o->oTimer > 300)
         o->oAction = 2;
 }