mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
knBullet / lv6Lblock done, lv6ChangeGate equivalent (#2729)
* knBullet / lv6Lblock done, lv6ChangeGate equivalent * d_a_e_mm matching * debug fix * obj_kage matching
This commit is contained in:
TakaRikka
+5
-5
@@ -1751,7 +1751,7 @@ config.libs = [
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_mf"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_mk"),
|
||||
ActorRel(MatchingFor("GZ2E01"), "d_a_e_mk_bo"),
|
||||
ActorRel(NonMatching, "d_a_e_mm"),
|
||||
ActorRel(MatchingFor("GZ2E01"), "d_a_e_mm"),
|
||||
ActorRel(NonMatching, "d_a_e_mm_mt"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_ms"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_nz"),
|
||||
@@ -2029,7 +2029,7 @@ config.libs = [
|
||||
ActorRel(NonMatching, "d_a_obj_itamato"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kabuto"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kag"),
|
||||
ActorRel(NonMatching, "d_a_obj_kage"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kage"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kago"),
|
||||
ActorRel(NonMatching, "d_a_obj_kaisou"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kamakiri"),
|
||||
@@ -2044,7 +2044,7 @@ config.libs = [
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kita"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kjgjs"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kkanban"),
|
||||
ActorRel(NonMatching, "d_a_obj_knBullet"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_knBullet"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kshutter"),
|
||||
ActorRel(NonMatching, "d_a_obj_kuwagata"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kwheel00"),
|
||||
@@ -2083,9 +2083,9 @@ config.libs = [
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv5SwIce"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv5ychndlr"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv5yiblltray"),
|
||||
ActorRel(NonMatching, "d_a_obj_lv6ChangeGate"),
|
||||
ActorRel(Equivalent, "d_a_obj_lv6ChangeGate"), # weak func order
|
||||
ActorRel(NonMatching, "d_a_obj_lv6FurikoTrap"),
|
||||
ActorRel(NonMatching, "d_a_obj_lv6Lblock"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6Lblock"),
|
||||
ActorRel(NonMatching, "d_a_obj_lv6SwGate"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6SzGate"),
|
||||
ActorRel(NonMatching, "d_a_obj_lv6Tenbin"),
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
#ifndef D_A_E_MM_H
|
||||
#define D_A_E_MM_H
|
||||
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "d/d_bg_s_acch.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "d/d_cc_uty.h"
|
||||
|
||||
/**
|
||||
* @ingroup actors-enemies
|
||||
@@ -10,17 +14,55 @@
|
||||
* @details
|
||||
*
|
||||
*/
|
||||
class e_mm_class : public fopEn_enemy_c {
|
||||
private:
|
||||
/* 0x5ac */ u8 field_0x5ac[0xc1c - 0x5ac];
|
||||
class e_mm_class {
|
||||
public:
|
||||
/* 0x000 */ fopEn_enemy_c enemy;
|
||||
/* 0x5AC */ request_of_phase_process_class phase;
|
||||
/* 0x5B4 */ u8 field_0x5b4;
|
||||
/* 0x5B5 */ u8 field_0x5b5;
|
||||
/* 0x5B6 */ u8 bitSw;
|
||||
/* 0x5B8 */ mDoExt_McaMorfSO* modelMorf;
|
||||
/* 0x5BC */ Z2CreatureEnemy sound;
|
||||
/* 0x660 */ int anm;
|
||||
/* 0x664 */ u32 shadowId;
|
||||
/* 0x668 */ fpc_ProcID armorChildId;
|
||||
/* 0x66C */ s16 lifetime;
|
||||
/* 0x66E */ s16 action;
|
||||
/* 0x670 */ s16 mode;
|
||||
/* 0x672 */ s8 field_0x672;
|
||||
/* 0x674 */ cXyz field_0x674;
|
||||
/* 0x680 */ u8 field_0x680[0x68C - 0x680];
|
||||
/* 0x68C */ s16 target_ya;
|
||||
/* 0x68E */ u8 field_0x68E[0x690 - 0x68E];
|
||||
/* 0x690 */ s16 angle_to_pl;
|
||||
/* 0x694 */ f32 dist_to_pl;
|
||||
/* 0x698 */ f32 field_0x698;
|
||||
/* 0x69C */ s16 timers[4];
|
||||
/* 0x6A4 */ s16 field_0x6a4;
|
||||
/* 0x6A8 */ f32 field_0x6a8;
|
||||
/* 0x6AC */ s16 field_0x6ac;
|
||||
/* 0x6B0 */ dBgS_AcchCir acchcir;
|
||||
/* 0x6F0 */ dBgS_ObjAcch acch;
|
||||
/* 0x8C8 */ dCcD_Stts ccStts;
|
||||
/* 0x904 */ dCcD_Sph ccSph;
|
||||
/* 0xA3C */ dCcD_Sph ccWindSph;
|
||||
/* 0xB74 */ dCcU_AtInfo atInfo;
|
||||
/* 0xB98 */ s8 field_0xb98;
|
||||
/* 0xB99 */ s8 field_0xb99;
|
||||
/* 0xB9C */ u32 field_0xb9c[6];
|
||||
/* 0xBB4 */ u32 waterEffEmtIds[4];
|
||||
/* 0xBC4 */ cXyz field_0xbc4;
|
||||
/* 0xBD0 */ cXyz field_0xbd0;
|
||||
/* 0xBDC */ cXyz field_0xbdc;
|
||||
/* 0xBE8 */ cXyz field_0xbe8;
|
||||
/* 0xBF4 */ cXyz field_0xbf4;
|
||||
/* 0xC00 */ u8 field_0xc00;
|
||||
/* 0xC01 */ u8 field_0xc01;
|
||||
/* 0xC04 */ u32 field_0xc04;
|
||||
/* 0xC08 */ u32 field_0xc08;
|
||||
/* 0xC0C */ u8 field_0xC0C[0xC1C - 0xC0C];
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(e_mm_class) == 0xc1c);
|
||||
|
||||
class daE_MM_HIO_c {
|
||||
/* 8071F9CC */ daE_MM_HIO_c();
|
||||
/* 80722780 */ ~daE_MM_HIO_c();
|
||||
};
|
||||
|
||||
|
||||
#endif /* D_A_E_MM_H */
|
||||
|
||||
@@ -11,9 +11,21 @@
|
||||
* @details
|
||||
*
|
||||
*/
|
||||
class obj_kage_class : public fopAc_ac_c {
|
||||
private:
|
||||
/* 0x568 */ u8 field_0x568[0x5b4 - 0x568];
|
||||
class obj_kage_class {
|
||||
public:
|
||||
/* 0x000 */ fopAc_ac_c actor;
|
||||
/* 0x568 */ request_of_phase_process_class phase;
|
||||
/* 0x570 */ J3DModel* model;
|
||||
/* 0x574 */ u8 field_0x574;
|
||||
/* 0x578 */ Z2SoundObjSimple sound;
|
||||
/* 0x598 */ u8 field_0x598[0x59A - 0x598];
|
||||
/* 0x59A */ s16 timers[2];
|
||||
/* 0x59E */ s16 field_0x59e;
|
||||
/* 0x5A0 */ s16 counter;
|
||||
/* 0x5A4 */ f32 field_0x5a4;
|
||||
/* 0x5A8 */ f32 field_0x5a8;
|
||||
/* 0x5AC */ fpc_ProcID inko_child_id;
|
||||
/* 0x5B0 */ u8 field_0x5b0[0x5B4 - 0x5B0];
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(obj_kage_class) == 0x5b4);
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#define D_A_OBJ_KNBULLET_H
|
||||
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "d/d_cc_d.h"
|
||||
|
||||
/**
|
||||
* @ingroup actors-objects
|
||||
@@ -13,25 +14,33 @@
|
||||
*/
|
||||
class daObjKnBullet_c : public fopAc_ac_c {
|
||||
public:
|
||||
/* 80C47118 */ void Create();
|
||||
/* 80C47300 */ void Execute();
|
||||
/* 80C47480 */ bool Draw();
|
||||
/* 80C47488 */ bool Delete();
|
||||
/* 80C47118 */ int Create();
|
||||
/* 80C47300 */ int Execute();
|
||||
/* 80C47480 */ int Draw();
|
||||
/* 80C47488 */ int Delete();
|
||||
/* 80C47490 */ void setBaseMtx();
|
||||
/* 80C474E8 */ void col_init();
|
||||
/* 80C47558 */ void col_chk();
|
||||
/* 80C47558 */ BOOL col_chk();
|
||||
/* 80C477B4 */ void hitPrtclSet();
|
||||
|
||||
u8 getActionMode() { return mActionMode; }
|
||||
void setActionMode(u8 i_action) { mActionMode = i_action; }
|
||||
|
||||
private:
|
||||
/* 0x568 */ u8 field_0x568[0x70c - 0x568];
|
||||
/* 0x568 */ Mtx mMtx;
|
||||
/* 0x598 */ dCcD_Stts mCcStts;
|
||||
/* 0x5D4 */ dCcD_Sph mCcSph;
|
||||
/* 0x70C */ u8 mActionMode;
|
||||
/* 0x70D */ u8 field_0x70d[0x71c - 0x70d];
|
||||
/* 0x70E */ s16 mTimer;
|
||||
/* 0x710 */ u32 mEmtIds[3];
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daObjKnBullet_c) == 0x71c);
|
||||
|
||||
struct daObjKnBullet_Hio_Param_c {
|
||||
/* 0x0 */ f32 radius;
|
||||
/* 0x4 */ f32 move_speed;
|
||||
/* 0x8 */ s16 lifetime;
|
||||
};
|
||||
|
||||
#endif /* D_A_OBJ_KNBULLET_H */
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
#define D_A_OBJ_LV6CHANGEGATE_H
|
||||
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "d/d_bg_s_movebg_actor.h"
|
||||
#include "d/d_event_lib.h"
|
||||
#include "d/d_cc_d.h"
|
||||
|
||||
/**
|
||||
* @ingroup actors-objects
|
||||
@@ -11,15 +14,14 @@
|
||||
* @details
|
||||
*
|
||||
*/
|
||||
class daLv6ChangeGate_c : public fopAc_ac_c {
|
||||
class daLv6ChangeGate_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c {
|
||||
public:
|
||||
daLv6ChangeGate_c() : dEvLib_callback_c(this) {}
|
||||
|
||||
/* 80C70D38 */ void setBaseMtx();
|
||||
/* 80C70DD4 */ void CreateHeap();
|
||||
/* 80C70E40 */ void create();
|
||||
/* 80C712A8 */ void isSwitch();
|
||||
/* 80C712F4 */ void Execute(Mtx**);
|
||||
/* 80C70E40 */ int create();
|
||||
/* 80C712A8 */ u8 isSwitch();
|
||||
/* 80C71494 */ void moveGate();
|
||||
/* 80C715BC */ void eventStart();
|
||||
/* 80C715F4 */ void init_modeWait();
|
||||
/* 80C71600 */ void modeWait();
|
||||
/* 80C71604 */ void init_modeSlideRight();
|
||||
@@ -28,23 +30,48 @@ public:
|
||||
/* 80C718EC */ void modeSlideLeft();
|
||||
/* 80C71A74 */ void init_modeBreak();
|
||||
/* 80C71AF8 */ void modeBreak();
|
||||
/* 80C71D40 */ void Draw();
|
||||
/* 80C71DE4 */ void Delete();
|
||||
/* 80C72034 */ ~daLv6ChangeGate_c();
|
||||
|
||||
static u8 const mCcDObjInfo[48];
|
||||
static u8 mCcDCyl[68];
|
||||
/* 80C70DD4 */ virtual int CreateHeap();
|
||||
/* 80C712F4 */ virtual int Execute(Mtx**);
|
||||
/* 80C71D40 */ virtual int Draw();
|
||||
/* 80C71DE4 */ virtual int Delete();
|
||||
|
||||
private:
|
||||
/* 0x568 */ u8 field_0x568[0x14dc - 0x568];
|
||||
/* 80C72034 */ virtual ~daLv6ChangeGate_c() {}
|
||||
/* 80C715BC */ virtual bool eventStart();
|
||||
|
||||
int getEventID() { return fopAcM_GetParamBit(this, 24, 8); }
|
||||
int getWaitTime() { return fopAcM_GetParamBit(this, 16, 8); }
|
||||
int getSwState() { return fopAcM_GetParamBit(this, 12, 4); }
|
||||
int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
|
||||
int getSw2() { return shape_angle.x & 0xFF; }
|
||||
|
||||
static const dCcD_SrcGObjInf mCcDObjInfo;
|
||||
static dCcD_SrcCyl mCcDCyl;
|
||||
|
||||
/* 0x05B8 */ request_of_phase_process_class mPhase;
|
||||
/* 0x05C0 */ J3DModel* mpModel;
|
||||
/* 0x05C4 */ u8 mMode;
|
||||
/* 0x05C8 */ dCcD_Stts mCcStts;
|
||||
/* 0x0604 */ dCcD_Cyl mCcCyls[12];
|
||||
/* 0x14D4 */ u8 mSwState;
|
||||
/* 0x14D5 */ u8 mSwbit;
|
||||
/* 0x14D6 */ u8 mIsSwitch;
|
||||
/* 0x14D7 */ u8 mTimer;
|
||||
/* 0x14D8 */ f32 mMoveTransX;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daLv6ChangeGate_c) == 0x14dc);
|
||||
|
||||
class daLv6ChangeGate_HIO_c {
|
||||
class daLv6ChangeGate_HIO_c : public fOpAcm_HIO_entry_c {
|
||||
public:
|
||||
/* 80C70C4C */ daLv6ChangeGate_HIO_c();
|
||||
/* 80C71EE8 */ ~daLv6ChangeGate_HIO_c();
|
||||
/* 80C71EE8 */ virtual ~daLv6ChangeGate_HIO_c() {}
|
||||
|
||||
void genMessage(JORMContext*);
|
||||
|
||||
/* 0x4 */ f32 speed;
|
||||
/* 0x8 */ f32 move_amount;
|
||||
/* 0xC */ u8 unk_0xc;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#define D_A_OBJ_LV6LBLOCK_H
|
||||
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "d/d_bg_s_movebg_actor.h"
|
||||
|
||||
/**
|
||||
* @ingroup actors-objects
|
||||
@@ -11,13 +12,11 @@
|
||||
* @details
|
||||
*
|
||||
*/
|
||||
class daLv6Lblock_c : public fopAc_ac_c {
|
||||
class daLv6Lblock_c : public dBgS_MoveBgActor {
|
||||
public:
|
||||
/* 80C73464 */ void setBaseMtx();
|
||||
/* 80C734EC */ void CreateHeap();
|
||||
/* 80C73558 */ void create();
|
||||
/* 80C736C0 */ void isSwitch();
|
||||
/* 80C7370C */ void Execute(Mtx**);
|
||||
/* 80C73558 */ int create();
|
||||
/* 80C736C0 */ u8 isSwitch();
|
||||
/* 80C7375C */ void moveBlock();
|
||||
/* 80C73850 */ void init_modeWait();
|
||||
/* 80C7385C */ void modeWait();
|
||||
@@ -25,19 +24,39 @@ public:
|
||||
/* 80C7386C */ void modeLiftUp();
|
||||
/* 80C7398C */ void init_modeLiftDown();
|
||||
/* 80C73998 */ void modeLiftDown();
|
||||
/* 80C73AB0 */ void Draw();
|
||||
/* 80C73B54 */ void Delete();
|
||||
|
||||
/* 80C734EC */ virtual int CreateHeap();
|
||||
/* 80C7370C */ virtual int Execute(Mtx**);
|
||||
/* 80C73AB0 */ virtual int Draw();
|
||||
/* 80C73B54 */ virtual int Delete();
|
||||
|
||||
int getSwState() { return fopAcM_GetParamBit(this, 12, 4); }
|
||||
int getUpMax() { return fopAcM_GetParamBit(this, 8, 4); }
|
||||
int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
|
||||
|
||||
private:
|
||||
/* 0x568 */ u8 field_0x568[0x5b8 - 0x568];
|
||||
/* 0x5A0 */ request_of_phase_process_class mPhase;
|
||||
/* 0x5A8 */ J3DModel* mpModel;
|
||||
/* 0x5AC */ u8 mMode;
|
||||
/* 0x5AD */ u8 mSwState;
|
||||
/* 0x5AE */ u8 mSwbit;
|
||||
/* 0x5AF */ u8 mIsSwitch;
|
||||
/* 0x5B0 */ f32 mMaxHeight;
|
||||
/* 0x5B4 */ f32 mBaseHeight;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daLv6Lblock_c) == 0x5b8);
|
||||
|
||||
class daLv6Lblock_HIO_c {
|
||||
class daLv6Lblock_HIO_c : public mDoHIO_entry_c {
|
||||
public:
|
||||
/* 80C733EC */ daLv6Lblock_HIO_c();
|
||||
/* 80C73C10 */ ~daLv6Lblock_HIO_c();
|
||||
/* 80C73C10 */ virtual ~daLv6Lblock_HIO_c() {}
|
||||
|
||||
void genMessage(JORMContext*);
|
||||
|
||||
/* 0x4 */ f32 speed;
|
||||
/* 0x8 */ f32 move_amount;
|
||||
/* 0xC */ u8 unk_0xc;
|
||||
};
|
||||
|
||||
|
||||
|
||||
+1146
-663
File diff suppressed because it is too large
Load Diff
+107
-171
@@ -6,198 +6,136 @@
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_obj_kage.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" static void daObj_Kage_Draw__FP14obj_kage_class();
|
||||
extern "C" static void daObj_Kage_Execute__FP14obj_kage_class();
|
||||
extern "C" static bool daObj_Kage_IsDelete__FP14obj_kage_class();
|
||||
extern "C" static void daObj_Kage_Delete__FP14obj_kage_class();
|
||||
extern "C" static void useHeapInit__FP10fopAc_ac_c();
|
||||
extern "C" static void daObj_Kage_Create__FP10fopAc_ac_c();
|
||||
extern "C" extern char const* const d_a_obj_kage__stringBase0;
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void mDoMtx_XrotM__FPA4_fs();
|
||||
extern "C" void mDoMtx_YrotM__FPA4_fs();
|
||||
extern "C" void mDoMtx_ZrotM__FPA4_fs();
|
||||
extern "C" void transM__14mDoMtx_stack_cFfff();
|
||||
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
|
||||
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
|
||||
extern "C" void __ct__10fopAc_ac_cFv();
|
||||
extern "C" void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i();
|
||||
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
|
||||
extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff();
|
||||
extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff();
|
||||
extern "C" void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c();
|
||||
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
|
||||
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
|
||||
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
|
||||
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
|
||||
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
|
||||
extern "C" void cM_rndF__Ff();
|
||||
extern "C" void cLib_addCalc2__FPffff();
|
||||
extern "C" void __ct__16Z2SoundObjSimpleFv();
|
||||
extern "C" void _savegpr_28();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_28();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" u8 now__14mDoMtx_stack_c[48];
|
||||
extern "C" u8 sincosTable___5JMath[65536];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
#include "d/actor/d_a_player.h"
|
||||
#include "d/d_s_play.h"
|
||||
|
||||
/* 80C314D8-80C3153C 000078 0064+00 1/0 0/0 0/0 .text daObj_Kage_Draw__FP14obj_kage_class
|
||||
*/
|
||||
static void daObj_Kage_Draw(obj_kage_class* param_0) {
|
||||
// NONMATCHING
|
||||
static int daObj_Kage_Draw(obj_kage_class* i_this) {
|
||||
fopAc_ac_c* actor = &i_this->actor;
|
||||
|
||||
g_env_light.settingTevStruct(16, &actor->current.pos, &actor->tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(i_this->model, &actor->tevStr);
|
||||
mDoExt_modelUpdateDL(i_this->model);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C3195C-80C31960 000000 0004+00 2/2 0/0 0/0 .rodata @3854 */
|
||||
SECTION_RODATA static u8 const lit_3854[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C3195C, &lit_3854);
|
||||
|
||||
/* 80C31960-80C31964 000004 0004+00 0/1 0/0 0/0 .rodata @3855 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3855 = 0.5f;
|
||||
COMPILER_STRIP_GATE(0x80C31960, &lit_3855);
|
||||
#pragma pop
|
||||
|
||||
/* 80C31964-80C31968 000008 0004+00 0/1 0/0 0/0 .rodata @3856 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3856 = 40.0f;
|
||||
COMPILER_STRIP_GATE(0x80C31964, &lit_3856);
|
||||
#pragma pop
|
||||
|
||||
/* 80C31968-80C3196C 00000C 0004+00 0/1 0/0 0/0 .rodata @3857 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3857 = 120.0f;
|
||||
COMPILER_STRIP_GATE(0x80C31968, &lit_3857);
|
||||
#pragma pop
|
||||
|
||||
/* 80C3196C-80C31970 000010 0004+00 0/1 0/0 0/0 .rodata @3858 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3858 = 1.0f / 10.0f;
|
||||
COMPILER_STRIP_GATE(0x80C3196C, &lit_3858);
|
||||
#pragma pop
|
||||
|
||||
/* 80C31970-80C31974 000014 0004+00 0/1 0/0 0/0 .rodata @3859 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3859 = 2.0f;
|
||||
COMPILER_STRIP_GATE(0x80C31970, &lit_3859);
|
||||
#pragma pop
|
||||
|
||||
/* 80C31974-80C31978 000018 0004+00 0/1 0/0 0/0 .rodata @3860 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3860 = -120.0f;
|
||||
COMPILER_STRIP_GATE(0x80C31974, &lit_3860);
|
||||
#pragma pop
|
||||
|
||||
/* 80C31978-80C3197C 00001C 0004+00 0/2 0/0 0/0 .rodata @3861 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3861 = 200.0f;
|
||||
COMPILER_STRIP_GATE(0x80C31978, &lit_3861);
|
||||
#pragma pop
|
||||
|
||||
/* 80C3197C-80C31980 000020 0004+00 0/1 0/0 0/0 .rodata @3862 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3862 = 500.0f;
|
||||
COMPILER_STRIP_GATE(0x80C3197C, &lit_3862);
|
||||
#pragma pop
|
||||
|
||||
/* 80C31980-80C31984 000024 0004+00 0/1 0/0 0/0 .rodata @3863 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3863 = 1.0f;
|
||||
COMPILER_STRIP_GATE(0x80C31980, &lit_3863);
|
||||
#pragma pop
|
||||
|
||||
/* 80C31984-80C31988 000028 0004+00 0/1 0/0 0/0 .rodata @3864 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3864 = 10.0f;
|
||||
COMPILER_STRIP_GATE(0x80C31984, &lit_3864);
|
||||
#pragma pop
|
||||
|
||||
/* 80C3153C-80C31764 0000DC 0228+00 2/1 0/0 0/0 .text daObj_Kage_Execute__FP14obj_kage_class */
|
||||
static void daObj_Kage_Execute(obj_kage_class* param_0) {
|
||||
// NONMATCHING
|
||||
static int daObj_Kage_Execute(obj_kage_class* i_this) {
|
||||
fopAc_ac_c* actor = &i_this->actor;
|
||||
cXyz sp14;
|
||||
cXyz sp8;
|
||||
|
||||
i_this->counter++;
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
if (i_this->timers[i] != 0) {
|
||||
i_this->timers[i]--;
|
||||
}
|
||||
}
|
||||
|
||||
if (i_this->field_0x59e != 0) {
|
||||
i_this->field_0x59e--;
|
||||
}
|
||||
|
||||
f32 var_f31 = 0.0f;
|
||||
s16 angle_x;
|
||||
s16 angle_z;
|
||||
if (i_this->field_0x574 != 1) {
|
||||
angle_x = i_this->field_0x5a4 * cM_ssin(i_this->counter * 1700);
|
||||
angle_z = i_this->field_0x5a4 * cM_ssin(i_this->counter * 1500);
|
||||
cLib_addCalc2(&i_this->field_0x5a4, i_this->field_0x5a8, 0.5f, 40.0f);
|
||||
cLib_addCalc2(&i_this->field_0x5a8, 120.0f + KREG_F(11), 0.1f, 2.0f);
|
||||
} else {
|
||||
var_f31 = -120.0f + XREG_F(16);
|
||||
if (daPy_getPlayerActorClass()->checkFrontRollCrash() && fopAcM_searchPlayerDistanceXZ(actor) < 200.0f) {
|
||||
i_this->field_0x5a4 = 500.0f + XREG_F(17);
|
||||
}
|
||||
|
||||
angle_x = i_this->field_0x5a4 * cM_ssin(i_this->counter * 4700);
|
||||
angle_z = i_this->field_0x5a4 * cM_ssin(i_this->counter * 4400);
|
||||
cLib_addCalc2(&i_this->field_0x5a4, 0.0f, 1.0f, 10.0f);
|
||||
}
|
||||
|
||||
actor->shape_angle.x = angle_x;
|
||||
actor->shape_angle.z = angle_z;
|
||||
|
||||
mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y + var_f31, actor->current.pos.z);
|
||||
mDoMtx_stack_c::YrotM(actor->shape_angle.y);
|
||||
mDoMtx_stack_c::XrotM(actor->shape_angle.x);
|
||||
mDoMtx_stack_c::ZrotM(actor->shape_angle.z);
|
||||
mDoMtx_stack_c::transM(0.0f, -var_f31, 0.0f);
|
||||
i_this->model->setBaseTRMtx(mDoMtx_stack_c::get());
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C31764-80C3176C 000304 0008+00 1/0 0/0 0/0 .text daObj_Kage_IsDelete__FP14obj_kage_class */
|
||||
static bool daObj_Kage_IsDelete(obj_kage_class* param_0) {
|
||||
return true;
|
||||
static int daObj_Kage_IsDelete(obj_kage_class* i_this) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C31990-80C31990 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80C31990 = "Obj_kage";
|
||||
#pragma pop
|
||||
|
||||
/* 80C3176C-80C3179C 00030C 0030+00 1/0 0/0 0/0 .text daObj_Kage_Delete__FP14obj_kage_class */
|
||||
static void daObj_Kage_Delete(obj_kage_class* param_0) {
|
||||
// NONMATCHING
|
||||
static int daObj_Kage_Delete(obj_kage_class* i_this) {
|
||||
fopAc_ac_c* actor = &i_this->actor;
|
||||
fpc_ProcID id = fopAcM_GetID(i_this);
|
||||
dComIfG_resDelete(&i_this->phase, "Obj_kage");
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C3179C-80C31808 00033C 006C+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
|
||||
static void useHeapInit(fopAc_ac_c* param_0) {
|
||||
// NONMATCHING
|
||||
static int useHeapInit(fopAc_ac_c* actor) {
|
||||
obj_kage_class* i_this = (obj_kage_class*)actor;
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_kage", 3);
|
||||
JUT_ASSERT(267, modelData != NULL);
|
||||
|
||||
i_this->model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->model == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C31988-80C3198C 00002C 0004+00 0/1 0/0 0/0 .rodata @3926 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3926 = 65536.0f;
|
||||
COMPILER_STRIP_GATE(0x80C31988, &lit_3926);
|
||||
#pragma pop
|
||||
|
||||
/* 80C3198C-80C31990 000030 0004+00 0/1 0/0 0/0 .rodata @3927 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3927 = -200.0f;
|
||||
COMPILER_STRIP_GATE(0x80C3198C, &lit_3927);
|
||||
#pragma pop
|
||||
|
||||
/* 80C31808-80C31954 0003A8 014C+00 1/0 0/0 0/0 .text daObj_Kage_Create__FP10fopAc_ac_c
|
||||
*/
|
||||
static void daObj_Kage_Create(fopAc_ac_c* param_0) {
|
||||
// NONMATCHING
|
||||
static int daObj_Kage_Create(fopAc_ac_c* actor) {
|
||||
fopAcM_SetupActor(actor, obj_kage_class);
|
||||
obj_kage_class* i_this = (obj_kage_class*)actor;
|
||||
|
||||
int phase_state = dComIfG_resLoad(&i_this->phase, "Obj_kage");
|
||||
if (phase_state == cPhs_COMPLEATE_e) {
|
||||
OS_REPORT("OBJ_KAGE PARAM %x\n", fopAcM_GetParam(actor));
|
||||
i_this->field_0x574 = fopAcM_GetParam(actor);
|
||||
|
||||
OS_REPORT("OBJ_KAGE//////////////OBJ_KAGE SET 1 !!\n");
|
||||
if (!fopAcM_entrySolidHeap(actor, useHeapInit, 0xEC0)) {
|
||||
OS_REPORT("//////////////OBJ_KAGE SET NON !!\n");
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
|
||||
OS_REPORT("//////////////OBJ_KAGE SET 2 !!\n");
|
||||
i_this->counter = cM_rndF(65536.0f);
|
||||
|
||||
fopAcM_SetMtx(actor, i_this->model->getBaseTRMtx());
|
||||
fopAcM_SetMin(actor, -200.0f, -200.0f, -200.0f);
|
||||
fopAcM_SetMax(actor, 200.0f, 200.0f, 200.0f);
|
||||
|
||||
i_this->inko_child_id = fopAcM_createChild(PROC_NPC_INKO, fopAcM_GetID(actor), 0, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL);
|
||||
|
||||
daObj_Kage_Execute(i_this);
|
||||
}
|
||||
|
||||
return phase_state;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C3199C-80C319BC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Kage_Method */
|
||||
static actor_method_class l_daObj_Kage_Method = {
|
||||
(process_method_func)daObj_Kage_Create__FP10fopAc_ac_c,
|
||||
(process_method_func)daObj_Kage_Delete__FP14obj_kage_class,
|
||||
(process_method_func)daObj_Kage_Execute__FP14obj_kage_class,
|
||||
(process_method_func)daObj_Kage_IsDelete__FP14obj_kage_class,
|
||||
(process_method_func)daObj_Kage_Draw__FP14obj_kage_class,
|
||||
(process_method_func)daObj_Kage_Create,
|
||||
(process_method_func)daObj_Kage_Delete,
|
||||
(process_method_func)daObj_Kage_Execute,
|
||||
(process_method_func)daObj_Kage_IsDelete,
|
||||
(process_method_func)daObj_Kage_Draw,
|
||||
};
|
||||
|
||||
/* 80C319BC-80C319EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_KAGE */
|
||||
@@ -217,5 +155,3 @@ extern actor_process_profile_definition g_profile_OBJ_KAGE = {
|
||||
fopAc_ACTOR_e, // mActorType
|
||||
fopAc_CULLBOX_CUSTOM_e, // cullType
|
||||
};
|
||||
|
||||
/* 80C31990-80C31990 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
+189
-259
@@ -6,85 +6,14 @@
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_obj_knBullet.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "dol2asm.h"
|
||||
#include "d/actor/d_a_npc_kn.h"
|
||||
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void Create__15daObjKnBullet_cFv();
|
||||
extern "C" void __dt__8cM3dGSphFv();
|
||||
extern "C" void __dt__8cM3dGAabFv();
|
||||
extern "C" void Execute__15daObjKnBullet_cFv();
|
||||
extern "C" bool Draw__15daObjKnBullet_cFv();
|
||||
extern "C" bool Delete__15daObjKnBullet_cFv();
|
||||
extern "C" void setBaseMtx__15daObjKnBullet_cFv();
|
||||
extern "C" void col_init__15daObjKnBullet_cFv();
|
||||
extern "C" void col_chk__15daObjKnBullet_cFv();
|
||||
extern "C" void hitPrtclSet__15daObjKnBullet_cFv();
|
||||
extern "C" static void daObjKnBullet_Execute__FP15daObjKnBullet_c();
|
||||
extern "C" static void daObjKnBullet_Draw__FP15daObjKnBullet_c();
|
||||
extern "C" static bool daObjKnBullet_IsDelete__FP15daObjKnBullet_c();
|
||||
extern "C" static void daObjKnBullet_Delete__FP15daObjKnBullet_c();
|
||||
extern "C" static void daObjKnBullet_create__FP10fopAc_ac_c();
|
||||
extern "C" void func_80C4792C(void* _this, s16*);
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void mDoMtx_YrotS__FPA4_fs();
|
||||
extern "C" void XYZrotM__14mDoMtx_stack_cFRC5csXyz();
|
||||
extern "C" void __ct__10fopAc_ac_cFv();
|
||||
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
|
||||
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
|
||||
extern "C" void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz();
|
||||
extern "C" void fpcEx_SearchByID__FUi();
|
||||
extern "C" void dComIfGp_getReverb__Fi();
|
||||
extern "C" void getEmitter__Q213dPa_control_c7level_cFUl();
|
||||
extern "C" void
|
||||
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
|
||||
extern "C" void
|
||||
set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
|
||||
extern "C" void __ct__10dCcD_GSttsFv();
|
||||
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
|
||||
extern "C" void __ct__12dCcD_GObjInfFv();
|
||||
extern "C" void ChkAtHit__12dCcD_GObjInfFv();
|
||||
extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph();
|
||||
extern "C" void Set__4cCcSFP8cCcD_Obj();
|
||||
extern "C" void __mi__4cXyzCFRC3Vec();
|
||||
extern "C" void normalizeZP__4cXyzFv();
|
||||
extern "C" void SetC__8cM3dGSphFRC4cXyz();
|
||||
extern "C" void SetR__8cM3dGSphFf();
|
||||
extern "C" void deleteAllParticle__14JPABaseEmitterFv();
|
||||
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void _savegpr_24();
|
||||
extern "C" void _savegpr_26();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_24();
|
||||
extern "C" void _restgpr_26();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" extern void* __vt__8dCcD_Sph[36];
|
||||
extern "C" extern void* __vt__9dCcD_Stts[11];
|
||||
extern "C" extern void* __vt__12cCcD_SphAttr[25];
|
||||
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
|
||||
extern "C" extern void* __vt__9cCcD_Stts[8];
|
||||
extern "C" u8 now__14mDoMtx_stack_c[48];
|
||||
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C47950-80C4795C 000000 000C+00 4/4 0/0 0/0 .rodata l_DATA */
|
||||
SECTION_RODATA static u8 const l_DATA[12] = {
|
||||
0x41, 0xF0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00,
|
||||
static const daObjKnBullet_Hio_Param_c l_DATA = {
|
||||
30.0f,
|
||||
20.0f,
|
||||
150
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C47950, &l_DATA);
|
||||
|
||||
/* 80C4795C-80C4799C 00000C 0040+00 1/1 0/0 0/0 .rodata l_sph_src */
|
||||
const static dCcD_SrcSph l_sph_src = {
|
||||
@@ -99,41 +28,196 @@ const static dCcD_SrcSph l_sph_src = {
|
||||
} // mSphAttr
|
||||
};
|
||||
|
||||
/* 80C4799C-80C479A0 00004C 0004+00 0/1 0/0 0/0 .rodata @3907 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3907 = -300.0f;
|
||||
COMPILER_STRIP_GATE(0x80C4799C, &lit_3907);
|
||||
#pragma pop
|
||||
/* 80C47118-80C47270 000078 0158+00 1/1 0/0 0/0 .text Create__15daObjKnBullet_cFv */
|
||||
int daObjKnBullet_c::Create() {
|
||||
fopAcM_SetupActor(this, daObjKnBullet_c);
|
||||
|
||||
/* 80C479A0-80C479A4 000050 0004+00 0/1 0/0 0/0 .rodata @3908 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3908 = -50.0f;
|
||||
COMPILER_STRIP_GATE(0x80C479A0, &lit_3908);
|
||||
#pragma pop
|
||||
setBaseMtx();
|
||||
fopAcM_SetMtx(this, mMtx);
|
||||
mTimer = l_DATA.lifetime + 30;
|
||||
fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f);
|
||||
|
||||
/* 80C479A4-80C479A8 000054 0004+00 0/1 0/0 0/0 .rodata @3909 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3909 = 300.0f;
|
||||
COMPILER_STRIP_GATE(0x80C479A4, &lit_3909);
|
||||
#pragma pop
|
||||
col_init();
|
||||
mActionMode = 0;
|
||||
|
||||
/* 80C479A8-80C479AC 000058 0004+00 0/1 0/0 0/0 .rodata @3910 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3910 = 450.0f;
|
||||
COMPILER_STRIP_GATE(0x80C479A8, &lit_3910);
|
||||
#pragma pop
|
||||
for (int i = 0; i < 3; i++) {
|
||||
mEmtIds[i] = -1;
|
||||
}
|
||||
|
||||
return cPhs_COMPLEATE_e;
|
||||
}
|
||||
|
||||
/* 80C47300-80C47480 000260 0180+00 1/1 0/0 0/0 .text Execute__15daObjKnBullet_cFv */
|
||||
int daObjKnBullet_c::Execute() {
|
||||
if (!col_chk()) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
fopAcM_posMove(this, NULL);
|
||||
setBaseMtx();
|
||||
|
||||
if (cLib_calcTimer<s16>(&mTimer) == 0) {
|
||||
fopAcM_delete(this);
|
||||
return 1;
|
||||
}
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
static const u16 l_prticles_id[] = {
|
||||
dPa_RM(ID_ZI_S_KN_MAGICBALL_A),
|
||||
dPa_RM(ID_ZI_S_KN_MAGICBALL_B),
|
||||
dPa_RM(ID_ZI_S_KN_MAGICBALL_C),
|
||||
};
|
||||
|
||||
mEmtIds[i] = dComIfGp_particle_set(mEmtIds[i], l_prticles_id[i], ¤t.pos, ¤t.angle, NULL);
|
||||
JPABaseEmitter* emt = dComIfGp_particle_getEmitter(mEmtIds[i]);
|
||||
if (emt != NULL) {
|
||||
emt->setGlobalTranslation(current.pos.x, current.pos.y, current.pos.z);
|
||||
}
|
||||
}
|
||||
|
||||
Z2GetAudioMgr()->seStartLevel(Z2SE_KN_BALL_LEVEL, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)), 1.0f, 1.0f, -1.0f, -1.0f, 0);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C47480-80C47488 0003E0 0008+00 1/1 0/0 0/0 .text Draw__15daObjKnBullet_cFv */
|
||||
int daObjKnBullet_c::Draw() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C47488-80C47490 0003E8 0008+00 1/1 0/0 0/0 .text Delete__15daObjKnBullet_cFv */
|
||||
int daObjKnBullet_c::Delete() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C47490-80C474E8 0003F0 0058+00 2/2 0/0 0/0 .text setBaseMtx__15daObjKnBullet_cFv */
|
||||
void daObjKnBullet_c::setBaseMtx() {
|
||||
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
|
||||
mDoMtx_stack_c::XYZrotM(shape_angle);
|
||||
MTXCopy(mDoMtx_stack_c::get(), mMtx);
|
||||
}
|
||||
|
||||
/* 80C474E8-80C47558 000448 0070+00 1/1 0/0 0/0 .text col_init__15daObjKnBullet_cFv */
|
||||
void daObjKnBullet_c::col_init() {
|
||||
mCcStts.Init(0xFF, 0xFF, this);
|
||||
mCcSph.Set(l_sph_src);
|
||||
mCcSph.SetStts(&mCcStts);
|
||||
mCcSph.SetC(current.pos);
|
||||
mCcSph.SetR(l_DATA.radius);
|
||||
}
|
||||
|
||||
/* 80C47558-80C477B4 0004B8 025C+00 1/1 0/0 0/0 .text col_chk__15daObjKnBullet_cFv */
|
||||
BOOL daObjKnBullet_c::col_chk() {
|
||||
if (mActionMode == 0) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if (mActionMode == 1) {
|
||||
cXyz move_vec(0.0f, 0.0f, l_DATA.move_speed);
|
||||
mDoMtx_stack_c::YrotS(shape_angle.y);
|
||||
mDoMtx_stack_c::multVec(&move_vec, &speed);
|
||||
|
||||
if ((mCcSph.ChkTgShieldHit() || mCcSph.ChkAtShieldHit()) && daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_GUARD_ATTACK) {
|
||||
daNpc_Kn_c* parent = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID);
|
||||
if (parent != NULL) {
|
||||
cXyz sp20(parent->current.pos);
|
||||
sp20.y += 150.0f;
|
||||
speed = sp20 - current.pos;
|
||||
speed.normalizeZP();
|
||||
speed *= l_DATA.move_speed;
|
||||
|
||||
mCcSph.SetAtSPrm(0x13);
|
||||
mActionMode = 2;
|
||||
mTimer = l_DATA.lifetime;
|
||||
} else {
|
||||
hitPrtclSet();
|
||||
fopAcM_delete(this);
|
||||
return FALSE;
|
||||
}
|
||||
} else if (mCcSph.ChkAtShieldHit()) {
|
||||
daNpc_Kn_c* parent = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID);
|
||||
if (parent != NULL) {
|
||||
parent->setTalkFlag(2);
|
||||
hitPrtclSet();
|
||||
fopAcM_delete(this);
|
||||
return FALSE;
|
||||
}
|
||||
} else if (mCcSph.ChkAtHit()) {
|
||||
daNpc_Kn_c* parent = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID);
|
||||
if (parent != NULL) {
|
||||
parent->setTalkFlag(1);
|
||||
hitPrtclSet();
|
||||
fopAcM_delete(this);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
} else if (mActionMode == 2 && mCcSph.ChkAtHit()) {
|
||||
hitPrtclSet();
|
||||
fopAcM_delete(this);
|
||||
speed.set(0.0f, 0.0f, 0.0f);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
mCcSph.SetC(current.pos);
|
||||
mCcSph.SetR(l_DATA.radius);
|
||||
dComIfG_Ccsp()->Set(&mCcSph);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* 80C477B4-80C478A4 000714 00F0+00 1/1 0/0 0/0 .text hitPrtclSet__15daObjKnBullet_cFv */
|
||||
void daObjKnBullet_c::hitPrtclSet() {
|
||||
for (int i = 0; i < 3; i++) {
|
||||
JPABaseEmitter* emt = dComIfGp_particle_getEmitter(mEmtIds[i]);
|
||||
if (emt != NULL) {
|
||||
emt->becomeInvalidEmitter();
|
||||
emt->deleteAllParticle();
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
static const u16 l_prticles_id[] = {
|
||||
dPa_RM(ID_ZI_S_KN_MBHIT_A),
|
||||
dPa_RM(ID_ZI_S_KN_MBHIT_B),
|
||||
dPa_RM(ID_ZI_S_KN_MBHIT_C),
|
||||
};
|
||||
|
||||
dComIfGp_particle_set(l_prticles_id[i], ¤t.pos, ¤t.angle, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
/* 80C478A4-80C478C4 000804 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Execute__FP15daObjKnBullet_c
|
||||
*/
|
||||
static int daObjKnBullet_Execute(daObjKnBullet_c* i_this) {
|
||||
return i_this->Execute();
|
||||
}
|
||||
|
||||
/* 80C478C4-80C478E4 000824 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Draw__FP15daObjKnBullet_c */
|
||||
static int daObjKnBullet_Draw(daObjKnBullet_c* i_this) {
|
||||
return i_this->Draw();
|
||||
}
|
||||
|
||||
/* 80C478E4-80C478EC 000844 0008+00 1/0 0/0 0/0 .text daObjKnBullet_IsDelete__FP15daObjKnBullet_c
|
||||
*/
|
||||
static int daObjKnBullet_IsDelete(daObjKnBullet_c* i_this) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C478EC-80C4790C 00084C 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Delete__FP15daObjKnBullet_c */
|
||||
static int daObjKnBullet_Delete(daObjKnBullet_c* i_this) {
|
||||
return i_this->Delete();
|
||||
}
|
||||
|
||||
/* 80C4790C-80C4792C 00086C 0020+00 1/0 0/0 0/0 .text daObjKnBullet_create__FP10fopAc_ac_c */
|
||||
static int daObjKnBullet_create(fopAc_ac_c* i_this) {
|
||||
return ((daObjKnBullet_c*)i_this)->Create();
|
||||
}
|
||||
|
||||
/* 80C479CC-80C479EC -00001 0020+00 1/0 0/0 0/0 .data l_daObjKnBullet_Method */
|
||||
static actor_method_class l_daObjKnBullet_Method = {
|
||||
(process_method_func)daObjKnBullet_create__FP10fopAc_ac_c,
|
||||
(process_method_func)daObjKnBullet_Delete__FP15daObjKnBullet_c,
|
||||
(process_method_func)daObjKnBullet_Execute__FP15daObjKnBullet_c,
|
||||
(process_method_func)daObjKnBullet_IsDelete__FP15daObjKnBullet_c,
|
||||
(process_method_func)daObjKnBullet_Draw__FP15daObjKnBullet_c,
|
||||
(process_method_func)daObjKnBullet_create,
|
||||
(process_method_func)daObjKnBullet_Delete,
|
||||
(process_method_func)daObjKnBullet_Execute,
|
||||
(process_method_func)daObjKnBullet_IsDelete,
|
||||
(process_method_func)daObjKnBullet_Draw,
|
||||
};
|
||||
|
||||
/* 80C479EC-80C47A1C -00001 0030+00 0/0 0/0 1/0 .data g_profile_KN_BULLET */
|
||||
@@ -153,157 +237,3 @@ extern actor_process_profile_definition g_profile_KN_BULLET = {
|
||||
fopAc_ACTOR_e, // mActorType
|
||||
fopAc_CULLBOX_CUSTOM_e, // cullType
|
||||
};
|
||||
|
||||
/* 80C47A1C-80C47A28 000050 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */
|
||||
SECTION_DATA extern void* __vt__8cM3dGSph[3] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)__dt__8cM3dGSphFv,
|
||||
};
|
||||
|
||||
/* 80C47A28-80C47A34 00005C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */
|
||||
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)__dt__8cM3dGAabFv,
|
||||
};
|
||||
|
||||
/* 80C47118-80C47270 000078 0158+00 1/1 0/0 0/0 .text Create__15daObjKnBullet_cFv */
|
||||
void daObjKnBullet_c::Create() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C47270-80C472B8 0001D0 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */
|
||||
// cM3dGSph::~cM3dGSph() {
|
||||
extern "C" void __dt__8cM3dGSphFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C472B8-80C47300 000218 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
|
||||
// cM3dGAab::~cM3dGAab() {
|
||||
extern "C" void __dt__8cM3dGAabFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C479AC-80C479B4 00005C 0006+02 0/1 0/0 0/0 .rodata l_prticles_id$3986 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const l_prticles_id_3986[6 + 2 /* padding */] = {
|
||||
0x8B,
|
||||
0x7F,
|
||||
0x8B,
|
||||
0x80,
|
||||
0x8B,
|
||||
0x81,
|
||||
/* padding */
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C479AC, &l_prticles_id_3986);
|
||||
#pragma pop
|
||||
|
||||
/* 80C479B4-80C479B8 000064 0004+00 1/2 0/0 0/0 .rodata @4021 */
|
||||
SECTION_RODATA static f32 const lit_4021 = 1.0f;
|
||||
COMPILER_STRIP_GATE(0x80C479B4, &lit_4021);
|
||||
|
||||
/* 80C479B8-80C479BC 000068 0004+00 0/1 0/0 0/0 .rodata @4022 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_4022 = -1.0f;
|
||||
COMPILER_STRIP_GATE(0x80C479B8, &lit_4022);
|
||||
#pragma pop
|
||||
|
||||
/* 80C47300-80C47480 000260 0180+00 1/1 0/0 0/0 .text Execute__15daObjKnBullet_cFv */
|
||||
void daObjKnBullet_c::Execute() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C47480-80C47488 0003E0 0008+00 1/1 0/0 0/0 .text Draw__15daObjKnBullet_cFv */
|
||||
bool daObjKnBullet_c::Draw() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80C47488-80C47490 0003E8 0008+00 1/1 0/0 0/0 .text Delete__15daObjKnBullet_cFv */
|
||||
bool daObjKnBullet_c::Delete() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80C47490-80C474E8 0003F0 0058+00 2/2 0/0 0/0 .text setBaseMtx__15daObjKnBullet_cFv */
|
||||
void daObjKnBullet_c::setBaseMtx() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C474E8-80C47558 000448 0070+00 1/1 0/0 0/0 .text col_init__15daObjKnBullet_cFv */
|
||||
void daObjKnBullet_c::col_init() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C479BC-80C479C0 00006C 0004+00 0/1 0/0 0/0 .rodata @4129 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_4129[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C479BC, &lit_4129);
|
||||
#pragma pop
|
||||
|
||||
/* 80C479C0-80C479C4 000070 0004+00 0/1 0/0 0/0 .rodata @4130 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_4130 = 150.0f;
|
||||
COMPILER_STRIP_GATE(0x80C479C0, &lit_4130);
|
||||
#pragma pop
|
||||
|
||||
/* 80C47558-80C477B4 0004B8 025C+00 1/1 0/0 0/0 .text col_chk__15daObjKnBullet_cFv */
|
||||
void daObjKnBullet_c::col_chk() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C479C4-80C479CA 000074 0006+00 1/1 0/0 0/0 .rodata l_prticles_id$4141 */
|
||||
SECTION_RODATA static u8 const l_prticles_id_4141[6] = {
|
||||
0x8B, 0x82, 0x8B, 0x83, 0x8B, 0x84,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C479C4, &l_prticles_id_4141);
|
||||
|
||||
/* 80C477B4-80C478A4 000714 00F0+00 1/1 0/0 0/0 .text hitPrtclSet__15daObjKnBullet_cFv */
|
||||
void daObjKnBullet_c::hitPrtclSet() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C478A4-80C478C4 000804 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Execute__FP15daObjKnBullet_c
|
||||
*/
|
||||
static void daObjKnBullet_Execute(daObjKnBullet_c* param_0) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C478C4-80C478E4 000824 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Draw__FP15daObjKnBullet_c */
|
||||
static void daObjKnBullet_Draw(daObjKnBullet_c* param_0) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C478E4-80C478EC 000844 0008+00 1/0 0/0 0/0 .text daObjKnBullet_IsDelete__FP15daObjKnBullet_c
|
||||
*/
|
||||
static bool daObjKnBullet_IsDelete(daObjKnBullet_c* param_0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80C478EC-80C4790C 00084C 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Delete__FP15daObjKnBullet_c */
|
||||
static void daObjKnBullet_Delete(daObjKnBullet_c* param_0) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4790C-80C4792C 00086C 0020+00 1/0 0/0 0/0 .text daObjKnBullet_create__FP10fopAc_ac_c */
|
||||
static void daObjKnBullet_create(fopAc_ac_c* param_0) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4792C-80C47948 00088C 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<s>__FPs */
|
||||
extern "C" void func_80C4792C(void* _this, s16* param_0) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+187
-332
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user