summaryrefslogtreecommitdiff
path: root/src/d/d_event.cpp
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 /src/d/d_event.cpp
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 'src/d/d_event.cpp')
-rw-r--r--src/d/d_event.cpp38
1 files changed, 1 insertions, 37 deletions
diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp
index e84af99de6..b5c316c864 100644
--- a/src/d/d_event.cpp
+++ b/src/d/d_event.cpp
@@ -12,43 +12,7 @@
#include "d/actor/d_a_midna.h"
#include "d/actor/d_a_tag_mhint.h"
#include "d/actor/d_a_tag_mstop.h"
-
-// This probably will need to be moved once actual debug rom decomp begins
-#ifdef DEBUG
-static dEvDb_bit_c dEvDb_bit_table[799] = {
- #include "src/d/d_event_debug_bit_table.inc"
-};
-
-static dEvDb_reg_c dEvDb_reg_table[21] = {
- #include "src/d/d_event_debug_reg_table.inc"
-};
-
-static dEvDb_bit_c dEvDb_bit_table_tmp[169] = {
- #include "src/d/d_event_debug_bit_table_tmp.inc"
-};
-
-static dEvDb_reg_c dEvDb_reg_table_tmp[14] = {
- #include "src/d/d_event_debug_reg_table_tmp.inc"
-};
-
-static dEvDb_flag_base_c dEvDb_flag_base_table = {
- dEvDb_bit_table, // mBitTable
- dEvDb_reg_table, // mRegTable
- 799, // mBitNum
- 21, // mRegNum
- 22, // field_0x10
- 4 // field_0x1
-};
-
-static dEvDb_flag_base_c dEvDb_flag_base_table_tmp = {
- dEvDb_bit_table_tmp, // mBitTable
- dEvDb_reg_table_tmp, // mRegTable
- 169, // mBitNum
- 14, // mRegNum
- 43, // field_0x10
- 6 // field_0x14
-};
-#endif
+#include "d/d_event_debug.h"
/* 80041480-80041488 03BDC0 0008+00 1/1 0/0 0/0 .text event_debug_evnt__21@unnamed@d_event_cpp@Fv
*/