mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-21 14:07:29 -04:00
d_a_kanban (#820)
* d_a_kanban * PR --------- Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
+1
-1
@@ -1373,7 +1373,7 @@ config.libs = [
|
||||
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_ikari"),
|
||||
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_jbo", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_kaji"),
|
||||
ActorRel(NonMatching, "d_a_kanban"),
|
||||
ActorRel(NonMatching, "d_a_kanban", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(Matching, "d_a_ki", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(NonMatching, "d_a_knob00"),
|
||||
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_kui"),
|
||||
|
||||
@@ -3,26 +3,63 @@
|
||||
|
||||
#include "f_op/f_op_actor.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "d/d_particle.h"
|
||||
#include "d/d_bg_s_acch.h"
|
||||
#include "m_Do/m_Do_hostIO.h"
|
||||
|
||||
class kanban_class : public fopAc_ac_c {
|
||||
public:
|
||||
/* 0x290 */ u8 m290[0x2C0 - 0x290];
|
||||
struct kanban_class {
|
||||
/* 0x000 */ fopAc_ac_c actor;
|
||||
/* 0x290 */ bool m290;
|
||||
/* 0x294 */ u32 m294;
|
||||
/* 0x298 */ u8 m298;
|
||||
/* 0x299 */ u8 m299[0x29A - 0x299];
|
||||
/* 0x29A */ u8 m29A;
|
||||
/* 0x29B */ u8 m29B;
|
||||
/* 0x29C */ u8 m29C;
|
||||
/* 0x2A0 */ f32 m2A0;
|
||||
/* 0x2A4 */ f32 m2A4;
|
||||
/* 0x2A8 */ f32 m2A8;
|
||||
/* 0x2AC */ csXyz m2AC;
|
||||
/* 0x2B2 */ s16 m2B2[5];
|
||||
/* 0x2BC */ s16 m2BC;
|
||||
/* 0x2BE */ s16 m2BE;
|
||||
/* 0x2C0 */ s16 m2C0;
|
||||
/* 0x2C2 */ u8 m2C2[0x310 - 0x2C2];
|
||||
/* 0x2C2 */ s16 m2C2;
|
||||
/* 0x2C4 */ s16 m2C4;
|
||||
/* 0x2C6 */ s16 m2C6;
|
||||
/* 0x2C8 */ fpc_ProcID m2C8;
|
||||
/* 0x2CC */ cXyz m2CC;
|
||||
/* 0x2D8 */ cXyz m2D8;
|
||||
/* 0x2E4 */ f32 m2E4;
|
||||
/* 0x2E8 */ f32 m2E8;
|
||||
/* 0x2EC */ f32 m2EC;
|
||||
/* 0x2F0 */ csXyz m2F0;
|
||||
/* 0x2F8 */ cXyz m2F8;
|
||||
/* 0x304 */ cXyz m304;
|
||||
/* 0x310 */ dBgS_AcchCir m310;
|
||||
/* 0x350 */ dBgS_Acch m350;
|
||||
/* 0x514 */ u8 m514[0x574 - 0x514];
|
||||
/* 0x350 */ dBgS_ObjAcch m350;
|
||||
/* 0x514 */ dPa_rippleEcallBack m514;
|
||||
/* 0x528 */ cXyz m528;
|
||||
/* 0x534 */ u8 m534[0x53C - 0x534];
|
||||
/* 0x53C */ request_of_phase_process_class mPhase;
|
||||
/* 0x544 */ J3DModel* m544[11];
|
||||
/* 0x570 */ u32 m570;
|
||||
/* 0x574 */ dCcD_Stts m574;
|
||||
/* 0x5B0 */ dCcD_Cyl m5B0;
|
||||
};
|
||||
}; // size = 0x6E0
|
||||
|
||||
class daKanban_HIO_c {
|
||||
class daKanban_HIO_c : public mDoHIO_entry_c {
|
||||
public:
|
||||
daKanban_HIO_c();
|
||||
virtual ~daKanban_HIO_c() {}
|
||||
|
||||
void genMessage(JORMContext* ctx);
|
||||
|
||||
public:
|
||||
/* Place member variables here */
|
||||
};
|
||||
/* 0x04 */ f32 m04;
|
||||
/* 0x08 */ s16 m08;
|
||||
/* 0x0A */ s16 m0A;
|
||||
/* 0x0C */ f32 m0C;
|
||||
}; // size = 0x10
|
||||
|
||||
#endif /* D_A_KANBAN_H */
|
||||
|
||||
@@ -216,7 +216,7 @@ public:
|
||||
/* 0x08 */ const cXyz* mPos;
|
||||
/* 0x0C */ u32 mFlags;
|
||||
/* 0x10 */ f32 mRate;
|
||||
};
|
||||
}; // size = 0x14
|
||||
|
||||
class dPa_modelEmitter_c : public node_class {
|
||||
public:
|
||||
|
||||
@@ -132,6 +132,10 @@ inline u32 fopAcM_checkCarryNow(fopAc_ac_c* pActor) {
|
||||
return pActor->actor_status & fopAcStts_CARRY_e;
|
||||
}
|
||||
|
||||
inline void fopAcM_ClearStatusMap(fopAc_ac_c* pActor) {
|
||||
pActor->actor_status &= ~0x3F;
|
||||
}
|
||||
|
||||
inline bool fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) {
|
||||
return fopAcM_CheckStatus(pActor, fopAcStts_HOOK_CARRY_e);
|
||||
}
|
||||
@@ -383,7 +387,7 @@ inline fopAc_ac_c* fopAcM_SearchByName(s16 procName) {
|
||||
return (fopAc_ac_c*)fopAcIt_Judge(fpcSch_JudgeForPName, &procName);
|
||||
}
|
||||
|
||||
inline fpc_ProcID fopAcM_GetLinkId(const fopAc_ac_c* pActor) {
|
||||
inline fpc_ProcID fopAcM_GetLinkId(fopAc_ac_c* pActor) {
|
||||
return pActor->parentActorID;
|
||||
}
|
||||
|
||||
|
||||
+1012
-37
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user