From a4ff5b11f771e9375fc8fed3f5b492423a68529b Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Wed, 2 Apr 2025 00:06:25 +0200
Subject: [PATCH] Fix and remove probably wrong inline

---
 include/d/lyt/d2d.h               | 7 -------
 src/d/lyt/d2d.cpp                 | 2 +-
 src/d/lyt/d_lyt_common_arrow.cpp  | 4 +++-
 src/d/lyt/d_lyt_pause_disp_00.cpp | 4 +++-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/d/lyt/d2d.h b/include/d/lyt/d2d.h
index 50dddb7e..f5dbb2eb 100644
--- a/include/d/lyt/d2d.h
+++ b/include/d/lyt/d2d.h
@@ -189,13 +189,6 @@ struct AnmGroupBase_c {
     void setForward();
     void setBackward();
 
-    inline void setFrameAndControlThings(f32 frame) {
-        bind(false);
-        setAnimEnable(true);
-        mpFrameCtrl->setFrame(frame);
-        syncAnmFrame();
-    }
-
     inline void play() {
         mpFrameCtrl->play();
         syncAnmFrame();
diff --git a/src/d/lyt/d2d.cpp b/src/d/lyt/d2d.cpp
index 6e3f4f5c..0089ab19 100644
--- a/src/d/lyt/d2d.cpp
+++ b/src/d/lyt/d2d.cpp
@@ -821,7 +821,7 @@ bool AnmGroupBase_c::bind(bool bDisable) {
         return false;
     }
 
-    nw4r::lyt::BindAnimation(mpGroup, anmTransform, false, b);
+    nw4r::lyt::BindAnimation(mpGroup, anmTransform, false, bDisable);
     mFlags |= ANMGROUP_FLAG_BOUND;
     if (bDisable) {
         mFlags = (mFlags & ~ANMGROUP_FLAG_ENABLE);
diff --git a/src/d/lyt/d_lyt_common_arrow.cpp b/src/d/lyt/d_lyt_common_arrow.cpp
index 2590df0a..568de8cd 100644
--- a/src/d/lyt/d_lyt_common_arrow.cpp
+++ b/src/d/lyt/d_lyt_common_arrow.cpp
@@ -125,7 +125,9 @@ bool dLytCommonArrow_c::fn_80168760() {
 
 void dLytCommonArrow_c::displayElement(s32 idx, f32 frame) {
     d2d::AnmGroup_c *s = &mAnmGroups[idx];
-    s->setFrameAndControlThings(frame);
+    s->bind(false);
+    s->setAnimEnable(true);
+    s->setFrame(frame);
 }
 
 void dLytCommonArrow_c::fn_80168800(s32 idx) {
diff --git a/src/d/lyt/d_lyt_pause_disp_00.cpp b/src/d/lyt/d_lyt_pause_disp_00.cpp
index 2e94dcfb..36367537 100644
--- a/src/d/lyt/d_lyt_pause_disp_00.cpp
+++ b/src/d/lyt/d_lyt_pause_disp_00.cpp
@@ -50,5 +50,7 @@ void dLytPauseDisp00_c::init() {
 
 void dLytPauseDisp00_c::displayElement(int i, float frame) {
     d2d::AnmGroup_c *s = &field_0x00D0[i];
-    s->setFrameAndControlThings(frame);
+    s->bind(false);
+    s->setAnimEnable(true);
+    s->setFrame(frame);
 }