From 6c9b6c3c000da5600b669c30d02bdca1b09056d3 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 24 Nov 2023 13:06:40 -0500 Subject: [PATCH] Manually fix headers for build --- include/d/actor/d_a_obj_buoyflag.h | 27 +++++++++++++++++++--- include/d/actor/d_a_obj_jump.h | 10 ++++++-- include/d/actor/d_a_obj_mkie.h | 10 ++++++-- include/d/actor/d_a_obj_mmrr.h | 5 +++- include/d/actor/d_a_obj_pirateship.h | 2 ++ include/d/actor/d_a_ship.h | 34 ++++++++++++++++------------ include/d/actor/d_a_title.h | 5 ++++ include/d/actor/d_a_ykgr.h | 11 ++++++++- include/d/d_particle.h | 4 ++-- src/d/actor/d_a_kaji.cpp | 2 +- src/d/d_a_ship_static.cpp | 14 ++++++------ 11 files changed, 90 insertions(+), 34 deletions(-) diff --git a/include/d/actor/d_a_obj_buoyflag.h b/include/d/actor/d_a_obj_buoyflag.h index db7af87a7..83354dcaa 100644 --- a/include/d/actor/d_a_obj_buoyflag.h +++ b/include/d/actor/d_a_obj_buoyflag.h @@ -2,10 +2,34 @@ #define D_A_OBJ_BUOYFLAG_H #include "f_op/f_op_actor.h" +#include "m_Do/m_Do_mtx.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" namespace daObjBuoyflag { + enum Type_e { + + }; + enum Texture_e { + + }; + class Act_c : public fopAc_ac_c { public: + static s32 make_norm(unsigned int parentPId, cXyz* pos, int roomNo, csXyz* angle) { + u32 params = prm_make(static_cast(0), static_cast(0), false); // TODO: placeholder + return fopAcM_createChild( + PROC_Obj_Buoyflag, parentPId, + params, pos, + roomNo, angle, NULL, -1, NULL + ); + } + static u32 prm_make(daObjBuoyflag::Type_e, daObjBuoyflag::Texture_e, bool) { + // TODO: placeholder function + return 0; + } + + void setup(MtxP mtx) { cMtx_copy(mtx, m1090); } void _create() {} void _delete() {} void _draw() {} @@ -13,9 +37,6 @@ namespace daObjBuoyflag { void jump_to_sea(float, float, short) {} void make_barrel2_mine(unsigned int, cXyz*, int, csXyz*, daObjBuoyflag::Texture_e, bool) {} void make_barrel2_norm(unsigned int, cXyz*, int, csXyz*, daObjBuoyflag::Texture_e) {} - void make_norm(unsigned int, cXyz*, int, csXyz*) {} - void prm_make(daObjBuoyflag::Type_e, daObjBuoyflag::Texture_e, bool) {} - void setup(float(*)[4]) {} void prm_get_texture() const; void attr_type() const; diff --git a/include/d/actor/d_a_obj_jump.h b/include/d/actor/d_a_obj_jump.h index 099993194..b0cfb62a6 100644 --- a/include/d/actor/d_a_obj_jump.h +++ b/include/d/actor/d_a_obj_jump.h @@ -8,8 +8,14 @@ namespace daObjJump { class Act_c : public fopAc_ac_c { public: - void prm_make_b() {} - void setup(const cXyz*) {} + static u32 prm_make_b() { + return 1; + } + + void setup(const cXyz* pos) { + current.pos = *pos; + m336 = 1; + } void CreateHeap(); void Create(); diff --git a/include/d/actor/d_a_obj_mkie.h b/include/d/actor/d_a_obj_mkie.h index 958e24271..1eff8a519 100644 --- a/include/d/actor/d_a_obj_mkie.h +++ b/include/d/actor/d_a_obj_mkie.h @@ -6,8 +6,14 @@ namespace daObjMkie { class Act_c : public fopAc_ac_c { public: - void prm_make(unsigned char, int) {} - void setup(const cXyz*) {} + static u32 prm_make(u8 eventId, int swNo) { + return swNo << 0x10 | (eventId | 0x3000); + } + + void setup(const cXyz* pos) { + current.pos = *pos; + mF58 = 1; + } void CreateHeap(); void init_cc(); diff --git a/include/d/actor/d_a_obj_mmrr.h b/include/d/actor/d_a_obj_mmrr.h index 8da5e37e4..d0cf13579 100644 --- a/include/d/actor/d_a_obj_mmrr.h +++ b/include/d/actor/d_a_obj_mmrr.h @@ -6,7 +6,10 @@ namespace daObjMmrr { class Act_c : public fopAc_ac_c { public: - void setup(const cXyz*) {} + void setup(const cXyz* pos) { + current.pos = *pos; + mBF8 = 1; + } void solidHeapCB(fopAc_ac_c*); void create_heap(); diff --git a/include/d/actor/d_a_obj_pirateship.h b/include/d/actor/d_a_obj_pirateship.h index 2e2a85f13..a82526584 100644 --- a/include/d/actor/d_a_obj_pirateship.h +++ b/include/d/actor/d_a_obj_pirateship.h @@ -33,6 +33,8 @@ namespace daObjPirateship { /* 0x2D0 */ J3DModel* mpModel; /* 0x2D4 */ u8 m2D4[0x6D4 - 0x2D4]; }; + + static f32 getShipOffsetY(s16*, s16*, f32); }; #endif /* D_A_OBJ_PIRATESHIP_H */ diff --git a/include/d/actor/d_a_ship.h b/include/d/actor/d_a_ship.h index 592128682..c5a068dde 100644 --- a/include/d/actor/d_a_ship.h +++ b/include/d/actor/d_a_ship.h @@ -12,6 +12,10 @@ class daShip_c : public fopAc_ac_c { public: + enum daSHIP_SFLG { + + }; + void checkForceMove() {} void getBodyMtx() {} void getCraneTop() {} @@ -28,7 +32,7 @@ public: void getWhirlActor() {} void offCraneHookFlg() {} void offFantomGanonBattle() {} - void offStateFlg(daShip_c::daSHIP_SFLG) {} + void offStateFlg(daSHIP_SFLG) {} void offTornadoFlg() {} void offWhirlFlg() {} void onCb1Ride() {} @@ -39,7 +43,7 @@ public: void onLinkSit() {} void onSceneChange() {} void onShortHitFlg() {} - void onStateFlg(daShip_c::daSHIP_SFLG) {} + void onStateFlg(daSHIP_SFLG) {} void onTornadoFlg(unsigned long) {} void onWhirlFlg(unsigned long, short) {} void onWhirlFlgDirect(unsigned long, short) {} @@ -67,24 +71,24 @@ public: void checkForceMessage(); void setInitMessage(); void setNextMessage(msg_class*); - void seStart(unsigned long, cXyz*); + void seStart(u32, cXyz*); void setSailAngle(); - void setControllAngle(short); + void setControllAngle(s16); void getMaxWaterY(cXyz*); - void setWaveAngle(short*, short*); + void setWaveAngle(s16*, s16*); void getWaterY(); void setYPos(); void checkOutRange(); - void decrementShipSpeed(float); - void firstDecrementShipSpeed(float); - void getAimControllAngle(short); - void setMoveAngle(short); + void decrementShipSpeed(f32); + void firstDecrementShipSpeed(f32); + void getAimControllAngle(s16); + void setMoveAngle(s16); void changeDemoEndProc(); - void setCrashData(short); + void setCrashData(s16); void checkNextMode(int); - void setPartOnAnime(unsigned char); + void setPartOnAnime(u8); void setPartOffAnime(); - void setPartAnimeInit(unsigned char); + void setPartAnimeInit(u8); void setSelfMove(int); void procWait_init(); void procWait(); @@ -126,7 +130,7 @@ public: void procWhirlDown(); void procStartModeThrow_init(); void procStartModeThrow(); - void setEffectData(float, short); + void setEffectData(f32, s16); void setRoomInfo(); void incRopeCnt(int, int); void setRopePos(); @@ -140,6 +144,7 @@ public: void create(); void getCannonAngleX() const; void checkForceMove() const; + void initStartPos(cXyz const*, s16); public: /* 0x0290 */ request_of_phase_process_class mPhs; @@ -155,7 +160,7 @@ public: /* 0x030C */ mDoExt_3DlineMat1_c mRopeLine; /* 0x0348 */ u8 m0348[0x034D - 0x0348]; /* 0x034D */ u8 m034D; - /* 0x034E */ daShip_c__ShipMode mShipMode; + /* 0x034E */ u8 mShipMode; /* 0x034F */ u8 m034F[0x0354 - 0x034F]; /* 0x0354 */ int mEvtStaffId; /* 0x0358 */ u32 m0358; @@ -221,7 +226,6 @@ public: /* 0x1180 */ dBgS_Acch mAcch; /* 0x1344 */ dCcD_Stts mStts; /* 0x1380 */ dCcD_Cyl mCyl[3]; - /* 0x14B0 */ u8 m14B0[0x1710 - 0x14B0]; /* 0x1710 */ dCcD_Sph m1710; /* 0x183C */ dPa_waveEcallBack mWaveR; /* 0x18A0 */ dPa_waveEcallBack mWaveL; diff --git a/include/d/actor/d_a_title.h b/include/d/actor/d_a_title.h index 4812803f2..91cb2b844 100644 --- a/include/d/actor/d_a_title.h +++ b/include/d/actor/d_a_title.h @@ -3,6 +3,11 @@ #include "f_op/f_op_actor.h" +class daTitle_proc_c { +public: + static void daTitle_Kirakira_Sound_flag_on(); +}; + class daTitle_c : public fopAc_ac_c { public: void create() {} diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h index 634c228c8..b99baaaf5 100644 --- a/include/d/actor/d_a_ykgr.h +++ b/include/d/actor/d_a_ykgr.h @@ -2,9 +2,19 @@ #define D_A_YKGR_H #include "f_op/f_op_actor.h" +#include "JSystem/JParticle/JPAEmitter.h" class daYkgr_c : public fopAc_ac_c { public: + static void stop() { + if (m_emitter) { + m_alpha_flag = 0; + } + }; + + static JPABaseEmitter* m_emitter; + static u8 m_alpha_flag; + void _create() {} void _delete() {} void _draw() {} @@ -16,7 +26,6 @@ public: void set_mtx() {} void show() {} void start() {} - void stop() {} void getPosRate(); diff --git a/include/d/d_particle.h b/include/d/d_particle.h index 2bd41d7e1..38c8cfd7c 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -120,7 +120,7 @@ public: /* 0x1C */ cXyz mCollapsePos[2]; /* 0x34 */ cXyz* mpPos; /* 0x38 */ csXyz* mpRot; - // /* 0x3C */ cXyz mRotMtx[3]; + /* 0x3C */ cXyz mRotMtx[3]; /* 0x60 */ JPABaseEmitter* mpBaseEmitter; }; @@ -153,7 +153,7 @@ public: /* 0x04 */ s16 mState; /* 0x08 */ f32 mBaseY; /* 0x0C */ f32 mMinY; - // /* 0x10 */ cXyz mPos[3]; + /* 0x10 */ cXyz mPos[3]; /* 0x34 */ cXyz* mpPos; /* 0x38 */ csXyz* mpRot; /* 0x3C */ f32 mExTransY; diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index 9c7339826..b61833a36 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/src/d/actor/d_a_kaji.cpp @@ -113,7 +113,7 @@ BOOL daKaji_c::_execute() { } bool daKaji_c::_draw() { - if (!l_p_ship->unk2CC) { + if (!l_p_ship->m2CC) { return true; } g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &mTevStr); diff --git a/src/d/d_a_ship_static.cpp b/src/d/d_a_ship_static.cpp index 9c4ff4c57..399255bf8 100644 --- a/src/d/d_a_ship_static.cpp +++ b/src/d/d_a_ship_static.cpp @@ -12,18 +12,18 @@ void daShip_c::initStartPos(const cXyz* pos, short rotY) { next.pos.z = pos->z; shape_angle.y = rotY; current.angle.y = shape_angle.y; - field_0x0358 &= 0xffffffef; + m0358 &= 0xffffffef; mGravity = -2.5f; - mWaveR.remove(); mWaveL.remove(); + mWaveR.remove(); mSplash.remove(); mTrack.remove(); - field_0x1970.end(); - field_0x1984.end(); - field_0x1998.end(); - field_0x19ac.end(); - field_0x19c0.end(); + m1970.end(); + m1984.end(); + m1998.end(); + m19AC.end(); + m19C0.end(); }