falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

obj_kanban2 equivalent (#2434) 

* kanban2 equivalent

* some kanban2 doc

* fix some fake padding issues
This commit is contained in:
TakaRikka 2025-05-11 12:10:49 -07:00 committed by GitHub
parent 792dd6077a
commit 8f97cd9e4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 1876 additions and 1378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/d/actor/d_a_obj_Turara.h
View File

@ -14,11 +14,8 @@
* @details
*
*/
struct fakeTuraraPadding {
u8 a[8];
};
class daTurara_c : public dBgS_MoveBgActor, public fakeTuraraPadding, public dEvLib_callback_c {
class daTurara_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c {
public:
daTurara_c() : dEvLib_callback_c(this) {}
/* 80B9E710 */ ~daTurara_c() {}

5
include/d/actor/d_a_obj_amiShutter.h
View File

@ -14,11 +14,8 @@
* @details
*
*/
struct fakeAmiShutterPadding {
u8 padding[8];
};
class daAmiShutter_c : public dBgS_MoveBgActor, public fakeAmiShutterPadding, public dEvLib_callback_c {
class daAmiShutter_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c {
public:
typedef void (daAmiShutter_c::*modeProc)();

83
include/d/actor/d_a_obj_kanban2.h
View File

@ -2,6 +2,10 @@
#define D_A_OBJ_KANBAN2_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_cc_d.h"
#include "d/d_cc_uty.h"
#include "d/d_bg_s_acch.h"
#include "d/d_msg_flow.h"
/**
* @ingroup actors-objects
@ -13,24 +17,24 @@
*/
class daObj_Kanban2_c : public fopAc_ac_c {
public:
/* 80581790 */ void draw();
/* 80581790 */ int draw();
/* 80581938 */ void setKanbanSE(int);
/* 805819BC */ void createBreakParts(u32, csXyz);
/* 805819FC */ void createWallHitBreak();
/* 80581B5C */ void getKanbanCutType();
/* 80581C48 */ void getKanbanWolfCutType();
/* 80581B5C */ int getKanbanCutType();
/* 80581C48 */ int getKanbanWolfCutType();
/* 80581D04 */ void damage_check();
/* 8058221C */ void float_damage_check();
/* 805822F0 */ void deletePart();
/* 805825A4 */ void getWallAngle();
/* 8058221C */ bool float_damage_check();
/* 805822F0 */ bool deletePart();
/* 805825A4 */ s16 getWallAngle();
/* 8058271C */ void setGroundAngle();
/* 80582894 */ void checkWaterSurface();
/* 80582944 */ void checkPataGround(s16, s16);
/* 80582894 */ bool checkWaterSurface();
/* 80582944 */ bool checkPataGround(s16, s16);
/* 80582A68 */ void setCullMtx();
/* 80582AAC */ void setSmokeEffect(cXyz);
/* 80582AFC */ void setWaterEffect();
/* 80582C40 */ void setCenterPos();
/* 80582E68 */ void checkCarryOn();
/* 80582E68 */ BOOL checkCarryOn();
/* 80582EF0 */ void setActionMode(int, int);
/* 80582F40 */ void calcNormalSwing();
/* 80583364 */ void executeNormal();
@ -41,21 +45,66 @@ public:
/* 805849CC */ void action();
/* 80584AD8 */ void mtx_set();
/* 80584CFC */ void cc_set();
/* 80584DF0 */ void execute();
/* 80584ED8 */ void _delete();
/* 80584F64 */ void CreateHeap();
/* 805850E8 */ void create();
/* 80584DF0 */ int execute();
/* 80584ED8 */ int _delete();
/* 80584F64 */ int CreateHeap();
/* 805850E8 */ int create();
private:
/* 0x568 */ u8 field_0x568[0xa50 - 0x568];
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ J3DModel* mpModel;
/* 0x574 */ J3DModel* mpPartModel[18];
/* 0x5BC */ Z2SoundObjSimple mSound;
/* 0x5DC */ cXyz field_0x5dc;
/* 0x5E8 */ csXyz field_0x5e8;
/* 0x5EE */ csXyz field_0x5ee;
/* 0x5F4 */ csXyz field_0x5f4;
/* 0x5FC */ f32 field_0x5fc;
/* 0x600 */ f32 field_0x600;
/* 0x604 */ f32 field_0x604;
/* 0x608 */ s16 field_0x608;
/* 0x60A */ s16 field_0x60a;
/* 0x60C */ int mAction;
/* 0x610 */ int mPrevAction;
/* 0x614 */ int mMode;
/* 0x618 */ u32 mShadowId;
/* 0x61C */ u32 mPartFlags;
/* 0x620 */ u32 field_0x620;
/* 0x624 */ s16 field_0x624;
/* 0x626 */ u8 field_0x626;
/* 0x627 */ u8 field_0x627;
/* 0x628 */ u8 mInvulnerabilityTimer;
/* 0x629 */ u8 field_0x629;
/* 0x62A */ u8 field_0x62a;
/* 0x62B */ u8 field_0x62b;
/* 0x62C */ u8 field_0x62c;
/* 0x62D */ u8 field_0x62d;
/* 0x62E */ u8 field_0x62e;
/* 0x630 */ dBgS_AcchCir mAcchCir;
/* 0x670 */ dBgS_ObjAcch mAcch;
/* 0x848 */ dCcD_Stts mCcStts;
/* 0x884 */ dCcD_Sph mCcSph;
/* 0x9BC */ dCcU_AtInfo mAtInfo;
/* 0x9E0 */ u32 field_0x9e0;
/* 0x9E4 */ u32 field_0x9e4;
/* 0x9E8 */ u32 mWaterEffID[4];
/* 0x9F8 */ u32 field_0x9f8;
/* 0x9FC */ u8 mInitHIO;
/* 0x9FE */ s16 field_0x9fe;
/* 0xA00 */ s16 mFlowID;
/* 0xA04 */ dMsgFlow_c mMsgFlow;
};
STATIC_ASSERT(sizeof(daObj_Kanban2_c) == 0xa50);
class daObj_Kanban2_HIO_c {
class daObj_Kanban2_HIO_c : public JORReflexible {
public:
/* 8058176C */ daObj_Kanban2_HIO_c();
/* 80585578 */ ~daObj_Kanban2_HIO_c();
/* 80585578 */ virtual ~daObj_Kanban2_HIO_c() {}
void genMessage(JORMContext*);
/* 0x4 */ s8 id;
/* 0x8 */ f32 base_size;
};

6
include/d/actor/d_a_obj_lv3Water2.h
View File

@ -5,10 +5,6 @@
#include "d/d_event_lib.h"
#include "f_op/f_op_actor_mng.h"
struct fakeLv3Water2Padding {
u8 a[8];
};
/**
* @ingroup actors-objects
* @class daLv3Water2_c
@ -17,7 +13,7 @@ struct fakeLv3Water2Padding {
* @details Water in the central room (where the boss entrance is). It can be raised twice.
*
*/
class daLv3Water2_c : public dBgS_MoveBgActor, public fakeLv3Water2Padding, public dEvLib_callback_c {
class daLv3Water2_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c {
public:
daLv3Water2_c() : dEvLib_callback_c(this) {}
~daLv3Water2_c() {}

15
include/d/actor/d_a_obj_lv4CandleTag.h
View File

@ -5,12 +5,6 @@
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
struct unknown {
u8 unk[8];
};
// dalv4CandleTag_c should inherit fopAc_ac_c, unknown, and dEvLib_callback_c
// but this causes issues with weak function ordering
/**
* @ingroup actors-objects
* @class dalv4CandleTag_c
@ -19,7 +13,7 @@ struct unknown {
* @details
*
*/
class dalv4CandleTag_c : public fopAc_ac_c {
class dalv4CandleTag_c : public fopAc_ac_c, public request_of_phase_process_class, public dEvLib_callback_c {
public:
enum Mode {
MODE_WATCH,
@ -31,11 +25,6 @@ public:
// dalv4CandleTag_c() : dEvLib_callback_c(this) {}
~dalv4CandleTag_c() {}
// These members are not real, remove once inheritance issue is resolved
unknown mBase2;
dEvLib_callback_c mBase3;
void* mVtable;
/* 80C5D4B8 */ void setBaseMtx();
/* 80C5D4F0 */ cPhs__Step create();
/* 80C5D5D4 */ int Execute();
@ -48,7 +37,7 @@ public:
/* 80C5D8AC */ void modeNGWait();
/* 80C5D8FC */ void init_modeEnd();
/* 80C5D908 */ void modeEnd();
/* 80C5D90C */ int eventStart();
/* 80C5D90C */ bool eventStart();
/* 80C5D930 */ int Draw();
/* 80C5D938 */ int Delete();

5
include/d/actor/d_a_obj_syRock.h
View File

@ -12,11 +12,8 @@
* @details Breakable stalactites seen in Lakebed Temple
*
*/
struct fakeSyRockPadding {
u8 a[8];
};
class daSyRock_c : public dBgS_MoveBgActor, public fakeSyRockPadding, public dEvLib_callback_c {
class daSyRock_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c {
public:
daSyRock_c() : dEvLib_callback_c(this) {}
/* 80D03DAC */ ~daSyRock_c() {};

7
include/d/actor/d_a_obj_waterPillar.h
View File

@ -14,12 +14,7 @@
* @details Water columns that can carry broken stalactites (see d_a_obj_syrock)
*
*/
struct fakeWtPillarPadding {
u8 a[8];
};
class daWtPillar_c : public fopAc_ac_c, public fakeWtPillarPadding, public dEvLib_callback_c {
class daWtPillar_c : public fopAc_ac_c, public request_of_phase_process_class, public dEvLib_callback_c {
public:
daWtPillar_c();
~daWtPillar_c() {}

3124
src/d/actor/d_a_obj_kanban2.cpp
View File

File diff suppressed because it is too large Load Diff

4
src/d/actor/d_a_obj_lv4CandleTag.cpp
View File

@ -296,7 +296,7 @@ void dalv4CandleTag_c::modeEnd() {
}
/* 80C5D90C-80C5D930 0005AC 0024+00 2/1 0/0 0/0 .text eventStart__16dalv4CandleTag_cFv */
int dalv4CandleTag_c::eventStart() {
bool dalv4CandleTag_c::eventStart() {
// NONMATCHING
}
@ -387,4 +387,4 @@ extern "C" bool eventStart__17dEvLib_callback_cFv() {
// dalv4CandleTag_c::~dalv4CandleTag_c() {
extern "C" void __dt__16dalv4CandleTag_cFv() {
// NONMATCHING
}
}