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

obj_lv8kekkaitrap / obj_nougu done, obj_lv7bridge almost (#2763) 

* obj_lv8kekkaitrap / obj_nougu done, obj_lv7bridge almost

* kekkaitrap cleanup
This commit is contained in:
TakaRikka 2025-10-31 01:13:14 -07:00 committed by GitHub
parent 194282d2c2
commit c9838e29fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 939 additions and 1351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.py
View File

@ -2115,8 +2115,8 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6swturn"),
ActorRel(NonMatching, "d_a_obj_lv7BsGate"),
ActorRel(NonMatching, "d_a_obj_lv7PropellerY"),
ActorRel(NonMatching, "d_a_obj_lv7bridge"),
ActorRel(NonMatching, "d_a_obj_lv8KekkaiTrap"),
ActorRel(Equivalent, "d_a_obj_lv7bridge"), # small regalloc
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv8KekkaiTrap"),
ActorRel(NonMatching, "d_a_obj_lv8Lift"),
ActorRel(NonMatching, "d_a_obj_lv8OptiLift"),
ActorRel(NonMatching, "d_a_obj_lv8UdFloor"),
@ -2139,7 +2139,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01"), "d_a_obj_nagaisu"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_nan"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_ndoor"),
ActorRel(NonMatching, "d_a_obj_nougu"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_nougu"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_octhashi"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_oiltubo"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_onsen"),

54
include/d/actor/d_a_obj_lv7bridge.h
View File

@ -2,6 +2,11 @@
#define D_A_OBJ_LV7BRIDGE_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
class daObjSwSpinner_c;
/**
* @ingroup actors-objects
@ -11,29 +16,56 @@
* @details
*
*/
class daObjLv7Brg_c : public fopAc_ac_c {
class daObjLv7Brg_c : public dBgS_MoveBgActor {
public:
/* 80C863EC */ void search_swspinner();
/* 80C863EC */ daObjSwSpinner_c* search_swspinner();
/* 80C86454 */ void initBaseMtx();
/* 80C864B4 */ void setBaseMtx();
/* 80C865B8 */ void Create();
/* 80C867CC */ void CreateHeap();
/* 80C86A44 */ void create1st();
/* 80C86B40 */ void Execute(Mtx**);
/* 80C86A44 */ int create1st();
/* 80C86E68 */ void action();
/* 80C86F44 */ void mode_action();
/* 80C87210 */ void mode_end();
/* 80C87214 */ void calcCoPos();
/* 80C87304 */ void Draw();
/* 80C87458 */ void Delete();
/* 80C867CC */ virtual int CreateHeap();
/* 80C865B8 */ virtual int Create();
/* 80C86B40 */ virtual int Execute(Mtx**);
/* 80C87304 */ virtual int Draw();
/* 80C87458 */ virtual int Delete();
u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
u8 getSwbit3() { return field_0xa80 & 0xFF; }
u8 getType() { return fopAcM_GetParamBit(this, 16, 4); }
u8 getKind() { return fopAcM_GetParamBit(this, 24, 1); }
void setMode(u8 i_mode) { mMode = i_mode; }
void setDestroyAnmA() { field_0xa94 = 0; }
void setDestroyAnmB() { field_0xa94 = 1; }
private:
/* 0x568 */ u8 field_0x568[0xa94 - 0x568];
/* 0xA94 */ u8 field_0xa94;
/* 0xA95 */ u8 field_0xa95[0xaa4 - 0xA95];
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ dBgS_ObjAcch mAcch;
/* 0x784 */ dBgS_AcchCir mAcchCir;
/* 0x7C4 */ dCcD_Stts mCcStts;
/* 0x800 */ dCcD_Cyl mCcCyl[2];
/* 0xA78 */ f32 field_0xa78;
/* 0xA7C */ u8 mType;
/* 0xA7D */ u8 mMode;
/* 0xA7E */ u8 mKind;
/* 0xA7F */ u8 mInitParams;
/* 0xA80 */ u16 field_0xa80;
/* 0xA82 */ u16 field_0xa82;
/* 0xA84 */ J3DModel* mpBrokenModel;
/* 0xA88 */ mDoExt_bckAnm* mpBck[2];
/* 0xA90 */ dBgW* mpBgw2;
/* 0xA94 */ s8 field_0xa94;
/* 0xA95 */ s8 field_0xa95;
/* 0xA96 */ u8 field_0xa96;
/* 0xA98 */ cXyz field_0xa98;
};
STATIC_ASSERT(sizeof(daObjLv7Brg_c) == 0xaa4);

31
include/d/actor/d_a_obj_lv8KekkaiTrap.h
View File

@ -2,6 +2,7 @@
#define D_A_OBJ_LV8KEKKAITRAP_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_movebg_actor.h"
/**
* @ingroup actors-objects
@ -11,12 +12,10 @@
* @details
*
*/
class daKekaiTrap_c : public fopAc_ac_c {
class daKekaiTrap_c : public dBgS_MoveBgActor {
public:
/* 80C87D40 */ void setBaseMtx();
/* 80C87DC8 */ void CreateHeap();
/* 80C87E48 */ void create();
/* 80C87FB0 */ void Execute(Mtx**);
/* 80C87E48 */ int create();
/* 80C88000 */ void moveMain();
/* 80C88104 */ void init_modeWait();
/* 80C88110 */ void modeWait();
@ -24,20 +23,26 @@ public:
/* 80C88138 */ void modeMoveUp();
/* 80C881F0 */ void init_modeMoveDown();
/* 80C88214 */ void modeMoveDown();
/* 80C882C8 */ void Draw();
/* 80C8836C */ void Delete();
/* 80C87DC8 */ virtual int CreateHeap();
/* 80C87FB0 */ virtual int Execute(Mtx**);
/* 80C882C8 */ virtual int Draw();
/* 80C8836C */ virtual int Delete();
int getType() { return fopAcM_GetParamBit(this, 0, 4); }
int getSwBit() { return fopAcM_GetParamBit(this, 4, 8); }
private:
/* 0x568 */ u8 field_0x568[0x5b4 - 0x568];
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ u8 mIsSwitch;
/* 0x5AD */ u8 mSwbit;
/* 0x5AE */ u8 mType;
/* 0x5AF */ u8 mMode;
/* 0x5B0 */ u8 mTimer;
};
STATIC_ASSERT(sizeof(daKekaiTrap_c) == 0x5b4);
class daKekaiTrap_HIO_c {
public:
/* 80C87CAC */ daKekaiTrap_HIO_c();
/* 80C88438 */ ~daKekaiTrap_HIO_c();
};
#endif /* D_A_OBJ_LV8KEKKAITRAP_H */

48
include/d/actor/d_a_obj_nougu.h
View File

@ -2,6 +2,8 @@
#define D_A_OBJ_NOUGU_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
/**
* @ingroup actors-objects
@ -13,32 +15,50 @@
*/
class daObj_Nougu_c : public fopAc_ac_c {
public:
/* 80CA3C0C */ ~daObj_Nougu_c();
/* 80CA3E24 */ void create();
/* 80CA4328 */ void CreateHeap();
/* 80CA43A0 */ void Delete();
/* 80CA43D4 */ void Execute();
/* 80CA45F4 */ void Draw();
/* 80CA46B8 */ void createHeapCallBack(fopAc_ac_c*);
/* 80CA46D8 */ void getResName();
/* 80CA46E8 */ void isDelete();
/* 0x568 */ u8 field_0x568[0x56C - 0x568];
/* 0x56C */ request_of_phase_process_class mPhase;
/* 0x574 */ J3DModel* mpModel;
/* 0x578 */ dBgS_ObjAcch mAcch;
/* 0x750 */ dCcD_Stts mCcStts;
/* 0x78C */ dBgS_AcchCir mAcchCir;
/* 0x7CC */ cBgS_GndChk mGndChk;
/* 0x808 */ dCcD_Sph mCcSph[5];
/* 0xE20 */ f32 mGroundH;
/* 0xE24 */ u32 mShadowId;
/* 0xE28 */ u8 mType;
/* 80CA3C0C */ virtual ~daObj_Nougu_c();
/* 80CA3E24 */ int create();
/* 80CA4328 */ int CreateHeap();
/* 80CA43A0 */ int Delete();
/* 80CA43D4 */ int Execute();
/* 80CA45F4 */ int Draw();
/* 80CA46B8 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80CA46D8 */ const char* getResName();
/* 80CA46E8 */ int isDelete();
/* 80CA4708 */ void setEnvTevColor();
/* 80CA4764 */ void setRoomNo();
/* 80CA47A4 */ void setMtx();
static u8 mCcDSph[64];
int getType() { return 0; }
private:
/* 0x568 */ u8 field_0x568[0xe30 - 0x568];
static dCcD_SrcSph mCcDSph;
};
STATIC_ASSERT(sizeof(daObj_Nougu_c) == 0xe30);
struct daObj_Nougu_HIOParam {
/* 0x0 */ f32 attention_offset;
/* 0x4 */ f32 gravity;
/* 0x8 */ f32 scale;
/* 0xC */ f32 shadow_size;
};
class daObj_Nougu_Param_c {
public:
/* 80CA494C */ ~daObj_Nougu_Param_c();
/* 80CA494C */ virtual ~daObj_Nougu_Param_c() {}
static u8 const m[16];
static const daObj_Nougu_HIOParam m;
};

4
include/d/actor/d_a_obj_swspinner.h
View File

@ -24,8 +24,8 @@ public:
/* 80D00890 */ int Draw();
/* 80D00954 */ int Delete();
u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
int GetRotSpeedY() { return mRotSpeedY; }
f32 GetR() { return 100.0f; }

2
src/d/actor/d_a_obj_lv4gear.cpp
View File

@ -19,7 +19,7 @@ static void* searchSwSpinSub(void* i_actor, void* i_data) {
daObjLv4Gear_c* gear = (daObjLv4Gear_c*)i_data;
if (sw != NULL && fopAc_IsActor(sw) && fpcM_GetProfName(sw) == PROC_Obj_SwSpinner) {
u8 sw_bit = sw->getSwBit();
u8 sw_bit = sw->getSwbit();
if (sw_bit != 0xFF && sw_bit == gear->getSwBit()) {
return sw;
}

952
src/d/actor/d_a_obj_lv7bridge.cpp
View File

File diff suppressed because it is too large Load Diff

518
src/d/actor/d_a_obj_lv8KekkaiTrap.cpp
View File

@ -6,152 +6,236 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_lv8KekkaiTrap.h"
#include "dol2asm.h"
class daKekaiTrap_HIO_c : public mDoHIO_entry_c {
public:
/* 80C87CAC */ daKekaiTrap_HIO_c();
/* 80C88438 */ virtual ~daKekaiTrap_HIO_c() {}
void genMessage(JORMContext*);
//
// Forward References:
//
extern "C" void __ct__17daKekaiTrap_HIO_cFv();
extern "C" void __dt__14mDoHIO_entry_cFv();
extern "C" void setBaseMtx__13daKekaiTrap_cFv();
extern "C" void CreateHeap__13daKekaiTrap_cFv();
extern "C" void create__13daKekaiTrap_cFv();
extern "C" void Execute__13daKekaiTrap_cFPPA3_A4_f();
extern "C" void moveMain__13daKekaiTrap_cFv();
extern "C" void init_modeWait__13daKekaiTrap_cFv();
extern "C" void modeWait__13daKekaiTrap_cFv();
extern "C" void init_modeMoveUp__13daKekaiTrap_cFv();
extern "C" void modeMoveUp__13daKekaiTrap_cFv();
extern "C" void init_modeMoveDown__13daKekaiTrap_cFv();
extern "C" void modeMoveDown__13daKekaiTrap_cFv();
extern "C" void Draw__13daKekaiTrap_cFv();
extern "C" void Delete__13daKekaiTrap_cFv();
extern "C" static void daKekaiTrap_Draw__FP13daKekaiTrap_c();
extern "C" static void daKekaiTrap_Execute__FP13daKekaiTrap_c();
extern "C" static void daKekaiTrap_Delete__FP13daKekaiTrap_c();
extern "C" static void daKekaiTrap_Create__FP10fopAc_ac_c();
extern "C" void __dt__17daKekaiTrap_HIO_cFv();
extern "C" void __sinit_d_a_obj_lv8KekkaiTrap_cpp();
extern "C" extern char const* const d_a_obj_lv8KekkaiTrap__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_ZXYrotM__FPA4_fsss();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void Release__4cBgSFP9dBgW_Base();
extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c();
extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz();
extern "C" void __ct__16dBgS_MoveBgActorFv();
extern "C" bool Create__16dBgS_MoveBgActorFv();
extern "C" bool IsDelete__16dBgS_MoveBgActorFv();
extern "C" bool ToFore__16dBgS_MoveBgActorFv();
extern "C" bool ToBack__16dBgS_MoveBgActorFv();
extern "C" void
MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f();
extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv();
extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void cLib_addCalc__FPfffff();
extern "C" void cLib_chaseF__FPfff();
extern "C" void __dl__FPv();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" void __register_global_object();
//
// Declarations:
//
/* ############################################################################################## */
/* 80C884E4-80C884E8 000000 0004+00 4/4 0/0 0/0 .rodata @3651 */
SECTION_RODATA static u8 const lit_3651[4] = {
0x00,
0x00,
0x00,
0x00,
/* 0x04 */ f32 appear_init_speed;
/* 0x08 */ f32 appear_max_speed;
/* 0x0C */ u8 appear_wait;
/* 0x10 */ f32 disappear_init_speed;
/* 0x14 */ f32 disappear_max_speed;
/* 0x18 */ u8 disappear_wait;
};
COMPILER_STRIP_GATE(0x80C884E4, &lit_3651);
/* 80C884E8-80C884EC 000004 0004+00 1/1 0/0 0/0 .rodata @3652 */
SECTION_RODATA static f32 const lit_3652 = 7.0f / 10.0f;
COMPILER_STRIP_GATE(0x80C884E8, &lit_3652);
/* 80C884F8-80C884F8 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80C884F8 = "Lv8Kekkai";
#pragma pop
/* 80C8861C-80C88638 000014 001C+00 5/5 0/0 0/0 .bss l_HIO */
static daKekaiTrap_HIO_c l_HIO;
/* 80C88524-80C88528 -00001 0004+00 3/3 0/0 0/0 .data l_type */
SECTION_DATA static void* l_type = (void*)&d_a_obj_lv8KekkaiTrap__stringBase0;
static char* l_type[] = {"Lv8Kekkai"};
/* 80C88528-80C8852C 000024 0004+00 1/1 0/0 0/0 .data l_bmdIdx */
SECTION_DATA static u32 l_bmdIdx = 0x00000004;
static int l_bmdIdx[] = {4};
/* 80C8852C-80C88530 000028 0004+00 1/1 0/0 0/0 .data l_dzbIdx */
SECTION_DATA static u32 l_dzbIdx = 0x00000007;
static int l_dzbIdx[] = {7};
/* 80C88530-80C8853C -00001 000C+00 0/1 0/0 0/0 .data @3756 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3756[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)modeWait__13daKekaiTrap_cFv,
};
#pragma pop
/* 80C87CAC-80C87CF8 0000EC 004C+00 1/1 0/0 0/0 .text __ct__17daKekaiTrap_HIO_cFv */
daKekaiTrap_HIO_c::daKekaiTrap_HIO_c() {
appear_init_speed = 0.0f;
appear_max_speed = 0.7f;
appear_wait = 10;
disappear_init_speed = 0.0f;
disappear_max_speed = 0.7f;
disappear_wait = 30;
}
/* 80C8853C-80C88548 -00001 000C+00 0/1 0/0 0/0 .data @3757 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3757[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)modeMoveUp__13daKekaiTrap_cFv,
};
#pragma pop
/* 80C87D40-80C87DC8 000180 0088+00 2/2 0/0 0/0 .text setBaseMtx__13daKekaiTrap_cFv */
void daKekaiTrap_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
mpModel->setBaseScale(scale);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80C88548-80C88554 -00001 000C+00 0/1 0/0 0/0 .data @3758 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3758[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)modeMoveDown__13daKekaiTrap_cFv,
};
#pragma pop
/* 80C87DC8-80C87E48 000208 0080+00 1/0 0/0 0/0 .text CreateHeap__13daKekaiTrap_cFv */
int daKekaiTrap_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_type[mType], l_bmdIdx[mType]);
JUT_ASSERT(170, modelData != NULL);
/* 80C88554-80C88578 000050 0024+00 0/1 0/0 0/0 .data mode_proc$3755 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 mode_proc[36] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mpModel == NULL) {
return 0;
}
return 1;
}
/* 80C87E48-80C87FB0 000288 0168+00 1/1 0/0 0/0 .text create__13daKekaiTrap_cFv */
int daKekaiTrap_c::create() {
fopAcM_ct(this, daKekaiTrap_c);
mType = getType();
int phase_state = dComIfG_resLoad(&mPhase, l_type[mType]);
if (phase_state == cPhs_COMPLEATE_e) {
if (MoveBGCreate(l_type[mType], l_dzbIdx[mType], dBgS_MoveBGProc_TypicalRotY, 0x4000, NULL) == cPhs_ERROR_e) {
return cPhs_ERROR_e;
}
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
fopAcM_setCullSizeBox2(this, mpModel->getModelData());
mSwbit = getSwBit();
mIsSwitch = fopAcM_isSwitch(this, mSwbit);
if (!mIsSwitch) {
if (mpBgW != NULL) {
dComIfG_Bgsp().Release(mpBgW);
}
scale.y = 0.0f;
}
init_modeWait();
setBaseMtx();
#if DEBUG
l_HIO.entryHIO("結界トラップ(Lv8)");
#endif
}
return phase_state;
}
/* 80C87FB0-80C88000 0003F0 0050+00 1/0 0/0 0/0 .text Execute__13daKekaiTrap_cFPPA3_A4_f
*/
int daKekaiTrap_c::Execute(Mtx** param_0) {
moveMain();
*param_0 = &mpModel->getBaseTRMtx();
setBaseMtx();
return 1;
}
/* 80C88000-80C88104 000440 0104+00 1/1 0/0 0/0 .text moveMain__13daKekaiTrap_cFv */
void daKekaiTrap_c::moveMain() {
static void (daKekaiTrap_c::*mode_proc[])() = {
&daKekaiTrap_c::modeWait,
&daKekaiTrap_c::modeMoveUp,
&daKekaiTrap_c::modeMoveDown,
};
u8 prev_switch = mIsSwitch;
mIsSwitch = fopAcM_isSwitch(this, mSwbit);
if (mIsSwitch != prev_switch) {
if (mIsSwitch) {
init_modeMoveUp();
} else {
init_modeMoveDown();
}
}
(this->*mode_proc[mMode])();
}
/* 80C88104-80C88110 000544 000C+00 3/3 0/0 0/0 .text init_modeWait__13daKekaiTrap_cFv */
void daKekaiTrap_c::init_modeWait() {
mMode = 0;
}
/* 80C88110-80C88114 000550 0004+00 1/0 0/0 0/0 .text modeWait__13daKekaiTrap_cFv */
void daKekaiTrap_c::modeWait() {}
/* 80C88114-80C88138 000554 0024+00 1/1 0/0 0/0 .text init_modeMoveUp__13daKekaiTrap_cFv
*/
void daKekaiTrap_c::init_modeMoveUp() {
fopAcM_SetSpeedF(this, l_HIO.appear_init_speed);
mTimer = l_HIO.appear_wait;
mMode = 1;
}
/* 80C88138-80C881F0 000578 00B8+00 1/0 0/0 0/0 .text modeMoveUp__13daKekaiTrap_cFv */
void daKekaiTrap_c::modeMoveUp() {
if (mTimer != 0) {
mTimer--;
return;
}
cLib_chaseF(&speedF, l_HIO.appear_max_speed, l_HIO.appear_max_speed / 30.0f);
if (cLib_addCalc(&scale.y, 1.0f, 1.0f, fopAcM_GetSpeedF(this), 0.03f) == 0.0f) {
if (mpBgW != NULL) {
dComIfG_Bgsp().Regist(mpBgW, this);
}
init_modeWait();
}
}
/* 80C881F0-80C88214 000630 0024+00 1/1 0/0 0/0 .text init_modeMoveDown__13daKekaiTrap_cFv */
void daKekaiTrap_c::init_modeMoveDown() {
fopAcM_SetSpeedF(this, l_HIO.disappear_init_speed);
mTimer = l_HIO.disappear_wait;
mMode = 2;
}
/* 80C88214-80C882C8 000654 00B4+00 1/0 0/0 0/0 .text modeMoveDown__13daKekaiTrap_cFv */
void daKekaiTrap_c::modeMoveDown() {
if (mTimer != 0) {
mTimer--;
return;
}
cLib_chaseF(&speedF, l_HIO.disappear_max_speed, l_HIO.disappear_max_speed / 30.0f);
if (cLib_addCalc(&scale.y, 0.0f, 1.0f, fopAcM_GetSpeedF(this), 0.03f) == 0.0f) {
if (mpBgW != NULL) {
dComIfG_Bgsp().Release(mpBgW);
}
init_modeWait();
}
}
/* 80C882C8-80C8836C 000708 00A4+00 1/0 0/0 0/0 .text Draw__13daKekaiTrap_cFv */
int daKekaiTrap_c::Draw() {
g_env_light.settingTevStruct(16, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
return 1;
}
/* 80C8836C-80C883AC 0007AC 0040+00 1/0 0/0 0/0 .text Delete__13daKekaiTrap_cFv */
int daKekaiTrap_c::Delete() {
dComIfG_resDelete(&mPhase, l_type[mType]);
#if DEBUG
l_HIO.removeHIO();
#endif
return 1;
}
/* 80C883AC-80C883D8 0007EC 002C+00 1/0 0/0 0/0 .text daKekaiTrap_Draw__FP13daKekaiTrap_c
*/
static int daKekaiTrap_Draw(daKekaiTrap_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80C883D8-80C883F8 000818 0020+00 1/0 0/0 0/0 .text daKekaiTrap_Execute__FP13daKekaiTrap_c */
static int daKekaiTrap_Execute(daKekaiTrap_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80C883F8-80C88418 000838 0020+00 1/0 0/0 0/0 .text daKekaiTrap_Delete__FP13daKekaiTrap_c */
static int daKekaiTrap_Delete(daKekaiTrap_c* i_this) {
return i_this->MoveBGDelete();
}
/* 80C88418-80C88438 000858 0020+00 1/0 0/0 0/0 .text daKekaiTrap_Create__FP10fopAc_ac_c
*/
static int daKekaiTrap_Create(fopAc_ac_c* i_this) {
return ((daKekaiTrap_c*)i_this)->create();
}
/* 80C88578-80C88598 -00001 0020+00 1/0 0/0 0/0 .data l_daKekaiTrap_Method */
static actor_method_class l_daKekaiTrap_Method = {
(process_method_func)daKekaiTrap_Create__FP10fopAc_ac_c,
(process_method_func)daKekaiTrap_Delete__FP13daKekaiTrap_c,
(process_method_func)daKekaiTrap_Execute__FP13daKekaiTrap_c,
0,
(process_method_func)daKekaiTrap_Draw__FP13daKekaiTrap_c,
(process_method_func)daKekaiTrap_Create,
(process_method_func)daKekaiTrap_Delete,
(process_method_func)daKekaiTrap_Execute,
NULL,
(process_method_func)daKekaiTrap_Draw,
};
/* 80C88598-80C885C8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv8KekkaiTrap */
@ -171,181 +255,3 @@ extern actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap = {
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80C885C8-80C885F0 0000C4 0028+00 1/1 0/0 0/0 .data __vt__13daKekaiTrap_c */
SECTION_DATA extern void* __vt__13daKekaiTrap_c[10] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)CreateHeap__13daKekaiTrap_cFv,
(void*)Create__16dBgS_MoveBgActorFv,
(void*)Execute__13daKekaiTrap_cFPPA3_A4_f,
(void*)Draw__13daKekaiTrap_cFv,
(void*)Delete__13daKekaiTrap_cFv,
(void*)IsDelete__16dBgS_MoveBgActorFv,
(void*)ToFore__16dBgS_MoveBgActorFv,
(void*)ToBack__16dBgS_MoveBgActorFv,
};
/* 80C885F0-80C885FC 0000EC 000C+00 2/2 0/0 0/0 .data __vt__17daKekaiTrap_HIO_c */
SECTION_DATA extern void* __vt__17daKekaiTrap_HIO_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__17daKekaiTrap_HIO_cFv,
};
/* 80C885FC-80C88608 0000F8 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */
SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__14mDoHIO_entry_cFv,
};
/* 80C87CAC-80C87CF8 0000EC 004C+00 1/1 0/0 0/0 .text __ct__17daKekaiTrap_HIO_cFv */
daKekaiTrap_HIO_c::daKekaiTrap_HIO_c() {
// NONMATCHING
}
/* 80C87CF8-80C87D40 000138 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */
// mDoHIO_entry_c::~mDoHIO_entry_c() {
extern "C" void __dt__14mDoHIO_entry_cFv() {
// NONMATCHING
}
/* 80C87D40-80C87DC8 000180 0088+00 2/2 0/0 0/0 .text setBaseMtx__13daKekaiTrap_cFv */
void daKekaiTrap_c::setBaseMtx() {
// NONMATCHING
}
/* 80C87DC8-80C87E48 000208 0080+00 1/0 0/0 0/0 .text CreateHeap__13daKekaiTrap_cFv */
void daKekaiTrap_c::CreateHeap() {
// NONMATCHING
}
/* 80C87E48-80C87FB0 000288 0168+00 1/1 0/0 0/0 .text create__13daKekaiTrap_cFv */
void daKekaiTrap_c::create() {
// NONMATCHING
}
/* 80C87FB0-80C88000 0003F0 0050+00 1/0 0/0 0/0 .text Execute__13daKekaiTrap_cFPPA3_A4_f
*/
void daKekaiTrap_c::Execute(Mtx** param_0) {
// NONMATCHING
}
/* ############################################################################################## */
/* 80C88610-80C8861C 000008 000C+00 1/1 0/0 0/0 .bss @3645 */
static u8 lit_3645[12];
/* 80C8861C-80C88638 000014 001C+00 5/5 0/0 0/0 .bss l_HIO */
static u8 l_HIO[28];
/* 80C88638-80C8863C 000030 0004+00 1/1 0/0 0/0 .bss None */
static u8 data_80C88638[4];
/* 80C88000-80C88104 000440 0104+00 1/1 0/0 0/0 .text moveMain__13daKekaiTrap_cFv */
void daKekaiTrap_c::moveMain() {
// NONMATCHING
}
/* 80C88104-80C88110 000544 000C+00 3/3 0/0 0/0 .text init_modeWait__13daKekaiTrap_cFv */
void daKekaiTrap_c::init_modeWait() {
// NONMATCHING
}
/* 80C88110-80C88114 000550 0004+00 1/0 0/0 0/0 .text modeWait__13daKekaiTrap_cFv */
void daKekaiTrap_c::modeWait() {
/* empty function */
}
/* 80C88114-80C88138 000554 0024+00 1/1 0/0 0/0 .text init_modeMoveUp__13daKekaiTrap_cFv
*/
void daKekaiTrap_c::init_modeMoveUp() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80C884EC-80C884F0 000008 0004+00 0/2 0/0 0/0 .rodata @3802 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3802 = 30.0f;
COMPILER_STRIP_GATE(0x80C884EC, &lit_3802);
#pragma pop
/* 80C884F0-80C884F4 00000C 0004+00 0/2 0/0 0/0 .rodata @3803 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3803 = 1.0f;
COMPILER_STRIP_GATE(0x80C884F0, &lit_3803);
#pragma pop
/* 80C884F4-80C884F8 000010 0004+00 0/2 0/0 0/0 .rodata @3804 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3804 = 3.0f / 100.0f;
COMPILER_STRIP_GATE(0x80C884F4, &lit_3804);
#pragma pop
/* 80C88138-80C881F0 000578 00B8+00 1/0 0/0 0/0 .text modeMoveUp__13daKekaiTrap_cFv */
void daKekaiTrap_c::modeMoveUp() {
// NONMATCHING
}
/* 80C881F0-80C88214 000630 0024+00 1/1 0/0 0/0 .text init_modeMoveDown__13daKekaiTrap_cFv */
void daKekaiTrap_c::init_modeMoveDown() {
// NONMATCHING
}
/* 80C88214-80C882C8 000654 00B4+00 1/0 0/0 0/0 .text modeMoveDown__13daKekaiTrap_cFv */
void daKekaiTrap_c::modeMoveDown() {
// NONMATCHING
}
/* 80C882C8-80C8836C 000708 00A4+00 1/0 0/0 0/0 .text Draw__13daKekaiTrap_cFv */
void daKekaiTrap_c::Draw() {
// NONMATCHING
}
/* 80C8836C-80C883AC 0007AC 0040+00 1/0 0/0 0/0 .text Delete__13daKekaiTrap_cFv */
void daKekaiTrap_c::Delete() {
// NONMATCHING
}
/* 80C883AC-80C883D8 0007EC 002C+00 1/0 0/0 0/0 .text daKekaiTrap_Draw__FP13daKekaiTrap_c
*/
static void daKekaiTrap_Draw(daKekaiTrap_c* param_0) {
// NONMATCHING
}
/* 80C883D8-80C883F8 000818 0020+00 1/0 0/0 0/0 .text daKekaiTrap_Execute__FP13daKekaiTrap_c */
static void daKekaiTrap_Execute(daKekaiTrap_c* param_0) {
// NONMATCHING
}
/* 80C883F8-80C88418 000838 0020+00 1/0 0/0 0/0 .text daKekaiTrap_Delete__FP13daKekaiTrap_c */
static void daKekaiTrap_Delete(daKekaiTrap_c* param_0) {
// NONMATCHING
}
/* 80C88418-80C88438 000858 0020+00 1/0 0/0 0/0 .text daKekaiTrap_Create__FP10fopAc_ac_c
*/
static void daKekaiTrap_Create(fopAc_ac_c* param_0) {
// NONMATCHING
}
/* 80C88438-80C88494 000878 005C+00 2/1 0/0 0/0 .text __dt__17daKekaiTrap_HIO_cFv */
daKekaiTrap_HIO_c::~daKekaiTrap_HIO_c() {
// NONMATCHING
}
/* 80C88494-80C884D0 0008D4 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv8KekkaiTrap_cpp
*/
void __sinit_d_a_obj_lv8KekkaiTrap_cpp() {
// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x80C88494, __sinit_d_a_obj_lv8KekkaiTrap_cpp);
#pragma pop
/* 80C884F8-80C884F8 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */

663
src/d/actor/d_a_obj_nougu.cpp
View File

@ -6,131 +6,231 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_nougu.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" void __dt__13daObj_Nougu_cFv();
extern "C" void __dt__8dCcD_SphFv();
extern "C" void create__13daObj_Nougu_cFv();
extern "C" void __ct__8dCcD_SphFv();
extern "C" void __dt__8cM3dGSphFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void CreateHeap__13daObj_Nougu_cFv();
extern "C" void Delete__13daObj_Nougu_cFv();
extern "C" void Execute__13daObj_Nougu_cFv();
extern "C" void Draw__13daObj_Nougu_cFv();
extern "C" void createHeapCallBack__13daObj_Nougu_cFP10fopAc_ac_c();
extern "C" void getResName__13daObj_Nougu_cFv();
extern "C" void isDelete__13daObj_Nougu_cFv();
extern "C" void setEnvTevColor__13daObj_Nougu_cFv();
extern "C" void setRoomNo__13daObj_Nougu_cFv();
extern "C" void setMtx__13daObj_Nougu_cFv();
extern "C" static void daObj_Nougu_Create__FPv();
extern "C" static void daObj_Nougu_Delete__FPv();
extern "C" static void daObj_Nougu_Execute__FPv();
extern "C" static void daObj_Nougu_Draw__FPv();
extern "C" static bool daObj_Nougu_IsDelete__FPv();
extern "C" void __dt__10cCcD_GSttsFv();
extern "C" void __sinit_d_a_obj_nougu_cpp();
extern "C" void __dt__19daObj_Nougu_Param_cFv();
extern "C" static void func_80CA4994();
extern "C" static void func_80CA499C();
extern "C" u8 const m__19daObj_Nougu_Param_c[16];
extern "C" extern char const* const d_a_obj_nougu__stringBase0;
extern "C" u8 mCcDSph__13daObj_Nougu_c[64];
//
// External References:
//
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz();
extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void
dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo();
extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo();
extern "C" void __ct__12dBgS_AcchCirFv();
extern "C" void __dt__9dBgS_AcchFv();
extern "C" void __ct__9dBgS_AcchFv();
extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz();
extern "C" void CrrPos__9dBgS_AcchFR4dBgS();
extern "C" void SetObj__16dBgS_PolyPassChkFv();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void __dt__12dCcD_GObjInfFv();
extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void __ct__11cBgS_GndChkFv();
extern "C" void __dt__11cBgS_GndChkFv();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void __dt__8cM3dGCirFv();
extern "C" void SetC__8cM3dGSphFRC4cXyz();
extern "C" void SetR__8cM3dGSphFf();
extern "C" void __dl__FPv();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void _savegpr_24();
extern "C" void _restgpr_24();
extern "C" u8 const mCcDObjData__8daNpcT_c[48];
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 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" void __register_global_object();
//
// Declarations:
//
/* ############################################################################################## */
/* 80CA49F8-80CA49F8 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80CA49F8 = "Jagar4";
#pragma pop
#include "d/actor/d_a_npc.h"
#include "SSystem/SComponent/c_counter.h"
/* 80CA4A00-80CA4A40 000000 0040+00 2/2 0/0 0/0 .data mCcDSph__13daObj_Nougu_c */
SECTION_DATA u8 daObj_Nougu_c::mCcDSph[64] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
dCcD_SrcSph daObj_Nougu_c::mCcDSph = {
daNpcT_c::mCcDObjData,
{
{{0.0f, 0.0f, 0.0f}, 0.0f}
},
};
/* 80CA4A40-80CA4A44 -00001 0004+00 1/1 0/0 0/0 .data l_resName */
SECTION_DATA static void* l_resName = (void*)&d_a_obj_nougu__stringBase0;
static char* l_resName = "Jagar4";
/* 80CA3C0C-80CA3D58 0000EC 014C+00 1/0 0/0 0/0 .text __dt__13daObj_Nougu_cFv */
daObj_Nougu_c::~daObj_Nougu_c() {
OS_REPORT("|%06d:%x|daObj_Nougu_c -> デストラクト\n", g_Counter.mCounter0, this);
dComIfG_resDelete(&mPhase, getResName());
}
/* 80CA49B8-80CA49C8 000000 0010+00 3/3 0/0 0/0 .rodata m__19daObj_Nougu_Param_c */
const daObj_Nougu_HIOParam daObj_Nougu_Param_c::m = {
0.0f,
-3.0f,
1.0f,
200.0f
};
/* 80CA3E24-80CA40D8 000304 02B4+00 1/1 0/0 0/0 .text create__13daObj_Nougu_cFv */
int daObj_Nougu_c::create() {
fopAcM_ct(this, daObj_Nougu_c);
mType = getType();
int phase_state = dComIfG_resLoad(&mPhase, getResName());
if (phase_state == cPhs_COMPLEATE_e) {
OS_REPORT("\t(%s:%d) <%08x> -> roomNo.%d", fopAcM_getProcNameString(this), getType(), fopAcM_GetParam(this), fopAcM_GetRoomNo(this));
if (isDelete()) {
OS_REPORT("===>isDelete:TRUE\n");
return cPhs_ERROR_e;
}
OS_REPORT("\n");
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x800)) {
return cPhs_ERROR_e;
}
mpModel->getModelData();
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -75.0f, -50.0f, -100.0f, 75.0f, 50.0f, 100.0f);
mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this));
mCcStts.Init(0xFF, 0, this);
for (int i = 0; i < 5; i++) {
mCcSph[i].Set(mCcDSph);
mCcSph[i].SetStts(&mCcStts);
}
mAcch.CrrPos(dComIfG_Bgsp());
mGndChk = mAcch.m_gnd;
mGroundH = mAcch.GetGroundH();
if (-G_CM3D_F_INF != mGroundH) {
setEnvTevColor();
setRoomNo();
}
Execute();
}
return phase_state;
}
/* 80CA4328-80CA43A0 000808 0078+00 1/1 0/0 0/0 .text CreateHeap__13daObj_Nougu_cFv */
int daObj_Nougu_c::CreateHeap() {
J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), 3);
if (mdlData_p == NULL) {
return 0;
}
mpModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084);
if (mpModel == NULL) {
return 0;
}
return 1;
}
/* 80CA43A0-80CA43D4 000880 0034+00 1/1 0/0 0/0 .text Delete__13daObj_Nougu_cFv */
int daObj_Nougu_c::Delete() {
OS_REPORT("|%06d:%x|daObj_Nougu_c -> Delete\n", g_Counter.mCounter0, this);
this->~daObj_Nougu_c();
return 1;
}
/* 80CA43D4-80CA45F4 0008B4 0220+00 2/2 0/0 0/0 .text Execute__13daObj_Nougu_cFv */
int daObj_Nougu_c::Execute() {
cXyz sp14;
cXyz sp8;
mAcch.CrrPos(dComIfG_Bgsp());
mGndChk = mAcch.m_gnd;
mGroundH = mAcch.GetGroundH();
if (-G_CM3D_F_INF != mGroundH) {
setEnvTevColor();
setRoomNo();
}
setMtx();
f32 var_f31 = 60.0f;
for (int i = 0; i < 5; i++) {
sp14.set(0.0f, 0.0f, var_f31);
mDoMtx_stack_c::YrotS(shape_angle.y);
mDoMtx_stack_c::multVec(&sp14, &sp14);
sp14 += current.pos;
mCcSph[i].SetC(sp14);
mCcSph[i].SetR(30.0f);
dComIfG_Ccsp()->Set(&mCcSph[i]);
mCcSph[i].ClrCoHit();
var_f31 -= 30.0f;
}
attention_info.position = current.pos;
attention_info.position.y += daObj_Nougu_Param_c::m.attention_offset;
eyePos = attention_info.position;
attention_info.flags = 0;
return 1;
}
/* 80CA45F4-80CA46B8 000AD4 00C4+00 1/1 0/0 0/0 .text Draw__13daObj_Nougu_cFv */
int daObj_Nougu_c::Draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mDoExt_modelUpdateDL(mpModel);
if (-G_CM3D_F_INF != mGroundH) {
mShadowId = dComIfGd_setShadow(mShadowId, 1, mpModel, &current.pos, daObj_Nougu_Param_c::m.shadow_size, 20.0f, current.pos.y, mGroundH, mGndChk, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
}
return 1;
}
/* 80CA46B8-80CA46D8 000B98 0020+00 1/1 0/0 0/0 .text
* createHeapCallBack__13daObj_Nougu_cFP10fopAc_ac_c */
int daObj_Nougu_c::createHeapCallBack(fopAc_ac_c* i_this) {
return ((daObj_Nougu_c*)i_this)->CreateHeap();
}
/* 80CA46D8-80CA46E8 000BB8 0010+00 3/3 0/0 0/0 .text getResName__13daObj_Nougu_cFv */
const char* daObj_Nougu_c::getResName() {
return l_resName;
}
/* 80CA46E8-80CA4708 000BC8 0020+00 1/1 0/0 0/0 .text isDelete__13daObj_Nougu_cFv */
int daObj_Nougu_c::isDelete() {
switch (mType) {
case 0:
return 0;
}
return 0;
}
/* 80CA4708-80CA4764 000BE8 005C+00 2/2 0/0 0/0 .text setEnvTevColor__13daObj_Nougu_cFv
*/
void daObj_Nougu_c::setEnvTevColor() {
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80CA4764-80CA47A4 000C44 0040+00 2/2 0/0 0/0 .text setRoomNo__13daObj_Nougu_cFv */
void daObj_Nougu_c::setRoomNo() {
fopAcM_SetRoomNo(this, dComIfG_Bgsp().GetRoomId(mGndChk));
}
/* 80CA47A4-80CA4808 000C84 0064+00 1/1 0/0 0/0 .text setMtx__13daObj_Nougu_cFv */
void daObj_Nougu_c::setMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::scaleM(scale);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80CA4808-80CA4828 000CE8 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Create__FPv */
static int daObj_Nougu_Create(void* i_this) {
return ((daObj_Nougu_c*)i_this)->create();
}
/* 80CA4828-80CA4848 000D08 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Delete__FPv */
static int daObj_Nougu_Delete(void* i_this) {
return ((daObj_Nougu_c*)i_this)->Delete();
}
/* 80CA4848-80CA4868 000D28 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Execute__FPv */
static int daObj_Nougu_Execute(void* i_this) {
return ((daObj_Nougu_c*)i_this)->Execute();
}
/* 80CA4868-80CA4888 000D48 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Draw__FPv */
static int daObj_Nougu_Draw(void* i_this) {
return ((daObj_Nougu_c*)i_this)->Draw();
}
/* 80CA4888-80CA4890 000D68 0008+00 1/0 0/0 0/0 .text daObj_Nougu_IsDelete__FPv */
static int daObj_Nougu_IsDelete(void* i_this) {
return 1;
}
/* 80CA4B24-80CA4B28 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */
static daObj_Nougu_Param_c l_HIO;
/* 80CA4A44-80CA4A64 -00001 0020+00 1/0 0/0 0/0 .data daObj_Nougu_MethodTable */
static actor_method_class daObj_Nougu_MethodTable = {
(process_method_func)daObj_Nougu_Create__FPv,
(process_method_func)daObj_Nougu_Delete__FPv,
(process_method_func)daObj_Nougu_Execute__FPv,
(process_method_func)daObj_Nougu_IsDelete__FPv,
(process_method_func)daObj_Nougu_Draw__FPv,
(process_method_func)daObj_Nougu_Create,
(process_method_func)daObj_Nougu_Delete,
(process_method_func)daObj_Nougu_Execute,
(process_method_func)daObj_Nougu_IsDelete,
(process_method_func)daObj_Nougu_Draw,
};
/* 80CA4A64-80CA4A94 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_NOUGU */
@ -150,332 +250,3 @@ extern actor_process_profile_definition g_profile_OBJ_NOUGU = {
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80CA4A94-80CA4AA0 000094 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGAabFv,
};
/* 80CA4AA0-80CA4AAC 0000A0 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGSph */
SECTION_DATA extern void* __vt__8cM3dGSph[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGSphFv,
};
/* 80CA4AAC-80CA4AD0 0000AC 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */
SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_ObjAcchFv,
(void*)NULL,
(void*)NULL,
(void*)func_80CA499C,
(void*)NULL,
(void*)NULL,
(void*)func_80CA4994,
};
/* 80CA4AD0-80CA4ADC 0000D0 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */
SECTION_DATA extern void* __vt__10cCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10cCcD_GSttsFv,
};
/* 80CA4ADC-80CA4AE8 0000DC 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */
SECTION_DATA extern void* __vt__10dCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10dCcD_GSttsFv,
};
/* 80CA4AE8-80CA4AF4 0000E8 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */
SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_AcchCirFv,
};
/* 80CA4AF4-80CA4B00 0000F4 000C+00 2/2 0/0 0/0 .data __vt__13daObj_Nougu_c */
SECTION_DATA extern void* __vt__13daObj_Nougu_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__13daObj_Nougu_cFv,
};
/* 80CA3C0C-80CA3D58 0000EC 014C+00 1/0 0/0 0/0 .text __dt__13daObj_Nougu_cFv */
daObj_Nougu_c::~daObj_Nougu_c() {
// NONMATCHING
}
/* 80CA3D58-80CA3E24 000238 00CC+00 2/2 0/0 0/0 .text __dt__8dCcD_SphFv */
// dCcD_Sph::~dCcD_Sph() {
extern "C" void __dt__8dCcD_SphFv() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80CA49B8-80CA49C8 000000 0010+00 3/3 0/0 0/0 .rodata m__19daObj_Nougu_Param_c */
SECTION_RODATA u8 const daObj_Nougu_Param_c::m[16] = {
0x00, 0x00, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80CA49B8, &daObj_Nougu_Param_c::m);
/* 80CA49C8-80CA49CC 000010 0004+00 0/1 0/0 0/0 .rodata @3916 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3916 = -75.0f;
COMPILER_STRIP_GATE(0x80CA49C8, &lit_3916);
#pragma pop
/* 80CA49CC-80CA49D0 000014 0004+00 0/1 0/0 0/0 .rodata @3917 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3917 = -50.0f;
COMPILER_STRIP_GATE(0x80CA49CC, &lit_3917);
#pragma pop
/* 80CA49D0-80CA49D4 000018 0004+00 0/1 0/0 0/0 .rodata @3918 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3918 = -100.0f;
COMPILER_STRIP_GATE(0x80CA49D0, &lit_3918);
#pragma pop
/* 80CA49D4-80CA49D8 00001C 0004+00 0/1 0/0 0/0 .rodata @3919 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3919 = 75.0f;
COMPILER_STRIP_GATE(0x80CA49D4, &lit_3919);
#pragma pop
/* 80CA49D8-80CA49DC 000020 0004+00 0/1 0/0 0/0 .rodata @3920 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3920 = 50.0f;
COMPILER_STRIP_GATE(0x80CA49D8, &lit_3920);
#pragma pop
/* 80CA49DC-80CA49E0 000024 0004+00 0/1 0/0 0/0 .rodata @3921 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3921 = 100.0f;
COMPILER_STRIP_GATE(0x80CA49DC, &lit_3921);
#pragma pop
/* 80CA49E0-80CA49E4 000028 0004+00 0/3 0/0 0/0 .rodata @3922 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3922 = -G_CM3D_F_INF;
COMPILER_STRIP_GATE(0x80CA49E0, &lit_3922);
#pragma pop
/* 80CA3E24-80CA40D8 000304 02B4+00 1/1 0/0 0/0 .text create__13daObj_Nougu_cFv */
void daObj_Nougu_c::create() {
// NONMATCHING
}
/* 80CA40D8-80CA415C 0005B8 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_SphFv */
// dCcD_Sph::dCcD_Sph() {
extern "C" void __ct__8dCcD_SphFv() {
// NONMATCHING
}
/* 80CA415C-80CA41A4 00063C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */
// cM3dGSph::~cM3dGSph() {
extern "C" void __dt__8cM3dGSphFv() {
// NONMATCHING
}
/* 80CA41A4-80CA41EC 000684 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
// cM3dGAab::~cM3dGAab() {
extern "C" void __dt__8cM3dGAabFv() {
// NONMATCHING
}
/* 80CA41EC-80CA425C 0006CC 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */
// dBgS_AcchCir::~dBgS_AcchCir() {
extern "C" void __dt__12dBgS_AcchCirFv() {
// NONMATCHING
}
/* 80CA425C-80CA42B8 00073C 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */
// dCcD_GStts::~dCcD_GStts() {
extern "C" void __dt__10dCcD_GSttsFv() {
// NONMATCHING
}
/* 80CA42B8-80CA4328 000798 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */
// dBgS_ObjAcch::~dBgS_ObjAcch() {
extern "C" void __dt__12dBgS_ObjAcchFv() {
// NONMATCHING
}
/* 80CA4328-80CA43A0 000808 0078+00 1/1 0/0 0/0 .text CreateHeap__13daObj_Nougu_cFv */
void daObj_Nougu_c::CreateHeap() {
// NONMATCHING
}
/* 80CA43A0-80CA43D4 000880 0034+00 1/1 0/0 0/0 .text Delete__13daObj_Nougu_cFv */
void daObj_Nougu_c::Delete() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80CA49E4-80CA49E8 00002C 0004+00 0/1 0/0 0/0 .rodata @4046 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4046 = 60.0f;
COMPILER_STRIP_GATE(0x80CA49E4, &lit_4046);
#pragma pop
/* 80CA49E8-80CA49EC 000030 0004+00 0/1 0/0 0/0 .rodata @4047 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4047[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80CA49E8, &lit_4047);
#pragma pop
/* 80CA49EC-80CA49F0 000034 0004+00 0/1 0/0 0/0 .rodata @4048 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4048 = 30.0f;
COMPILER_STRIP_GATE(0x80CA49EC, &lit_4048);
#pragma pop
/* 80CA43D4-80CA45F4 0008B4 0220+00 2/2 0/0 0/0 .text Execute__13daObj_Nougu_cFv */
void daObj_Nougu_c::Execute() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80CA49F0-80CA49F4 000038 0004+00 0/1 0/0 0/0 .rodata @4060 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4060 = 20.0f;
COMPILER_STRIP_GATE(0x80CA49F0, &lit_4060);
#pragma pop
/* 80CA49F4-80CA49F8 00003C 0004+00 0/1 0/0 0/0 .rodata @4061 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4061 = 1.0f;
COMPILER_STRIP_GATE(0x80CA49F4, &lit_4061);
#pragma pop
/* 80CA45F4-80CA46B8 000AD4 00C4+00 1/1 0/0 0/0 .text Draw__13daObj_Nougu_cFv */
void daObj_Nougu_c::Draw() {
// NONMATCHING
}
/* 80CA46B8-80CA46D8 000B98 0020+00 1/1 0/0 0/0 .text
* createHeapCallBack__13daObj_Nougu_cFP10fopAc_ac_c */
void daObj_Nougu_c::createHeapCallBack(fopAc_ac_c* param_0) {
// NONMATCHING
}
/* 80CA46D8-80CA46E8 000BB8 0010+00 3/3 0/0 0/0 .text getResName__13daObj_Nougu_cFv */
void daObj_Nougu_c::getResName() {
// NONMATCHING
}
/* 80CA46E8-80CA4708 000BC8 0020+00 1/1 0/0 0/0 .text isDelete__13daObj_Nougu_cFv */
void daObj_Nougu_c::isDelete() {
// NONMATCHING
}
/* 80CA4708-80CA4764 000BE8 005C+00 2/2 0/0 0/0 .text setEnvTevColor__13daObj_Nougu_cFv
*/
void daObj_Nougu_c::setEnvTevColor() {
// NONMATCHING
}
/* 80CA4764-80CA47A4 000C44 0040+00 2/2 0/0 0/0 .text setRoomNo__13daObj_Nougu_cFv */
void daObj_Nougu_c::setRoomNo() {
// NONMATCHING
}
/* 80CA47A4-80CA4808 000C84 0064+00 1/1 0/0 0/0 .text setMtx__13daObj_Nougu_cFv */
void daObj_Nougu_c::setMtx() {
// NONMATCHING
}
/* 80CA4808-80CA4828 000CE8 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Create__FPv */
static void daObj_Nougu_Create(void* param_0) {
// NONMATCHING
}
/* 80CA4828-80CA4848 000D08 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Delete__FPv */
static void daObj_Nougu_Delete(void* param_0) {
// NONMATCHING
}
/* 80CA4848-80CA4868 000D28 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Execute__FPv */
static void daObj_Nougu_Execute(void* param_0) {
// NONMATCHING
}
/* 80CA4868-80CA4888 000D48 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Draw__FPv */
static void daObj_Nougu_Draw(void* param_0) {
// NONMATCHING
}
/* 80CA4888-80CA4890 000D68 0008+00 1/0 0/0 0/0 .text daObj_Nougu_IsDelete__FPv */
static bool daObj_Nougu_IsDelete(void* param_0) {
return true;
}
/* 80CA4890-80CA48D8 000D70 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */
// cCcD_GStts::~cCcD_GStts() {
extern "C" void __dt__10cCcD_GSttsFv() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80CA4B00-80CA4B0C 000100 000C+00 2/2 0/0 0/0 .data __vt__19daObj_Nougu_Param_c */
SECTION_DATA extern void* __vt__19daObj_Nougu_Param_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__19daObj_Nougu_Param_cFv,
};
/* 80CA4B18-80CA4B24 000008 000C+00 1/1 0/0 0/0 .bss @3805 */
static u8 lit_3805[12];
/* 80CA4B24-80CA4B28 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */
static u8 l_HIO[4];
/* 80CA48D8-80CA494C 000DB8 0074+00 0/0 1/0 0/0 .text __sinit_d_a_obj_nougu_cpp */
void __sinit_d_a_obj_nougu_cpp() {
// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x80CA48D8, __sinit_d_a_obj_nougu_cpp);
#pragma pop
/* 80CA494C-80CA4994 000E2C 0048+00 2/1 0/0 0/0 .text __dt__19daObj_Nougu_Param_cFv */
daObj_Nougu_Param_c::~daObj_Nougu_Param_c() {
// NONMATCHING
}
/* 80CA4994-80CA499C 000E74 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */
static void func_80CA4994() {
// NONMATCHING
}
/* 80CA499C-80CA49A4 000E7C 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */
static void func_80CA499C() {
// NONMATCHING
}
/* 80CA49F8-80CA49F8 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */

12
src/d/actor/d_a_obj_swspinner.cpp
View File

@ -56,7 +56,7 @@ void daObjSwSpinner_c::setBaseMtx() {
/* 80D00284-80D0035C 000384 00D8+00 1/0 0/0 0/0 .text Create__16daObjSwSpinner_cFv */
int daObjSwSpinner_c::Create() {
if (fopAcM_isSwitch(this, getSwBit2())) {
if (fopAcM_isSwitch(this, getSwbit2())) {
mPartBHeight = 50.0f;
mCanUse = false;
} else {
@ -141,7 +141,7 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) {
mCount++;
}
if (fopAcM_isSwitch(this, getSwBit2())) {
if (fopAcM_isSwitch(this, getSwbit2())) {
if (cLib_addCalc(&mPartBHeight, 50.0f, 0.1f, 10.0f, 2.0f) == 0.0f && mCanUse) {
if (mSpinnerIn) {
spinner->offSpinnerTag();
@ -158,13 +158,13 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) {
} else if (mSpinnerIn) {
if (mCount > 200) {
if (mRotSpeedY > 3000) {
fopAcM_onSwitch(this, getSwBit());
fopAcM_onSwitch(this, getSwbit());
} else {
fopAcM_offSwitch(this, getSwBit());
fopAcM_offSwitch(this, getSwbit());
}
}
} else {
dComIfGs_offSwitch(getSwBit() & 0xFF, fopAcM_GetHomeRoomNo(this));
dComIfGs_offSwitch(getSwbit() & 0xFF, fopAcM_GetHomeRoomNo(this));
}
if (mSpinnerIn && !mPrevSpinnerIn) {
@ -182,7 +182,7 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) {
attention_info.position = current.pos;
attention_info.position.y -= 100.0f;
mPrevIsSwbit2 = fopAcM_isSwitch(this, getSwBit2());
mPrevIsSwbit2 = fopAcM_isSwitch(this, getSwbit2());
mPrevSpinnerIn = mSpinnerIn;
return 1;
}