d_s_play OK, work on d_a_ykgr (#2035)

6 files changed, 34 insertions, 13 deletions

diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index 86f902daa0..64b06fdf3b 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -808,6 +808,7 @@ extern dComIfG_inf_c g_dComIfG_gameInfo;
 extern GXColor g_blackColor;
 extern GXColor g_clearColor;
 extern GXColor g_whiteColor;
+extern GXColor g_saftyWhiteColor;
 
 int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*);
 BOOL dComIfG_resetToOpening(scene_class* scene);
@@ -1835,6 +1836,10 @@ inline void dComIfGs_setBButtonItemKey(u8 i_itemNo) {
     g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(4, i_itemNo);
 }
 
+inline void dComIfGs_offPlayerFieldLastStayFieldDataExistFlag() {
+    g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().offFieldDataExistFlag();
+}
+
 void dComIfGp_setSelectItem(int index);
 s32 dComIfGp_offHeapLockFlag(int flag);
 void dComIfGp_createSubExpHeap2D();
@@ -1886,6 +1891,10 @@ inline void dComIfGp_itemDataInit() {
     g_dComIfG_gameInfo.play.itemInit();
 }
 
+inline void dComIfGp_init() {
+    g_dComIfG_gameInfo.play.init();
+}
+
 inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
     return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag);
 }
@@ -2966,6 +2975,10 @@ inline void dComIfGp_createSimpleModel() {
     g_dComIfG_gameInfo.play.createSimpleModel();
 }
 
+inline void dComIfGp_deleteSimpleModel() {
+    g_dComIfG_gameInfo.play.deleteSimpleModel();
+}
+
 inline void i_dComIfGp_setHitMark(u16 i_hitmark, fopAc_ac_c* param_1, const cXyz* param_2,
                                   const csXyz* param_3, const cXyz* param_4, u32 i_atType) {
     g_dComIfG_gameInfo.play.getParticle()->setHitMark(i_hitmark, param_1, param_2, param_3, param_4,
@@ -3137,6 +3150,10 @@ inline void i_dComIfGp_event_reset() {
     g_dComIfG_gameInfo.play.getEvent().reset();
 }
 
+inline void i_dComIfGp_event_remove() {
+    g_dComIfG_gameInfo.play.getEvent().remove();
+}
+
 inline void dComIfGp_event_onEventFlag(u16 i_flag) {
     g_dComIfG_gameInfo.play.getEvent().onEventFlag(i_flag);
 }
diff --git a/include/d/d_model.h b/include/d/d_model.h
index f42868549e..9dc33d0ef2 100644
--- a/include/d/d_model.h
+++ b/include/d/d_model.h
@@ -44,7 +44,7 @@ public:
     /* 8009C724 */ dMdl_c* entry(J3DModelData*, u16, dKy_tevstr_c*);
     /* 8009C8D8 */ static dMdl_c* entry(J3DModelData*, u16, int);
     /* 8009C7AC */ static void create();
-    /* 8009C864 */ void remove();
+    /* 8009C864 */ static void remove();
     /* 8009C8C0 */ static void reset();
 
     static dMdl_mng_c* m_myObj;
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index a7f0e7ee3d..128e6dcfdb 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -997,11 +997,12 @@ static int dStage_fieldMapMapPathInit(dStage_dt_c*, void*, int, void*);
 s8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class&, int);
 int dStage_changeScene(int i_exitId, f32 i_speed, u32 i_mode, s8 i_roomNo, s16 i_angle, int i_layerOverride);
 void dStage_infoCreate();
-u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer);
+u32 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer);
 int dStage_changeSceneExitId(cBgS_PolyInfo& param_0, f32 speed, u32 mode, s8 roomNo, s16 angle);
 int dStage_changeScene4Event(int i_exitId, s8 room_no, int i_wipe, bool param_3, f32 speed,
                              u32 mode, s16 angle, int param_7);
 void dStage_Create();
+void dStage_Delete();
 static s32 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0);
 void dStage_restartRoom(u32 roomParam, u32 mode, int param_2);
 class cBgS_GndChk;
@@ -1043,7 +1044,7 @@ inline u32 dStage_stagInfo_GetMiniMap(stage_stag_info_class* pstag) {
     return (pstag->field_0x0a >> 0xD) & 7;
 }
 
-inline u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info) {
+inline u32 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info) {
     return (p_info->field_0x0a >> 0x3) & 0xFF;
 }
 
diff --git a/include/d/s/d_s_play.h b/include/d/s/d_s_play.h
index 6de31dc345..f81d367e50 100644
--- a/include/d/s/d_s_play.h
+++ b/include/d/s/d_s_play.h
@@ -16,29 +16,29 @@ public:
 
 class dScnPly_reg_HIO_c {
 public:
-    /* 8025AD78 */ virtual ~dScnPly_reg_HIO_c();
+    /* 8025AD78 */ virtual ~dScnPly_reg_HIO_c() {}
 
-#ifdef DEBUG
     /* 0x4 */ u8 field_0x4[0x8 - 0x4];
+#ifdef DEBUG
     /* 0x8 */ dScnPly_reg_childHIO_c mChildReg[26];
 #endif
 };
 
 class mDoHIO_entry_c {
 public:
-    virtual ~mDoHIO_entry_c();
+    virtual ~mDoHIO_entry_c() {}
 };
 
 class dScnPly_preLoad_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 8025ADC0 */ virtual ~dScnPly_preLoad_HIO_c();
+    /* 8025ADC0 */ virtual ~dScnPly_preLoad_HIO_c() {}
 };
 
 class dScnPly_env_otherHIO_c {
 public:
     /* 80259440 */ dScnPly_env_otherHIO_c();
 
-    /* 8025AC0C */ virtual ~dScnPly_env_otherHIO_c();
+    /* 8025AC0C */ virtual ~dScnPly_env_otherHIO_c() {}
 
     /* 0x4 */ f32 mShadowDensity;
     /* 0x8 */ u8 mLODBias;
@@ -50,7 +50,7 @@ class dScnPly_env_debugHIO_c {
 public:
     /* 80259468 */ dScnPly_env_debugHIO_c();
 
-    /* 8025ABC4 */ virtual ~dScnPly_env_debugHIO_c();
+    /* 8025ABC4 */ virtual ~dScnPly_env_debugHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -62,9 +62,9 @@ private:
 
 class dScnPly_env_HIO_c {
 public:
-    /* 8025AD04 */ virtual ~dScnPly_env_HIO_c();
+    /* 8025AD04 */ virtual ~dScnPly_env_HIO_c() {}
 
-    /* 0x04 */ u8 field_0x4;
+    /* 0x04 */ s8 field_0x4;
     /* 0x08 */ dScnPly_env_otherHIO_c mOther;
     /* 0x14 */ dScnPly_env_debugHIO_c mDebug;
 };
@@ -90,8 +90,8 @@ public:
     /* 0x1D4 */ u8 field_0x1d4;
 };
 
-extern u8 g_envHIO[68];
-extern u8 g_regHIO[4];
+extern dScnPly_env_HIO_c g_envHIO;
+extern dScnPly_reg_HIO_c g_regHIO;
 
 /**
  * === Register Usage ===
diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h
index a81b6c93dd..31569a7e42 100644
--- a/include/d/save/d_save.h
+++ b/include/d/save/d_save.h
@@ -509,6 +509,7 @@ public:
     void set(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_spawn, u8 i_regionNo);
 
     bool isFieldDataExistFlag() const { return mFieldDataExistFlag; }
+    void offFieldDataExistFlag() { mFieldDataExistFlag = false; }
 
 private:
     /* 0x00 */ cXyz mPos;
diff --git a/include/d/save/d_save_HIO.h b/include/d/save/d_save_HIO.h
index 032fed4d21..3239bb29d8 100644
--- a/include/d/save/d_save_HIO.h
+++ b/include/d/save/d_save_HIO.h
@@ -228,4 +228,6 @@ public:
 
 STATIC_ASSERT(sizeof(dSvBit_HIO_c) == 0x4A0);
 
+extern dSvBit_HIO_c g_save_bit_HIO;
+
 #endif /* D_SAVE_D_SAVE_HIO_H */