mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-04 00:38:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_meter_HIO debug (#2959)

Browse Source
This commit is contained in:
Jcw87
2025-12-16 06:54:05 -08:00
committed by GitHub
parent 80a6fcb319
commit 57188e25f5
15 changed files with 2986 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JHostIO/JORFile.h
+1
View File
@@ -43,6 +43,7 @@ public:
enum EFlags {
EFlags_READ = (1 << 0),
EFlags_WRITE = (1 << 1),
EFlags_UNK_0x4 = (1 << 2),
EFlags_DEFAULT_EXT = (1 << 4),
EFlags_UNK_0x20 = (1 << 5),
EFlags_HAS_SUFFIX = (1 << 6),
include/JSystem/JHostIO/JORMContext.h
+4
View File
@@ -293,6 +293,10 @@ public:
updateCheckBoxSub(mode, id, value, mask, param_4);
}
void updateRadioButton(u32 mode, s16* pSrc, u32 param_3) {
updateSelectorSub(mode, (uintptr_t)pSrc, *pSrc, param_3);
}
void editComboBoxItem(u32 param_0, u32 param_1, const char* param_2, s32 param_3, u32 param_4);
void openMessageBox(void* param_0, u32 style, const char* message, const char* title);
include/d/d_map.h
+24
View File
@@ -3,6 +3,30 @@
#include "d/d_map_path_dmap.h"
class dMap_HIO_list_c : public dMpath_HIO_n::hioList_c {
public:
virtual void copySrcToHio();
virtual void copyHioToDst();
virtual void copyBufToHio(const char*);
};
class dMap_HIO_c : public dMpath_HIO_file_base_c {
public:
dMap_HIO_c();
virtual void listenPropertyEvent(const JORPropertyEvent*);
virtual void genMessage(JORMContext*);
virtual u32 addString(char*, u32, u32);
virtual u32 addData(char*, u32, u32);
virtual void copyReadBufToData(const char*, s32);
virtual u32 addStringBinary(char*, u32, u32);
/* 0x04 */ u8 field_0x4[0x08 - 0x04];
/* 0x08 */ dMap_HIO_list_c field_0x8;
static dMap_HIO_c* mMySelfPointer;
static dMpath_HIO_n::list_s l_list;
};
struct dMap_prm_res_s {
/* 0x000 */ dMpath_RGB5A3_palDt_s palette_data[51];
/* 0x198 */ u8 field_0x198;
include/d/d_map_path.h
+40
View File
@@ -3,6 +3,46 @@
#include "d/d_drawlist.h"
namespace dMpath_HIO_n {
struct list_s {
/* 0x00 */ void* field_0x0;
/* 0x04 */ u32 field_0x4;
};
class hioList_c {
public:
/* 0x00 */ list_s field_0x0;
virtual ~hioList_c() {}
virtual void copySrcToHio() = 0;
virtual void copyHioToDst() = 0;
virtual void copyBufToHio(const char*) = 0;
void set(const list_s& param_1) { field_0x0 = param_1; }
void gen(JORMContext*);
void update(JORMContext*);
u32 addString(char*, u32, u32) const;
u32 addStringBinary(char*, u32, u32) const;
};
}
class dMpath_HIO_file_base_c : public JORReflexible {
public:
virtual ~dMpath_HIO_file_base_c() {}
virtual u32 addString(char*, u32, u32) = 0;
virtual u32 addData(char*, u32, u32) = 0;
virtual void copyReadBufToData(const char*, s32) = 0;
virtual u32 addStringBinary(char* param_1, u32 param_2, u32 param_3) {
return addString(param_1, param_2, param_3);
}
BOOL writeHostioTextFile(const char*);
BOOL writeBinaryTextFile(const char*);
BOOL writeBinaryFile(const char*);
void binaryDump(const void*, u32);
bool readBinaryFile(const char*);
};
class dDrawPath_c : public dDlst_base_c {
public:
struct line_class {
include/d/d_menu_dmap.h
+10
View File
@@ -22,6 +22,16 @@ class dMenu_ItemExplain_c;
class J2DPictureEx;
struct dMenu_DmapMapCtrl_c;
class dMdm_HIO_c : public JORReflexible {
public:
virtual ~dMdm_HIO_c() {}
virtual void genMessage(JORMContext*);
/* 0x04 */ u8 field_0x4[0xb8 - 0x4];
static dMdm_HIO_c* mMySelfPointer;
};
class renderingDmap_c : public renderingPlusDoor_c {
public:
virtual ~renderingDmap_c() {}
include/d/d_menu_fmap.h
+5 -2
View File
@@ -273,7 +273,7 @@ private:
/* 0x020 */ dMenu_Fmap_world_data_c* mpWorldData;
/* 0x024 */ dMenu_Fmap_region_data_c* mpRegionData[8];
/* 0x044 */ dMenu_Fmap_stage_data_c* mpStageData[8];
/* 0x064 */ JKRAramArchive* mpMapArchive;
/* 0x064 */ JKRArchive* mpMapArchive;
/* 0x068 */ JKRArchive* mpResArchive;
/* 0x06C */ dMenuMapCommon_c::RoomData_c* mpRoomData[8];
/* 0x08C */ dMenu_Fmap_field_data_c* mpFieldDat;
@@ -334,10 +334,13 @@ private:
/* 0x313 */ bool mAreaNameSet;
};
class dMf_HIO_c {
class dMf_HIO_c : public JORReflexible {
public:
dMf_HIO_c();
virtual ~dMf_HIO_c() {}
#if DEBUG
virtual void genMessage(JORMContext*);
#endif
/* 0x04 */ u8 field_0x4[4];
/* 0x08 */ f32 mBackAnimeStep;
include/d/d_menu_fmap_map.h
+53 -7
View File
@@ -30,6 +30,10 @@ struct dMfm_HIO_prm_res_src_s {
static const dMfm_HIO_prm_res_src_s m_other;
};
struct dMfm_HIO_prm_res_dst_s {
static const void* m_res;
};
class renderingFmap_c : public dRenderingFDAmap_c {
public:
enum palette_e {
@@ -97,9 +101,9 @@ public:
bool isDrawEnable() { return mDrawEnable; }
/* 0x24 */ Mtx mViewMtx;
/* 0x54 */ cXyz mEye;
/* 0x60 */ cXyz mCenter;
/* 0x6C */ cXyz mUp;
/* 0x54 */ Vec mEye;
/* 0x60 */ Vec mCenter;
/* 0x6C */ Vec mUp;
/* 0x78 */ dMenu_Fmap_world_data_c* mpWorldData;
/* 0x7C */ dMenu_Fmap_region_data_c* mpRegionData;
/* 0x80 */ dMenu_Fmap_stage_data_c* mpStageData;
@@ -120,7 +124,42 @@ public:
/* 0xB9 */ u8 mSaveTableNo;
/* 0xBA */ u8 mVisitedRoomSaveTableNo;
/* 0xBB */ bool mDrawEnable;
};
};
class dMfm_HIO_list_c : public dMpath_HIO_n::hioList_c {
public:
virtual void copySrcToHio();
virtual void copyHioToDst();
virtual void copyBufToHio(const char*);
};
class dMfm_HIO_c : public dMpath_HIO_file_base_c {
public:
dMfm_HIO_c();
virtual ~dMfm_HIO_c() { mMySelfPointer = NULL; }
virtual void listenPropertyEvent(const JORPropertyEvent*);
virtual void genMessage(JORMContext*);
virtual u32 addString(char* param_1, u32 param_2, u32 param_3) { return field_0xc.addString(param_1, param_2, param_3); }
virtual u32 addData(char* param_1, u32 param_2, u32 param_3) {
(void)param_2;
(void)param_3;
memcpy(param_1, dMfm_HIO_prm_res_dst_s::m_res, 366);
return 366;
}
virtual void copyReadBufToData(const char* param_1, s32 param_2) {
(void)param_2;
field_0xc.copyBufToHio(param_1);
}
virtual u32 addStringBinary(char* param_1, u32 param_2, u32 param_3) { return field_0xc.addStringBinary(param_1, param_2, param_3); }
/* 0x04 */ u8 field_0x4[0x8 - 0x4];
/* 0x08 */ dMenu_FmapMap_c* field_0x8;
/* 0x0C */ dMfm_HIO_list_c field_0xc;
/* 0x18 */ u8 field_0x18;
static dMfm_HIO_c* mMySelfPointer;
static dMpath_HIO_n::list_s l_list;
};
class dMenu_FmapMap_c : public renderingFmap_c {
public:
@@ -166,12 +205,17 @@ public:
}
ResTIMG* getResTIMGPointer() { return mResTIMG; }
#if DEBUG
dMenu_Fmap_world_data_c* getWorldData() { return mpWorldData; }
#endif
/* 0xBC */ ResTIMG* mResTIMG;
/* 0xC0 */ u8* mMapImage_p;
/* 0xC4 */ dMfm_prm_res_s* m_res;
/* 0xC8 */ dMpath_RGB5A3_palDt_s* m_palette;
/* 0xCC */ int field_0xcc;
#if DEBUG
/* 0xD0 */ dMenu_Fmap_world_data_c* mpWorldData;
#endif
/* 0xD0 */ f32 mZoomRate;
/* 0xD4 */ int mLineNo;
/* 0xD8 */ bool mFlash;
@@ -180,8 +224,10 @@ public:
/* 0xE0 */ int mLastStageCursor;
/* 0xE4 */ u8 mRegionCursor;
/* 0xE5 */ u8 mFlashTimer;
/* 0xE8 */ u8* mFlashRooms;
/* 0xEC */ int mFlashRoomCount;
/* 0xE8 */ u8* mp_roomList;
/* 0xEC */ int m_roomListNumber;
static dMenu_FmapMap_c* mMySelfPointer;
};
include/d/d_meter_HIO.h
+13 -7
View File
@@ -11,7 +11,7 @@
struct subJOREventCallbackListNode : public JOREventCallbackListNode {
subJOREventCallbackListNode() : JOREventCallbackListNode(0x81000000, 0x81000000, true) {}
virtual int JORAct(u32, const char*);
virtual BOOL JORAct(u32, const char*);
virtual ~subJOREventCallbackListNode() {}
};
@@ -578,12 +578,14 @@ public:
/* 0xA8 */ u8 mAnimDebug;
}; // Size: 0xAC
class dMeter_map_HIO_c;
class dMeter_drawHIO_c : public JORReflexible {
public:
dMeter_drawHIO_c();
virtual ~dMeter_drawHIO_c() {
#if DEBUG
field_0x8_debug = 0;
field_0x8_debug = NULL;
#endif
}
@@ -602,7 +604,7 @@ public:
/* 0x000 */ // vtable
/* 0x004 */ s8 field_0x4;
#if DEBUG
int field_0x8_debug;
dMeter_map_HIO_c* field_0x8_debug;
#endif
/* 0x008 */ f32 mLifeTopPosX;
/* 0x00C */ f32 mLifeTopPosY;
@@ -1140,6 +1142,10 @@ public:
/* 0x179 */ bool mIconDisplay[22];
}; // Size: 0x190
class dMf_HIO_c;
class dMdm_HIO_c;
class dMfm_HIO_c;
class dMeter_fmapHIO_c : public JORReflexible {
public:
enum {
@@ -1199,13 +1205,13 @@ public:
#if DEBUG
/* 0x008 */ subJOREventCallbackListNode* mpEvtCallBack;
#endif
/* 0x008 */ JKRAramArchive* mpArcData;
/* 0x008 */ JKRArchive* mpArcData;
/* 0x00C */ void* mpArcFile;
/* 0x010 */ void* mpDecompBuf;
/* 0x014 */ void* field_0x14;
/* 0x018 */ void* field_0x18;
/* 0x014 */ dMfm_HIO_c* field_0x14;
/* 0x018 */ dMdm_HIO_c* field_0x18;
#if DEBUG
/* 0x020 */ u8 unk_0x20[4];
/* 0x020 */ dMf_HIO_c* field_0x20;
#endif
/* 0x01C */ MapBlinkAnime mMapBlink[3];
/* 0x094 */ s16 mDisplayFrameNum;
include/d/d_meter_map.h
+53
View File
@@ -5,6 +5,52 @@
class J2DPicture;
class dMap_c;
class dMap_HIO_c;
class dMeter_map_HIO_c : public JORReflexible {
public:
dMeter_map_HIO_c();
virtual void listenPropertyEvent(const JORPropertyEvent*);
virtual void genMessage(JORMContext*);
virtual ~dMeter_map_HIO_c();
void update();
static dMeter_map_HIO_c* mMySelfPointer;
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u8 field_0x6;
/* 0x07 */ u8 field_0x7;
/* 0x08 */ s16 field_0x8;
/* 0x0A */ s16 field_0xa;
/* 0x0C */ s16 field_0xc;
/* 0x0E */ s16 field_0xe;
/* 0x10 */ s16 field_0x10;
/* 0x12 */ s16 field_0x12;
/* 0x14 */ s16 field_0x14;
/* 0x16 */ u8 field_0x16;
/* 0x17 */ u8 field_0x17;
/* 0x18 */ s16 field_0x18;
/* 0x1A */ s16 field_0x1a;
/* 0x1C */ s16 field_0x1c;
/* 0x1E */ s16 field_0x1e;
/* 0x20 */ s16 field_0x20;
/* 0x22 */ s16 field_0x22;
/* 0x24 */ s16 field_0x24;
/* 0x26 */ u8 field_0x26;
/* 0x27 */ u8 field_0x27[0x2a - 0x27];
/* 0x2A */ s16 field_0x2a;
/* 0x2C */ u8 field_0x2c;
/* 0x2D */ u8 field_0x2d;
/* 0x2E */ u8 field_0x2e;
/* 0x2F */ u8 field_0x2f;
/* 0x30 */ s16 field_0x30;
/* 0x32 */ u8 field_0x32;
/* 0x33 */ u8 field_0x33;
/* 0x34 */ dMap_HIO_c* field_0x34;
};
class dMeterMap_c : public dDlst_base_c {
public:
static bool isEnableDispMap();
@@ -40,7 +86,14 @@ public:
enum { MAP_SIZE_TYPE_BIG = 2, MAP_SIZE_TYPE_SMALL = 3, MAP_SIZE_TYPE_STAGE = 7 };
static dMeterMap_c* mMySelfPointer;
private:
#if DEBUG
/* 0x04 */ u8 field_0x4_debug;
/* 0x08 */ int field_0x8_debug;
#endif
/* 0x04 */ J2DPicture* mMapJ2DPicture;
/* 0x08 */ dMap_c* mMap;
/* 0x0C */ s32 mIsCompass;