mirror of
https://github.com/zeldaret/tp
synced 2026-06-09 04:40:05 -04:00
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
This commit is contained in:
@@ -266,9 +266,9 @@ void daTurara_c::modeWait() {
|
||||
}
|
||||
|
||||
/* 80B9D998-80B9D9BC 000EF8 0024+00 2/1 0/0 0/0 .text eventStart__10daTurara_cFv */
|
||||
BOOL daTurara_c::eventStart() {
|
||||
bool daTurara_c::eventStart() {
|
||||
init_modeDropInit();
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80B9D9BC-80B9DA00 000F1C 0044+00 1/1 0/0 0/0 .text init_modeDropInit__10daTurara_cFv
|
||||
|
||||
@@ -332,9 +332,9 @@ void daObjYtaihou_c::shotCheck() {
|
||||
}
|
||||
|
||||
/* 80BA0964-80BA0974 000F64 0010+00 2/1 0/0 0/0 .text eventStart__14daObjYtaihou_cFv */
|
||||
BOOL daObjYtaihou_c::eventStart() {
|
||||
bool daObjYtaihou_c::eventStart() {
|
||||
mStartBomb = 0x5a;
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80BA0974-80BA09E4 000F74 0070+00 1/0 0/0 0/0 .text CreateHeap__14daObjYtaihou_cFv */
|
||||
|
||||
@@ -193,9 +193,9 @@ void daAmiShutter_c::modeWaitEvent() {
|
||||
}
|
||||
|
||||
/* 80BA1C90-80BA1CB4 0008B0 0024+00 2/1 0/0 0/0 .text eventStart__14daAmiShutter_cFv */
|
||||
BOOL daAmiShutter_c::eventStart() {
|
||||
bool daAmiShutter_c::eventStart() {
|
||||
init_modeCloseEvent();
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
|
||||
@@ -348,7 +348,7 @@ int daObjKWheel00_c::Delete() {
|
||||
}
|
||||
|
||||
/* 80C4E298-80C4E2C0 000C18 0028+00 2/1 0/0 0/0 .text eventStart__15daObjKWheel00_cFv */
|
||||
BOOL daObjKWheel00_c::eventStart() {
|
||||
bool daObjKWheel00_c::eventStart() {
|
||||
#if DEBUG
|
||||
if(getArg0())
|
||||
mZAngularVelocity = l_HIO.mZAngularAcceleration;
|
||||
@@ -361,7 +361,7 @@ BOOL daObjKWheel00_c::eventStart() {
|
||||
mZAngularVelocity = -2;
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
|
||||
@@ -325,7 +325,7 @@ int daObjKWheel01_c::Delete() {
|
||||
}
|
||||
|
||||
/* 80C4F498-80C4F4C0 000A98 0028+00 2/2 0/0 0/0 .text eventStart__15daObjKWheel01_cFv */
|
||||
BOOL daObjKWheel01_c::eventStart() {
|
||||
bool daObjKWheel01_c::eventStart() {
|
||||
#ifdef DEBUG
|
||||
if(getArg0())
|
||||
mYAngularVelocity = l_HIO.mYAngularAcceleration;
|
||||
@@ -338,7 +338,7 @@ BOOL daObjKWheel01_c::eventStart() {
|
||||
mYAngularVelocity = -2;
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
|
||||
@@ -385,7 +385,7 @@ int daLv3Water_c::Delete() {
|
||||
}
|
||||
|
||||
/* 80C59AE0-80C59BA8 001400 00C8+00 2/1 0/0 0/0 .text eventStart__12daLv3Water_cFv */
|
||||
BOOL daLv3Water_c::eventStart() {
|
||||
bool daLv3Water_c::eventStart() {
|
||||
field_0x601 = fpcM_GetParam(this) >> 0x18;
|
||||
mSwitch1 = mSwitch2;
|
||||
|
||||
@@ -402,7 +402,7 @@ BOOL daLv3Water_c::eventStart() {
|
||||
mode_init_levelCtrl();
|
||||
}
|
||||
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80C59BA8-80C59BD4 0014C8 002C+00 1/0 0/0 0/0 .text daLv3Water_Draw__FP12daLv3Water_c
|
||||
|
||||
@@ -257,7 +257,7 @@ int daLv3Water2_c::Delete() {
|
||||
}
|
||||
|
||||
/* 80C5AF3C-80C5B0C0 000C1C 0184+00 2/1 0/0 0/0 .text eventStart__13daLv3Water2_cFv */
|
||||
BOOL daLv3Water2_c::eventStart() {
|
||||
bool daLv3Water2_c::eventStart() {
|
||||
if(mEastSwInitialStatus != mEastSwCurrentStatus) {
|
||||
mWaterLv = getParamLevel1() * 5.0f;
|
||||
mWaterLvFrame = static_cast<u8>(getParamFrame1());
|
||||
@@ -279,7 +279,7 @@ BOOL daLv3Water2_c::eventStart() {
|
||||
|
||||
mode_init_levelCtrl();
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80C5B0C0-80C5B0EC 000DA0 002C+00 1/0 0/0 0/0 .text daLv3Water2_Draw__FP13daLv3Water2_c
|
||||
|
||||
@@ -349,9 +349,9 @@ void dalv4CandleDemoTag_c::modeEnd() {
|
||||
}
|
||||
|
||||
/* 80C5CF78-80C5CF9C 000678 0024+00 2/1 0/0 0/0 .text eventStart__20dalv4CandleDemoTag_cFv */
|
||||
BOOL dalv4CandleDemoTag_c::eventStart() {
|
||||
bool dalv4CandleDemoTag_c::eventStart() {
|
||||
init_modeEnemyCreate();
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80C5CF9C-80C5CFEC 00069C 0050+00 1/1 0/0 0/0 .text
|
||||
|
||||
@@ -475,9 +475,9 @@ void daObjSwHang_c::modeOnWait() {
|
||||
}
|
||||
|
||||
/* 80CFCCE0-80CFCD04 001420 0024+00 2/1 0/0 0/0 .text eventStart__13daObjSwHang_cFv */
|
||||
BOOL daObjSwHang_c::eventStart() {
|
||||
bool daObjSwHang_c::eventStart() {
|
||||
changeOnStatus();
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80CFCD04-80CFCD98 001444 0094+00 1/0 0/0 0/0 .text Draw__13daObjSwHang_cFv */
|
||||
|
||||
@@ -250,12 +250,12 @@ void daSyRock_c::modeWait() {
|
||||
}
|
||||
|
||||
/* 80D02F88-80D02FB8 000DC8 0030+00 2/1 0/0 0/0 .text eventStart__10daSyRock_cFv */
|
||||
BOOL daSyRock_c::eventStart() {
|
||||
bool daSyRock_c::eventStart() {
|
||||
// field_0x779 is always 0 when eventStart() is called (see modeWait())
|
||||
if(!field_0x779)
|
||||
init_modeDropInit();
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80D02FB8-80D03070 000DF8 00B8+00 1/1 0/0 0/0 .text init_modeDropInit__10daSyRock_cFv
|
||||
|
||||
@@ -390,13 +390,13 @@ void daObjVolcBall_c::actionEnd() {
|
||||
}
|
||||
|
||||
/* 80D22DDC-80D22E24 00133C 0048+00 2/1 0/0 0/0 .text eventStart__15daObjVolcBall_cFv */
|
||||
BOOL daObjVolcBall_c::eventStart() {
|
||||
bool daObjVolcBall_c::eventStart() {
|
||||
daObjVolcBom_c* bom_p = (daObjVolcBom_c*)fopAcM_SearchByID(mBigVolcActorID);
|
||||
if (bom_p != NULL) {
|
||||
bom_p->startFall();
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80D22E24-80D22ED4 001384 00B0+00 1/1 0/0 0/0 .text setEruptEffect__15daObjVolcBall_cFi
|
||||
|
||||
@@ -341,7 +341,7 @@ void daWtPillar_c::actionSwWait() {
|
||||
}
|
||||
|
||||
/* 80D2D488-80D2D4AC 000EA8 0024+00 2/1 0/0 0/0 .text eventStart__12daWtPillar_cFv */
|
||||
BOOL daWtPillar_c::eventStart() {
|
||||
bool daWtPillar_c::eventStart() {
|
||||
actionUpFirstInit();
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -27,8 +27,8 @@ public:
|
||||
/* 805A3038 */ int _delete();
|
||||
|
||||
/* 805A3118 */ ~daTagAtkItem_c();
|
||||
/* 805A2D10 */ BOOL eventStart();
|
||||
/* 805A2D34 */ BOOL eventEnd();
|
||||
/* 805A2D10 */ bool eventStart();
|
||||
/* 805A2D34 */ bool eventEnd();
|
||||
|
||||
u8 getEvId() { return fopAcM_GetParamBit(this, 0x18, 8); }
|
||||
u8 getNum() { return fopAcM_GetParamBit(this, 8, 8); }
|
||||
@@ -268,15 +268,15 @@ void daTagAtkItem_c::action() {
|
||||
|
||||
|
||||
/* 805A2D10-805A2D34 000430 0024+00 2/1 0/0 0/0 .text eventStart__14daTagAtkItem_cFv */
|
||||
BOOL daTagAtkItem_c::eventStart() {
|
||||
bool daTagAtkItem_c::eventStart() {
|
||||
createItem();
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 805A2D34-805A2D58 000454 0024+00 2/1 0/0 0/0 .text eventEnd__14daTagAtkItem_cFv */
|
||||
BOOL daTagAtkItem_c::eventEnd() {
|
||||
bool daTagAtkItem_c::eventEnd() {
|
||||
fopAcM_delete(this);
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 805A2D58-805A2F54 000478 01FC+00 1/1 0/0 0/0 .text checkHit__14daTagAtkItem_cFv */
|
||||
@@ -404,4 +404,4 @@ daTagAtkItem_c::~daTagAtkItem_c() {
|
||||
// cCcD_GStts::~cCcD_GStts() {
|
||||
extern "C" void __dt__10cCcD_GSttsFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user