d_s_room start

include/d/d_com_inf_game.h

@@ -638,6 +638,10 @@ inline void dComIfGs_initZone() {
     g_dComIfG_gameInfo.save.initZone();
 }
 
+inline u32 dComIfGs_createZone(int i_roomNo) {
+    return g_dComIfG_gameInfo.save.createZone(i_roomNo);
+}
+
 inline u8 dComIfGs_getSelectEquip(int param_0) {
     return g_dComIfG_gameInfo.save.getPlayer().getPlayerStatusA().getSelectEquip(param_0);
 }
@@ -1193,6 +1197,14 @@ inline dBgW* dComIfGp_roomControl_getBgW(int i_roomNo) {
     return dStage_roomControl_c::getBgW(i_roomNo);
 }
 
+inline s32 dComIfGp_roomControl_getZoneNo(int i_roomNo) {
+    return dStage_roomControl_c::getZoneNo(i_roomNo);
+}
+
+inline void dComIfGp_roomControl_setZoneNo(int i_roomNo, int i_zoneNo) {
+    dStage_roomControl_c::setZoneNo(i_roomNo, i_zoneNo);
+}
+
 inline void dComIfGp_roomControl_init() {
     g_dComIfG_gameInfo.play.getRoomControl()->init();
 }
@@ -2000,14 +2012,22 @@ inline void dComIfGp_particle_drawModelParticle() {
     g_dComIfG_gameInfo.play.getParticle()->drawModelParticle();
 }
 
-inline void dComIfGp_particle_readScene(u8 particle_no, mDoDvdThd_toMainRam_c** param_1) {
-    g_dComIfG_gameInfo.play.getParticle()->readScene(particle_no, param_1);
+inline bool dComIfGp_particle_readScene(u8 particle_no, mDoDvdThd_toMainRam_c** param_1) {
+    return g_dComIfG_gameInfo.play.getParticle()->readScene(particle_no, param_1);
 }
 
 inline void dComIfGp_particle_createCommon(const void * pArc) {
     g_dComIfG_gameInfo.play.getParticle()->createCommon(pArc);
 }
 
+inline void dComIfGp_particle_createRoomScene(void * pData) {
+    g_dComIfG_gameInfo.play.getParticle()->createRoomScene(pData);
+}
+
+inline void dComIfGp_particle_removeRoomScene() {
+    g_dComIfG_gameInfo.play.getParticle()->removeRoomScene();
+}
+
 /**
  * === ATTENTION ===
  */

include/d/d_map.h

@@ -9,8 +9,8 @@ public:
     static bool isEnableDispMap();
     void getKindMapType();
     static void remove();
-    void setImage(int, int, f32);
-    void deleteImage(int);
+    static void setImage(int, int, f32);
+    static void deleteImage(int);
     void setNowRoom(int);
     void mapDrawIconFree(s16, s16, u8);
     void mapDrawIconSelf(s16, s16, u8);

include/d/d_particle.h

@@ -349,7 +349,7 @@ public:
     void swapFrameBufferTexture();
     void createCommon(void const*);
     void createRoomScene(void const*);
-    void readScene(u8, mDoDvdThd_toMainRam_c**);
+    bool readScene(u8, mDoDvdThd_toMainRam_c**);
     void createScene(void const*);
     void removeRoomScene();
     void removeScene();

include/d/d_stage.h

@@ -238,7 +238,7 @@ struct dStage_SoundInfo_c {
 
 class dStage_FileList_dt_c {
 public:
-    /* 0x0 */ int mParam;
+    /* 0x0 */ u32 mParam;
     /* 0x4 */ f32 mSkyboxY;
 };
 
@@ -252,7 +252,10 @@ struct dStage_dPnt_c {
 
 struct dStage_FloorInfo_c {};
 
-struct dStage_Lbnk_c {};
+struct dStage_Lbnk_c {
+    /* 0x00 */ u32 m_num;
+    /* 0x04 */ u8 * m_bank;
+};
 
 struct dStage_MemoryConfig_data {
     /* 0x0 */ u8 m_roomNo;
@@ -820,7 +823,9 @@ public:
     static JKRExpHeap* getMemoryBlock(int);
     static void setStayNo(int);
     static s32 GetTimePass();
-    static void setZoneNo(int, int);
+    static void setZoneNo(int i_roomNo, int i_zoneNo) {
+        mStatus[i_roomNo].mZoneNo = i_zoneNo;
+    }
     static int getZoneNo(int i_roomNo);
 
     static s8 getStayNo() { return mStayNo; }
@@ -830,9 +835,7 @@ public:
     static void onStatusDraw(int i_roomNo) { mStatus[i_roomNo].mDraw = true; }
     static void setProcID(u32 id) { mProcID = id; }
     static u32 getProcID() { return mProcID; }
-    static void setStatusProcID(int i_roomNo, unsigned int i_id) {
-        mStatus[i_roomNo].mProcID = i_id;
-    }
+    static void setStatusProcID(int i_roomNo, unsigned int i_id) { mStatus[i_roomNo].mProcID = i_id; }
     static int getStatusProcID(int i_roomNo) { return mStatus[i_roomNo].mProcID; }
     static dStage_darkStatus_c& getDarkStatus(int i_idx) { return mDarkStatus[i_idx]; }
     static char* getDemoArcName() { return mDemoArcName; }
@@ -928,6 +931,9 @@ s8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class&, int);
 int dStage_mapInfo_GetOceanZ(stage_map_info_class*);
 int dStage_mapInfo_GetOceanX(stage_map_info_class*);
 void dStage_infoCreate();
+void dStage_escapeRestart();
+void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* i_stage);
+void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* i_stage, int i_roomNo);
 
 dStage_objectNameInf* dStage_searchName(const char*);
 const char* dStage_getName2(s16 i_procName, s8 i_subtype);
@@ -976,4 +982,4 @@ inline int dStage_FileList_dt_GlobalWindLevel(dStage_FileList_dt_c* i_fili) {
     return (i_fili->mParam >> 0x12) & 3;
 }
 
-#endif /* D_D_STAGE_H */
+#endif /* D_D_STAGE_H */

include/f_op/f_op_scene_mng.h

@@ -20,6 +20,10 @@ inline u32 fpcM_LayerID(const void* pProc) {
                0xFFFFFFFF;
 }
 
+inline layer_class * fpcM_Layer(const void* pProc) {
+    return &((process_node_class*)pProc)->mLayer;
+}
+
 inline u32 fopScnM_GetID(void* proc) {
     return fpcM_GetID(proc);
 }