mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 12:52:51 -04:00
tag_allmato almost, swhit0 treesh swball done, misc cleanup (#2312)
* d_a_tag_allmato almost done * d_a_swhit0 done * some SSystem cleanup * treesh done * swball done, some other rel cleanup
This commit is contained in:
TakaRikka
+450
-349
@@ -4,164 +4,86 @@
|
||||
*/
|
||||
|
||||
#include "d/actor/d_a_swhit0.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "dol2asm.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
|
||||
#define COLOR_YELLOW 0
|
||||
#define COLOR_BLUE 1
|
||||
#define COLOR_RED 2
|
||||
#define COLOR_GREEN 3
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void getSwNo__10daSwhit0_cFv();
|
||||
extern "C" void getSwNo2__10daSwhit0_cFv();
|
||||
extern "C" void getEvNo__10daSwhit0_cFv();
|
||||
extern "C" void getTimer__10daSwhit0_cFv();
|
||||
extern "C" void getType__10daSwhit0_cFv();
|
||||
extern "C" void makeEventId__10daSwhit0_cFv();
|
||||
extern "C" void CreateHeap__10daSwhit0_cFv();
|
||||
extern "C" void CreateInit__10daSwhit0_cFv();
|
||||
extern "C" static void CheckCreateHeap__FP10fopAc_ac_c();
|
||||
extern "C" void create__10daSwhit0_cFv();
|
||||
extern "C" void __dt__8cM3dGSphFv();
|
||||
extern "C" void __dt__8cM3dGAabFv();
|
||||
extern "C" void __dt__12J3DFrameCtrlFv();
|
||||
extern "C" void checkHit__10daSwhit0_cFv();
|
||||
extern "C" void setCombackTimer__10daSwhit0_cFv();
|
||||
extern "C" void endCombackTimer__10daSwhit0_cFv();
|
||||
extern "C" void onSwitch__10daSwhit0_cFv();
|
||||
extern "C" void offSwitch__10daSwhit0_cFv();
|
||||
extern "C" void DemoProc__10daSwhit0_cFv();
|
||||
extern "C" void orderEvent__10daSwhit0_cFv();
|
||||
extern "C" void actionOffWait__10daSwhit0_cFv();
|
||||
extern "C" void actionToOnReady__10daSwhit0_cFv();
|
||||
extern "C" void actionToOnOrder__10daSwhit0_cFv();
|
||||
extern "C" void actionToOnDemo__10daSwhit0_cFv();
|
||||
extern "C" void actionToOnDemo2__10daSwhit0_cFv();
|
||||
extern "C" void actionSwWait__10daSwhit0_cFv();
|
||||
extern "C" void actionOnWait__10daSwhit0_cFv();
|
||||
extern "C" void setDrawMtx__10daSwhit0_cFv();
|
||||
extern "C" static void daSwhit0_Draw__FP10daSwhit0_c();
|
||||
extern "C" static void daSwhit0_Execute__FP10daSwhit0_c();
|
||||
extern "C" static void daSwhit0_Delete__FP10daSwhit0_c();
|
||||
extern "C" static void daSwhit0_Create__FP10fopAc_ac_c();
|
||||
extern "C" void func_8048734C(void* _this, u8*);
|
||||
extern "C" extern char const* const d_a_swhit0__stringBase0;
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void mDoMtx_XYZrotM__FPA4_fsss();
|
||||
extern "C" void play__14mDoExt_baseAnmFv();
|
||||
extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss();
|
||||
extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef();
|
||||
extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb();
|
||||
extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf();
|
||||
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
|
||||
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
|
||||
extern "C" void __ct__10fopAc_ac_cFv();
|
||||
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
|
||||
extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs();
|
||||
extern "C" void fopAcM_orderMapToolAutoNextEvent__FP10fopAc_ac_cUcsUsUsUs();
|
||||
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 onSwitch__10dSv_info_cFii();
|
||||
extern "C" void offSwitch__10dSv_info_cFii();
|
||||
extern "C" void isSwitch__10dSv_info_cCFii();
|
||||
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
|
||||
extern "C" void reset__14dEvt_control_cFv();
|
||||
extern "C" void getEventIdx__16dEvent_manager_cFPCcUcl();
|
||||
extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc();
|
||||
extern "C" void isMapToolCamera__16dEvent_manager_cFUcl();
|
||||
extern "C" void endCheck__16dEvent_manager_cFs();
|
||||
extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci();
|
||||
extern "C" void getIsAddvance__16dEvent_manager_cFi();
|
||||
extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii();
|
||||
extern "C" void cutEnd__16dEvent_manager_cFi();
|
||||
extern "C" void __ct__10dCcD_GSttsFv();
|
||||
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
|
||||
extern "C" void __ct__12dCcD_GObjInfFv();
|
||||
extern "C" void ChkTgHit__12dCcD_GObjInfFv();
|
||||
extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph();
|
||||
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
|
||||
extern "C" void setLightTevColorType__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
|
||||
extern "C" void Set__4cCcSFP8cCcD_Obj();
|
||||
extern "C" void SetC__8cM3dGSphFRC4cXyz();
|
||||
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void init__12J3DFrameCtrlFs();
|
||||
extern "C" void _savegpr_29();
|
||||
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" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" u8 sincosTable___5JMath[65536];
|
||||
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
/* 804873BC-804873C0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
|
||||
static char* l_arcName = "S_swHit00";
|
||||
|
||||
/* 80485FF8-80486004 000078 000C+00 9/9 0/0 0/0 .text getSwNo__10daSwhit0_cFv */
|
||||
void daSwhit0_c::getSwNo() {
|
||||
// NONMATCHING
|
||||
int daSwhit0_c::getSwNo() {
|
||||
return fopAcM_GetParam(this) & 0xFF;
|
||||
}
|
||||
|
||||
/* 80486004-80486010 000084 000C+00 1/1 0/0 0/0 .text getSwNo2__10daSwhit0_cFv */
|
||||
void daSwhit0_c::getSwNo2() {
|
||||
// NONMATCHING
|
||||
int daSwhit0_c::getSwNo2() {
|
||||
return home.angle.z & 0xFF;
|
||||
}
|
||||
|
||||
/* 80486010-8048602C 000090 001C+00 3/3 0/0 0/0 .text getEvNo__10daSwhit0_cFv */
|
||||
void daSwhit0_c::getEvNo() {
|
||||
// NONMATCHING
|
||||
u8 daSwhit0_c::getEvNo() {
|
||||
u8 evNo = (fopAcM_GetParam(this) >> 8) & 0xFF;
|
||||
if (evNo == 0xFE) {
|
||||
evNo = 0xFF;
|
||||
}
|
||||
|
||||
return evNo;
|
||||
}
|
||||
|
||||
/* 8048602C-80486048 0000AC 001C+00 1/1 0/0 0/0 .text getTimer__10daSwhit0_cFv */
|
||||
void daSwhit0_c::getTimer() {
|
||||
// NONMATCHING
|
||||
u8 daSwhit0_c::getTimer() {
|
||||
u8 timer = (fopAcM_GetParam(this) >> 16) & 0xFF;
|
||||
if (timer == 0xFF) {
|
||||
timer = 0;
|
||||
}
|
||||
|
||||
return timer;
|
||||
}
|
||||
|
||||
/* 80486048-80486064 0000C8 001C+00 4/4 0/0 0/0 .text getType__10daSwhit0_cFv */
|
||||
void daSwhit0_c::getType() {
|
||||
// NONMATCHING
|
||||
}
|
||||
u8 daSwhit0_c::getType() {
|
||||
u8 type = (fopAcM_GetParam(this) >> 30);
|
||||
if (type >= 4) {
|
||||
type = 0;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80487388 = "S_swHit00";
|
||||
SECTION_DEAD static char const* const stringBase_80487392 = "DEFAULT_SWITCH";
|
||||
#pragma pop
|
||||
return type;
|
||||
}
|
||||
|
||||
/* 80486064-804860EC 0000E4 0088+00 1/1 0/0 0/0 .text makeEventId__10daSwhit0_cFv */
|
||||
void daSwhit0_c::makeEventId() {
|
||||
// NONMATCHING
|
||||
u8 prm = (fopAcM_GetParam(this) >> 8) & 0xFF;
|
||||
if (prm == 0xFE) {
|
||||
mEventId = dComIfGp_evmng_getEventIdx("DEFAULT_SWITCH", getEvNo());
|
||||
} else {
|
||||
mEventId = dComIfGp_getEventManager().getEventIdx(this, getEvNo());
|
||||
}
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80487370-80487374 000000 0004+00 6/6 0/0 0/0 .rodata @3685 */
|
||||
SECTION_RODATA static f32 const lit_3685 = 1.0f;
|
||||
COMPILER_STRIP_GATE(0x80487370, &lit_3685);
|
||||
|
||||
/* 804873BC-804873C0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
|
||||
SECTION_DATA static void* l_arcName = (void*)&d_a_swhit0__stringBase0;
|
||||
|
||||
/* 804860EC-80486214 00016C 0128+00 1/1 0/0 0/0 .text CreateHeap__10daSwhit0_cFv */
|
||||
void daSwhit0_c::CreateHeap() {
|
||||
// NONMATCHING
|
||||
}
|
||||
int daSwhit0_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8);
|
||||
JUT_ASSERT(193, modelData != 0);
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80487374-80487378 000004 0004+00 1/1 0/0 0/0 .rodata @3725 */
|
||||
SECTION_RODATA static f32 const lit_3725 = 95.0f;
|
||||
COMPILER_STRIP_GATE(0x80487374, &lit_3725);
|
||||
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202);
|
||||
if (mpModel == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!mBck.init((J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 5), TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 11), FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 804873C0-80487400 000004 0040+00 1/1 0/0 0/0 .data l_sph_src */
|
||||
static dCcD_SrcSph l_sph_src = {
|
||||
@@ -177,56 +99,411 @@ static dCcD_SrcSph l_sph_src = {
|
||||
};
|
||||
|
||||
/* 80486214-80486390 000294 017C+00 1/1 0/0 0/0 .text CreateInit__10daSwhit0_cFv */
|
||||
void daSwhit0_c::CreateInit() {
|
||||
// NONMATCHING
|
||||
int daSwhit0_c::CreateInit() {
|
||||
shape_angle.z = 0;
|
||||
current.angle.z = 0;
|
||||
|
||||
mColliderStts.Init(0xFF, 0xFF, this);
|
||||
|
||||
attention_info.position.x += (cM_ssin(home.angle.x) * 95.0f) * cM_ssin(home.angle.y);
|
||||
attention_info.position.y += cM_scos(home.angle.x) * 95.0f;
|
||||
attention_info.position.z += (cM_ssin(home.angle.x) * 95.0f) * cM_scos(home.angle.y);
|
||||
eyePos = attention_info.position;
|
||||
|
||||
cXyz sp28;
|
||||
mSph.Set(l_sph_src);
|
||||
mSph.SetStts(&mColliderStts);
|
||||
mSph.SetC(attention_info.position);
|
||||
|
||||
if (fopAcM_isSwitch(this, getSwNo())) {
|
||||
setActio(ACTION_ON_WAIT_e);
|
||||
onFlag(1);
|
||||
} else {
|
||||
setActio(ACTION_OFF_WAIT_e);
|
||||
offFlag(1);
|
||||
}
|
||||
|
||||
makeEventId();
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80486390-804863B0 000410 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */
|
||||
static void CheckCreateHeap(fopAc_ac_c* param_0) {
|
||||
// NONMATCHING
|
||||
static int CheckCreateHeap(fopAc_ac_c* i_this) {
|
||||
return ((daSwhit0_c*)i_this)->CreateHeap();
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_804873A1 = "WAIT";
|
||||
SECTION_DEAD static char const* const stringBase_804873A6 = "CHANGE";
|
||||
#pragma pop
|
||||
/* 804863B0-804865B4 000430 0204+00 1/1 0/0 0/0 .text create__10daSwhit0_cFv */
|
||||
int daSwhit0_c::create() {
|
||||
fopAcM_SetupActor(this, daSwhit0_c);
|
||||
|
||||
/* 80487400-80487408 -00001 0008+00 1/1 0/0 0/0 .data action_table$3953 */
|
||||
SECTION_DATA static void* action_table[2] = {
|
||||
(void*)(((char*)&d_a_swhit0__stringBase0) + 0x19),
|
||||
(void*)(((char*)&d_a_swhit0__stringBase0) + 0x1E),
|
||||
};
|
||||
if (subtype != 0) {
|
||||
setDrawMtx();
|
||||
cMtx_copy(mDoMtx_stack_c::get(), field_0x5a8);
|
||||
fopAcM_SetMtx(this, field_0x5a8);
|
||||
CreateInit();
|
||||
return cPhs_COMPLEATE_e;
|
||||
}
|
||||
|
||||
/* 80487408-80487410 00004C 0008+00 1/1 0/0 0/0 .data l_color$localstatic3$draw__10daSwhit0_cFv */
|
||||
SECTION_DATA static u8 data_80487408[8] = {
|
||||
0x01, 0x00, 0x02, 0x03, 0x03, 0x02, 0x00, 0x01,
|
||||
};
|
||||
int phase_state = dComIfG_resLoad(this, l_arcName);
|
||||
if (phase_state == cPhs_COMPLEATE_e) {
|
||||
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0xB30)) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
|
||||
/* 80487410-8048743C -00001 002C+00 1/1 0/0 0/0 .data @4230 */
|
||||
SECTION_DATA static void* lit_4230[11] = {
|
||||
(void*)(((char*)daSwhit0_Execute__FP10daSwhit0_c) + 0x40),
|
||||
(void*)(((char*)daSwhit0_Execute__FP10daSwhit0_c) + 0x4C),
|
||||
(void*)(((char*)daSwhit0_Execute__FP10daSwhit0_c) + 0x58),
|
||||
(void*)(((char*)daSwhit0_Execute__FP10daSwhit0_c) + 0x64),
|
||||
(void*)(((char*)daSwhit0_Execute__FP10daSwhit0_c) + 0x70),
|
||||
(void*)(((char*)daSwhit0_Execute__FP10daSwhit0_c) + 0x7C),
|
||||
(void*)(((char*)daSwhit0_Execute__FP10daSwhit0_c) + 0x88),
|
||||
(void*)(((char*)daSwhit0_Execute__FP10daSwhit0_c) + 0x58),
|
||||
(void*)(((char*)daSwhit0_Execute__FP10daSwhit0_c) + 0x64),
|
||||
(void*)(((char*)daSwhit0_Execute__FP10daSwhit0_c) + 0x70),
|
||||
(void*)(((char*)daSwhit0_Execute__FP10daSwhit0_c) + 0x7C),
|
||||
};
|
||||
mpModel->setBaseScale(scale);
|
||||
setDrawMtx();
|
||||
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
|
||||
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
|
||||
CreateInit();
|
||||
}
|
||||
|
||||
return phase_state;
|
||||
}
|
||||
|
||||
/* 8048668C-80486704 00070C 0078+00 2/2 0/0 0/0 .text checkHit__10daSwhit0_cFv */
|
||||
bool daSwhit0_c::checkHit() {
|
||||
if (dComIfGp_event_runCheck()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (cLib_calcTimer<u8>(&mHitWaitTimer) == 0 && mSph.ChkTgHit()) {
|
||||
mHitWaitTimer = 8;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/* 80486704-80486788 000784 0084+00 1/1 0/0 0/0 .text setCombackTimer__10daSwhit0_cFv */
|
||||
void daSwhit0_c::setCombackTimer() {
|
||||
if (getType() == 0 || getType() == 3) {
|
||||
mCombackTimer = 0;
|
||||
} else if (getTimer() != 0) {
|
||||
mCombackTimer = getTimer() * 15;
|
||||
} else {
|
||||
mCombackTimer = 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* 80486788-80486800 000808 0078+00 1/1 0/0 0/0 .text endCombackTimer__10daSwhit0_cFv */
|
||||
int daSwhit0_c::endCombackTimer() {
|
||||
if (mCombackTimer > 0) {
|
||||
if (!fopAcM_isSwitch(this, getSwNo2()) && --mCombackTimer == 0) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 80486800-80486858 000880 0058+00 4/4 0/0 0/0 .text onSwitch__10daSwhit0_cFv */
|
||||
void daSwhit0_c::onSwitch() {
|
||||
fopAcM_onSwitch(this, getSwNo());
|
||||
onFlag(1);
|
||||
setCombackTimer();
|
||||
}
|
||||
|
||||
/* 80486858-804868A8 0008D8 0050+00 4/4 0/0 0/0 .text offSwitch__10daSwhit0_cFv */
|
||||
void daSwhit0_c::offSwitch() {
|
||||
fopAcM_offSwitch(this, getSwNo());
|
||||
offFlag(1);
|
||||
}
|
||||
|
||||
/* 804868A8-804869C4 000928 011C+00 2/2 0/0 0/0 .text DemoProc__10daSwhit0_cFv */
|
||||
int daSwhit0_c::DemoProc() {
|
||||
static char* action_table[2] = {
|
||||
"WAIT",
|
||||
"CHANGE",
|
||||
};
|
||||
|
||||
if (dComIfGp_evmng_getIsAddvance(mStaffId)) {
|
||||
int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 2, 0, 0);
|
||||
switch (act_idx) {
|
||||
case 1:
|
||||
if (fopAcM_isSwitch(this, getSwNo())) {
|
||||
offSwitch();
|
||||
} else {
|
||||
onSwitch();
|
||||
}
|
||||
|
||||
fopAcM_seStart(this, Z2SE_OBJ_SHOCK_SW_ON, 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
dComIfGp_evmng_cutEnd(mStaffId);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 804869C4-80486ABC 000A44 00F8+00 2/2 0/0 0/0 .text orderEvent__10daSwhit0_cFv */
|
||||
void daSwhit0_c::orderEvent() {
|
||||
if (strcmp(dComIfGp_getStartStageName(), "D_MN06") == 0 && dComIfGp_getStartStageRoomNo() == 4 && fopAcM_isSwitch(this, 50) && fopAcM_isSwitch(this, 51)) {
|
||||
fopAcM_orderOtherEventId(this, mEventId, getEvNo(), 0xFFFF, 0, 1);
|
||||
} else {
|
||||
fopAcM_orderMapToolAutoNextEvent(this, getEvNo(), mEventId, 0xFFFF, 1, 0);
|
||||
}
|
||||
|
||||
eventInfo.i_onCondition(2);
|
||||
}
|
||||
|
||||
/* 80486ABC-80486BC4 000B3C 0108+00 1/1 0/0 0/0 .text actionOffWait__10daSwhit0_cFv */
|
||||
int daSwhit0_c::actionOffWait() {
|
||||
if (checkHit()) {
|
||||
fopAcM_seStart(this, JA_SE_OBJ_HIT_SHOCK_SWITCH, 0);
|
||||
|
||||
if (getType() != 3) {
|
||||
if (mEventId == -1) {
|
||||
setActio(ACTION_SW_WAIT_e);
|
||||
mSwWaitTimer = 0;
|
||||
} else {
|
||||
setActio(ACTION_TO_ON_READY_e);
|
||||
mReadyTimer = 5;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (fopAcM_isSwitch(this, getSwNo())) {
|
||||
setActio(ACTION_ON_WAIT_e);
|
||||
onSwitch();
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80486BC4-80486C28 000C44 0064+00 1/1 0/0 0/0 .text actionToOnReady__10daSwhit0_cFv */
|
||||
int daSwhit0_c::actionToOnReady() {
|
||||
if (dComIfGp_event_runCheck()) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (mReadyTimer != 0) {
|
||||
mReadyTimer--;
|
||||
} else {
|
||||
mAction++;
|
||||
setActio(mAction);
|
||||
orderEvent();
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80486C28-80486CE4 000CA8 00BC+00 1/1 0/0 0/0 .text actionToOnOrder__10daSwhit0_cFv */
|
||||
int daSwhit0_c::actionToOnOrder() {
|
||||
if (eventInfo.i_checkCommandDemoAccrpt()) {
|
||||
if (dComIfGp_evmng_isMapToolCamera(getEvNo())) {
|
||||
mReadyTimer = 6;
|
||||
mAction += 2;
|
||||
setActio(mAction);
|
||||
} else {
|
||||
mAction++;
|
||||
setActio(mAction);
|
||||
mStaffId = dComIfGp_evmng_getMyStaffId("SWITCH", NULL, 0);
|
||||
DemoProc();
|
||||
}
|
||||
} else {
|
||||
orderEvent();
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80486CE4-80486D88 000D64 00A4+00 1/1 0/0 0/0 .text actionToOnDemo__10daSwhit0_cFv */
|
||||
int daSwhit0_c::actionToOnDemo() {
|
||||
if (dComIfGp_evmng_endCheck(mEventId)) {
|
||||
if (fopAcM_isSwitch(this, getSwNo())) {
|
||||
setActio(ACTION_ON_WAIT_e);
|
||||
} else {
|
||||
setActio(ACTION_OFF_WAIT_e);
|
||||
}
|
||||
|
||||
dComIfGp_event_reset();
|
||||
return 1;
|
||||
}
|
||||
|
||||
DemoProc();
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80486D88-80486EC4 000E08 013C+00 1/1 0/0 0/0 .text actionToOnDemo2__10daSwhit0_cFv */
|
||||
int daSwhit0_c::actionToOnDemo2() {
|
||||
if (mReadyTimer != 0) {
|
||||
mReadyTimer--;
|
||||
if (mReadyTimer == 0) {
|
||||
if (fopAcM_isSwitch(this, getSwNo())) {
|
||||
offSwitch();
|
||||
} else {
|
||||
onSwitch();
|
||||
}
|
||||
|
||||
fopAcM_seStart(this, Z2SE_OBJ_SHOCK_SW_ON, 0);
|
||||
}
|
||||
}
|
||||
|
||||
if (dComIfGp_evmng_endCheck(mEventId)) {
|
||||
if (mAction == 5) {
|
||||
setActio(ACTION_ON_WAIT_e);
|
||||
onSwitch();
|
||||
} else {
|
||||
setActio(ACTION_OFF_WAIT_e);
|
||||
offSwitch();
|
||||
}
|
||||
|
||||
dComIfGp_event_reset();
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80486EC4-80486FC0 000F44 00FC+00 1/1 0/0 0/0 .text actionSwWait__10daSwhit0_cFv */
|
||||
int daSwhit0_c::actionSwWait() {
|
||||
if (dComIfGp_event_runCheck()) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (++mSwWaitTimer > 30) {
|
||||
if (!fopAcM_isSwitch(this, getSwNo())) {
|
||||
setActio(ACTION_ON_WAIT_e);
|
||||
onSwitch();
|
||||
} else {
|
||||
setActio(ACTION_OFF_WAIT_e);
|
||||
offSwitch();
|
||||
}
|
||||
|
||||
fopAcM_seStart(this, Z2SE_OBJ_SHOCK_SW_ON, 0);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80486FC0-804870E0 001040 0120+00 1/1 0/0 0/0 .text actionOnWait__10daSwhit0_cFv */
|
||||
int daSwhit0_c::actionOnWait() {
|
||||
if (!fopAcM_isSwitch(this, getSwNo()) || endCombackTimer()) {
|
||||
offSwitch();
|
||||
setActio(ACTION_OFF_WAIT_e);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (checkHit()) {
|
||||
fopAcM_seStart(this, JA_SE_OBJ_HIT_SHOCK_SWITCH, 0);
|
||||
|
||||
if (getType() != 0) {
|
||||
if (mEventId == -1) {
|
||||
setActio(ACTION_SW_WAIT_e);
|
||||
mSwWaitTimer = 0;
|
||||
} else {
|
||||
setActio(ACTION_TOOL_TO_ON_READY_e);
|
||||
mReadyTimer = 5;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 804870E0-80487138 001160 0058+00 1/1 0/0 0/0 .text setDrawMtx__10daSwhit0_cFv */
|
||||
void daSwhit0_c::setDrawMtx() {
|
||||
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
|
||||
mDoMtx_stack_c::XYZrotM(current.angle.x, current.angle.y, current.angle.z);
|
||||
}
|
||||
|
||||
int daSwhit0_c::draw() {
|
||||
g_env_light.settingTevStruct(16, ¤t.pos, &tevStr);
|
||||
g_env_light.setLightTevColorType(mpModel, &tevStr);
|
||||
|
||||
// each set of 2 colors represents an on/off state color
|
||||
static u8 l_color[] = {
|
||||
COLOR_BLUE, COLOR_YELLOW,
|
||||
COLOR_RED, COLOR_GREEN,
|
||||
COLOR_GREEN, COLOR_RED,
|
||||
COLOR_YELLOW, COLOR_BLUE,
|
||||
};
|
||||
|
||||
u8* color_p = l_color;
|
||||
if (checkFlag(1)) {
|
||||
color_p++;
|
||||
}
|
||||
|
||||
mBrk.setFrame(color_p[getType() * 2]);
|
||||
|
||||
J3DModelData* modelData = mpModel->getModelData();
|
||||
mBck.entry(modelData);
|
||||
mBrk.entry(modelData);
|
||||
mDoExt_modelUpdateDL(mpModel);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80487138-80487228 0011B8 00F0+00 1/0 0/0 0/0 .text daSwhit0_Draw__FP10daSwhit0_c */
|
||||
static int daSwhit0_Draw(daSwhit0_c* i_this) {
|
||||
if (i_this->subtype != 0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return i_this->draw();
|
||||
}
|
||||
|
||||
int daSwhit0_c::execute() {
|
||||
switch (mAction) {
|
||||
case ACTION_SW_WAIT_e:
|
||||
actionSwWait();
|
||||
break;
|
||||
case ACTION_OFF_WAIT_e:
|
||||
actionOffWait();
|
||||
break;
|
||||
case ACTION_TO_ON_READY_e:
|
||||
case ACTION_TOOL_TO_ON_READY_e:
|
||||
actionToOnReady();
|
||||
break;
|
||||
case ACTION_TO_ON_ORDER_e:
|
||||
case ACTION_TOOL_TO_ON_ORDER_e:
|
||||
actionToOnOrder();
|
||||
break;
|
||||
case ACTION_TO_ON_DEMO_e:
|
||||
case ACTION_TOOL_TO_ON_DEMO_e:
|
||||
actionToOnDemo();
|
||||
break;
|
||||
case ACTION_TO_ON_DEMO2_e:
|
||||
case ACTION_TOOL_TO_ON_DEMO2_e:
|
||||
actionToOnDemo2();
|
||||
break;
|
||||
case ACTION_ON_WAIT_e:
|
||||
actionOnWait();
|
||||
break;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80487228-804872E4 0012A8 00BC+00 2/0 0/0 0/0 .text daSwhit0_Execute__FP10daSwhit0_c */
|
||||
static int daSwhit0_Execute(daSwhit0_c* i_this) {
|
||||
i_this->mBck.play();
|
||||
i_this->execute();
|
||||
dComIfG_Ccsp()->Set(&i_this->mSph);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 804872E4-8048732C 001364 0048+00 1/0 0/0 0/0 .text daSwhit0_Delete__FP10daSwhit0_c */
|
||||
static int daSwhit0_Delete(daSwhit0_c* i_this) {
|
||||
if (i_this->subtype == 0) {
|
||||
dComIfG_resDelete(i_this, l_arcName);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8048732C-8048734C 0013AC 0020+00 1/0 0/0 0/0 .text daSwhit0_Create__FP10fopAc_ac_c */
|
||||
static int daSwhit0_Create(fopAc_ac_c* i_this) {
|
||||
return ((daSwhit0_c*)i_this)->create();
|
||||
}
|
||||
|
||||
/* 8048743C-8048745C -00001 0020+00 1/0 0/0 0/0 .data l_daSwhit0_Method */
|
||||
static actor_method_class l_daSwhit0_Method = {
|
||||
(process_method_func)daSwhit0_Create__FP10fopAc_ac_c,
|
||||
(process_method_func)daSwhit0_Delete__FP10daSwhit0_c,
|
||||
(process_method_func)daSwhit0_Execute__FP10daSwhit0_c,
|
||||
0,
|
||||
(process_method_func)daSwhit0_Draw__FP10daSwhit0_c,
|
||||
(process_method_func)daSwhit0_Create,
|
||||
(process_method_func)daSwhit0_Delete,
|
||||
(process_method_func)daSwhit0_Execute,
|
||||
(process_method_func)NULL,
|
||||
(process_method_func)daSwhit0_Draw,
|
||||
};
|
||||
|
||||
/* 8048745C-8048748C -00001 0030+00 0/0 0/0 1/0 .data g_profile_SWHIT0 */
|
||||
@@ -246,179 +523,3 @@ extern actor_process_profile_definition g_profile_SWHIT0 = {
|
||||
fopAc_ACTOR_e, // mActorType
|
||||
fopAc_CULLBOX_0_e, // cullType
|
||||
};
|
||||
|
||||
/* 8048748C-80487498 0000D0 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,
|
||||
};
|
||||
|
||||
/* 80487498-804874A4 0000DC 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,
|
||||
};
|
||||
|
||||
/* 804874A4-804874B0 0000E8 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */
|
||||
SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)__dt__12J3DFrameCtrlFv,
|
||||
};
|
||||
|
||||
/* 804863B0-804865B4 000430 0204+00 1/1 0/0 0/0 .text create__10daSwhit0_cFv */
|
||||
void daSwhit0_c::create() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 804865B4-804865FC 000634 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */
|
||||
// cM3dGSph::~cM3dGSph() {
|
||||
extern "C" void __dt__8cM3dGSphFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 804865FC-80486644 00067C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
|
||||
// cM3dGAab::~cM3dGAab() {
|
||||
extern "C" void __dt__8cM3dGAabFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80486644-8048668C 0006C4 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */
|
||||
// J3DFrameCtrl::~J3DFrameCtrl() {
|
||||
extern "C" void __dt__12J3DFrameCtrlFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 8048668C-80486704 00070C 0078+00 2/2 0/0 0/0 .text checkHit__10daSwhit0_cFv */
|
||||
void daSwhit0_c::checkHit() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80486704-80486788 000784 0084+00 1/1 0/0 0/0 .text setCombackTimer__10daSwhit0_cFv */
|
||||
void daSwhit0_c::setCombackTimer() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80486788-80486800 000808 0078+00 1/1 0/0 0/0 .text endCombackTimer__10daSwhit0_cFv */
|
||||
void daSwhit0_c::endCombackTimer() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80486800-80486858 000880 0058+00 4/4 0/0 0/0 .text onSwitch__10daSwhit0_cFv */
|
||||
void daSwhit0_c::onSwitch() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80486858-804868A8 0008D8 0050+00 4/4 0/0 0/0 .text offSwitch__10daSwhit0_cFv */
|
||||
void daSwhit0_c::offSwitch() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80487378-80487380 000008 0004+04 5/5 0/0 0/0 .rodata @3982 */
|
||||
SECTION_RODATA static f32 const lit_3982[1 + 1 /* padding */] = {
|
||||
-1.0f,
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80487378, &lit_3982);
|
||||
|
||||
/* 804868A8-804869C4 000928 011C+00 2/2 0/0 0/0 .text DemoProc__10daSwhit0_cFv */
|
||||
void daSwhit0_c::DemoProc() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_804873AD = "D_MN06";
|
||||
#pragma pop
|
||||
|
||||
/* 804869C4-80486ABC 000A44 00F8+00 2/2 0/0 0/0 .text orderEvent__10daSwhit0_cFv */
|
||||
void daSwhit0_c::orderEvent() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80486ABC-80486BC4 000B3C 0108+00 1/1 0/0 0/0 .text actionOffWait__10daSwhit0_cFv */
|
||||
void daSwhit0_c::actionOffWait() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80486BC4-80486C28 000C44 0064+00 1/1 0/0 0/0 .text actionToOnReady__10daSwhit0_cFv */
|
||||
void daSwhit0_c::actionToOnReady() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_804873B4 = "SWITCH";
|
||||
#pragma pop
|
||||
|
||||
/* 80486C28-80486CE4 000CA8 00BC+00 1/1 0/0 0/0 .text actionToOnOrder__10daSwhit0_cFv */
|
||||
void daSwhit0_c::actionToOnOrder() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80486CE4-80486D88 000D64 00A4+00 1/1 0/0 0/0 .text actionToOnDemo__10daSwhit0_cFv */
|
||||
void daSwhit0_c::actionToOnDemo() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80486D88-80486EC4 000E08 013C+00 1/1 0/0 0/0 .text actionToOnDemo2__10daSwhit0_cFv */
|
||||
void daSwhit0_c::actionToOnDemo2() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80486EC4-80486FC0 000F44 00FC+00 1/1 0/0 0/0 .text actionSwWait__10daSwhit0_cFv */
|
||||
void daSwhit0_c::actionSwWait() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80486FC0-804870E0 001040 0120+00 1/1 0/0 0/0 .text actionOnWait__10daSwhit0_cFv */
|
||||
void daSwhit0_c::actionOnWait() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 804870E0-80487138 001160 0058+00 1/1 0/0 0/0 .text setDrawMtx__10daSwhit0_cFv */
|
||||
void daSwhit0_c::setDrawMtx() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80487380-80487388 000010 0008+00 1/1 0/0 0/0 .rodata @4212 */
|
||||
SECTION_RODATA static u8 const lit_4212[8] = {
|
||||
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80487380, &lit_4212);
|
||||
|
||||
/* 80487138-80487228 0011B8 00F0+00 1/0 0/0 0/0 .text daSwhit0_Draw__FP10daSwhit0_c */
|
||||
static void daSwhit0_Draw(daSwhit0_c* param_0) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80487228-804872E4 0012A8 00BC+00 2/0 0/0 0/0 .text daSwhit0_Execute__FP10daSwhit0_c */
|
||||
static void daSwhit0_Execute(daSwhit0_c* param_0) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 804872E4-8048732C 001364 0048+00 1/0 0/0 0/0 .text daSwhit0_Delete__FP10daSwhit0_c */
|
||||
static void daSwhit0_Delete(daSwhit0_c* param_0) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 8048732C-8048734C 0013AC 0020+00 1/0 0/0 0/0 .text daSwhit0_Create__FP10fopAc_ac_c */
|
||||
static void daSwhit0_Create(fopAc_ac_c* param_0) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 8048734C-80487368 0013CC 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<Uc>__FPUc */
|
||||
extern "C" void func_8048734C(void* _this, u8* param_0) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
Reference in New Issue
Block a user