d_a_bg 90%

include/JSystem/J3DGraphAnimator/J3DAnimation.h

@@ -367,6 +367,7 @@ public:
 
     u16 getUpdateMaterialID(u16 idx) const { return mUpdateMaterialID[idx]; }
     u16 getUpdateMaterialNum() const { return mTrackNum / 3; }
+    JUTNameTab * getUpdateMaterialName() { return &mMaterialName; }
     u16 getUpdateTexMtxID(u16 idx) const { return mUpdateTexMtxID[idx]; }
 
     u32 getTexMtxCalcType() const { return mTexMtxCalcType; }

include/d/d_com_inf_game.h

@@ -188,7 +188,7 @@ public:
     /* 0x04 */ s32 mTimerNowTimeMs;
     /* 0x08 */ s32 mTimerLimitTimeMs;
     /* 0x0C */ s32 mTimerMode;
-    /* 0x10 */ u8 mTimerType;
+    /* 0x10 */ u16 mTimerType;
 };
 
 class dADM_CharTbl : public cDT {
@@ -1262,6 +1262,7 @@ BOOL dComIfGs_checkSeaLandingEvent(s8 i_roomNo);
 void dComIfGp_setNextStage(const char* i_stageName, s16 i_point, s8 i_roomNo, s8 i_layer,
                            f32 i_lastSpeed, u32 i_lastMode, int, s8 i_wipe);
 dStage_Ship_data* dComIfGp_getShip(int i_roomNo, int param_1);
+bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle);
 
 inline camera_class* dComIfGp_getCamera(int idx) {
     return g_dComIfG_gameInfo.play.getCamera(idx);
@@ -1407,6 +1408,10 @@ inline dBgW* dComIfGp_roomControl_getBgW(int i_roomNo) {
     return dStage_roomControl_c::getBgW(i_roomNo);
 }
 
+inline void dComIfGp_roomControl_setBgW(int i_roomNo, dBgW * i_bgw) {
+    dStage_roomControl_c::setBgW(i_roomNo, i_bgw);
+}
+
 inline s32 dComIfGp_roomControl_getZoneNo(int i_roomNo) {
     return dStage_roomControl_c::getZoneNo(i_roomNo);
 }
@@ -1415,6 +1420,10 @@ inline void dComIfGp_roomControl_setZoneNo(int i_roomNo, int i_zoneNo) {
     dStage_roomControl_c::setZoneNo(i_roomNo, i_zoneNo);
 }
 
+inline dKy_tevstr_c* dComIfGp_roomControl_getTevStr(int room_no) {
+    return g_dComIfG_gameInfo.play.getRoomControl()->getTevStr(room_no);
+}
+
 inline void dComIfGp_roomControl_init() {
     g_dComIfG_gameInfo.play.getRoomControl()->init();
 }
@@ -1435,6 +1444,14 @@ inline void dComIfGp_roomControl_setStatusFlag(int i_roomNo, u8 i_flag) {
     g_dComIfG_gameInfo.play.getRoomControl()->setStatusFlag(i_roomNo, i_flag);
 }
 
+inline void dComIfGp_roomControl_onStatusFlag(int i_roomNo, u8 i_flag) {
+    g_dComIfG_gameInfo.play.getRoomControl()->onStatusFlag(i_roomNo, i_flag);
+}
+
+inline void dComIfGp_roomControl_offStatusFlag(int i_roomNo, u8 i_flag) {
+    g_dComIfG_gameInfo.play.getRoomControl()->offStatusFlag(i_roomNo, i_flag);
+}
+
 inline BOOL dComIfGp_roomControl_checkStatusFlag(int i_roomNo, u8 i_flag) {
     return g_dComIfG_gameInfo.play.getRoomControl()->checkStatusFlag(i_roomNo, i_flag);
 }

include/d/d_flower.h

@@ -54,6 +54,7 @@ public:
     void newData(s8, cXyz&, int, s8);
     void newAnm();
     void setAnm(int, s16);
+    void deleteRoom(s32 roomNo) { mRoom[roomNo].deleteData(); }
 
     virtual void draw();
     virtual ~dFlower_packet_c();

include/d/d_grass.h

@@ -57,6 +57,7 @@ public:
     void newData(cXyz&, int, s8);
     void newAnm();
     void setAnm(int, s16);
+    void deleteRoom(s32 roomNo) { mGrassRoom[roomNo].deleteData(); }
 
     virtual void draw();
     virtual ~dGrass_packet_c();

include/d/d_magma.h

@@ -47,6 +47,7 @@ public:
     void update();
     void checkYpos(cXyz&);
     void newFloor(cXyz&, cXyz&, int, s16);
+    void deleteRoom(s32 roomNo) { mRoom[roomNo].deleteFloor(); }
 
     virtual void draw();
     virtual ~dMagma_packet_c();

include/d/d_tree.h

@@ -70,6 +70,7 @@ public:
     void newData(cXyz&, u8, int);
     void newAnm(s16);
     void setAnm(int, s16);
+    void deleteRoom(s32 roomNo) { mRoom[roomNo].deleteData(); }
 
     virtual void draw();
     virtual ~dTree_packet_c();

include/m_Do/m_Do_lib.h

@@ -22,7 +22,9 @@ struct mDoLib_clipper {
         return mClipper.clip(m, center, radius);
     }
     
-    static s32 clip(J3DModel*);
+    static s32 clip(J3DModel* model) {
+        return mClipper.clipByBox(model);
+    }
 
     static f32 getFar() { return mSystemFar; }
     static f32 getFovyRate() { return mFovyRate; }