kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Applied some Attr defines

Browse source
This commit is contained in:
dbalatoni13 2024-11-03 23:53:45 +01:00
parent 348cdffb0e
commit c9f46f9418
99 changed files with 15333 additions and 15096 deletions
Download patch file Download diff file Expand all files Collapse all files

179
src/REL/m450Dll/main.c
View file

@ -2873,7 +2873,7 @@ void fn_1_AD58(omObjData *object)
fn_1_9F4C(var_r31, object->model[0], lbl_1_bss_4C, 0x7A);
if (1000.0f > var_r31->unk_00.unk_6C.y) {
var_r31->unk_150++;
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
}
break;
case 0xBBA:
@ -2883,7 +2883,7 @@ void fn_1_AD58(omObjData *object)
var_r31->unk_00.unk_9C = 270.0f;
fn_1_A470(var_r31, object, "m450mex06-s4kuppa", 2);
fn_1_4ED8(&var_r31->unk_00, 0);
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
}
break;
case 0xBBB:
@ -2903,7 +2903,7 @@ void fn_1_AD58(omObjData *object)
fn_1_9F4C(var_r31, object->model[0], &lbl_1_bss_4C[3], 0x78);
if (1000.0f > var_r31->unk_00.unk_6C.y) {
var_r31->unk_150++;
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
lbl_1_bss_1A4->work[0] = 0x404;
lbl_1_bss_128 = 0.0f;
}
@ -2917,7 +2917,7 @@ void fn_1_AD58(omObjData *object)
MTXIdentity(Hu3DData[object->model[0]].unk_F0);
omSetSca(object, 1.0f, 1.0f, 1.0f);
Hu3DModelScaleSet(object->model[1], 1.5f, 1.5f, 1.5f);
Hu3DModelAttrReset(object->model[1], 1);
Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[1], 0x40000002);
Hu3DModelHookSet(object->model[1], "g000i00-itemhook_A", object->model[0]);
var_r31->unk_00.unk_6C.x = 0.0f;
@ -2927,7 +2927,7 @@ void fn_1_AD58(omObjData *object)
fn_1_4ED8(&var_r31->unk_00, 0);
var_r31->unk_00.unk_3C |= 0x2020;
Hu3DMotionSet(object->model[0], object->motion[7]);
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
}
break;
case 0xBBE:
@ -3020,8 +3020,8 @@ void fn_1_AD58(omObjData *object)
var_r31->unk_150++;
var_r31->unk_154 &= ~2;
Hu3DModelHookObjReset(object->model[1], "g000i00-itemhook_A");
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[1], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
lbl_1_bss_1A4->work[0] = 0x410;
lbl_1_bss_128 = 0.0f;
}
@ -3034,7 +3034,7 @@ void fn_1_AD58(omObjData *object)
var_r31->unk_00.unk_9C = 0.0f;
fn_1_A470(var_r31, object, "m450mex06-s6kuppa01", 2);
fn_1_4ED8(&var_r31->unk_00, 0);
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
}
break;
case 0xBC5:
@ -3158,7 +3158,7 @@ void fn_1_AD58(omObjData *object)
}
if (Hu3DMotionEndCheck(object->model[0]) != 0) {
var_r31->unk_154 |= 0x40;
Hu3DModelAttrSet(object->model[0], 0x40000001);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DMotionSet(object->model[0], object->motion[14]);
}
}
@ -3217,7 +3217,7 @@ void fn_1_AD58(omObjData *object)
var_r31->unk_E0 = 0.0f;
var_r31->unk_154 &= ~0x8000;
Hu3DMotionShiftSet(object->model[0], object->motion[0], 0.0f, 8.0f, 0x40000001);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 1);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], HU3D_ATTR_DISPOFF);
}
break;
case 0xBCF:
@ -3255,9 +3255,9 @@ void fn_1_AD58(omObjData *object)
150.0f + var_r31->unk_00.unk_6C.z);
Hu3DModelScaleSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 2.0f, 2.0f, 2.0f);
Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 0.0f);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 0x40000001);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 1);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], HU3D_ATTR_DISPOFF);
}
}
if (var_r31->unk_150 != 0xBCF) {
@ -3348,7 +3348,7 @@ void fn_1_DBF0(omObjData *object)
for (var_r29 = 0; var_r29 < 2; var_r29++) {
object->model[var_r29] = Hu3DModelCreateFile(lbl_1_data_AC[var_r29]);
Hu3DModelAttrSet(object->model[var_r29], 0x4001);
Hu3DModelAttrSet(object->model[var_r29], 0x40000001);
Hu3DModelAttrSet(object->model[var_r29], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[var_r29], 0x40000002);
Hu3DModelLayerSet(object->model[var_r29], 3);
Hu3DModelShadowSet(object->model[var_r29]);
@ -3383,7 +3383,7 @@ void fn_1_DBF0(omObjData *object)
omSetTra(var_r31->unk_00.unk_00, var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, var_r31->unk_00.unk_6C.z);
omSetRot(var_r31->unk_00.unk_00, 0.0f, var_r31->unk_00.unk_9C, 0.0f);
omSetSca(object, 1.5f, 1.5f, 1.5f);
Hu3DModelAttrReset(*object->model, 1);
Hu3DModelAttrReset(*object->model, HU3D_ATTR_DISPOFF);
object->func = (omObjFunc)fn_1_AD58;
}
@ -3447,13 +3447,13 @@ void fn_1_E3C8(UnkM450Struct3 *arg0, omObjData *arg1, s32 arg2)
s32 var_r30;
if (arg2 != 0) {
if (arg1->work[0] == 0) {
Hu3DModelAttrReset(arg1->model[1], 1);
Hu3DModelAttrReset(arg1->model[1], HU3D_ATTR_DISPOFF);
}
Hu3DModelAttrReset(arg1->model[0], 1);
Hu3DModelAttrReset(arg1->model[0], HU3D_ATTR_DISPOFF);
}
else {
for (var_r30 = 0; var_r30 < 5; var_r30++) {
Hu3DModelAttrSet(arg1->model[var_r30], 1);
Hu3DModelAttrSet(arg1->model[var_r30], HU3D_ATTR_DISPOFF);
}
}
arg0->unk_00.unk_3C &= ~0xC00;
@ -3552,14 +3552,14 @@ void fn_1_EB6C(UnkM450Struct3 *arg0, omObjData *arg1)
fn_1_1D18(arg1->model[4], "g007i03-itemhook_M", &arg0->unk_00.unk_6C);
Hu3DModelHookObjReset(arg1->model[4], "g007i03-itemhook_M");
Hu3DModelAttrSet(arg1->model[4], 1);
Hu3DModelAttrSet(arg1->model[4], HU3D_ATTR_DISPOFF);
arg0->unk_150 = 0xFAE;
arg0->unk_154 &= 0xFFFFFFFD;
arg0->unk_108 = 19.6f;
arg0->unk_E0 = 0.0f;
Hu3DMotionSet(arg1->model[0], arg1->motion[6]);
Hu3DModelAttrReset(arg1->model[0], 0x40000001);
Hu3DModelAttrSet(arg1->model[0], 0x40000002);
Hu3DModelAttrSet(arg1->model[0], HU3D_MOTATTR_PAUSE);
Hu3DMotionTimeSet(arg1->model[0], 1.0f);
arg0->unk_13C = Hu3DParManLink(lbl_1_bss_24, &lbl_1_data_1504);
Hu3DParManPosSet(arg0->unk_13C, arg0->unk_00.unk_6C.x, arg0->unk_00.unk_6C.y, arg0->unk_00.unk_6C.z);
@ -3662,7 +3662,7 @@ void fn_1_ED4C(omObjData *object)
var_r31->unk_E0 = 0.0f;
var_r31->unk_E8 = 360.0f * frandf();
var_r31->unk_154 |= 2;
Hu3DModelAttrReset(object->model[4], 1);
Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[4], 0x40000002);
Hu3DModelHookSet(object->model[4], "g007i03-itemhook_M", object->model[0]);
var_r31->unk_00.unk_6C.x = 0.0f;
@ -3828,7 +3828,7 @@ void fn_1_ED4C(omObjData *object)
case 0xFAF:
if (lbl_1_bss_1A4->work[0] >= 0x403) {
var_r31->unk_150 = var_r31->unk_150 + 1;
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
}
break;
case 0xFB0:
@ -3933,9 +3933,9 @@ void fn_1_11D5C(omObjData *object)
omSetTra(var_r31->unk_00.unk_00, var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, var_r31->unk_00.unk_6C.z);
omSetRot(var_r31->unk_00.unk_00, 0.0f, var_r31->unk_00.unk_9C, 0.0f);
if (object->work[0] == 0) {
Hu3DModelAttrReset(object->model[1], 1);
Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
}
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
var_r31->unk_00.unk_3C &= ~0xC00;
object->func = (omObjFunc)fn_1_ED4C;
}
@ -3990,7 +3990,7 @@ void fn_1_12234(void)
for (var_r30 = 0; var_r30 < var_r27; var_r30++) {
espDrawNoSet(var_r31->unk_18[var_r30], 0);
espDispOff(var_r31->unk_18[var_r30]);
espAttrSet(var_r31->unk_18[var_r30], 1);
espAttrSet(var_r31->unk_18[var_r30], HUSPR_ATTR_NOANIM);
espBankSet(var_r31->unk_18[var_r30], 0);
espPriSet(var_r31->unk_18[var_r30], 0x80 - var_r29);
espPosSet(var_r31->unk_18[var_r30], var_r28, 225.0f);
@ -4064,15 +4064,15 @@ void fn_1_12688(omObjData *object)
omSetRot(object, 0.0f, var_f29, 0.0f);
omSetSca(object, var_f31, var_f30, var_f31);
Hu3DMotionTimeSet(object->model[0], 0.0f);
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[0], 0x40000002);
HuAudFXPlay(0x7C0);
}
}
else if (Hu3DMotionEndCheck(object->model[0]) != 0) {
object->work[0] = frandmod(0x258);
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], 0x40000002);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
}
}
@ -4083,7 +4083,7 @@ void fn_1_1291C(omObjData *object)
omSetRot(object, 0.0f, 0.0f, 0.0f);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M450, 0x22));
Hu3DModelAttrSet(object->model[0], 0x4001);
Hu3DModelAttrSet(object->model[0], 0x40000002);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelLayerSet(object->model[0], 1);
object->func = fn_1_12688;
@ -4416,7 +4416,8 @@ s32 lbl_1_data_F00[0x17] = {
DATA_MAKE_NUM(DATADIR_M450, 0x0F),
DATA_MAKE_NUM(DATADIR_M450, 0x0F),
};
s32 lbl_1_data_F5C[4] = { DATA_MAKE_NUM(DATADIR_M450, 0x24), DATA_MAKE_NUM(DATADIR_M450, 0x25), DATA_MAKE_NUM(DATADIR_M450, 0x26), DATA_MAKE_NUM(DATADIR_M450, 0x27) };
s32 lbl_1_data_F5C[4]
= { DATA_MAKE_NUM(DATADIR_M450, 0x24), DATA_MAKE_NUM(DATADIR_M450, 0x25), DATA_MAKE_NUM(DATADIR_M450, 0x26), DATA_MAKE_NUM(DATADIR_M450, 0x27) };
s32 lbl_1_data_F6C[6] = { 0, 0xE10, 0x4650, 0xE10, 0x4650, 0x4650 };
float lbl_1_data_F84[5] = { 1200.0f, 1500.0f, 0.0f, 200.0f, 300.0f };
float lbl_1_data_F98[5] = { 1200.0f, 1500.0f, 0.0f, 200.0f, 300.0f };
@ -4510,15 +4511,15 @@ void fn_1_12A1C(omObjData *object)
var_f30 = (1500.0f * frandf()) - 750.0f;
omSetTra(object, var_f31, 1380.0f, var_f30);
Hu3DMotionTimeSet(object->model[0], 0.0f);
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[0], 0x40000002);
}
}
}
else if (Hu3DMotionEndCheck(object->model[0]) != 0) {
object->work[0] = frandmod(0xB4);
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], 0x40000002);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
}
}
@ -4533,7 +4534,7 @@ void fn_1_12B80(omObjData *object)
object->model[0] = fn_1_46C(DATA_MAKE_NUM(DATADIR_M450, 0x23));
Hu3DModelAttrSet(object->model[0], 0x4001);
Hu3DModelAttrSet(object->model[0], 0x40000002);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelLayerSet(object->model[0], 1);
object->func = fn_1_12A1C;
@ -4546,8 +4547,8 @@ void fn_1_12D7C(omObjData *object)
omSetTra(object, 0.0f, 0.0f, 0.0f);
omSetRot(object, 0.0f, 0.0f, 0.0f);
object->model[0] = Hu3DModelCreateFile(lbl_1_data_F00[object->work[0]]);
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], 0x40000002);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
object->func = fn_1_12D78;
}
@ -4565,7 +4566,7 @@ void fn_1_12E5C(s32 var_r30, s32 var_r29, s32 var_r31)
lbl_1_bss_1A0->model[var_r31], 1.0f, 1.0f, VECDistance(&lbl_1_data_1450[var_r30].unk_04, &lbl_1_data_1450[var_r29].unk_04) / 1000.0f);
Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r31], 0.0f);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31], 0x40000003);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31], 1);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31], HU3D_ATTR_DISPOFF);
}
void fn_1_130A4(Vec *arg0, s32 var_r30)
@ -4573,7 +4574,7 @@ void fn_1_130A4(Vec *arg0, s32 var_r30)
Hu3DModelPosSet(lbl_1_bss_1A0->model[var_r30], arg0->x, arg0->y, arg0->z);
Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r30], 0.0f);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r30], 0x40000003);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r30], 1);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r30], HU3D_ATTR_DISPOFF);
HuAudFXPlay(0x7B7);
}
@ -4643,7 +4644,7 @@ void fn_1_13560(UnkData1380Struct *arg0, s32 *arg1, s32 arg2)
fn_1_13174(arg0);
for (var_r30 = 0; var_r30 < arg0->unk_08; var_r30++) {
if (arg0->unk_24[var_r30] >= 0) {
Hu3DModelAttrReset(lbl_1_bss_1A0->model[arg0->unk_24[var_r30]], 1);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[arg0->unk_24[var_r30]], HU3D_ATTR_DISPOFF);
}
}
}
@ -4984,7 +4985,7 @@ void fn_1_15308(omObjData *object)
for (var_r30 = 0; var_r30 < 0x21; var_r30++) {
object->model[var_r30] = Hu3DModelCreateFile(lbl_1_data_E7C[var_r30]);
Hu3DModelAttrSet(object->model[var_r30], 0x4001);
Hu3DModelAttrSet(object->model[var_r30], 0x40000001);
Hu3DModelAttrSet(object->model[var_r30], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[var_r30], 0x40000002);
Hu3DModelLayerSet(object->model[var_r30], 0);
Hu3DModelPosSet(object->model[var_r30], 0.0f, 0.0f, 0.0f);
@ -5014,15 +5015,15 @@ void fn_1_15308(omObjData *object)
fn_1_14AB8();
for (var_r30 = 0; var_r30 <= 1; var_r30++) {
Hu3DModelAttrReset(object->model[var_r30], 1);
Hu3DModelAttrReset(object->model[var_r30], HU3D_ATTR_DISPOFF);
}
Hu3DModelAttrReset(object->model[6], 1);
Hu3DModelAttrReset(object->model[17], 1);
Hu3DModelAttrReset(object->model[19], 1);
Hu3DModelAttrReset(object->model[6], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[17], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[19], HU3D_ATTR_DISPOFF);
for (var_r30 = 0; var_r30 < 5; var_r30++) {
Hu3DModelAttrSet(object->model[var_r30 + 0x14], 0x40000002);
Hu3DModelAttrSet(object->model[var_r30 + 0x14], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[var_r30 + 0x14], 0x40000001);
Hu3DModelAttrReset(object->model[var_r30 + 0x14], 1);
Hu3DModelAttrReset(object->model[var_r30 + 0x14], HU3D_ATTR_DISPOFF);
}
object->func = fn_1_14CE8;
}
@ -5200,18 +5201,18 @@ void fn_1_16378(omObjData *object)
var_r31->unk_50 = var_r31->unk_50 - 1.0f;
if ((lbl_1_bss_308 & 1) != 0) {
for (var_r30 = 0; var_r30 < 2; var_r30++) {
Hu3DModelAttrSet(object->model[var_r30], 1);
Hu3DModelAttrSet(object->model[var_r30], HU3D_ATTR_DISPOFF);
}
}
else {
for (var_r30 = 0; var_r30 < 2; var_r30++) {
Hu3DModelAttrReset(object->model[var_r30], 1);
Hu3DModelAttrReset(object->model[var_r30], HU3D_ATTR_DISPOFF);
}
}
if (0.0f > var_r31->unk_50) {
Hu3DModelShadowReset(object->model[0]);
for (var_r30 = 0; var_r30 < 2; var_r30++) {
Hu3DModelAttrSet(object->model[var_r30], 1);
Hu3DModelAttrSet(object->model[var_r30], HU3D_ATTR_DISPOFF);
}
fn_1_24(0x1000, object->model[0]);
fn_1_24(0x2000, object->model[1]);
@ -5267,7 +5268,7 @@ void fn_1_16910(omObjData *object)
object->model[1] = var_r26;
}
for (var_r27 = 0; var_r27 < 2; var_r27++) {
Hu3DModelAttrSet(object->model[var_r27], 1);
Hu3DModelAttrSet(object->model[var_r27], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[var_r27], 0x40000003);
Hu3DModelLayerSet(object->model[var_r27], 4);
Hu3DMotionTimeSet(object->model[var_r27], 0.0f);
@ -5277,8 +5278,8 @@ void fn_1_16910(omObjData *object)
omSetTra(object, var_r30->unk_00.x, var_r30->unk_00.y, var_r30->unk_00.z);
omSetRot(object, 0.0f, 0.0f, 0.0f);
Hu3DModelShadowSet(object->model[0]);
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[1], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
object->func = fn_1_16378;
}
@ -5324,7 +5325,7 @@ void fn_1_16CF4(omObjData *object)
if (var_r31->unk_78 != 0) {
var_r31->unk_40 = var_r31->unk_40 - 0.1f;
if (0.0f > var_r31->unk_40) {
Hu3DModelAttrSet(*object->model, 1);
Hu3DModelAttrSet(*object->model, HU3D_ATTR_DISPOFF);
fn_1_24(0x3000, object->model[0]);
omDelObjEx(lbl_1_bss_33C, object);
return;
@ -5380,13 +5381,13 @@ void fn_1_171C4(omObjData *object)
else {
object->model[0] = var_r26;
}
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], 0x40000001);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelLayerSet(object->model[0], 4);
omSetTra(object, var_r29->unk_00.x, var_r29->unk_00.y, var_r29->unk_00.z);
omSetRot(object, 0.0f, 0.0f, 0.0f);
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_1_16CF4;
}
@ -5425,7 +5426,7 @@ void fn_1_17474(omObjData *object)
if (var_r31->unk_74 != 0) {
fn_1_1D18(var_r31->unk_54, "g000m0-itemhook_R", &sp8);
if (Hu3DMotionShiftIDGet(var_r31->unk_54) < 0) {
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
if (165.0f <= Hu3DMotionTimeGet(var_r31->unk_54)) {
HuAudFXPlay(0x7B0);
var_r31->unk_74 = 0;
@ -5469,7 +5470,7 @@ void fn_1_17474(omObjData *object)
var_r31->unk_40 = var_r31->unk_40 - 0.05f;
if (0.0f > var_r31->unk_40) {
Hu3DModelShadowReset(object->model[0]);
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
fn_1_24(0x4000, object->model[0]);
omDelObjEx(lbl_1_bss_33C, object);
return;
@ -5518,8 +5519,8 @@ void fn_1_17970(s32 arg0, s32 arg1, float arg8)
else {
var_r31->model[0] = var_r26;
}
Hu3DModelAttrSet(var_r31->model[0], 1);
Hu3DModelAttrSet(var_r31->model[0], 0x40000001);
Hu3DModelAttrSet(var_r31->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(var_r31->model[0], 0x40000002);
Hu3DModelLayerSet(var_r31->model[0], 4);
omSetTra(var_r31, 0.0f, 0.0f, 0.0f);
@ -5568,7 +5569,7 @@ void fn_1_17BBC(omObjData *object)
var_r31->unk_0C = spC;
if ((var_r31->unk_74 != 0) && (var_r22->unk_150 >= 0xBCE)) {
Hu3DModelShadowReset(object->model[0]);
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelHookObjReset(var_r31->unk_54, "g000m0-itemhook_R");
fn_1_24(0x4000, object->model[0]);
omDelObjEx(lbl_1_bss_33C, object);
@ -5608,7 +5609,7 @@ void fn_1_17BBC(omObjData *object)
var_r31->unk_40 = var_r31->unk_40 - 0.05f;
if (0.0f > var_r31->unk_40) {
Hu3DModelShadowReset(*object->model);
Hu3DModelAttrSet(*object->model, 1);
Hu3DModelAttrSet(*object->model, HU3D_ATTR_DISPOFF);
fn_1_24(0x4000, object->model[0]);
omDelObjEx(lbl_1_bss_33C, object);
return;
@ -5660,15 +5661,15 @@ void fn_1_18424(s32 arg0, Vec *arg1)
else {
var_r31->model[0] = var_r26;
}
Hu3DModelAttrSet(var_r31->model[0], 1);
Hu3DModelAttrSet(var_r31->model[0], 0x40000001);
Hu3DModelAttrSet(var_r31->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(var_r31->model[0], 0x40000002);
Hu3DModelLayerSet(var_r31->model[0], 4);
omSetTra(var_r31, 0.0f, 0.0f, 0.0f);
omSetRot(var_r31, 0.0f, 0.0f, 0.0f);
omSetSca(var_r31, 1.0f, 1.0f, 1.0f);
Hu3DModelHookSet(var_r30->unk_54, "g000m0-itemhook_R", var_r31->model[0]);
Hu3DModelAttrReset(var_r31->model[0], 1);
Hu3DModelAttrReset(var_r31->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(var_r31->model[0]);
Hu3DModelShadowDispOff(var_r31->model[0]);
}
@ -5700,7 +5701,7 @@ void fn_1_186A8(void)
lbl_1_bss_C4++;
lbl_1_bss_C8 = 0.0f;
Hu3DModelPosSet(lbl_1_bss_1A0->model[28], 0.0f, 1501.0f, 0.0f);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[28], 1);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[28], HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[28], 0.0f);
var_r26 = &Hu3DData[lbl_1_bss_1A0->model[28]];
var_r25 = var_r26->hsfData->object;
@ -5765,14 +5766,14 @@ void fn_1_186A8(void)
lbl_1_bss_C8 += 1.0f;
if (60.0f <= lbl_1_bss_C8) {
lbl_1_bss_C4 = -1;
Hu3DModelAttrSet(lbl_1_bss_1A0->model[28], 1);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[28], HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[28], 1.0f);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[29], 1);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[30], 1);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[29], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[30], HU3D_ATTR_DISPOFF);
for (var_r31 = 0; var_r31 < 3; var_r31++) {
lbl_1_data_1450[lbl_1_bss_B8[0]].unk_1C = 0;
fn_1_1B510(lbl_1_bss_B8[0]);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31 + 0x19], 1);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31 + 0x19], HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[var_r31 + 0x19], 1.0f);
}
fn_1_1B4C8(var_r30);
@ -5999,7 +6000,7 @@ void fn_1_19CE0(omObjData *object)
if (var_r31->unk_FC & 0x100) {
var_r31->unk_FC |= 0x402;
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrSet(object->model[0], 0x40000002);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DMotionSet(object->model[0], object->motion[14]);
Hu3DMotionTimeSet(object->model[0], 48.0f);
}
@ -6013,9 +6014,9 @@ void fn_1_19CE0(omObjData *object)
Hu3DModelPosSet(
lbl_1_bss_1A0->model[var_r31->unk_110 + 2], var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, 50.0f + var_r31->unk_00.unk_6C.z);
Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 0.0f);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 0x40000001);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 1);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], HU3D_ATTR_DISPOFF);
}
if (var_r31->unk_FC & 0x100000) {
var_r31->unk_FC |= 0x400002;
@ -6279,7 +6280,7 @@ void fn_1_1B510(s32 sp8)
var_r29->unk_10C--;
lbl_1_bss_B8[var_r30] = -1;
for (var_r31 = 0; var_r31 < 3; var_r31++) {
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31 + 0x19], 1);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31 + 0x19], HU3D_ATTR_DISPOFF);
}
for (var_r31 = var_r30; var_r31 < 2; var_r31++) {
lbl_1_bss_B8[var_r31] = lbl_1_bss_B8[var_r31 + 1];
@ -6426,7 +6427,7 @@ void fn_1_1C434(UnkM450Struct5 *arg0, omObjData *arg1)
lbl_1_bss_1A4->work[0] += 1;
lbl_1_bss_128 = 0.0f;
fn_1_4ED8(&arg0->unk_00, 0);
Hu3DModelAttrReset(arg1->model[0], 1);
Hu3DModelAttrReset(arg1->model[0], HU3D_ATTR_DISPOFF);
arg1->func = fn_1_20170;
}
@ -6510,7 +6511,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
if (120.0f < var_r31->unk_F8) {
var_r31->unk_FC &= ~0x40000;
fn_1_4ED8(&var_r31->unk_00, 0);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 1);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], HU3D_ATTR_DISPOFF);
}
return 0;
}
@ -6528,10 +6529,10 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
return 0;
}
if ((var_r31->unk_100 & 1) == 0) {
Hu3DModelAttrSet(var_r30->model[0], 1);
Hu3DModelAttrSet(var_r30->model[0], HU3D_ATTR_DISPOFF);
}
else {
Hu3DModelAttrReset(var_r30->model[0], 1);
Hu3DModelAttrReset(var_r30->model[0], HU3D_ATTR_DISPOFF);
}
if (--var_r31->unk_100 < 0) {
var_r31->unk_FC &= ~0x70;
@ -6540,7 +6541,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
var_r31->unk_FC &= ~0x70000;
var_r31->unk_FC &= ~0x700004;
var_r31->unk_FC &= ~0x2;
Hu3DModelAttrReset(var_r30->model[0], 1);
Hu3DModelAttrReset(var_r30->model[0], HU3D_ATTR_DISPOFF);
}
return 1;
}
@ -6685,7 +6686,7 @@ void fn_1_1E150(omObjData *var_r29)
var_r31->unk_118 = 0x7EB;
Hu3DModelAttrReset(*var_r29->model, 0x40000003);
Hu3DMotionShiftSet(*var_r29->model, var_r29->motion[22], 0.0f, 8.0f, 0);
Hu3DModelAttrReset(*var_r29->model, 1);
Hu3DModelAttrReset(*var_r29->model, HU3D_ATTR_DISPOFF);
var_r29->func = fn_1_20170;
return;
}
@ -6721,7 +6722,7 @@ void fn_1_1E150(omObjData *var_r29)
var_r31->unk_00.unk_3C &= ~0x2;
}
Hu3DMotionSet(var_r29->model[0], var_r29->motion[8]);
Hu3DModelAttrReset(var_r29->model[0], 1);
Hu3DModelAttrReset(var_r29->model[0], HU3D_ATTR_DISPOFF);
fn_1_125C0(0, 0);
var_r29->func = fn_1_20170;
return;
@ -7205,13 +7206,13 @@ void fn_1_23330(omObjData *object)
object->motion[var_r29] = CharModelMotionCreate(lbl_1_data_0[var_r31->unk_11C], lbl_1_data_64C[var_r31->unk_11C][var_r29]);
CharModelMotionSet(lbl_1_data_0[var_r31->unk_11C], object->motion[var_r29]);
}
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], 0x40000001);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[0], 2);
Hu3DMotionSet(object->model[0], *object->motion);
omSetTra(var_r31->unk_00.unk_00, var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, var_r31->unk_00.unk_6C.z);
omSetRot(var_r31->unk_00.unk_00, 0.0f, var_r31->unk_00.unk_9C, 0.0f);
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
CharModelLayerSetAll2(6);
CharModelMotionDataClose(lbl_1_data_0[var_r31->unk_11C]);
object->func = fn_1_20170;
@ -7472,7 +7473,7 @@ void fn_1_24620(omObjData *var_r31)
var_f31 = 1.0f;
}
var_r30 = &lbl_1_data_1380;
Hu3DModelAttrReset(lbl_1_bss_1A0->model[5], 1);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[5], HU3D_ATTR_DISPOFF);
Hu3DModelRotSet(lbl_1_bss_1A0->model[5], 0.0f, 90.0f, 0.0f);
Hu3DModelPosSet(lbl_1_bss_1A0->model[5], var_r30->unk_30[3].x, var_r30->unk_30[3].y, var_r30->unk_30[3].z);
Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[5], var_f31);
@ -7495,7 +7496,7 @@ void fn_1_24620(omObjData *var_r31)
}
omVibrate(lbl_1_bss_120, 0xC, 6, 6);
lbl_1_bss_128 += 1.0f;
Hu3DModelAttrReset(lbl_1_bss_1A0->model[7], 1);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[7], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(lbl_1_bss_1A0->model[7], 0.0f, -(60.0f - (lbl_1_bss_128 / 2)), 0.0f);
if (120.0f < lbl_1_bss_128) {
var_r31->work[0] += 1;
@ -7575,7 +7576,7 @@ void fn_1_24620(omObjData *var_r31)
var_f31 = 1.0f;
}
var_r30 = &lbl_1_data_13B8;
Hu3DModelAttrReset(lbl_1_bss_1A0->model[16], 1);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[16], HU3D_ATTR_DISPOFF);
Hu3DModelRotSet(lbl_1_bss_1A0->model[16], 0.0f, -90.0f, 0.0f);
Hu3DModelPosSet(lbl_1_bss_1A0->model[16], var_r30->unk_30[8].x, var_r30->unk_30[8].y, var_r30->unk_30[8].z);
Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[16], var_f31);
@ -7593,7 +7594,7 @@ void fn_1_24620(omObjData *var_r31)
if (120.0f <= lbl_1_bss_128) {
lbl_1_bss_128 = 120.0f;
}
Hu3DModelAttrReset(lbl_1_bss_1A0->model[18], 1);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[18], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(lbl_1_bss_1A0->model[18], 0.0f, -(60.0f - (lbl_1_bss_128 / 2)), 0.0f);
fn_1_1A21C(0.0f, 0.0f);
fn_1_1710(lbl_1_bss_128 / 120.0f, &lbl_1_data_470);
@ -7613,7 +7614,7 @@ void fn_1_24620(omObjData *var_r31)
var_r31->work[0] += 1;
fn_1_1350(&lbl_1_bss_324, &lbl_1_data_470, &lbl_1_bss_30C);
fn_1_6CB0(fn_1_9BA4, 5);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[19], 1);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[19], HU3D_ATTR_DISPOFF);
}
break;
case 0x414:
@ -7742,7 +7743,7 @@ void ObjectSetup(void)
lbl_1_bss_358.unk08 = NULL;
for (var_r31 = 0; var_r31 < 4; var_r31++) {
lbl_1_bss_2C[var_r31] = Hu3DModelCreateFile(lbl_1_data_F5C[var_r31]);
Hu3DModelAttrSet(lbl_1_bss_2C[var_r31], 1);
Hu3DModelAttrSet(lbl_1_bss_2C[var_r31], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_2C[var_r31], 0x40000003);
}
lbl_1_bss_28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M450, 0x6C));