Applied more Attr defines

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

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;

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);