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

Applied more Attr defines

Browse source
This commit is contained in:
dbalatoni13 2024-11-04 00:05:52 +01:00
parent c9f46f9418
commit f1c171b33f
51 changed files with 336 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/REL/instDll/main.c
View file

@ -7,7 +7,6 @@
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/hsfmotion.h"
#include "game/audio.h"
@ -19,11 +18,9 @@
#include "game/window.h"
#include "game/wipe.h"
#include "ext_math.h"
#include "math.h"
#include "rel_sqrt_consts.h"
#include "REL/instDll.h"
@ -255,7 +252,7 @@ static void fn_1_994(void)
HuPrcVSleep();
}
HuAudFXPlay(1211);
Hu3DModelAttrReset(model, 0x40000002);
Hu3DModelAttrReset(model, HU3D_MOTATTR_PAUSE);
for (i = 1; i <= 20; i++) {
Hu3DModelPosSet(model, 0.0f, (200.0 * (sind(i * 2.25f) * (1.0 / sind(45)))) - 200.0, pos_z);
rot_x = (20 - i) * cosd(i * 13.5f);
@ -267,7 +264,7 @@ static void fn_1_994(void)
Hu3DModelAttrSet(model, HU3D_MOTATTR_PAUSE);
HuPrcSleep(10);
HuAudFXPlay(1212);
Hu3DModelAttrReset(model, 0x40000002);
Hu3DModelAttrReset(model, HU3D_MOTATTR_PAUSE);
i = Hu3DHookFuncCreate(fn_1_50B0);
Hu3DModelCameraSet(i, 1);
@ -358,7 +355,7 @@ static void fn_1_994(void)
lbl_1_data_0 = 4;
HuPrcSleep(10);
Hu3DModelAttrReset(model, 0x40000002);
Hu3DModelAttrReset(model, HU3D_MOTATTR_PAUSE);
HuPrcSleep(10);
fov_vel = 0;
for (i = 0; i <= 60; i++) {
@ -522,7 +519,7 @@ static void fn_1_17E4(void)
continue;
}
if (time == 0) {
Hu3DModelAttrReset(player_mdl[j], 0x40000001);
Hu3DModelAttrReset(player_mdl[j], HU3D_MOTATTR_LOOP);
CharModelVoiceEnableSet(char_tbl[i], mot_tbl[i][1], 1);
CharModelMotionSet(char_tbl[j], mot_tbl[j][1]);
}

10
src/REL/m401Dll/main.c
View file

@ -1169,7 +1169,7 @@ void fn_2_3F28(omObjData *object)
temp_r31->unk30.y = object->trans.y;
temp_r31->unk30.z = object->trans.z;
Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[3], 0x40000002);
Hu3DModelAttrReset(object->model[3], HU3D_MOTATTR_PAUSE);
Hu3DModelClusterAttrReset(object->model[3], 0, 0xC0000002);
Hu3DModelPosSet(object->model[3], object->trans.x, 100, 100 + object->trans.z);
Hu3DMotionTimeSet(object->model[3], 0);
@ -1384,12 +1384,12 @@ void fn_2_48A0(omObjData *object)
temp_r31->unk6C = 1;
omVibrate(temp_r31->unk4, 12, 4, 2);
Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[2], 0x40000002);
Hu3DModelAttrReset(object->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_LOOP);
Hu3DModelPosSet(object->model[2], object->trans.x, 950, 30 + object->trans.z);
Hu3DModelScaleSet(object->model[2], 1, 1, 1);
Hu3DMotionTimeSet(object->model[2], 0);
Hu3DModelAttrReset(object->model[3], 0x40000002);
Hu3DModelAttrReset(object->model[3], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF);
Hu3DModelClusterAttrReset(object->model[3], 0, 0xC0000002);
Hu3DModelPosSet(object->model[3], object->trans.x, 0, 30 + object->trans.z);
@ -2564,7 +2564,7 @@ void fn_2_A318(omObjData *object)
temp_r30->unk0.y = atan2d(temp_r28->trans.y - object->trans.y, temp_r28->trans.x - object->trans.x);
temp_r30->unk0.z = 8.0f + ((1.0f / 255.0f) * ((9.0f * frandu8())));
Hu3DMotionSet(object->model[0], object->motion[1]);
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP);
lbl_2_bss_78.x = object->trans.x;
lbl_2_bss_78.y = object->trans.y;
lbl_2_bss_78.z = object->trans.z;
@ -2807,7 +2807,7 @@ void fn_2_C130(omObjData *object)
temp_r31->unk50->work[0] = 1;
temp_r31->unk6C = 0;
CharModelMotionSet(((M401WorkPlayer *)(lbl_2_bss_118[temp_r30]->data))->unk86, lbl_2_bss_118[temp_r30]->motion[4]);
Hu3DModelAttrReset(lbl_2_bss_118[temp_r30]->model[0], 0x40000001);
Hu3DModelAttrReset(lbl_2_bss_118[temp_r30]->model[0], HU3D_MOTATTR_LOOP);
lbl_2_bss_118[temp_r30]->func = fn_2_48A0;
Hu3DModelAmbSet(lbl_2_bss_118[temp_r30]->model[0], 0.7f, 0.7f, 0.7f);
omSetTra(lbl_2_bss_118[temp_r30], -225.0f + (temp_r30 * 150), 740, 400);

24
src/REL/m402Dll/main.c
View file

@ -747,7 +747,7 @@ static void fn_1_2880(UnkFn27A8Struct *arg0, omObjData *arg1)
arg0->unk08 = 0.0f;
arg0->unk0C = 0.0f;
arg0->unk10 = arg0->unk0C;
Hu3DModelAttrReset(arg1->model[0], 0x40000002);
Hu3DModelAttrReset(arg1->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(arg1->model[0], HU3D_MOTATTR_LOOP);
Hu3DMotionSet(arg1->model[0], arg1->motion[0]);
}
@ -782,7 +782,7 @@ static void fn_1_2B30(UnkFn27A8Struct *arg0, omObjData *arg1, omObjData *arg2)
arg0->unk0C = Hu3DMotionTimeGet(arg2->model[0]);
Hu3DMotionTimeSet(lbl_1_bss_54[arg0->unk54]->model[0], 0.0f);
Hu3DMotionSpeedSet(arg1->model[0], 1.0f);
Hu3DModelAttrReset(arg1->model[0], 0x40000003);
Hu3DModelAttrReset(arg1->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[7], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
fn_1_2970(arg0, arg2, 1);
HuAudCharVoicePlay(arg0->unk58, 0x123);
@ -803,7 +803,7 @@ static u8 fn_1_2DBC(UnkFn27A8Struct *arg0, omObjData *arg1)
arg0->unk1C += arg0->unk20;
if (18.0f < arg0->unk50) {
arg0->unk20 = (670.0f - arg0->unk1C) / 20.0f;
Hu3DModelAttrReset(arg1->model[0], 0x40000003);
Hu3DModelAttrReset(arg1->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DMotionSet(arg1->model[0], arg1->motion[2]);
Hu3DMotionTimeSet(arg1->model[0], 20.0f);
omVibrate(arg0->unk54, 12, 4, 2);
@ -1033,7 +1033,7 @@ static void fn_1_43D8(omObjData *arg0)
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
Hu3DMotionSet(temp_r30->model[0], temp_r30->motion[0]);
Hu3DModelAttrSet(temp_r30->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(temp_r30->model[0], 0x40000001);
Hu3DModelAttrReset(temp_r30->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(temp_r30->model[0], HU3D_ATTR_DISPOFF);
}
break;
@ -1059,7 +1059,7 @@ static void fn_1_43D8(omObjData *arg0)
temp_r31->unk4C++;
temp_r31->unk50 = 0;
temp_r31->unk04 = 536.0f;
Hu3DModelAttrReset(temp_r30->model[0], 0x40000002);
Hu3DModelAttrReset(temp_r30->model[0], HU3D_MOTATTR_PAUSE);
spE8.x = temp_r31->unk00 * sind(180.0f + temp_r31->unk18);
spE8.y = temp_r31->unk04;
spE8.z = temp_r31->unk00 * cosd(180.0f + temp_r31->unk18);
@ -1146,9 +1146,9 @@ static void fn_1_43D8(omObjData *arg0)
if (temp_r31->unk54 == lbl_1_bss_26) {
temp_r31->unk4C = 2012;
temp_r31->unk20 = 10.5f;
Hu3DModelAttrReset(arg0->model[0], 0x40000003);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[8], 0.0f, 20.0f, HU3D_MOTATTR_NONE);
Hu3DModelAttrReset(temp_r30->model[0], 0x40000003);
Hu3DModelAttrReset(temp_r30->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[2], 20.0f, 20.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(0x513);
fn_1_4190(temp_r31->unk18);
@ -1391,7 +1391,7 @@ static void fn_1_6E64(omObjData *arg0)
omSetTra(arg0, temp_r30->unk00, temp_r30->unk04, temp_r30->unk08);
omSetRot(arg0, 0.0f, temp_r30->unk0C, 0.0f);
Hu3DModelShadowSet(arg0->model[0]);
Hu3DModelAttrReset(arg0->model[0], 0x40000002);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
arg0->func = fn_1_6AB4;
}
@ -1519,7 +1519,7 @@ static void fn_1_7950(omObjData *arg0)
omSetTra(arg0, temp_r30->unk00.x, temp_r30->unk00.y, temp_r30->unk00.z);
omSetRot(arg0, temp_r30->unk0C, temp_r30->unk10, temp_r30->unk14);
omSetSca(arg0, temp_r30->unk18, temp_r30->unk1C, temp_r30->unk20);
Hu3DModelAttrReset(arg0->model[0], 0x40000003);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
arg0->func = fn_1_70E4;
}
@ -1597,7 +1597,7 @@ static void fn_1_7E84(omObjData *arg0)
arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M402, 36));
Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(arg0->model[0], 0x40000002);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(arg0->model[0], 1);
temp_f31 = 135.0f + 90.0f * arg0->work[0];
omSetTra(arg0, 155.5 * sind(temp_f31), 0.0f, 155.5 * cosd(temp_f31));
@ -1725,7 +1725,7 @@ static void fn_1_8218(omObjData *arg0)
lbl_1_bss_2C += 1.0f;
if (lbl_1_bss_26 >= 0 && 110.0f == lbl_1_bss_2C) {
Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->model[2], 0x40000002);
Hu3DModelAttrReset(arg0->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->model[2], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(arg0->model[2], 0.0f);
Hu3DMotionSpeedSet(arg0->model[2], 3.0f);
@ -1745,7 +1745,7 @@ static void fn_1_8218(omObjData *arg0)
lbl_1_bss_30 -= 1.0f;
if (0.0f == lbl_1_bss_30) {
Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->model[2], 0x40000002);
Hu3DModelAttrReset(arg0->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->model[2], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(arg0->model[2], 0.0f);
Hu3DMotionSpeedSet(arg0->model[2], 3.0f);

6
src/REL/m404Dll/main.c
View file

@ -716,7 +716,7 @@ void fn_1_1344(omObjData *object)
}
}
Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DModelAttrSet(object->model[0], 0x40000601);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_OVL_LOOP | HU3D_MOTATTR_OVL_PAUSE);
CharModelVoiceEnableSet(var_r24, object->motion[1], 0);
object->trans.x = -90.0f;
object->trans.y = 0.0f;
@ -1023,7 +1023,7 @@ void fn_1_44A0(omObjData *object)
}
Hu3DMotionOverlaySpeedSet(object->model[0], Hu3DData[object->model[0]].unk_68);
if (var_r31->unk_2C == 0) {
Hu3DModelAttrReset(object->model[0], 0x40000400);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_OVL_PAUSE);
Hu3DMotionOverlayTimeSet(object->model[0], 0.0f);
}
}
@ -1032,7 +1032,7 @@ void fn_1_44A0(omObjData *object)
var_r28 = 0;
CharModelMotionSpeedSet(var_r31->unk_0C, 1.0f);
Hu3DMotionOverlayTimeSet(object->model[0], 0.0f);
Hu3DModelAttrSet(object->model[0], 0x40000400);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_OVL_PAUSE);
}
sp8.x = object->trans.x;
sp8.z = object->trans.z;

34
src/REL/m405Dll/main.c
View file

@ -1360,8 +1360,8 @@ void fn_1_58A0(omObjData *arg0)
arg0->work[0]++;
lbl_1_bss_6C = 0.0f;
Hu3DMotionSet(arg0->model[0], arg0->motion[1]);
Hu3DModelAttrReset(arg0->model[0], 0x40000003);
Hu3DModelAttrReset(arg0->model[1], 0x40000003);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->model[1], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
}
break;
case 1:
@ -1379,7 +1379,7 @@ void fn_1_58A0(omObjData *arg0)
if (Hu3DMotionEndCheck(arg0->model[0]) != 0) {
arg0->work[0]++;
Hu3DMotionSet(arg0->model[0], arg0->motion[0]);
Hu3DModelAttrReset(arg0->model[0], 0x40000002);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP);
}
break;
@ -1402,12 +1402,12 @@ void fn_1_5B28(omObjData *arg0)
}
for (i = 0; i < 2; i++) {
Hu3DModelAttrSet(arg0->model[i], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->model[i], 0x40000003);
Hu3DModelAttrSet(arg0->model[i], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(arg0->model[i], 5);
Hu3DModelShadowSet(arg0->model[i]);
}
Hu3DMotionSet(arg0->model[0], *arg0->motion);
Hu3DModelAttrReset(arg0->model[0], 0x40000002);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelHookSet(arg0->model[0], "g001m1_021-itemhook_r", arg0->model[1]);
Hu3DMotionTimeSet(arg0->model[1], 1.0f);
for (i = 0; i < 2; i++) {
@ -1585,7 +1585,7 @@ void fn_1_6BFC(omObjData *arg0)
if (lbl_1_bss_98->work[0] == 1006) {
temp_r31->unk100 = 2005;
temp_r31->unk104 = 0;
Hu3DModelAttrReset(arg0->model[0], 0x40000002);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_PAUSE);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionSpeedSet(arg0->model[0], 1.0f);
for (i = 0; i < 5; i++) {
@ -1712,7 +1712,7 @@ void fn_1_6BFC(omObjData *arg0)
temp_r31->unk5C = temp_r31->unk4C.z;
var_r27 = temp_r31->unk94 + 5;
temp_r31->unk104 = var_r27;
Hu3DModelAttrReset(arg0->model[0], 0x40000003);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
temp_r31->unk94++;
if (temp_r31->unk94 > lbl_1_bss_78) {
@ -1743,7 +1743,7 @@ void fn_1_6BFC(omObjData *arg0)
}
if (var_r27 != temp_r31->unk104) {
temp_r31->unk104 = var_r27;
Hu3DModelAttrReset(arg0->model[0], 0x40000002);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_PAUSE);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 30.0f, HU3D_MOTATTR_LOOP);
}
if (temp_r31->unk104 >= 2 && temp_r31->unk104 <= 4) {
@ -1776,13 +1776,13 @@ void fn_1_798C(omObjData *arg0)
case 2000:
if (lbl_1_bss_98->work[0] >= 1003) {
temp_r31->unk100++;
Hu3DModelAttrReset(arg0->model[0], 0x40000003);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
}
break;
case 2001:
if (lbl_1_bss_98->work[0] >= 1005) {
temp_r31->unk100++;
Hu3DModelAttrReset(arg0->model[0], 0x40000003);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
for (i = 0; i <= 3; i++) {
espDispOn(temp_r31->unk0C[i]);
}
@ -1799,7 +1799,7 @@ void fn_1_798C(omObjData *arg0)
temp_r31->unk5C = temp_r31->unk4C.z;
temp_r31->unk104 = 2;
Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(arg0->model[0], 0x40000002);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_PAUSE);
Hu3DMotionSet(arg0->model[0], arg0->motion[temp_r31->unk104]);
Hu3DMotionCalc(arg0->model[0]);
arg0->func = fn_1_6BFC;
@ -1817,12 +1817,12 @@ void fn_1_798C(omObjData *arg0)
temp_r31->unk104 = 7;
Hu3DMotionOverlaySet(arg0->model[0], arg0->motion[temp_r31->unk104]);
Hu3DMotionOverlayTimeSet(arg0->model[0], 0.0f);
Hu3DModelAttrReset(arg0->model[0], 0x40000400);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_OVL_PAUSE);
HuAudCharVoicePlay(temp_r31->unk10C, 0x124);
}
if (temp_r31->unk104 == 7 && 73.0f <= Hu3DMotionOverlayTimeGet(arg0->model[0])) {
Hu3DMotionOverlayTimeSet(arg0->model[0], 35.0f);
Hu3DModelAttrReset(arg0->model[0], 0x40000400);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_OVL_PAUSE);
}
temp_r31->unk4C.y = -62.0f + 4.0f * fn_1_5664(&temp_r31->unk4C);
break;
@ -1874,7 +1874,7 @@ void fn_1_81B4(omObjData *arg0)
CharModelMotionSet(lbl_1_data_0[temp_r31->unk10C], arg0->motion[i]);
}
Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->model[0], 0x40000001);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(arg0->model[0], 3);
Hu3DMotionSet(arg0->model[0], arg0->motion[1]);
@ -2270,11 +2270,11 @@ void fn_1_AD10(omObjData *arg0)
lbl_1_bss_70 = 900.0f;
omSetTra(arg0, 0.0f, 0.0f, 0.0f);
arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M405, 48));
Hu3DModelAttrSet(arg0->model[0], 0x4001);
Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(arg0->model[0], 5);
arg0->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M405, 49));
Hu3DModelAttrSet(arg0->model[1], 0x4001);
Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(arg0->model[1], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(arg0->model[1], 6);
Hu3DModelPosSet(arg0->model[1], 0.0f, 0.0f, 0.0f);
@ -2291,7 +2291,7 @@ void fn_1_AD10(omObjData *arg0)
Hu3DModelPosSet(arg0->model[3], 0.0f, -4.0f, 0.0f);
Hu3DModelTPLvlSet(arg0->model[3], 0.4f);
arg0->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M405, 52));
Hu3DModelAttrSet(arg0->model[4], 0x4001);
Hu3DModelAttrSet(arg0->model[4], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(arg0->model[4], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(arg0->model[4], 6);
Hu3DModelPosSet(arg0->model[4], 0.0f, 0.0f, 0.0f);

4
src/REL/m407dll/effect.c
View file

@ -181,12 +181,12 @@ void fn_1_485C(omObjData *arg0)
if (temp_r30->unk_1C == 0) {
Hu3DMotionTimeSet(*arg0->model, 0.0f);
Hu3DModelAttrReset(*arg0->model, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(*arg0->model, 0x40000002);
Hu3DModelAttrReset(*arg0->model, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(*arg0->model, HU3D_MOTATTR_LOOP);
temp_r30->unk_1C++;
}
else if (temp_r30->unk_1C == 1) {
Hu3DModelAttrReset(arg0->model[0], 0x40000001);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_LOOP);
temp_r30->unk_1C++;
}

8
src/REL/m407dll/whomp.c
View file

@ -382,7 +382,7 @@ void fn_1_3364(omObjData *arg0)
temp_r31 = arg0->data;
if (temp_r31->unk_2C == 0) {
Hu3DMotionSet(arg0->model[0], arg0->motion[4]);
Hu3DModelAttrReset(arg0->model[0], 0x40000001);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_LOOP);
switch (temp_r31->unk_28) {
case 0:
fn_1_4544(0, 0, temp_r31->unk_08.x, 0.0f, temp_r31->unk_08.z);
@ -421,7 +421,7 @@ void fn_1_34A4(omObjData *arg0)
Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
}
Hu3DMotionSet(arg0->model[0], arg0->motion[3]);
Hu3DModelAttrReset(arg0->model[0], 0x40000001);
Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_LOOP);
switch (temp_r30->unk_28) { /* irregular */
case 0:
fn_1_4544(0, 0, temp_r30->unk_08.x, 0.0f, temp_r30->unk_08.z);
@ -441,7 +441,7 @@ void fn_1_34A4(omObjData *arg0)
if ((temp_r30->unk_2C == 0xA) && (temp_r30->unk_28 == 1)) {
Hu3DMotionSet(arg0->model[1], arg0->motion[1]);
Hu3DModelAttrReset(arg0->model[1], 0x40000001);
Hu3DModelAttrReset(arg0->model[1], HU3D_MOTATTR_LOOP);
}
temp_r30->unk_2C++;
@ -468,7 +468,7 @@ void fn_1_36D0(omObjData *arg0)
Hu3DMotionSet(arg0->model[1], arg0->motion[0]);
Hu3DModelAttrSet(arg0->model[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(arg0->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->model[2], 0x40000002);
Hu3DModelAttrReset(arg0->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_LOOP);
fn_1_290C(arg0, 0);
}

8
src/REL/m408Dll/stage.c
View file

@ -348,7 +348,7 @@ void fn_1_D004(omObjData *object)
temp_r28 = ((ParticleData *)Hu3DData[temp_r27].unk_120)->unk_1C;
temp_r28[2] -= 0.025f;
if (temp_r28[2] <= 0) {
Hu3DModelAttrReset(temp_r27, 0x20);
Hu3DModelAttrReset(temp_r27, HU3D_ATTR_PARTICLE_KILL);
Hu3DModelKill(temp_r27);
object->model[6] = 0;
}
@ -500,7 +500,7 @@ void fn_1_DA6C(ModelData *model, ParticleData *particle, Mtx matrix)
DCFlushRange(particle->unk_48, particle->unk_30 * sizeof(HsfanimStruct01));
if (particle->unk_00 >= particle->unk_30 && temp_r29->unk_02 == 2) {
temp_r29->unk_02 = 0;
Hu3DModelAttrReset(temp_r29->unk_00, 0x20);
Hu3DModelAttrReset(temp_r29->unk_00, HU3D_ATTR_PARTICLE_KILL);
Hu3DModelKill(temp_r29->unk_00);
}
}
@ -540,7 +540,7 @@ void fn_1_DFD0(ModelData *model, ParticleData *particle, Mtx matrix)
case 1:
if (--particle->unk_00 == 0) {
Hu3DModelAttrReset(temp_r30->unk_00, 0x20);
Hu3DModelAttrReset(temp_r30->unk_00, HU3D_ATTR_PARTICLE_KILL);
Hu3DModelKill(temp_r30->unk_00);
return;
}
@ -747,7 +747,7 @@ void fn_1_F06C(ModelData *model, ParticleData *particle, Mtx matrix)
temp_r31->unk02--;
}
if (particle->unk_30 == temp_r27) {
Hu3DModelAttrReset(temp_r29->unk_00, 0x20);
Hu3DModelAttrReset(temp_r29->unk_00, HU3D_ATTR_PARTICLE_KILL);
Hu3DModelKill(temp_r29->unk_00);
return;
}

20
src/REL/m409Dll/main.c
View file

@ -284,7 +284,7 @@ s8 fn_1_10E8(omObjData *object)
}
break;
case 0:
Hu3DModelAttrReset(lbl_1_bss_DC->model[1], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_DC->model[1], HU3D_MOTATTR_PAUSE);
if (lbl_1_bss_C == 0.0f) {
fn_1_3840();
sp8.x = 1520.0f;
@ -502,8 +502,8 @@ static inline void unkInline(unkStruct4 *var_r31, s16 var_r29, s16 *var_r28, s16
Hu3DModelAttrSet(var_r31[var_r29].unk2, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(var_r31[var_r29].unk4, HU3D_MOTATTR_PAUSE);
if (arg3) {
Hu3DModelAttrSet(var_r31[var_r29].unk2, 0x00000001);
Hu3DModelAttrSet(var_r31[var_r29].unk4, 0x00000001);
Hu3DModelAttrSet(var_r31[var_r29].unk2, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31[var_r29].unk4, HU3D_ATTR_DISPOFF);
}
var_r31[var_r29].unk6 = Hu3DModelCreateFile(0x2001C);
var_r31[var_r29].unk8 = Hu3DJointMotionFile(var_r31[var_r29].unk6, DATA_MAKE_NUM(DATADIR_M409, 11));
@ -609,14 +609,14 @@ void fn_1_2DCC(omObjData *object)
case 1:
if (++lbl_1_bss_24.unk8 == (lbl_1_bss_24.unkA - 5)) {
Hu3DMotionSet(var_r31->unk6, var_r31->unkA);
Hu3DModelAttrReset(var_r31->unk6, 0x40000001);
Hu3DModelAttrReset(var_r31->unk6, HU3D_MOTATTR_LOOP);
lbl_1_bss_3C++;
break;
}
if (lbl_1_bss_24.unk8 > lbl_1_bss_24.unkA) {
lbl_1_bss_24.unk8 = 0;
lbl_1_bss_24.unkA = 0xF;
Hu3DModelAttrReset(var_r31->unk4, 0x40000002);
Hu3DModelAttrReset(var_r31->unk4, HU3D_MOTATTR_PAUSE);
lbl_1_bss_24.unk1 = 2;
HuAudFXPlay(0x55B);
HuAudFXPlay(0x55D);
@ -641,9 +641,9 @@ void fn_1_2DCC(omObjData *object)
Hu3DMotionSet(var_r31->unk6, var_r31->unkA);
Hu3DMotionTimeSet(var_r31->unk6, Hu3DMotionMaxTimeGet(var_r31->unk6));
Hu3DMotionSpeedSet(var_r31->unk6, -1.0f);
Hu3DModelAttrReset(var_r31->unk6, 0x40000001);
Hu3DModelAttrReset(var_r31->unk6, HU3D_MOTATTR_LOOP);
Hu3DMotionSpeedSet(var_r31->unk4, -1.0f);
Hu3DModelAttrReset(var_r31->unk4, 0x40000002);
Hu3DModelAttrReset(var_r31->unk4, HU3D_MOTATTR_PAUSE);
fn_1_2414(24, 0x18);
HuAudFXPlay(0x55C);
HuAudFXPlay(0x55D);
@ -680,9 +680,9 @@ void fn_1_2DCC(omObjData *object)
if (var_r31->unkE-- <= 0) {
temp_r30 = &Hu3DData[var_r31->unk2];
if ((var_r31->unkC < 2) && (lbl_1_bss_3C < 0xBU)) {
Hu3DModelAttrReset(var_r31->unk2, 1U);
Hu3DModelAttrReset(var_r31->unk4, 1U);
Hu3DModelAttrReset(var_r31->unk6, 1U);
Hu3DModelAttrReset(var_r31->unk2, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r31->unk4, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r31->unk6, HU3D_ATTR_DISPOFF);
}
var_r31->unk10 += var_f30;
var_f31 = sin((M_PI * (90.0f * var_r31->unk10)) / 180.0);

2
src/REL/m410Dll/game.c
View file

@ -1064,7 +1064,7 @@ void fn_1_7138(omObjData *object)
}
var_r31->unk_1C.x = var_f31;
if (var_r31->unk_00_field4) {
Hu3DModelAttrReset(object->model[var_r29], 0x40000002);
Hu3DModelAttrReset(object->model[var_r29], HU3D_MOTATTR_PAUSE);
Hu3DMotionSpeedSet(object->model[var_r29], 4.0f);
Hu3DMotionSet(object->model[var_r29], 0);
Hu3DMotionClusterNoSet(object->model[var_r29], Hu3DData[object->model[var_r29]].unk_10[0], 0);

10
src/REL/m411Dll/main.c
View file

@ -693,7 +693,7 @@ s32 fn_1_20C8(void)
}
var_r30 = temp_r29->unk00;
Hu3DModelCameraSet(var_r30, 1);
Hu3DModelAttrSet(var_r30, 0x40000040);
Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_SHAPE_LOOP);
}
temp_r29 = &var_r31->unkE4[0];
var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 51), MEMORY_DEFAULT_NUM, HEAP_DATA);
@ -769,7 +769,7 @@ void fn_1_25D0(void)
Hu3DModelCameraSet(temp_r31->unk00, 1 << temp_r31->unk38);
Hu3DModelPosSet(temp_r31->unk00, 0.0f, 0.0f, 0.0f);
Hu3DModelRotSet(temp_r31->unk00, 0.0f, 0.0f, 0.0f);
Hu3DModelAttrSet(temp_r31->unk00, 0x4001);
Hu3DModelAttrSet(temp_r31->unk00, HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
var_r28 = HuDataSelHeapReadNum(lbl_1_data_54[lbl_1_bss_E3C], MEMORY_DEFAULT_NUM, HEAP_DATA);
temp_r31->unk04 = Hu3DModelCreate(var_r28);
var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 14), MEMORY_DEFAULT_NUM, HEAP_DATA);
@ -868,7 +868,7 @@ void fn_1_25D0(void)
if (lbl_1_bss_E40 == 0) {
var_r28 = HuDataSelHeapReadNum(lbl_1_data_260[GWPlayerCfg[i].character], MEMORY_DEFAULT_NUM, HEAP_DATA);
temp_r31->unk20 = Hu3DModelCreate(var_r28);
Hu3DModelAttrSet(temp_r31->unk20, 0x800001);
Hu3DModelAttrSet(temp_r31->unk20, HU3D_ATTR_DISPOFF | HU3D_ATTR_CULL_FRONT);
Hu3DModelCameraSet(temp_r31->unk20, 1);
for (j = 0; j < 9; j++) {
var_r28 = HuDataSelHeapReadNum((u8)lbl_1_data_280[j] + lbl_1_data_2A4[GWPlayerCfg[i].character], MEMORY_DEFAULT_NUM, HEAP_DATA);
@ -1236,9 +1236,9 @@ void fn_1_4454(void)
HuPrcVSleep();
}
Hu3DMotionSet(temp_r31->unk00, temp_r31->unk02[2]);
Hu3DModelAttrReset(temp_r31->unk00, 0x40000001);
Hu3DModelAttrReset(temp_r31->unk00, HU3D_MOTATTR_LOOP);
Hu3DMotionSet(var_r30->unk00, var_r30->unk02[2]);
Hu3DModelAttrReset(var_r30->unk00, 0x40000001);
Hu3DModelAttrReset(var_r30->unk00, HU3D_MOTATTR_LOOP);
while (Hu3DMotionEndCheck(temp_r31->unk00) == 0) {
HuPrcVSleep();
}

26
src/REL/m412Dll/main.c
View file

@ -447,7 +447,7 @@ void fn_1_8BC(void)
temp_r30->unk8 = var_r29 = Hu3DModelLink(var_r29);
Hu3DModelLayerSet(var_r29, 0);
Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(var_r29, 0x800001);
Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF | HU3D_ATTR_CULL_FRONT);
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x1D), MEMORY_DEFAULT_NUM, HEAP_DATA);
temp_r30->unkA = var_r29 = Hu3DModelCreate(var_r27);
Hu3DModelLayerSet(var_r29, 3);
@ -783,9 +783,9 @@ loop_10:
var_r29 = 0x3C;
}
if (var_r29 == lbl_1_data_348[temp_r31->unk28]) {
Hu3DModelAttrReset(temp_r31->unk0, 0x40000002);
Hu3DModelAttrReset(temp_r31->unk2, 0x40000002);
Hu3DModelAttrReset(temp_r31->unk4, 0x40000002);
Hu3DModelAttrReset(temp_r31->unk0, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(temp_r31->unk2, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(temp_r31->unk4, HU3D_MOTATTR_PAUSE);
}
if (var_r25 == Hu3DMotionTimeGet(temp_r31->unk0)) {
temp_r31->unk20 = 1;
@ -823,8 +823,8 @@ loop_10:
temp_r27 = &lbl_1_bss_4D4[var_r26];
Hu3DMotionSet(temp_r31->unk0, temp_r31->unkC[1]);
Hu3DMotionSet(temp_r31->unk2, temp_r31->unkC[1]);
Hu3DModelAttrReset(temp_r31->unk0, 0x40000001);
Hu3DModelAttrReset(temp_r31->unk2, 0x40000001);
Hu3DModelAttrReset(temp_r31->unk0, HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(temp_r31->unk2, HU3D_MOTATTR_LOOP);
var_r29 = Hu3DMotionMaxTimeGet(temp_r31->unk0);
var_f24 = fn_1_1D08(atan2d(temp_r27->unk40.x - temp_r31->unk2C.x, temp_r27->unk40.z - temp_r31->unk2C.z));
temp_f18 = (temp_r27->unk40.x + (50.0 * sind(var_f24)));
@ -967,9 +967,9 @@ loop_1:
HuPrcVSleep();
goto loop_1;
}
Hu3DModelAttrReset(temp_r31->unk0, 0x40000002);
Hu3DModelAttrReset(temp_r31->unk0, HU3D_MOTATTR_PAUSE);
Hu3DModelClusterAttrReset(temp_r31->unk0, 0, -0x3FFFFFFE);
Hu3DModelAttrReset(temp_r31->unk2, 0x40000002);
Hu3DModelAttrReset(temp_r31->unk2, HU3D_MOTATTR_PAUSE);
Hu3DModelClusterAttrReset(temp_r31->unk2, 0, -0x3FFFFFFE);
Hu3DModelAttrReset(temp_r31->unk6, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(temp_r31->unk8, HU3D_ATTR_DISPOFF);
@ -1023,9 +1023,9 @@ loop_1:
}
temp_r27 = &lbl_1_bss_4D4[var_r26];
Hu3DMotionSet(temp_r31->unk0, temp_r31->unkC[3]);
Hu3DModelAttrReset(temp_r31->unk0, 0x40000001);
Hu3DModelAttrReset(temp_r31->unk0, HU3D_MOTATTR_LOOP);
Hu3DMotionSet(temp_r31->unk2, temp_r31->unk16[3]);
Hu3DModelAttrReset(temp_r31->unk2, 0x40000001);
Hu3DModelAttrReset(temp_r31->unk2, HU3D_MOTATTR_LOOP);
var_r29 = Hu3DMotionMaxTimeGet(temp_r31->unk0);
var_f29 = fn_1_1D08(atan2d(temp_r27->unk40.x - temp_r31->unk2C.x, temp_r27->unk40.z - temp_r31->unk2C.z));
sp6C = (temp_r27->unk40.x + (50.0 * sind(var_f29)));
@ -1741,7 +1741,7 @@ loop_6:
Hu3DModelPosSet(temp_r31->unkA, temp_r31->unk40.x + (100.0 * sind(lbl_1_bss_778)), 200.0f + temp_r31->unk40.y,
temp_r31->unk40.z + (100.0 * cosd(lbl_1_bss_778)));
Hu3DModelAttrReset(temp_r31->unkA, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(temp_r31->unkA, 0x40000002);
Hu3DModelAttrReset(temp_r31->unkA, HU3D_MOTATTR_PAUSE);
HuPrcSleep(10);
Hu3DModelAttrSet(temp_r31->unk0, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(temp_r31->unk2, HU3D_MOTATTR_PAUSE);
@ -2037,12 +2037,12 @@ void fn_1_ADC8(void)
var_f31 = Hu3DMotionMaxTimeGet(lbl_1_bss_79E);
for (; var_f31; var_r31++, var_f31--) {
if (var_r31 == 0x33) {
Hu3DModelAttrReset(lbl_1_bss_798[0], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_798[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_798[0], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(lbl_1_bss_798[0], 1465.0f, 770.0f, -2400.0f);
}
if (var_r31 == 0x47) {
Hu3DModelAttrReset(lbl_1_bss_798[1], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_798[1], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_798[1], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(lbl_1_bss_798[1], 1531.0f, 773.0f, -2380.0f);
}

48
src/REL/m414Dll/main.c
View file

@ -687,7 +687,7 @@ void fn_1_1E04(void)
Hu3DModelPosSet(var_r30, 2000.0f * (var_r28 % 2), 330.0f - (330.0f * (var_r29 & 1)), 2000.0f * (var_r28 / 2));
Hu3DModelRotSet(var_r30, 0.0f, 40.0f * ((var_r29 + 2) / 2), 0.0f);
Hu3DModelAttrSet(var_r30, HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(var_r30, 0x40000082);
Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_SHAPE_PAUSE);
Hu3DMotionSpeedSet(var_r30, 3.0f);
Hu3DMotionShapeSpeedSet(var_r30, 3.0f);
}
@ -1070,7 +1070,7 @@ void fn_1_3ECC(void)
HuAudFXPlay(1450);
}
}
Hu3DModelAttrReset(var_r31->unk_D4[var_r30], 0x40000186);
Hu3DModelAttrReset(var_r31->unk_D4[var_r30], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV | HU3D_MOTATTR_SHAPE_PAUSE | HU3D_MOTATTR_SHAPE_REV);
do {
var_r28 = lbl_1_bss_990[var_r30][var_r29++];
if (var_r29 >= 4) {
@ -1085,8 +1085,8 @@ void fn_1_3ECC(void)
}
} while (lbl_1_bss_98C != 5 && var_r31->unk_1F8 != -1 && lbl_1_bss_978 == lbl_1_bss_938[var_r31->unk_1F8]);
Hu3DModelAttrReset(var_r31->unk_D4[var_r30], 0x40000082);
Hu3DModelAttrSet(var_r31->unk_D4[var_r30], 0x40000104);
Hu3DModelAttrReset(var_r31->unk_D4[var_r30], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_SHAPE_PAUSE);
Hu3DModelAttrSet(var_r31->unk_D4[var_r30], HU3D_MOTATTR_REV | HU3D_MOTATTR_SHAPE_REV);
HuPrcSleep(10);
var_f30 = 40.0f * ((var_r30 + 2) / 2);
if (var_r31->unk_70 - var_f30 >= 0.0f) {
@ -1768,14 +1768,14 @@ void fn_1_6644(void)
var_r31->unk_1F8 = -1;
Hu3DMotionSet(var_r31->unk_20, var_r31->unk_22[0]);
Hu3DModelAttrSet(var_r31->unk_20, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(var_r31->unk_20, 0x40000004);
Hu3DModelAttrReset(var_r31->unk_20, HU3D_MOTATTR_REV);
Hu3DMotionSpeedSet(var_r31->unk_20, 2.0f);
}
if (var_r31->unk_1F4 == 5 && Hu3DMotionEndCheck(var_r31->unk_20)) {
var_r31->unk_1F4 = 2;
var_r31->unk_1F8 = -1;
Hu3DMotionSet(var_r31->unk_20, var_r31->unk_22[0]);
Hu3DModelAttrReset(var_r31->unk_20, 0x40000004);
Hu3DModelAttrReset(var_r31->unk_20, HU3D_MOTATTR_REV);
Hu3DMotionTimeSet(var_r31->unk_20, Hu3DMotionMaxTimeGet(var_r31->unk_20));
Hu3DMotionSpeedSet(var_r31->unk_20, 2.0f);
}
@ -1794,12 +1794,12 @@ void fn_1_6644(void)
var_r31->unk_1F4 = 4;
var_r31->unk_1F8 = var_r29;
Hu3DMotionSet(var_r31->unk_20, var_r31->unk_22[1]);
Hu3DModelAttrReset(var_r31->unk_20, 0x40000006);
Hu3DModelAttrReset(var_r31->unk_20, HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
Hu3DMotionSpeedSet(var_r31->unk_20, 1.0f);
var_r30 = HuPrcChildCreate(fn_1_6134, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = var_r31;
if (lbl_1_bss_978 == lbl_1_bss_938[var_r29] && fn_1_65DC(var_r31, var_r29)) {
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000186);
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV | HU3D_MOTATTR_SHAPE_PAUSE | HU3D_MOTATTR_SHAPE_REV);
var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = &sp8C;
sp8C.unk_00 = var_r31;
@ -1812,15 +1812,15 @@ void fn_1_6644(void)
}
else {
HuPrcSleep(10);
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000082);
Hu3DModelAttrSet(var_r31->unk_D4[var_r29], 0x40000104);
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_SHAPE_PAUSE);
Hu3DModelAttrSet(var_r31->unk_D4[var_r29], HU3D_MOTATTR_REV | HU3D_MOTATTR_SHAPE_REV);
HuPrcSleep(10);
omVibrate(var_r31->unk_44, 12, 4, 2);
var_r30 = HuPrcChildCreate(fn_1_1C48, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = var_r31;
fn_1_CD8(0, var_r31->unk_44, 5.0f);
Hu3DModelAttrSet(var_r31->unk_20, 0x40000004);
Hu3DModelAttrSet(var_r31->unk_20, HU3D_MOTATTR_REV);
HuPrcSleep(10);
if (var_r31->unk_44 & 1) {
HuAudFXPlay(1444);
@ -1828,7 +1828,7 @@ void fn_1_6644(void)
else {
HuAudFXPlay(1443);
}
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000004);
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], HU3D_MOTATTR_REV);
HuPrcSleep(10);
}
}
@ -1850,7 +1850,7 @@ void fn_1_6644(void)
var_r30 = HuPrcChildCreate(fn_1_6134, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = var_r31;
if (lbl_1_bss_978 == lbl_1_bss_938[var_r29] && fn_1_65DC(var_r31, var_r29)) {
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000186);
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV | HU3D_MOTATTR_SHAPE_PAUSE | HU3D_MOTATTR_SHAPE_REV);
var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = &sp8C;
sp8C.unk_00 = var_r31;
@ -1863,14 +1863,14 @@ void fn_1_6644(void)
}
else {
HuPrcSleep(10);
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000082);
Hu3DModelAttrSet(var_r31->unk_D4[var_r29], 0x40000104);
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_SHAPE_PAUSE);
Hu3DModelAttrSet(var_r31->unk_D4[var_r29], HU3D_MOTATTR_REV | HU3D_MOTATTR_SHAPE_REV);
HuPrcSleep(10);
omVibrate(var_r31->unk_44, 12, 4, 2);
var_r30 = HuPrcChildCreate(fn_1_1C48, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = var_r31;
fn_1_CD8(0, var_r31->unk_44, 5.0f);
Hu3DModelAttrSet(var_r31->unk_20, 0x40000004);
Hu3DModelAttrSet(var_r31->unk_20, HU3D_MOTATTR_REV);
HuPrcSleep(15);
if (var_r31->unk_44 & 1) {
HuAudFXPlay(1444);
@ -1878,7 +1878,7 @@ void fn_1_6644(void)
else {
HuAudFXPlay(1443);
}
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000004);
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], HU3D_MOTATTR_REV);
HuPrcSleep(15);
}
}
@ -1886,17 +1886,17 @@ void fn_1_6644(void)
}
}
if (fn_1_5554(var_r31->unk_44, 1) > 20 && (var_r31->unk_1F4 == 2 || var_r31->unk_1F4 == 0)) {
Hu3DModelAttrReset(var_r31->unk_20, 0x40000002);
Hu3DModelAttrSet(var_r31->unk_20, 0x40000004);
Hu3DModelAttrReset(var_r31->unk_20, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(var_r31->unk_20, HU3D_MOTATTR_REV);
var_r31->unk_1F4 = 3;
Hu3DModelAttrReset(var_r31->unk_12, 0x40000002);
Hu3DModelAttrSet(var_r31->unk_12, 0x40000004);
Hu3DModelAttrReset(var_r31->unk_12, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(var_r31->unk_12, HU3D_MOTATTR_REV);
Hu3DMotionSpeedSet(var_r31->unk_12, 2.0f);
}
if (fn_1_5554(var_r31->unk_44, 1) < -20 && (var_r31->unk_1F4 == 1 || var_r31->unk_1F4 == 0)) {
Hu3DModelAttrReset(var_r31->unk_20, 0x40000006);
Hu3DModelAttrReset(var_r31->unk_20, HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
var_r31->unk_1F4 = 3;
Hu3DModelAttrReset(var_r31->unk_12, 0x40000006);
Hu3DModelAttrReset(var_r31->unk_12, HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
Hu3DMotionSpeedSet(var_r31->unk_12, 2.0f);
}
if (!var_r31->unk_58) {
@ -2143,7 +2143,7 @@ void fn_1_7FC8(s32 arg0)
for (var_r29 = 0; var_r29 < 4; var_r29++) {
var_r31 = &lbl_1_bss_F0[var_r29];
CharModelMotionSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[5]);
Hu3DModelAttrReset(var_r31->unk_12, 0x40000001);
Hu3DModelAttrReset(var_r31->unk_12, HU3D_MOTATTR_LOOP);
CharModelMotionTimeSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], 61.0f);
CharModelMotionSpeedSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], 2.0f);
}

2
src/REL/m415Dll/main.c
View file

@ -1029,7 +1029,7 @@ void fn_1_3B44(omObjData *object)
}
else {
if ((Hu3DMotionTimeGet(temp_r23) >= 10.0f) && (Hu3DMotionShiftIDGet(temp_r23) < 0)) {
Hu3DModelAttrSet(temp_r23, 0x40000004);
Hu3DModelAttrSet(temp_r23, HU3D_MOTATTR_REV);
}
}
}

4
src/REL/m416Dll/main.c
View file

@ -752,7 +752,7 @@ void fn_1_1D84(omObjData *object)
}
temp_r28 = HU3D_MOTATTR_NONE;
object->rot.y = fn_1_1C80(object->rot.y, 0, 0.2f);
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP);
}
break;
}
@ -984,7 +984,7 @@ void fn_1_361C(omObjData *object)
temp_r29->rot.y = object->rot.y;
Hu3DModelObjPosGet(object->model[0], "test11_tex_we-itemhook-r", &temp_r29->pos);
Hu3DModelHookReset(object->model[0]);
Hu3DModelAttrReset(object->model[1], 0x8000);
Hu3DModelAttrReset(object->model[1], HU3D_ATTR_HOOK);
Hu3DModelShadowReset(object->model[1]);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
}

24
src/REL/m420dll/map.c
View file

@ -508,8 +508,8 @@ void fn_1_5C8C(M420DllUnkMapStruct *arg0)
Hu3DModelAttrReset(arg0->unk_10->unk_02, HU3D_ATTR_DISPOFF);
Hu3DMotionStartEndSet(arg0->unk_00->unk_02, 0.0f, 30.0f);
Hu3DMotionTimeSet(arg0->unk_00->unk_02, 0.0f);
Hu3DModelAttrReset(arg0->unk_00->unk_02, 0x40000002);
Hu3DModelAttrReset(arg0->unk_00->unk_02, 0x40000001);
Hu3DModelAttrReset(arg0->unk_00->unk_02, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->unk_00->unk_02, HU3D_MOTATTR_LOOP);
arg0->unk_34 = 3;
arg0->unk_38 = 0;
arg0->unk_24 = 0.8f;
@ -561,9 +561,9 @@ s32 fn_1_60F0(void)
var_f30 = var_f31 - 5.0f;
Hu3DMotionStartEndSet(lbl_1_bss_9F0[0xF], var_f30, var_f31);
Hu3DMotionTimeSet(lbl_1_bss_9F0[0xF], var_f31);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], 0x40000001);
Hu3DModelAttrSet(lbl_1_bss_9F0[0xF], 0x40000004);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_REV);
lbl_1_bss_B8 = 5;
lbl_1_bss_BC += 1;
if (lbl_1_bss_BC == 6) {
@ -582,9 +582,9 @@ void fn_1_6268(void)
Hu3DMotionStartEndSet(lbl_1_bss_9F0[0xF], var_f31, var_f30);
Hu3DMotionTimeSet(lbl_1_bss_9F0[0xF], var_f31);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], 0x40000001);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], 0x40000004);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_REV);
Hu3DMotionStartEndSet(lbl_1_bss_9F0[0x10], var_f31, var_f30);
Hu3DMotionTimeSet(lbl_1_bss_9F0[0x10], var_f31);
lbl_1_bss_BC = 0;
@ -606,9 +606,9 @@ void fn_1_63EC(void)
Hu3DMotionStartEndSet(lbl_1_bss_9F0[0xF], var_f31, var_f30);
Hu3DMotionTimeSet(lbl_1_bss_9F0[0xF], var_f31);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], 0x40000001);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], 0x40000004);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_REV);
lbl_1_bss_BC = 0;
lbl_1_bss_B8 = 0;
}
@ -1205,7 +1205,7 @@ void fn_1_8414(void)
Hu3DModelAttrSet(var_r31->unk_02, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r27->unk_02, HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(var_r27->unk_02, 0.0f);
Hu3DModelAttrReset(var_r27->unk_02, 0x40000002);
Hu3DModelAttrReset(var_r27->unk_02, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(var_r27->unk_02, HU3D_MOTATTR_LOOP);
HuPrcSleep(0x78);
lbl_1_bss_A2C[3] = NULL;

32
src/REL/m420dll/player.c
View file

@ -330,9 +330,9 @@ void fn_1_22CC(M420DllPlayerStruct *arg0)
CharModelMotionSet(arg0->unk_0A, arg0->unk_AE[5]);
Hu3DMotionStartEndSet(arg0->unk_AC, var_f31, var_f30);
Hu3DMotionTimeSet(arg0->unk_AC, var_f31);
Hu3DModelAttrReset(arg0->unk_AC, 0x40000002);
Hu3DModelAttrReset(arg0->unk_AC, 0x40000001);
Hu3DModelAttrReset(arg0->unk_AC, 0x40000004);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_REV);
arg0->unk_5C[arg0->unk_50++] = 1;
HuAudFXPlay(0x5F4);
fn_1_60F0();
@ -343,9 +343,9 @@ void fn_1_22CC(M420DllPlayerStruct *arg0)
WAITMODECHG(arg0, 1);
}
else {
Hu3DModelAttrReset(arg0->unk_AC, 0x40000002);
Hu3DModelAttrReset(arg0->unk_AC, 0x40000001);
Hu3DModelAttrSet(arg0->unk_AC, 0x40000004);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(arg0->unk_AC, HU3D_MOTATTR_REV);
fn_1_63EC();
while (!Hu3DMotionEndCheck(arg0->unk_AC))
WAITMODECHG(arg0, 1);
@ -358,7 +358,7 @@ void fn_1_22CC(M420DllPlayerStruct *arg0)
CharModelMotionSet(arg0->unk_0A, arg0->unk_AE[5]);
Hu3DMotionStartEndSet(arg0->unk_AC, var_f31, var_f30);
Hu3DMotionTimeSet(arg0->unk_AC, var_f31);
Hu3DModelAttrReset(arg0->unk_AC, 0x40000001);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_LOOP);
}
break;
default:
@ -464,14 +464,14 @@ void fn_1_276C(M420DllPlayerStruct *arg0)
CharModelMotionSet(arg0->unk_0A, arg0->unk_AE[4]);
Hu3DMotionStartEndSet(arg0->unk_AC, var_f31, var_f30);
Hu3DMotionTimeSet(arg0->unk_AC, var_f31);
Hu3DModelAttrReset(arg0->unk_AC, 0x40000002);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_PAUSE);
WAITMODECHG(arg0, 30);
var_f31 = 60.0f;
var_f30 = 70.0f;
CharModelMotionSet(arg0->unk_0A, arg0->unk_AE[4]);
Hu3DMotionStartEndSet(arg0->unk_AC, var_f31, var_f30);
Hu3DMotionTimeSet(arg0->unk_AC, var_f31);
Hu3DModelAttrReset(arg0->unk_AC, 0x40000002);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_PAUSE);
WAITMODECHG(arg0, 30);
break;
@ -511,9 +511,9 @@ void fn_1_2D7C(M420DllPlayerStruct *arg0)
var_f31 = 30.0f;
Hu3DMotionStartEndSet(arg0->unk_AC, var_f30, var_f31);
Hu3DMotionTimeSet(arg0->unk_AC, var_f31);
Hu3DModelAttrReset(arg0->unk_AC, 0x40000002);
Hu3DModelAttrReset(arg0->unk_AC, 0x40000001);
Hu3DModelAttrSet(arg0->unk_AC, 0x40000004);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(arg0->unk_AC, HU3D_MOTATTR_REV);
HuAudFXPlay(0x5F6);
fn_1_6268();
fn_1_5AA8(0, 22.5f);
@ -546,7 +546,7 @@ void fn_1_2EA8(M420DllPlayerStruct *arg0)
CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[3], 0.0f, 1.0f, 0);
var_r30 = fn_1_6660();
Hu3DModelAttrReset(var_r30, 0x40000002);
Hu3DModelAttrReset(var_r30, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP);
Hu3DMotionTimeSet(var_r30, 0.0f);
{
@ -830,9 +830,9 @@ void fn_1_3970(M420DllPlayerStruct *arg0)
}
fn_1_3450(arg0);
if (arg0->unk_4C == 0) {
Hu3DModelAttrReset(arg0->unk_AC, 0x40000002);
Hu3DModelAttrReset(arg0->unk_AC, 0x40000001);
Hu3DModelAttrSet(arg0->unk_AC, 0x40000004);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->unk_AC, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(arg0->unk_AC, HU3D_MOTATTR_REV);
fn_1_63EC();
CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[6], 0.0f, 32.0f, 0);
Hu3DMotionShiftStartEndSet(arg0->unk_AC, 0.0f, 59.0f);

2
src/REL/m426Dll/main.c
View file

@ -2540,7 +2540,7 @@ s32 fn_1_6888(Vec *arg0)
var_r31->unk_14 = arg0->z;
Hu3DMotionTimeSet(var_r31->unk_00, 0.0f);
Hu3DMotionSpeedSet(var_r31->unk_00, 0.5f);
Hu3DModelAttrSet(var_r31->unk_00, 0);
Hu3DModelAttrSet(var_r31->unk_00, HU3D_MOTATTR_NONE);
Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_0C, var_r31->unk_10, var_r31->unk_14);
Hu3DModelScaleSet(var_r31->unk_00, 1.0f, 1.0f, 1.0f);
Hu3DModelAttrReset(var_r31->unk_00, HU3D_ATTR_DISPOFF);

44
src/REL/m429Dll/main.c
View file

@ -1205,7 +1205,7 @@ void fn_1_33F8(omObjData *object)
Hu3DModelCameraSet(object->model[temp_r29], 15);
Hu3DModelAttrSet(object->model[temp_r29], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[temp_r29], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[temp_r29], 0x40000002);
Hu3DModelAttrReset(object->model[temp_r29], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[temp_r29], 3);
Hu3DModelPosSet(object->model[temp_r29], temp_r31->unk0.x, temp_r31->unk0.y, temp_r31->unk0.z);
Hu3DModelRotSet(object->model[temp_r29], 0, 0, 0);
@ -1473,7 +1473,7 @@ void fn_1_50AC(Work8F68 *arg0, omObjData *arg1)
arg0->unk28 = temp_r30->unk0;
arg0->unkA4 = lbl_1_bss_2C[arg0->unk110 >> 1]++;
arg0->unkA0 = (arg0->unk110 & 0x2) + arg0->unkA4;
Hu3DModelAttrReset(arg1->model[0], 0x40000001);
Hu3DModelAttrReset(arg1->model[0], HU3D_MOTATTR_LOOP);
if (!arg0->unkA4) {
arg0->unkA8 = 5;
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[5], 0, 10, HU3D_MOTATTR_NONE);
@ -1528,7 +1528,7 @@ void fn_1_54BC(Work8F68 *arg0, omObjData *arg1)
else {
arg0->unkAC = 9;
}
Hu3DModelAttrSet(arg1->model[0], 0x40000201);
Hu3DModelAttrSet(arg1->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_OVL_LOOP);
Hu3DMotionSet(arg1->model[0], arg1->motion[0]);
Hu3DMotionOverlaySet(arg1->model[0], arg1->motion[arg0->unkAC]);
}
@ -1913,8 +1913,8 @@ void fn_1_7D38(omObjData *object)
Hu3DMotionSet(object->model[0], object->motion[6]);
}
Hu3DMotionTimeSet(object->model[0], Hu3DMotionMaxTimeGet(object->model[0]) - 1);
Hu3DModelAttrReset(object->model[0], 0x40000003);
Hu3DModelAttrSet(object->model[0], 0x40000004);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_REV);
temp_r31->unk40.x = 0;
temp_r31->unk40.z = 0;
omSetRot(lbl_1_bss_1A0[temp_r31->unkA0], temp_r31->unk40.x, temp_r31->unk40.y, temp_r31->unk40.z);
@ -1972,7 +1972,7 @@ void fn_1_7D38(omObjData *object)
Hu3DModelPosSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], sp8.x, sp8.y, sp8.z);
Hu3DModelRotSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], 0, lbl_1_bss_110, 0);
Hu3DModelAttrReset(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], HU3D_MOTATTR_LOOP);
}
}
@ -1993,7 +1993,7 @@ void fn_1_7D38(omObjData *object)
temp_r31->unk9C++;
temp_r31->unk5C = 0;
if (temp_r31->unkA4 == 1) {
Hu3DModelAttrReset(lbl_1_bss_1A0[temp_r31->unkA0]->model[0], 0x40000003);
Hu3DModelAttrReset(lbl_1_bss_1A0[temp_r31->unkA0]->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DMotionSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[0], lbl_1_bss_1A0[temp_r31->unkA0]->motion[0]);
HuAudFXPlay(1649);
}
@ -2006,7 +2006,7 @@ void fn_1_7D38(omObjData *object)
if (20.0f == temp_r31->unk5C) {
temp_r31->unk60 = temp_r31->unk64;
if (temp_r31->unkA4 == 0) {
Hu3DModelAttrReset(lbl_1_bss_1A0[temp_r31->unkA0]->model[0], 0x40000003);
Hu3DModelAttrReset(lbl_1_bss_1A0[temp_r31->unkA0]->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DMotionSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[0], lbl_1_bss_1A0[temp_r31->unkA0]->motion[0]);
HuAudFXPlay(1648);
}
@ -2020,7 +2020,7 @@ void fn_1_7D38(omObjData *object)
case 2007:
if ((temp_r31->unk110 & 0x1) < lbl_1_bss_20) {
temp_r31->unk9C = 2008;
Hu3DModelAttrReset(object->model[0], 0x40000004);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_REV);
Hu3DMotionShiftSet(object->model[0], object->motion[3], 0, 8, HU3D_MOTATTR_NONE);
}
break;
@ -2185,7 +2185,7 @@ void fn_1_99F0(omObjData *object)
Hu3DModelCameraSet(object->model[temp_r30], 15);
Hu3DModelAttrSet(object->model[temp_r30], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[temp_r30], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[temp_r30], 0x40000001);
Hu3DModelAttrReset(object->model[temp_r30], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[temp_r30], 3);
Hu3DModelShadowSet(object->model[temp_r30]);
}
@ -2537,8 +2537,8 @@ void fn_1_B8E0(omObjData *object)
fn_1_1F58(100);
lbl_1_bss_12C = 0;
if (lbl_1_bss_28 >= 0) {
Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[3], 0x40000002);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[3], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF);
}
}
@ -2555,7 +2555,7 @@ void fn_1_B8E0(omObjData *object)
if (lbl_1_bss_28 >= 0 && 60.0f == lbl_1_bss_12C) {
Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[4], 0x40000002);
Hu3DModelAttrReset(object->model[4], HU3D_MOTATTR_PAUSE);
}
if (60.0f < lbl_1_bss_12C && !MGSeqStatGet(lbl_1_bss_2FE)) {
lbl_1_bss_2FE = -1;
@ -2713,38 +2713,38 @@ void fn_1_D5E8(omObjData *object)
}
object->model[0] = Hu3DModelCreateFile(lbl_1_bss_190->unk8[1]);
Hu3DModelCameraSet(object->model[0], 15);
Hu3DModelAttrSet(object->model[0], 0x4001);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[0], 0);
Hu3DModelShadowMapSet(object->model[0]);
omSetTra(object, 0, 0, 0);
omSetRot(object, 0, -90.0f * lbl_1_bss_34, 0);
object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M429, 0x22));
Hu3DModelCameraSet(object->model[1], 15);
Hu3DModelAttrSet(object->model[1], 0x4001);
Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[1], 0);
Hu3DModelShadowMapSet(object->model[1]);
Hu3DModelPosSet(object->model[1], 0, 0, 0);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M429, 0x23));
Hu3DModelCameraSet(object->model[2], 15);
Hu3DModelAttrSet(object->model[2], 0x4001);
Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[2], 0);
Hu3DModelPosSet(object->model[2], 0, 0, 0);
object->model[3] = Hu3DModelCreateFile(lbl_1_bss_190->unk8[2]);
Hu3DModelCameraSet(object->model[3], 15);
Hu3DModelAttrSet(object->model[3], 0x4001);
Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[3], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[3], 0x40000001);
Hu3DModelAttrReset(object->model[3], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[3], 1);
Hu3DModelPosSet(object->model[3], 0, 0, 0);
Hu3DModelRotSet(object->model[3], 0, -90.0f * lbl_1_bss_34, 0);
object->model[4] = Hu3DModelCreateFile(lbl_1_bss_190->unk8[3]);
Hu3DModelCameraSet(object->model[4], 15);
Hu3DModelAttrSet(object->model[4], 0x4001);
Hu3DModelAttrSet(object->model[4], 0x40000003);
Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[4], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[4], 1);
Hu3DModelPosSet(object->model[4], 0, 0, 0);
Hu3DModelRotSet(object->model[4], 0, -90.0f * lbl_1_bss_34, 0);
@ -2847,7 +2847,7 @@ void ObjectSetup(void)
}
lbl_1_bss_1A = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M429, 0x2F));
Hu3DModelAttrSet(lbl_1_bss_1A, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_1A, 0x40000003);
Hu3DModelAttrSet(lbl_1_bss_1A, HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
omMakeGroupEx(lbl_1_bss_33C, 3, 20);
lbl_1_bss_198 = omGetGroupMemberListEx(lbl_1_bss_33C, 3);
lbl_1_bss_1A8 = omAddObjEx(lbl_1_bss_33C, 104, 5, 0, -1, fn_1_31AC);

2
src/REL/m431Dll/main.c
View file

@ -1379,7 +1379,7 @@ s16 fn_1_4B14(s16 arg0, s16 arg1, s16 *arg2)
temp_r31->unk18 = 0;
temp_r31->unk20 = 1;
Hu3DMotionTimeSet(lbl_1_bss_2C->model[arg0 + 1], 0);
Hu3DModelAttrReset(lbl_1_bss_2C->model[arg0 + 1], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_2C->model[arg0 + 1], HU3D_MOTATTR_PAUSE);
HuAudFXPlay(9);
break;
}

5
src/REL/m431Dll/object.c
View file

@ -2,7 +2,6 @@
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/audio.h"
#include "game/gamework_data.h"
#include "game/minigame_seq.h"
@ -12,11 +11,9 @@
#include "game/sprite.h"
#include "game/wipe.h"
#include "REL/m431Dll.h"
#include "ext_math.h"
typedef struct bss_struct_62C {
u8 unk0;
float unk4;
@ -1215,7 +1212,7 @@ void fn_1_B18C(omObjData *object)
}
}
else {
Hu3DModelAttrReset(object->model[0], 0x40000007);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
switch (temp_r31->unk0 & 0xC) {
case 0:
temp_r28 = HU3D_MOTATTR_PAUSE;

16
src/REL/m438Dll/main.c
View file

@ -1672,8 +1672,8 @@ void fn_1_4724(omObjData *object)
// var_r30->unk_138 = var_f31;
// break;
// case 5:
// Hu3DModelAttrReset(*var_r29->model, 0x40000001);
// Hu3DModelAttrSet(*var_r29->model, 0x40000004);
// Hu3DModelAttrReset(*var_r29->model, HU3D_MOTATTR_LOOP);
// Hu3DModelAttrSet(*var_r29->model, HU3D_MOTATTR_REV);
// var_r29->func = fn_1_4F50;
// var_r29->work[0] = 0xA;
// var_r29->work[1] = 0;
@ -1789,7 +1789,7 @@ void fn_1_4724(omObjData *object)
// var_r31->unk_02 = temp_r0;
// if (temp_r0 == 0) {
// HuAudFXEmiterPlay(0x700, var_r31 + 0x10);
// Hu3DModelAttrReset(*var_r30->model, 0x40000002);
// Hu3DModelAttrReset(*var_r30->model, HU3D_MOTATTR_PAUSE);
// Hu3DModelAttrSet(*var_r30->model, HU3D_MOTATTR_LOOP);
// var_r31->unk_1C = 0.0f;
// var_r31->unk_00 = var_r31->unk_00 + 1;
@ -1852,8 +1852,8 @@ void fn_1_4724(omObjData *object)
// var_r31->unk_34 = var_r31->unk_10;
// var_r31->unk_38 = var_r31->unk_14;
// var_r31->unk_3C = var_r31->unk_18;
// Hu3DModelAttrReset(*var_r30->model, 0x40000001);
// Hu3DModelAttrSet(*var_r30->model, 0x40000004);
// Hu3DModelAttrReset(*var_r30->model, HU3D_MOTATTR_LOOP);
// Hu3DModelAttrSet(*var_r30->model, HU3D_MOTATTR_REV);
// var_r31->unk_44 = var_r31->unk_44 + 8.0f;
// var_r31->unk_40 = 10.0 * sind(var_r31->unk_44);
// var_r31->unk_48 = 10.0 * cosd(var_r31->unk_44);
@ -1877,15 +1877,15 @@ void fn_1_4724(omObjData *object)
// case 8:
// var_r31->unk_24 = 0.0f;
// var_r31->unk_1C = 0.0f;
// Hu3DModelAttrReset(*var_r30->model, 0x40000001);
// Hu3DModelAttrSet(*var_r30->model, 0x40000004);
// Hu3DModelAttrReset(*var_r30->model, HU3D_MOTATTR_LOOP);
// Hu3DModelAttrSet(*var_r30->model, HU3D_MOTATTR_REV);
// break;
// case 9:
// var_r31->unk_20 = fn_1_7EDC(var_r31->unk_20, 0.0f, 0.9f);
// break;
// case 10:
// if (var_r31->unk_04 == 0) {
// Hu3DModelAttrReset(*var_r30->model, 0x40000006);
// Hu3DModelAttrReset(*var_r30->model, HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
// Hu3DMotionSet(*var_r30->model, var_r30->motion->unk_02);
// Hu3DMotionSpeedSet(*var_r30->model, 1.0f);
// Hu3DModelAttrSet(*var_r30->model, HU3D_MOTATTR_LOOP);

10
src/REL/m440Dll/main.c
View file

@ -480,7 +480,7 @@ void fn_1_19B0(void)
temp_f31 = 0.1f * ((((rand8() << 8) | rand8()) % 11) + 25);
Hu3DModelScaleSet(lbl_1_bss_10[var_r31], temp_f31, temp_f31, temp_f31);
Hu3DModelAttrReset(lbl_1_bss_10[var_r31], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_10[var_r31], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_10[var_r31], HU3D_MOTATTR_PAUSE);
}
}
@ -613,7 +613,7 @@ void fn_1_2470(omObjData *arg0)
arg0->model[7] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x07));
temp_r26 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x01));
Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(arg0->model[2], 0x20000);
Hu3DModelAttrSet(arg0->model[2], HU3D_ATTR_HILITE);
Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(temp_r26, HU3D_ATTR_DISPOFF);
@ -783,7 +783,7 @@ void fn_1_2D28(omObjData *object)
temp_r31->rot.y = (360.0f * var_f31);
break;
case 0x3:
Hu3DModelAttrReset(object->model[3], 0x40000002);
Hu3DModelAttrReset(object->model[3], HU3D_MOTATTR_PAUSE);
Hu3DMotionSpeedSet(object->model[3], 2.0f);
if (lbl_1_data_F0[0] == 0) {
HuAudFXPlay(0x711);
@ -864,7 +864,7 @@ void fn_1_3DD8(omObjData *object)
sp8 = (unkStruct *)object->data;
switch (lbl_1_data_EC[0]) {
case 0:
Hu3DModelAttrReset(object->model[2], 0x40000002);
Hu3DModelAttrReset(object->model[2], HU3D_MOTATTR_PAUSE);
lbl_1_data_EC[0]++;
return;
case 1:
@ -904,7 +904,7 @@ void fn_1_3DD8(omObjData *object)
var_f31 = 0.1f * ((((rand8() << 8) | rand8()) % 11) + 0x19);
Hu3DModelScaleSet(lbl_1_bss_10[var_r29], var_f31, var_f31, var_f31);
Hu3DModelAttrReset(lbl_1_bss_10[var_r29], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_10[var_r29], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_10[var_r29], HU3D_MOTATTR_PAUSE);
}
fn_1_45BC(object);
fn_1_4EEC(7, 5);

38
src/REL/m441Dll/main.c
View file

@ -959,7 +959,7 @@ void fn_1_3C00(omObjData *object)
work->unk98 = 2005;
work->unk64.x = 10;
work->unkE4 = 0;
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 8, HU3D_MOTATTR_NONE);
Hu3DMotionSet(object->model[1], object->motion[11]);
HuAudFXEmiterPlay(1814, &work->unk4);
@ -968,7 +968,7 @@ void fn_1_3C00(omObjData *object)
work->unk98 = 2005;
work->unk64.x = 10;
work->unkE4 = 0;
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(object->model[0], object->motion[5], 0, 8, HU3D_MOTATTR_NONE);
Hu3DMotionSet(object->model[1], object->motion[11]);
HuAudFXEmiterPlay(1814, &work->unk4);
@ -1031,7 +1031,7 @@ void fn_1_40A8(omObjData *object)
if (lbl_1_bss_4C->work[0] == 1002 && 90.0f < lbl_1_bss_28) {
work->unk98++;
work->unk64.x = 10.0f;
Hu3DModelAttrReset(object->model[0], 0x40000003);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 10, HU3D_MOTATTR_NONE);
Hu3DMotionSet(object->model[1], object->motion[11]);
HuAudFXEmiterPlay(1814, &work->unk4);
@ -1146,7 +1146,7 @@ void fn_1_40A8(omObjData *object)
if (lbl_1_bss_4C->work[0] == 1007) {
work->unk98++;
work->unk64.x = 10.0f;
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(object->model[0], object->motion[8], 0, 8, HU3D_MOTATTR_NONE);
work->unk64.y = -90;
fn_1_40A8InlineFunc(&pos3D, work->unk4.x, 250, work->unk4.z);
@ -1331,7 +1331,7 @@ void fn_1_53E8(omObjData *object)
object->motion[i] = Hu3DJointMotionFile(object->model[1], lbl_1_data_2B0[i - 11]);
}
Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[1], 0x40000001);
Hu3DModelAttrReset(object->model[1], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[1], 2);
Hu3DModelHookSet(object->model[0], CharModelHookNameGet(work->unkB4, 2, 0), object->model[1]);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x42));
@ -1339,7 +1339,7 @@ void fn_1_53E8(omObjData *object)
object->motion[i] = Hu3DJointMotionFile(object->model[2], lbl_1_data_2B8[i - 13]);
}
Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[2], 0x40000001);
Hu3DModelAttrReset(object->model[2], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[2], 2);
Hu3DModelHookSet(object->model[0], CharModelHookNameGet(work->unkB4, 2, 4), object->model[2]);
for (i = 0; i < 4; i++) {
@ -1571,7 +1571,7 @@ void fn_1_713C(omObjData *object)
object->model[0] = mdlId;
}
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000003);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[0], 3);
Hu3DModelShadowSet(object->model[0]);
scale = &lbl_1_data_32C[object->work[0]];
@ -1590,7 +1590,7 @@ void fn_1_713C(omObjData *object)
Hu3DParticleBlendModeSet(Hu3DParManModelIDGet(work->unk30), 1);
Hu3DModelLayerSet(Hu3DParManModelIDGet(work->unk30), 4);
}
Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_1_5C04;
}
@ -1744,7 +1744,7 @@ void fn_1_8518(omObjData *object)
work->unk18.y = 6.0f;
work->unk18.x = (frandf() * 60.0f) - 30.0f;
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000003);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[0], 3);
Hu3DModelShadowSet(object->model[0]);
scale = &lbl_1_data_32C[object->work[0]];
@ -1763,7 +1763,7 @@ void fn_1_8518(omObjData *object)
Hu3DParticleBlendModeSet(Hu3DParManModelIDGet(work->unk30), 1);
Hu3DModelLayerSet(Hu3DParManModelIDGet(work->unk30), 4);
}
Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_1_803C;
}
@ -1797,13 +1797,13 @@ s32 fn_1_8AA0(s32 arg0)
}
else {
s16 model = Hu3DModelLink(lbl_1_bss_10[0]);
Hu3DModelAttrSet(model, 0x4001);
Hu3DModelAttrSet(model, 0x40000003);
Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(model, 1);
Hu3DMotionTimeSet(model, Hu3DMotionMaxTimeGet(model) * frandf());
Hu3DModelPosSet(model, ((radius * sind(angle)) + (frandf() * 20.0f)) - 10, -60.0f, radius * cosd(angle));
Hu3DModelScaleSet(model, 2, 2, 2);
Hu3DModelAttrReset(model, 0x40000002);
Hu3DModelAttrReset(model, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(model, HU3D_ATTR_DISPOFF);
return 1;
}
@ -2005,28 +2005,28 @@ void fn_1_9F40(omObjData *object)
lbl_1_bss_24 = 0;
object->work[0] = 1000;
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x38));
Hu3DModelAttrSet(object->model[0], 0x4001);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[0], 0);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelShadowMapSet(object->model[0]);
omSetTra(object, 0, -31, 0);
object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x39));
Hu3DModelAttrSet(object->model[1], 0x4001);
Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[1], 0);
Hu3DModelPosSet(object->model[1], 0, -31, 0);
Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x3A));
Hu3DModelAttrSet(object->model[2], 0x4001);
Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[2], 0);
Hu3DModelPosSet(object->model[2], 0, -31, 0);
Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
for (singleNo = 0; singleNo < 1; singleNo++) {
lbl_1_bss_10[singleNo] = Hu3DModelCreateFile(lbl_1_data_368[singleNo]);
Hu3DModelAttrSet(lbl_1_bss_10[singleNo], 0x4001);
Hu3DModelAttrSet(lbl_1_bss_10[singleNo], 0x40000003);
Hu3DModelAttrSet(lbl_1_bss_10[singleNo], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(lbl_1_bss_10[singleNo], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
}
for (i = 0, angleNo = 0; i < 30;) {
if (fn_1_8AA0(angleNo++) != 0) {
@ -2082,7 +2082,7 @@ void ObjectSetup(void)
lbl_1_bss_18[i] = 0;
lbl_1_bss_12[i] = Hu3DModelCreateFile(lbl_1_data_314[i]);
Hu3DModelAttrSet(lbl_1_bss_12[i], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_12[i], 0x40000003);
Hu3DModelAttrSet(lbl_1_bss_12[i], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
}
for (i = 0; i < 20; i++) {
fn_1_74F4(0);

4
src/REL/m443Dll/player.c
View file

@ -804,7 +804,7 @@ void fn_1_7340(omObjData *object)
if (temp_r31->unk78 >= 40000.0f) {
if (temp_r31->unk7C >= 30.0f) {
Hu3DMotionSpeedSet(object->model[2], 1.0f);
Hu3DModelAttrReset(object->model[2], 1U);
Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
if (fn_1_42E4() == 2) {
HuAudFXPlay(0x733);
}
@ -987,7 +987,7 @@ void fn_1_8508(omObjData *object)
temp_r31->unk14[var_r30] = -1;
if (lbl_1_data_410[var_r30][0] != 0) {
temp_r31->unk14[var_r30] = espEntry(lbl_1_data_410[var_r30][0], lbl_1_data_410[var_r30][1], 0);
espAttrSet(temp_r31->unk14[var_r30], 8);
espAttrSet(temp_r31->unk14[var_r30], HUSPR_ATTR_LINEAR);
espDispOff(temp_r31->unk14[var_r30]);
}
}

14
src/REL/m444dll/main.c
View file

@ -264,7 +264,7 @@ void fn_1_470(void)
HuWinExAnimOut(temp_r30);
HuWinExCleanup(temp_r30);
HuWinComKeyReset();
Hu3DModelAttrReset(lbl_1_bss_199C2[11], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_199C2[11], HU3D_MOTATTR_PAUSE);
HuAudFXPlay(1854);
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[24], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 < 20; temp_r31++) {
@ -286,7 +286,7 @@ void fn_1_470(void)
}
HuAudFXPlay(1856);
fn_1_861C(0);
Hu3DModelAttrReset(lbl_1_bss_199C2[9], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_199C2[9], HU3D_MOTATTR_PAUSE);
HuAudFXPlay(1863);
while (Hu3DMotionTimeGet(lbl_1_bss_199C2[9]) < lbl_1_data_140[0]) {
HuPrcVSleep();
@ -374,7 +374,7 @@ void fn_1_470(void)
}
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[27], 0, 10, HU3D_MOTATTR_LOOP);
fn_1_861C(1);
Hu3DModelAttrReset(lbl_1_bss_199C2[9], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_199C2[9], HU3D_MOTATTR_PAUSE);
HuAudFXPlay(1862);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 < 20; temp_r31++) {
@ -458,7 +458,7 @@ void fn_1_470(void)
}
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[31], 0, 10, HU3D_MOTATTR_LOOP);
fn_1_861C(2);
Hu3DModelAttrReset(lbl_1_bss_199C2[9], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_199C2[9], HU3D_MOTATTR_PAUSE);
HuAudFXPlay(1862);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 < 20; temp_r31++) {
@ -512,13 +512,13 @@ void fn_1_470(void)
HuPrcVSleep();
}
HuAudFXPlay(1862);
Hu3DModelAttrReset(lbl_1_bss_199C2[9], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_199C2[9], HU3D_MOTATTR_PAUSE);
while (Hu3DMotionEndCheck(lbl_1_bss_199C2[9]) == 0) {
HuPrcVSleep();
}
Hu3DModelAttrReset(lbl_1_bss_199C2[11], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_199C2[11], HU3D_MOTATTR_PAUSE);
HuAudFXPlay(1855);
Hu3DModelAttrSet(lbl_1_bss_199C2[11], 0x40000004);
Hu3DModelAttrSet(lbl_1_bss_199C2[11], HU3D_MOTATTR_REV);
while (Hu3DMotionTimeGet(lbl_1_bss_199C2[11]) > 0.0f) {
if (Hu3DMotionTimeGet(lbl_1_bss_199C2[11]) == 25.0f) {
HuAudFXPlay(1854);

4
src/REL/m444dll/pinball.c
View file

@ -173,7 +173,7 @@ s16 fn_1_8DD0(s16 arg0)
float sp8 = 0;
Hu3DMotionTimeSet(lbl_1_bss_199C2[9], lbl_1_data_258[arg0]);
Hu3DModelAttrSet(lbl_1_bss_199C2[9], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_199C2[arg0 + 65], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_199C2[arg0 + 65], HU3D_MOTATTR_PAUSE);
Hu3DMotionSpeedSet(lbl_1_bss_199C2[arg0 + 65], 0.1 * (-lbl_1_bss_1888.y - 14.0f) + 1.0);
temp_r28 = 0;
spC.z = spC.y = spC.x = 0;
@ -223,7 +223,7 @@ s16 fn_1_8DD0(s16 arg0)
lbl_1_bss_18F0[lbl_1_bss_1884].y = -500;
lbl_1_bss_18F0[lbl_1_bss_1884].z = 0;
lbl_1_bss_1884++;
Hu3DModelAttrReset(lbl_1_bss_199C2[arg0 + 55], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_199C2[arg0 + 55], HU3D_MOTATTR_PAUSE);
Hu3DMotionTimeSet(lbl_1_bss_199C2[arg0 + 55], 0);
temp_r28 = 1;
}

44
src/REL/m445Dll/main.c
View file

@ -779,7 +779,7 @@ void fn_1_1C64(void)
else {
Hu3DMotionSet(temp_r31->unk00, temp_r31->unk02[1]);
}
Hu3DModelAttrReset(temp_r31->unk00, 0x40000005);
Hu3DModelAttrReset(temp_r31->unk00, HU3D_MOTATTR_LOOP | HU3D_MOTATTR_REV);
while (!Hu3DMotionEndCheck(temp_r31->unk00)) {
temp_r31->unk44++;
HuPrcVSleep();
@ -801,7 +801,7 @@ void fn_1_1C64(void)
Hu3DModelAttrSet(var_r25->unk28, HU3D_MOTATTR_PAUSE);
if (temp_r31->unk14 == 6) {
HuPrcSleep(12);
Hu3DModelAttrReset(var_r25->unk28, 0x40000006);
Hu3DModelAttrReset(var_r25->unk28, HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
if (temp_r31->unk38 != 0) {
fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x758);
}
@ -811,7 +811,7 @@ void fn_1_1C64(void)
}
if (temp_r31->unk14 == 7) {
HuPrcSleep(11);
Hu3DModelAttrReset(var_r25->unk28, 0x40000006);
Hu3DModelAttrReset(var_r25->unk28, HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x754);
Hu3DModelAttrReset(lbl_1_bss_6E0, HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(lbl_1_bss_6E0, 0.0f);
@ -827,10 +827,10 @@ void fn_1_1C64(void)
else {
fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x757);
}
Hu3DModelAttrReset(var_r25->unk28, 0x40000006);
Hu3DModelAttrReset(var_r25->unk28, HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
if (lbl_1_data_260[temp_r31->unk14] > 1) {
Hu3DMotionSet(var_r29->unk28, var_r29->unk08[temp_r31->unk0C + 1]);
Hu3DModelAttrReset(var_r29->unk28, 0x40000006);
Hu3DModelAttrReset(var_r29->unk28, HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
}
}
while (!Hu3DMotionEndCheck(var_r25->unk28)) {
@ -850,7 +850,7 @@ void fn_1_1C64(void)
if (temp_r31->unk20[0] == 1) {
temp_r31->unk20[0] = 2;
Hu3DMotionSet(var_r25->unk28, var_r25->unk08[temp_r31->unk0C + 3]);
Hu3DModelAttrReset(var_r25->unk28, 0x40000001);
Hu3DModelAttrReset(var_r25->unk28, HU3D_MOTATTR_LOOP);
if (temp_r31->unk38 != 0) {
if (temp_r31->unk28 != 0) {
fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x75C);
@ -871,7 +871,7 @@ void fn_1_1C64(void)
if (temp_r31->unk20[1] == 1) {
temp_r31->unk20[1] = 2;
Hu3DMotionSet(var_r29->unk28, var_r29->unk08[temp_r31->unk0C + 3]);
Hu3DModelAttrReset(var_r29->unk28, 0x40000001);
Hu3DModelAttrReset(var_r29->unk28, HU3D_MOTATTR_LOOP);
if (temp_r31->unk38 != 0) {
if (temp_r31->unk2C != 0) {
fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x75C);
@ -918,16 +918,16 @@ void fn_1_1C64(void)
Hu3DMotionSet(var_r25->unk28, var_r25->unk08[temp_r31->unk0C + 1]);
Hu3DMotionTimeSet(var_r25->unk28, Hu3DMotionMaxTimeGet(var_r25->unk28));
Hu3DMotionSpeedSet(var_r25->unk28, 2.0f);
Hu3DModelAttrSet(var_r25->unk28, 0x40000004);
Hu3DModelAttrReset(var_r25->unk28, 0x40000001);
Hu3DModelAttrSet(var_r25->unk28, HU3D_MOTATTR_REV);
Hu3DModelAttrReset(var_r25->unk28, HU3D_MOTATTR_LOOP);
}
if (lbl_1_data_260[temp_r31->unk14] > 1 && temp_r31->unk20[1] == 0) {
var_r29->unk34 = 0;
Hu3DMotionSet(var_r29->unk28, var_r29->unk08[temp_r31->unk0C + 1]);
Hu3DMotionTimeSet(var_r29->unk28, Hu3DMotionMaxTimeGet(var_r29->unk28));
Hu3DMotionSpeedSet(var_r29->unk28, 2.0f);
Hu3DModelAttrSet(var_r29->unk28, 0x40000004);
Hu3DModelAttrReset(var_r29->unk28, 0x40000001);
Hu3DModelAttrSet(var_r29->unk28, HU3D_MOTATTR_REV);
Hu3DModelAttrReset(var_r29->unk28, HU3D_MOTATTR_LOOP);
}
if (lbl_1_data_260[temp_r31->unk14] > 1) {
while (!Hu3DMotionEndCheck(var_r25->unk28) || !Hu3DMotionEndCheck(var_r29->unk28)) {
@ -944,14 +944,14 @@ void fn_1_1C64(void)
if (lbl_1_data_260[temp_r31->unk14] > 1) {
Hu3DMotionSpeedSet(var_r29->unk28, 1.0f);
}
Hu3DModelAttrSet(temp_r31->unk00, 0x40000004);
Hu3DModelAttrSet(temp_r31->unk00, HU3D_MOTATTR_REV);
if (temp_r31->unk14 == 6 && temp_r31->unk20[0] == 0) {
HuPrcSleep(26);
Hu3DMotionSet(var_r25->unk28, var_r25->unk08[temp_r31->unk0C + 1]);
Hu3DMotionTimeSet(var_r25->unk28, Hu3DMotionMaxTimeGet(var_r25->unk28));
Hu3DMotionSpeedSet(var_r25->unk28, 2.0f);
Hu3DModelAttrSet(var_r25->unk28, 0x40000004);
Hu3DModelAttrReset(var_r25->unk28, 0x40000001);
Hu3DModelAttrSet(var_r25->unk28, HU3D_MOTATTR_REV);
Hu3DModelAttrReset(var_r25->unk28, HU3D_MOTATTR_LOOP);
}
while (!Hu3DMotionEndCheck(temp_r31->unk00)) {
HuPrcVSleep();
@ -1599,7 +1599,7 @@ void fn_1_6268(void)
Hu3DMotionSet(temp_r31->unk00, temp_r31->unk08[4]);
Hu3DMotionSpeedSet(temp_r31->unk00, 1.0f);
}
Hu3DModelAttrReset(temp_r31->unk00, 0x40000001);
Hu3DModelAttrReset(temp_r31->unk00, HU3D_MOTATTR_LOOP);
HuPrcSleep(15);
if (temp_r31->unk18 != 0) {
fn_1_4B8(temp_r31->unk34, temp_r31->unk3C, 0x75F);
@ -1663,10 +1663,10 @@ void fn_1_6268(void)
temp_r31->unk24 = 0;
if (fn_1_520(temp_r31->unk18) == FALSE) {
CharModelMotionSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[0]);
Hu3DModelAttrSet(temp_r31->unk00, 0x40000200);
Hu3DModelAttrSet(temp_r31->unk00, HU3D_MOTATTR_OVL_LOOP);
if (lbl_1_bss_6DC < 5) {
Hu3DMotionOverlaySet(temp_r31->unk00, temp_r31->unk08[4]);
Hu3DModelAttrSet(temp_r31->unk00, 0x40000200);
Hu3DModelAttrSet(temp_r31->unk00, HU3D_MOTATTR_OVL_LOOP);
}
}
else {
@ -1694,7 +1694,7 @@ void fn_1_6268(void)
lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
if (lbl_1_bss_6DC < 5) {
Hu3DMotionOverlaySet(temp_r31->unk00, temp_r31->unk08[4]);
Hu3DModelAttrSet(temp_r31->unk00, 0x40000200);
Hu3DModelAttrSet(temp_r31->unk00, HU3D_MOTATTR_OVL_LOOP);
}
}
else {
@ -1710,7 +1710,7 @@ void fn_1_6268(void)
lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
if (lbl_1_bss_6DC < 5) {
Hu3DMotionOverlaySet(temp_r31->unk00, temp_r31->unk08[4]);
Hu3DModelAttrSet(temp_r31->unk00, 0x40000200);
Hu3DModelAttrSet(temp_r31->unk00, HU3D_MOTATTR_OVL_LOOP);
}
}
else {
@ -1725,7 +1725,7 @@ void fn_1_6268(void)
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[0], 0.0f, 0.0f, HU3D_MOTATTR_LOOP);
if (lbl_1_bss_6DC < 5) {
Hu3DMotionOverlaySet(temp_r31->unk00, temp_r31->unk08[4]);
Hu3DModelAttrSet(temp_r31->unk00, 0x40000200);
Hu3DModelAttrSet(temp_r31->unk00, HU3D_MOTATTR_OVL_LOOP);
}
}
else {
@ -1923,7 +1923,7 @@ void fn_1_8320(void)
HuPrcSleep(30);
HuAudFXPlay(0x755);
temp_r28 = lbl_1_bss_288[5].unk00;
Hu3DModelAttrReset(temp_r28, 0x40000003);
Hu3DModelAttrReset(temp_r28, HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
while (!Hu3DMotionEndCheck(temp_r28)) {
HuPrcVSleep();
}
@ -1982,7 +1982,7 @@ void fn_1_8320(void)
else {
Hu3DMotionSet(temp_r31->unk00, temp_r31->unk08[3]);
}
Hu3DModelAttrReset(temp_r31->unk00, 0x40000001);
Hu3DModelAttrReset(temp_r31->unk00, HU3D_MOTATTR_LOOP);
}
HuPrcSleep(20);
for (i = 0; i < 2; i++) {

2
src/REL/m446Dll/card.c
View file

@ -302,7 +302,7 @@ unkStruct4 *m446CardCreate(s32 arg0)
Hu3DModelLayerSet(temp_r31->unkA[0], 0);
temp_r31->unkA[1] = Hu3DModelCreateFile(lbl_1_rodata_6C[arg0]);
Hu3DModelAmbSet(temp_r31->unkA[1], 1.0f, 1.0f, 1.0f);
Hu3DModelAttrSet(temp_r31->unkA[1], 0x40000001U);
Hu3DModelAttrSet(temp_r31->unkA[1], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(temp_r31->unkA[0], 0);
fn_1_2A58(temp_r31);
fn_1_2EC0(temp_r31, 1);

2
src/REL/m446Dll/cursor.c
View file

@ -183,7 +183,7 @@ void fn_1_799C(unkStruct7 *arg0)
if (arg0->unk8 == 0) {
for (var_r30 = 0; var_r30 < 9; var_r30++) {
Hu3DModelAttrReset(arg0->unkC[var_r30 + 1], 0x40000002);
Hu3DModelAttrReset(arg0->unkC[var_r30 + 1], HU3D_MOTATTR_PAUSE);
Hu3DMotionTimeSet(arg0->unkC[var_r30 + 1], 0.0f);
}
}

4
src/REL/m446Dll/player.c
View file

@ -257,7 +257,7 @@ unkStruct8 *m446PlayerCreate(s32 arg0, unkStruct6 *arg1)
Hu3DModelShadowSet(var_r31->unk3C[0]);
Hu3DModelShadowSet(var_r31->unk3C[1]);
Hu3DModelPosSet(var_r31->unk3C[1], 0.0f, 100.0f, 0.0f);
Hu3DModelAttrReset(var_r31->unk3C[1], 0x40000001);
Hu3DModelAttrReset(var_r31->unk3C[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(var_r31->unk3C[1], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(var_r31->unk3C[1], 2000.0f, 2000.0f, 2000.0f);
fn_1_637C(var_r31, 0);
@ -762,7 +762,7 @@ void fn_1_6074(unkStruct8 *arg0)
break;
case 4:
if (arg0->unk14 == 1) {
Hu3DModelAttrReset(arg0->unk3C[1], 0x40000001);
Hu3DModelAttrReset(arg0->unk3C[1], HU3D_MOTATTR_LOOP);
}
if (arg0->unk14++ < 0x1E)
break;

14
src/REL/m446Dll/stage.c
View file

@ -122,9 +122,9 @@ unkStruct9 *m446StageCreate(void)
Hu3DModelAttrSet(var_r31->unk0[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk0[3], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(var_r31->unk0[4], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(var_r31->unk0[3], 0x40000001);
Hu3DModelAttrReset(var_r31->unk0[4], 0x40000001);
Hu3DModelAttrReset(var_r31->unk0[2], 0x40000001);
Hu3DModelAttrReset(var_r31->unk0[3], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(var_r31->unk0[4], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(var_r31->unk0[2], HU3D_MOTATTR_LOOP);
for (var_r30 = 0; var_r30 < 3; var_r30++) {
var_r31->unkA[var_r30] = Hu3DGLightCreateV(&lbl_1_data_460[var_r30].unk0, &lbl_1_data_460[var_r30].unkC, &lbl_1_data_460[var_r30].unk18);
@ -180,8 +180,8 @@ void fn_1_84AC(unkStruct9 *arg0)
{
Hu3DModelAttrReset(arg0->unk0[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->unk0[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->unk0[3], 0x40000002);
Hu3DModelAttrReset(arg0->unk0[4], 0x40000002);
Hu3DModelAttrReset(arg0->unk0[3], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->unk0[4], HU3D_MOTATTR_PAUSE);
arg0->unk24 = 1;
arg0->unk1C = 0;
arg0->unk20 = 0;
@ -192,8 +192,8 @@ void fn_1_852C(unkStruct9 *arg0)
{
Hu3DModelAttrSet(arg0->unk0[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk0[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk0[3], 0x40000002U);
Hu3DModelAttrSet(arg0->unk0[4], 0x40000002U);
Hu3DModelAttrSet(arg0->unk0[3], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(arg0->unk0[4], HU3D_MOTATTR_PAUSE);
Hu3DMotionStartEndSet(arg0->unk0[2], 0.0f, 359.0f);
Hu3DMotionStartEndSet(arg0->unk0[3], 0.0f, 119.0f);
Hu3DMotionStartEndSet(arg0->unk0[4], 0.0f, 119.0f);

6
src/REL/m447dll/player.c
View file

@ -588,8 +588,8 @@ void fn_1_5520(UnkM447Struct_04 *arg0)
arg0->unk20 = 6;
/* fallthrough */
case 6:
Hu3DModelAttrReset(arg0->unk68, 0x40000002);
Hu3DModelAttrReset(arg0->unk68, 0x40000001);
Hu3DModelAttrReset(arg0->unk68, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(arg0->unk68, HU3D_MOTATTR_LOOP);
arg0->unk60 = 0;
arg0->unk20 = 7;
/* fallthrough */
@ -613,7 +613,7 @@ void fn_1_5760(UnkM447Struct_04 *arg0)
switch (arg0->unk20) {
case 0:
Hu3DModelAttrReset(arg0->unk68, 0x40000001);
Hu3DModelAttrReset(arg0->unk68, HU3D_MOTATTR_LOOP);
fn_1_71FC(arg0, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
arg0->unk60 = 0;
arg0->unk20 = 1;

4
src/REL/m447dll/stage.c
View file

@ -96,7 +96,7 @@ void fn_1_1F00(UnkM447Struct_06 *arg0, s32 arg1)
s16 temp_r31;
temp_r31 = arg0->unk00[arg1 + 3];
Hu3DModelAttrReset(temp_r31, 0x40000002);
Hu3DModelAttrReset(temp_r31, HU3D_MOTATTR_PAUSE);
Hu3DMotionTimeSet(temp_r31, 0.0f);
Hu3DMotionStartEndSet(temp_r31, 0.0f, 40.0f);
arg0->unk54[arg1] = 1;
@ -377,7 +377,7 @@ void fn_1_2A3C(UnkM447Struct_06 *arg0)
temp_r29 = arg0->unk00[i + 16];
Hu3DModelPosSet(temp_r29, lbl_1_rodata_190[i].x, lbl_1_rodata_190[i].y, lbl_1_rodata_190[i].z);
Hu3DMotionTimeSet(temp_r29, 0.0f);
Hu3DModelAttrReset(temp_r29, 0x40000001);
Hu3DModelAttrReset(temp_r29, HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(temp_r29, HU3D_ATTR_DISPOFF);
}
arg0->unk40 = 0;

4
src/REL/m448Dll/main.c
View file

@ -1360,8 +1360,8 @@ void fn_1_7148(omObjData *arg0)
case 1001:
lbl_1_bss_84++;
if (lbl_1_bss_84 == 1) {
Hu3DModelAttrReset(lbl_1_bss_88->model[1], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_88->model[2], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_88->model[1], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_88->model[2], HU3D_MOTATTR_PAUSE);
}
if (lbl_1_bss_84 > 0 && lbl_1_bss_84 <= 40 && lbl_1_bss_84 % 10 == 0 && lbl_1_bss_9C[12].unk00 < 3) {
lbl_1_bss_9C[12].unk04[lbl_1_bss_9C[12].unk00] = 0.0f;

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

@ -2918,7 +2918,7 @@ void fn_1_AD58(omObjData *object)
omSetSca(object, 1.0f, 1.0f, 1.0f);
Hu3DModelScaleSet(object->model[1], 1.5f, 1.5f, 1.5f);
Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[1], 0x40000002);
Hu3DModelAttrReset(object->model[1], HU3D_MOTATTR_PAUSE);
Hu3DModelHookSet(object->model[1], "g000i00-itemhook_A", object->model[0]);
var_r31->unk_00.unk_6C.x = 0.0f;
var_r31->unk_00.unk_6C.y = 3000.0f;
@ -2979,7 +2979,7 @@ void fn_1_AD58(omObjData *object)
var_r31->unk_154 |= 0x10;
fn_1_AAB0(var_r31, var_r31->unk_C8, 0);
fn_1_17970(object->model[0], object->model[1], var_r31->unk_00.unk_9C - 45.0f);
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(object->model[0], object->motion[10], 0.0f, 8.0f, 0);
}
var_r31->unk_EC += 0.5f;
@ -3186,7 +3186,7 @@ void fn_1_AD58(omObjData *object)
if ((var_r31->unk_154 & 0x10) == 0) {
var_r31->unk_154 |= 0x10;
fn_1_18424(object->model[0], &var_r31->unk_114);
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DMotionSet(object->model[0], object->motion[11]);
}
else if (((var_r31->unk_154 & 0x20) == 0) && (Hu3DMotionShiftIDGet(object->model[0]) < 0)
@ -3256,7 +3256,7 @@ void fn_1_AD58(omObjData *object)
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], 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], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], HU3D_ATTR_DISPOFF);
}
}
@ -3347,9 +3347,9 @@ void fn_1_DBF0(omObjData *object)
fn_1_2C1C(&var_r31->unk_00, object, 4, 9, lbl_1_data_18C, 0, &sp8, 0.0f);
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], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[var_r29], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[var_r29], 0x40000002);
Hu3DModelAttrReset(object->model[var_r29], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[var_r29], 3);
Hu3DModelShadowSet(object->model[var_r29]);
}
@ -3558,7 +3558,7 @@ void fn_1_EB6C(UnkM450Struct3 *arg0, omObjData *arg1)
arg0->unk_108 = 19.6f;
arg0->unk_E0 = 0.0f;
Hu3DMotionSet(arg1->model[0], arg1->motion[6]);
Hu3DModelAttrReset(arg1->model[0], 0x40000001);
Hu3DModelAttrReset(arg1->model[0], HU3D_MOTATTR_LOOP);
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);
@ -3663,7 +3663,7 @@ void fn_1_ED4C(omObjData *object)
var_r31->unk_E8 = 360.0f * frandf();
var_r31->unk_154 |= 2;
Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[4], 0x40000002);
Hu3DModelAttrReset(object->model[4], HU3D_MOTATTR_PAUSE);
Hu3DModelHookSet(object->model[4], "g007i03-itemhook_M", object->model[0]);
var_r31->unk_00.unk_6C.x = 0.0f;
var_r31->unk_00.unk_6C.y = 3000.0f;
@ -3807,7 +3807,7 @@ void fn_1_ED4C(omObjData *object)
var_r31->unk_108 = var_r31->unk_108 - 0.98f;
if (1505.0f >= var_r31->unk_00.unk_6C.y) {
var_r31->unk_00.unk_6C.y = 1505.0f;
Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_PAUSE);
}
}
else if (((var_r31->unk_154 & 0x400) == 0) && (Hu3DMotionEndCheck(object->model[0]) != 0)) {
@ -3904,8 +3904,8 @@ void fn_1_11D5C(omObjData *object)
var_r31->unk_00.unk_3C |= 0x1000;
for (var_r29 = 0; var_r29 < 5; var_r29++) {
object->model[var_r29] = Hu3DModelCreateFile(lbl_1_data_100[var_r29]);
Hu3DModelAttrSet(object->model[var_r29], 0x4001);
Hu3DModelAttrSet(object->model[var_r29], 0x40000003);
Hu3DModelAttrSet(object->model[var_r29], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[var_r29], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[var_r29], 3);
Hu3DModelShadowSet(object->model[var_r29]);
}
@ -3921,7 +3921,7 @@ void fn_1_11D5C(omObjData *object)
object->motion[var_r29] = Hu3DJointMotionFile(object->model[0], var_r26[var_r29]);
}
Hu3DMotionSet(object->model[0], object->motion[7]);
Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_PAUSE);
if (object->work[0] == 0) {
CharModelEffectNpcInit(object->model[0], object->motion[1], 0, 0xD);
CharModelEffectNpcInit(object->model[0], object->motion[2], 1, 0xD);
@ -4065,7 +4065,7 @@ void fn_1_12688(omObjData *object)
omSetSca(object, var_f31, var_f30, var_f31);
Hu3DMotionTimeSet(object->model[0], 0.0f);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_PAUSE);
HuAudFXPlay(0x7C0);
}
}
@ -4082,9 +4082,9 @@ void fn_1_1291C(omObjData *object)
omSetTra(object, 0.0f, 0.0f, 0.0f);
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], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[0], 1);
object->func = fn_1_12688;
}
@ -4512,7 +4512,7 @@ void fn_1_12A1C(omObjData *object)
omSetTra(object, var_f31, 1380.0f, var_f30);
Hu3DMotionTimeSet(object->model[0], 0.0f);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_PAUSE);
}
}
}
@ -4533,9 +4533,9 @@ void fn_1_12B80(omObjData *object)
omSetRot(object, 0.0f, 0.0f, 0.0f);
object->model[0] = fn_1_46C(DATA_MAKE_NUM(DATADIR_M450, 0x23));
Hu3DModelAttrSet(object->model[0], 0x4001);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[0], 1);
object->func = fn_1_12A1C;
}
@ -4565,7 +4565,7 @@ void fn_1_12E5C(s32 var_r30, s32 var_r29, s32 var_r31)
Hu3DModelScaleSet(
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], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31], HU3D_ATTR_DISPOFF);
}
@ -4573,7 +4573,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], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r30], HU3D_ATTR_DISPOFF);
HuAudFXPlay(0x7B7);
}
@ -4984,9 +4984,9 @@ void fn_1_15308(omObjData *object)
omSetRot(object, 0.0f, 0.0f, 0.0f);
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], HU3D_ATTR_DISPOFF | HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(object->model[var_r30], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[var_r30], 0x40000002);
Hu3DModelAttrReset(object->model[var_r30], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[var_r30], 0);
Hu3DModelPosSet(object->model[var_r30], 0.0f, 0.0f, 0.0f);
Hu3DModelRotSet(object->model[var_r30], 0.0f, 0.0f, 0.0f);
@ -5022,7 +5022,7 @@ void fn_1_15308(omObjData *object)
Hu3DModelAttrReset(object->model[19], HU3D_ATTR_DISPOFF);
for (var_r30 = 0; var_r30 < 5; var_r30++) {
Hu3DModelAttrSet(object->model[var_r30 + 0x14], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[var_r30 + 0x14], 0x40000001);
Hu3DModelAttrReset(object->model[var_r30 + 0x14], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[var_r30 + 0x14], HU3D_ATTR_DISPOFF);
}
object->func = fn_1_14CE8;
@ -5269,7 +5269,7 @@ void fn_1_16910(omObjData *object)
}
for (var_r27 = 0; var_r27 < 2; var_r27++) {
Hu3DModelAttrSet(object->model[var_r27], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[var_r27], 0x40000003);
Hu3DModelAttrReset(object->model[var_r27], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[var_r27], 4);
Hu3DMotionTimeSet(object->model[var_r27], 0.0f);
Hu3DModelPosSet(object->model[var_r27], var_r30->unk_00.x, var_r30->unk_00.y, var_r30->unk_00.z);
@ -5383,7 +5383,7 @@ void fn_1_171C4(omObjData *object)
}
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_PAUSE);
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);
@ -5440,7 +5440,7 @@ void fn_1_17474(omObjData *object)
var_r31->unk_00.z = sp80[2][3];
Hu3DModelHookObjReset(var_r31->unk_54, "g000m0-itemhook_R");
MTXIdentity(Hu3DData[object->model[0]].unk_F0);
Hu3DModelAttrReset(object->model[0], 0x8000);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_HOOK);
}
}
var_r31->unk_0C = sp8;
@ -5521,7 +5521,7 @@ void fn_1_17970(s32 arg0, s32 arg1, float arg8)
}
Hu3DModelAttrSet(var_r31->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(var_r31->model[0], 0x40000002);
Hu3DModelAttrReset(var_r31->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(var_r31->model[0], 4);
omSetTra(var_r31, 0.0f, 0.0f, 0.0f);
omSetRot(var_r31, 0.0f, 0.0f, 0.0f);
@ -5556,7 +5556,7 @@ void fn_1_17BBC(omObjData *object)
fn_1_1D18(var_r31->unk_54, "g000m0-itemhook_R", &var_r31->unk_00);
Hu3DModelHookObjReset(var_r31->unk_54, "g000m0-itemhook_R");
MTXIdentity(Hu3DData[*object->model].unk_F0);
Hu3DModelAttrReset(*object->model, 0x8000);
Hu3DModelAttrReset(*object->model, HU3D_ATTR_HOOK);
var_f31 = var_r31->unk_00.x - var_r31->unk_24.x;
var_f30 = var_r31->unk_00.z - var_r31->unk_24.z;
var_r31->unk_30.x = sqrtf((var_f31 * var_f31) + (var_f30 * var_f30)) / 2;
@ -5663,7 +5663,7 @@ void fn_1_18424(s32 arg0, Vec *arg1)
}
Hu3DModelAttrSet(var_r31->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(var_r31->model[0], 0x40000002);
Hu3DModelAttrReset(var_r31->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(var_r31->model[0], 4);
omSetTra(var_r31, 0.0f, 0.0f, 0.0f);
omSetRot(var_r31, 0.0f, 0.0f, 0.0f);
@ -5999,7 +5999,7 @@ void fn_1_19CE0(omObjData *object)
}
if (var_r31->unk_FC & 0x100) {
var_r31->unk_FC |= 0x402;
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DMotionSet(object->model[0], object->motion[14]);
Hu3DMotionTimeSet(object->model[0], 48.0f);
@ -6015,7 +6015,7 @@ void fn_1_19CE0(omObjData *object)
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], 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], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], HU3D_ATTR_DISPOFF);
}
if (var_r31->unk_FC & 0x100000) {
@ -6332,7 +6332,7 @@ void fn_1_1B830(UnkM450Struct5 *arg0)
lbl_1_data_1450[arg0->unk_108].unk_20 = 1;
lbl_1_bss_B8[arg0->unk_10C++] = arg0->unk_108;
Hu3DMotionTimeSet(lbl_1_bss_1A0->model[arg0->unk_108 + 0x14], 0.0f);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[arg0->unk_108 + 0x14], 0x40000003);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[arg0->unk_108 + 0x14], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
if (arg0->unk_10C == 2) {
fn_1_12E5C(lbl_1_bss_B8[0], lbl_1_bss_B8[1], 25);
HuAudFXPlay(0x7B4);
@ -6479,7 +6479,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
if (var_r31->unk_FC & 0x40) {
var_r31->unk_F8 += 1.0f;
if (var_r31->unk_F8 == 15.0f) {
Hu3DModelAttrReset(var_r30->model[0], 0x40000002);
Hu3DModelAttrReset(var_r30->model[0], HU3D_MOTATTR_PAUSE);
}
if ((15.0f < var_r31->unk_F8) && (Hu3DMotionEndCheck(var_r30->model[0]) != 0)) {
var_r31->unk_FC &= ~0x40;
@ -6490,7 +6490,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
if (var_r31->unk_FC & 0x400) {
var_r31->unk_F8 += 1.0f;
if (var_r31->unk_F8 == 15.0f) {
Hu3DModelAttrReset(var_r30->model[0], 0x40000003);
Hu3DModelAttrReset(var_r30->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
}
if ((15.0f < var_r31->unk_F8) && (Hu3DMotionEndCheck(var_r30->model[0]) != 0)) {
var_r31->unk_FC &= ~0x400;
@ -6684,7 +6684,7 @@ void fn_1_1E150(omObjData *var_r29)
if (sp70 != 0) {
if (((var_r31->unk_FC & 0x80000) || (lbl_1_bss_304 < 0)) && (var_r31->unk_00.unk_38 == 0)) {
var_r31->unk_118 = 0x7EB;
Hu3DModelAttrReset(*var_r29->model, 0x40000003);
Hu3DModelAttrReset(*var_r29->model, HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DMotionShiftSet(*var_r29->model, var_r29->motion[22], 0.0f, 8.0f, 0);
Hu3DModelAttrReset(*var_r29->model, HU3D_ATTR_DISPOFF);
var_r29->func = fn_1_20170;
@ -7744,7 +7744,7 @@ void ObjectSetup(void)
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], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_2C[var_r31], 0x40000003);
Hu3DModelAttrSet(lbl_1_bss_2C[var_r31], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
}
lbl_1_bss_28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M450, 0x6C));
HuSprAnimLock(lbl_1_bss_28);

28
src/REL/mgmodedll/mgmode.c
View file

@ -300,7 +300,7 @@ void fn_1_DF0(void)
}
if (time == 20) {
HuAudFXPlay(2173);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
}
HuPrcVSleep();
}
@ -395,7 +395,7 @@ void fn_1_DF0(void)
modelP = &Hu3DData[lbl_1_bss_2C80[9]];
posModel = modelP->pos;
VECSubtract(&pos3D, &posModel, &pos2D);
Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004);
Hu3DModelAttrSet(lbl_1_bss_2C80[9], HU3D_MOTATTR_REV);
espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF);
HuAudFXPlay(2174);
for (time = 0; time <= 20; time++) {
@ -442,8 +442,8 @@ s32 fn_1_1B0C(void)
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_ATTR_DISPOFF);
}
else {
Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002);
Hu3DModelAttrSet(lbl_1_bss_2C80[9], HU3D_MOTATTR_REV);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE);
espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF);
fn_1_25E74(lbl_1_bss_2CC);
fn_1_25584(lbl_1_bss_2CE);
@ -495,7 +495,7 @@ exit:
modelP = &Hu3DData[lbl_1_bss_2C80[9]];
posModel = modelP->pos;
VECSubtract(&pos3D, &posModel, &pos2D);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
for (i = 0; i <= 20; i++) {
if (i == 10) {
HuAudFXPlay(2173);
@ -531,8 +531,8 @@ s32 fn_1_21C4(void)
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_ATTR_DISPOFF);
}
else {
Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002);
Hu3DModelAttrSet(lbl_1_bss_2C80[9], HU3D_MOTATTR_REV);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE);
espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF);
fn_1_25E74(lbl_1_bss_2CC);
fn_1_25584(lbl_1_bss_2CE);
@ -585,7 +585,7 @@ exit:
modelP = &Hu3DData[lbl_1_bss_2C80[9]];
posModel = modelP->pos;
VECSubtract(&pos3D, &posModel, &pos2D);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
for (i = 0; i <= 20; i++) {
if (i == 10) {
HuAudFXPlay(2173);
@ -625,8 +625,8 @@ s32 fn_1_2940(void)
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_ATTR_DISPOFF);
}
else {
Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002);
Hu3DModelAttrSet(lbl_1_bss_2C80[9], HU3D_MOTATTR_REV);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE);
espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF);
fn_1_25E74(lbl_1_bss_2CC);
fn_1_25584(lbl_1_bss_2CE);
@ -683,7 +683,7 @@ exit:
modelP = &Hu3DData[lbl_1_bss_2C80[9]];
posModel = modelP->pos;
VECSubtract(&pos3D, &posModel, &pos2D);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
for (i = 0; i <= 20; i++) {
if (i == 10) {
HuAudFXPlay(2173);
@ -719,8 +719,8 @@ s32 fn_1_3150(void)
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_ATTR_DISPOFF);
}
else {
Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002);
Hu3DModelAttrSet(lbl_1_bss_2C80[9], HU3D_MOTATTR_REV);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE);
espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF);
fn_1_25E74(lbl_1_bss_2CC);
fn_1_25584(lbl_1_bss_2CE);
@ -774,7 +774,7 @@ exit:
modelP = &Hu3DData[lbl_1_bss_2C80[9]];
posModel = modelP->pos;
VECSubtract(&pos3D, &posModel, &pos2D);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006);
Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV);
for (i = 0; i <= 20; i++) {
if (i == 10) {
HuAudFXPlay(2173);

8
src/REL/modeltestDll/main.c
View file

@ -245,7 +245,7 @@ void fn_1_29C(omObjData *arg0)
lbl_1_bss_88A[var_r31][7] = CharModelMotionCreate(chrIdx, lbl_1_data_0[7]);
lbl_1_bss_88A[var_r31][0] = CharModelMotionCreate(chrIdx, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x4D));
CharModelMotionSet(chrIdx, lbl_1_bss_88A[var_r31][0]);
Hu3DModelAttrSet(lbl_1_bss_98A[var_r31], 0x40000001U);
Hu3DModelAttrSet(lbl_1_bss_98A[var_r31], HU3D_MOTATTR_LOOP);
Hu3DModelPosSet(lbl_1_bss_98A[var_r31], (var_r31 / 4 * 0xC8) - 100, 0.0f, -(var_r31 % 4) * 0x96);
CharModelMotionDataClose(chrIdx);
}
@ -263,7 +263,7 @@ void fn_1_29C(omObjData *arg0)
var_r31 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M407, 0x1E));
temp_r27 = Hu3DJointMotion(var_r31, HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M407, 0x2F), MEMORY_DEFAULT_NUM, 2));
Hu3DMotionSet(var_r31, temp_r27);
Hu3DModelAttrSet(var_r31, 0x40000001U);
Hu3DModelAttrSet(var_r31, HU3D_MOTATTR_LOOP);
for (var_r31 = 0; var_r31 < 10; ++var_r31) {
if (var_r31 == 0) {
@ -274,8 +274,8 @@ void fn_1_29C(omObjData *arg0)
}
Hu3DModelShadowSet(lbl_1_bss_664[var_r31]);
Hu3DModelPosSet(lbl_1_bss_664[var_r31], (((var_r31 / 5) * 0x1F4) + 0xC8), 0.0f, (-(var_r31 % 5) * 0x12C));
Hu3DModelAttrSet(lbl_1_bss_664[var_r31], 0x4000U);
Hu3DModelAttrSet(lbl_1_bss_664[var_r31], 0x40000001U);
Hu3DModelAttrSet(lbl_1_bss_664[var_r31], HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(lbl_1_bss_664[var_r31], HU3D_MOTATTR_LOOP);
}
temp_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_SAF, 0x13), MEMORY_DEFAULT_NUM, 2);
temp_r28 = HuSprAnimRead(temp_r29);

2
src/REL/modeltestDll/modeltest00.c
View file

@ -199,7 +199,7 @@ void fn_1_46F0(void)
Hu3DModelShadowSet(lbl_1_bss_9EC[var_r31]);
lbl_1_bss_9AC[var_r31][0] = CharModelMotionCreate(var_r30, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02));
CharModelMotionSet(var_r30, lbl_1_bss_9AC[var_r31][0]);
Hu3DModelAttrSet(lbl_1_bss_9EC[var_r31], 0x40000001U);
Hu3DModelAttrSet(lbl_1_bss_9EC[var_r31], HU3D_MOTATTR_LOOP);
Hu3DModelCameraSet(lbl_1_bss_9EC[var_r31], lbl_1_data_358[var_r31]);
Hu3DModelPosSet(lbl_1_bss_9EC[var_r31], ((( var_r31 / 4) * 200) - 100), 0.0f, (-( var_r31 % 4) * 150));
Hu3DModelPosSet(lbl_1_bss_9EC[var_r31], 0.0f, 0.0f, 0.0f);

24
src/REL/modeltestDll/modeltest01.c
View file

@ -299,9 +299,9 @@ void fn_1_5DA8(void)
Hu3DModelAttrSet(sp16[2], HU3D_MOTATTR_LOOP);
}
else {
Hu3DModelAttrReset(sp16[0], 0x40000001);
Hu3DModelAttrReset(sp16[1], 0x40000001);
Hu3DModelAttrReset(sp16[2], 0x40000001);
Hu3DModelAttrReset(sp16[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[2], HU3D_MOTATTR_LOOP);
}
fn_1_69C8(temp_r28, sp16[0], 0);
fn_1_69C8(temp_r28, sp16[1], 1);
@ -322,9 +322,9 @@ void fn_1_5DA8(void)
Hu3DModelAttrSet(sp16[2], HU3D_MOTATTR_LOOP);
}
else {
Hu3DModelAttrReset(sp16[0], 0x40000001);
Hu3DModelAttrReset(sp16[1], 0x40000001);
Hu3DModelAttrReset(sp16[2], 0x40000001);
Hu3DModelAttrReset(sp16[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[2], HU3D_MOTATTR_LOOP);
}
fn_1_69C8(temp_r28, sp16[0], 0);
fn_1_69C8(temp_r28, sp16[1], 1);
@ -340,9 +340,9 @@ void fn_1_5DA8(void)
}
else {
if (temp_r30 != 3 && temp_r30 != 2) {
Hu3DModelAttrReset(sp16[0], 0x40000001);
Hu3DModelAttrReset(sp16[1], 0x40000001);
Hu3DModelAttrReset(sp16[2], 0x40000001);
Hu3DModelAttrReset(sp16[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[2], HU3D_MOTATTR_LOOP);
}
}
}
@ -351,9 +351,9 @@ void fn_1_5DA8(void)
Hu3DMotionSet(sp16[0], sp40[0][temp_r30]);
Hu3DMotionSet(sp16[1], sp40[1][temp_r30]);
Hu3DMotionSet(sp16[2], sp40[2][temp_r30]);
Hu3DModelAttrReset(sp16[0], 0x40000001);
Hu3DModelAttrReset(sp16[1], 0x40000001);
Hu3DModelAttrReset(sp16[2], 0x40000001);
Hu3DModelAttrReset(sp16[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[2], HU3D_MOTATTR_LOOP);
for (temp_r29 = 0; temp_r29 <= 30; temp_r29++) {
Hu3DModelPosSet(sp16[0], 0, sind(temp_r29 * 6.0f) * 150, 0);
Hu3DModelPosSet(sp16[1], 0, sind(temp_r29 * 6.0f) * 150, 0);

4
src/REL/modeseldll/filesel.c
View file

@ -626,10 +626,10 @@ void fn_1_5850(void)
Hu3DMotionSet(lbl_1_bss_19A[index + 4], lbl_1_bss_16A[6]);
Hu3DMotionSpeedSet(lbl_1_bss_19A[index + 4], 2.0f);
if (param) {
Hu3DModelAttrReset(lbl_1_bss_19A[index + 4], 0x40000004);
Hu3DModelAttrReset(lbl_1_bss_19A[index + 4], HU3D_MOTATTR_REV);
}
else {
Hu3DModelAttrSet(lbl_1_bss_19A[index + 4], 0x40000004);
Hu3DModelAttrSet(lbl_1_bss_19A[index + 4], HU3D_MOTATTR_REV);
Hu3DMotionTimeSet(lbl_1_bss_19A[index + 4], Hu3DMotionMaxTimeGet(lbl_1_bss_19A[6]));
}
for (i = 0; i < 10; i++) {

8
src/REL/modeseldll/modesel.c
View file

@ -59,8 +59,8 @@ s32 fn_1_2490(void)
HuPrcVSleep();
}
HuPrcSleep(20);
Hu3DModelAttrReset(lbl_1_bss_19A[14], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_19A[15], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_19A[14], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(lbl_1_bss_19A[15], HU3D_MOTATTR_PAUSE);
HuAudFXPlay(2093);
HuPrcSleep(120);
HuAudFXPlay(2095);
@ -153,7 +153,7 @@ s32 fn_1_2490(void)
continue;
}
}
Hu3DModelAttrReset(lbl_1_bss_19A[lbl_1_data_80[lbl_1_bss_80]], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_19A[lbl_1_data_80[lbl_1_bss_80]], HU3D_MOTATTR_PAUSE);
HuAudSeqAllFadeOut(1000);
for (temp_r31 = 0; temp_r31 <= 20; temp_r31++) {
temp_f31 = temp_r31 / 20.0f;
@ -197,7 +197,7 @@ s32 fn_1_2490(void)
}
HuPrcSleep(90);
Hu3DFogSet(3000, 8000, 255, 255, 255);
Hu3DModelAttrReset(lbl_1_bss_19A[22], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_19A[22], HU3D_MOTATTR_PAUSE);
HuPrcSleep(60);
temp_f31 = 0;
temp_f30 = 5;

4
src/REL/mpexDll/mpex.c
View file

@ -904,7 +904,7 @@ void fn_1_5530(void)
}
}
} while (var_r31 != 4);
Hu3DModelAttrReset(lbl_1_bss_3B0.unk_00->model[5], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_3B0.unk_00->model[5], HU3D_MOTATTR_PAUSE);
fn_1_25C4(lbl_1_bss_2D8[0].unk_00, 1, 2, 0xF, 1);
fn_1_28E0(lbl_1_bss_2D8[0].unk_00, 1, sp14, 0.0f, 9.0f, 0.0f, 1, 0);
fn_1_25C4(lbl_1_bss_2D8[0].unk_00, 1, 1, 0xF, 1);
@ -940,7 +940,7 @@ void fn_1_581C(void)
fn_1_1B7D0(1);
} while (lbl_1_bss_1B8[0].unk_04 != NULL);
Hu3DModelAttrReset(lbl_1_bss_3B0.unk_00->model[5], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_3B0.unk_00->model[5], HU3D_MOTATTR_PAUSE);
fn_1_25C4(lbl_1_bss_2D8[1].unk_00, 1, 2, 0xF, 1);
fn_1_28E0(lbl_1_bss_2D8[1].unk_00, 1, sp14, 0.0f, 9.0f, 0.0f, 1, 0);
fn_1_25C4(lbl_1_bss_2D8[1].unk_00, 1, 1, 0xF, 1);

2
src/REL/option/record.c
View file

@ -342,7 +342,7 @@ static void StartSystemMotion(omObjData *object, s32 type)
Hu3DMotionTimeSet(model, 6.0f);
break;
}
Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_PAUSE);
}
static omObjData *CreateHand(void)

16
src/REL/option/rumble.c
View file

@ -235,8 +235,8 @@ static void StartSystemMotion(omObjData *system, s32 rumbleF, BOOL slowF)
{
s16 model = system->model[0];
Hu3DModelAttrReset(system->model[0], 0x40000002);
Hu3DModelAttrReset(system->model[0], 0x40000001);
Hu3DModelAttrReset(system->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(system->model[0], HU3D_MOTATTR_LOOP);
if (rumbleF) {
Hu3DMotionStartEndSet(model, 60.0f, 120.0f);
if (slowF) {
@ -279,12 +279,12 @@ static void KillPad(omObjData *pad)
static void ShakePad(omObjData *pad, BOOL on)
{
if (on) {
Hu3DModelAttrReset(pad->model[0], 0x40000002);
Hu3DModelAttrReset(pad->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_LOOP);
}
else {
Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(pad->model[0], 0x40000001);
Hu3DModelAttrReset(pad->model[0], HU3D_MOTATTR_LOOP);
}
}
@ -316,8 +316,8 @@ void OptionRumbleMotionShowStart(omObjData *object)
Hu3DMotionStartEndSet(model, 0.0f, 40.0f);
Hu3DMotionTimeSet(model, 0.0f);
Hu3DModelAttrReset(work->padFilter->model[0], 0x40000002);
Hu3DModelAttrReset(work->padFilter->model[0], 0x40000001);
Hu3DModelAttrReset(work->padFilter->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(work->padFilter->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(work->padFilter->model[0], 2);
HuAudFXPlay(0x83D);
}
@ -329,8 +329,8 @@ void OptionRumbleMotionHideStart(omObjData *object)
Hu3DMotionStartEndSet(model, 40.0f, 80.0f);
Hu3DMotionTimeSet(model, 40.0f);
Hu3DModelAttrReset(work->padFilter->model[0], 0x40000002);
Hu3DModelAttrReset(work->padFilter->model[0], 0x40000001);
Hu3DModelAttrReset(work->padFilter->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(work->padFilter->model[0], HU3D_MOTATTR_LOOP);
HuAudFXPlay(0x83E);
}

2
src/REL/option/sound.c
View file

@ -1535,7 +1535,7 @@ static omObjData *CreateNoteObj(s32 type)
note->model[0] = Hu3DModelCreateFile(noteMdlTbl[type]);
Hu3DModelAttrSet(note->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(note->model[0], 2);
Hu3DModelAttrReset(note->model[0], 2);
Hu3DModelAttrReset(note->model[0], HU3D_ATTR_ZWRITE_OFF);
return note;
}

4
src/REL/resultDll/battle.c
View file

@ -362,7 +362,7 @@ void fn_1_7544(void)
HuPrcVSleep();
}
for (i = 0; i < 4; i++) {
Hu3DModelAttrReset(lbl_1_bss_1A9C[i + 4], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_1A9C[i + 4], HU3D_MOTATTR_PAUSE);
Hu3DMotionSpeedSet(lbl_1_bss_1A9C[i + 4], 1.5f);
}
HuPrcSleep(35);
@ -422,7 +422,7 @@ void fn_1_7544(void)
HuPrcVSleep();
}
HuAudFXPlay(828);
Hu3DModelAttrReset(lbl_1_bss_1A9C[10], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_1A9C[10], HU3D_MOTATTR_PAUSE);
Hu3DModelPosSet(lbl_1_bss_1A9C[10], 0, 0, 200);
for (i = 0; i < Hu3DMotionMaxTimeGet(lbl_1_bss_1A9C[10]); i++) {
if (i > 10) {

2
src/REL/selmenuDll/main.c
View file

@ -553,7 +553,7 @@ static void SMCharInit(omObjData *object)
void *data = HuDataSelHeapReadNum(charMdlTbl[i], MEMORY_DEFAULT_NUM, HEAP_DATA);
charModelID[i] = Hu3DModelCreate(data);
Hu3DModelPosSet(charModelID[i], 0.0f, 0.0f, 0.0f);
Hu3DModelAttrSet(charModelID[i], 0x40000001);
Hu3DModelAttrSet(charModelID[i], HU3D_MOTATTR_LOOP);
Hu3DMotionSet(charModelID[i], Hu3DJointMotionFile(charModelID[i], charMdlMotTbl[i]));
}
for (i = 0; i < 4; i++) {

3
src/game/board/item.c
View file

@ -26,7 +26,6 @@
#include "game/window.h"
#include "game/wipe.h"
#include "ext_math.h"
typedef struct {
@ -561,7 +560,7 @@ static void ItemSizeSet(s32 arg0)
HuPrcVSleep();
}
}
Hu3DModelAttrReset(temp_r28, 0x40000002);
Hu3DModelAttrReset(temp_r28, HU3D_MOTATTR_PAUSE);
BoardPlayerSizeSet(currItemRestore, arg0);
}

6
src/game/board/model.c
View file

@ -310,7 +310,7 @@ s32 BoardModelPassSet(s16 model, s32 pass)
Hu3DModelAttrSet(model_ptr->id, HU3D_ATTR_ZWRITE_OFF);
}
else {
Hu3DModelAttrReset(model_ptr->id, 2);
Hu3DModelAttrReset(model_ptr->id, HU3D_ATTR_ZWRITE_OFF);
}
return 0;
}
@ -456,7 +456,7 @@ s32 BoardModelMotionUpdateSet(s16 model, s32 flag)
Hu3DModelAttrSet(model_ptr->id, HU3D_MOTATTR_LOOP);
}
else {
Hu3DModelAttrReset(model_ptr->id, 0x40000001);
Hu3DModelAttrReset(model_ptr->id, HU3D_MOTATTR_LOOP);
}
return 0;
}
@ -513,7 +513,7 @@ s32 BoardModelMotionStart(s16 model, s32 motion, u32 attr)
CharModelMotionTimeSet(model_ptr->character, model_ptr->mot_end);
}
}
Hu3DModelAttrReset(model_ptr->id, 0x40000003);
Hu3DModelAttrReset(model_ptr->id, HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(model_ptr->id, attr);
model_ptr->curr_mot = motion;
return 0;

3
src/game/board/player.c
View file

@ -18,7 +18,6 @@
#include "game/objsub.h"
#include "game/pad.h"
#include "math.h"
#include "stdlib.h"
@ -2694,7 +2693,7 @@ void BoardPlayerResizeAnimExec(s32 player, s32 size)
HuPrcVSleep();
}
}
Hu3DModelAttrReset(modelid, 0x40000002);
Hu3DModelAttrReset(modelid, HU3D_MOTATTR_PAUSE);
BoardPlayerSizeSet(player, size);
}