summaryrefslogtreecommitdiff
path: root/include/d/actor
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/d/actor
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/d/actor')
-rw-r--r--include/d/actor/d_a_obj_Turara.h2
-rw-r--r--include/d/actor/d_a_obj_Y_taihou.h2
-rw-r--r--include/d/actor/d_a_obj_amiShutter.h2
-rw-r--r--include/d/actor/d_a_obj_kwheel00.h2
-rw-r--r--include/d/actor/d_a_obj_kwheel01.h2
-rw-r--r--include/d/actor/d_a_obj_lv3Water.h2
-rw-r--r--include/d/actor/d_a_obj_lv3Water2.h2
-rw-r--r--include/d/actor/d_a_obj_lv4CandleDemoTag.h2
-rw-r--r--include/d/actor/d_a_obj_swhang.h2
-rw-r--r--include/d/actor/d_a_obj_syRock.h2
-rw-r--r--include/d/actor/d_a_obj_volcball.h2
-rw-r--r--include/d/actor/d_a_obj_waterPillar.h2
12 files changed, 12 insertions, 12 deletions
diff --git a/include/d/actor/d_a_obj_Turara.h b/include/d/actor/d_a_obj_Turara.h
index 63649da81f..0e203a0631 100644
--- a/include/d/actor/d_a_obj_Turara.h
+++ b/include/d/actor/d_a_obj_Turara.h
@@ -31,7 +31,7 @@ public:
/* 80B9D548 */ void move();
/* 80B9D72C */ void init_modeWait();
/* 80B9D738 */ void modeWait();
- /* 80B9D998 */ BOOL eventStart();
+ /* 80B9D998 */ bool eventStart();
/* 80B9D9BC */ void init_modeDropInit();
/* 80B9DA00 */ void modeDropInit();
/* 80B9DA44 */ void init_modeDrop();
diff --git a/include/d/actor/d_a_obj_Y_taihou.h b/include/d/actor/d_a_obj_Y_taihou.h
index df4ce5ec94..1ce439d254 100644
--- a/include/d/actor/d_a_obj_Y_taihou.h
+++ b/include/d/actor/d_a_obj_Y_taihou.h
@@ -25,7 +25,7 @@ public:
/* 80BA0084 */ void setMtx();
/* 80BA0208 */ void rotateCheck();
/* 80BA045C */ void shotCheck();
- /* 80BA0964 */ virtual BOOL eventStart();
+ /* 80BA0964 */ virtual bool eventStart();
/* 80BA0974 */ int CreateHeap();
/* 80BA09E4 */ int Create();
/* 80BA0A94 */ int Execute(Mtx** i_mtx);
diff --git a/include/d/actor/d_a_obj_amiShutter.h b/include/d/actor/d_a_obj_amiShutter.h
index c19f61e1c8..306e348ecd 100644
--- a/include/d/actor/d_a_obj_amiShutter.h
+++ b/include/d/actor/d_a_obj_amiShutter.h
@@ -44,7 +44,7 @@ public:
/* 80BA1B58 */ void modeWait();
/* 80BA1BCC */ void init_modeWaitEvent();
/* 80BA1BD8 */ void modeWaitEvent();
- /* 80BA1C90 */ BOOL eventStart();
+ /* 80BA1C90 */ bool eventStart();
/* 80BA1CB4 */ void init_modeClose();
/* 80BA1D48 */ void modeClose();
/* 80BA1DCC */ void init_modeCloseEvent();
diff --git a/include/d/actor/d_a_obj_kwheel00.h b/include/d/actor/d_a_obj_kwheel00.h
index d9a24d388a..02d749491f 100644
--- a/include/d/actor/d_a_obj_kwheel00.h
+++ b/include/d/actor/d_a_obj_kwheel00.h
@@ -29,7 +29,7 @@ public:
/* 80C4DBBC */ int Execute(Mtx**);
/* 80C4E1B0 */ int Draw();
/* 80C4E254 */ int Delete();
- /* 80C4E298 */ BOOL eventStart();
+ /* 80C4E298 */ bool eventStart();
int getSwNo() {
return fopAcM_GetParamBit(this, 0, 8);
diff --git a/include/d/actor/d_a_obj_kwheel01.h b/include/d/actor/d_a_obj_kwheel01.h
index cc94891fd5..5a890cfdbc 100644
--- a/include/d/actor/d_a_obj_kwheel01.h
+++ b/include/d/actor/d_a_obj_kwheel01.h
@@ -25,7 +25,7 @@ public:
/* 80C4F048 */ int Execute(Mtx**);
/* 80C4F344 */ int Draw();
/* 80C4F3E8 */ int Delete();
- /* 80C4F498 */ BOOL eventStart();
+ /* 80C4F498 */ bool eventStart();
private:
/* 0x5B8 */ Mtx mNewBgMtx;
diff --git a/include/d/actor/d_a_obj_lv3Water.h b/include/d/actor/d_a_obj_lv3Water.h
index 34d9134913..f9ef9bb6c6 100644
--- a/include/d/actor/d_a_obj_lv3Water.h
+++ b/include/d/actor/d_a_obj_lv3Water.h
@@ -38,7 +38,7 @@ public:
/* 80C59AA0 */ virtual int Delete();
/* 80C59D80 */ virtual ~daLv3Water_c();
- /* 80C59AE0 */ virtual BOOL eventStart();
+ /* 80C59AE0 */ virtual bool eventStart();
int getParam() { return fpcM_GetParam(this) >> 0xC & 0x0FFF; }
int getParamSw() { return fpcM_GetParam(this) & 0xFF; }
diff --git a/include/d/actor/d_a_obj_lv3Water2.h b/include/d/actor/d_a_obj_lv3Water2.h
index 595d87a686..8f9a3c4aa3 100644
--- a/include/d/actor/d_a_obj_lv3Water2.h
+++ b/include/d/actor/d_a_obj_lv3Water2.h
@@ -31,7 +31,7 @@ public:
/* 80C5ACE4 */ void mode_proc_levelCtrl();
/* 80C5ADA4 */ int Draw();
/* 80C5AEFC */ int Delete();
- /* 80C5AF3C */ BOOL eventStart();
+ /* 80C5AF3C */ bool eventStart();
private:
/* 0x5B8 */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_obj_lv4CandleDemoTag.h b/include/d/actor/d_a_obj_lv4CandleDemoTag.h
index ef7a0b1fe7..de15710694 100644
--- a/include/d/actor/d_a_obj_lv4CandleDemoTag.h
+++ b/include/d/actor/d_a_obj_lv4CandleDemoTag.h
@@ -40,7 +40,7 @@ public:
int getEventID() { return fopAcM_GetParamBit(this, 0x18, 8); }
/* 80C5D184 */ virtual ~dalv4CandleDemoTag_c();
- /* 80C5CF78 */ virtual BOOL eventStart();
+ /* 80C5CF78 */ virtual bool eventStart();
private:
/* 0x584 */ u8 mMode;
diff --git a/include/d/actor/d_a_obj_swhang.h b/include/d/actor/d_a_obj_swhang.h
index eef0e09676..513d898ad4 100644
--- a/include/d/actor/d_a_obj_swhang.h
+++ b/include/d/actor/d_a_obj_swhang.h
@@ -50,7 +50,7 @@ public:
/* 80CFC6AC */ void modeOffWait();
/* 80CFCA34 */ void init_modeOnWait();
/* 80CFCA40 */ void modeOnWait();
- /* 80CFCCE0 */ BOOL eventStart();
+ /* 80CFCCE0 */ bool eventStart();
/* 80CFD034 */ virtual ~daObjSwHang_c() {}
daObjSwHang_c() : dEvLib_callback_c(this) {}
diff --git a/include/d/actor/d_a_obj_syRock.h b/include/d/actor/d_a_obj_syRock.h
index d22e8dff2c..6cde36309f 100644
--- a/include/d/actor/d_a_obj_syRock.h
+++ b/include/d/actor/d_a_obj_syRock.h
@@ -29,7 +29,7 @@ public:
/* 80D02C54 */ void move();
/* 80D02E70 */ void init_modeWait();
/* 80D02E7C */ void modeWait();
- /* 80D02F88 */ BOOL eventStart();
+ /* 80D02F88 */ bool eventStart();
/* 80D02FB8 */ void init_modeDropInit();
/* 80D03070 */ void modeDropInit();
/* 80D030A8 */ static void* searchWaterPillar(void*, void*);
diff --git a/include/d/actor/d_a_obj_volcball.h b/include/d/actor/d_a_obj_volcball.h
index a69a557f87..d0ea3d5d0d 100644
--- a/include/d/actor/d_a_obj_volcball.h
+++ b/include/d/actor/d_a_obj_volcball.h
@@ -107,7 +107,7 @@ public:
/* 80D23904 */ int draw();
/* 80D23A0C */ int _delete();
- /* 80D22DDC */ virtual BOOL eventStart();
+ /* 80D22DDC */ virtual bool eventStart();
/* 80D23B24 */ virtual ~daObjVolcBall_c() {}
u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_waterPillar.h b/include/d/actor/d_a_obj_waterPillar.h
index 72fa1b9b5d..9b7f61adc4 100644
--- a/include/d/actor/d_a_obj_waterPillar.h
+++ b/include/d/actor/d_a_obj_waterPillar.h
@@ -34,7 +34,7 @@ public:
/* 80D2D278 */ void effectSet2();
/* 80D2D3FC */ void actionSwWaitInit();
/* 80D2D408 */ void actionSwWait();
- /* 80D2D488 */ virtual BOOL eventStart();
+ /* 80D2D488 */ virtual bool eventStart();
/* 80D2D4AC */ void actionWaitInit();
/* 80D2D588 */ void actionWait();
/* 80D2D5C0 */ void actionUpFirstInit();