m_Do_main / f_ap_game / f_op_actor debug work and misc (#2744)

* m_Do_main / f_ap_game debug stuff

* revolution sdk compatibility

* f_op_actor debug work

* rename fopAcM_SetupActor to fopAcM_ct

* fix build

* fix jp/pal splits

include/d/actor/d_a_alink.h

@@ -3750,9 +3750,9 @@ public:
     s16 getHookshotStopTime() const { return field_0x3026; }
     bool getHookshotLeft() const { return field_0x3020 == 0; }
 
-    static int getBallModelIdx() { return 0x25; }
-    static int getBallBtkIdx() { return 0x49; }
-    static int getBallBrkIdx() { return 0x41; }
+    static u16 getBallModelIdx() { return 0x25; }
+    static u16 getBallBtkIdx() { return 0x49; }
+    static u16 getBallBrkIdx() { return 0x41; }
 
     bool checkRootTransClearMode() { return field_0x2f99 & 7; }
     bool checkRootTransZClearMode() { return field_0x2f99 & 4; }
@@ -3828,6 +3828,8 @@ public:
 
     u16 getReadyItem() { return dComIfGp_getSelectItem(mSelectItemId); }
 
+    static u32 getOtherHeapSize() { return 0xF0A60; }
+
     static daAlink_BckData const m_mainBckShield[20];
     static daAlink_BckData const m_mainBckSword[5];
     static daAlink_BckData const m_mainBckFishing[28];

include/d/actor/d_a_guard_mng.h

@@ -56,7 +56,7 @@ public:
     }
 
     int create() {
-        fopAcM_SetupActor(this, daGuardMng_c);
+        fopAcM_ct(this, daGuardMng_c);
         create_init();
         return cPhs_COMPLEATE_e;
     }

include/d/actor/d_a_midna.h

@@ -391,6 +391,8 @@ public:
         onStateFlg0(daMidna_FLG0(FLG0_PORTAL_OBJ_CALL | FLG0_TAG_WAIT));
     }
 
+    static u32 getOtherHeapSize() { return 0x1D0; }
+
     static daMidna_texData_s const m_texDataTable[21];
     static daMidna_anmData_s const m_anmDataTable[53];
 

include/d/actor/d_a_tag_arena.h

@@ -6,7 +6,7 @@
 class daTagArena_c : public fopAc_ac_c {
 public:
     int create() {
-        fopAcM_SetupActor(this, daTagArena_c);
+        fopAcM_ct(this, daTagArena_c);
         return cPhs_COMPLEATE_e;
     }
 

include/d/actor/d_a_tag_assistance.h

@@ -11,7 +11,7 @@ public:
     }
 
     int create() {
-        fopAcM_SetupActor(this, daTagAssist_c);
+        fopAcM_ct(this, daTagAssist_c);
         create_init();
         return cPhs_COMPLEATE_e;
     }

include/d/actor/d_a_tag_chkpoint.h

@@ -14,7 +14,7 @@ public:
     u8 getSwBit2() { return fopAcM_GetParam(this) >> 16; }
 
     int create() {
-        fopAcM_SetupActor(this, daTag_Chk_c);
+        fopAcM_ct(this, daTag_Chk_c);
 
         if (getAreaType() == 0) {
             scale.x *= 50.0f;

include/d/actor/d_a_tag_gra.h

@@ -30,7 +30,7 @@ public:
     }
 
     int create() {
-        fopAcM_SetupActor(this, daTagGra_c);
+        fopAcM_ct(this, daTagGra_c);
 
         if (getMode() == 2) {
             if (dComIfGs_isSwitch(getSwBit(),fopAcM_GetRoomNo(this))) {

include/d/actor/d_a_tag_schedule.h

@@ -6,7 +6,7 @@
 class daTagSchedule_c : public fopAc_ac_c {
 public:
     int create() {
-        fopAcM_SetupActor(this, daTagSchedule_c);
+        fopAcM_ct(this, daTagSchedule_c);
         return cPhs_COMPLEATE_e;
     }
 

include/d/actor/d_a_tag_theB_hint.h

@@ -68,7 +68,7 @@ public:
     }    
 
     int create() {
-        fopAcM_SetupActor(this, daTagTheBHint_c);
+        fopAcM_ct(this, daTagTheBHint_c);
         field_0x568 = pow(scale.x * 100.0f,2.0f);
         return cPhs_COMPLEATE_e;
     }

include/d/d_attention.h

@@ -249,6 +249,7 @@ public:
     void runDebugDisp0();
 #endif
 
+    JKRSolidHeap* getHeap() { return heap; }
     fopAc_ac_c* getCatghTarget() { return mCatghTarget.getCatghTarget(); }
     fopAc_ac_c* getZHintTarget() { return mZHintTarget.getZHintTarget(); }
     u8 getCatchChgItem() { return mCatghTarget.getChangeItem(); }

include/d/d_bg_s.h

@@ -141,6 +141,8 @@ public:
     fopAc_ac_c* GetActorPointer(cBgS_PolyInfo const& param_0) const { return cBgS::GetActorPointer(param_0); }
     f32 GroundCross(cBgS_GndChk* i_gndChk) { return (f32)((cBgS*)this)->GroundCross(i_gndChk); }
 
+    void ChkDeleteActorRegist(fopAc_ac_c*);
+
 #ifdef DEBUG
     /* 0x1404 */ u8 field_0x1404[0x1408 - 0x1404];
     /* 0x1408 */ dBgS_HIO m_hio;

include/d/d_cc_s.h

@@ -59,6 +59,8 @@ public:
         mMass_Mng.SetAttr(radius, height, param_2, param_3);
     }
 
+    void ChkActor(fopAc_ac_c*);
+
     static bool m_mtrl_hit_tbl[64];
 
     // /* 0x0000 */ cCcS mCCcS;

include/d/d_com_inf_game.h

@@ -295,6 +295,7 @@ public:
     dEvent_manager_c& getEvtManager() { return mEvtManager; }
     dAttention_c* getAttention() { return &mAttention; }
     dStage_startStage_c* getStartStage() { return &mStartStage; }
+    dSmplMdl_draw_c* getSimpleModel() { return mSimpleModel; }
 
     void setCurrentGrafPort(J2DOrthoGraph* i_graf) { mCurrentGrafPort = i_graf; }
     void setCurrentWindow(dDlst_window_c* i_window) { mCurrentWindow = i_window; }
@@ -589,6 +590,7 @@ public:
     void setExpHeap2D(void* heap) { mItemInfo.mExpHeap2D = (JKRExpHeap*)heap; }
     void setMsgExpHeap(void* heap) { mItemInfo.mMsgExpHeap = (JKRExpHeap*)heap; }
 
+    JKRArchive* getMsgDtArchive() { return mMsgDtArchive[0]; }
     JKRArchive* getMsgDtArchive(int idx) { return mMsgDtArchive[idx]; }
     JKRArchive* getMsgArchive(int idx) { return mMsgArchive[idx]; }
     JKRArchive* getMsgCommonArchive() { return mMsgCommonArchive; }
@@ -864,6 +866,10 @@ extern GXColor g_clearColor;
 extern GXColor g_whiteColor;
 extern GXColor g_saftyWhiteColor;
 
+inline void dComIfG_ct() {
+    g_dComIfG_gameInfo.ct();
+}
+
 int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*);
 BOOL dComIfG_resetToOpening(scene_class* scene);
 char* dComIfG_getRoomArcName(int roomNo);
@@ -979,6 +985,10 @@ inline void* dComIfG_getObjectRes(const char* i_arcName, int i_index) {
     return g_dComIfG_gameInfo.mResControl.getObjectRes(i_arcName, i_index);
 }
 
+inline void dComIfG_dumpResControl() {
+    g_dComIfG_gameInfo.mResControl.dump();
+}
+
 inline dBgS& dComIfG_Bgsp() {
     return g_dComIfG_gameInfo.play.mBgs;
 }
@@ -1816,6 +1826,10 @@ inline void dComIfGs_removeZone(int i_zoneNo) {
     g_dComIfG_gameInfo.info.removeZone(i_zoneNo);
 }
 
+inline dSmplMdl_draw_c* dComIfGp_getSimpleModel() {
+    return g_dComIfG_gameInfo.play.getSimpleModel();
+}
+
 inline int dComIfGp_addSimpleModel(J3DModelData* i_modelData, int roomNo, u8 i_drawBG) {
     return g_dComIfG_gameInfo.play.addSimpleModel(i_modelData, roomNo, i_drawBG);
 }
@@ -2314,6 +2328,10 @@ inline JKRArchive* dComIfGp_getDemoMsgArchive() {
     return g_dComIfG_gameInfo.play.getDemoMsgArchive();
 }
 
+inline JKRArchive* dComIfGp_getMsgDtArchive() {
+    return g_dComIfG_gameInfo.play.getMsgDtArchive();
+}
+
 inline JKRArchive* dComIfGp_getMsgDtArchive(int idx) {
     return g_dComIfG_gameInfo.play.getMsgDtArchive(idx);
 }

include/d/d_demo.h

@@ -361,7 +361,11 @@ public:
     /* 80039EEC */ static void setBranchId(u16, s16);
     /* 80039F04 */ static void reset();
 
-    static dDemo_actor_c* getActor(u8 param_0) { return m_object->getActor(param_0); }
+    static dDemo_actor_c* getActor(u8 param_0) {
+        JUT_ASSERT(546, m_object != NULL);
+        return m_object->getActor(param_0);
+    }
+
     static u32 getFrameNoMsg() { return m_frameNoMsg; }
     static s32 getMode() { return m_mode; }
     static u32 getFrame() { return m_frame; }

include/d/d_particle.h

@@ -403,6 +403,8 @@ public:
     void draw2DmenuFore(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 17); }
     void draw2DmenuBack(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 18); }
 
+    JKRSolidHeap* getHeap() { return mHeap; }
+    JKRSolidHeap* getSceneHeap() { return m_sceneHeap; }
     JKRExpHeap* getResHeap() { return m_resHeap; }
 
     void levelAllForceOnEventMove() { field_0x210.allForceOnEventMove(); }

include/d/d_resorce.h

@@ -67,6 +67,7 @@ public:
     int setObjectRes(char const* i_arcName, void* i_archiveRes, u32 i_bufferSize, JKRHeap* i_heap);
     int setStageRes(char const* i_arcName, JKRHeap* i_heap);
     void dump();
+    void dump(char*);
     int getObjectResName2Index(char const* i_arcName, char const* i_resName);
 
     static int setRes(char const* i_arcName, dRes_info_c* i_resInfo, int i_infoNum, char const* i_path, u8 i_mountDirection, JKRHeap* i_heap);
@@ -126,6 +127,12 @@ public:
     dRes_info_c* getStageResInfo(const char* i_arcName) {
         return getResInfo(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo));
     }
+    
+    #if DEBUG
+    void dumpTag() {
+        // TODO
+    }
+    #endif
 
     /* 0x0000 */ dRes_info_c mObjectInfo[128];
     /* 0x1200 */ dRes_info_c mStageInfo[64];

include/d/d_s_play.h

@@ -15,13 +15,17 @@ public:
     /* 0x7C */ s16 mShortReg[10];
 };
 
-class dScnPly_reg_HIO_c {
+class dScnPly_reg_HIO_c : public JORReflexible {
 public:
     /* 8025AD78 */ virtual ~dScnPly_reg_HIO_c() {}
 
-    /* 0x4 */ u8 field_0x4[0x8 - 0x4];
 #ifdef DEBUG
+    void genMessage(JORMContext*);
+
+    /* 0x4 */ s8 id;
     /* 0x8 */ dScnPly_reg_childHIO_c mChildReg[26];
+#else
+    /* 0x4 */ u8 field_0x4[0x8 - 0x4];
 #endif
 };
 
@@ -50,7 +54,7 @@ public:
     virtual void genMessage(JORMContext*);
     virtual ~dScnPly_preset_HIO_c() {}
 
-    /* 0x0004 */ u8 field_0x4;
+    /* 0x0004 */ s8 field_0x4;
     /* 0x0005 */ u8 field_0x5;
     /* 0x0006 */ u8 mPresetData[10000];
     /* 0x2716 */ u8 field_0x2716;

include/d/d_s_play_env.h

@@ -8,14 +8,37 @@ public:
     /* 8025AC0C */ virtual ~dScnPly_env_otherHIO_c() {}
     void genMessage(JORMContext*);
 
-    /* 0x04 */ f32 mShadowDensity;
-    /* 0x08 */ u8 mLODBias;
-    /* 0x09 */ u8 field_0x9;
-    /* 0x0A */ u8 mDispTransCylinder;
     #ifdef DEBUG
-    /* 0x0B */ u8 field_0xb[0x46 - 0xb];
-    /* 0x46 */ u8 field_0x46;
-    /* 0x47 */ u8 field_0x47[0x4f - 0x47];
+    /* 0x04 */ s8 field_0x04;
+    #endif
+    
+    /* 0x08 */ f32 mShadowDensity;
+
+    #ifdef DEBUG
+    /* 0x0C */ f32 mCullFarValue;
+    /* 0x10 */ f32 mRailSize;
+    /* 0x14 */ s16 mRailColorR;
+    /* 0x16 */ s16 mRailColorG;
+    /* 0x18 */ s16 mRailColorB;
+    /* 0x1A */ s16 field_0x1a;
+    /* 0x1C */ s16 field_0x1c[20];
+    #endif
+
+    /* 0x44 */ u8 mAdjustLODBias;
+    /* 0x45 */ u8 field_0x45;
+    /* 0x46 */ u8 mDisplayTransparentCyl;
+
+    #ifdef DEBUG
+    /* 0x47 */ u8 mDisplayShadows;
+    /* 0x48 */ u8 mDisplayShadowImage;
+    /* 0x49 */ u8 mDisplayShadowPoly;
+    /* 0x4A */ u8 mDisplayCullBox;
+    /* 0x4B */ u8 mLoadAllRooms;
+    /* 0x4C */ u8 mDepthOfField;
+    /* 0x4D */ u8 mDisplayParticleInfo;
+    /* 0x4E */ u8 field_0x4e;
+    /* 0x4F */ u8 field_0x4f;
+    /* 0x50 */ u8 mAdjustCullFar;
     #endif
 };
 

include/d/d_stage.h

@@ -1153,6 +1153,8 @@ public:
         return cLib_onBit(mStatus[i_roomNo].mFlag, flag);
     }
 
+    static JKRExpHeap* getMemoryBlockHeap(int i_no) { return mMemoryBlock[i_no]; }
+
     static const int MEMORY_BLOCK_MAX = 19;
 
     static JKRExpHeap* mMemoryBlock[MEMORY_BLOCK_MAX];
@@ -1426,7 +1428,7 @@ inline u32 dStage_FileList_dt_GetEnemyAppear1Flag(dStage_FileList_dt_c* p_fList)
     return p_fList->mParameters & 0x20000000;
 }
 
-inline int dStage_FileList_dt_GetBitSw(dStage_FileList_dt_c* p_fList) {
+inline u8 dStage_FileList_dt_GetBitSw(dStage_FileList_dt_c* p_fList) {
     return p_fList->mBitSw;
 }
 

include/d/d_tresure.h

@@ -94,6 +94,10 @@ public:
         offStatus(0, param_0, i_flag);
     }
 
+    static typeGroupData_c* getTypeGroupData() {
+        return mTypeGroupData;
+    }
+
     static u8 const typeToTypeGroup[17][2];
     static type_group_list mTypeGroupListAll[17];
     static typeGroupData_c* mTypeGroupData;