mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-27 16:12:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use resource enums for all other old actors

Browse Source
This commit is contained in:
LagoLunatic
2024-04-25 12:36:12 -04:00
parent ae0bc3ff95
commit e235db5379
30 changed files with 729 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_fan.cpp
+4 -2
View File
@@ -4,6 +4,8 @@
//
#include "d/actor/d_a_fan.h"
#include "d/res/res_hsen1.h"
#include "d/res/res_hsen3.h"
#include "d/res/res_yaflw00.h"
#include "f_op/f_op_kankyo_mng.h"
#include "d/d_com_inf_game.h"
@@ -14,8 +16,8 @@
const char* daFan_c::m_arcname[3] = { "Hsen1", "Hsen1", "Hsen3", };
const char daFan_c::m_arcname2[8] = "Yaflw00";
const s16 daFan_c::m_bdlidx[3] = { 0x05, 0x05, 0x04, };
const s16 daFan_c::m_dzbidx[3] = { 0x0C, 0x0C, 0x07, };
const s16 daFan_c::m_bdlidx[3] = { HSEN1_BDL_HSEN1, HSEN1_BDL_HSEN1, HSEN3_BDL_HSEN3, };
const s16 daFan_c::m_dzbidx[3] = { HSEN1_DZB_HSEN1, HSEN1_DZB_HSEN1, HSEN3_DZB_HSEN3, };
const f32 daFan_c::m_wind_length[3] = { 1600.0f, 1600.0f, 1220.0f, };
const f32 daFan_c::m_wind_r[3] = { 120.0f, 120.0f, 780.0f, };
const Vec daFan_c::m_wind_model_scale[3] = { { 1.0f, 1.6f, 1.0f, }, { 1.0f, 1.6f, 1.0f, }, { 3.0f, 2.9f, 3.0f, }, };
src/d/actor/d_a_floor.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ s32 daFloor_c::_create() {
s32 rt = dComIfG_resLoad(&mPhs, m_arcname);
if (rt == cPhs_COMPLEATE_e) {
if (!MoveBGCreate(m_arcname, 0x07, NULL, 0x8A0))
if (!MoveBGCreate(m_arcname, HHYU1_DZB_HHYU1, NULL, 0x8A0))
return cPhs_ERROR_e;
}
return rt;
src/d/actor/d_a_ikari.cpp
+8 -1
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_ikari.h"
#include "d/res/res_ikari.h"
#include "d/d_kankyo_wether.h"
#include "d/d_procname.h"
#include "d/d_s_play.h"
@@ -33,7 +34,13 @@ void daIkari_c::setMtx() {
/* 000001C4-00000290 .text _createHeap__9daIkari_cFv */
BOOL daIkari_c::_createHeap() {
static int ikari_bdl[5] = {0x03, 0x03, 0x03, 0x04, 0x05};
static int ikari_bdl[5] = {
IKARI_BDL_S_IKARI2,
IKARI_BDL_S_IKARI2,
IKARI_BDL_S_IKARI2,
IKARI_BDL_S_IKARI3,
IKARI_BDL_S_IKARI4,
};
J3DModelData* modelData =
static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, ikari_bdl[mModelType]));
src/d/actor/d_a_itembase.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ BOOL daItemBase_c::clothCreate() {
}
/* 800F8A44-800F9074 .text CreateItemHeap__12daItemBase_cFPCcsssssss */
BOOL daItemBase_c::CreateItemHeap(const char* resName, short resIdx, short btkAnm1, short btkAnm2, short brkAnm1, short brkAnm2, short bckAnm, short) {
BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, s16 btkAnm2, s16 brkAnm1, s16 brkAnm2, s16 bckAnm, s16) {
JUT_ASSERT(78, 0 <= m_itemNo && m_itemNo <= 255);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(resName, resIdx);
src/d/actor/d_a_npc_ji1.cpp
+64 -63
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_npc_ji1.h"
#include "d/res/res_ji.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_snap.h"
@@ -2457,146 +2458,146 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) {
switch(param_1) {
case 0:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x38));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_WAIT01));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1C);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_WAIT01);
break;
case 1:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x39));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_WAIT02));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1D);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_WAIT02);
break;
case 2:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x32));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_TALK01));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x16);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TALK01);
break;
case 3:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x33));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_TALK02));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x17);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TALK02);
break;
case 4:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x24));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_AKIRE));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x8);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_AKIRE);
break;
case 5:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2C));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_KAMAE));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x10);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_KAMAE);
break;
case 6:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2D));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_KROT));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x11);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_KROT);
speed = l_HIO.field_0x48;
break;
case 7:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2A));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_INASI));
temp2 = 0;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xE);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_INASI);
speed = l_HIO.field_0x44;
break;
case 8:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x35));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_TATEGUARD));
temp2 = 0;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x19);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TATEGUARD);
break;
case 9:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x3B));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_YKGUARD));
temp2 = 0;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1F);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_YKGUARD);
break;
case 10:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2B));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_JPGUARD));
temp2 = 0;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xF);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_JPGUARD);
break;
case 11:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x36));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_TOKAMAE));
temp2 = 0;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1A);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TOKAMAE);
break;
case 12:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x31));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_REI));
temp2 = 0;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x15);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_REI);
break;
case 13:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x3A));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_WARAI));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1E);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_WARAI);
speed = l_HIO.field_0x4C;
break;
case 14:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2B));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_JPGUARD));
temp2 = 0;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xF);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_JPGUARD);
speed = 2.0f;
break;
case 15:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x29));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_GUARD));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xD);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_GUARD);
speed = 2.0f;
break;
case 16:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x27));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_BTKAMASI));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xB);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_BTKAMASI);
break;
case 17:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x26));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_BTKAMAE));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xA);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_BTKAMAE);
break;
case 18:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x37));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_UDEGUMI));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1B);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_UDEGUMI);
break;
case 19:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x34));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_TATEATTACK));
temp2 = 0;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x18);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TATEATTACK);
break;
case 20:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x3C));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_YOKOATTACK));
temp2 = 0;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x20);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_YOKOATTACK);
break;
case 21:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x30));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_ODOROKU));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x14);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_ODOROKU);
break;
case 22:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x25));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_BIBIRI));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x9);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_BIBIRI);
BackSlideInit();
if(field_0xD84 == 1) {
@@ -2605,9 +2606,9 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) {
break;
case 23:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2E));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_NAKU));
temp2 = 2;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x12);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_NAKU);
if(field_0x430 == 0) {
field_0x430 = dComIfGp_particle_set(0x81A4, &current.pos);
@@ -2616,15 +2617,15 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) {
break;
case 24:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2F));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_NUGUI));
temp2 = 0;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x13);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_NUGUI);
break;
case 25:
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x28));
temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_DAMAGE));
temp2 = 0;
pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xC);
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_DAMAGE);
break;
default:
@@ -2633,10 +2634,10 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) {
field_0x330->setAnm(temp1, temp2, param_2, speed, 0.0f, -1.0f, pSoundAnimRes);
if(field_0xD64 == 0x13) {
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", 0x3D), 2, 0.0f, 1.0f, 0.0f, -1.0f, 0);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_TATEATTACK), 2, 0.0f, 1.0f, 0.0f, -1.0f, 0);
}
else if(field_0xD64 == 0x14) {
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", 0x3E), 2, 0.0f, 1.0f, 0.0f, -1.0f, 0);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_YOKOATTACK), 2, 0.0f, 1.0f, 0.0f, -1.0f, 0);
}
return true;
@@ -2764,13 +2765,13 @@ s32 daNpc_Ji1_c::_create() {
BOOL daNpc_Ji1_c::CreateHeap() {
/* Nonmatching */
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", 0x42));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", JI_BDL_JI));
field_0x330 = new mDoExt_McaMorf(
modelData,
NULL, NULL,
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Ji", 0x3F)),
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Ji", JI_BCK_WAIT01)),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1,
dComIfG_getObjectRes("Ji", 0x21),
dComIfG_getObjectRes("Ji", JI_BAS_WAIT01),
0x00000000,
0x11020203
);
@@ -2799,9 +2800,9 @@ BOOL daNpc_Ji1_c::CreateHeap() {
JUT_ASSERT(0x15BA, handRJointNo >= 0);
mpMorf = new mDoExt_McaMorf(
static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", 0x43)),
static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", JI_BDL_JI_YARI)),
NULL, NULL,
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Ji", 0x3D)),
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_TATEATTACK)),
J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1, 1,
0,
0x00000000,
@@ -2813,13 +2814,13 @@ BOOL daNpc_Ji1_c::CreateHeap() {
return false;
}
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", 0x44));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", JI_BDL_YJITR00));
field_0x3F8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Ji", 0x47));
J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Ji", JI_BRK_YJITR00));
JUT_ASSERT(0x15CD, a_brk != 0);
J3DAnmTextureSRTKey* a_btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Ji", 0x4A));
J3DAnmTextureSRTKey* a_btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Ji", JI_BTK_YJITR00));
JUT_ASSERT(0x15D0, a_btk != 0);
int temp1 = field_0x3FC.init(modelData, a_brk, false, 2, 1.0f, 0, -1, false, 0);
@@ -2829,7 +2830,7 @@ BOOL daNpc_Ji1_c::CreateHeap() {
return false;
}
headTexPattern = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Ji", 0x4D));
headTexPattern = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Ji", JI_BTP_JI));
JUT_ASSERT(0x15D8, headTexPattern != 0);
if(field_0x3D8.init(modelData, headTexPattern, 1, 2, 1.0f, 0, -1, false, 0) == 0) {
src/d/actor/d_a_npc_os.cpp
+19 -20
View File
@@ -1604,10 +1604,9 @@ void daNpc_Os_c::setAnm(int param_1) {
};
static s8 l_anmTbl[] = {
6,
6,
5,
0
OS_BCK_OS_MOVE01,
OS_BCK_OS_MOVE01,
OS_BCK_OS_AWAKE,
};
static anmPrm_c l_anmPrm[] = {
@@ -1680,32 +1679,32 @@ BOOL daNpc_Os_c::dNpc_Os_setAnm(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f
/* 00004DD4-00004F48 .text initBrkAnm__10daNpc_Os_cFUcb */
BOOL daNpc_Os_c::initBrkAnm(u8 param_1, bool param_2) {
struct AnmTableEntry {
u8 unk_1;
u32 unk_2;
f32 unk_3;
s32 unk_4;
};
/* 0x00 */ u8 brkFileIndex;
/* 0x04 */ int loopMode;
/* 0x08 */ f32 speed;
/* 0x0C */ s32 unk_4;
}; // Size: 0x10
static AnmTableEntry brkAnmTbl[] = {
{0x0F, 0x00, 1.0f, 0},
{0x0F, 0x00, 1.0f, -1},
{0x0D, 0x00, 1.0f, 0},
{0x0D, 0x00, -1.0f, 0},
{0x10, 0x00, 1.0f, 0},
{0x10, 0x00, 0.0f, 0},
{0x0E, 0x02, 1.0f, 0},
{0x0D, 0x00, 0.0f, -1},
{0x0C, 0x02, 1.0f, 0},
{OS_BRK_TURN_OFF, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0},
{OS_BRK_TURN_OFF, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1},
{OS_BRK_OS_AWAKE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0},
{OS_BRK_OS_AWAKE, J3DFrameCtrl::LOOP_ONCE_e, -1.0f, 0},
{OS_BRK_TURN_ON, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0},
{OS_BRK_TURN_ON, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0},
{OS_BRK_TENMETU, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0},
{OS_BRK_OS_AWAKE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, -1},
{OS_BRK_LINK, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0},
};
J3DModelData* modelData = mpMorf->getModel()->getModelData();
bool ret = false;
if(field_0x7A2 != param_1) {
J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Os", brkAnmTbl[param_1].unk_1));
J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Os", brkAnmTbl[param_1].brkFileIndex));
JUT_ASSERT(0xBB9, a_brk != 0);
if(mBrkAnm.init(modelData, a_brk, true, brkAnmTbl[param_1].unk_2, brkAnmTbl[param_1].unk_3, 0, -1, param_2, 0)) {
if(mBrkAnm.init(modelData, a_brk, TRUE, brkAnmTbl[param_1].loopMode, brkAnmTbl[param_1].speed, 0, -1, param_2, 0)) {
field_0x7A2 = param_1;
if(brkAnmTbl[param_1].unk_4 < 0) {
mBrkAnm.setFrame(mBrkAnm.getEndFrame());
src/d/actor/d_a_npc_roten.cpp
+45 -44
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_npc_roten.h"
#include "d/res/res_ro.h"
#include "m_Do/m_Do_ext.h"
#include "d/actor/d_a_player_main.h"
#include "d/actor/d_a_demo_item.h"
@@ -1389,72 +1390,72 @@ static char* l_npc_staff_id[] = {
const char daNpcRoten_c::m_arcname[] = "Ro";
static const int l_bmd_ix_tbl[] = {
0x02,
0x02,
0x02,
RO_BDL_RO,
RO_BDL_RO,
RO_BDL_RO,
};
static const int l_bck_ix_tbl[][10] = {
{
0x00,
0x04,
0x07,
0x05,
0x06,
0x0A,
0x0B,
0x08,
0x09,
0x13,
RO_BCK_RO_WAIT01,
RO_BCK_RO_TALK01,
RO_BCK_RO_WALK,
RO_BCK_RO_TALK02,
RO_BCK_RO_TALK03,
RO_BCK_RO_TALK04,
RO_BCK_RO_TALK05,
RO_BCK_RO_WATASU,
RO_BCK_RO_ITEMWAIT,
RO_BCK_RO_WIND,
},
{
0x00,
0x04,
0x07,
0x05,
0x06,
0x0A,
0x0B,
0x08,
0x09,
0x13,
RO_BCK_RO_WAIT01,
RO_BCK_RO_TALK01,
RO_BCK_RO_WALK,
RO_BCK_RO_TALK02,
RO_BCK_RO_TALK03,
RO_BCK_RO_TALK04,
RO_BCK_RO_TALK05,
RO_BCK_RO_WATASU,
RO_BCK_RO_ITEMWAIT,
RO_BCK_RO_WIND,
},
{
0x00,
0x04,
0x07,
0x05,
0x06,
0x0A,
0x0B,
0x08,
0x09,
0x13,
RO_BCK_RO_WAIT01,
RO_BCK_RO_TALK01,
RO_BCK_RO_WALK,
RO_BCK_RO_TALK02,
RO_BCK_RO_TALK03,
RO_BCK_RO_TALK04,
RO_BCK_RO_TALK05,
RO_BCK_RO_WATASU,
RO_BCK_RO_ITEMWAIT,
RO_BCK_RO_WIND,
},
};
static const int l_head_bmd_ix_tbl[] = {
0x17,
0x18,
0x19,
RO_BDL_RO_HAT,
RO_BDL_RO_HAT2,
RO_BDL_RO_HAT3,
};
static const int l_head_bck_ix_tbl[] = {
0x12,
0x10,
0x11,
RO_BCK_HAT_WID,
RO_BCK_HAT2_WIND,
RO_BCK_HAT3_WID,
};
static const int l_btp_ix_tbl[] = {
0x03,
0x03,
0x03,
RO_BTP_RO,
RO_BTP_RO,
RO_BTP_RO,
};
static const int l_bmt_ix_tbl[] = {
-1,
0x0E,
0x0F,
RO_BMT_RO2,
RO_BMT_RO3,
};
static const int l_diff_flag_tbl[] = {
src/d/actor/d_a_obj_Vteng.cpp
+4 -3
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_Vteng.h"
#include "d/res/res_vteng.h"
#include "f_op/f_op_actor_mng.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "d/d_bg_w.h"
@@ -35,8 +36,8 @@ BOOL daObjVteng_c::solidHeapCB(fopAc_ac_c* i_this) {
bool daObjVteng_c::create_heap() {
bool ret = true;
J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, 0x08));
J3DAnmTransform * pAnm = (J3DAnmTransform *)dComIfG_getObjectRes(l_arcname, 0x05);
J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, VTENG_BDL_VTENG));
J3DAnmTransform * pAnm = (J3DAnmTransform *)dComIfG_getObjectRes(l_arcname, VTENG_BCK_VTENG);
if (!pModelData || !pAnm) {
JUT_ASSERT(0xb7, 0);
@@ -56,7 +57,7 @@ bool daObjVteng_c::create_heap() {
} else {
J3DModel * model = mpMorf->getModel();
mpModel = model;
mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, 0x0B), cBgW::MOVE_BG_e, &mtx);
mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, VTENG_DZB_VTENG), cBgW::MOVE_BG_e, &mtx);
if (!mpBgW)
ret = false;
}
src/d/actor/d_a_obj_Yboil.cpp
+5 -4
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_Yboil.h"
#include "d/res/res_yboil.h"
#include "d/d_a_obj.h"
#include "d/d_com_inf_game.h"
#include "d/d_kankyo.h"
@@ -18,13 +19,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-00000368 .text CreateHeap__12daObjYboil_cFv */
BOOL daObjYboil_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Yboil", 0x06);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Yboil", YBOIL_BDL_YBOIL00);
JUT_ASSERT(92, modelData != 0);
J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Yboil", 0x09));
J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Yboil", YBOIL_BCK_YBOIL00));
JUT_ASSERT(96, bck != 0);
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Yboil", 0x0F));
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Yboil", YBOIL_BTK_YBOIL00));
JUT_ASSERT(100, btk != 0);
J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Yboil", 0x0C));
J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Yboil", YBOIL_BRK_YBOIL00));
JUT_ASSERT(104, brk != 0);
for (s32 i = 0; i < 50; i++) {
src/d/actor/d_a_obj_Ygush00.cpp
+4 -3
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_Ygush00.h"
#include "d/res/res_ygush00.h"
#include "f_op/f_op_actor_mng.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "d/d_a_obj.h"
@@ -31,9 +32,9 @@ BOOL daObjYgush00_c::solidHeapCB(fopAc_ac_c* ac) {
/* 0000009C-00000250 .text create_heap__14daObjYgush00_cFv */
bool daObjYgush00_c::create_heap() {
static u32 mdl_table[] = { 0x0A, 0x09, 0x09, 0x09 };
static u32 btk_table[] = { 0x0E, 0x0D, 0x0D, 0x0D };
static u32 bck_table[] = { 0x06, 0x05, 0x05, 0x05 };
static u32 mdl_table[] = { YGUSH00_BDL_YGUSH00, YGUSH00_BDL_YGSTP00, YGUSH00_BDL_YGSTP00, YGUSH00_BDL_YGSTP00 };
static u32 btk_table[] = { YGUSH00_BTK_YGUSH00, YGUSH00_BTK_YGSTP00, YGUSH00_BTK_YGSTP00, YGUSH00_BTK_YGSTP00 };
static u32 bck_table[] = { YGUSH00_BCK_YGUSH00, YGUSH00_BCK_YGSTP00, YGUSH00_BCK_YGSTP00, YGUSH00_BCK_YGSTP00 };
bool ret = true;
src/d/actor/d_a_obj_adnno.cpp
+18 -2
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_adnno.h"
#include "d/res/res_adnno.h"
#include "f_op/f_op_actor_mng.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "d/d_bg_w.h"
@@ -13,7 +14,22 @@
#include "m_Do/m_Do_mtx.h"
static const u32 daObjAdnno_bmt_table[16] = {
0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
ADNNO_BMT_ADNNO_00,
ADNNO_BMT_ADNNO_01,
ADNNO_BMT_ADNNO_02,
ADNNO_BMT_ADNNO_03,
ADNNO_BMT_ADNNO_04,
ADNNO_BMT_ADNNO_05,
ADNNO_BMT_ADNNO_06,
ADNNO_BMT_ADNNO_07,
ADNNO_BMT_ADNNO_08,
ADNNO_BMT_ADNNO_09,
ADNNO_BMT_ADNNO_10,
ADNNO_BMT_ADNNO_11,
ADNNO_BMT_ADNNO_12,
ADNNO_BMT_ADNNO_13,
ADNNO_BMT_ADNNO_14,
ADNNO_BMT_ADNNO_15,
};
/* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */
@@ -23,7 +39,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-00000178 .text CreateHeap__12daObjAdnno_cFv */
BOOL daObjAdnno_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Adnno", 0x04));
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Adnno", ADNNO_BDL_ADNNO));
JUT_ASSERT(0x5c, modelData != 0);
for (s32 i = 0; i < 16; i++) {
mpModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x37441422);
src/d/actor/d_a_obj_akabe.cpp
+5 -1
View File
@@ -4,6 +4,10 @@
//
#include "d/actor/d_a_obj_akabe.h"
#include "d/res/res_akabe.h"
#include "d/res/res_akabed.h"
#include "d/res/res_akabek.h"
#include "d/res/res_nbox.h"
#include "d/d_item.h"
#include "d/d_item_data.h"
#include "d/d_cc_d.h"
@@ -30,7 +34,7 @@ namespace daObjAkabe {
mpBgW = new dBgW();
if (mpBgW != NULL) {
static const s16 dzb[4] = { 3, 3, 3, 3, };
static const s16 dzb[4] = { AKABE_DZB_AKABE, AKABED_DZB_AKABED, AKABEK_DZB_AKABEK, NBOX_DZB_NBOX, };
cBgD_t * bgw_data = (cBgD_t*)dComIfG_getObjectRes(M_arcname[mType], dzb[mType]);
JUT_ASSERT(0x82, bgw_data != 0);
if (!mpBgW->Set(bgw_data, cBgW::MOVE_BG_e, &mMtx))
src/d/actor/d_a_obj_barrier.cpp
+12 -11
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_barrier.h"
#include "d/res/res_ycage.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "d/actor/d_a_player_main.h"
#include "d/d_com_inf_game.h"
@@ -98,9 +99,9 @@ int daObjBarrier_c::solidHeapCB(fopAc_ac_c* i_this) {
/* 000001B0-00000340 .text init__18daObjBarrier_anm_cFv */
bool daObjBarrier_anm_c::init() {
bool rt = true;
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, 10));
J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, 18));
J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, 14));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, YCAGE_BDL_YCAGE00));
J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YCAGE00));
J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YCAGE00));
if (modelData == NULL || pbtk == NULL || pbrk == NULL) {
JUT_PANIC(407);
@@ -129,7 +130,7 @@ bool daObjBarrier_c::create_heap() {
if (!anm_init || !eff_init) {
rt = false;
} else {
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(l_arcname, 22);
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(l_arcname, YCAGE_DZB_KEKKAI);
mpBgW = dBgW_NewSet(dzb, cBgW::MOVE_BG_e, &mBgMtx);
if (mpBgW == NULL) {
rt = false;
@@ -373,13 +374,13 @@ void daObjBarrier_ef_c::birth(fopAc_ac_c* i_hitActor, f32 i_radius, cXyz i_cente
J3DModelData* modelData = mpModel[effect_idx]->getModelData();
J3DAnmTextureSRTKey* btk_anm_p = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, 19));
J3DAnmTextureSRTKey* btk_anm_p = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YHRBR00));
JUT_ASSERT(937, btk_anm_p != 0);
J3DAnmTransform* bck_anm_p = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, 7));
J3DAnmTransform* bck_anm_p = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, YCAGE_BCK_YHRBR00));
JUT_ASSERT(942, bck_anm_p != 0);
J3DAnmTevRegKey* brk_anm_p = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, 15));
J3DAnmTevRegKey* brk_anm_p = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00));
JUT_ASSERT(947, brk_anm_p != 0);
mBtk[effect_idx].init(modelData, btk_anm_p, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1,
@@ -400,10 +401,10 @@ void daObjBarrier_ef_c::birth(fopAc_ac_c* i_hitActor, f32 i_radius, cXyz i_cente
/* 000011B8-000013E0 .text init__17daObjBarrier_ef_cFv */
bool daObjBarrier_ef_c::init() {
bool rt = true;
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, 11));
J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, 19));
J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, 7));
J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, 15));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, YCAGE_BDL_YHRBR00));
J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YHRBR00));
J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, YCAGE_BCK_YHRBR00));
J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00));
if (modelData == NULL || pbtk == NULL || pbck == NULL || pbrk == NULL) {
JUT_PANIC(1016);
src/d/actor/d_a_obj_dmgroom.cpp
+3 -2
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_dmgroom.h"
#include "d/res/res_dmgroom.h"
#include "f_op/f_op_actor_mng.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "d/d_bg_w.h"
@@ -19,13 +20,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-000001FC .text CreateHeap__14daObjDmgroom_cFv */
BOOL daObjDmgroom_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dmgroom", 0x04));
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BDL_DMGROOM));
JUT_ASSERT(0x52, modelData != 0);
mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203);
if (!mpModel)
return FALSE;
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dmgroom", 0x07));
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BRK_DMGROOM));
JUT_ASSERT(0x5c, brk != 0);
if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0))
return FALSE;
src/d/actor/d_a_obj_doguu_demo.cpp
+3 -2
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_doguu_demo.h"
#include "d/res/res_doguud.h"
#include "d/d_bg_w.h"
#include "d/d_cc_d.h"
#include "d/d_com_inf_game.h"
@@ -21,7 +22,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
BOOL daObjDoguuD_c::CreateHeap() {
mUnusedParam = fopAcM_GetParam(this) & 0xFF;
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("DoguuD", 0x04));
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("DoguuD", DOGUUD_BDL_ESKZTO));
JUT_ASSERT(0x65, modelData != 0);
mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203);
if (mpModel == NULL)
@@ -38,7 +39,7 @@ BOOL daObjDoguuD_c::CreateHeap() {
return FALSE;
}
if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("DoguuD", 0x07), cBgW::MOVE_BG_e, &mMtx))
if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("DoguuD", DOGUUD_DZB_ESKZTO), cBgW::MOVE_BG_e, &mMtx))
return FALSE;
return TRUE;
src/d/actor/d_a_obj_dragonhead.cpp
+3 -2
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_dragonhead.h"
#include "d/res/res_qdghd.h"
#include "f_op/f_op_actor_mng.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "d/d_bg_w.h"
@@ -53,7 +54,7 @@ namespace daObjDragonhead_prm {
/* 00000098-00000228 .text CreateHeap__17daObjDragonhead_cFv */
BOOL daObjDragonhead_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)(dComIfG_getObjectRes("Qdghd", 0x04));
J3DModelData* model_data = (J3DModelData*)(dComIfG_getObjectRes("Qdghd", QDGHD_BDL_QDGHD));
JUT_ASSERT(0xA0, model_data != 0);
mpModel = mDoExt_J3DModel__create(model_data, 0x00, 0x11020203);
if (!mpModel)
@@ -67,7 +68,7 @@ BOOL daObjDragonhead_c::CreateHeap() {
mDoMtx_copy(mDoMtx_stack_c::get(), mtx);
mpBgW = new dBgW();
if (!mpBgW || mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("Qdghd", 0x07), cBgW::MOVE_BG_e, &mtx))
if (!mpBgW || mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("Qdghd", QDGHD_DZB_QDGHD), cBgW::MOVE_BG_e, &mtx))
ret = 0;
if (ret != 1)
src/d/actor/d_a_obj_gaship2.cpp
+3 -2
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_gaship2.h"
#include "d/res/res_yakerom.h"
#include "SSystem/SComponent/c_bg_w.h"
#include "d/d_com_inf_game.h"
#include "d/d_bg_s_movebg_actor.h"
@@ -22,12 +23,12 @@ bool daObjGaship2::Act_c::create_heap() {
J3DModelData *mdl_data;
cBgD_t *bgw_data;
mdl_data = (J3DModelData *) (dComIfG_getObjectRes(M_arcname, 4));
mdl_data = (J3DModelData *) (dComIfG_getObjectRes(M_arcname, YAKEROM_BDL_YAKEROM));
JUT_ASSERT(0x5A, mdl_data != 0);
mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11000002);
set_mtx();
bgw_data = (cBgD_t *) (dComIfG_getObjectRes(M_arcname, 7));
bgw_data = (cBgD_t *) (dComIfG_getObjectRes(M_arcname, YAKEROM_DZB_YAKEROM));
JUT_ASSERT(0x67, bgw_data != 0);
if (bgw_data != NULL) {
mpBgW = new dBgW();
src/d/actor/d_a_obj_gong.cpp
+3 -2
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_gong.h"
#include "d/res/res_vdora.h"
#include "f_op/f_op_actor_mng.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "d/d_a_obj.h"
@@ -38,8 +39,8 @@ BOOL daObjGong::Act_c::solidHeapCB(fopAc_ac_c* i_this) {
/* 0000009C-0000028C .text create_heap__Q29daObjGong5Act_cFv */
bool daObjGong::Act_c::create_heap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, 0x04));
J3DAnmTransformKey* bck = static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes(M_arcname, 0x07));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, VDORA_INDEX_BDL_VDORA));
J3DAnmTransformKey* bck = static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes(M_arcname, VDORA_INDEX_BCK_05_VDORA_CUT02_HIT));
JUT_ASSERT(0xbd, (modelData != 0) && (bck != 0));
mpMorf = new mDoExt_McaMorf(
src/d/actor/d_a_obj_hole.cpp
+2 -1
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_hole.h"
#include "d/res/res_aana.h"
#include "d/d_bg_s_lin_chk.h"
#include "d/d_bg_s_acch.h"
#include "d/d_com_inf_game.h"
@@ -222,7 +223,7 @@ void daObj_Hole_c::createInit() {
/* 00000864-00000928 .text _createHeap__12daObj_Hole_cFv */
BOOL daObj_Hole_c::_createHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, 3);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, AANA_BDL_AANA);
JUT_ASSERT(0x13D, modelData != 0);
src/d/actor/d_a_obj_mknjd.cpp
+5 -9
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_mknjd.h"
#include "d/res/res_mknjd.h"
#include "f_op/f_op_actor_mng.h"
#include "f_pc/f_pc_manager.h"
#include "f_op/f_op_msg.h"
@@ -37,11 +38,6 @@
#define ACT_LESSON 7
#define ACT_TACT 8
#define ID_EARTH_MDL 4
#define ID_BREAK_MDL 5
#define ID_WIND_MDL 6
#define ID_COL_DZB 9
static const char* daObjMknjD_jointName[] = {
"Hahen1",
"Hahen2",
@@ -171,14 +167,14 @@ s16 daObjMknjD::Act_c::XyEventCB(int) {
int daObjMknjD::Act_c::CreateHeap() {
const void* temp_r26; // Fakematch to get it to use the same register for model_data_d and jntName
if (m043E == true) {
temp_r26 = dComIfG_getObjectRes(M_arcname, ID_WIND_MDL);
temp_r26 = dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJK);
}
else {
temp_r26 = dComIfG_getObjectRes(M_arcname, ID_EARTH_MDL);
temp_r26 = dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJD);
}
J3DModelData* model_data_d = (J3DModelData*)temp_r26;
J3DModelData* model_data_h = (J3DModelData*)dComIfG_getObjectRes(M_arcname, ID_BREAK_MDL);
J3DModelData* model_data_h = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJH);
JUT_ASSERT(0x123, model_data_d != 0)
JUT_ASSERT(0x124, model_data_h != 0)
@@ -313,7 +309,7 @@ s32 daObjMknjD::Act_c::Mthd_Create() {
else {
phase_state = dComIfG_resLoad(&mPhs, M_arcname);
if (phase_state == cPhs_COMPLEATE_e) {
phase_state = MoveBGCreate(M_arcname, ID_COL_DZB, NULL, 0x65A0);
phase_state = MoveBGCreate(M_arcname, MKNJD_DZB_MKNJD, NULL, 0x65A0);
JUT_ASSERT(0x1CA, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e))
}
src/d/actor/d_a_obj_monument.cpp
+3 -2
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_monument.h"
#include "d/res/res_esekh.h"
#include "f_op/f_op_actor_mng.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "d/d_a_obj.h"
@@ -16,8 +17,8 @@
namespace daObjMonument {
namespace {
static Attr_c L_attr[2] = {
{ 0x04, 0x08 },
{ 0x05, 0x09 },
{ ESEKH_BDL_ESEKH, ESEKH_DZB_ESEKH },
{ ESEKH_BDL_ESEKH2, ESEKH_DZB_ESEKH2 },
};
inline const Attr_c & attr(Type_e type) { return L_attr[type]; }
src/d/actor/d_a_obj_paper.cpp
+45 -5
View File
@@ -4,6 +4,9 @@
//
#include "d/actor/d_a_obj_paper.h"
#include "d/res/res_opaper.h"
#include "d/res/res_ppos.h"
#include "d/res/res_piwa.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
@@ -34,19 +37,56 @@ namespace daObjPaper {
/* 0x0A */ s16 mAttentionOffset;
/* 0x0C */ s16 mCullSphereRadius;
/* 0x0E */ s16 mCullSphereYOffset;
/* 0x10 */ s8 mAttentionDist1;
/* 0x11 */ s8 mAttentionDist2;
/* 0x12 */ u8 mTevType;
/* 0x14 */ s16 mColCylinderRadius;
/* 0x16 */ s16 mColCylinderHeight;
};
static const Attr_c L_attr[3] = {
{ "Opaper", 0x04C0, 3, 0x00, 0x28, 0x28, 0x00, 0x1D, 0x1E, 0x01, 0x00, 0x00 },
{ "Ppos", 0x04C0, 3, 0x00, 0x32, 0x3C, 0x00, 0x1F, 0x20, 0x00, 0x00, 0x00 },
{ "Piwa", 0x04C0, 3, 0x3C, 0x82, 0x50, 0x3C, 0x1D, 0x1E, 0x00, 0x37, 0x73 }
{
/* mResName */ "Opaper",
/* mHeapSize */ 0x04C0,
/* mModelId */ OPAPER_BDL_OPAPER,
/* mEyeOffset */ 0x00,
/* mAttentionOffset */ 0x28,
/* mCullSphereRadius */ 0x28,
/* mCullSphereYOffset */ 0x00,
/* mAttentionDist1 */ 0x1D,
/* mAttentionDist2 */ 0x1E,
/* mTevType */ 0x01,
/* mColCylinderRadius */ 0x00,
/* mColCylinderHeight */ 0x00,
},
{
/* mResName */ "Ppos",
/* mHeapSize */ 0x04C0,
/* mModelId */ PPOS_BDL_PPOS,
/* mEyeOffset */ 0x00,
/* mAttentionOffset */ 0x32,
/* mCullSphereRadius */ 0x3C,
/* mCullSphereYOffset */ 0x00,
/* mAttentionDist1 */ 0x1F,
/* mAttentionDist2 */ 0x20,
/* mTevType */ 0x00,
/* mColCylinderRadius */ 0x00,
/* mColCylinderHeight */ 0x00,
},
{
/* mResName */ "Piwa",
/* mHeapSize */ 0x04C0,
/* mModelId */ PIWA_BDL_PIWA,
/* mEyeOffset */ 0x3C,
/* mAttentionOffset */ 0x82,
/* mCullSphereRadius */ 0x50,
/* mCullSphereYOffset */ 0x3C,
/* mAttentionDist1 */ 0x1D,
/* mAttentionDist2 */ 0x1E,
/* mTevType */ 0x00,
/* mColCylinderRadius */ 0x37,
/* mColCylinderHeight */ 0x73,
}
};
inline const Attr_c & attr(Type_e type) { return L_attr[type]; }
src/d/actor/d_a_obj_pbco.cpp
+4 -3
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_pbco.h"
#include "d/res/res_pbco.h"
#include "d/d_com_inf_game.h"
#include "d/d_item.h"
#include "d/d_procname.h"
@@ -34,16 +35,16 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) {
BOOL daObj_Pbco_c::CreateHeap() {
J3DModelData* modelData;
if (dComIfGs_isEventBit(0x0a02) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) {
modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, 0x04));
modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBCO));
} else {
modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, 0x05));
modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBC2));
}
JUT_ASSERT(0xa9, modelData != 0);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (dComIfGs_isEventBit(0x0a02) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) {
mpBgW = NULL;
} else {
mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, 0x08), cBgW::MOVE_BG_e,
mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, PBCO_INDEX_DZB_PBCO), cBgW::MOVE_BG_e,
&mpModel->getBaseTRMtx());
if (mpBgW == NULL) {
return FALSE;
src/d/actor/d_a_obj_pbka.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
*/
#include "d/actor/d_a_obj_pbka.h"
#include "d/res/res_pbka.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_mtx.h"
@@ -16,7 +17,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-0000015C .text CreateHeap__11daObjPbka_cFv */
BOOL daObjPbka_c::CreateHeap() {
J3DModelData *modelData = (J3DModelData *)dComIfG_getObjectRes("Pbka", 3);
J3DModelData *modelData = (J3DModelData *)dComIfG_getObjectRes("Pbka", PBKA_BDL_PBKA);
JUT_ASSERT(0x51, modelData != 0);
mpModel = mDoExt_J3DModel__create(modelData,0,0x11020203);
if(mpModel == NULL) {
src/d/actor/d_a_obj_roten.cpp
+7 -6
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_roten.h"
#include "d/res/res_roten.h"
#include "m_Do/m_Do_mtx.h"
#include "d/d_com_inf_game.h"
#include "d/d_bg_s_movebg_actor.h"
@@ -35,14 +36,14 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 000001A8-000002E4 .text CreateHeap__13daObj_Roten_cFv */
BOOL daObj_Roten_c::CreateHeap() {
static u32 bdl_arc_idx[] = {
0x04,
0x05,
0x06
ROTEN_BDL_ROTEN02,
ROTEN_BDL_ROTEN03,
ROTEN_BDL_ROTEN04
};
static u32 dzb_arc_idx[] = {
0x09,
0x0A,
0x0B
ROTEN_DZB_ROTEN02,
ROTEN_DZB_ROTEN03,
ROTEN_DZB_ROTEN04
};
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, bdl_arc_idx[mType]));
src/d/actor/d_a_obj_toripost.cpp
+3 -3
View File
@@ -571,9 +571,9 @@ void daObjTpost_c::setAttention() {
/* 00000EA4-0000100C .text setAnm__12daObjTpost_cFScb */
void daObjTpost_c::setAnm(s8 param_1, bool param_2) {
static const int a_anm_bcks_tbl[] = {
0x04,
0x05,
0x06,
TORIPOST_BCK_POST_GET,
TORIPOST_BCK_POST_PUTOUT,
TORIPOST_BCK_POST_WAIT,
};
static const dLib_anm_prm_c a_anm_prm_tbl[] = {
{
src/d/actor/d_a_obj_tower.cpp
+3 -2
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_tower.h"
#include "d/res/res_x_tower.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "dolphin/mtx/mtx.h"
@@ -17,7 +18,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-0000020C .text CreateHeap__12daObjTower_cFv */
BOOL daObjTower_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("X_tower", 4);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("X_tower", X_TOWER_BDL_X_TOWER);
JUT_ASSERT(0x56, modelData != 0);
@@ -36,7 +37,7 @@ BOOL daObjTower_c::CreateHeap() {
if (mpBgW == NULL)
return FALSE;
cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("X_tower", 7);
cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("X_tower", X_TOWER_DZB_X_TOWER);
return mpBgW->Set(pData, cBgW::MOVE_BG_e, &mMtx) ? FALSE : TRUE;
}
src/d/actor/d_a_obj_vfan.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ s32 daObjVfan::Act_c::Mthd_Create() {
} else {
phase_state = dComIfG_resLoad(&mPhs, M_arcname);
if (phase_state == cPhs_COMPLEATE_e) {
phase_state = MoveBGCreate(M_arcname, 7, NULL, 0xa60);
phase_state = MoveBGCreate(M_arcname, VFAN_DZB_V_FAN_00, NULL, 0xa60);
JUT_ASSERT(0xc6, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e));
}
src/d/actor/d_a_obj_zouK.cpp
+5 -4
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_zouK.h"
#include "d/res/res_vzouk.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera.h"
#include "d/d_com_inf_game.h"
@@ -65,9 +66,9 @@ BOOL daObjZouk::Act_c::solidHeapCB(fopAc_ac_c* i_this) {
/* 0000009C-00000468 .text create_heap__Q29daObjZouk5Act_cFv */
bool daObjZouk::Act_c::create_heap() {
J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, 0x08);
J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_BDL_VZOUK);
JUT_ASSERT(0x171, mdl_data != 0);
M_bck_data = (J3DAnmTransformKey*)dComIfG_getObjectRes(M_arcname, 0x05);
M_bck_data = (J3DAnmTransformKey*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_BCK_VZOUK);
JUT_ASSERT(0x175, M_bck_data != 0);
if (mdl_data != NULL && M_bck_data != NULL) {
M_anm = new mDoExt_McaMorf(
@@ -92,7 +93,7 @@ bool daObjZouk::Act_c::create_heap() {
}
set_mtx();
cBgD_t* bgw_data_before = (cBgD_t*)dComIfG_getObjectRes(M_arcname, 0x0B);
cBgD_t* bgw_data_before = (cBgD_t*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_DZB_MAEKISI);
JUT_ASSERT(0x196, bgw_data_before != 0);
if (bgw_data_before != NULL) {
mBgBefore = new dBgW();
@@ -102,7 +103,7 @@ bool daObjZouk::Act_c::create_heap() {
}
}
cBgD_t* bgw_data_after = (cBgD_t*)dComIfG_getObjectRes(M_arcname, 0x0C);
cBgD_t* bgw_data_after = (cBgD_t*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_DZB_ATOKISI);
JUT_ASSERT(0x1a4, bgw_data_after != 0);
if (bgw_data_after != NULL) {
mBgAfter = new dBgW();
src/d/d_item_data.cpp
+444 -339
View File
File diff suppressed because it is too large Load Diff