diff --git a/include/SMS/Camera/CubeManagerBase.hxx b/include/SMS/Camera/CubeManagerBase.hxx
index d188e25..240a56e 100644
--- a/include/SMS/Camera/CubeManagerBase.hxx
+++ b/include/SMS/Camera/CubeManagerBase.hxx
@@ -18,7 +18,7 @@ public:
 
     void calcPointInCubeRatio(const Vec &, s32, f32 *, f32 *, f32 *) const;
     s32 getDataNo(s32) const;
-    s32 getInCubeNo(const Vec &pos) const;
+    u32 getInCubeNo(const Vec &pos) const;
     bool isInCube(const Vec &pos, s32) const;
 
     template <typename CubeT>
@@ -30,6 +30,7 @@ public:
     u8 mCubeMax;
     void *mCubeInfo;
     const char *mCubeKey;
+    u32 mCurrentCube;
 };
 
 extern TCubeManagerBase *gpCubeMirror;
diff --git a/include/SMS/Enemy/SpineEnemy.hxx b/include/SMS/Enemy/SpineEnemy.hxx
index f06d11b..11a3571 100644
--- a/include/SMS/Enemy/SpineEnemy.hxx
+++ b/include/SMS/Enemy/SpineEnemy.hxx
@@ -64,7 +64,7 @@ public:
     void walkToCurPathNode(f32, f32, f32);
     void zigzagToCurPathNode(f32, f32, f32, f32);
 
-    u32 _F4;
+    THitActor* mTarget;
     f32 _F8;
     f32 _FC;
     f32 _100;
diff --git a/include/SMS/Player/MarioGamePad.hxx b/include/SMS/Player/MarioGamePad.hxx
index 021b555..fb9f29a 100644
--- a/include/SMS/Player/MarioGamePad.hxx
+++ b/include/SMS/Player/MarioGamePad.hxx
@@ -55,9 +55,16 @@ public:
     struct {
         u16 _00         : 8;
         bool mDisable   : 1;
-        u8 _01          : 5;
+        bool _01        : 1;
+        bool _02        : 1;
+        bool _03        : 1;
+        bool mIsTalking : 1;
+        bool _05        : 1;
+        bool _06        : 1;
+        bool _07        : 1;
+        bool _08        : 1;
         bool mReadInput : 1;
-        u8 _02          : 1;
+        u8 _09          : 1;
     } mState;  // 0x00E2
 
     u16 _E4;
diff --git a/include/SMS/System/MarDirector.hxx b/include/SMS/System/MarDirector.hxx
index 674d927..ac1c67a 100644
--- a/include/SMS/System/MarDirector.hxx
+++ b/include/SMS/System/MarDirector.hxx
@@ -72,8 +72,8 @@ public:
     s32 setup(JDrama::TDisplay *, TMarioGamePad **, u8 areaID, u8 episodeID);
 
     TMarioGamePad **mGamePads;
-    TPerformList *mPerformListGX;
-    TPerformList *mPerformListSilhouette;
+    TPerformList *mPerformListGX;          // 0x001c
+    TPerformList *mPerformListSilhouette;  // 0x0020
     TPerformList *mPerformListGXPost;      // 0x0024
     TPerformList *mPerformListMovement;    // 0x0028
     TPerformList *mPerformListCalcAnim;    // 0x002C
diff --git a/include/SMS/raw_fn.hxx b/include/SMS/raw_fn.hxx
index 56b8e73..9a416b8 100644
--- a/include/SMS/raw_fn.hxx
+++ b/include/SMS/raw_fn.hxx
@@ -2654,6 +2654,7 @@
 #define __dt__16TNerveBossEelEatFv                                      ((int (*)(...))0x800D0BF4)
 #define __dt__26TNerveBossEelMouthOpenWaitFv                            ((int (*)(...))0x800D0CB4)
 #define execute__16TNerveBossEelDieCFP24TSpineBase_1                    ((int (*)(...))0x800D0D10)
+#define execute__16TNerveBossEelEatCFP24TSpineBase_1                    ((int (*)(...))0x800D1250)
 #define theNerve__16TNerveBossEelDieFv                                  ((int (*)(...))0x800D1190)
 #define __dt__16TNerveBossEelDieFv                                      ((int (*)(...))0x800D11F4)
 #define __dt__22TNerveBossEelQuickBackFv                                ((int (*)(...))0x800D1884)
@@ -6341,6 +6342,7 @@
 #define changeNerveFromTalk___8TBaseNPCFv                               ((int (*)(...))0x80214788)
 #define isNerveCanGoToMad__8TBaseNPCCFv                                 ((int (*)(...))0x80214970)
 #define isNerveCanGoToTalk__8TBaseNPCCFv                                ((int (*)(...))0x80214A14)
+#define isNerveMaybeDontCalcAnim0__8TBaseNPCCFv                         ((int (*)(...))0x80214bb8)
 #define isNerveMaybeDontCalcAnim1__8TBaseNPCCFv                         ((int (*)(...))0x80214B44)
 #define isNerveMaybeDontMovement__8TBaseNPCCFv                          ((int (*)(...))0x80214C20)
 #define isNerveWalk__8TBaseNPCCFv                                       ((int (*)(...))0x80214C94)