summaryrefslogtreecommitdiff
path: root/include/JSystem
diff options
context:
space:
mode:
authorHuitzi <73550465+marwernerh@users.noreply.github.com>2025-03-30 23:11:50 -0400
committerGitHub <noreply@github.com>2025-03-30 20:11:50 -0700
commit4ccca6b893fbf9f690d0e7efc33ff57c63e701bc (patch)
tree5e397aae68bb8fbed51683c0c3b67d494386dcf7 /include/JSystem
parent559d389e3dc7d47136b5f2e98ad44c48b5641225 (diff)
d_event_debug equivalent & modifications to dEvLib_callback_c (#2359)
* WIP d_event_debug * Implemented most functions close to matching * Removed erroneous comment in d_com_inf_game.h * Implemented getEventP in dEvDtBase_c * Retyped dEvLib_callback_c function returns from BOOL to bool * Implemented getHeader, getEventList, and setDbgData in dEvent_manager_c * Moved relevant dEvDb_* classes from d_event.h to d_event_debug.h and changed to structs * Extended JORFile mFilename character array from 8 to 256 characters * Implemented combo boxes and update slider functionalities in JORMContext * Named field_0xC of JORProperyEvent as id, based on use of field in d_event_debug.cpp * Corrected debug event tables and created missing table * Debug tables explicitly pasted in d_event_debug.cpp to circumvent ShiftJIS not properly encoding tables via #include directive * Change return types for implemented virtual functions of actors that inherit from dEvLib_callback_c * Add const modifier to several d_com_inf_game functions called in d_event_debug, and change respective fields in dEvDb_bit & reg_c to be const * d_event_debug Equivalent * Changed configure.py entry to equivalent instead of matching * Preliminary documentation * Remove debug tables from d_event.cpp
Diffstat (limited to 'include/JSystem')
-rw-r--r--include/JSystem/JHostIO/JORFile.h2
-rw-r--r--include/JSystem/JHostIO/JORMContext.h58
-rw-r--r--include/JSystem/JHostIO/JORReflexible.h2
3 files changed, 60 insertions, 2 deletions
diff --git a/include/JSystem/JHostIO/JORFile.h b/include/JSystem/JHostIO/JORFile.h
index 5d06259a48..d5119a60a7 100644
--- a/include/JSystem/JHostIO/JORFile.h
+++ b/include/JSystem/JHostIO/JORFile.h
@@ -88,7 +88,7 @@ public:
/* 0x16 */ u16 mFlags;
/* 0x18 */ int field_0x18;
/* 0x1C */ JSUMemoryOutputStream mDataStream;
- /* 0x30 */ char mFilename[8];
+ /* 0x30 */ char mFilename[256];
};
#endif /* JORFILE_H */
diff --git a/include/JSystem/JHostIO/JORMContext.h b/include/JSystem/JHostIO/JORMContext.h
index 68f4135c59..9c117a5f02 100644
--- a/include/JSystem/JHostIO/JORMContext.h
+++ b/include/JSystem/JHostIO/JORMContext.h
@@ -54,6 +54,30 @@
width, height); \
}
+#define DEFINE_START_COMBO_BOX(T, kind) \
+ void startComboBox(const char* label, T* pSrc, u32 style, \
+ JOREventListener* pListener, u16 posX, u16 posY, u16 width, u16 height) { \
+ startSelectorSub('CMBX', kind, label, (u32)pSrc, style, *pSrc, pListener, posX, \
+ posY, width, height); \
+ }
+
+#define DEFINE_START_COMBO_BOX_ID(T, kind) \
+ void startComboBoxID(const char* label, u32 id, T data, u32 style, \
+ JOREventListener* pListener, u16 posX, u16 posY, u16 width, u16 height) { \
+ startSelectorSub('CMBX', kind, label, id, style, data, pListener, posX, \
+ posY, width, height); \
+ }
+
+#define DEFINE_UPDATE_SLIDER(T) \
+ void updateSlider(u32 mode, T* pSrc, T rangeMin, T rangeMax, u32 param_5) { \
+ updateSliderSub(mode, (u32) pSrc, *pSrc, rangeMin, rangeMax, param_5); \
+ }
+
+#define DEFINE_UPDATE_SLIDER_ID(T) \
+ void updateSliderID(u32 mode, u32 id, T value, T rangeMin, T rangeMax, u32 param_5) { \
+ updateSliderSub(mode, id, value, rangeMin, rangeMax, param_5); \
+ }
+
namespace jhostio {
enum EKind {
EKind_8B = 0x08,
@@ -127,6 +151,10 @@ public:
genNodeSub(label, obj, param_2, param_3);
}
+ void startUpdateNode(JORReflexible* obj) {
+ putNode(obj);
+ }
+
void genNodeSub(const char* label, JORReflexible* i_node, u32, u32);
void putNode(JORReflexible* obj);
void invalidNode(JORReflexible* i_node, u32);
@@ -180,6 +208,27 @@ public:
DEFINE_GEN_SLIDER_ID(f64, JORPropertyEvent::EKind_ValueID | JORPropertyEvent::EKind_FloatValue)
DEFINE_GEN_SLIDER_ID(int, JORPropertyEvent::EKind_ValueID)
+ DEFINE_UPDATE_SLIDER(u8)
+ DEFINE_UPDATE_SLIDER(s16)
+ DEFINE_UPDATE_SLIDER(f32)
+ DEFINE_UPDATE_SLIDER(s32)
+
+ DEFINE_UPDATE_SLIDER_ID(f64)
+ DEFINE_UPDATE_SLIDER_ID(int)
+
+ /**
+ * === COMBO BOX ===
+ */
+ DEFINE_START_COMBO_BOX(u8, 0x100 | jhostio::EKind_8B)
+ DEFINE_START_COMBO_BOX(s16, jhostio::EKind_16B)
+ DEFINE_START_COMBO_BOX(s32, jhostio::EKind_32B)
+
+ DEFINE_START_COMBO_BOX_ID(int, JORPropertyEvent::EKind_ValueID)
+
+ void endComboBox() {
+ endSelectorSub();
+ }
+
void genComboBoxItem(const char* label, s32 itemNo) {
genSelectorItemSub(label, itemNo, 0, 0, 0, 0, 0);
}
@@ -196,6 +245,15 @@ public:
void updateCheckBoxSub(u32 mode, u32 id, u16 value, u16 mask, u32 param_4);
void updateSelectorSub(u32 mode, u32 id, s32 value, u32 param_3);
void updateEditBoxID(u32 mode, u32 id, const char* string, u32 param_3, u16 length);
+
+ void updateCheckBox(u32 mode, u8* pSrc, u8 mask, u32 param_4) {
+ updateCheckBoxSub(mode, (u32) pSrc, *pSrc, mask, param_4);
+ }
+
+ void updateCheckBoxID(u32 mode, u32 id, u8 value, u8 mask, u32 param_4) {
+ updateCheckBoxSub(mode, id, value, mask, param_4);
+ }
+
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);
diff --git a/include/JSystem/JHostIO/JORReflexible.h b/include/JSystem/JHostIO/JORReflexible.h
index 0e82126cc7..04c8f54a37 100644
--- a/include/JSystem/JHostIO/JORReflexible.h
+++ b/include/JSystem/JHostIO/JORReflexible.h
@@ -17,7 +17,7 @@ struct JORPropertyEvent : JOREvent {
/* 0x00 */ u8 field_0x0[0x4 - 0x0];
/* 0x04 */ u32 type;
/* 0x08 */ u32 kind;
- /* 0x0C */ char* field_0xc;
+ /* 0x0C */ char* id; // id?
/* 0x10 */ JORReflexible* field_0x10; // ?
/* 0x14 */ u32 field_0x14;
union {