From ccfb46043bcd6160f314335cbb13ffbf76b6a927 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Fri, 16 Jun 2023 18:09:23 -0700
Subject: [PATCH] Fixed character anim offsets during certain dialog boxes

---
 src/game/characters.c           | 8 ++------
 src/game/rendering_graph_node.c | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/game/characters.c b/src/game/characters.c
index 684375a1d..bff32ab9c 100644
--- a/src/game/characters.c
+++ b/src/game/characters.c
@@ -555,7 +555,7 @@ f32 get_character_anim_offset(struct MarioState* m) {
     switch (sAnimTypes[animID]) {
         case ANIM_TYPE_LOWY:
             if (m->minimumBoneY < c->animOffsetLowYPoint) {
-                return -(m->minimumBoneY - c->animOffsetLowYPoint);
+                return c->animOffsetLowYPoint - m->minimumBoneY;
             }
             break;
         case ANIM_TYPE_FEET:
@@ -584,10 +584,6 @@ void update_character_anim_offset(struct MarioState* m) {
     if (m->curAnimOffset > 40)  { m->curAnimOffset = 40; }
     if (m->curAnimOffset < -40) { m->curAnimOffset = -40; }
 
-    if (m->action == ACT_JUMBO_STAR_CUTSCENE) {
-        marioObj->header.gfx.pos[1] = m->pos[1] + m->curAnimOffset;
-    } else {
-        marioObj->header.gfx.pos[1] += m->curAnimOffset;
-    }
+    marioObj->header.gfx.pos[1] = m->pos[1] + m->curAnimOffset;
     marioObj->header.gfx.node.flags |= GRAPH_RENDER_PLAYER;
 }
\ No newline at end of file
diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c
index 9a4295faa..363e9b0a3 100644
--- a/src/game/rendering_graph_node.c
+++ b/src/game/rendering_graph_node.c
@@ -1222,7 +1222,7 @@ static void geo_process_object(struct Object *node) {
             }
         }
         if (gCurGraphNodeMarioState != NULL) {
-            gCurGraphNodeMarioState->minimumBoneY = 999;
+            gCurGraphNodeMarioState->minimumBoneY = 9999;
         }
     }