mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-17 12:39:27 -04:00
Merge branch 'main' into pjb-audio
This commit is contained in:
PJB3005
@@ -379,7 +379,7 @@ int daAlink_c::procBottleDrinkInit(u16 i_itemNo) {
|
||||
mProcVar0.field_0x3008 = 0;
|
||||
|
||||
u32 id = fopAcM_GetID(this);
|
||||
dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0);
|
||||
dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, nullptr);
|
||||
mProcVar2.field_0x300c = 0;
|
||||
mProcVar3.field_0x300e = 0;
|
||||
return 1;
|
||||
@@ -429,7 +429,7 @@ int daAlink_c::procBottleOpenInit(u16 i_itemNo) {
|
||||
|
||||
mProcVar3.field_0x300e = 0;
|
||||
|
||||
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", 1, &field_0x3194, 0);
|
||||
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", 1, &field_0x3194, nullptr);
|
||||
mProcVar2.field_0x300c = 0;
|
||||
|
||||
field_0x27c8.initialize(current.pos.y + mHeight);
|
||||
@@ -738,7 +738,7 @@ int daAlink_c::procBottleGetInit(BOOL param_0) {
|
||||
}
|
||||
|
||||
u32 id = fopAcM_GetID(this);
|
||||
dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0);
|
||||
dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, nullptr);
|
||||
|
||||
if (mEquipItem == dItemNo_FAIRY_DROP_e || mEquipItem == dItemNo_CHUCHU_RARE_e || mEquipItem == dItemNo_WORM_e) {
|
||||
setFaceBasicTexture(FTANM_I_BINGET);
|
||||
|
||||
@@ -1575,7 +1575,7 @@ int daAlink_c::procCanoeBottleDrinkInit(u16 i_itemNo) {
|
||||
dComIfGp_setPlayerStatus1(0, 0x2000);
|
||||
|
||||
field_0x319c = 1;
|
||||
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", 1, &field_0x319c, 0);
|
||||
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", 1, &field_0x319c, nullptr);
|
||||
mProcVar2.field_0x300c = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -1982,7 +1982,7 @@ int daAlink_c::procCoLavaReturnInit(BOOL i_isSandReturn) {
|
||||
mNormalSpeed = 0.0f;
|
||||
field_0x3194 = 1;
|
||||
|
||||
dCam_getBody()->StartEventCamera(9, fopAcM_GetID(this), "Type", 1, &field_0x3194, 0);
|
||||
dCam_getBody()->StartEventCamera(9, fopAcM_GetID(this), "Type", 1, &field_0x3194, nullptr);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -2040,7 +2040,7 @@ int daAlink_c::procCoSwimFreezeReturnInit() {
|
||||
field_0x3194 = 1;
|
||||
|
||||
u32 id = fopAcM_GetID(this);
|
||||
dCam_getBody()->StartEventCamera(9, id, "Type", 1, &field_0x3194, 0);
|
||||
dCam_getBody()->StartEventCamera(9, id, "Type", 1, &field_0x3194, nullptr);
|
||||
mProcVar2.field_0x300c = 0x2D;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -3019,7 +3019,7 @@ int daAlink_c::procCoDead() {
|
||||
if (!checkNoResetFlg2(FLG2_FORCE_GAMEOVER)) {
|
||||
mProcVar3.field_0x300e++;
|
||||
if (mProcVar3.field_0x300e == 2) {
|
||||
dCam_getBody()->StartEventCamera(9, fopAcM_GetID(this), 0);
|
||||
dCam_getBody()->StartEventCamera(9, fopAcM_GetID(this), nullptr);
|
||||
} else if (mProcVar3.field_0x300e > 10) {
|
||||
mProcVar3.field_0x300e = 10;
|
||||
}
|
||||
@@ -3330,7 +3330,7 @@ int daAlink_c::procCoFogDeadInit() {
|
||||
|
||||
field_0x3194 = 0;
|
||||
|
||||
dCam_getBody()->StartEventCamera(0x13, fopAcM_GetID(this), "Type", 1, &field_0x3194, 0);
|
||||
dCam_getBody()->StartEventCamera(0x13, fopAcM_GetID(this), "Type", 1, &field_0x3194, nullptr);
|
||||
mProcVar0.field_0x3008 = 60;
|
||||
mProcVar2.field_0x300c = 0;
|
||||
return 1;
|
||||
@@ -3849,7 +3849,7 @@ int daAlink_c::procNotUseItemInit(int i_itemNo) {
|
||||
current.angle.y = shape_angle.y;
|
||||
field_0x3194 = 3;
|
||||
|
||||
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", 1, &field_0x3194, 0);
|
||||
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", 1, &field_0x3194, nullptr);
|
||||
keepItemData();
|
||||
dComIfGp_setPlayerStatus1(0, 0x4000800);
|
||||
|
||||
|
||||
@@ -2570,7 +2570,7 @@ int daAlink_c::procHorseBottleDrinkInit(u16 i_itemNo) {
|
||||
dComIfGp_setPlayerStatus1(0, 0x2000);
|
||||
|
||||
field_0x319c = 1;
|
||||
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", 1, &field_0x319c, 0);
|
||||
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", 1, &field_0x319c, nullptr);
|
||||
mProcVar2.field_0x300c = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -256,7 +256,7 @@ void daAlink_c::commonKandelaarPourInit() {
|
||||
mProcVar2.field_0x300c = 0;
|
||||
dComIfGp_setPlayerStatus1(0, 0x2000);
|
||||
field_0x3194 = 10;
|
||||
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", 1, &field_0x3194, 0);
|
||||
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", 1, &field_0x3194, nullptr);
|
||||
}
|
||||
|
||||
int daAlink_c::commonKandelaarPour(int param_0) {
|
||||
|
||||
@@ -43,6 +43,7 @@ void daAlink_c::setOriginalHeap(JKRExpHeap** i_ppheap, u32 i_size) {
|
||||
JKRHeap* parent = mDoExt_getGameHeap();
|
||||
|
||||
JKRExpHeap* heap = JKRExpHeap::create(size + (var_r29 + var_r28), parent, true);
|
||||
JKRHEAP_NAME(heap, "Alink original");
|
||||
*i_ppheap = heap;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -145,7 +145,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s
|
||||
mProcVar2.field_0x300c = param_0;
|
||||
mProcVar3.field_0x300e = param_1;
|
||||
|
||||
dCam_getBody()->StartEventCamera(12, fopAcM_GetID(this), 0);
|
||||
dCam_getBody()->StartEventCamera(12, fopAcM_GetID(this), nullptr);
|
||||
mProcVar0.field_0x3008 = 0;
|
||||
mProcVar4.field_0x3010 = 0;
|
||||
mProcVar5.field_0x3012 = 0;
|
||||
|
||||
@@ -3967,7 +3967,7 @@ int daAlink_c::procWolfHowlDemoInit() {
|
||||
}
|
||||
}
|
||||
|
||||
dCam_getBody()->StartEventCamera(12, fopAcM_GetID(this), 0);
|
||||
dCam_getBody()->StartEventCamera(12, fopAcM_GetID(this), nullptr);
|
||||
mProcVar1.field_0x300a = 0;
|
||||
mMsgClassID = fpcM_ERROR_PROCESS_ID_e;
|
||||
field_0x32cc = 0x5DD;
|
||||
@@ -9206,7 +9206,7 @@ int daAlink_c::procWolfDigThroughInit(int param_0) {
|
||||
field_0x3198 = 3;
|
||||
}
|
||||
|
||||
dCam_getBody()->StartEventCamera(0x1E, fopAcM_GetID(this), "Type", 1, &field_0x3198, 0);
|
||||
dCam_getBody()->StartEventCamera(0x1E, fopAcM_GetID(this), "Type", 1, &field_0x3198, nullptr);
|
||||
|
||||
cXyz sp8(current.pos.x, 30.0f + field_0x27f4->current.pos.y, current.pos.z);
|
||||
if (fopAcM_gc_c::gndCheck(&sp8)) {
|
||||
@@ -9413,7 +9413,7 @@ int daAlink_c::procWolfGetSmell() {
|
||||
|
||||
mProcVar4.field_0x3010 = 1;
|
||||
|
||||
dCam_getBody()->StartEventCamera(8, fopAcM_GetID(this), 0);
|
||||
dCam_getBody()->StartEventCamera(8, fopAcM_GetID(this), nullptr);
|
||||
field_0x2f99 = 12;
|
||||
|
||||
if (field_0x3198 == 0xBBC) {
|
||||
|
||||
@@ -3323,6 +3323,9 @@ void daB_GG_c::DeathCam() {
|
||||
|
||||
void daB_GG_c::GroundAction() {
|
||||
s16 var_r30 = 0;
|
||||
#if AVOID_UB
|
||||
var_r30 = 1;
|
||||
#endif
|
||||
|
||||
switch (mSubAction) {
|
||||
case SUBACT_MOVE:
|
||||
|
||||
@@ -338,6 +338,10 @@ static s16 s_TargetAngle;
|
||||
void daE_PM_c::SearchFarP() {
|
||||
//! @bug best_distance is not initialized
|
||||
f32 best_distance;
|
||||
#if AVOID_UB
|
||||
best_distance = 0.0f;
|
||||
#endif
|
||||
|
||||
int best_index;
|
||||
dPnt* pnt = dPath_GetPnt(mpPath, 0);
|
||||
Vec pos;
|
||||
@@ -2652,6 +2656,11 @@ void daE_PM_c::setGakkiBaseMtx() {
|
||||
|
||||
void daE_PM_c::setLampBaseMtx() {
|
||||
cXyz vec1, vec2;
|
||||
#if AVOID_UB
|
||||
vec1.set(0, 0, 0);
|
||||
vec2.set(0, 0, 0);
|
||||
#endif
|
||||
|
||||
MTXCopy(mpMorf->getModel()->getAnmMtx(JNT_HAND_R), *calc_mtx);
|
||||
cXyz vec3(0.0f, -30.0f, -5.0f);
|
||||
//! @bug vec1 is not initialized in its first two uses, which are probably supposed to be vec3
|
||||
|
||||
@@ -577,7 +577,7 @@ void daNpcTkc_c::reset() {
|
||||
setAngle(fopAcM_searchPlayerAngleY(this));
|
||||
|
||||
static int const m_cameraItemNum = 1;
|
||||
dCam_getBody()->StartEventCamera(18, fopAcM_GetID(this), "Type", 1, &m_cameraItemNum, 0);
|
||||
dCam_getBody()->StartEventCamera(18, fopAcM_GetID(this), "Type", 1, &m_cameraItemNum, nullptr);
|
||||
} else if (parentActorID == fpcM_ERROR_PROCESS_ID_e) {
|
||||
home.pos.y += mpHIO->m.target_height;
|
||||
} else {
|
||||
|
||||
@@ -588,9 +588,11 @@ static void cut_control2(obj_brg_class* i_this, br_s* i_part) {
|
||||
}
|
||||
|
||||
static void himo_cut_control1(obj_brg_class* i_this, cXyz* param_1, f32 param_2) {
|
||||
cXyz sp74;
|
||||
cXyz sp80;
|
||||
cXyz sp8C;
|
||||
STUB_RET();
|
||||
|
||||
cXyz sp74 = {};
|
||||
cXyz sp80 = {};
|
||||
cXyz sp8C = {};
|
||||
|
||||
sp74.x = 0.0f;
|
||||
sp74.y = 0.0f;
|
||||
@@ -602,7 +604,7 @@ static void himo_cut_control1(obj_brg_class* i_this, cXyz* param_1, f32 param_2)
|
||||
sp74.y = 0.0f;
|
||||
sp74.z = param_2;
|
||||
|
||||
int i, temp_r27 = (intptr_t) ++param_1;
|
||||
intptr_t i, temp_r27 = (intptr_t) ++param_1;
|
||||
f32 var_f31, var_f30, var_f29, var_f28, var_f27;
|
||||
for (i = 1; i < 5; i++, param_1++) {
|
||||
var_f28 = i_this->field_0xaf30 * cM_ssin( (i_this->field_0xaf20 * 6000) + (NREG_S(3) - 10000) * (temp_r27 + i) )
|
||||
|
||||
@@ -164,7 +164,7 @@ int daObjTks_c::Create() {
|
||||
field_0xde1 = 1;
|
||||
|
||||
static const int m_cameraItemNum = 1;
|
||||
dCam_getBody()->StartEventCamera(18, fopAcM_GetID(this), "Type", 1, &m_cameraItemNum, 0);
|
||||
dCam_getBody()->StartEventCamera(18, fopAcM_GetID(this), "Type", 1, &m_cameraItemNum, nullptr);
|
||||
}
|
||||
|
||||
return phase_state;
|
||||
|
||||
+154
-113
@@ -7,131 +7,160 @@
|
||||
#include "d/actor/d_a_obj_wflag.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
#include "d/actor/d_a_e_wb.h"
|
||||
#include "d/d_s_play.h"
|
||||
|
||||
static int daObj_Wflag_Draw(obj_wflag_class* i_this) {
|
||||
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
|
||||
mDoExt_modelUpdateDL(i_this->mpModel);
|
||||
J3DModel* morfModel = i_this->mMorf->getModel();
|
||||
g_env_light.setLightTevColorType_MAJI(morfModel, &i_this->tevStr);
|
||||
i_this->field_0x578->entry(morfModel->getModelData());
|
||||
i_this->field_0x57c->entry(morfModel->getModelData());
|
||||
i_this->mMorf->entryDL();
|
||||
fopAc_ac_c* actor = &i_this->actor;
|
||||
g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(i_this->pillar_model, &actor->tevStr);
|
||||
mDoExt_modelUpdateDL(i_this->pillar_model);
|
||||
|
||||
J3DModel* morfModel = i_this->anm_p->getModel();
|
||||
g_env_light.setLightTevColorType_MAJI(morfModel, &actor->tevStr);
|
||||
|
||||
i_this->kolin_btk->entry(morfModel->getModelData());
|
||||
i_this->kolin_btp->entry(morfModel->getModelData());
|
||||
i_this->anm_p->entryDL();
|
||||
|
||||
for (int i = 0; i < 1; i++) {
|
||||
wf_tail_s* tail = &i_this->mTails[i];
|
||||
wf_tail_s* tail = &i_this->tail_s[i];
|
||||
for (int j = 0; j < 19; j++) {
|
||||
g_env_light.setLightTevColorType_MAJI(tail->mModels[j], &i_this->tevStr);
|
||||
mDoExt_modelUpdateDL(tail->mModels[j]);
|
||||
g_env_light.setLightTevColorType_MAJI(tail->model[j], &actor->tevStr);
|
||||
mDoExt_modelUpdateDL(tail->model[j]);
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void tail_control(fopAc_ac_c* param_1, wf_tail_s* param_2) {
|
||||
static f32 pd[19] = {1.0f, 0.9f, 0.8f, 0.7f, 0.6f, 0.5f, 0.4f, 0.3f, 0.2f, 0.2f,
|
||||
0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f};
|
||||
static void tail_control(fopAc_ac_c* i_this, wf_tail_s* i_tail) {
|
||||
static f32 pd[19] = {
|
||||
1.0f, 0.9f, 0.8f, 0.7f, 0.6f, 0.5f, 0.4f, 0.3f, 0.2f, 0.2f,
|
||||
0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f,
|
||||
};
|
||||
|
||||
cXyz sp4C;
|
||||
cXyz sp40;
|
||||
cXyz sp34;
|
||||
|
||||
cXyz local_74;
|
||||
cXyz cStack_80;
|
||||
int i;
|
||||
cXyz* ptr;
|
||||
f32 dVar11;
|
||||
cXyz local_98;
|
||||
cXyz local_a4;
|
||||
f32 dVar9;
|
||||
f32 dVar14;
|
||||
f32 dVar13;
|
||||
cXyz* pPos;
|
||||
f32 var_f27;
|
||||
f32 var_f28;
|
||||
f32 var_f31;
|
||||
f32 var_f30;
|
||||
f32 speed;
|
||||
csXyz* pAngle;
|
||||
|
||||
ptr = ¶m_2->field_0x004[1];
|
||||
pAngle = ¶m_2->field_0x0f4[1];
|
||||
dVar11 = -20.0f;
|
||||
cMtx_YrotS(*calc_mtx, param_1->current.angle.y);
|
||||
local_74.x = 0.0f;
|
||||
local_74.y = 0.0f;
|
||||
local_74.z = -(20.0f + param_1->speedF * 10.0f);
|
||||
MtxPosition(&local_74, &local_98);
|
||||
speed = param_1->speedF * 2.0f;
|
||||
local_74.x = 0.0f;
|
||||
local_74.y = 0.0f;
|
||||
local_74.z = 20.0f;
|
||||
for (i = 1; i < 20; i++, ptr++, pAngle++) {
|
||||
local_a4.x =
|
||||
local_98.x * pd[i - 1];
|
||||
local_a4.z =
|
||||
local_98.z * pd[i - 1];
|
||||
local_a4.x += (speed * cM_ssin(param_2->field_0x000 * 5400 + i * (-3700))) * 0.3f;
|
||||
local_a4.z += (speed * cM_ssin(param_2->field_0x000 * 5700 + i * (-4200))) * 0.3f;
|
||||
local_a4.y = speed * cM_ssin(param_2->field_0x000 * 4200 + i * (-2400));
|
||||
dVar9 = local_a4.x + (ptr->x - ptr[-1].x);
|
||||
dVar14 = local_a4.y + (dVar11 + (ptr[0].y - ptr[-1].y));
|
||||
dVar13 = local_a4.z + (ptr->z - ptr[-1].z);
|
||||
s16 xRot = -cM_atan2s(dVar14, dVar13);
|
||||
s32 yRot = cM_atan2s(dVar9, JMAFastSqrt(dVar14 * dVar14 + dVar13 * dVar13));
|
||||
pPos = &i_tail->pos[1];
|
||||
pAngle = &i_tail->rot[1];
|
||||
var_f27 = NREG_F(2) + -20.0f;
|
||||
|
||||
cXyz sp28;
|
||||
cXyz sp1C;
|
||||
cMtx_YrotS(*calc_mtx, i_this->current.angle.y);
|
||||
sp4C.x = 0.0f;
|
||||
sp4C.y = 0.0f;
|
||||
sp4C.z = -(NREG_F(3) + 20.0f + i_this->speedF * 10.0f);
|
||||
MtxPosition(&sp4C, &sp28);
|
||||
|
||||
speed = i_this->speedF * (NREG_F(7) + 2.0f);
|
||||
sp4C.x = 0.0f;
|
||||
sp4C.y = 0.0f;
|
||||
sp4C.z = NREG_F(0) + 20.0f;
|
||||
|
||||
for (i = 1; i < 20; i++, pPos++, pAngle++) {
|
||||
sp1C.x = sp28.x * pd[i - 1];
|
||||
sp1C.z = sp28.z * pd[i - 1];
|
||||
|
||||
sp1C.x += (speed * cM_ssin(i_tail->field_0x0 * (XREG_S(6) + 5400) + i * (XREG_S(7) + -3700))) * 0.3f;
|
||||
sp1C.z += (speed * cM_ssin(i_tail->field_0x0 * (XREG_S(6) + 5700) + i * (XREG_S(7) + -4200))) * 0.3f;
|
||||
sp1C.y = speed * cM_ssin(i_tail->field_0x0 * (XREG_S(6) + 4200) + i * (XREG_S(7) + -2400));
|
||||
|
||||
var_f28 = sp1C.x + (pPos->x - pPos[-1].x);
|
||||
var_f31 = sp1C.y + (var_f27 + (pPos[0].y - pPos[-1].y));
|
||||
var_f30 = sp1C.z + (pPos->z - pPos[-1].z);
|
||||
|
||||
s16 xRot = -cM_atan2s(var_f31, var_f30);
|
||||
s16 yRot = (s16)cM_atan2s(var_f28, JMAFastSqrt(SQUARE(var_f31) + SQUARE(var_f30)));
|
||||
cMtx_XrotS(*calc_mtx, xRot);
|
||||
cMtx_YrotM(*calc_mtx, yRot);
|
||||
MtxPosition(&local_74, &cStack_80);
|
||||
pAngle[-1].x = xRot;
|
||||
pAngle[-1].y = yRot;
|
||||
*ptr = ptr[-1] + cStack_80;
|
||||
MtxPosition(&sp4C, &sp40);
|
||||
|
||||
pAngle[-1].x = (s16)xRot;
|
||||
pAngle[-1].y = (s16)yRot;
|
||||
*pPos = pPos[-1] + sp40;
|
||||
}
|
||||
}
|
||||
|
||||
static void tail_mtxset(wf_tail_s* i_tail) {
|
||||
for (int i = 0; i < 19; i++) {
|
||||
MtxTrans(i_tail->field_0x004[i].x, i_tail->field_0x004[i].y, i_tail->field_0x004[i].z, 0);
|
||||
cMtx_XrotM(*calc_mtx, i_tail->field_0x0f4[i].x);
|
||||
cMtx_YrotM(*calc_mtx, i_tail->field_0x0f4[i].y);
|
||||
MtxTrans(i_tail->pos[i].x, i_tail->pos[i].y, i_tail->pos[i].z, 0);
|
||||
cMtx_XrotM(*calc_mtx, i_tail->rot[i].x);
|
||||
cMtx_YrotM(*calc_mtx, i_tail->rot[i].y);
|
||||
cMtx_XrotM(*calc_mtx, -0x8000);
|
||||
cMtx_ZrotM(*calc_mtx, i * 0x2734);
|
||||
i_tail->mModels[i]->setBaseTRMtx(*calc_mtx);
|
||||
i_tail->model[i]->setBaseTRMtx(*calc_mtx);
|
||||
}
|
||||
}
|
||||
|
||||
static int daObj_Wflag_Execute(obj_wflag_class* i_this) {
|
||||
cXyz cStack_3c;
|
||||
i_this->field_0x836++;
|
||||
fopAc_ac_c* actor = &i_this->actor;
|
||||
cXyz sp14;
|
||||
|
||||
i_this->counter++;
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
if (i_this->field_0x830[i] != 0) {
|
||||
i_this->field_0x830[i]--;
|
||||
if (i_this->timers[i] != 0) {
|
||||
i_this->timers[i]--;
|
||||
}
|
||||
}
|
||||
if (i_this->field_0x834 != 0) {
|
||||
i_this->field_0x834--;
|
||||
|
||||
if (i_this->unk_timer != 0) {
|
||||
i_this->unk_timer--;
|
||||
}
|
||||
fopAc_ac_c* actor = fopAcM_SearchByID(i_this->parentActorID);
|
||||
if (actor != NULL) {
|
||||
i_this->current.angle.y = actor->shape_angle.y;
|
||||
i_this->speedF = actor->speedF;
|
||||
// TODO: Figure out what the actor class is
|
||||
MTXCopy((*(mDoExt_McaMorfSO**)((char*)actor + 0x5e0))->getModel()->getAnmMtx(16), *calc_mtx);
|
||||
cMtx_XrotM(*calc_mtx, (i_this->speedF * cM_ssin(i_this->field_0x836 * 5400)) * 5.0f);
|
||||
i_this->mpModel->setBaseTRMtx(*calc_mtx);
|
||||
|
||||
fopAc_ac_c* parent = fopAcM_SearchByID(actor->parentActorID);
|
||||
if (parent != NULL) {
|
||||
actor->current.angle.y = parent->shape_angle.y;
|
||||
actor->speedF = parent->speedF;
|
||||
|
||||
J3DModel* model = ((e_wb_class*)parent)->anm_p->getModel();
|
||||
MTXCopy(model->getAnmMtx(YREG_S(3) + 16), *calc_mtx);
|
||||
s16 rotX = (actor->speedF * cM_ssin(i_this->counter * 5400)) * 5.0f;
|
||||
cMtx_XrotM(*calc_mtx, rotX);
|
||||
i_this->pillar_model->setBaseTRMtx(*calc_mtx);
|
||||
} else {
|
||||
mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z);
|
||||
mDoMtx_stack_c::YrotM(i_this->shape_angle.y);
|
||||
i_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
|
||||
mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y, actor->current.pos.z);
|
||||
mDoMtx_stack_c::YrotM((s16)actor->shape_angle.y);
|
||||
i_this->pillar_model->setBaseTRMtx(mDoMtx_stack_c::get());
|
||||
}
|
||||
MTXCopy(i_this->mpModel->getBaseTRMtx(), mDoMtx_stack_c::get());
|
||||
mDoMtx_stack_c::transM(133.0f, 248.0f, 0.0f);
|
||||
mDoMtx_stack_c::YrotM(0x4000);
|
||||
mDoMtx_stack_c::XrotM(2100);
|
||||
mDoMtx_stack_c::ZrotM(0);
|
||||
i_this->mMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
|
||||
i_this->field_0x578->play();
|
||||
i_this->field_0x57c->play();
|
||||
i_this->mMorf->play(NULL, 0, 0);
|
||||
i_this->mMorf->modelCalc();
|
||||
MTXCopy(i_this->mpModel->getBaseTRMtx(), mDoMtx_stack_c::get());
|
||||
|
||||
MTXCopy(i_this->pillar_model->getBaseTRMtx(), mDoMtx_stack_c::get());
|
||||
mDoMtx_stack_c::transM(VREG_F(0) + 133.0f, VREG_F(1) + 248.0f, VREG_F(2) + 0.0f);
|
||||
mDoMtx_stack_c::YrotM(VREG_S(0) + 0x4000);
|
||||
mDoMtx_stack_c::XrotM(VREG_S(1) + 2100);
|
||||
mDoMtx_stack_c::ZrotM((s16)VREG_S(2));
|
||||
|
||||
J3DModel* model = i_this->anm_p->getModel();
|
||||
model->setBaseTRMtx(mDoMtx_stack_c::get());
|
||||
|
||||
i_this->kolin_btk->play();
|
||||
i_this->kolin_btp->play();
|
||||
i_this->anm_p->play(NULL, 0, 0);
|
||||
i_this->anm_p->modelCalc();
|
||||
MTXCopy(i_this->pillar_model->getBaseTRMtx(), mDoMtx_stack_c::get());
|
||||
|
||||
for (int i = 0; i < 1; i++) {
|
||||
wf_tail_s* pTail = &i_this->mTails[i];
|
||||
mDoMtx_stack_c::transM(143.0f, 418.0f, 0.0f);
|
||||
mDoMtx_stack_c::multVecZero(pTail->field_0x004);
|
||||
pTail->field_0x000++;
|
||||
tail_control(i_this, pTail);
|
||||
tail_mtxset(pTail);
|
||||
wf_tail_s* tail = &i_this->tail_s[i];
|
||||
mDoMtx_stack_c::transM(VREG_F(3) + 143.0f, VREG_F(4) + 418.0f, VREG_F(5) + 0.0f);
|
||||
mDoMtx_stack_c::multVecZero(tail->pos);
|
||||
tail->field_0x0++;
|
||||
tail_control(actor, tail);
|
||||
tail_mtxset(tail);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -140,7 +169,9 @@ static int daObj_Wflag_IsDelete(obj_wflag_class* i_this) {
|
||||
}
|
||||
|
||||
static int daObj_Wflag_Delete(obj_wflag_class* i_this) {
|
||||
dComIfG_resDelete(&i_this->mPhaseReq, "Obj_wflag");
|
||||
fopAc_ac_c* actor = &i_this->actor;
|
||||
fpc_ProcID id = fopAcM_GetID(i_this);
|
||||
dComIfG_resDelete(&i_this->phase, "Obj_wflag");
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -148,61 +179,71 @@ static int useHeapInit(fopAc_ac_c* i_actor) {
|
||||
obj_wflag_class* i_this = (obj_wflag_class*)i_actor;
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_wflag", 10);
|
||||
JUT_ASSERT(409, modelData != NULL);
|
||||
i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->mpModel == NULL) {
|
||||
|
||||
i_this->pillar_model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->pillar_model == NULL) {
|
||||
return 0;
|
||||
}
|
||||
i_this->mMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Obj_wflag", 11), NULL, NULL, ( J3DAnmTransform*)dComIfG_getObjectRes("Obj_wflag", 6), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11020284);
|
||||
if (i_this->mMorf == NULL || i_this->mMorf->getModel() == NULL) {
|
||||
|
||||
i_this->anm_p = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Obj_wflag", 11), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Obj_wflag", 6), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11020284);
|
||||
if (i_this->anm_p == NULL || i_this->anm_p->getModel() == NULL) {
|
||||
return 0;
|
||||
}
|
||||
i_this->field_0x578 = JKR_NEW mDoExt_btkAnm();
|
||||
if (i_this->field_0x578 == NULL) {
|
||||
|
||||
i_this->kolin_btk = JKR_NEW mDoExt_btkAnm();
|
||||
if (i_this->kolin_btk == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (i_this->field_0x578->init(i_this->mMorf->getModel()->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Obj_wflag", 14), 1, 2, 1.0f, 0, -1) == 0) {
|
||||
if (i_this->kolin_btk->init(i_this->anm_p->getModel()->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Obj_wflag", 14), 1, 2, 1.0f, 0, -1) == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
i_this->field_0x57c = JKR_NEW mDoExt_btpAnm();
|
||||
if (i_this->field_0x57c == NULL) {
|
||||
i_this->kolin_btp = JKR_NEW mDoExt_btpAnm();
|
||||
if (i_this->kolin_btp == NULL) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
|
||||
if (i_this->field_0x57c->init(i_this->mMorf->getModel()->getModelData(), (J3DAnmTexPattern*)dComIfG_getObjectRes("Obj_wflag", 18), 1, 2, 1.0f, 0, -1) == 0) {
|
||||
if (i_this->kolin_btp->init(i_this->anm_p->getModel()->getModelData(), (J3DAnmTexPattern*)dComIfG_getObjectRes("Obj_wflag", 18), 1, 2, 1.0f, 0, -1) == 0) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
|
||||
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Obj_wflag", 9));
|
||||
JUT_ASSERT(479, modelData != NULL);
|
||||
|
||||
for (int i = 0; i < 1; i++) {
|
||||
for (int j = 0; j < 19; j++) {
|
||||
i_this->mTails[i].mModels[j] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->mTails[i].mModels[j] == NULL) {
|
||||
i_this->tail_s[i].model[j] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->tail_s[i].model[j] == NULL) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int daObj_Wflag_Create(fopAc_ac_c* i_this) {
|
||||
fopAcM_ct(i_this, obj_wflag_class);
|
||||
int rv = dComIfG_resLoad(&((obj_wflag_class*)i_this)->mPhaseReq, "Obj_wflag");
|
||||
static int daObj_Wflag_Create(fopAc_ac_c* actor) {
|
||||
obj_wflag_class* i_this = (obj_wflag_class*)actor;
|
||||
fopAcM_ct(actor, obj_wflag_class);
|
||||
|
||||
int rv = dComIfG_resLoad(&i_this->phase, "Obj_wflag");
|
||||
if (rv == cPhs_COMPLEATE_e) {
|
||||
OS_REPORT("OBJ_WFLAG PARAM %x\n", fopAcM_GetParam(i_this));
|
||||
((obj_wflag_class*)i_this)->field_0x82c = fopAcM_GetParam(i_this);
|
||||
OS_REPORT("OBJ_WFLAG PARAM %x\n", fopAcM_GetParam(actor));
|
||||
i_this->unk_0x82c = fopAcM_GetParam(actor);
|
||||
|
||||
OS_REPORT("OBJ_WFLAG//////////////OBJ_WFLAG SET 1 !!\n");
|
||||
if (fopAcM_entrySolidHeap(i_this, useHeapInit, 0xd700) == 0) {
|
||||
|
||||
if (!fopAcM_entrySolidHeap(actor, useHeapInit, 0xd700)) {
|
||||
OS_REPORT("//////////////OBJ_WFLAG SET NON !!\n");
|
||||
return cPhs_ERROR_e;
|
||||
} else {
|
||||
OS_REPORT("//////////////OBJ_WFLAG SET 2 !!\n");
|
||||
((obj_wflag_class*)i_this)->field_0x836 = cM_rndF(65536.0f);
|
||||
daObj_Wflag_Execute(((obj_wflag_class*)i_this));
|
||||
}
|
||||
|
||||
OS_REPORT("//////////////OBJ_WFLAG SET 2 !!\n");
|
||||
i_this->counter = cM_rndF(65536.0f);
|
||||
daObj_Wflag_Execute(i_this);
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
+28
-48
@@ -34,60 +34,40 @@ static s8* l_loadResPtrnList[3] = {
|
||||
l_loadResPtrn0,
|
||||
};
|
||||
|
||||
static u8 l_faceMotionAnmData[140] = {
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E,
|
||||
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
|
||||
0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1F,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
|
||||
static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = {
|
||||
{-1, 0, 0, 30, 2, 1, 1},
|
||||
{10, 0, 1, 30, 2, 1, 1},
|
||||
{8, 2, 1, 32, 2, 1, 0},
|
||||
{9, 0, 1, 33, 0, 1, 0},
|
||||
{7, 0, 1, 31, 0, 1, 0},
|
||||
};
|
||||
|
||||
static u8 l_motionAnmData[308] = {
|
||||
0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1B,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
|
||||
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
|
||||
0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01,
|
||||
0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1B,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F,
|
||||
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
|
||||
0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
|
||||
0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1B,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
|
||||
0x00, 0x01, 0x00, 0x00,
|
||||
static daNpcT_motionAnmData_c l_motionAnmData[11] = {
|
||||
{20, 2, 1, 27, 0, 1, 1, 0},
|
||||
{17, 2, 1, 27, 0, 1, 1, 0},
|
||||
{18, 2, 1, 27, 0, 1, 1, 0},
|
||||
{21, 2, 1, 27, 0, 1, 1, 0},
|
||||
{16, 2, 1, 27, 0, 1, 1, 0},
|
||||
{15, 2, 1, 27, 0, 1, 1, 0},
|
||||
{19, 0, 1, 27, 0, 1, 1, 0},
|
||||
{13, 0, 1, 27, 0, 1, 1, 0},
|
||||
{14, 2, 1, 27, 0, 1, 1, 0},
|
||||
{12, 0, 1, 27, 0, 1, 1, 0},
|
||||
{11, 0, 1, 27, 0, 1, 1, 0},
|
||||
};
|
||||
|
||||
static u8 l_faceMotionSequenceData[80] = {
|
||||
0x00, 0x01, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x02, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x03, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x04, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = {
|
||||
{1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
};
|
||||
|
||||
static u8 l_motionSequenceData[160] = {
|
||||
0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x01, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x02, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x05, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x06, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x07, 0xFF, 0x00, 0x00, 0x08, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x09, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0A, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x03, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x04, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[40] = {
|
||||
{0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 0}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {10, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
};
|
||||
|
||||
const char* daPeru_c::mCutNameList[3] = {
|
||||
|
||||
@@ -260,6 +260,7 @@ void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType) {
|
||||
|
||||
JKRHeap* tmp;
|
||||
mAnimeHeap = mDoExt_createSolidHeapFromGameToCurrent(&tmp, size, 0x20);
|
||||
JKRHEAP_NAMEF(mAnimeHeap, "Alink anime type %d", i_heapType);
|
||||
|
||||
if (i_heapType == 4) {
|
||||
tmpWork = JKR_NEW_ARRAY(char, size);
|
||||
|
||||
@@ -138,6 +138,7 @@ int daTitle_c::create() {
|
||||
|
||||
m2DHeap = JKRCreateExpHeap(0x8000, mDoExt_getGameHeap(), false);
|
||||
JUT_ASSERT(345, m2DHeap != NULL);
|
||||
JKRHEAP_NAME(m2DHeap, "daTitle_c::m2DHeap");
|
||||
loadWait_init();
|
||||
|
||||
g_daTitHIO.id = mDoHIO_CREATE_CHILD("タイトルロゴ", &g_daTitHIO);
|
||||
|
||||
@@ -510,6 +510,10 @@ dFlower_packet_c::dFlower_packet_c() {
|
||||
}
|
||||
|
||||
m_deleteRoom = &dFlower_packet_c::deleteRoom;
|
||||
|
||||
#if AVOID_UB
|
||||
m_playerSwordTop.set(0, 0, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
void dFlower_packet_c::draw() {
|
||||
|
||||
Reference in New Issue
Block a user