Merge pull request #356 from hatal175/d_com_cursor

Work on d_select_cursor and d_com_static

4 files changed, 27 insertions, 11 deletions

diff --git a/include/d/d_select_cursor.h b/include/d/d_select_cursor.h
index 698156c485..fcea7acd66 100644
--- a/include/d/d_select_cursor.h
+++ b/include/d/d_select_cursor.h
@@ -14,8 +14,7 @@ public:
 
     /* 80195978 */ virtual ~dSelect_cursorHIO_c();
 
-private:
-    /* 0x04 */ u8 field_0x4;
+    /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 field_0x8;
     /* 0x0C */ f32 mXAxisExpansion;
     /* 0x10 */ f32 mYAxisExpansion;
@@ -58,6 +57,7 @@ public:
 
     void onPlayAnime(int i_flag) { field_0xb4 |= (1 << i_flag); }
     void offPlayAnime(int i_flag) { field_0xb4 &= ~(1 << i_flag); }
+    bool chkPlayAnime(int i_flag) { return field_0xb4 & (1 << i_flag); }
     void onPlayAllAnime() { field_0xb4 = 0xff; }
     void offPlayAllAnime() { field_0xb4 = 0; }
 
@@ -66,9 +66,16 @@ private:
     /* 0x08 */ J2DPane* mpPane;
     /* 0x0C */ dSelect_icon_c* mpSelectIcon;
     /* 0x10 */ CPaneMgr* mpPaneMgr;
-    /* 0x14 */ u8 field_0x14[40];
+    /* 0x14 */ CPaneMgr* field_0x14;
+    /* 0x18 */ CPaneMgr* field_0x18;
+    /* 0x18 */ CPaneMgr* field_0x1C[4];
+    /* 0x2C */ J2DAnmTransformKey* field_0x2C;
+    /* 0x30 */ J2DAnmColor* field_0x30;
+    /* 0x34 */ J2DAnmTextureSRTKey* field_0x34[2];
     /* 0x3C */ dSelect_cursorHIO_c* mpCursorHIO;
-    /* 0x40 */ u8 field_0x40[16];
+    /* 0x40 */ f32 field_0x40;
+    /* 0x44 */ f32 field_0x44;
+    /* 0x48 */ f32 field_0x48[2];
     /* 0x50 */ f32 field_0x50;
     /* 0x54 */ f32 field_0x54;
     /* 0x58 */ f32 mPositionX;
@@ -78,11 +85,12 @@ private:
     /* 0x68 */ f32 mParam3;
     /* 0x6C */ f32 mParam4;
     /* 0x70 */ f32 mParam5;
-    /* 0x74 */ u8 field_0x74[32];
+    /* 0x74 */ f32 field_0x74[4];
+    /* 0x84 */ f32 field_0x84[4];
     /* 0x94 */ f32 field_0x94[4];
     /* 0xA4 */ f32 field_0xa4[4];
     /* 0xB4 */ u8 field_0xb4;
-    /* 0xB5 */ s8 mNameIdx;
+    /* 0xB5 */ u8 mNameIdx;
     /* 0xB6 */ u8 field_0xb6;
     /* 0xB7 */ bool mUpdateFlag;
 };
diff --git a/include/d/d_select_icon.h b/include/d/d_select_icon.h
index de1814657b..34fc301b96 100644
--- a/include/d/d_select_icon.h
+++ b/include/d/d_select_icon.h
@@ -17,8 +17,13 @@ public:
     /* 80195A3C */ void animation();
     /* 80195B40 */ void setAlpha(u8);
     /* 80195B70 */ void setPos(J2DPane*, f32, f32);
+    virtual ~dSelect_icon_c() {}
 
-    /* 0x00 */ u8 field_0x0[8];
+    void drawSelf() {
+        // Not sure what field_0x4 is
+    }
+
+    /* 0x04 */ u8 field_0x4[4];
     /* 0x08 */ J2DScreen* field_0x8;
     /* 0x0C */ CPaneMgrAlpha* field_0xc;
     /* 0x10 */ CPaneMgr* field_0x10;
diff --git a/include/rel/d/a/d_a_suspend/d_a_suspend.h b/include/rel/d/a/d_a_suspend/d_a_suspend.h
index 97eb0a4a7d..4449d0580a 100644
--- a/include/rel/d/a/d_a_suspend/d_a_suspend.h
+++ b/include/rel/d/a/d_a_suspend/d_a_suspend.h
@@ -19,6 +19,8 @@ public:
         void setNext(data_c* i_next) { mpNext = i_next; }
         data_c* getNext() { return mpNext; }
         u8 getType() { return mType; }
+        bool isUsed() { return mRoomNo < 0; }
+        s8 getRoomNo() { return mRoomNo; }
 
         /* 0x00 */ s8 mRoomNo;
         /* 0x01 */ bool field_0x1;
@@ -35,11 +37,12 @@ public:
         /* 80031190 */ void add(daSus_c::data_c*);
         /* 800311FC */ void reset();
         /* 80031EE4 */ room_c();
+        void init() { mpData = NULL; }
 
         /* 0x0 */ data_c* mpData;
     };  // Size: 0x4
 
-    /* 80031248 */ static void newData(s8, cXyz const&, cXyz const&, u8, u8, u8);
+    /* 80031248 */ static int newData(s8, cXyz const&, cXyz const&, u8, u8, u8);
     /* 800313BC */ void reset();
     /* 800314D4 */ static void check(fopAc_ac_c*);
     /* 80031434 */ static bool check(s8 i_roomNo, cXyz const& i_pos);
diff --git a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
index 47be9da007..edb85d9da9 100644
--- a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
+++ b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
@@ -29,8 +29,8 @@ public:
     /* 80031CF8 */ static void clrSaveFlag();
     /* 80031D04 */ static void setSaveFlag();
     /* 80031D10 */ static bool chkSaveFlag();
-    /* 80031D24 */ void getPos(int);
-    /* 80031D38 */ void savePos(int, cXyz);
+    /* 80031D24 */ static const cXyz& getPos(int);
+    /* 80031D38 */ static void savePos(int, cXyz);
     /* 80031D64 */ static void onSttsFlag(int, u8);
     /* 80031D78 */ static void offSttsFlag(int, u8);
     /* 80031D8C */ static u8 chkSttsFlag(int, u8);
@@ -185,7 +185,7 @@ public:
     s32 getType() { return mType; }
 
     static u8 const mData[2072];
-    static u8 mPos[60];
+    static Vec mPos[5];
     static u8 mSttsFlag[5];
     static s8 mRoomNo[5];
     static bool mSaveFlag;