diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2024-10-17 17:24:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-17 14:24:29 -0700 |
| commit | abc4c6659ae6e9cab854ff05651c1ff119659bf6 (patch) | |
| tree | daf3eb274135760aadeeb88f26987ded6a8fe978 /src/d/actor/d_a_npc_the.cpp | |
| parent | 38445f4d516dbc802670def3d4d6fc3d9eb1317c (diff) | |
cleanup (#2216)
Diffstat (limited to 'src/d/actor/d_a_npc_the.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_the.cpp | 1609 |
1 files changed, 187 insertions, 1422 deletions
diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 0c5bd5bcf4..d0969fde4a 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -247,9 +247,7 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { }; /* 80AFC1DC-80AFC1F0 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, @@ -257,7 +255,9 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { 0x3FE00000, 0x00000000, }; -#pragma pop + +/* 80AFC67C-80AFC680 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ +static daNpcThe_Param_c l_HIO; /* 80AFC1F0-80AFC200 000020 0010+00 1/1 0/0 0/0 .data l_bmdGetParamList */ static daNpc_GetParam1 l_bmdGetParamList[2] = { @@ -344,392 +344,50 @@ static char* l_resNames[4] = { }; /* 80AFC390-80AFC3A0 0001C0 0010+00 0/2 0/0 0/0 .data l_evtGetParamList */ -#pragma push -#pragma force_active on static int l_evtGetParamList[4] = { 0, 3, 3, 0, }; -#pragma pop /* 80AFC3A0-80AFC3B0 -00001 0010+00 0/2 0/0 0/0 .data l_evtNames */ -#pragma push -#pragma force_active on static char* l_evtNames[4] = { NULL, "TW_RESISTANCE1", "TW_RESISTANCE2", "THE_INTRODUCTION", }; -#pragma pop /* 80AFC3B0-80AFC3B4 -00001 0004+00 0/1 0/0 0/0 .data l_myName */ -#pragma push -#pragma force_active on static char* l_myName = "The"; -#pragma pop /* 80AFC3B4-80AFC3C4 -00001 0010+00 0/1 0/0 0/0 .data mEvtCutNameList__10daNpcThe_c */ -#pragma push -#pragma force_active on char* daNpcThe_c::mEvtCutNameList[4] = { "", "TW_RESISTANCE", "TW_RESISTANCE", "THE_INTRODUCTION", }; -#pragma pop - -/* 80AFC3C4-80AFC3D0 -00001 000C+00 0/1 0/0 0/0 .data @3810 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3810[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)EvCut_TwResistance__10daNpcThe_cFi, -}; -#pragma pop - -/* 80AFC3D0-80AFC3DC -00001 000C+00 0/1 0/0 0/0 .data @3811 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3811[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)EvCut_TwResistance__10daNpcThe_cFi, -}; -#pragma pop - -/* 80AFC3DC-80AFC3E8 -00001 000C+00 0/1 0/0 0/0 .data @3812 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3812[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)EvCut_Introduction__10daNpcThe_cFi, -}; -#pragma pop -#ifdef NONMATCHING daNpcThe_c::EventFn daNpcThe_c::mEvtCutList[4] = { NULL, &EvCut_TwResistance, &EvCut_TwResistance, &EvCut_Introduction, }; -#else -/* 80AFC3E8-80AFC418 000218 0030+00 0/2 0/0 0/0 .data mEvtCutList__10daNpcThe_c */ -#pragma push -#pragma force_active on -SECTION_DATA u8 daNpcThe_c::mEvtCutList[48] = { - 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, -}; -#pragma pop -#endif - -/* 80AFC418-80AFC424 -00001 000C+00 1/1 0/0 0/0 .data @4153 */ -SECTION_DATA static void* lit_4153[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)test__10daNpcThe_cFPv, -}; - -/* 80AFC424-80AFC45C -00001 0038+00 1/1 0/0 0/0 .data @4407 */ -SECTION_DATA static void* lit_4407[14] = { - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0x90), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0xAC), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0xC8), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0xE4), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0x100), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0x120), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0x13C), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0x158), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0x174), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0x194), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0x1B4), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0x1D4), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0x1F4), - (void*)(((char*)setExpressionAnm__10daNpcThe_cFib) + 0x214), -}; - -/* 80AFC45C-80AFC494 -00001 0038+00 1/1 0/0 0/0 .data @4441 */ -SECTION_DATA static void* lit_4441[14] = { - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0x8C), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0xD0), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0xD0), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0xD0), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0x94), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0xD0), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0xD0), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0xD0), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0x9C), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0xA4), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0xAC), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0xB4), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0xBC), - (void*)(((char*)setExpressionBtp__10daNpcThe_cFi) + 0xC4), -}; - -/* 80AFC494-80AFC4C8 -00001 0034+00 1/1 0/0 0/0 .data @4482 */ -SECTION_DATA static void* lit_4482[13] = { - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0x9C), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xA4), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xAC), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xB4), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xBC), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xC4), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xCC), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xD4), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xDC), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xE4), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xEC), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xF4), - (void*)(((char*)setMotionAnm__10daNpcThe_cFif) + 0xFC), -}; - -/* 80AFC4C8-80AFC4D4 -00001 000C+00 0/1 0/0 0/0 .data @4577 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4577[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)test__10daNpcThe_cFPv, -}; -#pragma pop - -/* 80AFC4D4-80AFC4E0 -00001 000C+00 0/1 0/0 0/0 .data @4583 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4583[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)waitTW__10daNpcThe_cFPv, -}; -#pragma pop - -/* 80AFC4E0-80AFC4EC -00001 000C+00 0/1 0/0 0/0 .data @4585 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4585[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait__10daNpcThe_cFPv, -}; -#pragma pop - -/* 80AFC4EC-80AFC4F8 -00001 000C+00 0/1 0/0 0/0 .data @4611 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4611[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)talk__10daNpcThe_cFPv, -}; -#pragma pop - -/* 80AFC4F8-80AFC504 -00001 000C+00 0/1 0/0 0/0 .data @4616 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4616[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)talk__10daNpcThe_cFPv, -}; -#pragma pop - -/* 80AFC504-80AFC510 -00001 000C+00 0/1 0/0 0/0 .data @4621 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4621[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)talk__10daNpcThe_cFPv, -}; -#pragma pop - -/* 80AFC510-80AFC51C -00001 000C+00 0/1 0/0 0/0 .data @4626 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4626[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)talk__10daNpcThe_cFPv, -}; -#pragma pop - -/* 80AFC51C-80AFC528 -00001 000C+00 0/1 0/0 0/0 .data @4630 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4630[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)talk__10daNpcThe_cFPv, -}; -#pragma pop - -/* 80AFC528-80AFC534 -00001 000C+00 0/1 0/0 0/0 .data @4635 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4635[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)talk__10daNpcThe_cFPv, -}; -#pragma pop - -/* 80AFC534-80AFC554 -00001 0020+00 1/0 0/0 0/0 .data daNpcThe_MethodTable */ -static actor_method_class daNpcThe_MethodTable = { - (process_method_func)daNpcThe_Create, - (process_method_func)daNpcThe_Delete, - (process_method_func)daNpcThe_Execute, - (process_method_func)daNpcThe_IsDelete, - (process_method_func)daNpcThe_Draw, -}; - -/* 80AFC554-80AFC584 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_THE */ -extern actor_process_profile_definition g_profile_NPC_THE = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_THE, - &g_fpcLf_Method.mBase, - sizeof(daNpcThe_c), - 0, - 0, - &g_fopAc_Method.base, - 0x174, - &daNpcThe_MethodTable, - 0x44108, - fopAc_NPC_e, - fopAc_CULLBOX_CUSTOM_e, -}; - -/* 80AFC584-80AFC590 0003B4 000C+00 2/2 0/0 0/0 .data __vt__11J3DTexNoAnm */ -SECTION_DATA extern void* __vt__11J3DTexNoAnm[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)calc__11J3DTexNoAnmCFPUs, -}; - -/* 80AFC590-80AFC5D8 0003C0 0048+00 2/2 0/0 0/0 .data __vt__10daNpcThe_c */ -SECTION_DATA extern void* __vt__10daNpcThe_c[18] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10daNpcThe_cFv, - (void*)setParam__10daNpcThe_cFv, - (void*)main__10daNpcThe_cFv, - (void*)ctrlBtk__10daNpcThe_cFv, - (void*)adjustShapeAngle__10daNpcThe_cFv, - (void*)setMtx__8daNpcF_cFv, - (void*)setMtx2__8daNpcF_cFv, - (void*)setAttnPos__10daNpcThe_cFv, - (void*)setCollisions__8daNpcF_cFv, - (void*)setExpressionAnm__10daNpcThe_cFib, - (void*)setExpressionBtp__10daNpcThe_cFi, - (void*)setExpression__10daNpcThe_cFif, - (void*)setMotionAnm__10daNpcThe_cFif, - (void*)setMotion__10daNpcThe_cFifi, - (void*)drawDbgInfo__10daNpcThe_cFv, - (void*)drawOtherMdls__8daNpcF_cFv, -}; - -/* 80AFC5D8-80AFC5E4 000408 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; -/* 80AFC5E4-80AFC608 000414 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_80AFBDF0, - (void*)NULL, - (void*)NULL, - (void*)func_80AFBDE8, -}; - -/* 80AFC608-80AFC614 000438 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, -}; - -/* 80AFC614-80AFC620 000444 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, -}; - -/* 80AFC620-80AFC62C 000450 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, -}; - -/* 80AFC62C-80AFC638 00045C 000C+00 4/4 0/0 0/0 .data __vt__18daNpcF_ActorMngr_c */ -SECTION_DATA extern void* __vt__18daNpcF_ActorMngr_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18daNpcF_ActorMngr_cFv, -}; - -/* 80AFC638-80AFC644 000468 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80AFC644-80AFC650 000474 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, -}; - -/* 80AFC650-80AFC65C 000480 000C+00 3/3 0/0 0/0 .data __vt__15daNpcF_Lookat_c */ -SECTION_DATA extern void* __vt__15daNpcF_Lookat_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daNpcF_Lookat_cFv, -}; +int daNpcThe_c::Draw() { + mpMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); + ActionFn action_test = &test; + int is_test = mpActionFn == action_test; + return draw(is_test, false, daNpcThe_Param_c::m.mShadowDepth, NULL, false); +} /* 80AF76CC-80AF7850 0000EC 0184+00 1/1 0/0 0/0 .text __ct__10daNpcThe_cFv */ -#ifdef NONMATCHING -// daNpcF_c constructor needs to not be inlined +// NONMATCHING daNpcF_c constructor needs to not be inlined daNpcThe_c::daNpcThe_c() { /* empty function */ } -#else -// daNpcThe_c::daNpcThe_c() { -extern "C" void __ct__10daNpcThe_cFv() { - // NONMATCHING -} -#endif - -/* 80AF7850-80AF7898 000270 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -// cM3dGCyl::~cM3dGCyl() { -extern "C" void __dt__8cM3dGCylFv() { - // NONMATCHING -} - -/* 80AF7898-80AF78E0 0002B8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} /* 80AF78E0-80AF7AE0 000300 0200+00 1/0 0/0 0/0 .text __dt__10daNpcThe_cFv */ -#ifdef NONMATCHING daNpcThe_c::~daNpcThe_c() { for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) { dComIfG_resDelete(&mPhase[i], l_resNames[l_loadRes_list[mType][i]]); @@ -738,12 +396,6 @@ daNpcThe_c::~daNpcThe_c() { mpMorf->stopZelAnime(); } } -#else -// daNpcThe_c::~daNpcThe_c() { -extern "C" void __dt__10daNpcThe_cFv() { - // NONMATCHING -} -#endif /* 80AFBE0C-80AFBE78 000000 006C+00 11/11 0/0 0/0 .rodata m__16daNpcThe_Param_c */ daNpcThe_Param_c::param const daNpcThe_Param_c::m = { @@ -792,7 +444,7 @@ int daNpcThe_c::CreateHeap() { )); } mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, - &mSound, 0x80000, 0x11020284); + &mSound, 0x80000, 0x11020284); if (mpMorf != NULL && mpMorf->getModel() == NULL) { mpMorf->stopZelAnime(); @@ -857,87 +509,12 @@ int daNpcThe_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { return 1; } -/* ############################################################################################## */ -/* 80AFBE84-80AFBE88 000078 0004+00 4/4 0/0 0/0 .rodata @4296 */ -SECTION_RODATA static f32 const lit_4296 = 1.0f; -COMPILER_STRIP_GATE(0x80AFBE84, &lit_4296); - -/* 80AFBE88-80AFBE8C 00007C 0004+00 5/7 0/0 0/0 .rodata @4297 */ -SECTION_RODATA static u8 const lit_4297[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBE88, &lit_4297); - /* 80AF7CB0-80AF7F58 0006D0 02A8+00 1/1 0/0 0/0 .text * createHeapCallBack__10daNpcThe_cFP10fopAc_ac_c */ int daNpcThe_c::createHeapCallBack(fopAc_ac_c* i_this) { return static_cast<daNpcThe_c*>(i_this)->CreateHeap(); } - -/* 80AF7F58-80AF7F94 000978 003C+00 1/1 0/0 0/0 .text __dt__15J3DTevKColorAnmFv */ -// J3DTevKColorAnm::~J3DTevKColorAnm() { -extern "C" void __dt__15J3DTevKColorAnmFv() { - // NONMATCHING -} - -/* 80AF7F94-80AF7FAC 0009B4 0018+00 1/1 0/0 0/0 .text __ct__15J3DTevKColorAnmFv */ -// J3DTevKColorAnm::J3DTevKColorAnm() { -extern "C" void __ct__15J3DTevKColorAnmFv() { - // NONMATCHING -} - -/* 80AF7FAC-80AF7FE8 0009CC 003C+00 1/1 0/0 0/0 .text __dt__14J3DTevColorAnmFv */ -// J3DTevColorAnm::~J3DTevColorAnm() { -extern "C" void __dt__14J3DTevColorAnmFv() { - // NONMATCHING -} - -/* 80AF7FE8-80AF8000 000A08 0018+00 1/1 0/0 0/0 .text __ct__14J3DTevColorAnmFv */ -// J3DTevColorAnm::J3DTevColorAnm() { -extern "C" void __ct__14J3DTevColorAnmFv() { - // NONMATCHING -} - -/* 80AF8000-80AF8048 000A20 0048+00 1/1 0/0 0/0 .text __dt__11J3DTexNoAnmFv */ -// J3DTexNoAnm::~J3DTexNoAnm() { -extern "C" void __dt__11J3DTexNoAnmFv() { - // NONMATCHING -} - -/* 80AF8048-80AF806C 000A68 0024+00 1/1 0/0 0/0 .text __ct__11J3DTexNoAnmFv */ -// J3DTexNoAnm::J3DTexNoAnm() { -extern "C" void __ct__11J3DTexNoAnmFv() { - // NONMATCHING -} - -/* 80AF806C-80AF80A8 000A8C 003C+00 1/1 0/0 0/0 .text __dt__12J3DTexMtxAnmFv */ -// J3DTexMtxAnm::~J3DTexMtxAnm() { -extern "C" void __dt__12J3DTexMtxAnmFv() { - // NONMATCHING -} - -/* 80AF80A8-80AF80C0 000AC8 0018+00 1/1 0/0 0/0 .text __ct__12J3DTexMtxAnmFv */ -// J3DTexMtxAnm::J3DTexMtxAnm() { -extern "C" void __ct__12J3DTexMtxAnmFv() { - // NONMATCHING -} - -/* 80AF80C0-80AF80FC 000AE0 003C+00 1/1 0/0 0/0 .text __dt__14J3DMatColorAnmFv */ -// J3DMatColorAnm::~J3DMatColorAnm() { -extern "C" void __dt__14J3DMatColorAnmFv() { - // NONMATCHING -} - -/* 80AF80FC-80AF8114 000B1C 0018+00 1/1 0/0 0/0 .text __ct__14J3DMatColorAnmFv */ -// J3DMatColorAnm::J3DMatColorAnm() { -extern "C" void __ct__14J3DMatColorAnmFv() { - // NONMATCHING -} - /* 80AF8114-80AF8160 000B34 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__10daNpcThe_cFP8J3DJointi */ int daNpcThe_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { @@ -954,7 +531,7 @@ int daNpcThe_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { */ bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) { J3DAnmTransform* anm = NULL; - int attr = 0; + int attr = J3DFrameCtrl::LOOP_ONCE_e; mAnmFlags &= ~ANM_EXPRESSION_FLAGS; if (l_bckGetParamList[i_idx].fileIdx >= 0) { @@ -978,7 +555,7 @@ bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) { break; case ANM_F_TALK_B: res = setExpressionBtp(4); - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_F_TALK_C: res = setExpressionBtp(5); @@ -991,27 +568,27 @@ bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) { break; case ANM_FH_SMILE: res = setExpressionBtp(8); - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_FH_CHUCKLE: res = setExpressionBtp(9); - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_FH_TALK_B: res = setExpressionBtp(10); - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_FH_TALK_C: res = setExpressionBtp(11); - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_FH_LAUGH: res = setExpressionBtp(12); - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_FH_TALK_R: res = setExpressionBtp(13); - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; default: anm = NULL; @@ -1034,7 +611,6 @@ bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) { return false; } - /* 80AF841C-80AF8564 000E3C 0148+00 2/0 0/0 0/0 .text setExpressionBtp__10daNpcThe_cFi */ bool daNpcThe_c::setExpressionBtp(int i_idx) { J3DAnmTexPattern* anm = NULL; @@ -1045,10 +621,10 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) { l_btpGetParamList[i_idx].fileIdx); } - int attr = 0; + int attr = J3DFrameCtrl::LOOP_ONCE_e; switch (i_idx) { case 0: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case 1: break; @@ -1057,7 +633,7 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) { case 3: break; case 4: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case 5: break; @@ -1066,22 +642,22 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) { case 7: break; case 8: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case 9: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case 10: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case 11: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case 12: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case 13: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; default: anm = NULL; @@ -1102,12 +678,11 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) { return false; } - /* 80AF8564-80AF8744 000F84 01E0+00 2/0 0/0 0/0 .text setMotionAnm__10daNpcThe_cFif */ void daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) { J3DAnmTransformKey* anm_trans = NULL; J3DAnmTextureSRTKey* anm_tex = NULL; - int attr = 2; + int attr = J3DFrameCtrl::LOOP_REPEAT_e; mAnmFlags &= ~ANM_MOTION_FLAGS; if (l_bckGetParamList[i_idx].fileIdx >= 0) { @@ -1117,43 +692,43 @@ void daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) { switch (i_idx) { case ANM_WAIT_A: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_WAIT_LOOKING: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_TO_WAIT_B: - attr = 0; + attr = J3DFrameCtrl::LOOP_ONCE_e; break; case ANM_WAIT_B: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_WAIT_LOOKUP: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_TALK_R: - attr = 0; + attr = J3DFrameCtrl::LOOP_ONCE_e; break; case ANM_TALKING_R: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_LOOK_A: - attr = 0; + attr = J3DFrameCtrl::LOOP_ONCE_e; break; case ANM_LOOK: - attr = 0; + attr = J3DFrameCtrl::LOOP_ONCE_e; break; case ANM_KUNE_WAIT_A: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_KUNE_TALK: - attr = 0; + attr = J3DFrameCtrl::LOOP_ONCE_e; break; case ANM_KUNE_WAIT_B: - attr = 2; + attr = J3DFrameCtrl::LOOP_REPEAT_e; break; case ANM_KUNE_SHISHI: - attr = 0; + attr = J3DFrameCtrl::LOOP_ONCE_e; break; default: anm_trans = NULL; @@ -1179,578 +754,116 @@ void daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) { } } +/* 80AFA338-80AFA6CC 002D58 0394+00 1/1 0/0 0/0 .text playExpression__10daNpcThe_cFv */ +void daNpcThe_c::playExpression() { + daNpcF_anmPlayData dat0 = {ANM_F_TALK_A, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData* pDat0[2] = {&dat0, NULL}; + daNpcF_anmPlayData dat1 = {ANM_F_SMILE, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData* pDat1[2] = {&dat1, NULL}; + daNpcF_anmPlayData dat2 = {ANM_F_CHUCKLE, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData* pDat2[2] = {&dat2, NULL}; + daNpcF_anmPlayData dat3 = {ANM_F_TALK_B, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData* pDat3[2] = {&dat3, NULL}; + daNpcF_anmPlayData dat4 = {ANM_F_TALK_C, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData* pDat4[2] = {&dat4, NULL}; + daNpcF_anmPlayData dat5 = {ANM_F_LAUGH, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData* pDat5[2] = {&dat5, NULL}; + daNpcF_anmPlayData dat6 = {ANM_F_TALK_R, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData* pDat6[2] = {&dat6, NULL}; + daNpcF_anmPlayData dat7 = {ANM_FH_TALK_R, 0.0f, 0}; + daNpcF_anmPlayData* pDat7[2] = {&dat7, NULL}; + daNpcF_anmPlayData dat8 = {ANM_FH_SMILE, 0.0f, 0}; + daNpcF_anmPlayData* pDat8[2] = {&dat8, NULL}; + daNpcF_anmPlayData dat9 = {ANM_FH_CHUCKLE, 0.0f, 0}; + daNpcF_anmPlayData* pDat9[2] = {&dat9, NULL}; + daNpcF_anmPlayData dat10 = {ANM_FH_TALK_B, 0.0f, 0}; + daNpcF_anmPlayData* pDat10[2] = {&dat10, NULL}; + daNpcF_anmPlayData dat11 = {ANM_FH_TALK_C, 0.0f, 0}; + daNpcF_anmPlayData* pDat11[2] = {&dat11, NULL}; + daNpcF_anmPlayData dat12 = {ANM_FH_LAUGH, 0.0f, 0}; + daNpcF_anmPlayData* pDat12[2] = {&dat12, NULL}; + daNpcF_anmPlayData dat13 = {ANM_NONE, daNpcThe_Param_c::m.mMorfFrames, 0}; + daNpcF_anmPlayData* pDat13[1] = {&dat13}; + daNpcF_anmPlayData** ppDat[14] = { + pDat0, + pDat1, + pDat2, + pDat3, + pDat4, + pDat5, + pDat6, + pDat7, + pDat8, + pDat9, + pDat10, + pDat11, + pDat12, + pDat13, + }; + if (mExpression >= 0 && mExpression < 14) { + playExpressionAnm(ppDat); + } +} -/* ############################################################################################## */ -/* 80AFBE8C-80AFBE98 000080 000C+00 0/1 0/0 0/0 .rodata @4507 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4507[12] = { - 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFBE8C, &lit_4507); -#pragma pop - -/* 80AFBE98-80AFBEA0 00008C 0008+00 0/1 0/0 0/0 .rodata @4508 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4508[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBE98, &lit_4508); -#pragma pop - -/* 80AFBEA0-80AFBEAC 000094 000C+00 0/1 0/0 0/0 .rodata @4509 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4509[12] = { - 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFBEA0, &lit_4509); -#pragma pop - -/* 80AFBEAC-80AFBEB4 0000A0 0008+00 0/1 0/0 0/0 .rodata @4510 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4510[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBEAC, &lit_4510); -#pragma pop - -/* 80AFBEB4-80AFBEC0 0000A8 000C+00 0/1 0/0 0/0 .rodata @4511 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4511[12] = { - 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFBEB4, &lit_4511); -#pragma pop - -/* 80AFBEC0-80AFBEC8 0000B4 0008+00 0/1 0/0 0/0 .rodata @4512 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4512[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBEC0, &lit_4512); -#pragma pop - -/* 80AFBEC8-80AFBED4 0000BC 000C+00 0/1 0/0 0/0 .rodata @4513 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4513[12] = { - 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFBEC8, &lit_4513); -#pragma pop - -/* 80AFBED4-80AFBEDC 0000C8 0008+00 0/1 0/0 0/0 .rodata @4514 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4514[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBED4, &lit_4514); -#pragma pop - -/* 80AFBEDC-80AFBEE8 0000D0 000C+00 0/1 0/0 0/0 .rodata @4515 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4515[12] = { - 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFBEDC, &lit_4515); -#pragma pop - -/* 80AFBEE8-80AFBEF0 0000DC 0008+00 0/1 0/0 0/0 .rodata @4516 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4516[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBEE8, &lit_4516); -#pragma pop - -/* 80AFBEF0-80AFBEFC 0000E4 000C+00 0/1 0/0 0/0 .rodata @4517 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4517[12] = { - 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFBEF0, &lit_4517); -#pragma pop - -/* 80AFBEFC-80AFBF04 0000F0 0008+00 0/1 0/0 0/0 .rodata @4518 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4518[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBEFC, &lit_4518); -#pragma pop - -/* 80AFBF04-80AFBF10 0000F8 000C+00 0/1 0/0 0/0 .rodata @4519 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4519[12] = { - 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFBF04, &lit_4519); -#pragma pop - -/* 80AFBF10-80AFBF18 000104 0008+00 0/1 0/0 0/0 .rodata @4520 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4520[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF10, &lit_4520); -#pragma pop - -/* 80AFBF18-80AFBF24 00010C 000C+00 0/1 0/0 0/0 .rodata @4521 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4521[12] = { - 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF18, &lit_4521); -#pragma pop - -/* 80AFBF24-80AFBF2C 000118 0008+00 0/1 0/0 0/0 .rodata @4522 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4522[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF24, &lit_4522); -#pragma pop - -/* 80AFBF2C-80AFBF38 000120 000C+00 0/1 0/0 0/0 .rodata @4523 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4523[12] = { - 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF2C, &lit_4523); -#pragma pop - -/* 80AFBF38-80AFBF40 00012C 0008+00 0/1 0/0 0/0 .rodata @4524 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4524[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF38, &lit_4524); -#pragma pop - -/* 80AFBF40-80AFBF4C 000134 000C+00 0/1 0/0 0/0 .rodata @4525 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4525[12] = { - 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF40, &lit_4525); -#pragma pop - -/* 80AFBF4C-80AFBF54 000140 0008+00 0/1 0/0 0/0 .rodata @4526 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4526[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF4C, &lit_4526); -#pragma pop - -/* 80AFBF54-80AFBF60 000148 000C+00 0/1 0/0 0/0 .rodata @4527 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4527[12] = { - 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF54, &lit_4527); -#pragma pop - -/* 80AFBF60-80AFBF68 000154 0008+00 0/1 0/0 0/0 .rodata @4528 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4528[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF60, &lit_4528); -#pragma pop - -/* 80AFBF68-80AFBF74 00015C 000C+00 0/1 0/0 0/0 .rodata @4529 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4529[12] = { - 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF68, &lit_4529); -#pragma pop - -/* 80AFBF74-80AFBF7C 000168 0008+00 0/1 0/0 0/0 .rodata @4530 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4530[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF74, &lit_4530); -#pragma pop - -/* 80AFBF7C-80AFBF88 000170 000C+00 0/1 0/0 0/0 .rodata @4531 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4531[12] = { - 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF7C, &lit_4531); -#pragma pop - -/* 80AFBF88-80AFBF90 00017C 0008+00 0/1 0/0 0/0 .rodata @4532 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4532[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF88, &lit_4532); -#pragma pop - -/* 80AFBF90-80AFBF9C 000184 000C+00 0/1 0/0 0/0 .rodata @4533 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4533[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF90, &lit_4533); -#pragma pop - -/* 80AFBF9C-80AFBFA0 000190 0004+00 0/1 0/0 0/0 .rodata @4534 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4534[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBF9C, &lit_4534); -#pragma pop - -/* 80AFBFA0-80AFBFD8 000194 0038+00 0/0 0/0 0/0 .rodata @4535 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4535[56] = { - 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, -}; -COMPILER_STRIP_GATE(0x80AFBFA0, &lit_4535); -#pragma pop - -/* 80AFBFD8-80AFBFE4 0001CC 000C+00 0/1 0/0 0/0 .rodata @4539 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4539[12] = { - 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBFD8, &lit_4539); -#pragma pop - -/* 80AFBFE4-80AFBFE8 0001D8 0004+00 0/1 0/0 0/0 .rodata @4540 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4540[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBFE4, &lit_4540); -#pragma pop - -/* 80AFBFE8-80AFBFF4 0001DC 000C+00 0/1 0/0 0/0 .rodata @4541 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4541[12] = { - 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFBFE8, &lit_4541); -#pragma pop - -/* 80AFBFF4-80AFC000 0001E8 000C+00 0/1 0/0 0/0 .rodata @4542 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4542[12] = { - 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFBFF4, &lit_4542); -#pragma pop - -/* 80AFC000-80AFC008 0001F4 0008+00 0/1 0/0 0/0 .rodata @4543 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4543[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC000, &lit_4543); -#pragma pop - -/* 80AFC008-80AFC014 0001FC 000C+00 0/1 0/0 0/0 .rodata @4544 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4544[12] = { - 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFC008, &lit_4544); -#pragma pop - -/* 80AFC014-80AFC020 000208 000C+00 0/1 0/0 0/0 .rodata @4545 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4545[12] = { - 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC014, &lit_4545); -#pragma pop - -/* 80AFC020-80AFC028 000214 0008+00 0/1 0/0 0/0 .rodata @4546 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4546[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC020, &lit_4546); -#pragma pop - -/* 80AFC028-80AFC034 00021C 000C+00 0/1 0/0 0/0 .rodata @4547 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4547[12] = { - 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC028, &lit_4547); -#pragma pop - -/* 80AFC034-80AFC038 000228 0004+00 0/1 0/0 0/0 .rodata @4548 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4548[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC034, &lit_4548); -#pragma pop - -/* 80AFC038-80AFC044 00022C 000C+00 0/1 0/0 0/0 .rodata @4549 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4549[12] = { - 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFC038, &lit_4549); -#pragma pop - -/* 80AFC044-80AFC050 000238 000C+00 0/1 0/0 0/0 .rodata @4550 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4550[12] = { - 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC044, &lit_4550); -#pragma pop - -/* 80AFC050-80AFC058 000244 0008+00 0/1 0/0 0/0 .rodata @4551 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4551[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC050, &lit_4551); -#pragma pop - -/* 80AFC058-80AFC064 00024C 000C+00 0/1 0/0 0/0 .rodata @4552 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4552[12] = { - 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC058, &lit_4552); -#pragma pop - -/* 80AFC064-80AFC068 000258 0004+00 0/1 0/0 0/0 .rodata @4553 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4553[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC064, &lit_4553); -#pragma pop - -/* 80AFC068-80AFC074 00025C 000C+00 0/1 0/0 0/0 .rodata @4554 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4554[12] = { - 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFC068, &lit_4554); -#pragma pop - -/* 80AFC074-80AFC080 000268 000C+00 0/1 0/0 0/0 .rodata @4555 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4555[12] = { - 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC074, &lit_4555); -#pragma pop - -/* 80AFC080-80AFC088 000274 0008+00 0/1 0/0 0/0 .rodata @4556 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4556[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC080, &lit_4556); -#pragma pop - -/* 80AFC088-80AFC094 00027C 000C+00 0/1 0/0 0/0 .rodata @4557 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4557[12] = { - 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC088, &lit_4557); -#pragma pop - -/* 80AFC094-80AFC098 000288 0004+00 0/1 0/0 0/0 .rodata @4558 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4558[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC094, &lit_4558); -#pragma pop - -/* 80AFC098-80AFC0A4 00028C 000C+00 0/1 0/0 0/0 .rodata @4559 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4559[12] = { - 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC098, &lit_4559); -#pragma pop - -/* 80AFC0A4-80AFC0A8 000298 0004+00 0/1 0/0 0/0 .rodata @4560 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4560[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC0A4, &lit_4560); -#pragma pop - -/* 80AFC0A8-80AFC0B4 00029C 000C+00 0/1 0/0 0/0 .rodata @4561 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4561[12] = { - 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFC0A8, &lit_4561); -#pragma pop - -/* 80AFC0B4-80AFC0C0 0002A8 000C+00 0/1 0/0 0/0 .rodata @4562 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4562[12] = { - 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC0B4, &lit_4562); -#pragma pop - -/* 80AFC0C0-80AFC0C8 0002B4 0008+00 0/1 0/0 0/0 .rodata @4563 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4563[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC0C0, &lit_4563); -#pragma pop - -/* 80AFC0C8-80AFC0D4 0002BC 000C+00 0/1 0/0 0/0 .rodata @4564 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4564[12] = { - 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AFC0C8, &lit_4564); -#pragma pop - -/* 80AFC0D4-80AFC0E0 0002C8 000C+00 0/1 0/0 0/0 .rodata @4565 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4565[12] = { - 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC0D4, &lit_4565); -#pragma pop - -/* 80AFC0E0-80AFC0E8 0002D4 0008+00 0/1 0/0 0/0 .rodata @4566 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4566[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC0E0, &lit_4566); -#pragma pop - -/* 80AFC0E8-80AFC114 0002DC 002C+00 0/0 0/0 0/0 .rodata @4567 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4567[44] = { - 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, -}; -COMPILER_STRIP_GATE(0x80AFC0E8, &lit_4567); -#pragma pop +/* 80AF9F94-80AFA338 0029B4 03A4+00 1/1 0/0 0/0 .text playMotion__10daNpcThe_cFv */ +void daNpcThe_c::playMotion() { + daNpcF_anmPlayData dat0 = {ANM_WAIT_A, daNpcThe_Param_c::m.mMorfFrames, 0}; + daNpcF_anmPlayData* pDat0[1] = {&dat0}; + daNpcF_anmPlayData dat1a = {ANM_LOOK_A, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData dat1b = {ANM_WAIT_LOOKING, 0.0f, 0}; + daNpcF_anmPlayData* pDat1[2] = {&dat1a, &dat1b}; + daNpcF_anmPlayData dat2a = {ANM_TO_WAIT_B, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData dat2b = {ANM_WAIT_B, 0.0f, 0}; + daNpcF_anmPlayData* pDat2[2] = {&dat2a, &dat2b}; + daNpcF_anmPlayData dat3 = {ANM_WAIT_LOOKUP, daNpcThe_Param_c::m.mMorfFrames, 0}; + daNpcF_anmPlayData* pDat3[1] = {&dat3}; + daNpcF_anmPlayData dat4a = {ANM_KUNE_TALK, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData dat4b = {ANM_KUNE_WAIT_B, 0.0f, 0}; + daNpcF_anmPlayData* pDat4[2] = {&dat4a, &dat4b}; + daNpcF_anmPlayData dat5 = {ANM_KUNE_WAIT_A, daNpcThe_Param_c::m.mMorfFrames, 0}; + daNpcF_anmPlayData* pDat5[1] = {&dat5}; + daNpcF_anmPlayData dat6a = {ANM_KUNE_SHISHI, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData dat6b = {ANM_KUNE_WAIT_A, daNpcThe_Param_c::m.mMorfFrames, 0}; + daNpcF_anmPlayData* pDat6[2] = {&dat6a, &dat6b}; + daNpcF_anmPlayData dat7 = {ANM_WAIT_B, daNpcThe_Param_c::m.mMorfFrames, 0}; + daNpcF_anmPlayData* pDat7[1] = {&dat7}; + daNpcF_anmPlayData dat8 = {ANM_KUNE_WAIT_B, daNpcThe_Param_c::m.mMorfFrames, 0}; + daNpcF_anmPlayData* pDat8[1] = {&dat8}; + daNpcF_anmPlayData dat9a = {ANM_TALK_R, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData dat9b = {ANM_TALKING_R, 0.0f, 0}; + daNpcF_anmPlayData* pDat9[2] = {&dat9a, &dat9b}; + daNpcF_anmPlayData dat10a = {ANM_LOOK, daNpcThe_Param_c::m.mMorfFrames, 1}; + daNpcF_anmPlayData dat10b = {ANM_WAIT_LOOKING, 0.0f, 0}; + daNpcF_anmPlayData* pDat10[2] = {&dat10a, &dat10b}; + daNpcF_anmPlayData** ppDat[11] = { + pDat0, + pDat1, + pDat2, + pDat3, + pDat4, + pDat5, + pDat6, + pDat7, + pDat8, + pDat9, + pDat10, + }; + if (mMotion >= 0 && mMotion < 11) { + playMotionAnm(ppDat); + } +} /* 80AFC114-80AFC120 000308 000C+00 0/1 0/0 0/0 .rodata @4676 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4676[12] = { +static u8 const lit_4676[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(0x80AFC114, &lit_4676); -#pragma pop - -/* 80AFC120-80AFC124 000314 0004+00 4/4 0/0 0/0 .rodata @4781 */ -SECTION_RODATA static f32 const lit_4781 = -1.0f; -COMPILER_STRIP_GATE(0x80AFC120, &lit_4781); - -/* 80AFC158-80AFC158 00034C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80AFC1AC = "R_SP116"; -#pragma pop /* 80AF8744-80AF8B0C 001164 03C8+00 1/0 0/0 0/0 .text wait__10daNpcThe_cFPv */ BOOL daNpcThe_c::wait(void* param_0) { switch (mMode) { case 0: mAttnChangeTimer = 0; - // no break + // fallthrough case 1: if (mType == TYPE_KAKARIKO) { @@ -1833,7 +946,6 @@ BOOL daNpcThe_c::wait(void* param_0) { return true; } - /* 80AF8B0C-80AF8B50 00152C 0044+00 1/0 0/0 0/0 .text setMotion__10daNpcThe_cFifi */ void daNpcThe_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) { s16 motion = i_motion; @@ -1862,7 +974,7 @@ BOOL daNpcThe_c::waitTW(void* param_0) { switch (mMode) { case 0: mAttnChangeTimer = 0; - // no break + // fallthrough case 1: if (mType == TYPE_KAKARIKO) { @@ -1890,20 +1002,6 @@ BOOL daNpcThe_c::waitTW(void* param_0) { return true; } - -/* ############################################################################################## */ -/* 80AFC124-80AFC12C 000318 0008+00 1/1 0/0 0/0 .rodata @4840 */ -SECTION_RODATA static u8 const lit_4840[8] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, -}; -COMPILER_STRIP_GATE(0x80AFC124, &lit_4840); - -/* 80AFC158-80AFC158 00034C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80AFC1B4 = "DEFAULT_GETITEM"; -#pragma pop - /* 80AF8CC4-80AF912C 0016E4 0468+00 6/0 0/0 0/0 .text talk__10daNpcThe_cFPv */ BOOL daNpcThe_c::talk(void* param_0) { BOOL ret = false; @@ -1990,7 +1088,7 @@ BOOL daNpcThe_c::talk(void* param_0) { } field_0x9ec = false; } - // no break + // fallthrough case 3: default: @@ -1999,7 +1097,6 @@ BOOL daNpcThe_c::talk(void* param_0) { return ret; } - /* 80AF912C-80AF923C 001B4C 0110+00 2/0 0/0 0/0 .text test__10daNpcThe_cFPv */ BOOL daNpcThe_c::test(void* param_0) { switch (mMode) { @@ -2012,7 +1109,7 @@ BOOL daNpcThe_c::test(void* param_0) { speed.setall(0.0f); mTurnMode = 0; mMode = 2; - // no break + // fallthrough case 2: attention_info.flags = 0; @@ -2031,7 +1128,6 @@ BOOL daNpcThe_c::test(void* param_0) { return true; } - /* 80AF923C-80AF9244 001C5C 0008+00 2/0 0/0 0/0 .text EvCut_TwResistance__10daNpcThe_cFi */ BOOL daNpcThe_c::EvCut_TwResistance(int i_staffID) { @@ -2186,7 +1282,6 @@ void daNpcThe_c::reset() { field_0x9ee = 1; } - /* 80AF98D0-80AF9904 0022F0 0034+00 1/0 0/0 0/0 .text daNpcThe_Delete__FPv */ static int daNpcThe_Delete(void* i_this) { static_cast<daNpcThe_c*>(i_this)->~daNpcThe_c(); @@ -2198,13 +1293,6 @@ static int daNpcThe_Execute(void* i_this) { return static_cast<daNpcThe_c*>(i_this)->execute(); } -int daNpcThe_c::Draw() { - mpMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); - ActionFn action_test = &test; - int is_test = mpActionFn == action_test; - return draw(is_test, false, daNpcThe_Param_c::m.mShadowDepth, NULL, false); -} - /* 80AF9924-80AF99BC 002344 0098+00 1/0 0/0 0/0 .text daNpcThe_Draw__FPv */ static int daNpcThe_Draw(void* i_this) { return static_cast<daNpcThe_c*>(i_this)->Draw(); @@ -2216,12 +1304,6 @@ static int daNpcThe_IsDelete(void* i_this) { return 1; } -/* 80AF99C4-80AF99F4 0023E4 0030+00 1/0 0/0 0/0 .text calc__11J3DTexNoAnmCFPUs */ -// void J3DTexNoAnm::calc(u16* param_0) const { -extern "C" void calc__11J3DTexNoAnmCFPUs() { - // NONMATCHING -} - /* 80AF99F4-80AF9CF0 002414 02FC+00 1/0 0/0 0/0 .text setParam__10daNpcThe_cFv */ void daNpcThe_c::setParam() { if (mActorMngr[2].getActorP() == NULL) { @@ -2253,17 +1335,19 @@ void daNpcThe_c::setParam() { attention_info.flags |= 0x800000; } else { if (!strcmp(dComIfGp_getStartStageName(), "R_SP116")) { - attention_info.distances[fopAc_attn_LOCK_e] = getDistTableIdx(daNpcThe_Param_c::m.mTalkDistIdx, - talk_angle_idx); - attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e]; - attention_info.distances[fopAc_attn_SPEAK_e] = getDistTableIdx(daNpcThe_Param_c::m.mSpeakDistIdx + 1, - speak_angle_idx); + attention_info.distances[fopAc_attn_LOCK_e] + = getDistTableIdx(daNpcThe_Param_c::m.mTalkDistIdx, talk_angle_idx); + attention_info.distances[fopAc_attn_TALK_e] + = attention_info.distances[fopAc_attn_LOCK_e]; + attention_info.distances[fopAc_attn_SPEAK_e] + = getDistTableIdx(daNpcThe_Param_c::m.mSpeakDistIdx + 1, speak_angle_idx); } else { - attention_info.distances[fopAc_attn_LOCK_e] = getDistTableIdx(daNpcThe_Param_c::m.mTalkDistIdx, - talk_angle_idx); - attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e]; - attention_info.distances[fopAc_attn_SPEAK_e] = getDistTableIdx(daNpcThe_Param_c::m.mSpeakDistIdx, - speak_angle_idx); + attention_info.distances[fopAc_attn_LOCK_e] + = getDistTableIdx(daNpcThe_Param_c::m.mTalkDistIdx, talk_angle_idx); + attention_info.distances[fopAc_attn_TALK_e] + = attention_info.distances[fopAc_attn_LOCK_e]; + attention_info.distances[fopAc_attn_SPEAK_e] + = getDistTableIdx(daNpcThe_Param_c::m.mSpeakDistIdx, speak_angle_idx); } } @@ -2275,8 +1359,7 @@ void daNpcThe_c::setParam() { /* 80AF9CF0-80AF9F94 002710 02A4+00 1/0 0/0 0/0 .text main__10daNpcThe_cFv */ -#ifdef NONMATCHING -// dComIfG_gameInfo issues +// NONMATCHING dComIfG_gameInfo issues BOOL daNpcThe_c::main() { if (!doEvent()) { doNormalAction(); @@ -2298,7 +1381,7 @@ BOOL daNpcThe_c::main() { } if (!daNpcThe_Param_c::m.mTest - && (dComIfGp_event_runCheck() == false + && (dComIfGp_event_runCheck() == FALSE || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) { if (mOrderEvtNo != 0 && l_resNames[l_evtGetParamList[mOrderEvtNo]] != NULL) { @@ -2314,112 +1397,6 @@ BOOL daNpcThe_c::main() { playMotion(); return true; } -#else -BOOL daNpcThe_c::main() { - // NONMATCHING -} -#endif - -/* 80AF9F94-80AFA338 0029B4 03A4+00 1/1 0/0 0/0 .text playMotion__10daNpcThe_cFv */ -void daNpcThe_c::playMotion() { - daNpcF_anmPlayData dat0 = {ANM_WAIT_A, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat0[1] = {&dat0}; - daNpcF_anmPlayData dat1a = {ANM_LOOK_A, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData dat1b = {ANM_WAIT_LOOKING, 0.0f, 0}; - daNpcF_anmPlayData* pDat1[2] = {&dat1a, &dat1b}; - daNpcF_anmPlayData dat2a = {ANM_TO_WAIT_B, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData dat2b = {ANM_WAIT_B, 0.0f, 0}; - daNpcF_anmPlayData* pDat2[2] = {&dat2a, &dat2b}; - daNpcF_anmPlayData dat3 = {ANM_WAIT_LOOKUP, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat3[1] = {&dat3}; - daNpcF_anmPlayData dat4a = {ANM_KUNE_TALK, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData dat4b = {ANM_KUNE_WAIT_B, 0.0f, 0}; - daNpcF_anmPlayData* pDat4[2] = {&dat4a, &dat4b}; - daNpcF_anmPlayData dat5 = {ANM_KUNE_WAIT_A, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat5[1] = {&dat5}; - daNpcF_anmPlayData dat6a = {ANM_KUNE_SHISHI, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData dat6b = {ANM_KUNE_WAIT_A, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat6[2] = {&dat6a, &dat6b}; - daNpcF_anmPlayData dat7 = {ANM_WAIT_B, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat7[1] = {&dat7}; - daNpcF_anmPlayData dat8 = {ANM_KUNE_WAIT_B, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat8[1] = {&dat8}; - daNpcF_anmPlayData dat9a = {ANM_TALK_R, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData dat9b = {ANM_TALKING_R, 0.0f, 0}; - daNpcF_anmPlayData* pDat9[2] = {&dat9a, &dat9b}; - daNpcF_anmPlayData dat10a = {ANM_LOOK, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData dat10b = {ANM_WAIT_LOOKING, 0.0f, 0}; - daNpcF_anmPlayData* pDat10[2] = {&dat10a, &dat10b}; - daNpcF_anmPlayData** ppDat[11] = { - pDat0, - pDat1, - pDat2, - pDat3, - pDat4, - pDat5, - pDat6, - pDat7, - pDat8, - pDat9, - pDat10, - }; - if (mMotion >= 0 && mMotion < 11) { - playMotionAnm(ppDat); - } -} - - -/* 80AFA338-80AFA6CC 002D58 0394+00 1/1 0/0 0/0 .text playExpression__10daNpcThe_cFv */ -void daNpcThe_c::playExpression() { - daNpcF_anmPlayData dat0 = {ANM_F_TALK_A, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat0[2] = {&dat0, NULL}; - daNpcF_anmPlayData dat1 = {ANM_F_SMILE, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat1[2] = {&dat1, NULL}; - daNpcF_anmPlayData dat2 = {ANM_F_CHUCKLE, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat2[2] = {&dat2, NULL}; - daNpcF_anmPlayData dat3 = {ANM_F_TALK_B, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat3[2] = {&dat3, NULL}; - daNpcF_anmPlayData dat4 = {ANM_F_TALK_C, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat4[2] = {&dat4, NULL}; - daNpcF_anmPlayData dat5 = {ANM_F_LAUGH, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat5[2] = {&dat5, NULL}; - daNpcF_anmPlayData dat6 = {ANM_F_TALK_R, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat6[2] = {&dat6, NULL}; - daNpcF_anmPlayData dat7 = {ANM_FH_TALK_R, 0.0f, 0}; - daNpcF_anmPlayData* pDat7[2] = {&dat7, NULL}; - daNpcF_anmPlayData dat8 = {ANM_FH_SMILE, 0.0f, 0}; - daNpcF_anmPlayData* pDat8[2] = {&dat8, NULL}; - daNpcF_anmPlayData dat9 = {ANM_FH_CHUCKLE, 0.0f, 0}; - daNpcF_anmPlayData* pDat9[2] = {&dat9, NULL}; - daNpcF_anmPlayData dat10 = {ANM_FH_TALK_B, 0.0f, 0}; - daNpcF_anmPlayData* pDat10[2] = {&dat10, NULL}; - daNpcF_anmPlayData dat11 = {ANM_FH_TALK_C, 0.0f, 0}; - daNpcF_anmPlayData* pDat11[2] = {&dat11, NULL}; - daNpcF_anmPlayData dat12 = {ANM_FH_LAUGH, 0.0f, 0}; - daNpcF_anmPlayData* pDat12[2] = {&dat12, NULL}; - daNpcF_anmPlayData dat13 = {ANM_NONE, daNpcThe_Param_c::m.mMorfFrames, 0}; - daNpcF_anmPlayData* pDat13[1] = {&dat13}; - daNpcF_anmPlayData** ppDat[14] = { - pDat0, - pDat1, - pDat2, - pDat3, - pDat4, - pDat5, - pDat6, - pDat7, - pDat8, - pDat9, - pDat10, - pDat11, - pDat12, - pDat13, - }; - if (mExpression >= 0 && mExpression < 14) { - playExpressionAnm(ppDat); - } -} - void daNpcThe_c::setExpressionTalkAfter() { switch (mExpression) { @@ -2447,16 +1424,8 @@ void daNpcThe_c::setExpressionTalkAfter() { } } -/* ############################################################################################## */ -/* 80AFC158-80AFC158 00034C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80AFC1C4 = "NO_RESPONSE"; -#pragma pop - /* 80AFA6CC-80AFADEC 0030EC 0720+00 1/1 0/0 0/0 .text doEvent__10daNpcThe_cFv */ -#ifdef NONMATCHING -// regalloc and mr ordering +// NONMATCHING regalloc and mr ordering BOOL daNpcThe_c::doEvent() { BOOL ret = false; if (dComIfGp_event_runCheck() != false) { @@ -2553,20 +1522,9 @@ BOOL daNpcThe_c::doEvent() { } return ret; } -#else -BOOL daNpcThe_c::doEvent() { - // NONMATCHING -} -#endif - -/* ############################################################################################## */ -/* 80AFC12C-80AFC130 000320 0004+00 1/1 0/0 0/0 .rodata @5324 */ -SECTION_RODATA static f32 const lit_5324 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x80AFC12C, &lit_5324); /* 80AFADEC-80AFAEC8 00380C 00DC+00 1/0 0/0 0/0 .text ctrlBtk__10daNpcThe_cFv */ -#ifdef NONMATCHING -// somehow this needs to not inline TSinCosTable<13,f32>::sinShort +// NONMATCHING somehow this needs to not inline TSinCosTable<13,f32>::sinShort BOOL daNpcThe_c::ctrlBtk() { if (mpMatAnm != NULL) { J3DAnmTextureSRTKey* anm = NULL; @@ -2584,46 +1542,6 @@ BOOL daNpcThe_c::ctrlBtk() { } return false; } -#else -BOOL daNpcThe_c::ctrlBtk() { - // NONMATCHING -} -#endif - -/* ############################################################################################## */ -/* 80AFC130-80AFC134 000324 0004+00 0/1 0/0 0/0 .rodata @5398 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5398 = -10.0f; -COMPILER_STRIP_GATE(0x80AFC130, &lit_5398); -#pragma pop - -/* 80AFC134-80AFC13C 000328 0008+00 0/1 0/0 0/0 .rodata @5399 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_5399[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC134, &lit_5399); -#pragma pop - -/* 80AFC13C-80AFC144 000330 0008+00 0/1 0/0 0/0 .rodata @5400 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_5400[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC13C, &lit_5400); -#pragma pop - -/* 80AFC144-80AFC14C 000338 0008+00 0/1 0/0 0/0 .rodata @5401 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_5401[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AFC144, &lit_5401); -#pragma pop /* 80AFAEC8-80AFB1C4 0038E8 02FC+00 1/0 0/0 0/0 .text setAttnPos__10daNpcThe_cFv */ void daNpcThe_c::setAttnPos() { @@ -2666,30 +1584,8 @@ void daNpcThe_c::setAttnPos() { } } - -/* ############################################################################################## */ -/* 80AFC14C-80AFC150 000340 0004+00 0/1 0/0 0/0 .rodata @5449 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5449 = -80.0f; -COMPILER_STRIP_GATE(0x80AFC14C, &lit_5449); -#pragma pop - -/* 80AFC150-80AFC154 000344 0004+00 0/1 0/0 0/0 .rodata @5450 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5450 = 80.0f; -COMPILER_STRIP_GATE(0x80AFC150, &lit_5450); -#pragma pop - -/* 80AFC154-80AFC158 000348 0004+00 0/1 0/0 0/0 .rodata @5451 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5451 = 40.0f; -COMPILER_STRIP_GATE(0x80AFC154, &lit_5451); -#pragma pop - /* 80AFB1C4-80AFB488 003BE4 02C4+00 1/1 0/0 0/0 .text lookat__10daNpcThe_cFv */ +// NONMATCHING rodata problems void daNpcThe_c::lookat() { fopAc_ac_c* actor = NULL; J3DModel* model = mpMorf->getModel(); @@ -2713,7 +1609,7 @@ void daNpcThe_c::lookat() { case LOOK_PLAYER_TALK: head_right_angle = -80.0f; head_left_angle = 80.0f; - // no break + // fallthrough case LOOK_PLAYER: actor = daPy_getPlayerActorClass(); break; @@ -2752,160 +1648,29 @@ BOOL daNpcThe_c::drawDbgInfo() { return false; } -/* 80AFB490-80AFB49C 003EB0 000C+00 1/1 0/0 0/0 .text sinShort__Q25JMath18TSinCosTable<13,f>CFs */ -extern "C" void func_80AFB490(void* _this, s16 param_0) /* const */ { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AFC65C-80AFC668 00048C 000C+00 2/2 0/0 0/0 .data __vt__16daNpcThe_Param_c */ -SECTION_DATA extern void* __vt__16daNpcThe_Param_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daNpcThe_Param_cFv, +/* 80AFC534-80AFC554 -00001 0020+00 1/0 0/0 0/0 .data daNpcThe_MethodTable */ +static actor_method_class daNpcThe_MethodTable = { + (process_method_func)daNpcThe_Create, + (process_method_func)daNpcThe_Delete, + (process_method_func)daNpcThe_Execute, + (process_method_func)daNpcThe_IsDelete, + (process_method_func)daNpcThe_Draw, }; -/* 80AFC670-80AFC67C 000008 000C+00 1/1 0/0 0/0 .bss @3809 */ -static u8 lit_3809[12]; - -/* 80AFC67C-80AFC680 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ -#ifdef NONMATCHING -static daNpcThe_Param_c l_HIO; -#else -static u8 l_HIO[4]; -#endif - -/* 80AFB49C-80AFB558 003EBC 00BC+00 0/0 1/0 0/0 .text __sinit_d_a_npc_the_cpp */ -void __sinit_d_a_npc_the_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80AFB49C, __sinit_d_a_npc_the_cpp); -#pragma pop - -/* 80AFB558-80AFB5A0 003F78 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ -// daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { -extern "C" void __dt__18daNpcF_ActorMngr_cFv() { - // NONMATCHING -} - -/* 80AFB5A0-80AFB5DC 003FC0 003C+00 2/2 0/0 0/0 .text __ct__18daNpcF_ActorMngr_cFv */ -// daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { -extern "C" void __ct__18daNpcF_ActorMngr_cFv() { - // NONMATCHING -} - -/* 80AFB5DC-80AFB6AC 003FFC 00D0+00 1/0 0/0 0/0 .text __dt__15daNpcF_Lookat_cFv */ -// daNpcF_Lookat_c::~daNpcF_Lookat_c() { -extern "C" void __dt__15daNpcF_Lookat_cFv() { - // NONMATCHING -} - -/* 80AFB6AC-80AFB6E8 0040CC 003C+00 5/5 0/0 0/0 .text __dt__5csXyzFv */ -// csXyz::~csXyz() { -extern "C" void __dt__5csXyzFv() { - // NONMATCHING -} - -/* 80AFB6E8-80AFB6EC 004108 0004+00 2/2 0/0 0/0 .text __ct__5csXyzFv */ -// csXyz::csXyz() { -extern "C" void __ct__5csXyzFv() { - /* empty function */ -} - -/* 80AFB6EC-80AFB728 00410C 003C+00 5/5 0/0 0/0 .text __dt__4cXyzFv */ -// cXyz::~cXyz() { -extern "C" void __dt__4cXyzFv() { - // NONMATCHING -} - -/* 80AFB728-80AFB72C 004148 0004+00 2/2 0/0 0/0 .text __ct__4cXyzFv */ -// cXyz::cXyz() { -extern "C" void __ct__4cXyzFv() { - /* empty function */ -} - -/* 80AFB72C-80AFB978 00414C 024C+00 1/1 0/0 0/0 .text __dt__8daNpcF_cFv */ -// daNpcF_c::~daNpcF_c() { -extern "C" void __dt__8daNpcF_cFv() { - // NONMATCHING -} - -/* 80AFB978-80AFBB68 004398 01F0+00 1/1 0/0 0/0 .text __ct__8daNpcF_cFv */ -// daNpcF_c::daNpcF_c() { -extern "C" void __ct__8daNpcF_cFv() { - // NONMATCHING -} - -/* 80AFBB68-80AFBBD8 004588 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -// dBgS_AcchCir::~dBgS_AcchCir() { -extern "C" void __dt__12dBgS_AcchCirFv() { - // NONMATCHING -} - -/* 80AFBBD8-80AFBC34 0045F8 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -// dCcD_GStts::~dCcD_GStts() { -extern "C" void __dt__10dCcD_GSttsFv() { - // NONMATCHING -} - -/* 80AFBC34-80AFBCA4 004654 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -// dBgS_ObjAcch::~dBgS_ObjAcch() { -extern "C" void __dt__12dBgS_ObjAcchFv() { - // NONMATCHING -} - -/* 80AFBCA4-80AFBCEC 0046C4 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -// J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" void __dt__12J3DFrameCtrlFv() { - // NONMATCHING -} - -/* 80AFBCEC-80AFBCF0 00470C 0004+00 1/0 0/0 0/0 .text setCollisions__8daNpcF_cFv */ -// void daNpcF_c::setCollisions() { -extern "C" void setCollisions__8daNpcF_cFv() { - /* empty function */ -} - -/* 80AFBCF0-80AFBCF4 004710 0004+00 1/0 0/0 0/0 .text drawOtherMdls__8daNpcF_cFv */ -// void daNpcF_c::drawOtherMdls() { -extern "C" void drawOtherMdls__8daNpcF_cFv() { - /* empty function */ -} - -/* 80AFBCF4-80AFBD3C 004714 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -// cCcD_GStts::~cCcD_GStts() { -extern "C" void __dt__10cCcD_GSttsFv() { - // NONMATCHING -} - -/* 80AFBD3C-80AFBD9C 00475C 0060+00 1/1 0/0 0/0 .text chkPointInArea__15daTag_EvtArea_cF4cXyz */ -// void daTag_EvtArea_c::chkPointInArea(cXyz param_0) { -extern "C" void chkPointInArea__15daTag_EvtArea_cF4cXyz() { - // NONMATCHING -} - -/* 80AFBD9C-80AFBDA0 0047BC 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__10daNpcThe_cFv */ -void daNpcThe_c::adjustShapeAngle() { - /* empty function */ -} - -/* 80AFBDA0-80AFBDE8 0047C0 0048+00 2/1 0/0 0/0 .text __dt__16daNpcThe_Param_cFv */ -// daNpcThe_Param_c::~daNpcThe_Param_c() { -extern "C" void __dt__16daNpcThe_Param_cFv() { - // NONMATCHING -} - -/* 80AFBDE8-80AFBDF0 004808 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -static void func_80AFBDE8() { - // NONMATCHING -} - -/* 80AFBDF0-80AFBDF8 004810 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -static void func_80AFBDF0() { - // NONMATCHING -} - -/* 80AFC158-80AFC158 00034C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
\ No newline at end of file +/* 80AFC554-80AFC584 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_THE */ +extern actor_process_profile_definition g_profile_NPC_THE = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_NPC_THE, + &g_fpcLf_Method.mBase, + sizeof(daNpcThe_c), + 0, + 0, + &g_fopAc_Method.base, + 0x174, + &daNpcThe_MethodTable, + 0x44108, + fopAc_NPC_e, + fopAc_CULLBOX_CUSTOM_e, +}; |
