shand OK, ship 99.8%, add some missing inlines

include/d/actor/d_a_grid.h

@@ -22,11 +22,11 @@ public:
     bool _draw();
 
 public:
-    /* 0x0290 */ u8 m0290[0x2216 - 0x290];
+    /* 0x0290 */ u8 m0290[0x2200 - 0x290];
+    /* 0x2200 */ f32 m2200;
+    /* 0x2204 */ u8 m2219[0x2216 - 0x2204];
     /* 0x2216 */ s16 m2216;
     /* 0x2218 */ u8 m2218;
-    /* 0x2219 */ u8 m2219[0x2220 - 0x2219];
-    /* 0x2220 */ f32 m2220;
 };
 
 class daHo_HIO_c {

include/d/actor/d_a_ship.h

@@ -81,7 +81,7 @@ public:
     void getBeltSpeed() const {}
     void getBodyMtx() {}
     s16 getCannonAngleX() const { return shape_angle.x + m0396 - 0x4000; }
-    void getCannonAngleY() const {}
+    s16 getCannonAngleY() const { return shape_angle.y + m0394; }
     void getCraneAngle() const {}
     void getCraneBaseAngle() const {}
     void getCraneHookAngleY() const {}
@@ -125,8 +125,8 @@ public:
     void onShortHitFlg() {}
     void onStateFlg(daSHIP_SFLG flag) { mStateFlag |= flag; }
     void onTornadoFlg(u32 tornadoID) { mTornadoID = tornadoID; }
-    void onWhirlFlg(unsigned long, short) {}
-    void onWhirlFlgDirect(unsigned long, short) {}
+    void onWhirlFlg(u32, s16) {}
+    void onWhirlFlgDirect(u32, s16) {}
     void setAtnPos(const cXyz*) {}
     void setCannon() {}
     void setCrane() {}

include/d/d_com_inf_game.h

@@ -2977,7 +2977,7 @@ inline s32 dComIfGp_demo_mode() {
 }
 
 inline dDemo_actor_c* dComIfGp_demo_getActor(u8 id) {
-    return g_dComIfG_gameInfo.play.getDemo()->mDemoObj.getActor(id);
+    return g_dComIfG_gameInfo.play.getDemo()->getObject()->getActor(id);
 }
 
 /**

include/d/d_demo.h

@@ -241,6 +241,10 @@ public:
     void remove();
     bool update();
 
+    dDemo_system_c* getSystem() { return mSystem;}
+    JStudio::TControl* getControl() { return mControl; }
+    dMesg_tControl* getMesgControl() { return mMesgControl; }
+    dDemo_object_c* getObject() { return &mDemoObj; }
     int getFrame() { return mFrame; }
     u32 getFrameNoMsg() { return mFrameNoMsg; }
     s32 getMode() { return mMode; }

include/m_Do/m_Do_ext.h

@@ -33,6 +33,7 @@ public:
     f32 getEndFrame() { return mFrameCtrl->getEnd(); }
     void setFrame(f32 frame) { mFrameCtrl->setFrame(frame); }
     void setPlayMode(int i_mode) { mFrameCtrl->setAttribute(i_mode); }
+    f32 getLoopFrame() { return mFrameCtrl->getLoop(); }
     void setLoopFrame(f32 i_frame) { mFrameCtrl->setLoop(i_frame); }
     BOOL isStop() {
         return mFrameCtrl->checkState(J3DFrameCtrl::STATE_STOP_E) || mFrameCtrl->getRate() == 0.0f;
@@ -52,6 +53,7 @@ public:
     void entry(J3DModelData *i_modelData, f32 i_frame);
 
     void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
+    void entry(J3DMaterialTable* i_matTable) { entry(i_matTable, getFrame()); }
     int init(J3DModelData* i_modelData, J3DAnmTextureSRTKey* i_btk, BOOL i_anmPlay, int i_attribute,
              f32 i_rate, s16 i_start, s16 i_end, bool i_modify, BOOL i_entry);
 
@@ -179,6 +181,9 @@ public:
 
     int init(J3DModelData*, J3DAnmTransform*, int, int, f32, s16, s16, bool);
 
+    // TODO
+    void entry(J3DModel* i_model) {}
+
 private:
     /* 0x08 */ J3DAnmVisibilityFull* mpAnm;
     /* 0x0C */ J3DVisibilityManager* field_0xc;
@@ -595,6 +600,9 @@ public:
     void update(u16, GXColor&, dKy_tevstr_c*);
     int getMaterialID();
 
+    cXyz* getPos(int i_idx) { return mpLines[i_idx].mpSegments; }
+    u8* getSize(int i_idx) { return mpLines[i_idx].mpSize; }
+
 public:
     /* 0x08 */ GXColor mColor;
     /* 0x0C */ dKy_tevstr_c* mpTevStr;
@@ -614,6 +622,9 @@ public:
     void update(u16, GXColor&, dKy_tevstr_c*);
     int getMaterialID();
 
+    cXyz* getPos(int i_idx) { return mpLines[i_idx].mpSegments; }
+    u8* getSize(int i_idx) { return mpLines[i_idx].mpSize; }
+
 public:
     /* 0x08 */ GXTexObj mTexObj;
     /* 0x28 */ GXColor mColor;
@@ -622,10 +633,26 @@ public:
     /* 0x32 */ u16 mMaxSegments;
     /* 0x34 */ u16 mNumSegments;
     /* 0x36 */ u8 mCurArr;
-    /* 0x37 */ u8 m37[0x38 - 0x37];
     /* 0x38 */ mDoExt_3Dline_c* mpLines;
 };
 
+// The following classes only appear in the debug maps and seem unused:
+// mDoExt_ArrowPacket
+// mDoExt_circlePacket
+// mDoExt_cube8pPacket
+// mDoExt_cubePacket
+// mDoExt_cylinderMPacket
+// mDoExt_cylinderPacket
+// mDoExt_linePacket
+// mDoExt_pointPacket
+// mDoExt_quadPacket
+// mDoExt_spherePacket
+// mDoExt_trianglePacket
+
+inline void mDoExt_bckAnmRemove(J3DModelData* i_modelData) {
+    i_modelData->getJointNodePointer(0)->setMtxCalc(NULL);
+}
+
 J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u32 i_differedDlistFlag);
 
 void mDoExt_modelUpdate(J3DModel* i_model);