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

Applying HU3D defines across the board (1/?)

Browse source
This commit is contained in:
mrshigure 2024-08-26 13:51:03 -07:00
parent dc3ada0adc
commit 27e67cb66c
89 changed files with 634 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1138,7 +1138,7 @@ void fn_2_3F28(omObjData *object)
case 0:
if (--temp_r31->unk6E == 0) {
temp_r31->unk0 = 1;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[4], 0, 20, 0);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[4], 0, 20, HU3D_MOTATTR_NONE);
temp_r31->unk58.x = 16;
temp_r31->unk58.y = 0;
}
@ -1164,7 +1164,7 @@ void fn_2_3F28(omObjData *object)
temp_r27 = temp_r28->data;
temp_r27->unkC = object;
temp_r31->unk48 = temp_r28;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 80, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 80, HU3D_MOTATTR_LOOP);
temp_r31->unk30.x = object->trans.x;
temp_r31->unk30.y = object->trans.y;
temp_r31->unk30.z = object->trans.z;
@ -1256,7 +1256,7 @@ void fn_2_48A0(omObjData *object)
switch (temp_r31->unk0) {
case 5:
if (temp_r31->unk6A == 1) {
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, HU3D_MOTATTR_LOOP);
temp_r31->unk6A = 0;
}
omSetRot(object, 0, 180, 0);
@ -1284,7 +1284,7 @@ void fn_2_48A0(omObjData *object)
if (temp_r31->unk58.x <= 0.5f) {
temp_r31->unk0 = 7;
temp_r31->unk58.x = -0.5f;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[0], 0, 30, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[0], 0, 30, HU3D_MOTATTR_LOOP);
temp_r31->unk80 = 0;
temp_r31->unk6C = 0;
}
@ -1426,7 +1426,7 @@ void fn_2_48A0(omObjData *object)
if (object->trans.y <= 1030.0f && temp_f29 < 0) {
temp_r31->unk0 = 12;
object->trans.y = 1030 + temp_r29->unk4;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[2], 0, 15, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[2], 0, 15, HU3D_MOTATTR_LOOP);
temp_r31->unk58.x = 0;
}
break;
@ -1446,7 +1446,7 @@ void fn_2_48A0(omObjData *object)
temp_r31->unk58.x += 3.0f;
if (temp_r31->unk58.x > 90.0f) {
temp_r31->unk0 = 13;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[5], 0, 20, 0);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[5], 0, 20, HU3D_MOTATTR_NONE);
HuAudSStreamPlay(1);
lbl_2_bss_C0 = MGSeqWinCreate(lbl_2_bss_AA[0], -1, -1, -1);
lbl_2_bss_1A = 210;
@ -1570,7 +1570,7 @@ void fn_2_5CC0(omObjData *object)
}
if (temp_r31->unk84) {
if (--temp_r31->unk84 == 0) {
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, HU3D_MOTATTR_LOOP);
temp_r31->unk6A = 0;
}
}
@ -1579,7 +1579,7 @@ void fn_2_5CC0(omObjData *object)
temp_r31->unk84 = 0;
if (--temp_r31->unk7A == 0) {
sp10 = GWPlayerCfg[temp_r31->unk4].character;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, HU3D_MOTATTR_LOOP);
temp_r31->unk78 = 0;
temp_r31->unk6A = 0;
}
@ -1606,12 +1606,12 @@ void fn_2_5CC0(omObjData *object)
if (temp_r31->unk58.z > 0 || temp_r31->unk8C >= 5) {
if (temp_r31->unk6A == 0) {
temp_r31->unk6A = 1;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[3], 0, 8, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[3], 0, 8, HU3D_MOTATTR_LOOP);
}
}
else {
if (temp_r31->unk6A == 1) {
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, HU3D_MOTATTR_LOOP);
temp_r31->unk6A = 0;
}
}
@ -2038,7 +2038,7 @@ void fn_2_7C3C(omObjData *object)
M401WorkPlayer *temp_r31 = object->data;
temp_r31->unk78 = 1;
temp_r31->unk7A = 120;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[7], 0, 10, 0);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[7], 0, 10, HU3D_MOTATTR_NONE);
fn_2_A914(temp_r31->unk4);
}

2
src/REL/m401Dll/main_ex.c
View file

@ -341,7 +341,7 @@ void fn_2_113AC(omObjData *object)
}
dist = VECDistanceXYZ(&object->trans, &temp_r27->trans);
if (dist < 108.00001f) {
Hu3DMotionShiftSet(lbl_2_bss_118[temp_r29]->model[0], lbl_2_bss_118[temp_r29]->motion[6], 0, 10, 0);
Hu3DMotionShiftSet(lbl_2_bss_118[temp_r29]->model[0], lbl_2_bss_118[temp_r29]->motion[6], 0, 10, HU3D_MOTATTR_NONE);
HuAudFXPlay(1288);
if (temp_r30->unk18 == 0) {
HuAudFXPlay(9);