From 08f72749c9b4828e77b3f50edb2a48f21fba016b Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sat, 26 Sep 2020 19:30:22 -0700
Subject: [PATCH] Fix Toad messages, and likely other things related to
 behParams

---
 src/game/object_list_processor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/object_list_processor.c b/src/game/object_list_processor.c
index 4f69ca00..7e91bd2c 100644
--- a/src/game/object_list_processor.c
+++ b/src/game/object_list_processor.c
@@ -505,7 +505,7 @@ void spawn_objects_from_info(UNUSED s32 unused, struct SpawnInfo *spawnInfo) {
             object->respawnInfo = &spawnInfo->behaviorArg;
 
             // found a player
-            if (spawnInfo->behaviorArg & (1 << 31)) {
+            if (spawnInfo->behaviorArg & (1 << 31) && object->behavior == bhvMario) {
                 u16 playerIndex = (spawnInfo->behaviorArg & ~(1 << 31));
                 object->oBehParams = playerIndex + 1;
                 gMarioObjects[playerIndex] = object;