d_kankyo_data and d_kankyo work (#158)

* Copy over progress * Comment other d_kankyo_data dat section stuff * Compiling * Progress * Progress * Close * Match * Clean * Change loop * Clean * Clean * Before attempt clean * Work on dKy_F_SP121Check, not compiling * Adjust comparisons * Adjust headers * Close * Matching * Remove * Comments * Fix u8 pointer * Comment * Adjust * Comment stage names * Rename member * Decomp dKy_darkworld_spot_check * Decomp dKy_darkworld_Area_set * Adjust * Comments, small adjust * Add phase1 base txt * Working through d_s_play phase_1 * Finish function outline * Comments * Add darkLv enum * Rename enum * Refactor * Comment * Documentation * Move out notes * Comments * Adjust * Rename structs * Comments * Minor adjust * Comment * Adjust and Comments * Adjust * Adjust * Comment * Clean * Add back addresses * Adjust comment * Adjust comments * Comments * Comment * Adjust for clang-format-10 * Edit getName * Fix fog table * Make l_field_data use placeholder struct * Make l_envr_default use placeholder struct * Make l_vr_box_data use placeholder struct * Make l_pselect_default use placeholder struct
2026-08-09 10:22:16 -04:00 · 2021-12-02 16:43:22 -06:00
parent df0aabc1b9
commit f944135644
9 changed files with 588 additions and 1005 deletions
@@ -157,7 +157,7 @@ public:
    void setMaxOxygen(int max) { mMaxOxygen = max; }
    u8 getDoStatus() { return mDoStatus; }
    u8 getRStatus() { return mRStatus; }
-    char* getStartStageName() { return mStartStage.getName(); }
+    const char* getStartStageName() { return mStartStage.getName(); }
    s8 getStartStageRoomNo() { return mStartStage.getRoomNo(); }
    s8 getStartStageLayer() { return mStartStage.getLayer(); }
    u8 isHeapLockFlag() { return mHeapLockFlag; }
@@ -173,6 +173,8 @@ public:
    dAttention_c& getAttention() { return mAttention; }
    JKRArchive* getMsgDtArchive(int idx) { return mMsgDtArchive[idx]; }
    s16 getStartStagePoint() { return mStartStage.getPoint(); }
+    s8 getStartStageDarkArea() { return mStartStage.getDarkArea(); }
+    void setStartStageDarkArea(s8 darkArea) { mStartStage.setDarkArea(darkArea); }
    void* getPlayerPtr(int ptrIdx) { return mPlayerPtr[ptrIdx]; }
    JKRArchive* getMain2DArchive() { return mMain2DArchive; }
    J2DGrafContext* getCurrentGrafPort() { return mCurrentGrafPort; }
@@ -741,7 +743,7 @@ inline u32 dComIfGp_getNowVibration() {
    return g_dComIfG_gameInfo.play.getNowVibration();
 }

-inline char* dComIfGp_getStartStageName() {
+inline const char* dComIfGp_getStartStageName() {
    return g_dComIfG_gameInfo.play.getStartStageName();
 }

@@ -757,6 +759,10 @@ inline s8 dComIfGp_roomControl_getStayNo() {
    return dStage_roomControl_c::getStayNo();
 }

+inline void dComIfGp_setStartStage(dStage_startStage_c* pStartStage) {
+    g_dComIfG_gameInfo.play.setStartStage(pStartStage);
+}
+
 inline s8 dComIfGp_getStartStageRoomNo() {
    return g_dComIfG_gameInfo.play.getStartStageRoomNo();
 }
@@ -765,6 +771,14 @@ inline s8 dComIfGp_getStartStageLayer() {
    return g_dComIfG_gameInfo.play.getStartStageLayer();
 }

+inline s8 dComIfGp_getStartStageDarkArea() {
+    return g_dComIfG_gameInfo.play.getStartStageDarkArea();
+}
+
+inline void dComIfGp_setStartStageDarkArea(s8 darkArea) {
+    g_dComIfG_gameInfo.play.setStartStageDarkArea(darkArea);
+}
+
 inline roomRead_class* dComIfGp_getStageRoom() {
    return g_dComIfG_gameInfo.play.getStage().getRoom();
 }