mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 20:27:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup (#2216)

Browse Source
This commit is contained in:
Caroline Madsen
2024-10-17 17:24:29 -04:00
committed by GitHub
parent b634bb8c1b
commit 0e6d98769f
56 changed files with 6446 additions and 30124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_volcball.cpp
+24 -619
View File
@@ -9,193 +9,19 @@
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "d/d_event_lib.h"
#include "dol2asm.h"
#include "f_op/f_op_actor_mng.h"
#include "global.h"
//
// Forward References:
//
extern "C" void getData__15daObjVolcBall_cFv();
extern "C" static void CheckCreateHeap__FP10fopAc_ac_c();
extern "C" static void search_big_volc__FPvPv();
extern "C" void initBaseMtx__15daObjVolcBall_cFv();
extern "C" void setBaseMtx__15daObjVolcBall_cFv();
extern "C" void Create__15daObjVolcBall_cFv();
extern "C" void CreateHeap__15daObjVolcBall_cFv();
extern "C" void create__15daObjVolcBall_cFv();
extern "C" void __dt__Q215daObjVolcBall_c7vball_sFv();
extern "C" void __dt__19dPa_followEcallBackFv();
extern "C" void cleanup__18dPa_levelEcallBackFv();
extern "C" void __ct__Q215daObjVolcBall_c7vball_sFv();
extern "C" void __defctor__19dPa_followEcallBackFv();
extern "C" void __dt__8cM3dGSphFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void execute__15daObjVolcBall_cFv();
extern "C" void action__15daObjVolcBall_cFv();
extern "C" void initActionPlayerWait__15daObjVolcBall_cFv();
extern "C" void initActionWarning__15daObjVolcBall_cFv();
extern "C" void initActionSwWait__15daObjVolcBall_cFv();
extern "C" void actionPlayerWait__15daObjVolcBall_cFv();
extern "C" void actionSwWait__15daObjVolcBall_cFv();
extern "C" void actionStop__15daObjVolcBall_cFv();
extern "C" void actionWarning__15daObjVolcBall_cFv();
extern "C" void actionEruption__15daObjVolcBall_cFv();
extern "C" void initActionEnd__15daObjVolcBall_cFv();
extern "C" void actionEnd__15daObjVolcBall_cFv();
extern "C" void eventStart__15daObjVolcBall_cFv();
extern "C" void setEruptEffect__15daObjVolcBall_cFi();
extern "C" void setFallEffect__15daObjVolcBall_cFi();
extern "C" void endFallEffect__15daObjVolcBall_cFi();
extern "C" void createSearchBall__15daObjVolcBall_cFv();
extern "C" void createNormalBall__15daObjVolcBall_cFv();
extern "C" void executeBall__15daObjVolcBall_cFv();
extern "C" void startQuake__15daObjVolcBall_cFv();
extern "C" void draw__15daObjVolcBall_cFv();
extern "C" void _delete__15daObjVolcBall_cFv();
extern "C" static void daObjVolcBall_Draw__FP15daObjVolcBall_c();
extern "C" static void daObjVolcBall_Execute__FP15daObjVolcBall_c();
extern "C" static void daObjVolcBall_Delete__FP15daObjVolcBall_c();
extern "C" static void daObjVolcBall_Create__FP10fopAc_ac_c();
extern "C" void __dt__15daObjVolcBall_cFv();
extern "C" void __dt__17dEvLib_callback_cFv();
extern "C" int eventRun__17dEvLib_callback_cFv(void* this_);
extern "C" int eventEnd__17dEvLib_callback_cFv(void* this_);
extern "C" void __dt__10cCcD_GSttsFv();
extern "C" void __dt__18dPa_levelEcallBackFv();
extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0);
extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0);
extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0);
extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0);
extern "C" int eventStart__17dEvLib_callback_cFv(void* this_);
extern "C" u8 func_80D23D6C(u8*);
extern "C" u32 func_80D23D88(u32*);
extern "C" static void func_80D23DA4();
extern "C" static void func_80D23DAC();
extern "C" static void func_80D23DB4();
extern "C" static void func_80D23DBC();
extern "C" extern char const* const d_a_obj_volcball__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void transS__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 fopAc_IsActor__FPv();
extern "C" void fopAcIt_Judge__FPFPvPv_PvPv();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c();
extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz();
extern "C" void fpcSch_JudgeByID__FPvPv();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void
dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void eventUpdate__17dEvLib_callback_cFv();
extern "C" void orderEvent__17dEvLib_callback_cFiii();
extern "C" void __ct__19dPa_followEcallBackFUcUc();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void StartQuake__12dVibration_cFii4cXyz();
extern "C" void StopQuake__12dVibration_cFi();
extern "C" void CheckQuake__12dVibration_cFv();
extern "C" void __ct__12dBgS_AcchCirFv();
extern "C" void SetWall__12dBgS_AcchCirFff();
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 __pl__4cXyzCFRC3Vec();
extern "C" void cM_atan2s__Fff();
extern "C" void cM_rndF__Ff();
extern "C" void cM_rndFX__Ff();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void __dt__8cM3dGCirFv();
extern "C" void SetC__8cM3dGSphFRC4cXyz();
extern "C" void SetR__8cM3dGSphFf();
extern "C" void cLib_chaseF__FPfff();
extern "C" void __dt__18JPAEmitterCallBackFv();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __dl__FPv();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void __ptmf_scall();
extern "C" void __cvt_fp2unsigned();
extern "C" void _savegpr_23();
extern "C" void _savegpr_25();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_23();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__19dPa_followEcallBack[10];
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" u8 sincosTable___5JMath[65536];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" extern u8 data_80D24100[4];
extern void* __vt__15daObjVolcBall_c[10];
extern void* __vt__12dBgS_AcchCir[3];
extern void* __vt__10cCcD_GStts[3];
extern void* __vt__10dCcD_GStts[3];
extern void* __vt__18dPa_levelEcallBack[9];
extern void* __vt__12dBgS_ObjAcch[9];
extern void* __vt__8cM3dGAab[3];
extern void* __vt__8cM3dGSph[3];
extern void* __vt__17dEvLib_callback_c[6];
//
// Declarations:
//
/* 80D23E8C-80D23E98 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80D23E98-80D23EAC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
@@ -203,10 +29,9 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
0x3FE00000,
0x00000000,
};
#pragma pop
/* 80D23EAC-80D23EB0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
SECTION_DATA static const char* l_arcName = "M_Volcbal";
static const char* l_arcName = "M_Volcbal";
/* 80D23EB0-80D23F58 000024 00A8+00 1/1 0/0 0/0 .data l_param */
static daObjVolcBall_c::volc_param_c l_param[] = {
@@ -258,7 +83,6 @@ void daObjVolcBall_c::setBaseMtx() {
MTXCopy(mDoMtx_stack_c::get(), field_0x28ec);
}
/* ############################################################################################## */
/* 80D23DCC-80D23E0C 000000 0040+00 7/7 0/0 0/0 .rodata l_sph_src */
static const dCcD_SrcSph l_sph_src = {
{
@@ -275,33 +99,6 @@ static const dCcD_SrcSph l_sph_src = {
}
};
/* 80D23E0C-80D23E10 000040 0004+00 2/6 0/0 0/0 .rodata @3715 */
SECTION_RODATA static f32 const lit_3715 = 30.0f;
COMPILER_STRIP_GATE(0x80D23E0C, &lit_3715);
/* 80D23E10-80D23E14 000044 0004+00 0/1 0/0 0/0 .rodata @3716 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3716 = -1000.0f;
COMPILER_STRIP_GATE(0x80D23E10, &lit_3716);
#pragma pop
/* 80D23E14-80D23E18 000048 0004+00 4/8 0/0 0/0 .rodata @3717 */
SECTION_RODATA static u8 const lit_3717[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80D23E14, &lit_3717);
/* 80D23E18-80D23E1C 00004C 0004+00 0/1 0/0 0/0 .rodata @3718 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3718 = 1000.0f;
COMPILER_STRIP_GATE(0x80D23E18, &lit_3718);
#pragma pop
/* 80D21C40-80D21D80 0001A0 0140+00 1/1 0/0 0/0 .text Create__15daObjVolcBall_cFv */
int daObjVolcBall_c::Create() {
initBaseMtx();
@@ -374,68 +171,6 @@ int daObjVolcBall_c::create() {
return phase;
}
/* 80D21FA8-80D220C4 000508 011C+00 2/2 0/0 0/0 .text __dt__Q215daObjVolcBall_c7vball_sFv
*/
daObjVolcBall_c::vball_s::~vball_s() {
// NONMATCHING
}
/* 80D220C4-80D22148 000624 0084+00 2/2 0/0 0/0 .text __dt__19dPa_followEcallBackFv */
// dPa_followEcallBack::~dPa_followEcallBack() {
extern "C" void __dt__19dPa_followEcallBackFv() {
// NONMATCHING
}
/* 80D22148-80D2214C 0006A8 0004+00 1/0 0/0 0/0 .text cleanup__18dPa_levelEcallBackFv */
// void dPa_levelEcallBack::cleanup() {
extern "C" void cleanup__18dPa_levelEcallBackFv() {
/* empty function */
}
/* 80D2214C-80D22230 0006AC 00E4+00 1/1 0/0 0/0 .text __ct__Q215daObjVolcBall_c7vball_sFv
*/
daObjVolcBall_c::vball_s::vball_s() {
// NONMATCHING
}
/* 80D22230-80D22258 000790 0028+00 1/1 0/0 0/0 .text __defctor__19dPa_followEcallBackFv
*/
// void dPa_followEcallBack::__defctor() {
extern "C" void __defctor__19dPa_followEcallBackFv() {
// NONMATCHING
}
/* 80D22258-80D222A0 0007B8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */
// cM3dGSph::~cM3dGSph() {
extern "C" void __dt__8cM3dGSphFv() {
// NONMATCHING
}
/* 80D222A0-80D222E8 000800 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
// cM3dGAab::~cM3dGAab() {
extern "C" void __dt__8cM3dGAabFv() {
// NONMATCHING
}
/* 80D222E8-80D22358 000848 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */
// dBgS_ObjAcch::~dBgS_ObjAcch() {
extern "C" void __dt__12dBgS_ObjAcchFv() {
// NONMATCHING
}
/* 80D22358-80D223B4 0008B8 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */
// dCcD_GStts::~dCcD_GStts() {
extern "C" void __dt__10dCcD_GSttsFv() {
// NONMATCHING
}
/* 80D223B4-80D22424 000914 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */
// dBgS_AcchCir::~dBgS_AcchCir() {
extern "C" void __dt__12dBgS_AcchCirFv() {
// NONMATCHING
}
/* 80D22424-80D22484 000984 0060+00 1/1 0/0 0/0 .text execute__15daObjVolcBall_cFv */
int daObjVolcBall_c::execute() {
f32 ball_gravity = getData()->mGravity;
@@ -477,21 +212,6 @@ void daObjVolcBall_c::initActionSwWait() {
setAction(MODE_SWITCH_WAIT);
}
/* ############################################################################################## */
/* 80D23E1C-80D23E20 000050 0004+00 0/1 0/0 0/0 .rodata @3969 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3969 = 2500.0f;
COMPILER_STRIP_GATE(0x80D23E1C, &lit_3969);
#pragma pop
/* 80D23E20-80D23E24 000054 0004+00 0/1 0/0 0/0 .rodata @3970 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3970 = 300.0f;
COMPILER_STRIP_GATE(0x80D23E20, &lit_3970);
#pragma pop
/* 80D225B0-80D2267C 000B10 00CC+00 1/0 0/0 0/0 .text actionPlayerWait__15daObjVolcBall_cFv */
void daObjVolcBall_c::actionPlayerWait() {
daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -505,14 +225,12 @@ void daObjVolcBall_c::actionPlayerWait() {
}
}
/* 80D2267C-80D22724 000BDC 00A8+00 1/0 0/0 0/0 .text actionSwWait__15daObjVolcBall_cFv
*/
void daObjVolcBall_c::actionSwWait() {
if (fopAcM_isSwitch(this, getSwBit())) {
setAction(MODE_STOP);
mTime = getData()->mNormalWaitTime * FLOAT_LABEL(lit_3715) +
cM_rndFX(getData()->mRandWaitTime * FLOAT_LABEL(lit_3715));
mTime = getData()->mNormalWaitTime * 30.0f + cM_rndFX(getData()->mRandWaitTime * 30.0f);
}
}
@@ -522,25 +240,13 @@ void daObjVolcBall_c::actionStop() {
setAction(MODE_SWITCH_WAIT);
}
if (func_80D23D88(&mTime) == 0) {
mTime = getData()->mNormalWarningTime * FLOAT_LABEL(lit_3715) +
cM_rndFX(getData()->mRandWarningTime * FLOAT_LABEL(lit_3715));
if (cLib_calcTimer(&mTime) == 0) {
mTime = getData()->mNormalWarningTime * 30.0f +
cM_rndFX(getData()->mRandWarningTime * 30.0f);
initActionWarning();
}
}
/* ############################################################################################## */
/* 80D23E24-80D23E28 000058 0004+00 2/7 0/0 0/0 .rodata @4031 */
SECTION_RODATA static f32 const lit_4031 = 1.0f;
COMPILER_STRIP_GATE(0x80D23E24, &lit_4031);
/* 80D23E28-80D23E2C 00005C 0004+00 0/3 0/0 0/0 .rodata @4032 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4032 = -1.0f;
COMPILER_STRIP_GATE(0x80D23E28, &lit_4032);
#pragma pop
/* 80D227E4-80D22944 000D44 0160+00 1/0 0/0 0/0 .text actionWarning__15daObjVolcBall_cFv
*/
void daObjVolcBall_c::actionWarning() {
@@ -555,10 +261,10 @@ void daObjVolcBall_c::actionWarning() {
}
}
if (func_80D23D88(&mTime) == 0) {
if (cLib_calcTimer(&mTime) == 0) {
setAction(MODE_ERUPT);
mTime = getData()->mNormalEruptTime * FLOAT_LABEL(lit_3715) +
cM_rndFX(getData()->mRandEruptTime * FLOAT_LABEL(lit_3715));
mTime = getData()->mNormalEruptTime * 30.0f +
cM_rndFX(getData()->mRandEruptTime * 30.0f);
mSearchBallCreateTimer = getData()->mSearchBallCreateTime * 30;
}
@@ -567,39 +273,16 @@ void daObjVolcBall_c::actionWarning() {
dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
}
/* ############################################################################################## */
/* 80D23E2C-80D23E34 000060 0004+04 0/1 0/0 0/0 .rodata @4095 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4095[1 + 1 /* padding */] = {
100.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x80D23E2C, &lit_4095);
#pragma pop
/* 80D23E34-80D23E3C 000068 0008+00 0/1 0/0 0/0 .rodata @4097 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4097[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D23E34, &lit_4097);
#pragma pop
/* 80D22944-80D22C6C 000EA4 0328+00 1/0 0/0 0/0 .text actionEruption__15daObjVolcBall_cFv
*/
// small regalloc / literals
#ifdef NONMATCHING
// NONMATCHING small regalloc
void daObjVolcBall_c::actionEruption() {
if (!dComIfGp_getVibration().CheckQuake()) {
startQuake();
}
daPy_py_c* player_p = daPy_getPlayerActorClass();
u32 timer = func_80D23D88(&mTime);
u32 timer = cLib_calcTimer(&mTime);
bool disable_ball_create = true;
if (timer != 0) {
@@ -614,11 +297,11 @@ void daObjVolcBall_c::actionEruption() {
}
if (!disable_ball_create) {
if (func_80D23D88(&mSearchBallCreateTimer) == 0) {
if (cLib_calcTimer(&mSearchBallCreateTimer) == 0) {
createSearchBall();
}
if (func_80D23D6C(&mNormalBallCreateTimer) == 0) {
if (cLib_calcTimer(&mNormalBallCreateTimer) == 0) {
createNormalBall();
}
}
@@ -649,8 +332,7 @@ void daObjVolcBall_c::actionEruption() {
if (!executeBall() && disable_ball_create) {
if (mIsBigVolc == 0) {
setAction(MODE_STOP);
mTime = getData()->mNormalWaitTime * FLOAT_LABEL(lit_3715) +
cM_rndFX(getData()->mRandWaitTime * FLOAT_LABEL(lit_3715));
mTime = getData()->mNormalWaitTime * 30.0f + cM_rndFX(getData()->mRandWaitTime * 30.0f);
} else if (mIsBigVolc == 1) {
initActionEnd();
}
@@ -661,11 +343,6 @@ void daObjVolcBall_c::actionEruption() {
mDoAud_seStartLevel(Z2SE_ENV_VOLCANO_SHAKE, NULL, 0,
dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
}
#else
void daObjVolcBall_c::actionEruption() {
// NONMATCHING
}
#endif
/* 80D22C6C-80D22CD4 0011CC 0068+00 1/1 0/0 0/0 .text initActionEnd__15daObjVolcBall_cFv
*/
@@ -731,7 +408,7 @@ void daObjVolcBall_c::setEruptEffect(int i_ballNo) {
for (int i = 0; i < 6; i++) {
dComIfGp_particle_setColor(l_effect_id[i], &ball->field_0x4, &tevStr, NULL, NULL,
FLOAT_LABEL(lit_3717), 0xFF, NULL, &ball->field_0x1c, NULL, -1,
0.0f, 0xFF, NULL, &ball->field_0x1c, NULL, -1,
NULL);
}
}
@@ -753,7 +430,7 @@ void daObjVolcBall_c::setFallEffect(int i_ballNo) {
}
dComIfGp_particle_setColor(l_fall_effect_id[i], &ball->field_0x4, &tevStr, NULL, NULL,
FLOAT_LABEL(lit_3717), 0xFF, &ball->field_0x34, &sp28,
0.0f, 0xFF, &ball->field_0x34, &sp28,
&ball->field_0x390[i], -1, NULL);
}
}
@@ -799,22 +476,6 @@ bool daObjVolcBall_c::createSearchBall() {
return var_r30;
}
/* ############################################################################################## */
/* 80D23E50-80D23E54 000084 0004+00 0/1 0/0 0/0 .rodata @4279 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4279 = 32767.0f;
COMPILER_STRIP_GATE(0x80D23E50, &lit_4279);
#pragma pop
/* 80D23E54-80D23E58 000088 0004+00 0/1 0/0 0/0 .rodata @4280 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4280 = 3000.0f;
COMPILER_STRIP_GATE(0x80D23E54, &lit_4280);
#pragma pop
/* 80D23188-80D23438 0016E8 02B0+00 1/1 0/0 0/0 .text createNormalBall__15daObjVolcBall_cFv */
bool daObjVolcBall_c::createNormalBall() {
daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -875,56 +536,7 @@ bool daObjVolcBall_c::createNormalBall() {
return bvar;
}
/* ############################################################################################## */
/* 80D23E58-80D23E5C 00008C 0004+00 0/1 0/0 0/0 .rodata @4407 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4407 = 1.0f / 10.0f;
COMPILER_STRIP_GATE(0x80D23E58, &lit_4407);
#pragma pop
/* 80D23E5C-80D23E64 000090 0004+04 0/1 0/0 0/0 .rodata @4408 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4408[1 + 1 /* padding */] = {
-1000000000.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x80D23E5C, &lit_4408);
#pragma pop
/* 80D23E64-80D23E6C 000098 0008+00 0/1 0/0 0/0 .rodata @4409 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4409[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D23E64, &lit_4409);
#pragma pop
/* 80D23E6C-80D23E74 0000A0 0008+00 0/1 0/0 0/0 .rodata @4410 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4410[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D23E6C, &lit_4410);
#pragma pop
/* 80D23E74-80D23E7C 0000A8 0008+00 0/1 0/0 0/0 .rodata @4411 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4411[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D23E74, &lit_4411);
#pragma pop
/* 80D23438-80D23868 001998 0430+00 1/1 0/0 0/0 .text executeBall__15daObjVolcBall_cFv */
// literals
#ifdef NONMATCHING
int daObjVolcBall_c::executeBall() {
int ret = 0;
vball_s* ball = mBall;
@@ -947,8 +559,8 @@ int daObjVolcBall_c::executeBall() {
if (i != 8) {
cLib_chaseF(&ball->field_0x28.x, ball->field_0x1c.x, 0.1f);
cLib_chaseF(&ball->field_0x28.x, ball->field_0x1c.x, 0.1f);
cLib_chaseF(&ball->field_0x28.x, ball->field_0x1c.x, 0.1f);
cLib_chaseF(&ball->field_0x28.y, ball->field_0x1c.y, 0.1f);
cLib_chaseF(&ball->field_0x28.z, ball->field_0x1c.z, 0.1f);
}
mDoMtx_stack_c::transS(ball->field_0x4);
@@ -987,11 +599,6 @@ int daObjVolcBall_c::executeBall() {
return ret;
}
#else
int daObjVolcBall_c::executeBall() {
// NONMATCHING
}
#endif
/* 80D23868-80D23904 001DC8 009C+00 3/3 0/0 0/0 .text startQuake__15daObjVolcBall_cFv */
void daObjVolcBall_c::startQuake() {
@@ -1002,15 +609,6 @@ void daObjVolcBall_c::startQuake() {
}
}
/* ############################################################################################## */
/* 80D23E7C-80D23E80 0000B0 0004+00 0/1 0/0 0/0 .rodata @4447 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4447 = 2000.0f;
COMPILER_STRIP_GATE(0x80D23E7C, &lit_4447);
#pragma pop
/* 80D23904-80D23A0C 001E64 0108+00 1/1 0/0 0/0 .text draw__15daObjVolcBall_cFv */
int daObjVolcBall_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -1040,7 +638,6 @@ int daObjVolcBall_c::draw() {
return 1;
}
/* 80D23A0C-80D23AA4 001F6C 0098+00 1/1 0/0 0/0 .text _delete__15daObjVolcBall_cFv */
int daObjVolcBall_c::_delete() {
dComIfG_resDelete(&mPhase, l_arcName);
@@ -1079,11 +676,11 @@ static int daObjVolcBall_Create(fopAc_ac_c* i_this) {
/* 80D23FE8-80D24008 -00001 0020+00 1/0 0/0 0/0 .data l_daObjVolcBall_Method */
static actor_method_class l_daObjVolcBall_Method = {
(process_method_func)daObjVolcBall_Create__FP10fopAc_ac_c,
(process_method_func)daObjVolcBall_Delete__FP15daObjVolcBall_c,
(process_method_func)daObjVolcBall_Execute__FP15daObjVolcBall_c,
0,
(process_method_func)daObjVolcBall_Draw__FP15daObjVolcBall_c,
(process_method_func)daObjVolcBall_Create,
(process_method_func)daObjVolcBall_Delete,
(process_method_func)daObjVolcBall_Execute,
NULL,
(process_method_func)daObjVolcBall_Draw,
};
/* 80D24008-80D24038 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_VolcanicBall */
@@ -1103,195 +700,3 @@ extern actor_process_profile_definition g_profile_Obj_VolcanicBall = {
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80D24038-80D24060 0001AC 0028+00 2/2 0/0 0/0 .data __vt__15daObjVolcBall_c */
SECTION_DATA extern void* __vt__15daObjVolcBall_c[10] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)func_80D23DBC,
(void*)func_80D23DB4,
(void*)eventRun__17dEvLib_callback_cFv,
(void*)eventEnd__17dEvLib_callback_cFv,
(void*)eventStart__15daObjVolcBall_cFv,
(void*)__dt__15daObjVolcBall_cFv,
};
/* 80D24060-80D2406C 0001D4 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,
};
/* 80D2406C-80D24078 0001E0 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,
};
/* 80D24078-80D24084 0001EC 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,
};
/* 80D24084-80D240A8 0001F8 0024+00 2/2 0/0 0/0 .data __vt__18dPa_levelEcallBack */
SECTION_DATA extern void* __vt__18dPa_levelEcallBack[9] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__18dPa_levelEcallBackFv,
(void*)execute__18JPAEmitterCallBackFP14JPABaseEmitter,
(void*)executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter,
(void*)draw__18JPAEmitterCallBackFP14JPABaseEmitter,
(void*)drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter,
(void*)NULL,
(void*)cleanup__18dPa_levelEcallBackFv,
};
/* 80D240A8-80D240CC 00021C 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_80D23DAC,
(void*)NULL,
(void*)NULL,
(void*)func_80D23DA4,
};
/* 80D240CC-80D240D8 000240 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,
};
/* 80D240D8-80D240E4 00024C 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,
};
/* 80D240E4-80D240FC 000258 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */
SECTION_DATA extern void* __vt__17dEvLib_callback_c[6] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__17dEvLib_callback_cFv,
(void*)eventStart__17dEvLib_callback_cFv,
(void*)eventRun__17dEvLib_callback_cFv,
(void*)eventEnd__17dEvLib_callback_cFv,
};
/* 80D23B24-80D23C40 002084 011C+00 2/1 0/0 0/0 .text __dt__15daObjVolcBall_cFv */
// daObjVolcBall_c::~daObjVolcBall_c() {
extern "C" void __dt__15daObjVolcBall_cFv() {
// NONMATCHING
}
/* 80D23C40-80D23C88 0021A0 0048+00 1/0 0/0 0/0 .text __dt__17dEvLib_callback_cFv */
// dEvLib_callback_c::~dEvLib_callback_c() {
extern "C" void __dt__17dEvLib_callback_cFv() {
// NONMATCHING
}
/* 80D23C88-80D23C90 0021E8 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */
// int dEvLib_callback_c::eventRun() {
extern "C" int eventRun__17dEvLib_callback_cFv(void* this_) {
return true;
}
/* 80D23C90-80D23C98 0021F0 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */
// int dEvLib_callback_c::eventEnd() {
extern "C" int eventEnd__17dEvLib_callback_cFv(void* this_) {
return true;
}
/* 80D23C98-80D23CE0 0021F8 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */
// cCcD_GStts::~cCcD_GStts() {
extern "C" void __dt__10cCcD_GSttsFv() {
// NONMATCHING
}
/* 80D23CE0-80D23D54 002240 0074+00 1/0 0/0 0/0 .text __dt__18dPa_levelEcallBackFv */
// dPa_levelEcallBack::~dPa_levelEcallBack() {
extern "C" void __dt__18dPa_levelEcallBackFv() {
// NONMATCHING
}
/* 80D23D54-80D23D58 0022B4 0004+00 1/0 0/0 0/0 .text
* execute__18JPAEmitterCallBackFP14JPABaseEmitter */
// void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) {
extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0) {
/* empty function */
}
/* 80D23D58-80D23D5C 0022B8 0004+00 1/0 0/0 0/0 .text
* executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter */
// void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) {
extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0) {
/* empty function */
}
/* 80D23D5C-80D23D60 0022BC 0004+00 1/0 0/0 0/0 .text draw__18JPAEmitterCallBackFP14JPABaseEmitter
*/
// void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) {
extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0) {
/* empty function */
}
/* 80D23D60-80D23D64 0022C0 0004+00 1/0 0/0 0/0 .text
* drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter */
// void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) {
extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0) {
/* empty function */
}
/* 80D23D64-80D23D6C 0022C4 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv
*/
// bool dEvLib_callback_c::eventStart()() {
extern "C" int eventStart__17dEvLib_callback_cFv(void* this_) {
return true;
}
/* 80D23D6C-80D23D88 0022CC 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<Uc>__FPUc */
extern "C" u8 func_80D23D6C(u8* param_0) {
// NONMATCHING
}
/* 80D23D88-80D23DA4 0022E8 001C+00 3/3 0/0 0/0 .text cLib_calcTimer<Ul>__FPUl */
extern "C" u32 func_80D23D88(u32* param_0) {
// NONMATCHING
}
/* 80D23DA4-80D23DAC 002304 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */
static void func_80D23DA4() {
// NONMATCHING
}
/* 80D23DAC-80D23DB4 00230C 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */
static void func_80D23DAC() {
// NONMATCHING
}
/* 80D23DB4-80D23DBC 002314 0008+00 1/0 0/0 0/0 .text @1384@eventStart__15daObjVolcBall_cFv */
static void func_80D23DB4() {
// NONMATCHING
}
/* 80D23DBC-80D23DC4 00231C 0008+00 1/0 0/0 0/0 .text @1384@__dt__15daObjVolcBall_cFv */
static void func_80D23DBC() {
// NONMATCHING
}
/* 80D23E80-80D23E80 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */