From fe07ecb773fac0076c5c1cb40836ce2cd3604a64 Mon Sep 17 00:00:00 2001
From: Arceveti <73617174+Arceveti@users.noreply.github.com>
Date: Sat, 13 Nov 2021 23:06:17 -0800
Subject: [PATCH] Fix held object shadows on slopes

---
 src/game/shadow.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/game/shadow.c b/src/game/shadow.c
index bf79fce70..5ad666f77 100644
--- a/src/game/shadow.c
+++ b/src/game/shadow.c
@@ -218,12 +218,14 @@ Gfx *create_shadow_below_xyz(Vec3f pos, s16 shadowScale, u8 shadowSolidity, s8 s
     s8 isPlayer = FALSE;
     // Attempt to use existing floors before finding a new one.
     if ((gCurGraphNodeObjectNode == gMarioObject)
-     && (gMarioState->floor != NULL)) {
+     && (gMarioState->floor != NULL)
+     && (gCurGraphNodeHeldObject == NULL)) {
         s.floor       = gMarioState->floor;
         s.floorHeight = gMarioState->floorHeight;
         isPlayer = TRUE;
     } else if ((gCurGraphNodeObject != &gMirrorMario)
-            && (gCurGraphNodeObjectNode->oFloor != NULL)) {
+            && (gCurGraphNodeObjectNode->oFloor != NULL)
+            && (gCurGraphNodeHeldObject == NULL)) {
         s.floor       = gCurGraphNodeObjectNode->oFloor;
         s.floorHeight = gCurGraphNodeObjectNode->oFloorHeight;
     } else {