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

Merge pull request #406 from mrshigure/hu3d

Browse source 
Applying HU3D defines across the board (1/?)
This commit is contained in:
Liam Coleman 2024-08-26 15:58:25 -05:00 • committed by GitHub
commit 2fc65f3fb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
89 changed files with 634 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/REL/m437Dll.h
View file

@ -1,3 +1,6 @@
#ifndef M437DLL_H
#define M437DLL_H
#include "game/object.h"
#include "dolphin.h"
@ -21,7 +24,7 @@ typedef struct {
/* 0x00 */ void (*unk00)(void);
/* 0x04 */ void (*unk04)(void);
/* 0x08 */ float unk08;
/* 0x08 */ float unk0C;
/* 0x0C */ float unk0C;
/* 0x10 */ float unk10;
/* 0x14 */ float unk14;
/* 0x18 */ float unk18;
@ -71,3 +74,5 @@ void fn_1_15CD0(StructFn15CD0* arg0, s32 arg1);
void fn_1_15DC8(StructFn15CD0* arg0);
void fn_1_164B0(Process* arg0, StructFn15CD0* arg1, s32 arg2, const char* arg3);
void fn_1_1660C(Process* arg0, StructFn15CD0* arg1, s32 arg2, s32 arg3);
#endif

1
include/game/hsfman.h
View file

@ -11,6 +11,7 @@
#define HU3D_TEXANIM_MAX 256
#define HU3D_TEXSCROLL_MAX 16
#define HU3D_MOTATTR_NONE 0
#define HU3D_MOTATTR 0x40000000
#define HU3D_MOTATTR_LOOP 0x40000001

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

@ -519,7 +519,7 @@ static void fn_1_17E4(void)
CharModelMotionSet(char_tbl[j], mot_tbl[j][2]);
}
if(time == 30) {
CharModelMotionShiftSet(char_tbl[j], mot_tbl[j][0], 0, 10, 0x40000001);
CharModelMotionShiftSet(char_tbl[j], mot_tbl[j][0], 0, 10, HU3D_MOTATTR_LOOP);
}
if(time <= 20) {
Hu3DModelPosSet(player_mdl[j], player_pos[j].x, player_pos[j].y+(1000.0*cos(M_PI*(time*4.5f)/180.0)), player_pos[j].z);
@ -635,7 +635,7 @@ static void fn_1_220C(void)
Hu3DModelRotSet(model, 0.0f, 90-((i/10.0f)*70), 0);
HuPrcVSleep();
}
Hu3DMotionShiftSet(model, motion[0], 0, 10, 0x40000001);
Hu3DMotionShiftSet(model, motion[0], 0, 10, HU3D_MOTATTR_LOOP);
model_ptr = &Hu3DData[model];
while(1) {
fontcolor = FONT_COLOR_RED;

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

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

@ -874,7 +874,7 @@ static void fn_1_2B30(UnkFn27A8Struct *arg0, omObjData *arg1, omObjData *arg2) {
Hu3DMotionTimeSet(lbl_1_bss_54[arg0->unk54]->model[0], 0.0f);
Hu3DMotionSpeedSet(arg1->model[0], 1.0f);
Hu3DModelAttrReset(arg1->model[0], 0x40000003);
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[7], 0.0f, 8.0f, 0);
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[7], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
fn_1_2970(arg0, arg2, 1);
HuAudCharVoicePlay(arg0->unk58, 0x123);
}
@ -965,7 +965,7 @@ static void fn_1_3204(omObjData *arg0) {
temp_r31->unk20 = 0.0f;
temp_r31->unk24 = temp_r31->unk1C;
HuAudFXPlay(0x50E);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 2.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 2.0f, HU3D_MOTATTR_LOOP);
}
} else {
temp_r31->unk30 += 1.0f;
@ -992,7 +992,7 @@ static void fn_1_3204(omObjData *arg0) {
temp_r31->unk60++;
if (temp_r31->unk60 == 3) {
Hu3DMotionSpeedSet(arg0->model[0], 0.83f);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[6], 0.0f, 4.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[6], 0.0f, 4.0f, HU3D_MOTATTR_LOOP);
}
if (temp_r31->unk60 == 9) {
Hu3DMotionSpeedSet(arg0->model[0], 1.0f);
@ -1042,7 +1042,7 @@ static void fn_1_3204(omObjData *arg0) {
temp_r31->unk50 -= 1.0f;
if (temp_r31->unk50 == 32) {
Hu3DMotionSet(arg0->model[0], arg0->motion[9]);
Hu3DMotionShiftSet(temp_r29->model[0], temp_r29->motion[1], 0.0f, 20.0f, 0x40000002);
Hu3DMotionShiftSet(temp_r29->model[0], temp_r29->motion[1], 0.0f, 20.0f, HU3D_MOTATTR_PAUSE);
}
if (0.0f > temp_r31->unk50) {
fn_1_2880(temp_r31, arg0);
@ -1102,7 +1102,7 @@ static void fn_1_43D8(omObjData *arg0) {
case 2000:
if (lbl_1_bss_58->work[0] == 1001) {
temp_r31->unk4C++;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
break;
case 2001:
@ -1111,7 +1111,7 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk4C++;
temp_r31->unk08 = 0.0f;
temp_r31->unk04 = 2000.0f;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 10.0f, 0);
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], 0x40000002);
Hu3DModelAttrReset(temp_r30->model[0], 0x40000001);
@ -1130,7 +1130,7 @@ static void fn_1_43D8(omObjData *arg0) {
if (temp_r31->unk54 == 0) {
HuAudFXPlay(0x50D);
}
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[3], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
break;
case 2003:
@ -1152,7 +1152,7 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk50++;
if (70.0f < temp_r31->unk50) {
temp_r31->unk4C++;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[4], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[4], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
break;
case 2005:
@ -1171,8 +1171,8 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk4C++;
temp_r31->unk50 = 0;
temp_r31->unk0C = 0.0f;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 10.0f, 0x40000002);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 10.0f, HU3D_MOTATTR_PAUSE);
}
break;
case 2006:
@ -1213,7 +1213,7 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk50 -= 1.0f;
if (temp_r31->unk50 == 32) {
Hu3DMotionSet(arg0->model[0], arg0->motion[9]);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 20.0f, 0x40000002);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 20.0f, HU3D_MOTATTR_PAUSE);
}
if (0.0f > temp_r31->unk50) {
lbl_1_bss_58->work[0]++;
@ -1227,9 +1227,9 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk4C = 2012;
temp_r31->unk20 = 10.5f;
Hu3DModelAttrReset(arg0->model[0], 0x40000003);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[8], 0.0f, 20.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[8], 0.0f, 20.0f, HU3D_MOTATTR_NONE);
Hu3DModelAttrReset(temp_r30->model[0], 0x40000003);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[2], 20.0f, 20.0f, 0);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[2], 20.0f, 20.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(0x513);
fn_1_4190(temp_r31->unk18);
} else {
@ -1250,7 +1250,7 @@ static void fn_1_43D8(omObjData *arg0) {
if (0.0f > temp_r31->unk20) {
temp_r31->unk4C++;
temp_r31->unk50 = 0;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[9], 0.0f, 20.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[9], 0.0f, 20.0f, HU3D_MOTATTR_NONE);
}
if (4.5f <= temp_r31->unk20) {
fn_1_4284(temp_r31->unk18);
@ -1281,7 +1281,7 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk50 -= 1.0f;
if (temp_r31->unk50 == 32) {
Hu3DMotionSet(arg0->model[0], arg0->motion[9]);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 20.0f, 0x40000002);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 20.0f, HU3D_MOTATTR_PAUSE);
}
if (0.0f > temp_r31->unk50) {
temp_r31->unk4C = 2011;
@ -1415,7 +1415,7 @@ static void fn_1_6AB4(omObjData *arg0) {
temp_r31->unk0C = 360.0f * frandf();
temp_r31->unk10 = 10.0f;
HuAudFXPlay(0x512);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 20.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 20.0f, HU3D_MOTATTR_NONE);
}
break;
case 3001:
@ -1435,7 +1435,7 @@ static void fn_1_6AB4(omObjData *arg0) {
temp_r31->unk18 = 3000;
temp_r31->unk14 = 20.0f;
temp_r31->unk04 = temp_r29->y;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 20.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 20.0f, HU3D_MOTATTR_NONE);
}
break;
}
@ -1781,7 +1781,7 @@ static void fn_1_8218(omObjData *arg0) {
} else {
lbl_1_bss_1AA = MGSeqCreate(5, 3, GWPlayerCfg[lbl_1_bss_26].character, -1, -1, -1);
temp_r30 = lbl_1_bss_4C[lbl_1_bss_26];
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[10], 0.0f, 20.0f, 0);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[10], 0.0f, 20.0f, HU3D_MOTATTR_NONE);
HuAudSStreamPlay(1);
}
} else {

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

@ -1106,7 +1106,7 @@ void fn_1_44A0(omObjData *object)
}
if (var_r28 >= 0 && var_r28 != var_r31->unk_2C) {
var_r31->unk_2C = var_r28;
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_2C], 0.0f, 5.0f, 0x40000001);
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_2C], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
}
}
}
@ -1120,7 +1120,7 @@ void fn_1_4C7C(omObjData *object)
object->trans.z = -450.0f + (300.0f * var_r30->unk_02);
object->rot.y = 0.0f;
var_r30->unk_2C = -1;
CharModelMotionShiftSet(var_r30->unk_0C, *object->motion, 0.0f, 5.0f, 0x40000001);
CharModelMotionShiftSet(var_r30->unk_0C, *object->motion, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
var_r30->unk_5A = 0;
var_r30->unk_5C = fn_1_F70(object, 1.0f);
var_r30->unk_5A = 0;
@ -1155,7 +1155,7 @@ void fn_1_4F4C(omObjData *object)
else {
var_r30->unk_2C = 4;
}
CharModelMotionShiftSet(var_r30->unk_0C, object->motion[var_r30->unk_2C], 0.0f, 5.0f, 0);
CharModelMotionShiftSet(var_r30->unk_0C, object->motion[var_r30->unk_2C], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
}
}

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

@ -1683,7 +1683,7 @@ void fn_1_6BFC(omObjData *arg0) {
temp_r31->unk100 = 2005;
temp_r31->unk104 = 0;
Hu3DModelAttrReset(arg0->model[0], 0x40000002);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 8.0f, 0x40000001);
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++) {
Hu3DParManAttrSet(temp_r31->unkF0[i], 1);
@ -1802,7 +1802,7 @@ void fn_1_6BFC(omObjData *arg0) {
var_r27 = temp_r31->unk94 + 5;
temp_r31->unk104 = var_r27;
Hu3DModelAttrReset(arg0->model[0], 0x40000003);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 8.0f, 0);
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) {
lbl_1_bss_78 = temp_r31->unk94;
@ -1833,7 +1833,7 @@ void fn_1_6BFC(omObjData *arg0) {
if (var_r27 != temp_r31->unk104) {
temp_r31->unk104 = var_r27;
Hu3DModelAttrReset(arg0->model[0], 0x40000002);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 30.0f, 0x40000001);
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) {
temp_r31->unk60 = 0.5f * temp_r31->unk64;

14
src/REL/m406Dll/player.c
View file

@ -396,7 +396,7 @@ void fn_1_D90C(omObjData *object)
var_r31->unk_58 = 0;
var_r31->unk_14.y = 0.0f;
var_r31->unk_14.z = 45.0f;
fn_1_DD7C(object, 0, 1.0f, 0x40000001);
fn_1_DD7C(object, 0, 1.0f, HU3D_MOTATTR_LOOP);
object->trans.x = lbl_1_data_FF0[var_r31->unk_02];
object->trans.z = -500.0f;
object->trans.y = fn_1_143F4(&object->trans, &var_r31->unk_44);
@ -538,7 +538,7 @@ void fn_1_E214(omObjData *object)
if (fn_1_122C() >= 2) {
if (var_r31->unk_00_field0 != 0) {
fn_1_DD7C(object, 9, 1.0f, 0);
fn_1_DD7C(object, 9, 1.0f, HU3D_MOTATTR_NONE);
if ((var_r26->attr & 1) == 0) {
Hu3D3Dto2D(&object->trans, 1, &sp28);
if (sp28.x < 0.0 || sp28.x >= 576.0f || sp28.y < 0.0 || sp28.y >= 480.0f) {
@ -1165,7 +1165,7 @@ void fn_1_10744(omObjData *object)
var_r29 = &Hu3DData[object->model[0]];
switch (var_r31->unk_12) {
case 0:
fn_1_DD7C(object, 0, 1.0f, 0);
fn_1_DD7C(object, 0, 1.0f, HU3D_MOTATTR_NONE);
if (--var_r31->unk_64 == 0) {
fn_1_1284();
var_r31->unk_12++;
@ -1203,7 +1203,7 @@ void fn_1_10744(omObjData *object)
object->motion[var_r24] = CharModelMotionCreate(var_r31->unk_0C, lbl_1_data_1078[var_r24]);
}
var_r31->unk_38 = -1;
fn_1_DD7C(object, 0, 1.0f, 0);
fn_1_DD7C(object, 0, 1.0f, HU3D_MOTATTR_NONE);
Hu3DModelShadowSet(object->model[0]);
return;
}
@ -1214,7 +1214,7 @@ void fn_1_10744(omObjData *object)
object->trans.y = 0.0f;
var_r31->unk_12++;
var_r31->unk_2C.y = 0.0f;
fn_1_DD7C(object, 2, 1.0f, 0);
fn_1_DD7C(object, 2, 1.0f, HU3D_MOTATTR_NONE);
omVibrate(var_r31->unk_02, 0xC, 6, 6);
var_r31->unk_7C[0] = HuAudFXPlay(0x53B);
}
@ -1235,7 +1235,7 @@ void fn_1_10744(omObjData *object)
var_r31->unk_2C.x = var_r31->unk_54 * (100.0 * (0.10000000149011612 * sind(180.0f + var_r31->unk_14.x)));
var_r31->unk_2C.z = var_r31->unk_54 * (100.0 * (0.10000000149011612 * cosd(180.0f + var_r31->unk_14.x)));
if (var_r31->unk_64 == 48.0f) {
fn_1_DD7C(object, 8, 1.0f, 0);
fn_1_DD7C(object, 8, 1.0f, HU3D_MOTATTR_NONE);
}
if (--var_r31->unk_64 == 0) {
var_r31->unk_12 = -1;
@ -1277,7 +1277,7 @@ void fn_1_11058(omObjData *object)
Hu3DModelScaleSet(object->model[var_r28], 1.0f, 1.0f, 1.0f);
}
Hu3DModelHookReset(object->model[0]);
fn_1_DD7C(object, 0, 1.0f, 0);
fn_1_DD7C(object, 0, 1.0f, HU3D_MOTATTR_NONE);
var_r30->unk_00 = 0;
var_r30->unk_12 = 0;
var_r30->unk_00_field3 = 1;

28
src/REL/m407dll/player.c
View file

@ -415,7 +415,7 @@ void fn_1_A8C(omObjData *arg0)
}
if (var_r29 != 0) {
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[2], 0.0f, 0.0f, 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[2], 0.0f, 0.0f, HU3D_MOTATTR_NONE);
fn_1_4544(4, 0x10, 600.0f - (400.0f * temp_r31->unk_00), -20.0f, -450.0f);
fn_1_26CC(temp_r31->unk_00);
temp_r31->unk_34 = 1;
@ -423,7 +423,7 @@ void fn_1_A8C(omObjData *arg0)
}
if ((temp_r31->unk_34 != 0) && (Hu3DMotionEndCheck(arg0->model[0]) != 0)) {
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[1], 0.0f, 0.0f, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[1], 0.0f, 0.0f, HU3D_MOTATTR_LOOP);
temp_r31->unk_34 = 0;
}
}
@ -434,7 +434,7 @@ void fn_1_C58(omObjData *arg0)
temp_r30 = arg0->data;
if (Hu3DMotionEndCheck(arg0->model[0]) != 0) {
CharModelMotionShiftSet(temp_r30->unk_01, arg0->motion[1], 0.0f, 10.0f, 0x40000001);
CharModelMotionShiftSet(temp_r30->unk_01, arg0->motion[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
temp_r30->unk_34 = 0;
SetDominationDataStuff(arg0, 0, 0);
}
@ -446,7 +446,7 @@ void fn_1_CF4(omObjData *arg0)
temp_r31 = arg0->data;
if (temp_r31->unk_20 == 0) {
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[1], 0.0f, 10.0f, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
CharModelItemHookCreate(temp_r31->unk_01, lbl_1_data_13C[temp_r31->unk_01]);
}
if (temp_r31->unk_20++ >= 30) {
@ -464,7 +464,7 @@ void fn_1_DB4(omObjData *arg0)
if (temp_r31->unk_20 == 0) {
CharModelVoiceEnableSet(temp_r31->unk_01, arg0->motion[3], 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[3], 0.0f, 10.0f, 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
temp_r31->unk_24 = 0.0f;
temp_r31->unk_20++;
}
@ -480,7 +480,7 @@ void fn_1_DB4(omObjData *arg0)
}
temp_r31->unk_14 = 30.0f;
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
SetDominationDataStuff(arg0, 0, 0);
}
@ -494,12 +494,12 @@ void fn_1_F8C(omObjData *arg0)
temp_r31 = arg0->data;
if (temp_r31->unk_20 == 0) {
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[5], 0.0f, 10.0f, 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[5], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(lbl_1_rodata_70[temp_r31->unk_01]);
}
if (temp_r31->unk_20++ >= 120) {
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[0], 0.0f, 10.0f, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
SetDominationDataStuff(arg0, 0, 0);
}
}
@ -511,7 +511,7 @@ void fn_1_1074(omObjData *arg0)
temp_r31 = arg0->data;
if (temp_r31->unk_20 == 0) {
CharModelVoiceEnableSet(temp_r31->unk_01, arg0->motion[3], 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[3], 0.0f, 10.0f, 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
temp_r31->unk_24 = 0.0f;
temp_r31->unk_20 = 1;
}
@ -520,7 +520,7 @@ void fn_1_1074(omObjData *arg0)
temp_r31->unk_24 += 0.3f;
if (!(temp_r31->unk_14 < 1000.0f)) {
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
SetDominationDataStuff(arg0, 7, 0);
}
}
@ -533,7 +533,7 @@ void fn_1_11CC(omObjData *arg0)
temp_r31 = arg0->data;
if (temp_r31->unk_20 == 0) {
CharModelVoiceEnableSet(temp_r31->unk_01, arg0->motion[3], 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[3], 0.0f, 10.0f, 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
temp_r31->unk_14 = 1000.0f;
temp_r31->unk_18 = 200.0f * (fn_1_28B8(temp_r31->unk_00) + 2);
temp_r31->unk_24 = 0.0f;
@ -546,7 +546,7 @@ void fn_1_11CC(omObjData *arg0)
if (!(temp_r31->unk_14 > 300.0f)) {
temp_r31->unk_14 = 300.0f;
CharModelVoiceEnableSet(temp_r31->unk_01, arg0->motion[4], 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
temp = fn_1_28E4(temp_r31->unk_00);
Hu3DModelHookSet(temp, "itemhook_c", arg0->model[0]);
temp_r31->unk_10 = 0.0f;
@ -561,7 +561,7 @@ void fn_1_13E4(omObjData *arg0)
unkDominationData *temp_r30;
temp_r30 = arg0->data;
CharModelMotionShiftSet(temp_r30->unk_01, arg0->motion[6], 0.0f, 10.0f, 0);
CharModelMotionShiftSet(temp_r30->unk_01, arg0->motion[6], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
SetDominationDataStuff(arg0, 0, 0);
}
@ -571,6 +571,6 @@ void fn_1_1460(omObjData *arg0)
temp_r30 = arg0->data;
CharModelVoiceEnableSet(temp_r30->unk_01, arg0->motion[7], 0);
CharModelMotionShiftSet(temp_r30->unk_01, arg0->motion[7], 0.0f, 10.0f, 0);
CharModelMotionShiftSet(temp_r30->unk_01, arg0->motion[7], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
SetDominationDataStuff(arg0, 0, 0);
}

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

@ -447,7 +447,7 @@ void fn_1_34A4(omObjData *arg0)
temp_r30->unk_2C++;
if (Hu3DMotionEndCheck(arg0->model[0]) != 0) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
switch (temp_r30->unk_28) {
case 0:
fn_1_290C(arg0, 0);
@ -464,7 +464,7 @@ void fn_1_36D0(omObjData *arg0)
unkDominationData7 *sp8;
sp8 = arg0->data;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionSet(arg0->model[1], arg0->motion[0]);
Hu3DModelAttrSet(arg0->model[1], 0x40000001);
Hu3DModelAttrReset(arg0->model[2], 1);

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

@ -641,7 +641,7 @@ void fn_1_26E4(omObjData *object)
}
}
CharModelVoiceEnableSet(temp_r31->unk2, object->motion[1], 0);
CharModelMotionShiftSet(temp_r31->unk2, object->motion[0], 0, 0.2, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk2, object->motion[0], 0, 0.2, HU3D_MOTATTR_LOOP);
CharModelLayerSetAll(2);
CharModelMotionDataClose(temp_r31->unk2);
object->model[1] = Hu3DModelCreateFile(lbl_1_data_C8[temp_r31->unk2]);
@ -692,7 +692,7 @@ void fn_1_2FAC(omObjData *object)
temp_r31->unk28.x = temp_r31->unk28.y = temp_r31->unk28.z = 0;
object->trans.x -= 10.0 * (2.0 * sind(temp_r31->unk58.x));
object->trans.z -= 10.0 * (2.0 * cosd(temp_r31->unk58.x));
CharModelMotionShiftSet(temp_r31->unk2, object->motion[4], 0, 0.2, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk2, object->motion[4], 0, 0.2, HU3D_MOTATTR_LOOP);
temp_r31->unk1C.x = temp_r31->unk94.x = object->trans.x;
temp_r31->unk1C.y = temp_r31->unk94.y = object->trans.y;
temp_r31->unk1C.z = temp_r31->unk94.z = object->trans.z;
@ -915,7 +915,7 @@ void fn_1_3E80(omObjData *object)
temp_r31->unk28.z = temp_r31->unk40.z * temp_f29;
temp_r31->unk34.x = temp_r31->unk28.x * (1.0f / 60.0f);
temp_r31->unk34.z = temp_r31->unk28.z * (1.0f / 60.0f);
CharModelMotionShiftSet(temp_r31->unk2, object->motion[5], 0, 0.2f, 0);
CharModelMotionShiftSet(temp_r31->unk2, object->motion[5], 0, 0.2f, HU3D_MOTATTR_NONE);
HuAudFXPlay(1358);
omVibrate(object->work[0], 12, 4, 2);
if (temp_r31->unk8) {
@ -930,7 +930,7 @@ void fn_1_3E80(omObjData *object)
}
}
if (fn_1_6878() == 4 && (temp_r31->unk4 & 0x20) == 0) {
CharModelMotionShiftSet(temp_r31->unk2, object->motion[3], 0, 0.2f, 0);
CharModelMotionShiftSet(temp_r31->unk2, object->motion[3], 0, 0.2f, HU3D_MOTATTR_NONE);
Hu3DModelShadowSet(object->model[0]);
object->work[1] = 0;
object->func = fn_1_5098;
@ -971,7 +971,7 @@ void fn_1_4A58(omObjData *object)
temp_r31->unk10++;
if (fn_1_6878() == 4) {
temp_r26 = 0;
CharModelMotionShiftSet(temp_r31->unk2, object->motion[3], 0, 0.2f, 0);
CharModelMotionShiftSet(temp_r31->unk2, object->motion[3], 0, 0.2f, HU3D_MOTATTR_NONE);
Hu3DModelShadowSet(object->model[0]);
object->work[1] = 0;
object->func = fn_1_5098;
@ -979,7 +979,7 @@ void fn_1_4A58(omObjData *object)
else if (temp_r31->unk10 > 60) {
temp_r26 = 0;
temp_r31->unk4 &= ~0x3;
CharModelMotionShiftSet(temp_r31->unk2, object->motion[4], 0, 0.2f, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk2, object->motion[4], 0, 0.2f, HU3D_MOTATTR_LOOP);
object->func = fn_1_3E80;
}
if (temp_r26) {
@ -1048,12 +1048,12 @@ void fn_1_54E4(omObjData *object)
if (!(temp_r30->unk4 & 0x8)) {
temp_r30->unk4 |= 0x8;
if (temp_r30->unk14 != 0) {
CharModelMotionShiftSet(temp_r30->unk2, object->motion[1], 0, 0.2f, 0);
CharModelMotionShiftSet(temp_r30->unk2, object->motion[1], 0, 0.2f, HU3D_MOTATTR_NONE);
HuAudCharVoicePlay(temp_r30->unk2, 290);
GWPlayerCoinCollectAdd(object->work[0], temp_r30->unk14);
}
else {
CharModelMotionShiftSet(temp_r30->unk2, object->motion[2], 0, 0.2f, 0);
CharModelMotionShiftSet(temp_r30->unk2, object->motion[2], 0, 0.2f, HU3D_MOTATTR_NONE);
}
object->work[1] = 0;
}

8
src/REL/m409Dll/player.c
View file

@ -380,7 +380,7 @@ void fn_1_7344(omObjData* arg0) {
}
if (var_r28 != temp_r31->unk1C) {
temp_r31->unk1C = var_r28;
CharModelMotionShiftSet(temp_r31->unk1, arg0->motion[temp_r31->unk1C], var_f31, 8.0f, (u32) var_r27);
CharModelMotionShiftSet(temp_r31->unk1, arg0->motion[temp_r31->unk1C], var_f31, 8.0f, var_r27);
}
omSetTra(arg0, temp_r31->unk24.x, temp_r31->unk24.y, temp_r31->unk24.z);
omSetRot(arg0, temp_r31->unk3C.x, temp_r31->unk3C.y, temp_r31->unk3C.z);
@ -779,7 +779,7 @@ void fn_1_962C(omObjData* arg0) {
case 3:
Hu3DModelAttrReset(var_r26 = arg0->model[lbl_1_bss_106 + 1], 1);
Hu3DModelHookSet(arg0->model[0], "g001mk-itemhook_r", var_r26);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 8.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(0x558);
lbl_1_bss_108++;
for (var_r29 = 0; var_r29 < 4; var_r29++) {
@ -799,7 +799,7 @@ void fn_1_962C(omObjData* arg0) {
}
}
arg0->work[3] = var_r28 * 10 + 10;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 8.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
if (lbl_1_bss_104 == 0) {
fn_1_3840();
}
@ -808,7 +808,7 @@ void fn_1_962C(omObjData* arg0) {
if (--arg0->work[3] == 0) {
lbl_1_bss_108 = 0;
Hu3DModelHookReset(arg0->model[0]);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 8.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(arg0->model[lbl_1_bss_106 + 1], 1);
}
break;

20
src/REL/m410Dll/player.c
View file

@ -45,16 +45,16 @@ u32 lbl_1_data_1AC[] = {
};
UnkM410Struct10 lbl_1_data_1D4[] = {
{ 0.0f, 0.0f, 12.0f, 0x40000001 },
{ 0.0f, 0.0f, 1.1999999, 0 },
{ 0.0f, 0.0f, 12.0f, 0x40000001 },
{ 0.0f, 0.0f, 6.0f, 0 },
{ 6.0f, 0.0f, 4.7999997f, 0 },
{ 0.0f, 0.0f, 1.1999999f, 0 },
{ 0.0f, 0.0f, 1.1999999f, 0 },
{ 0.0f, 0.0f, 1.1999999f, 0 },
{ 0.0f, 0.0f, 12.0f, 0 },
{ 0.0f, 0.0f, 12.0f, 0 },
{ 0.0f, 0.0f, 12.0f, HU3D_MOTATTR_LOOP },
{ 0.0f, 0.0f, 1.1999999f, HU3D_MOTATTR_NONE },
{ 0.0f, 0.0f, 12.0f, HU3D_MOTATTR_LOOP },
{ 0.0f, 0.0f, 6.0f, HU3D_MOTATTR_NONE },
{ 6.0f, 0.0f, 4.7999997f, HU3D_MOTATTR_NONE },
{ 0.0f, 0.0f, 1.1999999f, HU3D_MOTATTR_NONE },
{ 0.0f, 0.0f, 1.1999999f, HU3D_MOTATTR_NONE },
{ 0.0f, 0.0f, 1.1999999f, HU3D_MOTATTR_NONE },
{ 0.0f, 0.0f, 12.0f, HU3D_MOTATTR_NONE },
{ 0.0f, 0.0f, 12.0f, HU3D_MOTATTR_NONE },
};
s32 lbl_1_data_274[] = {

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

@ -1260,8 +1260,8 @@ void fn_1_4454(void) {
}
Hu3DModelRotSet(temp_r31->unk00, temp_r31->unk1C.x, 0.0f, temp_r31->unk1C.z);
Hu3DModelRotSet(var_r30->unk00, temp_r31->unk1C.x, 0.0f, temp_r31->unk1C.z);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[1], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[1], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
for (i = 0; i < 120; i++) {
if (var_f31 > 180.0f) {
temp_r31->unk10.x += 1.6666666f;
@ -1281,11 +1281,11 @@ void fn_1_4454(void) {
HuPrcVSleep();
}
if (temp_r31->unk0E == 0) {
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[3], 0.0f, 5.0f, 0x40000001);
Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[3], 0.0f, 5.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[3], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[3], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
} else {
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[4], 0.0f, 5.0f, 0x40000001);
Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[4], 0.0f, 5.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[4], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[4], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
}
while (TRUE) {
HuPrcVSleep();
@ -1305,8 +1305,8 @@ void fn_1_4968(void) {
Hu3DModelRotSet(var_r30->unk00, var_r31->unk1C.x, var_r31->unk1C.y, var_r31->unk1C.z);
HuPrcVSleep();
}
Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[2], 0.0f, 5.0f, 0x40000001);
Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[2], 0.0f, 5.0f, 0x40000001);
Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[2], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[2], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
for (i = 0; i < 60; i++) {
var_r31->unk10.x += 2.5f;
var_r31->unk10.z += 3.3333333f;
@ -1320,8 +1320,8 @@ void fn_1_4968(void) {
Hu3DModelRotSet(var_r30->unk00, var_r31->unk1C.x, var_r31->unk1C.y, var_r31->unk1C.z);
HuPrcVSleep();
}
Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[1], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[1], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
while (TRUE) {
if (lbl_1_bss_E98 >= 5) {
break;
@ -1429,11 +1429,11 @@ void fn_1_4E8C(void) {
Hu3DModelPosSet(temp_r31->unk00, temp_r31->unk10.x, temp_r31->unk10.y, temp_r31->unk10.z);
HuPrcVSleep();
}
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[1], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
while (!Hu3DMotionEndCheck(temp_r31->unk00)) {
HuPrcVSleep();
}
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[2], 0.0f, 2.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[2], 0.0f, 2.0f, HU3D_MOTATTR_LOOP);
HuAudFXPlay(0x36);
while (TRUE) {
HuPrcVSleep();
@ -1661,7 +1661,7 @@ void fn_1_5910(void) {
HuPrcVSleep();
}
var_r31 = &lbl_1_bss_138.unkE4[0];
Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[1], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
for (var_f31 = 1.0f; var_f31 > 0.0f; var_f31 -= 0.033333335f) {
lbl_1_bss_E24 = var_f31;
Hu3DTexScrollPosMoveSet(lbl_1_bss_E9E, -0.01f * var_f31, 0.0f, 0.0f);
@ -1687,7 +1687,7 @@ void fn_1_5910(void) {
Hu3DTexScrollPosMoveSet(lbl_1_bss_E9E, -0.01f, 0.0f, 0.0f);
Hu3DTexScrollPosMoveSet(lbl_1_bss_E9C, -0.017f, 0.0f, 0.0f);
HuAudFXPitchSet(lbl_1_bss_E2C[0], 0);
Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[0], 0.0f, 5.0f, 0x40000001);
Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[0], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
while (TRUE) {
HuPrcVSleep();
}
@ -2209,7 +2209,7 @@ void fn_1_7738(void) {
}
omVibrate(temp_r31->unk34, 12, 6, 6);
HuPrcSleep(30);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[5], 0.0f, 5.0f, 0);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[5], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcChildCreate(fn_1_75C8, 0x2000, 0x1000, 0, HuPrcCurrentGet());
if (temp_r31->unk34 == 0) {
HuAudFXPlay(0x56B);
@ -2465,7 +2465,7 @@ void fn_1_9BC0(s32 arg0) {
i++;
}
Hu3DModelPosSet(temp_r31->unk08, 0.0f, temp_r31->unk4C, temp_r31->unk50);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[0], 0.0f, 5.0f, 0x40000001);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[0], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(10);
for (i = 0; i < 9; i++) {
temp_r31->unk58 -= 10.0f;
@ -2473,7 +2473,7 @@ void fn_1_9BC0(s32 arg0) {
HuPrcVSleep();
}
HuPrcSleep(20);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[3], 0.0f, 5.0f, 0);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[3], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
if (lbl_1_bss_E40 == 1) {
var_f31 = -20.0f;
} else {
@ -2537,8 +2537,8 @@ void fn_1_A120(s32 arg0) {
temp_r31->unk4C -= var_f31;
if (temp_r31->unk4C < 0.0f) {
var_r29 = 1;
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[4], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(temp_r31->unk20, temp_r31->unk22[4], 0.0f, 5.0f, 0);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[4], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(temp_r31->unk20, temp_r31->unk22[4], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
temp_r31->unk4C = 0.0f;
break;
}
@ -2558,12 +2558,12 @@ void fn_1_A120(s32 arg0) {
while (!Hu3DMotionEndCheck(temp_r31->unk08)) {
HuPrcVSleep();
}
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[0], 0.0f, 5.0f, 0x40000001);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[0], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(30);
HuAudSStreamPlay(1);
HuAudPlayerVoicePlay(temp_r31->unk34, 0x124);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[7], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(temp_r31->unk20, temp_r31->unk22[7], 0.0f, 5.0f, 0);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[7], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(temp_r31->unk20, temp_r31->unk22[7], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcChildCreate(fn_1_A07C, 0x2000, 0x1000, 0, HuPrcCurrentGet());
}
@ -2586,7 +2586,7 @@ void fn_1_A4B4(s32 arg0) {
temp_r31->unk4C -= var_f31;
if (temp_r31->unk4C < 0.0f) {
var_r29 = 1;
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[2], 0.0f, 20.0f, 0x40000001);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[2], 0.0f, 20.0f, HU3D_MOTATTR_LOOP);
temp_r31->unk4C = 0.0f;
}
}
@ -2598,14 +2598,14 @@ void fn_1_A4B4(s32 arg0) {
Hu3DModelPosSet(temp_r31->unk08, temp_r31->unk48, temp_r31->unk4C, temp_r31->unk50);
HuPrcVSleep();
}
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[0], 0.0f, 5.0f, 0x40000001);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[0], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
for (i = 0; i < 30; i++) {
temp_r31->unk58 += 6.0f;
Hu3DModelRotSet(temp_r31->unk08, temp_r31->unk54, temp_r31->unk58, temp_r31->unk5C);
HuPrcVSleep();
}
HuAudSStreamPlay(1);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[8], 0.0f, 5.0f, 0);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[8], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
}
void fn_1_A788(s32 arg0) {
@ -2631,7 +2631,7 @@ void fn_1_A788(s32 arg0) {
temp_r31->unk4C -= var_f31;
if (temp_r31->unk4C < 0.0f) {
var_r28 = 1;
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[2], 0.0f, 5.0f, 0x40000001U);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[2], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
temp_r31->unk4C = 0.0f;
}
}
@ -2644,14 +2644,14 @@ void fn_1_A788(s32 arg0) {
Hu3DModelPosSet(temp_r31->unk08, temp_r31->unk48, temp_r31->unk4C, temp_r31->unk50);
HuPrcVSleep();
}
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[0], 0.0f, 5.0f, 0x40000001);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[0], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(30);
temp_f30 = (100.0f - temp_r31->unk48) / 30.0f;
temp_f29 = -temp_r31->unk50 / 30.0f;
var_f31 = 20.0f;
Hu3DMotionShiftSet(var_r29->unk00, var_r29->unk02[3], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(var_r29->unk00, var_r29->unk02[3], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[6], 0.0f, 5.0f, 0);
CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[6], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
for (i = 0; i < 30; i++) {
temp_r31->unk4C += var_f31;
var_f31 -= 1.2f;

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

@ -850,8 +850,8 @@ loop_10:
Hu3DModelPosSet(temp_r31->unk8, 0.0f, 0.0f, 0.0f);
Hu3DModelHookSet(temp_r31->unk0, "itemhook", temp_r31->unk6);
Hu3DModelHookSet(temp_r31->unk2, "itemhook", temp_r31->unk8);
Hu3DMotionShiftSet(temp_r31->unk0, temp_r31->unkC[2], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unkC[2], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(temp_r31->unk0, temp_r31->unkC[2], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unkC[2], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
while (Hu3DMotionTimeGet(temp_r31->unk0) < 18.0f) {
HuPrcVSleep();
@ -1002,8 +1002,8 @@ loop_1:
Hu3DModelPosSet(temp_r31->unk8, 0.0f, 0.0f, 0.0f);
Hu3DModelHookSet(temp_r31->unk0, "itemhook", temp_r31->unk6);
Hu3DModelHookSet(temp_r31->unk2, "itemhook", temp_r31->unk8);
Hu3DMotionShiftSet(temp_r31->unk0, temp_r31->unkC[2], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk16[2], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(temp_r31->unk0, temp_r31->unkC[2], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk16[2], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
while (Hu3DMotionEndCheck(temp_r31->unk0) == 0) {
@ -1044,8 +1044,8 @@ loop_1:
HuPrcVSleep();
}
HuPrcSleep(30);
Hu3DMotionShiftSet(temp_r31->unk0, temp_r31->unkC[4], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk16[4], 0.0f, 5.0f, 0);
Hu3DMotionShiftSet(temp_r31->unk0, temp_r31->unkC[4], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk16[4], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
while (Hu3DMotionTimeGet(temp_r31->unk0) < 24.0f) {
@ -1649,14 +1649,14 @@ loop_6:
if (temp_r31->unk60.z >= 8.0f) {
if (temp_r31->unk30 != 2) {
temp_r31->unk30 = 2;
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[2], 0.0f, 8.0f, 0x40000001U);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk18[2], 0.0f, 8.0f, 0x40000001U);
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk18[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
}
else if (temp_r31->unk30 != 1) {
temp_r31->unk30 = 1;
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[1], 0.0f, 8.0f, 0x40000001U);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk18[1], 0.0f, 8.0f, 0x40000001U);
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk18[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
temp_r31->unk7C.x += 0.1f * sp1A0.x;
temp_r31->unk7C.z += 0.1f * sp1A0.z;
@ -1765,8 +1765,8 @@ loop_6:
HuPrcVSleep();
}
case 4:
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[0], 0.0f, 5.0f, 0x40000001U);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk18[0], 0.0f, 5.0f, 0x40000001);
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[0], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk18[0], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
var_r27 = 30;
sp12C = fn_1_27C4(var_r27, lbl_1_bss_778, temp_r31->unk54.y);
@ -1779,8 +1779,8 @@ loop_6:
while (lbl_1_bss_794 < 5) {
HuPrcVSleep();
}
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[5], 0.0f, 5.0f, 0U);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk18[5], 0.0f, 5.0f, 0);
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[5], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk18[5], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
while (1) {
HuPrcVSleep();
@ -2053,8 +2053,8 @@ void fn_1_ADC8(void)
if (var_f31 == 90.0f) {
for (var_r31 = 0; var_r31 < 4; var_r31++) {
temp_r30 = &lbl_1_bss_4D4[var_r31];
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[var_r31].character], temp_r30->unkC[3], 0.0f, 5.0f, 0U);
Hu3DMotionShiftSet(temp_r30->unk2, temp_r30->unk18[3], 0.0f, 5.0f, 0U);
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[var_r31].character], temp_r30->unkC[3], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(temp_r30->unk2, temp_r30->unk18[3], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
}
}
HuPrcVSleep();
@ -2064,8 +2064,8 @@ void fn_1_ADC8(void)
for (var_r31 = 0; var_r31 < 4; var_r31++) {
temp_r30 = &lbl_1_bss_4D4[var_r31];
HuAudPlayerVoicePlay(temp_r30->unk24, 0x128);
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[var_r31].character], temp_r30->unkC[4], 0.0f, 5.0f, 0U);
Hu3DMotionShiftSet(temp_r30->unk2, temp_r30->unk18[4], 0.0f, 5.0f, 0U);
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[var_r31].character], temp_r30->unkC[4], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(temp_r30->unk2, temp_r30->unk18[4], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
}
}

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

@ -1184,9 +1184,9 @@ void fn_1_42AC(void)
}
CharModelMotionSpeedSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], 1.0f);
if (var_r30->unk_08) {
CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[1], 60.0f, 5.0f, 0);
CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[1], 60.0f, 5.0f, HU3D_MOTATTR_NONE);
} else {
CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[1], 0.0f, 5.0f, 0);
CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
}
HuPrcSleep(5);
Hu3DModelAttrSet(var_r31->unk_12, 0x40000002);
@ -1981,7 +1981,7 @@ void fn_1_79A8(void)
CharModelMotionSpeedSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], 1.0f);
for (var_r30 = 0; var_r30 < 4; var_r30++) {
var_r31 = &lbl_1_bss_F0[var_r30];
CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[1], 0.0f, 5.0f, 0);
CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
}
HuPrcSleep(5);
for (var_r30 = 0; var_r30 < 4; var_r30++) {
@ -2084,7 +2084,7 @@ void fn_1_7FC8(s32 arg0)
HuAudFXPlay(lbl_1_data_8C[lbl_1_bss_978]);
for (var_r29 = 0; var_r29 < 4; var_r29++) {
var_r31 = &lbl_1_bss_F0[var_r29];
CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[0], 0.0f, 5.0f, 0x40000001);
CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[0], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
}
HuPrcSleep(5);
for (var_r29 = 0; var_r29 < 4; var_r29++) {

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

@ -1061,7 +1061,7 @@ void fn_1_3B44(omObjData* object) {
CharModelMotionShiftSet(temp_r31->unk1, object->motion[temp_r31->unk18], 0.0f, 8.0f, var_r28);
temp_r31->unk28 = CharModelMotionMaxTimeGet(temp_r31->unk1);
if (var_r25 != 0) {
Hu3DMotionShiftSet(object->model[2], object->model[var_r25], 0.0f, 8.0f, 0);
Hu3DMotionShiftSet(object->model[2], object->model[var_r25], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
}
}
if ((Hu3DModelAttrGet(object->model[2]) & 1) != 0) {

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

@ -457,7 +457,7 @@ void fn_1_156C(omObjData *object)
work->field_0_bit4 = 1;
work->unk28 = 0;
work->unk2C = -1;
work->unk34 = 0;
work->unk34 = HU3D_MOTATTR_NONE;
work->unk38 = 50;
if (!work->unk10) {
fn_1_1964(object);
@ -659,12 +659,12 @@ void fn_1_1D84(omObjData *object)
else {
temp_r29 = 2;
}
temp_r28 = 0x40000001;
temp_r28 = HU3D_MOTATTR_LOOP;
}
else {
temp_r31->unk1C.x = temp_r31->unk1C.z = 0;
temp_r29 = 0;
temp_r28 = 0x40000001;
temp_r28 = HU3D_MOTATTR_LOOP;
}
object->trans.x += temp_r31->unk1C.x;
object->trans.z += temp_r31->unk1C.z;
@ -686,7 +686,7 @@ void fn_1_1D84(omObjData *object)
else {
temp_r29 = 0;
}
temp_r28 = 0x40000001;
temp_r28 = HU3D_MOTATTR_LOOP;
break;
case 2:
@ -698,7 +698,7 @@ void fn_1_1D84(omObjData *object)
temp_f28 = VECMag(&sp34);
if (temp_f28 < 20 || temp_r31->unk40 == 0) {
temp_r29 = 5;
temp_r28 = 0x40000001;
temp_r28 = HU3D_MOTATTR_LOOP;
object->rot.y = fn_1_1C80(object->rot.y, 0, 0.2f);
temp_r31->field_0_bit3 = 1;
}
@ -730,7 +730,7 @@ void fn_1_1D84(omObjData *object)
object->trans.x += temp_r31->unk1C.x;
object->trans.z += temp_r31->unk1C.z;
temp_r29 = 8;
temp_r28 = 0x40000001;
temp_r28 = HU3D_MOTATTR_LOOP;
}
if (temp_r31->unk40) {
temp_r31->unk40--;
@ -741,7 +741,7 @@ void fn_1_1D84(omObjData *object)
case 3:
if (fn_1_1240() < 10) {
temp_r29 = 0;
temp_r28 = 0x40000001;
temp_r28 = HU3D_MOTATTR_LOOP;
}
else {
if ((!temp_r31->unk10 && lbl_1_bss_924 < 0) || (temp_r31->unk10 && lbl_1_bss_924 >= 0)) {
@ -750,7 +750,7 @@ void fn_1_1D84(omObjData *object)
else {
temp_r29 = 7;
}
temp_r28 = 0;
temp_r28 = HU3D_MOTATTR_NONE;
object->rot.y = fn_1_1C80(object->rot.y, 0, 0.2f);
Hu3DModelAttrReset(object->model[0], 0x40000001);
}
@ -820,7 +820,7 @@ void fn_1_29DC(omObjData *object)
temp_r31->field_0_bit0 = 0;
temp_r31->field_0_bit1 = 1;
temp_r31->unk2C = 3;
temp_r31->unk34 = 0;
temp_r31->unk34 = HU3D_MOTATTR_NONE;
temp_r31->unk46 = 60;
temp_r31->unk60 = 30;
omVibrate(temp_r31->unk02, 12, 6, 6);
@ -889,7 +889,7 @@ void fn_1_2EA4(omObjData *object)
temp_r30->unk50 = 1;
temp_r30->unk60 = 15;
temp_r30->unk2C = 3;
temp_r30->unk34 = 0;
temp_r30->unk34 = HU3D_MOTATTR_NONE;
HuAudFXEmiterPlay(1465, &object->trans);
}
break;
@ -926,7 +926,7 @@ void fn_1_2EA4(omObjData *object)
case 2:
if (--temp_r30->unk60 == 0) {
temp_r30->unk2C = 4;
temp_r30->unk34 = 0;
temp_r30->unk34 = HU3D_MOTATTR_NONE;
temp_r29->field_0_bit0 = 0;
temp_r30->unk50 = 3;
temp_r30->unk60 = 30;

22
src/REL/m417Dll/player.c
View file

@ -143,17 +143,17 @@ u32 lbl_1_data_90[11][3] = {
};
UnkM417Struct8 lbl_1_data_114[11] = {
{ 0, 0.2f, 0.0f, -1.0f, 0x40000001 },
{ 1, 0.2f, 0.0f, -1.0f, 0 },
{ 2, 0.2f, 0.0f, -1.0f, 0 },
{ 3, 0.2f, 0.0f, -1.0f, 0x40000001 },
{ 4, 0.2f, 0.0f, -1.0f, 0x40000001 },
{ 5, 0.5f, 0.0f, -1.0f, 0 },
{ 6, 0.2f, 0.0f, -1.0f, 0x40000001 },
{ 7, 0.03f, 0.0f, -1.0f, 0 },
{ 8, 0.0f, 0.0f, -1.0f, 0 },
{ 9, 0.2f, 0.0f, -1.0f, 0 },
{ 10, 0.0f, 0.0f, -1.0f, 0 },
{ 0, 0.2f, 0.0f, -1.0f, HU3D_MOTATTR_LOOP },
{ 1, 0.2f, 0.0f, -1.0f, HU3D_MOTATTR_NONE },
{ 2, 0.2f, 0.0f, -1.0f, HU3D_MOTATTR_NONE },
{ 3, 0.2f, 0.0f, -1.0f, HU3D_MOTATTR_LOOP },
{ 4, 0.2f, 0.0f, -1.0f, HU3D_MOTATTR_LOOP },
{ 5, 0.5f, 0.0f, -1.0f, HU3D_MOTATTR_NONE },
{ 6, 0.2f, 0.0f, -1.0f, HU3D_MOTATTR_LOOP },
{ 7, 0.03f, 0.0f, -1.0f, HU3D_MOTATTR_NONE },
{ 8, 0.0f, 0.0f, -1.0f, HU3D_MOTATTR_NONE },
{ 9, 0.2f, 0.0f, -1.0f, HU3D_MOTATTR_NONE },
{ 10, 0.0f, 0.0f, -1.0f, HU3D_MOTATTR_NONE },
};
s32 lbl_1_bss_8AC; // unused

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

@ -894,10 +894,10 @@ void fn_1_16F8(omObjData *object)
if (var_r26 != var_r31->unk_28) {
var_r31->unk_28 = var_r26;
if (var_r26 == 3) {
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, 0);
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
}
else {
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, 0x40000001);
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
}
if (var_r31->unk_94 == -1) {
@ -970,7 +970,7 @@ void fn_1_16F8(omObjData *object)
var_r31->unk_2C = 0;
var_r31->unk_24 = 2;
var_r31->unk_28 = 9;
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 8.0f, 8.0f, 0);
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 8.0f, 8.0f, HU3D_MOTATTR_NONE);
}
}
else if (sp10 & 256) {
@ -998,7 +998,7 @@ void fn_1_16F8(omObjData *object)
var_r31->unk_24 = 0;
var_r31->unk_2C = 0;
var_r31->unk_28 = 8;
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, 0x40000001);
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
break;
case 3:
@ -1037,7 +1037,7 @@ void fn_1_16F8(omObjData *object)
var_r31->unk_2C = 0;
HuAudCharVoicePlay(var_r31->unk_0C, 281);
var_r31->unk_28 = 6;
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, 0x40000001);
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
break;
case 6:
@ -1049,12 +1049,12 @@ void fn_1_16F8(omObjData *object)
}
else if (var_r31->unk_2C == 60.0f) {
var_r31->unk_28 = 7;
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, 0);
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
}
else if (var_r31->unk_2C >= 90.0f) {
var_r31->unk_24 = 7;
var_r31->unk_28 = 8;
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, 0x40000001);
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
break;
case 7:
@ -1090,7 +1090,7 @@ void fn_1_16F8(omObjData *object)
}
if (var_r26 != var_r31->unk_28) {
var_r31->unk_28 = var_r26;
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, 0);
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_28], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
}
break;
}
@ -1280,7 +1280,7 @@ void fn_1_2B74(Vec *arg0)
}
var_r31->unk_9C.y = 45.5f;
var_r31->unk_28 = 5;
CharModelMotionShiftSet(var_r31->unk_0C, var_r30->motion[var_r31->unk_28], 0.0f, 8.0f, 0);
CharModelMotionShiftSet(var_r31->unk_0C, var_r30->motion[var_r31->unk_28], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
spC.x = var_r30->trans.x;
spC.y = var_r30->trans.y;
spC.z = var_r30->trans.z;
@ -2003,7 +2003,7 @@ void fn_1_5134(omObjData *object)
if (lbl_1_bss_3C) {
var_r31->unk_30 = 0;
var_r31->unk_28 = 3;
Hu3DMotionShiftSet(var_r31->unk_00, var_r31->unk_0C, 0.0f, 8.0f, 0x40000001);
Hu3DMotionShiftSet(var_r31->unk_00, var_r31->unk_0C, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
else {
var_r31->unk_48 = fn_1_770C(0.0f, var_r31->unk_48, 10.0f);
@ -2033,7 +2033,7 @@ void fn_1_5134(omObjData *object)
}
Hu3DMotionSpeedSet(var_r31->unk_00, 1.4f * (0.33333334f * var_r31->unk_34));
if (lbl_1_bss_3C == 0) {
Hu3DMotionShiftSet(var_r31->unk_00, var_r31->unk_08, 0.0f, 8.0f, 1073741825);
Hu3DMotionShiftSet(var_r31->unk_00, var_r31->unk_08, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
var_r31->unk_2C = 0;
var_r31->unk_30 = 0;
var_r31->unk_28 = 2;

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

@ -1332,7 +1332,7 @@ void fn_1_40C0(Work8F68 *arg0, omObjData *arg1, s32 arg2)
s32 temp_r29;
if (arg2 >= 0 && arg0->unkA8 != arg2) {
arg0->unkA8 = arg2;
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[arg0->unkA8], 0, 8, 0x40000001);
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[arg0->unkA8], 0, 8, HU3D_MOTATTR_LOOP);
temp_r29 = -1;
temp_f31 = 1;
if (arg0->unkA4 == 1) {
@ -1476,12 +1476,12 @@ void fn_1_50AC(Work8F68 *arg0, omObjData *arg1)
Hu3DModelAttrReset(arg1->model[0], 0x40000001);
if (!arg0->unkA4) {
arg0->unkA8 = 5;
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[5], 0, 10, 0);
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[5], 0, 10, HU3D_MOTATTR_NONE);
HuAudFXPlay(1642);
}
else {
arg0->unkA8 = 6;
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[6], 0, 10, 0);
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[6], 0, 10, HU3D_MOTATTR_NONE);
HuAudFXPlay(1643);
}
temp_r27 = lbl_1_bss_1A0[arg0->unkA0];
@ -1929,13 +1929,13 @@ void fn_1_7D38(omObjData *object)
}
else {
temp_r31->unk9C = 2008;
Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 8, 0);
Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 8, HU3D_MOTATTR_NONE);
}
}
if (lbl_1_bss_1AC->work[0] == 1012) {
temp_r31->unk9C = 2008;
Hu3DMotionOverlayReset(object->model[0]);
Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 8, 0);
Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 8, HU3D_MOTATTR_NONE);
}
if (temp_r31->unk9C == 2008 && temp_r31->unkA0 >= 0) {
Hu3DModelAttrSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[0], 1);
@ -2021,7 +2021,7 @@ void fn_1_7D38(omObjData *object)
if ((temp_r31->unk110 & 0x1) < lbl_1_bss_20) {
temp_r31->unk9C = 2008;
Hu3DModelAttrReset(object->model[0], 0x40000004);
Hu3DMotionShiftSet(object->model[0], object->motion[3], 0, 8, 0);
Hu3DMotionShiftSet(object->model[0], object->motion[3], 0, 8, HU3D_MOTATTR_NONE);
}
break;

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

@ -1570,14 +1570,14 @@ void fn_1_5708(void)
switch (temp_r31->unk10) {
case 0:
if (temp_r30->unk_08 != lbl_1_bss_2C->motion[0]) {
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[0], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[0], 0, 8, HU3D_MOTATTR_LOOP);
}
break;
case 1:
if (temp_r31->unk12 == 0) {
temp_r31->unk12 = 1;
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[1], 0, 8, 0);
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[1], 0, 8, HU3D_MOTATTR_NONE);
}
else {
if (temp_r30->unk_0C == -1) {
@ -1593,7 +1593,7 @@ void fn_1_5708(void)
case 2:
if (temp_r31->unk12 == 0) {
temp_r31->unk12 = 1;
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[5], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[5], 0, 8, HU3D_MOTATTR_LOOP);
}
else {
if (temp_r29->unkA < 180) {
@ -1606,7 +1606,7 @@ void fn_1_5708(void)
case 3:
if (temp_r31->unk12 == 0) {
temp_r31->unk12 = 1;
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[2], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[2], 0, 8, HU3D_MOTATTR_LOOP);
}
else {
if (temp_r30->unk_0C == -1) {
@ -1623,7 +1623,7 @@ void fn_1_5708(void)
case 4:
if (temp_r31->unk12 == 0) {
temp_r31->unk12 = 1;
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[3], 0, 8, 0);
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[3], 0, 8, HU3D_MOTATTR_NONE);
}
else {
if (temp_r30->unk_0C == -1) {
@ -1638,7 +1638,7 @@ void fn_1_5708(void)
case 5:
if (temp_r31->unk12 == 0) {
temp_r31->unk12 = 1;
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[6], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C->model[5], lbl_1_bss_2C->motion[6], 0, 8, HU3D_MOTATTR_LOOP);
}
break;
}

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

@ -1185,15 +1185,15 @@ void fn_1_B18C(omObjData *object)
Hu3DModelAttrReset(object->model[0], 0x40000007);
switch(temp_r31->unk0 & 0xC) {
case 0:
temp_r28 = 0x40000002;
temp_r28 = HU3D_MOTATTR_PAUSE;
break;
case 4:
temp_r28 = 0;
temp_r28 = HU3D_MOTATTR_NONE;
break;
case 8:
temp_r28 = 0x40000001;
temp_r28 = HU3D_MOTATTR_LOOP;
break;
}
if(temp_r31->unk0 & 0x2) {

18
src/REL/m434Dll/player.c
View file

@ -69,15 +69,15 @@ u32 lbl_1_data_1FC[10] = {
};
Data224Struct lbl_1_data_224[9] = {
{ 0, 4, 12, 0, 0x40000001 },
{ 1, 6, 6, 0, 0x40000001 },
{ 0, 8, 6, 0, 0 },
{ 0, 5, 6, 0, 0x40000001 },
{ 1, 5, 6, 0, 0x40000001 },
{ 0, 8, 6, 30, 0 },
{ 0, 9, 6, 0, 0 },
{ 2, 0, 12, 0, 0 },
{ 3, 0, 12, 0, 0 },
{ 0, 4, 12, 0, HU3D_MOTATTR_LOOP },
{ 1, 6, 6, 0, HU3D_MOTATTR_LOOP },
{ 0, 8, 6, 0, HU3D_MOTATTR_NONE },
{ 0, 5, 6, 0, HU3D_MOTATTR_LOOP },
{ 1, 5, 6, 0, HU3D_MOTATTR_LOOP },
{ 0, 8, 6, 30, HU3D_MOTATTR_NONE },
{ 0, 9, 6, 0, HU3D_MOTATTR_NONE },
{ 2, 0, 12, 0, HU3D_MOTATTR_NONE },
{ 3, 0, 12, 0, HU3D_MOTATTR_NONE },
};
void fn_1_4988(omObjData *object);

12
src/REL/m437Dll/sequence.c
View file

@ -162,13 +162,13 @@ s32 fn_1_11890(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
void fn_1_119A0(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
switch (arg4) {
case 0:
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0);
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, HU3D_MOTATTR_NONE);
break;
case 1:
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0x40000001);
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, HU3D_MOTATTR_LOOP);
break;
case 2:
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0x40000002);
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, HU3D_MOTATTR_PAUSE);
break;
}
}
@ -228,14 +228,14 @@ s32 fn_1_11CE0(omObjData* arg0, Vec arg1, float arg2, float arg3, float arg4, fl
if (var_f27 > 0.0f) {
if (arg6 == 1 || arg6 == 3) {
if (arg0->motion[1] != Hu3DMotionIDGet(arg0->model[0]) && arg0->motion[1] != Hu3DMotionShiftIDGet(arg0->model[0])) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
} else if (arg0->motion[10] != Hu3DMotionIDGet(arg0->model[0]) && arg0->motion[10] != Hu3DMotionShiftIDGet(arg0->model[0])) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[10], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[10], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
} else {
if (arg0->motion[0] != Hu3DMotionIDGet(arg0->model[0]) && arg0->motion[0] != Hu3DMotionShiftIDGet(arg0->model[0])) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
return 1;
}

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

@ -436,7 +436,7 @@ void fn_1_D0C(omObjData *object)
}
Hu3DModelCameraSet(object->model[0], lbl_1_data_75E0[work->unk2]);
work->unk2C = 0;
work->unk30 = 0x40000001;
work->unk30 = HU3D_MOTATTR_LOOP;
for (i = 0; i < 7; i++) {
object->motion[i] = CharModelMotionCreate(work->unkC, lbl_1_data_7694[i]);
}
@ -964,7 +964,7 @@ void fn_1_2C84(omObjData *object)
object->trans.y = 100 + (-2000.0f * (temp_f28 - 0.1f)) * (temp_f28 - 0.1f);
object->trans.z = temp_r31->unk50.z + (temp_f28 * (temp_r31->unk5C.z - temp_r31->unk50.z));
temp_r28 = 3;
temp_r26 = 0;
temp_r26 = HU3D_MOTATTR_NONE;
break;
case 2:
@ -974,7 +974,7 @@ void fn_1_2C84(omObjData *object)
object->trans.y = temp_r27->trans.y - 150;
object->trans.z = temp_r27->trans.z;
temp_r28 = 4;
temp_r26 = 0;
temp_r26 = HU3D_MOTATTR_NONE;
}
else {
if (temp_r31->unk3E) {
@ -985,7 +985,7 @@ void fn_1_2C84(omObjData *object)
object->trans.y = temp_r31->unk74.y - (temp_f28 * (temp_r31->unk74.y - temp_r31->unk68.y));
object->trans.z = temp_r31->unk74.z - (temp_f28 * (temp_r31->unk74.z - temp_r31->unk68.z));
temp_r28 = 0;
temp_r26 = 0x40000001;
temp_r26 = HU3D_MOTATTR_LOOP;
}
break;
}
@ -1042,20 +1042,20 @@ void fn_1_3C1C(omObjData *object)
object->rot.y = fn_1_1024(object->rot.y, 180.0f, 0.2f);
temp_r29 = 1;
temp_f29 = 1.0f;
temp_r28 = 0x40000001;
temp_r28 = HU3D_MOTATTR_LOOP;
break;
case 1:
if (fn_1_374() >= 9) {
temp_r29 = (temp_r31->unk0_field8) ? 5 : 6;
temp_f29 = 1.0f;
temp_r28 = 0;
temp_r28 = HU3D_MOTATTR_NONE;
}
else {
object->rot.y = fn_1_1024(object->rot.y, 0.0f, 0.2f);
temp_r29 = 0;
temp_f29 = 1.0f;
temp_r28 = 0x40000001;
temp_r28 = HU3D_MOTATTR_LOOP;
}
break;
@ -1065,7 +1065,7 @@ void fn_1_3C1C(omObjData *object)
}
temp_r29 = 0;
temp_f29 = 1.0f;
temp_r28 = 0x40000001;
temp_r28 = HU3D_MOTATTR_LOOP;
break;
}
if (temp_r31->unk0_field0) {

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

@ -315,7 +315,7 @@ u8 fn_1_1138(omObjData *object)
switch (lbl_1_bss_6) {
case 0:
if (lbl_1_bss_8 == 0) {
Hu3DMotionShiftSet(lbl_1_bss_C0[temp_r29]->model[0], lbl_1_bss_C0[temp_r29]->motion[1], 0.0f, 7.0f, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_C0[temp_r29]->model[0], lbl_1_bss_C0[temp_r29]->motion[1], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
temp_r30->unk40 = temp_r30->unk34;
}
lbl_1_bss_8++;
@ -324,7 +324,7 @@ u8 fn_1_1138(omObjData *object)
var_f30 = 1.0f;
if (lbl_1_bss_B == 0) {
lbl_1_bss_B = 1;
Hu3DMotionShiftSet(lbl_1_bss_C0[temp_r29]->model[0], lbl_1_bss_C0[temp_r29]->motion[0], 0.0f, 7.0f, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_C0[temp_r29]->model[0], lbl_1_bss_C0[temp_r29]->motion[0], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
}
}
temp_r30->unk34 = (temp_r30->unk40 + (var_f30 * (360.0f - temp_r30->unk40)));
@ -351,7 +351,7 @@ u8 fn_1_1138(omObjData *object)
}
break;
case 1:
Hu3DMotionShiftSet(lbl_1_bss_C0[temp_r29]->model[0], lbl_1_bss_C0[temp_r29]->motion[5], 0.0f, 7.0f, 0);
Hu3DMotionShiftSet(lbl_1_bss_C0[temp_r29]->model[0], lbl_1_bss_C0[temp_r29]->motion[5], 0.0f, 7.0f, HU3D_MOTATTR_NONE);
HuAudSStreamPlay(1);
lbl_1_bss_6++;
lbl_1_bss_8 = 0;

38
src/REL/m440Dll/object.c
View file

@ -165,7 +165,7 @@ void fn_1_B3A4(omObjData* arg0) {
fn_1_F228();
} else {
fn_1_F4D4(var_r31, 15, 7);
Hu3DMotionShiftSet(var_r30->model[0], var_r30->motion[1], 0.0f, 7.0f, 0x40000001);
Hu3DMotionShiftSet(var_r30->model[0], var_r30->motion[1], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
}
}
var_r28 = (var_r31->unkA == -1) ? 0 : var_r31->unkA;
@ -186,7 +186,7 @@ void fn_1_B3A4(omObjData* arg0) {
var_f31 = 1.0f;
var_r31->unkC = 0;
fn_1_F4D4(var_r31, 15, 8);
Hu3DMotionShiftSet(var_r30->model[0], var_r30->motion[0], 0.0f, 7.0f, 0x40000001);
Hu3DMotionShiftSet(var_r30->model[0], var_r30->motion[0], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
}
var_r31->unk30.y = 90.0f + (lbl_1_data_21C[var_r31->unkA] - 90.0f) * var_f31;
var_r31->unk3C = var_r31->unk30;
@ -323,7 +323,7 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) {
var_f31 = 1.0f;
arg1->unkC = arg1->unkE = 0;
lbl_1_bss_74++;
Hu3DMotionShiftSet(*arg0->model, *arg0->motion, 0.0f, 7.0f, 0x40000001U);
Hu3DMotionShiftSet(*arg0->model, *arg0->motion, 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
}
var_f30 = 90.0f - lbl_1_data_0[arg1->unk60];
@ -550,12 +550,12 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) {
arg1->unkC = arg1->unkE;
var_f28 = 1.0f;
if ((arg1->unk48 & 4) != 0) {
fn_1_ED88(arg0, 0, 0x40000001);
fn_1_ED88(arg0, 0, HU3D_MOTATTR_LOOP);
} else {
fn_1_ED88(arg0, 2, 0x40000001);
fn_1_ED88(arg0, 2, HU3D_MOTATTR_LOOP);
}
} else {
fn_1_ED88(arg0, 2, 0x40000001);
fn_1_ED88(arg0, 2, HU3D_MOTATTR_LOOP);
}
if ((arg1->unk48 & 4) != 0) {
arg1->unk30.y = fn_1_927C(arg1->unk6C, arg1->unk70, var_f28);
@ -664,14 +664,14 @@ void fn_1_D34C(omObjData* arg0, unkObjStruct* arg1) {
temp_f30 = HuPadTrigR[arg1->unk6];
if ((temp_r30->unk_0C == -1) && (temp_r30->unk_08 == arg0->motion[0]) && ((arg1->unk48 & 8) == 0) && (temp_f30 > 10.0f)) {
arg1->unk48 |= 8;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[3], 0.0f, 7.0f, 0U);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[3], 0.0f, 7.0f, HU3D_MOTATTR_NONE);
}
if ((arg1->unk48 & 8) != 0) {
if (temp_f30 <= 10.0f) {
fn_1_4E00(arg1->unk4A, -1.0f);
arg1->unk48 &= ~8;
temp_r30->unk_68 = 1.0f;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 7.0f, 0x40000001U);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
} else if (temp_f30 > 10.0f) {
if ((HuPadBtn[arg1->unk6] & 0x20) != 0) {
arg1->unk60 = 0;
@ -770,9 +770,9 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) {
arg1->unkC = 0;
Hu3DMotionSpeedSet(arg0->model[0], 2.0f);
if ((arg1->unk6C - arg1->unk68) > 0.0f) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[7], 64.0f, 7.0f, 0U);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[7], 64.0f, 7.0f, HU3D_MOTATTR_NONE);
} else {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[7], 4.0f, 7.0f, 0U);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[7], 4.0f, 7.0f, HU3D_MOTATTR_NONE);
}
Hu3DMotionShiftSpeedSet(arg0->model[0], 2.0f);
arg1->unk60++;
@ -786,7 +786,7 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) {
if (var_f31 >= 1.0f) {
arg1->unkC = 0;
var_f31 = 1.0f;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 7.0f, 0x40000001U);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
arg1->unk60++;
} else if (((arg1->unk6C - arg1->unk68) < 0.0f) && (Hu3DMotionShiftIDGet(arg0->model[0]) < 0)) {
if (Hu3DMotionTimeGet(arg0->model[0]) >= 60.0f) {
@ -842,13 +842,13 @@ void fn_1_E034(omObjData* arg0, unkObjStruct* arg1) {
switch (arg1->unk60) {
case 0:
lbl_1_bss_84 = lbl_1_data_0[arg1->unk4A];
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[4], 0.0f, 7.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[4], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
HuAudCharVoicePlay(arg1->unk8, 0x125);
arg1->unk60++;
break;
case 1:
if (temp_r27->unk_64 >= (Hu3DMotionMaxTimeGet(arg0->model[0]) - 1.0f)) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 7.0f, 0x40000001U);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
arg1->unkC = arg1->unkE = 0;
arg1->unk68 = arg1->unk30.y;
@ -960,13 +960,13 @@ u8 fn_1_E8AC(omObjData* arg0, unkObjStruct* arg1) {
switch (arg1->unk60) {
case 0:
lbl_1_bss_70 = 0;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[6], 0.0f, 7.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[6], 0.0f, 7.0f, HU3D_MOTATTR_NONE);
HuAudCharVoicePlay(arg1->unk8, 0x12E);
arg1->unk60++;
break;
case 1:
if (fn_1_4EA8(7U) == 5) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 7.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
arg1->unkC = 0;
arg1->unk68 = arg1->unk30.y;
var_f31 = lbl_1_data_0[arg1->unk4A];
@ -1032,7 +1032,7 @@ void fn_1_EE78(void) {
for (var_r31 = 0; var_r31 < 4; var_r31++) {
var_r30 = (unkObjStruct*)lbl_1_bss_C0[var_r31]->data;
if (fn_1_F4C0(var_r30, 15) == 8) {
Hu3DMotionShiftSet(lbl_1_bss_C0[var_r31]->model[0], lbl_1_bss_C0[var_r31]->motion[6], 0.0f, 7.0f, 0);
Hu3DMotionShiftSet(lbl_1_bss_C0[var_r31]->model[0], lbl_1_bss_C0[var_r31]->motion[6], 0.0f, 7.0f, HU3D_MOTATTR_NONE);
}
}
}
@ -1049,7 +1049,7 @@ void fn_1_EF50(void) {
var_r28 = Hu3DData[lbl_1_bss_C0[var_r31]->model[0]].unk_08;
var_r29 = Hu3DData[lbl_1_bss_C0[var_r31]->model[0]].unk_0C;
if ((var_r29 != lbl_1_bss_C0[var_r31]->motion[0]) && (var_r28 != lbl_1_bss_C0[var_r31]->motion[0])) {
Hu3DMotionShiftSet(lbl_1_bss_C0[var_r31]->model[0], lbl_1_bss_C0[var_r31]->motion[0], 0.0f, 7.0f, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_C0[var_r31]->model[0], lbl_1_bss_C0[var_r31]->motion[0], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
}
}
}
@ -1075,7 +1075,7 @@ void fn_1_F168(void) {
temp_r31 = lbl_1_bss_C0[lbl_1_bss_B8[var_r30]];
var_r29 = (unkObjStruct*)temp_r31->data;
fn_1_F4D4(var_r29, 15, 1);
Hu3DMotionShiftSet(temp_r31->model[0], temp_r31->motion[2], 0.0f, 7.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r31->model[0], temp_r31->motion[2], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
}
}
@ -1128,7 +1128,7 @@ void fn_1_F228(void) {
fn_1_F4D4(temp_r31, 15, 1);
}
if (temp_r30->motion[2] != Hu3DData[temp_r30->model[0]].unk_08) {
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[2], 0.0f, 7.0f, 0x40000001U);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[2], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
}
}
}

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

@ -834,7 +834,7 @@ void fn_1_2BD4(Work53E8 *arg0, omObjData *arg1, s32 arg2)
}
if (temp_r29 >= 0 && arg0->unk9C != temp_r29) {
arg0->unk9C = temp_r29;
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[arg0->unk9C], 0, 8, 0x40000001);
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[arg0->unk9C], 0, 8, HU3D_MOTATTR_LOOP);
}
}
@ -936,7 +936,7 @@ void fn_1_3C00(omObjData *object)
if (work->unk98 == 2004 && lbl_1_bss_4C->work[0] >= 1005) {
work->unk98 = 2007;
work->unk64.x = 20;
Hu3DMotionShiftSet(object->model[0], object->motion[1], 0, 20, 0x40000001);
Hu3DMotionShiftSet(object->model[0], object->motion[1], 0, 20, HU3D_MOTATTR_LOOP);
object->func = fn_1_40A8;
return;
}
@ -960,7 +960,7 @@ void fn_1_3C00(omObjData *object)
work->unk64.x = 10;
work->unkE4 = 0;
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 8, 0);
Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 8, HU3D_MOTATTR_NONE);
Hu3DMotionSet(object->model[1], object->motion[11]);
HuAudFXEmiterPlay(1814, &work->unk4);
}
@ -969,7 +969,7 @@ void fn_1_3C00(omObjData *object)
work->unk64.x = 10;
work->unkE4 = 0;
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DMotionShiftSet(object->model[0], object->motion[5], 0, 8, 0);
Hu3DMotionShiftSet(object->model[0], object->motion[5], 0, 8, HU3D_MOTATTR_NONE);
Hu3DMotionSet(object->model[1], object->motion[11]);
HuAudFXEmiterPlay(1814, &work->unk4);
}
@ -991,7 +991,7 @@ void fn_1_3C00(omObjData *object)
if (240.0f < work->unkE4 || Hu3DMotionEndCheck(object->model[0])) {
work->unk98 = 2004;
work->unk9C = 1;
Hu3DMotionShiftSet(object->model[0], object->motion[1], 0, 8, 0x40000001);
Hu3DMotionShiftSet(object->model[0], object->motion[1], 0, 8, HU3D_MOTATTR_LOOP);
}
break;
@ -1032,7 +1032,7 @@ void fn_1_40A8(omObjData *object)
work->unk98++;
work->unk64.x = 10.0f;
Hu3DModelAttrReset(object->model[0], 0x40000003);
Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 10, 0);
Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 10, HU3D_MOTATTR_NONE);
Hu3DMotionSet(object->model[1], object->motion[11]);
HuAudFXEmiterPlay(1814, &work->unk4);
}
@ -1043,7 +1043,7 @@ void fn_1_40A8(omObjData *object)
if (0.0f > work->unk64.x && Hu3DMotionEndCheck(object->model[0])) {
work->unk98++;
work->unk64.x = 10.0f;
Hu3DMotionShiftSet(object->model[0], object->motion[5], 0, 10, 0);
Hu3DMotionShiftSet(object->model[0], object->motion[5], 0, 10, HU3D_MOTATTR_NONE);
Hu3DMotionSet(object->model[1], object->motion[11]);
HuAudFXEmiterPlay(1814, &work->unk4);
}
@ -1053,7 +1053,7 @@ void fn_1_40A8(omObjData *object)
work->unk64.x--;
if (0.0f > work->unk64.x && Hu3DMotionEndCheck(object->model[0])) {
work->unk98++;
Hu3DMotionShiftSet(object->model[0], object->motion[1], 0, 10, 0x40000001);
Hu3DMotionShiftSet(object->model[0], object->motion[1], 0, 10, HU3D_MOTATTR_LOOP);
}
break;
@ -1140,14 +1140,14 @@ void fn_1_40A8(omObjData *object)
if (8.0f > ABS(angle)) {
work->unkA0 = 0;
Hu3DModelPosSet(object->model[2], 0, 0, -10);
Hu3DMotionShiftSet(object->model[0], object->motion[6], 0, 4, 0x40000001);
Hu3DMotionShiftSet(object->model[0], object->motion[6], 0, 4, HU3D_MOTATTR_LOOP);
}
}
if (lbl_1_bss_4C->work[0] == 1007) {
work->unk98++;
work->unk64.x = 10.0f;
Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DMotionShiftSet(object->model[0], object->motion[8], 0, 8, 0);
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);
Hu3D3Dto2D(&pos3D, 1, &pos2D);
@ -1263,10 +1263,10 @@ void fn_1_40A8(omObjData *object)
if (60.0f < work->unk64.x && work->unkC0 >= 0) {
work->unk98++;
if (work->unkC0 == 1) {
Hu3DMotionShiftSet(object->model[0], object->motion[9], 0, 20, 0);
Hu3DMotionShiftSet(object->model[0], object->motion[9], 0, 20, HU3D_MOTATTR_NONE);
}
else {
Hu3DMotionShiftSet(object->model[0], object->motion[10], 0, 20, 0);
Hu3DMotionShiftSet(object->model[0], object->motion[10], 0, 20, HU3D_MOTATTR_NONE);
}
}
break;

12
src/REL/m442Dll/main.c
View file

@ -883,7 +883,7 @@ void fn_1_2254(omObjData *object)
var_r29 = 0;
var_f28 = 1.0f;
}
var_r28 = 0x40000001;
var_r28 = HU3D_MOTATTR_LOOP;
object->trans.x += var_r31->unk_24.x;
object->trans.z += var_r31->unk_24.z;
fn_1_37B8(object);
@ -954,7 +954,7 @@ void fn_1_2254(omObjData *object)
}
var_r29 = 8;
var_f28 = 1.0f;
var_r28 = 0;
var_r28 = HU3D_MOTATTR_NONE;
object->trans.x += 0.2f * (var_r31->unk_4C - object->trans.x);
object->trans.z += 0.2f * (var_r31->unk_54 - object->trans.z);
object->rot.y = fn_1_85E8(object->rot.y, var_r31->unk_58, 0.2f);
@ -969,7 +969,7 @@ void fn_1_2254(omObjData *object)
}
var_r29 = 8;
var_f28 = var_r31->unk_3C < (var_r31->unk_3E / 2) ? 0.0f : 1.0f;
var_r28 = 0;
var_r28 = HU3D_MOTATTR_NONE;
object->trans.x += 0.2f * (var_r31->unk_4C - object->trans.x);
object->trans.z += 0.2f * (var_r31->unk_54 - object->trans.z);
object->rot.y = fn_1_85E8(object->rot.y, var_r31->unk_58, 0.2f);
@ -1295,14 +1295,14 @@ void fn_1_3C94(omObjData *object)
if (var_r27 < 11) {
var_r29 = 0;
var_f31 = 1.0f;
var_r28 = 0x40000001;
var_r28 = HU3D_MOTATTR_LOOP;
}
else {
object->rot.y = fn_1_85E8(object->rot.y, 0.0f, 0.2f);
if (lbl_1_bss_11EE8 != 0) {
var_r29 = 5;
var_f31 = 1.0f;
var_r28 = 0;
var_r28 = HU3D_MOTATTR_NONE;
if (var_r31->unk_3C != 0) {
if (--var_r31->unk_3C == 0) {
HuAudCharVoicePlay(var_r31->unk_10, 0x125);
@ -1312,7 +1312,7 @@ void fn_1_3C94(omObjData *object)
else {
var_r29 = 6;
var_f31 = 1.0f;
var_r28 = 0;
var_r28 = HU3D_MOTATTR_NONE;
}
}
if ((var_r29 >= 0 && var_r29 != var_r31->unk_30) || var_r28 != var_r31->unk_34) {

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

@ -202,12 +202,12 @@ void fn_1_470(void)
Hu3DModelRotSet(lbl_1_bss_2D0, 0, (-(temp_r29 / 20.0f)) * 120.0f, 0);
}
if (temp_r31 == 10) {
Hu3DMotionShiftSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[19], 0, 16, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[19], 0, 16, HU3D_MOTATTR_LOOP);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 8, HU3D_MOTATTR_LOOP);
}
HuPrcVSleep();
}
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 8, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 8, HU3D_MOTATTR_LOOP);
HuWinMesMaxSizeGet(1, sp8, MAKE_MESSID(0x1C, 0x00));
temp_r30 = HuWinExCreateStyled(-10000, 340, sp8[0], sp8[1], -1, 1);
HuWinExAnimIn(temp_r30);
@ -218,7 +218,7 @@ void fn_1_470(void)
HuWinExAnimOut(temp_r30);
HuWinExCleanup(temp_r30);
HuWinComKeyReset();
Hu3DMotionShiftSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[20], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[20], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 <= 20; temp_r31++) {
HuPrcVSleep();
}
@ -243,7 +243,7 @@ void fn_1_470(void)
Hu3DModelRotSet(lbl_1_bss_199C2[22], 0, (30.0 * (1.0 - (temp_r29 / 20.0f))) + 60.0, 0);
}
if (temp_r31 == 50) {
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[23], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[23], 0, 10, HU3D_MOTATTR_LOOP);
}
if (temp_r31 > 40) {
temp_r29 = temp_r31 - 40;
@ -265,21 +265,21 @@ void fn_1_470(void)
HuWinComKeyReset();
Hu3DModelAttrReset(lbl_1_bss_199C2[11], 0x40000002);
HuAudFXPlay(1854);
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[24], 0, 10, 0x40000001);
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++) {
temp_f31 = temp_r31 / 20.0f;
Hu3DModelRotSet(lbl_1_bss_199C2[22], 0, (150.0f * temp_f31) + 30.0f, 0);
HuPrcVSleep();
}
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[23], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[23], 0, 10, HU3D_MOTATTR_LOOP);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 < 20; temp_r31++) {
temp_f31 = temp_r31 / 20.0f;
Hu3DModelRotSet(lbl_1_bss_2D0, 0, -120.0f - (60.0f * temp_f31), 0);
HuPrcVSleep();
}
HuAudFXPlay(1855);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, HU3D_MOTATTR_LOOP);
while (Hu3DMotionEndCheck(lbl_1_bss_199C2[11]) == 0) {
HuPrcVSleep();
}
@ -294,7 +294,7 @@ void fn_1_470(void)
Hu3DMotionTimeSet(lbl_1_bss_199C2[9], lbl_1_data_140[0]);
Hu3DModelAttrSet(lbl_1_bss_199C2[9], 0x40000002);
HuPrcSleep(20);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 8, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 8, HU3D_MOTATTR_LOOP);
sp1C.x = 124;
sp1C.y = 0;
sp1C.z = -180;
@ -325,20 +325,20 @@ void fn_1_470(void)
HuPrcSleep(40);
Hu3DModelAttrSet(lbl_1_bss_199C2[64], 1);
fn_1_8180(9);
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[24], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[24], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) {
if (temp_r31 <= 10) {
Hu3DModelRotSet(lbl_1_bss_199C2[22], 0, (90.0 * (temp_r31 / 10.0)) + 180.0, 0);
}
if (temp_r31 == 10) {
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, HU3D_MOTATTR_LOOP);
}
if (temp_r31 > 10 && temp_r31 <= 25) {
temp_r29 = temp_r31 - 10;
Hu3DModelRotSet(lbl_1_bss_2D0, 0, (90.0 * (temp_r29 / 15.0)) + 180.0, 0);
}
if (temp_r31 == 25) {
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, HU3D_MOTATTR_LOOP);
}
Hu3DModelPosSet(lbl_1_bss_199C2[22], (-300.0 * (1.0 - cosd(3.0 * temp_r31))) + (-160.0), 0, 155);
HuPrcVSleep();
@ -350,7 +350,7 @@ void fn_1_470(void)
for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) {
Hu3DModelPosSet(lbl_1_bss_199C2[26], (-300.0 * cosd(1.5 * temp_r31)) + (-160.0), 0, 155);
if (temp_r31 == 50) {
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[27], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[27], 0, 10, HU3D_MOTATTR_LOOP);
}
HuPrcVSleep();
}
@ -365,23 +365,23 @@ void fn_1_470(void)
HuWinExAnimOut(temp_r30);
HuWinExCleanup(temp_r30);
HuWinComKeyReset();
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[28], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[28], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 < 20; temp_r31++) {
temp_f31 = temp_r31 / 20.0f;
Hu3DModelRotSet(lbl_1_bss_199C2[26], 0, (temp_f31 * 90.0f) + 90.0f, 0);
HuPrcVSleep();
}
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[27], 0, 10, 0x40000001);
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);
HuAudFXPlay(1862);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 < 20; temp_r31++) {
temp_f31 = 1.0 - (temp_r31 / 20.0f);
Hu3DModelRotSet(lbl_1_bss_2D0, 0, (temp_f31 * 90.0f) + 180.0f, 0);
HuPrcVSleep();
}
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, HU3D_MOTATTR_LOOP);
while (Hu3DMotionTimeGet(lbl_1_bss_199C2[9]) < lbl_1_data_140[1]) {
if (Hu3DMotionTimeGet(lbl_1_bss_199C2[9]) == 128.0f) {
HuAudFXPlay(1850);
@ -408,20 +408,20 @@ void fn_1_470(void)
HuPrcSleep(40);
Hu3DModelAttrSet(lbl_1_bss_199C2[64], 1);
fn_1_8180(9);
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[28], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[28], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) {
if (temp_r31 <= 10) {
Hu3DModelRotSet(lbl_1_bss_199C2[26], 0, (90.0 * (temp_r31 / 10.0)) + 180.0, 0);
}
if (temp_r31 == 10) {
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, HU3D_MOTATTR_LOOP);
}
if (temp_r31 > 10 && temp_r31 <= 25) {
temp_r29 = temp_r31 - 10;
Hu3DModelRotSet(lbl_1_bss_2D0, 0, (90.0 * (temp_r29 / 15.0)) + 180.0, 0);
}
if (temp_r31 == 25) {
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, HU3D_MOTATTR_LOOP);
}
Hu3DModelPosSet(lbl_1_bss_199C2[26], (-400.0 * (1.0 - cosd(3.0 * temp_r31))) + (-160.0), 0, 155);
HuPrcVSleep();
@ -433,7 +433,7 @@ void fn_1_470(void)
for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) {
Hu3DModelPosSet(lbl_1_bss_199C2[30], (-400.0 * cosd(1.5 * temp_r31)) + (-160.0), 100, 155);
if (temp_r31 == 50) {
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[31], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[31], 0, 10, HU3D_MOTATTR_LOOP);
}
HuPrcVSleep();
}
@ -449,23 +449,23 @@ void fn_1_470(void)
HuWinExAnimOut(temp_r30);
HuWinExCleanup(temp_r30);
HuWinComKeyReset();
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[32], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[32], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 < 20; temp_r31++) {
temp_f31 = temp_r31 / 20.0f;
Hu3DModelRotSet(lbl_1_bss_199C2[30], 0, (temp_f31 * 90.0f) + 90.0f, 0);
HuPrcVSleep();
}
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[31], 0, 10, 0x40000001);
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);
HuAudFXPlay(1862);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 < 20; temp_r31++) {
temp_f31 = 1.0 - (temp_r31 / 20.0f);
Hu3DModelRotSet(lbl_1_bss_2D0, 0, (temp_f31 * 90.0f) + 180.0f, 0);
HuPrcVSleep();
}
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, HU3D_MOTATTR_LOOP);
while (Hu3DMotionTimeGet(lbl_1_bss_199C2[9]) < lbl_1_data_140[2]) {
if (Hu3DMotionTimeGet(lbl_1_bss_199C2[9]) == 300.0f) {
HuAudFXPlay(1850);
@ -492,20 +492,20 @@ void fn_1_470(void)
HuPrcSleep(40);
Hu3DModelAttrSet(lbl_1_bss_199C2[64], 1);
fn_1_8180(9);
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[32], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[32], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) {
if (temp_r31 <= 10) {
Hu3DModelRotSet(lbl_1_bss_199C2[30], 0, (90.0 * (temp_r31 / 10.0)) + 180.0, 0);
}
if (temp_r31 == 10) {
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, HU3D_MOTATTR_LOOP);
}
if (temp_r31 > 10 && temp_r31 <= 25) {
temp_r29 = temp_r31 - 10;
Hu3DModelRotSet(lbl_1_bss_2D0, 0, (90.0 * (temp_r29 / 15.0)) + 180.0, 0);
}
if (temp_r31 == 25) {
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, HU3D_MOTATTR_LOOP);
}
Hu3DModelPosSet(lbl_1_bss_199C2[30], (-400.0 * (1.0 - cosd(3.0 * temp_r31))) + (-160.0), 100, 155);
HuPrcVSleep();
@ -535,10 +535,10 @@ void fn_1_470(void)
Hu3DModelRotSet(lbl_1_bss_199C2[34], 0, (30.0 * (1.0 - (temp_r29 / 20.0f))) + 60.0, 0);
}
if (temp_r31 == 50) {
Hu3DMotionShiftSet(lbl_1_bss_199C2[34], lbl_1_bss_1990E[35], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[34], lbl_1_bss_1990E[35], 0, 10, HU3D_MOTATTR_LOOP);
}
if (temp_r31 == 40) {
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 10, HU3D_MOTATTR_LOOP);
}
if (temp_r31 >= 40) {
temp_r29 = temp_r31 - 40;
@ -558,7 +558,7 @@ void fn_1_470(void)
Hu3DModelPosSet(lbl_1_bss_2D0, (temp_f31 * sp1C.x) + sp10.x, (temp_f31 * sp1C.y) + sp10.y, (temp_f31 * sp1C.z) + sp10.z);
HuPrcVSleep();
}
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, 0x40000001);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0], 0, 10, HU3D_MOTATTR_LOOP);
BoardStatusShowSet(lbl_1_bss_2D6, 1);
BoardStatusShowSet(lbl_1_bss_2D4, 1);
sp1C.x = -112;
@ -716,7 +716,7 @@ void fn_1_3B7C(void)
for (temp_r30 = 0; temp_r30 < 100; temp_r30++) {
temp_r31 = temp_r30;
if (temp_r31 == 0) {
Hu3DMotionShiftSet(lbl_1_bss_199C2[34], lbl_1_bss_1990E[36], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[34], lbl_1_bss_1990E[36], 0, 10, HU3D_MOTATTR_LOOP);
}
if (temp_r31 <= 20) {
Hu3DModelRotSet(lbl_1_bss_199C2[34], 0, (30.0 * (temp_r31 / 20.0)) + 60.0, 0);
@ -730,7 +730,7 @@ void fn_1_3B7C(void)
Hu3DModelRotSet(lbl_1_bss_199C2[34], 0, (110.0 * (1.0 - (temp_r29 / 20.0))) + -20.0, 0);
}
if (temp_r31 == 70) {
Hu3DMotionShiftSet(lbl_1_bss_199C2[34], lbl_1_bss_1990E[35], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[34], lbl_1_bss_1990E[35], 0, 10, HU3D_MOTATTR_LOOP);
}
temp_r31 = temp_r30;
if (temp_r31 == 0) {
@ -748,7 +748,7 @@ void fn_1_3B7C(void)
Hu3DModelRotSet(lbl_1_bss_199C2[18], 0, temp_f31 * (1.0 - (temp_r29 / 20.0)), 0);
}
if (temp_r31 == 60) {
Hu3DMotionShiftSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[19], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[19], 0, 10, HU3D_MOTATTR_LOOP);
}
if (temp_r30 >= 20) {
temp_r31 = temp_r30 - 20;
@ -767,7 +767,7 @@ void fn_1_3B7C(void)
Hu3DModelRotSet(lbl_1_bss_199C2[26], 0, (temp_f31 - 10.0f) * (1.0 - (temp_r29 / 20.0)) + 10.0, 0);
}
if (temp_r31 == 50) {
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[27], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[27], 0, 10, HU3D_MOTATTR_LOOP);
}
}
if (temp_r30 >= 30) {
@ -787,7 +787,7 @@ void fn_1_3B7C(void)
Hu3DModelRotSet(lbl_1_bss_199C2[30], 0, (temp_f31 - -10.0f) * (1.0 - (temp_r29 / 20.0)) + -10.0, 0);
}
if (temp_r31 == 50) {
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[31], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[31], 0, 10, HU3D_MOTATTR_LOOP);
}
}
if (temp_r30 >= 40) {
@ -807,19 +807,19 @@ void fn_1_3B7C(void)
Hu3DModelRotSet(lbl_1_bss_199C2[22], 0, (temp_f31 - 20.0f) * (1.0 - (temp_r29 / 20.0)) + 20.0, 0);
}
if (temp_r31 == 50) {
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[23], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[23], 0, 10, HU3D_MOTATTR_LOOP);
}
}
if (temp_r30 >= 30) {
temp_r31 = temp_r30 - 30;
if (temp_r31 == 0) {
Hu3DMotionShiftSet(lbl_1_bss_2D0, lbl_1_bss_2C0[1], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2D0, lbl_1_bss_2C0[1], 0, 10, HU3D_MOTATTR_LOOP);
}
if (temp_r31 <= 20) {
Hu3DModelRotSet(lbl_1_bss_2D0, 0, -135.0 - (45.0 * (temp_r31 / 20.0)), 0);
}
if (temp_r31 == 20) {
Hu3DMotionShiftSet(lbl_1_bss_2D0, lbl_1_bss_2C0[0], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2D0, lbl_1_bss_2C0[0], 0, 10, HU3D_MOTATTR_LOOP);
}
}
HuPrcVSleep();
@ -839,14 +839,14 @@ void fn_1_3B7C(void)
HuWinExAnimOut(temp_r28);
HuWinExCleanup(temp_r28);
HuWinComKeyReset();
Hu3DMotionShiftSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[21], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[21], 0, 10, HU3D_MOTATTR_LOOP);
HuPrcSleep(5);
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[25], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[29], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[25], 0, 10, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[29], 0, 10, HU3D_MOTATTR_LOOP);
HuPrcSleep(10);
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[33], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[33], 0, 10, HU3D_MOTATTR_LOOP);
HuPrcSleep(10);
Hu3DMotionShiftSet(lbl_1_bss_199C2[34], lbl_1_bss_1990E[37], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_199C2[34], lbl_1_bss_1990E[37], 0, 10, HU3D_MOTATTR_LOOP);
}
void fn_1_55B0(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4);

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

@ -266,7 +266,7 @@ void fn_1_9418(s16 arg0)
fn_1_8180(0);
Hu3DModelPosSet(lbl_1_bss_2D0, 124, 0, 70);
Hu3DModelRotSet(lbl_1_bss_2D0, 0, 180, 0);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[3], 0, 4, 0x40000020);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[3], 0, 4, HU3D_MOTATTR_SHIFT_REV);
HuPrcSleep(12);
HuWinMesMaxSizeGet(1, sp8, MAKE_MESSID(0x1C, 0x0F));
temp_r29 = HuWinCreate(-10000, 340, sp8[0], sp8[1], 1);
@ -356,7 +356,7 @@ void fn_1_9418(s16 arg0)
HuPrcVSleep();
}
}
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[3], 0, 8, 0x0);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[3], 0, 8, HU3D_MOTATTR_NONE);
HuPrcSleep(4);
temp_r24 = lbl_1_bss_788[arg0]/4;
lbl_1_bss_1888.y = (-15-temp_r24)+(0.1*(float)frandmod(10));
@ -608,11 +608,11 @@ void fn_1_ABD0(s16 arg0, s16 arg1)
if(temp_r31[1] & 0x2) {
if(temp_r31[0] == 85) {
if(Hu3DMotionIDGet(temp_r29) != lbl_1_bss_1990E[45] && Hu3DMotionShiftIDGet(temp_r29) != lbl_1_bss_1990E[45]) {
Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[45], 0, 8, 0);
Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[45], 0, 8, HU3D_MOTATTR_NONE);
}
} else {
if(Hu3DMotionIDGet(temp_r29) != lbl_1_bss_1990E[46] && Hu3DMotionShiftIDGet(temp_r29) != lbl_1_bss_1990E[46]) {
Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[46], 0, 8, 0x40000001);
Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[46], 0, 8, HU3D_MOTATTR_LOOP);
}
}
temp_r31[0]--;
@ -624,7 +624,7 @@ void fn_1_ABD0(s16 arg0, s16 arg1)
} else {
if(temp_r31[1] & 0x4) {
if(Hu3DMotionIDGet(temp_r29) != lbl_1_bss_1990E[43] && Hu3DMotionShiftIDGet(temp_r29) != lbl_1_bss_1990E[43]) {
Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[43], 0, 16, 0x40000001);
Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[43], 0, 16, HU3D_MOTATTR_LOOP);
}
temp_r31[0]--;
if(temp_r31[0] <= 0) {

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

@ -1642,7 +1642,7 @@ void fn_1_6268(void) {
Hu3DModelAttrSet(temp_r31->unk00, 0x40000200);
}
} else {
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 8.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSpeedSet(temp_r31->unk00, 1.0f);
}
} else {
@ -1661,39 +1661,39 @@ void fn_1_6268(void) {
if (temp_r31->unk24 != 2) {
temp_r31->unk24 = 2;
if (fn_1_520(temp_r31->unk18) == FALSE) {
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[2], 0.0f, 8.0f, 0x40000001);
CharModelMotionShiftSet(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);
}
} else {
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[2], 0.0f, 8.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f);
}
}
} else if (temp_r31->unk24 != 1) {
temp_r31->unk24 = 1;
if (fn_1_520(temp_r31->unk18) == FALSE) {
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[1], 0.0f, 8.0f, 0x40000001);
CharModelMotionShiftSet(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);
}
} else {
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[1], 0.0f, 8.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f);
}
}
} else if (temp_r31->unk24 != 0) {
temp_r31->unk24 = 0;
if (fn_1_520(temp_r31->unk18) == FALSE) {
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[0], 0.0f, 0.0f, 0x40000001);
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);
}
} else {
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 0.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 0.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSpeedSet(temp_r31->unk00, 1.0f);
}
}
@ -1718,9 +1718,9 @@ void fn_1_6268(void) {
block_exit_loop:
lbl_1_bss_6DC = 6;
if (fn_1_520(temp_r31->unk18) == FALSE) {
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[0], 0.0f, 2.0f, 0x40000001);
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[0], 0.0f, 2.0f, HU3D_MOTATTR_LOOP);
} else {
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 0.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 0.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSpeedSet(temp_r31->unk00, 1.0f);
}
var_f19 = 10.0f;
@ -1747,7 +1747,7 @@ block_exit_loop:
if (lbl_1_bss_588->unk30 > lbl_1_bss_588[1].unk30) {
var_r26 = 0;
}
var_r24 = 0;
var_r24 = HU3D_MOTATTR_NONE;
if (temp_r31->unk18 != 0) {
if (fn_1_520(1) == FALSE) {
if (var_r26 != -1) {
@ -1782,10 +1782,10 @@ block_exit_loop:
} else {
if (var_r28 == 6) {
var_r28 = 5;
var_r24 = 0x40000001;
var_r24 = HU3D_MOTATTR_LOOP;
} else {
var_r28 = 6;
var_r24 = 0;
var_r24 = HU3D_MOTATTR_NONE;
}
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[var_r28], 0.0f, 8.0f, var_r24);
if (var_r28 == 6) {
@ -1951,10 +1951,10 @@ void fn_1_8320(void) {
for (i = 0; i < 2; i++) {
temp_r31 = &lbl_1_bss_588[i];
if (fn_1_520(temp_r31->unk18) == FALSE) {
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[0], 0.0f, 8.0f, 0x40000001);
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[0], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionOverlaySet(temp_r31->unk00, temp_r31->unk08[4]);
} else {
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 8.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
}
}

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

@ -605,10 +605,10 @@ void fn_1_5B48(unkStruct8 *arg0)
switch (arg0->unk1C) {
case 0:
if (arg0->unk70 != 0) {
Hu3DMotionShiftSet(arg0->unk3C[0], arg0->unk40[2], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(arg0->unk3C[0], arg0->unk40[2], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
else {
CharModelMotionShiftSet(arg0->unk64, arg0->unk40[2], 0.0f, 10.0f, 0);
CharModelMotionShiftSet(arg0->unk64, arg0->unk40[2], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
arg0->unk1C = 1;
break;
@ -630,10 +630,10 @@ void fn_1_5C24(unkStruct8 *arg0)
switch (arg0->unk1C) {
case 0:
if (arg0->unk70 != 0) {
Hu3DMotionShiftSet(arg0->unk3C[0], arg0->unk40[3], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(arg0->unk3C[0], arg0->unk40[3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
else {
CharModelMotionShiftSet(arg0->unk64, arg0->unk40[3], 0.0f, 10.0f, 0);
CharModelMotionShiftSet(arg0->unk64, arg0->unk40[3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
arg0->unk1C = 1;
break;
@ -659,10 +659,10 @@ void fn_1_5D00(unkStruct8 *arg0)
case 0:
Hu3DModelAmbSet(arg0->unk3C[0], 0.8f, 0.8f, 0.8f);
if (arg0->unk70 != 0) {
Hu3DMotionShiftSet(arg0->unk3C[0], arg0->unk40[1], 0.0f, 10.0f, 0U);
Hu3DMotionShiftSet(arg0->unk3C[0], arg0->unk40[1], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
else {
CharModelMotionShiftSet(arg0->unk64, arg0->unk40[1], 0.0f, 10.0f, 0x40000001U);
CharModelMotionShiftSet(arg0->unk64, arg0->unk40[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionStartEndSet(arg0->unk3C[0], 0.0f, 59.0f);
}
sp8.y = 0.0f;

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

@ -496,7 +496,7 @@ void fn_1_4C84(UnkM447Struct_04* arg0) {
break;
}
if (var_r30 >= 0 && arg0->unkA4 != var_r30) {
fn_1_71FC(arg0, var_r30, 0.0f, 8.0f, 0x40000001);
fn_1_71FC(arg0, var_r30, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
}
@ -530,7 +530,7 @@ void fn_1_5080(UnkM447Struct_04* arg0) {
fn_1_1ED4(var_r30, &sp14);
VECSubtract(&sp14, &arg0->unk28, &sp8);
arg0->unk38 = fn_1_4F7C(arg0->unk38, atan2d(sp8.x, sp8.z), 1.0f);
fn_1_71FC(arg0, 3, 0.0f, 8.0f, 0);
fn_1_71FC(arg0, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
arg0->unk20 = 1;
/* fallthrough */
case 1:
@ -620,7 +620,7 @@ void fn_1_5520(UnkM447Struct_04* arg0) {
switch (arg0->unk20) {
case 0:
fn_1_71FC(arg0, 5, 0.0f, 8.0f, 0);
fn_1_71FC(arg0, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
arg0->unk60 = 0;
arg0->unk20 = 1;
/* fallthrough */
@ -688,7 +688,7 @@ void fn_1_5760(UnkM447Struct_04* arg0) {
switch (arg0->unk20) {
case 0:
Hu3DModelAttrReset(arg0->unk68, 0x40000001);
fn_1_71FC(arg0, 5, 0.0f, 8.0f, 0);
fn_1_71FC(arg0, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
arg0->unk60 = 0;
arg0->unk20 = 1;
/* fallthrough */
@ -702,7 +702,7 @@ void fn_1_5760(UnkM447Struct_04* arg0) {
}
arg0->unk20 = 2;
case 2:
fn_1_71FC(arg0, 0, 0.0f, 8.0f, 0x40000001);
fn_1_71FC(arg0, 0, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
fn_1_43CC(arg0, 8);
break;
}
@ -743,7 +743,7 @@ void fn_1_59D8(UnkM447Struct_04* arg0) {
} else {
HuAudFXPlay(lbl_1_rodata_510[arg0->unk18]);
}
fn_1_71FC(arg0, 6, 0.0f, 8.0f, 0);
fn_1_71FC(arg0, 6, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
arg0->unk20 = 1;
/* fallthrough */
case 1:
@ -753,7 +753,7 @@ void fn_1_59D8(UnkM447Struct_04* arg0) {
arg0->unk20 = 2;
/* fallthrough */
case 2:
fn_1_71FC(arg0, 0, 0.0f, 8.0f, 0x40000001);
fn_1_71FC(arg0, 0, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
fn_1_43CC(arg0, 0);
fn_1_7AA4(arg0, 0, 60);
break;
@ -761,19 +761,12 @@ void fn_1_59D8(UnkM447Struct_04* arg0) {
}
void fn_1_5AF0(UnkM447Struct_04* arg0) {
s32 var_r30;
switch (arg0->unk20) {
case 0:
if (arg0->unk1C != 0) {
HuAudFXPlay(0x40);
}
if (arg0->unk1C != 0) {
var_r30 = 0x40000001;
} else {
var_r30 = 0;
}
fn_1_71FC(arg0, 7, 0.0f, 8.0f, var_r30);
fn_1_71FC(arg0, 7, 0.0f, 8.0f, (arg0->unk1C != 0) ? HU3D_MOTATTR_LOOP : HU3D_MOTATTR_NONE);
arg0->unk20 = 1;
/* fallthrough */
case 1:
@ -791,7 +784,7 @@ void fn_1_5AF0(UnkM447Struct_04* arg0) {
void fn_1_5BD0(UnkM447Struct_04* arg0) {
switch (arg0->unk20) {
case 0:
fn_1_71FC(arg0, 8, 0.0f, 8.0f, 0);
fn_1_71FC(arg0, 8, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
arg0->unk20 = 1;
/* fallthrough */
case 1:

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

@ -413,13 +413,13 @@ void fn_1_1338(omObjData* arg0) {
if (lbl_1_bss_80 == 1001 && lbl_1_bss_84 == 45 && temp_r31->unk08 != -1) {
var_r20 = 8;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[var_r20], lbl_1_data_EC[var_r20], 45.0f,
(lbl_1_data_A8[var_r20] != 0) ? 0 : 0x40000001);
(lbl_1_data_A8[var_r20] != 0) ? HU3D_MOTATTR_NONE : HU3D_MOTATTR_LOOP);
temp_r31->unk20 = var_r20;
}
if (lbl_1_bss_80 == 1001 && lbl_1_bss_84 == 210 && temp_r31->unk08 != -1) {
var_r19 = 0;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[var_r19], lbl_1_data_EC[var_r19], 30.0f,
(lbl_1_data_A8[var_r19] != 0) ? 0 : 0x40000001);
(lbl_1_data_A8[var_r19] != 0) ? HU3D_MOTATTR_NONE : HU3D_MOTATTR_LOOP);
temp_r31->unk20 = var_r19;
}
if (lbl_1_bss_80 == 1003 && temp_r31->unk08 != -1) {
@ -820,12 +820,12 @@ void fn_1_1338(omObjData* arg0) {
var_r18 = (temp_r31->unk08 == -1 && (var_r29 == 9 || var_r29 == 10)) ? 0 : var_r29;
if (temp_r31->unk08 != -1) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[var_r18], lbl_1_data_EC[var_r18], lbl_1_data_C0[var_r18],
(lbl_1_data_A8[var_r18] != 0) ? 0 : 0x40000001);
(lbl_1_data_A8[var_r18] != 0) ? HU3D_MOTATTR_NONE : HU3D_MOTATTR_LOOP);
} else {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[var_r29], lbl_1_data_EC[var_r29], lbl_1_data_118[var_r29],
(lbl_1_data_B3[var_r29] != 0) ? 0 : 0x40000001);
(lbl_1_data_B3[var_r29] != 0) ? HU3D_MOTATTR_NONE : HU3D_MOTATTR_LOOP);
if (var_r29 == 3) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 15.0f, 33.0f, 0x40000002);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 15.0f, 33.0f, HU3D_MOTATTR_PAUSE);
}
}
temp_r31->unk20 = var_r29;

26
src/REL/mgmodedll/battle.c
View file

@ -190,7 +190,7 @@ s32 fn_1_E72C(void)
sp14.z = 680;
VECSubtract(&sp14, &sp20, &sp14);
temp_f30 = (180+atan2d(sp14.z, sp14.x))-360;
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[7], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[7], 0, 8, HU3D_MOTATTR_LOOP);
for(temp_r31=0; temp_r31<=30; temp_r31++) {
if(temp_r31 <= 20) {
temp_f31 = temp_r31/20.0;
@ -207,7 +207,7 @@ s32 fn_1_E72C(void)
HuPrcVSleep();
}
HuSprGrpDrawNoSet(lbl_1_bss_388, 64);
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 8, HU3D_MOTATTR_LOOP);
for(temp_r31=0; temp_r31<=10; temp_r31++) {
temp_f31 = temp_r31/10.0;
Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f30+((20-temp_f30)*temp_f31), 0);
@ -235,7 +235,7 @@ s32 fn_1_E72C(void)
HuPrcVSleep();
}
for(temp_r31=0; temp_r31<4; temp_r31++) {
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r31], lbl_1_bss_2BC4[temp_r31][0], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r31], lbl_1_bss_2BC4[temp_r31][0], 0, 10, HU3D_MOTATTR_LOOP);
}
for(temp_r31=0; temp_r31<=10; temp_r31++) {
temp_f31 = temp_r31/10.0f;
@ -595,9 +595,9 @@ s32 fn_1_1129C(void)
if(temp_r31 == 10) {
for(temp_r30=0; temp_r30<4; temp_r30++) {
if(lbl_1_bss_38C[temp_r30]) {
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r30], lbl_1_bss_2BC4[temp_r30][3], 0, 5, 0);
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r30], lbl_1_bss_2BC4[temp_r30][3], 0, 5, HU3D_MOTATTR_NONE);
} else {
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r30], lbl_1_bss_2BC4[temp_r30][4], 0, 5, 0);
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r30], lbl_1_bss_2BC4[temp_r30][4], 0, 5, HU3D_MOTATTR_NONE);
}
}
}
@ -638,10 +638,10 @@ s32 fn_1_1129C(void)
HuAudFXPlay(2175);
for(temp_r30=0; temp_r30<4; temp_r30++) {
if(sp10[temp_r30]) {
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r30], lbl_1_bss_2BC4[temp_r30][5], 0, 5, 0);
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r30], lbl_1_bss_2BC4[temp_r30][5], 0, 5, HU3D_MOTATTR_NONE);
fn_1_12B64(temp_r30);
} else {
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r30], lbl_1_bss_2BC4[temp_r30][6], 0, 5, 0);
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r30], lbl_1_bss_2BC4[temp_r30][6], 0, 5, HU3D_MOTATTR_NONE);
}
}
HuPrcSleep(120);
@ -649,7 +649,7 @@ s32 fn_1_1129C(void)
} else {
HuPrcSleep(30);
for(temp_r30=0; temp_r30<4; temp_r30++) {
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r30], lbl_1_bss_2BC4[temp_r30][0], 0, 5, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r30], lbl_1_bss_2BC4[temp_r30][0], 0, 5, HU3D_MOTATTR_LOOP);
}
HuPrcSleep(30);
}
@ -683,7 +683,7 @@ s32 fn_1_11E68(void)
s16 j;
float weight;
for(i=0; i<4; i++) {
Hu3DMotionShiftSet(lbl_1_bss_2C14[i], lbl_1_bss_2BC4[i][0], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C14[i], lbl_1_bss_2BC4[i][0], 0, 10, HU3D_MOTATTR_LOOP);
}
for(i=0; i<=20; i++) {
weight = i/20.0f;
@ -725,7 +725,7 @@ void fn_1_1222C(void)
Vec posEnd;
Vec posModel;
for(i=0; i<4; i++) {
Hu3DMotionShiftSet(lbl_1_bss_2C14[i], lbl_1_bss_2BC4[i][2], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C14[i], lbl_1_bss_2BC4[i][2], 0, 10, HU3D_MOTATTR_LOOP);
}
model = &Hu3DData[lbl_1_bss_2C80[5]];
pos = model->pos;
@ -747,7 +747,7 @@ void fn_1_1222C(void)
}
}
if(i == 20) {
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[7], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[7], 0, 8, HU3D_MOTATTR_LOOP);
}
if(i >= 20) {
weight = (i-20)/10.0;
@ -756,7 +756,7 @@ void fn_1_1222C(void)
HuPrcVSleep();
}
for(i=0; i<4; i++) {
Hu3DMotionShiftSet(lbl_1_bss_2C14[i], lbl_1_bss_2BC4[i][0], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C14[i], lbl_1_bss_2BC4[i][0], 0, 10, HU3D_MOTATTR_LOOP);
}
for(i=0; i<=30; i++) {
weight = i/30.0;
@ -765,7 +765,7 @@ void fn_1_1222C(void)
Hu3DModelPosSetV(lbl_1_bss_2C80[5], &posModel);
HuPrcVSleep();
}
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 10, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 10, HU3D_MOTATTR_LOOP);
for(i=0; i<=10; i++) {
weight = 1.0-(i/10.0);
Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, angle*weight, 0);

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

@ -2505,13 +2505,13 @@ void fn_1_25E74(s32 arg0) {
void fn_1_25EC8(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
switch (arg3) {
case 0:
Hu3DMotionShiftSet(arg0, arg1, 0.0f, arg2, 0);
Hu3DMotionShiftSet(arg0, arg1, 0.0f, arg2, HU3D_MOTATTR_NONE);
break;
case 1:
Hu3DMotionShiftSet(arg0, arg1, 0.0f, arg2, 0x40000001);
Hu3DMotionShiftSet(arg0, arg1, 0.0f, arg2, HU3D_MOTATTR_LOOP);
break;
case 2:
Hu3DMotionShiftSet(arg0, arg1, 0.0f, arg2, 0x40000002);
Hu3DMotionShiftSet(arg0, arg1, 0.0f, arg2, HU3D_MOTATTR_PAUSE);
break;
}
}

8
src/REL/mgmodedll/tictactoe.c
View file

@ -129,7 +129,7 @@ s32 fn_1_13418(void)
HuSprGrpPosSet(lbl_1_bss_3AA, 450+(-16*temp_f31), 65);
}
if(temp_r31 == 30) {
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[7], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[7], 0, 8, HU3D_MOTATTR_LOOP);
}
if(temp_r31 > 30) {
temp_f31 = (temp_r31-30.0)/30.0;
@ -143,7 +143,7 @@ s32 fn_1_13418(void)
}
HuPrcVSleep();
}
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 8, HU3D_MOTATTR_LOOP);
for(temp_r31=0; temp_r31<=10; temp_r31++) {
temp_f31 = temp_r31/10.0;
Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f29+((20.0f-temp_f29)*temp_f31), 0);
@ -556,7 +556,7 @@ void fn_1_16438(void)
Hu3DMotionTimeSet(lbl_1_bss_2C80[5], 0);
}
if(temp_r31 == 30) {
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[7], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[7], 0, 8, HU3D_MOTATTR_LOOP);
}
if(temp_r31 > 30) {
temp_f31 = (temp_r31-30.0)/30.0;
@ -570,7 +570,7 @@ void fn_1_16438(void)
}
HuPrcVSleep();
}
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 8, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 8, HU3D_MOTATTR_LOOP);
for(temp_r31=0; temp_r31<=10; temp_r31++) {
temp_f31 = 1.0-(temp_r31/10.0);
Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f31*temp_f30, 0);

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

@ -446,9 +446,9 @@ void fn_1_5DA8(void)
fn_1_69C8(temp_r28, sp16[0], 0);
fn_1_69C8(temp_r28, sp16[1], 1);
fn_1_69C8(temp_r28, sp16[2], 2);
Hu3DMotionShiftSet(sp16[0], sp40[0][0], 0, 16, 0x40000001);
Hu3DMotionShiftSet(sp16[1], sp40[1][0], 0, 16, 0x40000001);
Hu3DMotionShiftSet(sp16[2], sp40[2][0], 0, 16, 0x40000001);
Hu3DMotionShiftSet(sp16[0], sp40[0][0], 0, 16, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(sp16[1], sp40[1][0], 0, 16, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(sp16[2], sp40[2][0], 0, 16, HU3D_MOTATTR_LOOP);
}
temp_r24 = 0;
}

4
src/REL/option/guide.c
View file

@ -74,7 +74,7 @@ omObjData *OptionGuideCreate(void)
work->unk_60 = CharModelEffectNpcInit(object->model[0], object->motion[1], 0, 0xC);
CharModelLayerSetAll(1);
Hu3DModelShadowSet(object->model[0]);
Hu3DMotionShiftSet(object->model[0], object->motion[0], 0.0f, 8.0f, 0x40000001);
Hu3DMotionShiftSet(object->model[0], object->motion[0], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
SetExecMode(object, MODE_DISABLED);
UpdateGuide(object);
return object;
@ -207,7 +207,7 @@ static void UpdateGuide(omObjData *object)
work->pos.x += work->posDelta.x;
work->pos.z += work->posDelta.z;
if (work->motion != motion) {
Hu3DMotionShiftSet(*object->model, object->motion[motion], 0.0f, 8.0f, 0x40000001);
Hu3DMotionShiftSet(*object->model, object->motion[motion], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
work->motion = motion;
}
omSetTra(object, work->pos.x, work->pos.y, work->pos.z);

4
src/REL/present/common.c
View file

@ -58,7 +58,7 @@ omObjData *PresentGuideCreate(void)
for (var_r29 = 0; var_r29 < 3; var_r29++) {
object->motion[var_r29] = Hu3DJointMotionFile(object->model[0], guideMotTbl[var_r29]);
}
Hu3DMotionShiftSet(object->model[0], object->motion[work->motion = 0], 0.0f, 8.0f, 0x40000001);
Hu3DMotionShiftSet(object->model[0], object->motion[work->motion = 0], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
work->unk_50 = CharModelEffectNpcInit(object->model[0], object->motion[2], 1, 10);
work->unk_54 = CharModelEffectNpcInit(object->model[0], object->motion[1], 0, 10);
CharModelLayerSetAll(1);
@ -204,7 +204,7 @@ static void UpdateGuide(omObjData *object)
work->pos.x += work->posDelta.x;
work->pos.z += work->posDelta.z;
if (work->motion != motion) {
Hu3DMotionShiftSet(object->model[0], object->motion[work->motion = motion], 0.0f, 8.0f, 0x40000001);
Hu3DMotionShiftSet(object->model[0], object->motion[work->motion = motion], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
omSetTra(object, work->pos.x, work->pos.y, work->pos.z);
omSetRot(object, work->rot.x, work->rot.y, work->rot.z);

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

@ -467,11 +467,11 @@ void fn_1_7544(void)
gains[lbl_1_bss_172] += gains[4];
for (i = 0; i < 4; i++) {
if (gains[lbl_1_bss_19F0[i]]) {
CharModelMotionShiftSet(GWPlayerCfg[lbl_1_bss_19F0[i]].character, lbl_1_bss_1990[lbl_1_bss_19F0[i]][1], 0, 4, 0);
CharModelMotionShiftSet(GWPlayerCfg[lbl_1_bss_19F0[i]].character, lbl_1_bss_1990[lbl_1_bss_19F0[i]][1], 0, 4, HU3D_MOTATTR_NONE);
HuAudPlayerVoicePlay(lbl_1_bss_19F0[i], 293);
}
else {
CharModelMotionShiftSet(GWPlayerCfg[lbl_1_bss_19F0[i]].character, lbl_1_bss_1990[lbl_1_bss_19F0[i]][2], 0, 4, 0);
CharModelMotionShiftSet(GWPlayerCfg[lbl_1_bss_19F0[i]].character, lbl_1_bss_1990[lbl_1_bss_19F0[i]][2], 0, 4, HU3D_MOTATTR_NONE);
}
}
HuPrcSleep(20);

12
src/REL/w01Dll/main.c
View file

@ -920,7 +920,7 @@ static void fn_1_276C(void) {
BoardPlayerMotionStart(lbl_1_bss_6B4, lbl_1_bss_5CC[1], 0);
BoardPlayerMotionTimeSet(lbl_1_bss_6B4, temp_f26);
} else {
BoardPlayerMotionShiftSet(lbl_1_bss_6B4, lbl_1_bss_5CC[0], 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_6B4, lbl_1_bss_5CC[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
fn_1_2F18();
}
@ -1257,7 +1257,7 @@ static s32 fn_1_48B4(void) {
lbl_1_bss_6B2 = 0;
lbl_1_bss_6B4 = GWSystem.player_curr;
temp_r30 = GWPlayer[lbl_1_bss_6B4].space_curr;
BoardPlayerMotionShiftSet(lbl_1_bss_6B4, 1, 0.0f, 14.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_6B4, 1, 0.0f, 14.0f, HU3D_MOTATTR_LOOP);
BoardWinCreateChoice(0, MAKE_MESSID(13, 0), -1, 0);
if (GWPlayer[lbl_1_bss_6B4].com) {
fn_1_9D00(lbl_1_bss_6B4);
@ -1699,7 +1699,7 @@ static void fn_1_6194(Bss18Work *arg0, omObjData *arg1) {
arg1->scale.x = sp2C.x;
arg1->scale.y = sp2C.y;
arg1->scale.z = sp2C.z;
BoardPlayerMotionShiftSet(GWSystem.player_curr, 4, 15.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 4, 15.0f, 5.0f, HU3D_MOTATTR_NONE);
arg0->unk00_field1 = 2;
arg0->unk01 = 0;
}
@ -1731,7 +1731,7 @@ static void fn_1_63F0(Bss18Work *arg0, omObjData *arg1) {
}
if (arg0->unk01 == 25) {
BoardPlayerPosSet(GWSystem.player_curr, arg1->scale.x, arg1->scale.y, arg1->scale.z);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 5, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
}
if (arg0->unk01 < 25) {
OSu8tof32(&arg0->unk01, &temp_f29);
@ -1778,7 +1778,7 @@ static void fn_1_6A14(Bss18Work *arg0, omObjData *arg1) {
arg1->scale.x = sp20.x;
arg1->scale.y = sp20.y;
arg1->scale.z = sp20.z;
BoardPlayerMotionShiftSet(GWSystem.player_curr, 4, 15.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 4, 15.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardPlayerRotYSet(GWSystem.player_curr, atan2d(sp8.x, sp8.z));
arg0->unk00_field1 = 3;
arg0->unk01 = 0;
@ -1804,7 +1804,7 @@ static void fn_1_6BC0(Bss18Work *arg0, omObjData *arg1) {
}
if (arg0->unk01 == 25) {
BoardPlayerPosSet(GWSystem.player_curr, arg1->scale.x, arg1->scale.y, arg1->scale.z);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 5, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
}
if (arg0->unk01 < 25) {
OSu8tof32(&arg0->unk01, &temp_f29);

10
src/REL/w01Dll/mg_coin.c
View file

@ -669,7 +669,7 @@ static void fn_1_BAF8(omObjData *arg0) {
if ((temp_r31->unk20 += 1.0f) == 30.0f) {
sp14.y = sp8.y + 5.0f;
BoardPlayerPosSetV(lbl_1_bss_798, &sp14);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 2, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 2, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
arg0->func = fn_1_BCDC;
}
BoardPlayerPosSetV(lbl_1_bss_798, &sp14);
@ -686,7 +686,7 @@ static void fn_1_BCDC(omObjData *arg0) {
sp8 = sp14;
sp8.z += 100.0f;
if (fn_1_CB44(&sp8, 10.0f) == 1) {
BoardPlayerMotionShiftSet(lbl_1_bss_798, 1, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
temp_r29->unk1C = 90;
lbl_1_bss_710->work[0] = 1;
lbl_1_bss_714[lbl_1_bss_730]->work[2] = 3;
@ -746,7 +746,7 @@ static void fn_1_C000(void) {
temp_r31->unk10.y = 10.0f;
temp_r31->unk10.z = 3.0f;
temp_r31->unk20 = 0.0f;
BoardPlayerMotionShiftSet(lbl_1_bss_798, 4, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
temp_r30->func = fn_1_C0FC;
HuPrcKill(NULL);
while (TRUE) {
@ -765,7 +765,7 @@ static void fn_1_C0FC(omObjData *arg0) {
sp8.z += temp_r31->unk10.z;
temp_r31->unk20 += 1.0f;
if (sp8.y <= lbl_1_bss_738.y) {
BoardPlayerMotionShiftSet(lbl_1_bss_798, 1, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
sp8.y = lbl_1_bss_738.y;
lbl_1_bss_75C = HuPrcCreate(fn_1_C25C, 0x2004, 0x1000, 0);
lbl_1_bss_75C->user_data = arg0;
@ -826,7 +826,7 @@ static void fn_1_C25C(void) {
var_f31 = -20.0f;
}
if (var_r30 == lbl_1_bss_728) {
BoardPlayerMotionShiftSet(lbl_1_bss_798, 7, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 7, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
break;
}
HuPrcVSleep();

12
src/REL/w01Dll/mg_item.c
View file

@ -312,7 +312,7 @@ static void fn_1_E44C(omObjData *arg0) {
arg0->rot.y = 10.0f;
arg0->rot.z = sp18.y;
arg0->scale.x = 0.0f;
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
arg0->func = fn_1_E914;
}
BoardModelMotionSpeedSet(lbl_1_bss_6C4[17], lbl_1_bss_7EC);
@ -338,7 +338,7 @@ static void fn_1_E914(omObjData *arg0) {
for (i = 0; i < 4; i++) {
lbl_1_bss_7FC[i]->func = fn_1_FED0;
}
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, lbl_1_bss_7B8, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, lbl_1_bss_7B8, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
lbl_1_bss_7D6 = MGSeqStartCreate();
BoardMusStart(1, 0xE, 0x7F, 0);
arg0->func = fn_1_ECD4;
@ -465,7 +465,7 @@ static void fn_1_F3F8(omObjData *arg0) {
arg0->rot.y = 0.016666668f * (arg0->scale.y / 2) * (arg0->scale.y / 2);
arg0->rot.z = sp18.y;
arg0->scale.x = 0.0f;
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
VECSubtract(&lbl_1_bss_7C4, &sp18, &spC);
VECNormalize(&spC, &spC);
BoardPlayerRotSet(lbl_1_bss_7E4, 0.0f, fn_1_10EB8(&spC), 0.0f);
@ -494,7 +494,7 @@ static void fn_1_F890(omObjData *arg0) {
BoardPlayerRotGet(lbl_1_bss_7E4, &sp8);
if (sp8.y == 0.0f) {
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 1, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
lbl_1_bss_7F0->work[0] = 0;
lbl_1_bss_7F0->func = fn_1_10820;
arg0->func = fn_1_FA1C;
@ -516,7 +516,7 @@ static void fn_1_F890(omObjData *arg0) {
static void fn_1_FA1C(omObjData *arg0) {
if (lbl_1_bss_7F0->work[0] == 1) {
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, lbl_1_bss_7BC, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, lbl_1_bss_7BC, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
arg0->work[0] = 30;
lbl_1_bss_7A4 = HuAudSStreamPlay(2);
arg0->func = fn_1_FABC;
@ -546,7 +546,7 @@ static void fn_1_FB58(void) {
BoardWinWait();
BoardWinKill();
temp_r31 = HuPrcCurrentGet()->user_data;
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 1, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
lbl_1_bss_7F0->work[0] = 0;
HuAudFXPlay(0x30D);
HuAudFXFadeOut(lbl_1_bss_7AC, 1000);

2
src/REL/w02Dll/gamble.c
View file

@ -218,7 +218,7 @@ void fn_1_2D04(void)
} else {
temp_r26 = GWPlayer[temp_r31].space_curr;
BoardCameraTargetSpaceSet(temp_r26);
BoardPlayerMotionShiftSet(temp_r31, 6, 0, 5, 0x40000001);
BoardPlayerMotionShiftSet(temp_r31, 6, 0, 5, HU3D_MOTATTR_LOOP);
HuPrcSleep(60);
HuPrcSleep(30);
BoardModelPosSetV(temp_r28, &spC);

6
src/REL/w02Dll/mg_coin.c
View file

@ -419,7 +419,7 @@ void fn_1_46E8(void)
temp_f31 = -20.0f;
}
if (temp_r30 == lbl_1_bss_84) {
BoardPlayerMotionShiftSet(lbl_1_bss_86, 7, 0, 10, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_86, 7, 0, 10, HU3D_MOTATTR_NONE);
break;
}
HuPrcVSleep();
@ -511,7 +511,7 @@ void fn_1_53B8(omObjData *object)
if ((temp_r29 & PAD_BUTTON_A) || temp_r31->unk18 < 0) {
MGSeqParamSet(temp_r31->unk1C, 2, -1);
HuWinKill(temp_r31->unk1E);
BoardPlayerMotionShiftSet(lbl_1_bss_86, 4, 0, 5, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_86, 4, 0, 5, HU3D_MOTATTR_NONE);
temp_r31->unk0 = 10;
temp_r31->unk4 = 0;
if (lbl_1_bss_A4->work[0] & 0x1) {
@ -595,7 +595,7 @@ void fn_1_5868(omObjData *object)
if (sp14.y == sp8.y) {
BoardModelMotionTimeSet(lbl_1_bss_BC[temp_r31->unk8], 0);
BoardModelAttrReset(lbl_1_bss_BC[temp_r31->unk8], 0x40000002);
BoardPlayerMotionShiftSet(lbl_1_bss_86, object->motion[1], 0, 5, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_86, object->motion[1], 0, 5, HU3D_MOTATTR_NONE);
lbl_1_bss_A4->work[3] |= 1 << temp_r31->unk8;
temp_r31->unk0 = 5;
temp_r31->unk4 = 0;

2
src/REL/w02Dll/mg_item.c
View file

@ -472,7 +472,7 @@ void fn_1_6EA8(void)
BoardPlayerItemAdd(lbl_1_bss_196, lbl_1_bss_190[temp_r31]);
omVibrate(lbl_1_bss_196, 12, 6, 6);
temp_r28 = HuAudSStreamPlay(2);
BoardPlayerMotionShiftSet(lbl_1_bss_196, 7, 0, 5, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_196, 7, 0, 5, HU3D_MOTATTR_NONE);
while (!BoardPlayerMotionEndCheck(lbl_1_bss_196)) {
HuPrcVSleep();
}

2
src/REL/w02Dll/roulette.c
View file

@ -559,7 +559,7 @@ void fn_1_D3AC(void)
temp_f31 = -40.0f;
}
if(temp_r30 == 20) {
BoardPlayerMotionShiftSet(lbl_1_bss_388, 7, 0, 10, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_388, 7, 0, 10, HU3D_MOTATTR_NONE);
break;
}
HuPrcVSleep();

4
src/REL/w02Dll/shuffleboard.c
View file

@ -217,7 +217,7 @@ void fn_1_98D8(void)
while(!BoardPlayerMotBlendCheck(lbl_1_bss_36E)) {
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(lbl_1_bss_36E, lbl_1_bss_1C0[0], 0, 10, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_36E, lbl_1_bss_1C0[0], 0, 10, HU3D_MOTATTR_LOOP);
HuPrcSleep(20);
}
@ -483,7 +483,7 @@ void fn_1_A8E8(void)
HuWinKill(lbl_1_bss_1AC);
BoardPlayerMotionStart(lbl_1_bss_36E, lbl_1_bss_1C0[1], 0);
BoardPlayerMotionEndWait(lbl_1_bss_36E);
BoardPlayerMotionShiftSet(lbl_1_bss_36E, 6, 0, 15, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_36E, 6, 0, 15, HU3D_MOTATTR_LOOP);
HuPrcSleep(40);
BoardAudSeqFadeOut(1, 1000);
HuPrcSleep(70);

12
src/REL/w03Dll/condor.c
View file

@ -220,14 +220,14 @@ s32 fn_1_3478(s32 arg0)
BoardPlayerIdleSet(arg0);
HuAudFXPlay(0x447);
BoardModelMotionShiftSet(lbl_1_data_310, 4, 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_310, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(6);
while (BoardModelMotionEndCheck(lbl_1_data_310) == 0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_data_310, 1, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_data_310, 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
temp_r26 = BoardPlayerGetCharMess(arg0);
BoardWinCreate(2, MAKE_MESSID(22, 16), 8);
BoardWinInsertMesSet(temp_r26, 3);
@ -286,7 +286,7 @@ void fn_1_3814(s32 arg0)
Vec sp8;
f32 temp;
BoardModelMotionShiftSet(lbl_1_data_310, 2, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_data_310, 2, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
temp = (180.0f + BoardPlayerRotYGet(arg0));
BoardPlayerMotBlendSet(arg0, temp, 0xF);
@ -342,7 +342,7 @@ void fn_1_3968(s32 arg0)
VECSubtract(&sp3C, &sp30, &sp24);
VECNormalize(&sp24, &sp24);
VECScale(&sp24, &sp24, temp_f30 / 45.0f);
BoardPlayerMotionShiftSet(arg0, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(arg0, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(5);
spC = BoardPlayerRotYGet(arg0);
@ -389,7 +389,7 @@ void fn_1_3968(s32 arg0)
BoardModelHookSet(lbl_1_data_310, "itemhook_oya", BoardPlayerModelGet(arg0));
BoardPlayerMotionStart(arg0, lbl_1_data_312, 0x40000001);
HuAudFXPlay(0x44F);
BoardModelMotionShiftSet(lbl_1_data_310, 5, 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_310, 5, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
sp18.x = -15.0f;
sp18.y = 180.0f;
@ -821,7 +821,7 @@ void fn_1_4F24(w03StructUnk2 *arg0)
}
if (arg0->unk_02 != 0) {
BoardModelMotionShiftSet(lbl_1_bss_C[2], 0, 101.0f, 10.0f, 0);
BoardModelMotionShiftSet(lbl_1_bss_C[2], 0, 101.0f, 10.0f, HU3D_MOTATTR_NONE);
}
}
}

4
src/REL/w03Dll/mg_coin.c
View file

@ -583,7 +583,7 @@ void fn_1_9044(omObjData *arg0, someBits3 *arg1)
if (arg0->trans.x <= 1.0f) {
arg0->trans.y = 0.0f;
BoardPlayerIdleSet(arg1->unk00_bit5);
BoardModelMotionShiftSet(lbl_1_bss_C[10], 1, 0.0f, 10.0f, 0x40000001U);
BoardModelMotionShiftSet(lbl_1_bss_C[10], 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
arg1->unk00_bit0 = 1;
}
}
@ -668,7 +668,7 @@ void fn_1_9474(s32 arg0)
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(arg0, 7, 0.0f, 8.0f, 0U);
BoardPlayerMotionShiftSet(arg0, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while (BoardPlayerMotionEndCheck(arg0) == 0) {

14
src/REL/w03Dll/mg_item.c
View file

@ -288,7 +288,7 @@ void fn_1_9FE4(void)
VECSubtract(&sp18, &sp24, &spC);
temp_f30 = (atan2(spC.z, spC.x) / M_PI * 180.0);
sp8 = BoardModelRotYGet(lbl_1_bss_C[11]);
BoardModelMotionShiftSet(lbl_1_bss_C[11], lbl_1_data_4DA, 0.0f, 10.0, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[11], lbl_1_data_4DA, 0.0f, 10.0, HU3D_MOTATTR_LOOP);
while (BoardDAngleCalcRange(&sp8, temp_f30, 10.0) == 0) {
BoardModelRotYSet(lbl_1_bss_C[11], sp8);
@ -316,7 +316,7 @@ void fn_1_9FE4(void)
HuAudFXPlay(0x362);
BoardCameraQuakeSet(3, 100.0f);
fn_1_B8E8(1);
BoardModelMotionShiftSet(lbl_1_bss_C[11], lbl_1_data_4DC, 0.0f, 10.0, 0x40000005);
BoardModelMotionShiftSet(lbl_1_bss_C[11], lbl_1_data_4DC, 0.0f, 10.0, HU3D_MOTATTR_LOOP | HU3D_MOTATTR_REV);
VECSubtract(&sp24, &sp30, &spC);
spC.x /= 60.0f;
@ -333,14 +333,14 @@ void fn_1_9FE4(void)
temp_f30 = 0.0f;
sp8 = BoardModelRotYGet(lbl_1_bss_C[11]);
BoardModelMotionShiftSet(lbl_1_bss_C[11], lbl_1_data_4DA, 0.0f, 10.0, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[11], lbl_1_data_4DA, 0.0f, 10.0, HU3D_MOTATTR_LOOP);
while (BoardDAngleCalcRange(&sp8, temp_f30, 10.0) == 0) {
BoardModelRotYSet(lbl_1_bss_C[11], sp8);
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_C[11], 1, 0.0f, 10.0, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[11], 1, 0.0f, 10.0, HU3D_MOTATTR_LOOP);
}
void fn_1_A44C(s32 arg0)
@ -586,10 +586,10 @@ void fn_1_ACD8(s32 arg0)
MGSeqParamSet(temp_r31->unk4, 2, -1U);
temp_r31->unk4 = -1;
}
BoardPlayerMotionShiftSet(temp_r31->unk00_bit4, 0xB, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(temp_r31->unk00_bit4, 0xB, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
return;
case 3:
BoardPlayerMotionShiftSet(temp_r31->unk00_bit4, 7, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(temp_r31->unk00_bit4, 7, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
break;
}
}
@ -811,7 +811,7 @@ void fn_1_B4AC(omObjData *arg0, someBits2 *arg1)
HuAudFXPlay(0x30C);
BoardModelHookObjReset(lbl_1_bss_C[9], lbl_1_data_508[arg1->unk2]);
temp_f31 = BoardModelMotionTimeGet(lbl_1_bss_C[9]);
BoardModelMotionShiftSet(lbl_1_bss_C[9], 0, 15.0f, 10.0f, 0x40000004U);
BoardModelMotionShiftSet(lbl_1_bss_C[9], 0, 15.0f, 10.0f, HU3D_MOTATTR_REV);
BoardModelMotionSpeedSet(lbl_1_bss_C[9], 0.5f);
BoardModelMotionTimeSet(lbl_1_bss_C[9], temp_f31);
BoardModelPosSetV(arg1->unk_06[arg1->unk2], &sp8);

18
src/REL/w03Dll/river.c
View file

@ -254,7 +254,7 @@ void fn_1_6B98(s32 arg0) {
s16 var_r31;
s16 i;
BoardModelMotionShiftSet(lbl_1_data_38A, 2, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_38A, 2, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
sp8 = BoardModelRotYGet(lbl_1_data_38A);
temp_f31 = sp8 + 180.0f;
@ -277,7 +277,7 @@ void fn_1_6B98(s32 arg0) {
spC.y /= 120.0f;
spC.z = spC.z / 120.0f;
BoardCameraTargetModelSet(lbl_1_data_388);
BoardModelMotionShiftSet(lbl_1_data_38A, 3, 0.0f, 4.0f, 0x40000001U);
BoardModelMotionShiftSet(lbl_1_data_38A, 3, 0.0f, 4.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(4);
var_r31 = 0;
@ -300,7 +300,7 @@ void fn_1_6B98(s32 arg0) {
BoardModelPosSetV(lbl_1_data_388, &sp18);
BoardCameraTargetModelSet(-1);
BoardModelMotionShiftSet(lbl_1_data_38A, 2, 0.0f, 10.0f, 0x40000004U);
BoardModelMotionShiftSet(lbl_1_data_38A, 2, 0.0f, 10.0f, HU3D_MOTATTR_REV);
sp8 = BoardModelRotYGet(lbl_1_data_38A);
temp_f31 = 0.0f;
@ -313,7 +313,7 @@ void fn_1_6B98(s32 arg0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_data_38A, 1, 0.0f, 10.0f, 0x40000001U);
BoardModelMotionShiftSet(lbl_1_data_38A, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
extern s32 lbl_1_data_368[];
@ -349,7 +349,7 @@ void fn_1_6F9C(s32 arg0) {
lbl_1_bss_124 = 1;
HuAudFXPlay(lbl_1_data_368[GWPlayer[arg0].character]);
BoardPlayerMotionShiftSet(arg0, 4, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(arg0, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
for (var_r30 = 0, var_f31 = 0.0f; var_f31 < 60.0f; var_f31 += 1.0f) {
VECAdd(&sp14, &sp8, &sp14);
@ -357,7 +357,7 @@ void fn_1_6F9C(s32 arg0) {
if (sp14.y <= sp20.y) {
sp14.y = sp20.y;
if (var_r30 == 0) {
BoardPlayerMotionShiftSet(arg0, 5, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(arg0, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
var_r30 = 1;
}
}
@ -365,7 +365,7 @@ void fn_1_6F9C(s32 arg0) {
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(arg0, 5, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(arg0, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
BoardPlayerIdleSet(arg0);
@ -401,7 +401,7 @@ void fn_1_735C(s32 arg0) {
sp8.y = 0.0f;
HuAudFXPlay(lbl_1_data_368[GWPlayer[arg0].character]);
BoardPlayerMotionShiftSet(arg0, 4, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(arg0, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
if (lbl_1_bss_0->unk0 != 0) {
var_f30 = 0.25f;
} else {
@ -414,7 +414,7 @@ void fn_1_735C(s32 arg0) {
if (sp14.y <= sp20.y && var_f31 > 48.0f) {
sp14.y = sp20.y;
if (var_r30 == 0) {
BoardPlayerMotionShiftSet(arg0, 5, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(arg0, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
var_r30 = 1;
}
}

6
src/REL/w03Dll/statue.c
View file

@ -278,7 +278,7 @@ void fn_1_19DC(s32 arg0, s32 arg1) {
HuAudFXPlay(var_r29);
BoardPlayerVoiceEnableSet(arg0, lbl_1_bss_6A, 0);
BoardPlayerMotionShiftSet(arg0, lbl_1_bss_6A, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(arg0, lbl_1_bss_6A, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(9);
while (BoardPlayerMotionEndCheck(arg0) == 0) {
@ -289,7 +289,7 @@ void fn_1_19DC(s32 arg0, s32 arg1) {
HuPrcSleep(60);
if (arg1 != 0) {
BoardPlayerMotionShiftSet(arg0, lbl_1_bss_68, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(arg0, lbl_1_bss_68, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(9);
while (BoardPlayerMotionEndCheck(arg0) == 0) {
HuPrcVSleep();
@ -306,7 +306,7 @@ void fn_1_19DC(s32 arg0, s32 arg1) {
}
BoardAudSeqPause(0, 1, 1000);
BoardPlayerMotionShiftSet(arg0, lbl_1_data_280, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(arg0, lbl_1_data_280, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(11);
while (BoardPlayerMotionEndCheck(arg0) == 0) {

10
src/REL/w04Dll/big_boo.c
View file

@ -391,7 +391,7 @@ static void fn_1_6CF8(void) {
HuPrcSleep(0x78);
for (i = 0; i < 3; i++) {
BoardPlayerModelAttrReset(sp8[i], 0x40000001);
BoardPlayerMotionShiftSet(sp8[i], lbl_1_bss_114[sp8[i]][1], 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(sp8[i], lbl_1_bss_114[sp8[i]][1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
}
BoardModelPosGet(lbl_1_bss_274, &sp10);
var_r28 = 10;
@ -407,7 +407,7 @@ static void fn_1_6CF8(void) {
HuPrcVSleep();
}
for (i = 0; i < 3; i++) {
BoardPlayerMotionShiftSet(sp8[i], 1, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(sp8[i], 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
}
}
@ -780,7 +780,7 @@ static void fn_1_7888(void) {
var_f31 = -40.0f;
}
if (var_r28 == var_r27) {
BoardPlayerMotionShiftSet(lbl_1_bss_282, 7, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_282, 7, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
break;
}
HuPrcVSleep();
@ -977,7 +977,7 @@ static void fn_1_8A60(void) {
}
}
temp_r27 = HuAudSStreamPlay(6);
BoardPlayerMotionShiftSet(lbl_1_bss_282, 7, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_282, 7, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
while (!BoardPlayerMotionEndCheck(lbl_1_bss_282)) {
HuPrcVSleep();
}
@ -1008,7 +1008,7 @@ static void fn_1_98A0(void) {
BoardModelPosGet(lbl_1_bss_274, &sp14);
var_f30 = BoardModelRotYGet(lbl_1_bss_274);
BoardModelMotionShiftSet(lbl_1_bss_274, 2, 0.0f, 25.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_274, 2, 0.0f, 25.0f, HU3D_MOTATTR_LOOP);
for (i = 0; i < 25; i++) {
var_f30 += 7.2f;
BoardModelRotYSet(lbl_1_bss_274, var_f30);

10
src/REL/w04Dll/boo_event.c
View file

@ -187,7 +187,7 @@ static void fn_1_20EC(void) {
HuPrcVSleep();
}
BoardCameraMotionWait();
BoardPlayerMotionShiftSet(temp_r30, lbl_1_bss_52[temp_r30][0], 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(temp_r30, lbl_1_bss_52[temp_r30][0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuAudPlayerVoicePlay(temp_r30, 0x128);
BoardModelPosGet(lbl_1_bss_14[3], &sp20);
BoardModelPosSetV(lbl_1_bss_FA, &sp20);
@ -508,7 +508,7 @@ static void fn_1_30A4(void) {
}
BoardPlayerPosSetV(i, &sp14);
BoardPlayerRotYSet(i, 0.0f);
BoardPlayerMotionShiftSet(i, lbl_1_bss_52[GWSystem.player_curr][1], 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(i, lbl_1_bss_52[GWSystem.player_curr][1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
temp_r31->unk08 = i;
}
if (temp_r31->unk06 == 0) {
@ -604,7 +604,7 @@ static void fn_1_38D8(void) {
temp_r30 = HuPrcCurrentGet()->user_data;
temp_r31 = temp_r30->unk08;
temp_r30->unk08 = -1;
BoardPlayerMotionShiftSet(temp_r31, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(temp_r31, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
sp18 = lbl_1_bss_80[temp_r31];
GWPlayer[temp_r31].space_curr = lbl_1_bss_B0;
BoardPlayerPosGet(temp_r31, &sp24);
@ -917,7 +917,7 @@ static void fn_1_4848(void) {
}
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(temp_r30, lbl_1_bss_52[temp_r30][0], 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(temp_r30, lbl_1_bss_52[temp_r30][0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuAudPlayerVoicePlay(temp_r30, 0x128);
for (i = 0; i < 65; i++) {
BoardModelPosGet(lbl_1_bss_FA, &sp14);
@ -927,7 +927,7 @@ static void fn_1_4848(void) {
}
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(temp_r30, 1, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(temp_r30, 1, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardModelPosGet(lbl_1_bss_FA, &sp14);
temp_f28 = VECDistanceXZ(&sp20, &sp14);
if (temp_f28 > 200.0f) {

2
src/REL/w04Dll/bridge.c
View file

@ -122,7 +122,7 @@ void fn_1_1618(void) {
BoardWinWait();
BoardWinKill();
}
BoardPlayerMotionShiftSet(temp_r31, 1, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(temp_r31, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardCameraViewSet(1);
BoardCameraMotionWait();
BoardRollDispSet(1);

8
src/REL/w04Dll/mg_coin.c
View file

@ -156,7 +156,7 @@ void fn_1_C7D4(void) {
while (!BoardPlayerMotBlendCheck(lbl_1_bss_324)) {
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
var_f31 = 0.0f;
temp_f30 = 8.0f;
VECSubtract(&sp2C, &sp20, &sp38);
@ -411,7 +411,7 @@ static void fn_1_D770(void) {
var_f31 = -20.0f;
}
if (var_r29 == lbl_1_bss_314) {
BoardPlayerMotionShiftSet(lbl_1_bss_324, 7, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_324, 7, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
break;
}
HuPrcVSleep();
@ -424,7 +424,7 @@ static void fn_1_D770(void) {
BoardWinKill();
temp_r3 = HuPrcCreate(fn_1_E004, 0x2004, 0x1000, 0);
temp_r3->user_data = NULL;
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
var_f30 = 0.0f;
temp_f29 = 8.0f;
lbl_1_bss_308.z = sp18.z + 100.0f;
@ -549,7 +549,7 @@ static void fn_1_E374(omObjData *arg0) {
arg0->scale.x = sp14.x;
arg0->scale.y = sp14.y;
arg0->scale.z = sp14.z;
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
arg0->func = fn_1_E4C0;
}
}

12
src/REL/w04Dll/mg_item.c
View file

@ -126,7 +126,7 @@ void fn_1_A1F0(void) {
while (BoardModelMotionTimeGet(lbl_1_bss_14[10]) < BoardModelMotionMaxTimeGet(lbl_1_bss_14[10])) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_14[10], 1, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_14[10], 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
BoardAudSeqPause(0, 1, 1000);
BoardModelMotionTimeSet(lbl_1_bss_14[6], 0.0f);
BoardModelAttrReset(lbl_1_bss_14[6], 0x40000002);
@ -299,7 +299,7 @@ static void fn_1_A7E8(void) {
}
BoardModelVisibilitySet(var_r28, 0);
BoardPlayerPosGet(lbl_1_bss_2AC, &sp18);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
var_f30 = 0.0f;
var_f29 = 12.0f;
sp3C = sp54[var_r30];
@ -330,7 +330,7 @@ static void fn_1_A7E8(void) {
BoardModelMotionTimeSet(lbl_1_bss_29E[var_r30], 0.0f);
BoardModelAttrReset(lbl_1_bss_29E[var_r30], 0x40000002);
BoardPlayerPosSetV(lbl_1_bss_2AC, &sp30);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 1, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
while (BoardModelMotionTimeGet(lbl_1_bss_29E[var_r30]) < BoardModelMotionMaxTimeGet(lbl_1_bss_29E[var_r30])) {
if (BoardModelMotionTimeGet(lbl_1_bss_29E[var_r30]) >= 13.0f) {
BoardPlayerPosGet(lbl_1_bss_2AC, &sp30);
@ -375,7 +375,7 @@ static void fn_1_A7E8(void) {
while (!BoardPlayerMotBlendCheck(lbl_1_bss_2AC)) {
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
var_f30 = 0.0f;
var_f29 = 12.0f;
BoardPlayerPosGet(lbl_1_bss_2AC, &sp30);
@ -402,7 +402,7 @@ static void fn_1_A7E8(void) {
}
omVibrate(lbl_1_bss_2AC, 12, 6, 6);
BoardPlayerPosSetV(lbl_1_bss_2AC, &sp30);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 1, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
BoardModelPosGet(lbl_1_bss_298[temp_r29], &sp24);
sp3C = sp24;
sp3C.z += 100.0f;
@ -460,7 +460,7 @@ static void fn_1_A7E8(void) {
BoardPlayerItemAdd(lbl_1_bss_2AC, lbl_1_bss_2A6[temp_r29]);
omVibrate(lbl_1_bss_2AC, 12, 6, 6);
sp8 = HuAudSStreamPlay(2);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 7, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 7, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
while (!BoardPlayerMotionEndCheck(lbl_1_bss_2AC)) {
HuPrcVSleep();
}

4
src/REL/w05Dll/dolphin.c
View file

@ -180,7 +180,7 @@ void fn_1_4034(s32 arg0)
}
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_data_118), lbl_1_data_22C[var_r27], &sp34);
temp_f25 = (180.0 * (atan2((sp34.x - sp40.x), (sp34.z - sp40.z)) / M_PI));
BoardModelMotionShiftSet(lbl_1_bss_64, 2, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_64, 2, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
while (fn_1_1208(lbl_1_bss_64, temp_f25, 10.0f) == 0) {
HuPrcVSleep();
@ -244,7 +244,7 @@ loop_37:
}
fn_1_66C0(1, &sp40);
BoardModelMotionShiftSet(lbl_1_bss_64, 5, 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(lbl_1_bss_64, 5, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
var_r30 = 0;
var_r31 = 0;

16
src/REL/w05Dll/hotel.c
View file

@ -108,7 +108,7 @@ void fn_1_155C(void) {
while (fn_1_1208(lbl_1_bss_14[4], temp_f31, 10.0f) == 0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
var_r30 = BoardPlayerCoinsGet(lbl_1_bss_28);
sprintf(sp18, "%d", lbl_1_bss_0->unk_00);
if (var_r30 > 0) {
@ -188,7 +188,7 @@ void fn_1_155C(void) {
while (fn_1_1208(lbl_1_bss_14[4], 0.0f, 15.0f) == 0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
BoardCameraViewSet(1);
while (BoardPlayerMotBlendCheck(lbl_1_bss_28) == 0) {
@ -271,7 +271,7 @@ void fn_1_1E44(void) {
while (fn_1_1208(lbl_1_bss_14[4], temp_f31, 10.0f) == 0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
temp_f31 = 180.0 * (atan2((sp2C.x - sp50.x), (sp2C.z - sp50.z)) / M_PI);
BoardPlayerMotBlendSet(lbl_1_bss_28, temp_f31, 0xF);
@ -377,17 +377,17 @@ void fn_1_1E44(void) {
BoardWinWait();
BoardWinKill();
HuPrcSleep(0x1E);
BoardModelMotionShiftSet(lbl_1_bss_14[4], sp8[3], 0.0f, 5.0f, 0U);
BoardModelMotionShiftSet(lbl_1_bss_14[4], sp8[3], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
BoardPlayerMotionShiftSet(var_r31, sp1C[var_r31][1], 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(var_r31, sp1C[var_r31][1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardPlayerVoiceEnableSet(var_r31, 6, 1);
}
HuPrcSleep(0x23);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
BoardPlayerMotionShiftSet(var_r31, 1, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(var_r31, 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
}
}
BoardCameraViewSet(1);
@ -413,7 +413,7 @@ void fn_1_1E44(void) {
while (fn_1_1208(lbl_1_bss_14[4], 0.0f, 15.0f) == 0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, 0x40000001U);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
BoardModelMotionKill(lbl_1_bss_14[4], sp8[var_r31]);

2
src/REL/w05Dll/mg_coin.c
View file

@ -449,7 +449,7 @@ void fn_1_AB24(void)
var_f31 = -20.0f;
}
if (var_r29 == lbl_1_bss_C6) {
BoardPlayerMotionShiftSet(lbl_1_bss_C0, 7, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_C0, 7, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
break;
}
else {

6
src/REL/w05Dll/mg_item.c
View file

@ -79,7 +79,7 @@ void fn_1_6B7C(void)
BoardModelMotionStartEndSet(lbl_1_bss_14[0], 0x1E, 0x5A);
BoardModelAttrReset(lbl_1_bss_14[0], 0x40000002);
BoardMusStart(1, 0x22, 0x7F, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_B6, lbl_1_bss_9E[0], 0.0f, 30.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_B6, lbl_1_bss_9E[0], 0.0f, 30.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(0x1E);
BoardModelVisibilitySet(lbl_1_bss_A2, 1);
BoardModelHookSet(BoardPlayerModelGet(lbl_1_bss_B6), "a-itemhook-r", lbl_1_bss_A2);
@ -348,7 +348,7 @@ void fn_1_799C(void)
BoardPlayerItemAdd(lbl_1_bss_B6, lbl_1_bss_B0[temp_r31]);
omVibrate(lbl_1_bss_B6, 0xC, 6, 6);
temp_r27 = HuAudSStreamPlay(2);
BoardPlayerMotionShiftSet(lbl_1_bss_B6, 7, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_B6, 7, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
while (BoardPlayerMotionEndCheck(lbl_1_bss_B6) == 0) {
HuPrcVSleep();
@ -520,7 +520,7 @@ void fn_1_8668(omObjData *arg0)
if (arg0->work[0] == 0) {
BoardModelHookReset(BoardPlayerModelGet(lbl_1_bss_B6));
BoardPlayerMotionShiftSet(lbl_1_bss_B6, 1, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_B6, 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
arg0->func = NULL;
lbl_1_bss_8C->func = fn_1_7928;
BoardModelKill(lbl_1_bss_A2);

6
src/REL/w05Dll/monkey.c
View file

@ -153,7 +153,7 @@ void fn_1_3044(void) {
void fn_1_3430(void) {
if (GWPlayer[lbl_1_bss_4C].bowser_suit == 0) {
BoardPlayerMotionShiftSet(lbl_1_bss_4C, lbl_1_bss_30[2], 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_4C, lbl_1_bss_30[2], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while (BoardPlayerMotionEndCheck(lbl_1_bss_4C) == 0) {
@ -178,7 +178,7 @@ void fn_1_3514(void) {
s32 var_r31;
BoardPlayerPosGet(lbl_1_bss_4C, &sp2C);
BoardPlayerMotionShiftSet(lbl_1_bss_4C, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_4C, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
VECSubtract(&lbl_1_bss_38, &sp2C, &sp20);
sp20.y = 0.0f;
VECNormalize(&sp20, &sp20);
@ -284,7 +284,7 @@ void fn_1_3514(void) {
}
HuPrcVSleep();
} else {
BoardPlayerMotionShiftSet(lbl_1_bss_4C, 6, 0.0f, 8.0f, 0x40000001U);
BoardPlayerMotionShiftSet(lbl_1_bss_4C, 6, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
break;
}
}

58
src/REL/w06Dll/bowser.c
View file

@ -252,7 +252,7 @@ static void fn_1_95AC(s32 arg0) {
BoardModelPosGet(lbl_1_data_49A, &sp2C);
VECSubtract(&sp2C, &sp38, &sp20);
VECNormalize(&sp20, &sp20);
BoardModelMotionShiftSet(lbl_1_data_498, 4, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 4, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
HuAudFXPlay(0x3C);
BoardMusStart(1, 6, 0x7F, 0);
@ -280,13 +280,13 @@ static void fn_1_95AC(s32 arg0) {
while (!BoardModelMotionEndCheck(lbl_1_data_498)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardWinCreate(2, MAKE_MESSID(48, 2), 5);
BoardWinWait();
BoardWinKill();
BoardCameraMotionStartEx(-1, NULL, NULL, 2000.0f, -1.0f, 21);
BoardCameraMotionWait();
BoardModelMotionShiftSet(lbl_1_data_498, 5, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while (BoardModelMotionTimeGet(lbl_1_data_498) < 80.0f) {
HuPrcVSleep();
@ -386,7 +386,7 @@ static void fn_1_9E5C(s32 arg0) {
BoardModelPosGet(lbl_1_data_49A, &sp2C);
VECSubtract(&sp2C, &sp38, &sp20);
VECNormalize(&sp20, &sp20);
BoardModelMotionShiftSet(lbl_1_data_498, 4, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 4, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
HuAudFXPlay(0x3C);
BoardMusStart(1, 6, 0x7F, 0);
@ -414,7 +414,7 @@ static void fn_1_9E5C(s32 arg0) {
while (!BoardModelMotionEndCheck(lbl_1_data_498)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_data_498, 7, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(9);
while (BoardModelMotionTimeGet(lbl_1_data_498) < 33.0f) {
HuPrcVSleep();
@ -459,8 +459,8 @@ static void fn_1_9E5C(s32 arg0) {
while (!BoardModelMotionEndCheck(lbl_1_data_498)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(arg0, var_r25, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardPlayerMotionShiftSet(arg0, var_r25, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
while (!BoardPlayerMotionEndCheck(arg0)) {
HuPrcVSleep();
@ -470,7 +470,7 @@ static void fn_1_9E5C(s32 arg0) {
} else {
var_r29 = MAKE_MESSID(48, 6);
}
BoardModelMotionShiftSet(lbl_1_data_498, 3, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(0x3A);
BoardWinCreate(2, var_r29, 5);
BoardWinWait();
@ -481,7 +481,7 @@ static void fn_1_9E5C(s32 arg0) {
BoardCameraMoveSet(1);
BoardCameraViewSet(1);
BoardCameraMotionWait();
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
fn_1_B6A0(0.0f, 20);
BoardAudSeqPause(0, 0, 1000);
}
@ -502,7 +502,7 @@ static void fn_1_A408(s32 arg0) {
BoardModelPosGet(lbl_1_data_49A, &sp2C);
VECSubtract(&sp2C, &sp38, &sp20);
VECNormalize(&sp20, &sp20);
BoardModelMotionShiftSet(lbl_1_data_498, 4, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 4, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
HuAudFXPlay(0x3C);
BoardMusStart(1, 6, 0x7F, 0);
@ -523,16 +523,16 @@ static void fn_1_A408(s32 arg0) {
while (!BoardModelMotionEndCheck(lbl_1_data_498)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardWinCreate(2, MAKE_MESSID(48, 7), 5);
BoardWinWait();
BoardWinKill();
fn_1_BD08(0);
BoardPlayerPosGet(arg0, &sp38);
BoardAudSeqFadeOut(1, 1000);
BoardModelMotionShiftSet(lbl_1_data_498, 2, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 2, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(55);
BoardPlayerMotionShiftSet(arg0, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(arg0, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(5);
temp_r28 = HuAudFXPlay(0x3D);
BoardPlayerPosGet(arg0, &sp20);
@ -684,7 +684,7 @@ static void fn_1_AB4C(s32 arg0, s32 arg1) {
var_r26 = MAKE_MESSID(48, 10);
var_r25 = 8;
HuAudFXPlay(0x3A);
BoardModelMotionShiftSet(lbl_1_data_498, 3, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
} else {
var_r26 = MAKE_MESSID(48, 8);
var_r25 = 7;
@ -698,7 +698,7 @@ static void fn_1_AB4C(s32 arg0, s32 arg1) {
HuPrcVSleep();
}
if (var_r29 != 0) {
BoardModelMotionShiftSet(lbl_1_data_498, 7, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
temp_r23 = BoardPlayerCoinsGet(arg0);
var_r30 = temp_r23 - (BoardPlayerCoinsGet(arg0) >> 1);
if (var_r30 < 0) {
@ -718,7 +718,7 @@ static void fn_1_AB4C(s32 arg0, s32 arg1) {
}
HuAudFXPlay(0xF);
} else {
BoardModelMotionShiftSet(lbl_1_data_498, 8, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 8, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
BoardWinCreate(2, MAKE_MESSID(48, 9), 5);
BoardWinWait();
BoardWinKill();
@ -743,7 +743,7 @@ static void fn_1_AB4C(s32 arg0, s32 arg1) {
BoardSpaceTypeSet(0, var_r24, 1);
BoardMusStartBoard();
}
BoardPlayerMotionShiftSet(arg0, var_r25, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(arg0, var_r25, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
BoardModelAttrSet(lbl_1_data_498, 0x40000004);
while (!BoardModelMotionEndCheck(lbl_1_data_498)) {
@ -756,7 +756,7 @@ static void fn_1_AB4C(s32 arg0, s32 arg1) {
BoardAudSeqFadeOut(1, 1000);
}
HuPrcSleep(48);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardPlayerIdleSet(arg0);
fn_1_B6A0(0.0f, 20);
}
@ -776,7 +776,7 @@ static void fn_1_B27C(s32 arg0) {
BoardModelPosGet(lbl_1_data_49A, &sp2C);
VECSubtract(&sp2C, &sp38, &sp20);
VECNormalize(&sp20, &sp20);
BoardModelMotionShiftSet(lbl_1_data_498, 4, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 4, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
HuAudFXPlay(0x3C);
sp14.x = 0.0f;
@ -797,9 +797,9 @@ static void fn_1_B27C(s32 arg0) {
while (!BoardModelMotionEndCheck(lbl_1_data_498)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardMusStart(1, 6, 0x7F, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 7, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
var_r29 = MAKE_MESSID(48, 38);
var_r27 = 50;
@ -821,12 +821,12 @@ static void fn_1_B27C(s32 arg0) {
HuPrcVSleep();
}
var_r29 = MAKE_MESSID(48, 39);
BoardModelMotionShiftSet(lbl_1_data_498, 3, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(0x3A);
BoardWinCreate(2, var_r29, 5);
BoardWinWait();
BoardWinKill();
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardAudSeqFadeOut(1, 1000);
HuPrcSleep(24);
BoardPlayerIdleSet(arg0);
@ -862,7 +862,7 @@ static void fn_1_B6A0(float arg0, s16 arg1) {
BoardModelRotYSet(lbl_1_data_498, arg0);
return;
}
BoardModelMotionShiftSet(lbl_1_data_498, 6, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_data_498, 6, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardModelMotionSpeedSet(lbl_1_data_498, 2.0f);
while (arg1 > 0) {
var_f27 = var_f25 + BoardModelRotYGet(lbl_1_data_498);
@ -871,7 +871,7 @@ static void fn_1_B6A0(float arg0, s16 arg1) {
arg1--;
}
BoardModelRotYSet(lbl_1_data_498, arg0);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
static void fn_1_B8E0(omObjData *arg0) {
@ -972,7 +972,7 @@ static void fn_1_BD8C(s32 arg0) {
void fn_1_C108(s32 arg0) {
if (arg0 != 0) {
BoardModelMotionShiftSet(lbl_1_data_498, 2, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 2, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
BoardModelMotionSpeedSet(lbl_1_data_498, 2.0f);
HuPrcSleep(30);
lbl_1_bss_0->unk00_field4 = 1;
@ -989,7 +989,7 @@ void fn_1_C108(s32 arg0) {
while (!BoardModelMotionEndCheck(lbl_1_data_498)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
}
@ -1058,7 +1058,7 @@ static void fn_1_C40C(void) {
BoardWinWait();
BoardWinKill();
HuAudFXPlay(0x359);
BoardModelMotionShiftSet(lbl_1_data_498, 4, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(11);
HuAudFXPlay(0x33F);
HuAudFXPlay(0x3C);
@ -1077,7 +1077,7 @@ static void fn_1_C40C(void) {
while (!BoardModelMotionEndCheck(lbl_1_data_498)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(lbl_1_data_498, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
BoardWinCreate(0, MAKE_MESSID(48, 12), -1);
BoardWinWait();
BoardWinKill();

8
src/REL/w06Dll/bridge.c
View file

@ -118,7 +118,7 @@ void fn_1_7BB0(void) {
temp_r27 = BoardSpaceFlagPosGet(0, lbl_1_data_434[i][var_r28], &sp8);
BoardModelPosSetV(lbl_1_bss_D0[i], &sp8);
BoardModelRotYSet(lbl_1_bss_D0[i], lbl_1_data_41C[i][var_r28]);
BoardModelMotionShiftSet(lbl_1_bss_D0[i], 0, 60.0f * var_f29, 0.0f, 0);
BoardModelMotionShiftSet(lbl_1_bss_D0[i], 0, 60.0f * var_f29, 0.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(2);
BoardModelMotionSpeedSet(lbl_1_bss_D0[i], 0.0f);
lbl_1_bss_D6[i][var_r28] = temp_r27;
@ -157,7 +157,7 @@ void fn_1_7FA4(void) {
temp_r29 = BoardSpaceFlagPosGet(0, lbl_1_data_434[var_r31][temp_r30], &sp8);
BoardModelPosSetV(lbl_1_bss_D0[var_r31], &sp8);
BoardModelRotYSet(lbl_1_bss_D0[var_r31], lbl_1_data_41C[var_r31][temp_r30]);
BoardModelMotionShiftSet(lbl_1_bss_D0[var_r31], 0, 60.0f * temp_f31, 0.0f, 0);
BoardModelMotionShiftSet(lbl_1_bss_D0[var_r31], 0, 60.0f * temp_f31, 0.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(2);
BoardModelMotionSpeedSet(lbl_1_bss_D0[var_r31], 0.0f);
lbl_1_bss_D6[var_r31][temp_r30] = temp_r29;
@ -249,7 +249,7 @@ static s32 fn_1_8490(s32 arg0, s8 arg1) {
BoardPlayerIdleSet(arg0);
HuPrcSleep(30);
} else {
BoardPlayerMotionShiftSet(arg0, lbl_1_data_418, 0.0f, 6.0f, 0);
BoardPlayerMotionShiftSet(arg0, lbl_1_data_418, 0.0f, 6.0f, HU3D_MOTATTR_NONE);
BoardPlayerMotionSpeedSet(arg0, 1.5f);
HuPrcSleep(60);
}
@ -262,7 +262,7 @@ static s32 fn_1_8490(s32 arg0, s8 arg1) {
BoardPlayerIdleSet(arg0);
HuPrcSleep(30);
} else {
BoardPlayerMotionShiftSet(arg0, lbl_1_data_418, 0.0f, 6.0f, 0x40000001);
BoardPlayerMotionShiftSet(arg0, lbl_1_data_418, 0.0f, 6.0f, HU3D_MOTATTR_LOOP);
BoardPlayerMotionSpeedSet(arg0, 3.0f);
HuPrcSleep(60);
}

4
src/REL/w06Dll/fire.c
View file

@ -95,7 +95,7 @@ static void fn_1_6F80(void) {
fn_1_72CC(temp_r31);
fn_1_7760(temp_r31);
BoardCameraMotionWait();
BoardModelMotionShiftSet(lbl_1_bss_C0, 0, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C0, 0, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(8);
while (BoardModelMotionTimeGet(lbl_1_bss_C0) < 22.0f) {
HuPrcVSleep();
@ -113,7 +113,7 @@ static void fn_1_6F80(void) {
if (lbl_1_bss_B8 != -1) {
HuAudFXStop(lbl_1_bss_B8);
}
BoardModelMotionShiftSet(lbl_1_bss_C0, 0, 60.0f, 8.0f, 0);
BoardModelMotionShiftSet(lbl_1_bss_C0, 0, 60.0f, 8.0f, HU3D_MOTATTR_NONE);
fn_1_73EC(0.0f);
fn_1_7574();
while (!BoardModelMotionEndCheck(lbl_1_bss_C0)) {

12
src/REL/w06Dll/mg_coin.c
View file

@ -208,7 +208,7 @@ static s32 fn_1_4BF8(s32 arg0) {
BoardPlayerRotYSet(arg0, atan2d(-sp20.x, -sp20.z));
BoardPlayerPosLerpStart(arg0, &sp2C, &sp38, 40);
BoardModelPosGet(lbl_1_bss_C[5], &sp2C);
BoardModelMotionShiftSet(lbl_1_bss_C[5], lbl_1_data_1DA, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[5], lbl_1_data_1DA, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardModelMotionSpeedSet(lbl_1_bss_C[5], 2.0f);
while (GWPlayer[arg0].moving) {
BoardPlayerPosGet(arg0, &sp38);
@ -216,7 +216,7 @@ static s32 fn_1_4BF8(s32 arg0) {
BoardModelRotYSet(lbl_1_bss_C[5], atan2d(sp20.x, sp20.z));
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_C[5], 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[5], 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardPlayerIdleSet(arg0);
BoardPlayerRotYSet(arg0, -90.0f);
BoardAudSeqPause(0, 1, 1000);
@ -255,7 +255,7 @@ static void fn_1_4FB8(s32 arg0) {
while (lbl_1_bss_54) {
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(arg0, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(arg0, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while (!BoardPlayerMotionEndCheck(arg0)) {
HuPrcVSleep();
@ -281,7 +281,7 @@ static void fn_1_519C(s32 arg0) {
if (lbl_1_bss_8C == 0) {
BoardPlayerPosLerpStart(arg0, &sp20, &sp14, 40);
BoardModelPosGet(lbl_1_bss_C[5], &sp20);
BoardModelMotionShiftSet(lbl_1_bss_C[5], lbl_1_data_1DA, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[5], lbl_1_data_1DA, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardModelMotionSpeedSet(lbl_1_bss_C[5], 2.0f);
while (GWPlayer[arg0].moving) {
BoardPlayerPosGet(arg0, &sp14);
@ -289,7 +289,7 @@ static void fn_1_519C(s32 arg0) {
BoardModelRotYSet(lbl_1_bss_C[5], atan2d(sp8.x, sp8.z));
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_C[5], 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[5], 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
BoardModelRotYSet(lbl_1_bss_C[5], 0.0f);
BoardCameraMotionWait();
@ -446,7 +446,7 @@ static void fn_1_59D0(s32 arg0) {
return;
}
if (arg0 == 4) {
BoardModelMotionShiftSet(temp_r31->unk04, 2, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(temp_r31->unk04, 2, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
temp_r31->unk02 = 10;
return;
}

12
src/REL/w06Dll/mg_item.c
View file

@ -377,7 +377,7 @@ static void fn_1_15CC(s32 arg0) {
}
fn_1_2048(lbl_1_bss_33, 3);
temp_r25 = HuAudSStreamPlay(2);
BoardPlayerMotionShiftSet(arg0, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(arg0, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while (!BoardPlayerMotionEndCheck(arg0)) {
HuPrcVSleep();
@ -969,7 +969,7 @@ static void fn_1_3698(s8 arg0) {
sp18.z = sp24.z;
temp_f31 = sp18.x - sp24.x;
if (ABS(temp_f31) < 1.0f) {
BoardModelMotionShiftSet(lbl_1_bss_C[4], 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[4], 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
lbl_1_bss_28->trans.y = 0.0f;
return;
}
@ -982,7 +982,7 @@ static void fn_1_3698(s8 arg0) {
VECSubtract(&sp18, &sp24, &spC);
lbl_1_bss_28->trans.y = temp_f31 / var_f30;
BoardModelRotYSet(lbl_1_bss_C[4], atan2d(spC.x, spC.z));
BoardModelMotionShiftSet(lbl_1_bss_C[4], temp_r31->unk08, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[4], temp_r31->unk08, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardModelMotionSpeedSet(lbl_1_bss_C[4], 2.0f);
}
@ -1037,11 +1037,11 @@ static void fn_1_3974(omObjData *arg0) {
fn_1_3560(0);
temp_r31->unk06 = 0;
BoardModelRotYSet(lbl_1_bss_C[4], 0.0f);
BoardModelMotionShiftSet(lbl_1_bss_C[4], 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[4], 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
break;
case 2:
if (temp_r31->unk06++ == 0) {
BoardModelMotionShiftSet(lbl_1_bss_C[4], temp_r31->unk0A, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[4], temp_r31->unk0A, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
break;
}
if (temp_r31->unk06 < 50) {
@ -1053,7 +1053,7 @@ static void fn_1_3974(omObjData *arg0) {
case 4:
temp_r31->unk00_field3 = 0;
lbl_1_bss_33 = temp_r31->unk01[temp_r31->unk00_field2];
BoardModelMotionShiftSet(lbl_1_bss_C[4], 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_C[4], 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
fn_1_3560(0);
break;
case 5:

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

@ -570,12 +570,12 @@ void fn_1_2350(void)
if (var_r31 == 0x14) {
HuAudFXPlay(0x9A);
if (mgBattleStarMax < 6) {
Hu3DMotionShiftSet(lbl_1_bss_36[0], lbl_1_bss_E[0][2], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(lbl_1_bss_36[1], lbl_1_bss_E[1][2], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(lbl_1_bss_36[0], lbl_1_bss_E[0][2], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(lbl_1_bss_36[1], lbl_1_bss_E[1][2], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
else {
Hu3DMotionShiftSet(lbl_1_bss_36[0], lbl_1_bss_E[0][3], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(lbl_1_bss_36[1], lbl_1_bss_E[1][3], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(lbl_1_bss_36[0], lbl_1_bss_E[0][3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(lbl_1_bss_36[1], lbl_1_bss_E[1][3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
}
HuPrcVSleep();
@ -601,8 +601,8 @@ void fn_1_2350(void)
}
}
else {
Hu3DMotionShiftSet(lbl_1_bss_36[0], lbl_1_bss_E[0][0], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_36[1], lbl_1_bss_E[1][0], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_36[0], lbl_1_bss_E[0][0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(lbl_1_bss_36[1], lbl_1_bss_E[1][0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
for (var_r31 = 0; var_r31 <= 0xA; var_r31++) {
var_f31 = 1.0 - (var_r31 / 10.0);
HuSprScaleSet(lbl_1_bss_50, 1, var_f31, var_f31);
@ -613,8 +613,8 @@ void fn_1_2350(void)
}
}
else {
Hu3DMotionShiftSet(lbl_1_bss_36[0], lbl_1_bss_E[0][4], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(lbl_1_bss_36[1], lbl_1_bss_E[1][4], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(lbl_1_bss_36[0], lbl_1_bss_E[0][4], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
Hu3DMotionShiftSet(lbl_1_bss_36[1], lbl_1_bss_E[1][4], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(0xB4);
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 0x1E);
@ -640,8 +640,8 @@ void fn_1_2350(void)
Hu3DModelPosSet(lbl_1_bss_36[2], 125.0f + (400.0f * var_f31), 0.0f, 0.0f);
Hu3DModelPosSet(lbl_1_bss_36[3], 275.0f + (400.0f * var_f31), 0.0f, 0.0f);
if (var_r31 == 0x19) {
Hu3DMotionShiftSet(lbl_1_bss_36[2], lbl_1_bss_E[2][0], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_36[3], lbl_1_bss_E[3][0], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(lbl_1_bss_36[2], lbl_1_bss_E[2][0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(lbl_1_bss_36[3], lbl_1_bss_E[3][0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
if ((GWPlayerCfg[2].character < 8) && ((var_r31 % 5) == 0)) {
HuAudFXPlay(GWPlayerCfg[2].character + 0xD5);
@ -942,14 +942,14 @@ void fn_1_4374(void)
if (GWPlayerCfg[spC[var_r31]].character >= 8) {
HuAudFXPlay(lbl_1_data_4A[GWPlayerCfg[spC[var_r31]].character - 8]);
}
Hu3DMotionShiftSet(lbl_1_bss_36[var_r31], lbl_1_bss_E[var_r31][3], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(lbl_1_bss_36[var_r31], lbl_1_bss_E[var_r31][3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
var_r30++;
}
else {
if (GWPlayerCfg[spC[var_r31]].character >= 8) {
HuAudFXPlay(lbl_1_data_56[GWPlayerCfg[spC[var_r31]].character - 8]);
}
Hu3DMotionShiftSet(lbl_1_bss_36[var_r31], lbl_1_bss_E[var_r31][4], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(lbl_1_bss_36[var_r31], lbl_1_bss_E[var_r31][4], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
}
HuSprAttrReset(lbl_1_bss_50, 1, 4);

4
src/game/board/basic_space.c
View file

@ -90,7 +90,7 @@ void BoardLandBlueExec(s32 player, s32 space) {
coin_chg = BoardCoinChgCreate(&pos, coins);
HuAudFXPlay(839);
BoardCameraMotionWait();
BoardPlayerMotionShiftSet(player, 12, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(player, 12, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
for (i = 0; i < coins; i++) {
BoardPlayerCoinsAdd(player, 1);
@ -131,7 +131,7 @@ void BoardLandRedExec(s32 player, s32 space) {
coin_chg = BoardCoinChgCreate(&pos, -coins);
HuAudFXPlay(840);
BoardCameraMotionWait();
BoardPlayerMotionShiftSet(player, 13, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(player, 13, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
for (i = 0; i < coins; i++) {
BoardPlayerCoinsAdd(player, -1);
HuAudFXPlay(14);

2
src/game/board/battle.c
View file

@ -454,7 +454,7 @@ static void UpdateExplode(omObjData *arg0) {
if (currSpace == GWPlayer[i].space_curr) {
temp_f31 = 20.0f * BoardRandFloat();
HuAudFXPlay(bombFXTbl[GWPlayer[i].character]);
BoardPlayerMotionShiftSet(i, 6, temp_f31, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(i, 6, temp_f31, 8.0f, HU3D_MOTATTR_LOOP);
}
}
CharModelLayerSetAll(2);

2
src/game/board/block.c
View file

@ -116,7 +116,7 @@ static void BlockProc(void)
BoardWinCreate(0, 0x10000, -1);
BoardWinWait();
BoardWinKill();
BoardPlayerMotionShiftSet(player, 0xB, 0, 8.0, 0.0);
BoardPlayerMotionShiftSet(player, 0xB, 0, 8.0, HU3D_MOTATTR_NONE);
HuPrcSleep(9);
while (BoardPlayerMotionTimeGet(player) < 30.0f) {
HuPrcVSleep();

12
src/game/board/boo.c
View file

@ -931,7 +931,7 @@ static void BallPlayerScare(omObjData *arg0, BallPlayerWork *arg1) {
temp_r29 = arg0->data;
temp_f31 = -BoardPlayerRotYGet(stealTarget);
if (stealType == 2) {
BoardPlayerMotionShiftSet(stealTarget, temp_r29->unk04[3], 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(stealTarget, temp_r29->unk04[3], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
SetBallPlayerState(0);
} else {
BoardPlayerMotBlendSet(stealTarget, temp_f31, 15);
@ -1039,7 +1039,7 @@ static void BallPlayerCatch(omObjData *arg0, BallPlayerWork *arg1) {
omVibrate(stealTarget, 12, 4, 2);
TakeBallStar();
}
BoardPlayerMotionShiftSet(stealTarget, temp_r27->unk04[0], 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(stealTarget, temp_r27->unk04[0], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
arg1->unk02 = 1;
}
if (stealType == 0) {
@ -1124,7 +1124,7 @@ static void SetBallBooState(s32 arg0) {
ballBooObj->rot.y = (sp8.y - ballBooObj->trans.y) / 30.0f;
ballBooObj->rot.z = (sp8.z - ballBooObj->trans.z) / 30.0f;
temp_r31->unk02 = 30;
BoardModelMotionShiftSet(temp_r31->unk04, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r31->unk04, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
if (arg0 == 5) {
HuAudFXPlay(0x64);
@ -1133,7 +1133,7 @@ static void SetBallBooState(s32 arg0) {
if (arg0 == 7) {
temp_r31->unk08 = -ballBooObj->scale.y;
HuAudFXPlay(0x64);
BoardModelMotionShiftSet(temp_r31->unk04, 5, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r31->unk04, 5, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
if (arg0 == 3) {
battleTimer = 0;
@ -1200,7 +1200,7 @@ static void BallBooChase(omObjData *arg0, BallBooWork *arg1) {
} else {
SetBallBooState(0);
}
BoardModelMotionShiftSet(arg1->unk04, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(arg1->unk04, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
}
@ -1255,7 +1255,7 @@ static void BallBooFlash(omObjData *arg0, BallBooWork *arg1) {
if (BoardDAngleCalcRange(&arg0->scale.y, arg1->unk08, 8.0f) != 0) {
SetBallBooState(6);
BoardModelMotionShiftSet(arg1->unk04, 3, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(arg1->unk04, 3, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
temp_f31 = BoardPlayerRotYGet(stealTarget);
BoardPlayerPosGet(stealTarget, &sp8);
sp8.x += 500.0 * sind(-temp_f31);

28
src/game/board/boo_house.c
View file

@ -253,7 +253,7 @@ static void ExecBooHouse(void)
BoardPlayerMoveBetween(currPlayer, var_r30, temp_r29);
BoardPlayerIdleSet(currPlayer);
BoardMusStart(1, 1, 0x7F, 0);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[0], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardWinCreate(2, hostMesTbl[GWBoardGet()][0], BoardWinPortraitGet());
BoardWinWait();
@ -295,7 +295,7 @@ repeatWindowView:
BoardStatusShowSet(currPlayer, 0);
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
CloseBooHouse();
BoardCameraViewSet(1);
BoardCameraRotSet(0.0f, 0.0f);
@ -409,19 +409,19 @@ static void OpenBooHouse(void)
while (BoardModelMotionTimeGet(houseMdl[0]) < 90.0f) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(houseMdl[0], houseShowMot, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(houseMdl[1], houseHideMot, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(houseMdl[0], houseShowMot, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardModelMotionShiftSet(houseMdl[1], houseHideMot, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardModelHookObjReset(houseMdl[0], "yoko02");
SetBooBallPos();
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[2], 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[2], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
static void CloseBooHouse(void)
{
BoardModelPosSet(ballMdl, 0.0f, 0.0f, 0.0f);
BoardModelHookSet(houseMdl[0], "yoko02", ballMdl);
BoardModelMotionShiftSet(houseMdl[1], 0, 90.0f, 10.0f, 0);
BoardModelMotionShiftSet(houseMdl[0], 0, 90.0f, 10.0f, 0);
BoardModelMotionShiftSet(houseMdl[1], 0, 90.0f, 10.0f, HU3D_MOTATTR_NONE);
BoardModelMotionShiftSet(houseMdl[0], 0, 90.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(0xA);
while (BoardModelMotionShiftIDGet(houseMdl[0]) != -1) {
@ -697,7 +697,7 @@ void ApplyCoinSteal(s16 arg0, s16 arg1)
BoardWinKill();
BoardStatusShowSetForce(currPlayer);
BoardStatusShowSet(currPlayer, 1);
BoardPlayerMotionShiftSet(currPlayer, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(currPlayer, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
for (var_r30 = 0; var_r30 < arg0; var_r30++) {
BoardPlayerCoinsAdd(currPlayer, 1);
@ -721,7 +721,7 @@ void ApplyStarSteal(void)
BoardAudSeqPause(1, 1, 0x3E8);
HuPrcSleep(0x17);
BoardPlayerVoiceEnableSet(currPlayer, 7, 0);
BoardPlayerMotionShiftSet(currPlayer, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(currPlayer, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(boardStarSndTbl[GWPlayer[currPlayer].character]);
BoardPlayerStarsAdd(currPlayer, 1);
HuAudFXPlay(8);
@ -742,7 +742,7 @@ void ApplyBooLight(void)
BoardWinCreate(2, MAKE_MESSID(7, 11), 3);
BoardWinWait();
BoardWinKill();
BoardPlayerMotionShiftSet(currPlayer, 8, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(currPlayer, 8, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
while (BoardPlayerMotionEndCheck(currPlayer) == 0) {
HuPrcVSleep();
}
@ -860,13 +860,13 @@ void BoardBooHouseTutorialExec(void)
while (BoardModelMotionEndCheck(BoardBooHouseHostGet()) == 0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[0], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardTutorialHookExec(0x1C, 0);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardModelPosSet(ballMdl, 0.0f, 0.0f, 0.0f);
BoardModelHookSet(houseMdl[0], "yoko02", ballMdl);
BoardModelMotionShiftSet(houseMdl[1], 0, 90.0f, 10.0f, 0);
BoardModelMotionShiftSet(houseMdl[0], 0, 90.0f, 10.0f, 0);
BoardModelMotionShiftSet(houseMdl[1], 0, 90.0f, 10.0f, HU3D_MOTATTR_NONE);
BoardModelMotionShiftSet(houseMdl[0], 0, 90.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(0xA);
while (BoardModelMotionShiftIDGet(houseMdl[0]) != -1) {
HuPrcVSleep();

40
src/game/board/bowser.c
View file

@ -220,12 +220,12 @@ static void ExecBowserMain(void)
BoardCameraViewSet(3);
BoardFilterFadeInit(30, 160);
BoardCameraMotionWait();
BoardPlayerMotionShiftSet(eventPlayer, jumpMot, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(eventPlayer, jumpMot, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardPlayerMotionSpeedSet(eventPlayer, 2.0f);
HuPrcSleep(120);
ConfigBowserEvent();
HuAudFXPlay(scareFxTbl[GWPlayer[eventPlayer].character]);
BoardPlayerMotionShiftSet(eventPlayer, scareMot, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(eventPlayer, scareMot, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
CreateMiniBowser();
while(!CheckMiniBowser()) {
HuPrcVSleep();
@ -241,7 +241,7 @@ static void ExecBowserMain(void)
HuPrcSleep(30);
}
ExecBowserSpecial();
BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
HuAudFXPlay(58);
BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
@ -288,7 +288,7 @@ static void ExecMGReturn(void)
DoMGReturnEffect();
GWSystem.player_curr = player;
BoardStatusShowSetAll(1);
BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
HuAudFXPlay(58);
BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
@ -357,7 +357,7 @@ static void ExecBowserSpecial(void)
BoardWinWait();
BoardWinKill();
HuAudFXPlay(857);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
for(i=0; i<4; i++) {
omVibrate(i, 12, 12, 0);
}
@ -376,7 +376,7 @@ static void ExecBowserSpecial(void)
while(!BoardModelMotionEndCheck(bowserMdl)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
StopBowserEvent();
switch(GWSystem.bowser_event) {
case 0:
@ -422,7 +422,7 @@ static void ExecBowserGame(void)
BoardWinCreate(2, mess, 5);
BoardWinWait();
BoardWinKill();
BoardModelMotionShiftSet(bowserMdl, 5, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while(BoardModelMotionTimeGet(bowserMdl) < 80.0f) {
HuPrcVSleep();
@ -545,7 +545,7 @@ static void ExecBowserShuffle(void)
player++;
}
HuAudFXPlay(857);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
while(!BoardModelMotionEndCheck(bowserMdl)) {
HuPrcVSleep();
}
@ -597,7 +597,7 @@ static void ExecBowserRevo(void)
}
coin /= 4;
HuAudFXPlay(857);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
while(!BoardModelMotionEndCheck(bowserMdl)) {
HuPrcVSleep();
}
@ -622,11 +622,11 @@ static void ExecBowserRevo(void)
static void ExecBowserSuit(void)
{
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
BoardWinCreate(2, MAKE_MESSID(3, 18), 5);
BoardWinWait();
HuAudFXPlay(857);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
StartSuitGive();
while(!CheckSuitGive()) {
@ -826,7 +826,7 @@ static void ExecBowserObj(omObjData *object)
}
if(work->mot_active && BoardModelMotionEndCheck(bowserMdl)) {
work->mot_active = 0;
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
switch(work->state) {
case 1:
@ -880,7 +880,7 @@ static void ExecBowserFall(BowserWork *work, omObjData *object)
}
if(BoardModelMotionEndCheck(bowserMdl)) {
work->state = 0;
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
return;
}
if(!work->fall_done && !(BoardModelMotionTimeGet(bowserMdl) < 140.0f)) {
@ -933,7 +933,7 @@ static void ExecBowserJump(BowserWork *work, omObjData *object)
{
switch(work->jump_state) {
case 0:
BoardModelMotionShiftSet(bowserMdl, 2, 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 2, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
work->jump_state = 1;
break;
@ -1532,9 +1532,9 @@ static void MiniBowserTake(void)
omVibrate(eventPlayer, 12, 6, 6);
}
if(coin_inc < 0) {
BoardPlayerMotionShiftSet(eventPlayer, 13, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(eventPlayer, 13, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
} else {
BoardPlayerMotionShiftSet(eventPlayer, 12, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(eventPlayer, 12, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
}
for(i=0; i<steal; i++) {
BoardPlayerCoinsAdd(eventPlayer, coin_inc);
@ -1607,9 +1607,9 @@ static void MiniBowserTakeAll(void)
}
for(i=0; i<4; i++) {
if(coin_inc < 0) {
BoardPlayerMotionShiftSet(i, 13, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(i, 13, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
} else {
BoardPlayerMotionShiftSet(i, 12, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(i, 12, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
}
}
if(steal >= 20) {
@ -1778,9 +1778,9 @@ static void SetMiniBowserMotion(s32 mot, u8 end, s32 pause)
work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
models = work->models;
if(pause) {
attr = 0x40000001;
attr = HU3D_MOTATTR_LOOP;
} else {
attr = 0;
attr = HU3D_MOTATTR_NONE;
}
if(end) {
OSu8tof32(&end, &shift_end);

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

@ -944,7 +944,7 @@ static void ExecItemPipe(void) {
}
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(sp2C[1], 6, 0.0f, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(sp2C[1], 6, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardModelVoiceEnableSet(BoardPlayerModelGet(sp2C[1]), 6, 0);
CharModelLayerSetAll(2);
BoardPlayerIdleSet(sp2C[0]);
@ -1480,7 +1480,7 @@ static void ExecItemWhistle(void) {
}
HuPrcVSleep();
}
BoardModelMotionShiftSet(temp_r28, temp_r20, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r28, temp_r20, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
HuAudFXPlay(0x322);
for (var_r29 = 0; var_r29 < 180; var_r29++) {
for (var_r31 = 0; var_r31 < 4; var_r31++) {
@ -1533,7 +1533,7 @@ static void ExecItemWhistle(void) {
if (sp28[0] < 100.0f) {
if (var_r27 == 0) {
var_r27 = 1;
BoardModelMotionShiftSet(temp_r28, temp_r21, 0.0f, 3.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r28, temp_r21, 0.0f, 3.0f, HU3D_MOTATTR_LOOP);
HuAudFXPlay(forceMoveSfxTbl[GWBoardGet()]);
}
sp9C.y += var_f30;
@ -1619,18 +1619,18 @@ static void ExecItemBowser(void) {
HuAudFXPlay(0x326);
BoardModelVisibilitySet(temp_r31, 1);
BoardModelHookSet(suitMdl, "itemhook_head", temp_r31);
BoardModelMotionShiftSet(suitMdl, suitMot[1], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(temp_r31, suitCommonMot[1], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(suitMdl, suitMot[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardModelMotionShiftSet(temp_r31, suitCommonMot[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
while (!BoardModelMotionEndCheck(suitMdl)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(suitMdl, suitMot[0], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(temp_r31, suitCommonMot[0], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(suitMdl, suitMot[0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardModelMotionShiftSet(temp_r31, suitCommonMot[0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(0x28);
HuAudPlayerVoicePlay(currItemRestore, 0x129);
omVibrate(currItemRestore, 12, 4, 2);
HuPrcSleep(60);
BoardModelMotionShiftSet(suitMdl, 0, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(suitMdl, 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
HuPrcKill(NULL);
while (1) {
HuPrcVSleep();
@ -1828,7 +1828,7 @@ static void ExecItemBooBall(void) {
BoardWinKill();
BoardStatusShowSetAll(1);
if (var_r29 != 0) {
BoardPlayerMotionShiftSet(currItemRestore, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(currItemRestore, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(30);
for (var_r31 = 0; var_r31 < spC; var_r31++) {
BoardPlayerCoinsAdd(currItemRestore, 1);
@ -1837,7 +1837,7 @@ static void ExecItemBooBall(void) {
}
BoardPlayerMotionEndWait(currItemRestore);
HuPrcSleep(10);
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
break;
case 1:
@ -1874,7 +1874,7 @@ static void ExecItemBooBall(void) {
if (var_r29 != 0) {
BoardPlayerVoiceEnableSet(currItemRestore, 7, 0);
sp18 = HuAudSStreamPlay(6);
BoardPlayerMotionShiftSet(currItemRestore, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(currItemRestore, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(boardStarSndTbl[GWPlayer[currItemRestore].character]);
BoardPlayerStarsAdd(currItemRestore, 1);
HuAudFXPlay(8);
@ -1885,7 +1885,7 @@ static void ExecItemBooBall(void) {
HuPrcVSleep();
}
}
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
break;
case 3:
BoardViewMapExec(currItemRestore);
@ -2311,7 +2311,7 @@ static void GenieSceneExec(void) {
temp_f30 = 40.0f - var_f31 * var_f31 * 0.25f * 0.0125f;
if (temp_f30 <= 0.0f && var_r22 == 0) {
var_r22 = 1;
BoardModelMotionShiftSet(temp_r28, 3, 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(temp_r28, 3, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
}
var_f31 += 1.0f;
sp50.y += temp_f30;
@ -2668,7 +2668,7 @@ static void ExecItemBag(void) {
}
HuPrcChildWatch();
BoardPlayerItemAdd(currItemRestore, itemBagItems[var_r30]);
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(10);
var_r30++;
}
@ -2754,8 +2754,8 @@ static void RestoreItemBowser(void) {
BoardModelAttrSet(temp_r31, 0x400000);
suitMdl = BoardBowserSuitModelGet();
temp_r29 = BoardBowserSuitPlayerModelGet();
BoardModelMotionShiftSet(suitMdl, suitMot[0], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(temp_r29, suitCommonMot[0], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(suitMdl, suitMot[0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardModelMotionShiftSet(temp_r29, suitCommonMot[0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(40);
HuAudPlayerVoicePlay(currItemRestore, 0x129);
HuPrcSleep(20);

38
src/game/board/last5.c
View file

@ -513,9 +513,9 @@ static void Last5Main(void)
}
BoardWinCreate(2, messBase+10, BoardWinPortraitGetStar());
BoardWinWait();
BoardModelMotionShiftSet(hostMdl, hostMot[5], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(hostMdl, hostMot[5], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcVSleep(8);
BoardModelMotionShiftSet(hostMdl, hostMot[6], 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[6], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
for(temp_r31=0; temp_r31<4; temp_r31++) {
temp_r30 = sp28[temp_r31];
temp_r27 = sp24[temp_r31];
@ -581,7 +581,7 @@ static void Last5Main(void)
}
BoardModelMotionStart(hostMdl, hostMot[5], 0x40000004);
HuPrcVSleep(8);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardWinCreate(2, messBase+15, BoardWinPortraitGetStar());
BoardWinWait();
if((s32)GWSystem.team != 0) {
@ -619,7 +619,7 @@ static void Last5Main(void)
while(!CheckHostMove()) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(8);
if((s32)GWSystem.team != 0) {
temp_r30 = last5Player;
@ -642,9 +642,9 @@ static void Last5Main(void)
BoardWinCreate(2, messBase+16, BoardWinPortraitGetStar());
BoardWinInsertMesSet(BoardPlayerGetCharMess(temp_r30), 3);
BoardWinWait();
BoardModelMotionShiftSet(hostMdl, hostMot[5], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(hostMdl, hostMot[5], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcVSleep(8);
BoardModelMotionShiftSet(hostMdl, hostMot[6], 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[6], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
temp_r19 = 0;
temp_r29 = 3;
for(temp_f31=0; temp_r29>0; temp_f31++) {
@ -668,7 +668,7 @@ static void Last5Main(void)
sp3C = sp48;
BoardModelMotionStart(hostMdl, hostMot[5], 0x40000004);
HuPrcVSleep(8);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
CreateLast5Roulette();
SetLast5RouletteFade(1);
SetLast5RouletteState(2);
@ -722,15 +722,15 @@ static void Last5Main(void)
BoardPlayerIdleSet(temp_r30);
BoardModelVisibilitySet(BoardPlayerModelGet(temp_r30), 0);
SetLast5RouletteFade(0);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardWinCreate(2, messBase+23, BoardWinPortraitGetStar());
BoardWinWait();
BoardModelMotionShiftSet(hostMdl, hostMot[4], 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(hostMdl, hostMot[4], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while(!BoardModelMotionEndCheck(hostMdl)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(hostMdl, hostMot[2], 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
SetLotteryDrawState(4);
}
@ -1086,7 +1086,7 @@ static void ExecLotteryDraw(void)
SetLotteryDrawWheelState(3);
BoardWinCreate(2, 2+messBase+ticket, BoardWinPortraitGetStar());
BoardWinWait();
BoardModelMotionShiftSet(hostMdl, hostMot[7], 0, 8, 0);
BoardModelMotionShiftSet(hostMdl, hostMot[7], 0, 8, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while(BoardModelMotionTimeGet(hostMdl) < 26.0f) {
HuPrcVSleep();
@ -1098,7 +1098,7 @@ static void ExecLotteryDraw(void)
while(!BoardModelMotionEndCheck(hostMdl)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, HU3D_MOTATTR_LOOP);
while(GetLotteryDrawWheelState() != 0) {
HuPrcVSleep();
}
@ -1133,7 +1133,7 @@ static void ExecLotteryDraw(void)
}
} else {
BoardAudSeqPause(1, 1, 1000);
BoardModelMotionShiftSet(hostMdl, hostMot[3], 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[3], 0, 8, HU3D_MOTATTR_LOOP);
stream = HuAudSStreamPlay(10);
while(HuAudSStreamStatGet(stream)) {
HuPrcVSleep();
@ -1164,11 +1164,11 @@ static void ExecLotteryDraw(void)
HuPrcVSleep();
}
BoardPlayerIdleSet(player);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, HU3D_MOTATTR_LOOP);
while(!CheckHostMove()) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, HU3D_MOTATTR_LOOP);
BoardStatusShowSetForce(player);
BoardStatusShowSet(player, 1);
BoardPlayerMotBlendSet(player, 0, 7);
@ -1178,7 +1178,7 @@ static void ExecLotteryDraw(void)
BoardWinCreate(2, 6+messBase, BoardWinPortraitGetStar());
BoardWinWait();
BoardAudSeqPause(1, 1, 1000);
BoardModelMotionShiftSet(hostMdl, hostMot[1], 0, 8, 0);
BoardModelMotionShiftSet(hostMdl, hostMot[1], 0, 8, HU3D_MOTATTR_NONE);
star_pos.x = host_start.x;
star_pos.y = 60.0f+host_start.y;
star_pos.z = host_start.z;
@ -1188,11 +1188,11 @@ static void ExecLotteryDraw(void)
BoardStatusShowSet(player, 0);
StartHostMove(&host_start, &host_end, 25);
BoardPlayerPosLerpStart(player, &player_start, &player_end, 25);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, HU3D_MOTATTR_LOOP);
while(!CheckHostMove()) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, HU3D_MOTATTR_LOOP);
while(GWPlayer[player].moving) {
HuPrcVSleep();
}
@ -1514,7 +1514,7 @@ static void StartHostMove(Vec *from, Vec *to, s16 time)
angle = 180.0*(atan2(object->rot.x, object->rot.z)/M_PI);
work->angle = 0;
OSf32tos16(&angle, &work->angle_end);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, HU3D_MOTATTR_LOOP);
BoardModelMotionSpeedSet(hostMdl, 3.0f);
}

20
src/game/board/lottery.c
View file

@ -533,7 +533,7 @@ static void ExecLottery(void) {
while (!BoardModelMotionEndCheck(lotteryMdl[0])) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[3], 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
BoardPlayerRotSet(temp_r31, 0.0f, temp_r26, 0.0f);
BoardPlayerPosLerpStart(temp_r31, &sp38, &sp2C, 0x14);
while (GWPlayer[temp_r31].moving) {
@ -556,7 +556,7 @@ static void ExecLottery(void) {
while (!BoardStatusStopCheck(temp_r31)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[0], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
if (GWPlayer[temp_r31].draw_ticket == 0 && GWSystem.max_turn - GWSystem.turn >= 5) {
SetupTicket(temp_r31);
ShowTicket();
@ -902,7 +902,7 @@ static void ExecBallGame(void) {
BoardModelMotionTimeSet(lotteryMdl[1], 0.0f);
BoardModelAttrSet(gripMdl[0], 0x40000001);
BoardModelAttrSet(gripMdl[1], 0x40000001);
BoardPlayerMotionShiftSet(temp_r27, turnMot, 0.0f, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(temp_r27, turnMot, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardPlayerMotionSpeedSet(temp_r27, 0.0f);
temp_f24 = BoardModelMotionMaxTimeGet(lotteryMdl[1]);
temp_f24 -= 4.0f;
@ -1878,7 +1878,7 @@ static void ExecPrize(void) {
HuAudFXPlay(0x332);
}
if (var_r29 == 7) {
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
if (var_r26 != 0) {
BoardPlayerPosGet(temp_r30, &sp8);
@ -1922,7 +1922,7 @@ static void ExecPrize(void) {
HuAudFXPlay(loseSoundTbl[GWPlayer[temp_r30].character]);
BoardPlayerVoiceEnableSet(temp_r30, var_r29, 0);
}
BoardPlayerMotionShiftSet(temp_r30, var_r29, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(temp_r30, var_r29, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
switch (var_r31) {
case 0:
case 1:
@ -1951,7 +1951,7 @@ static void ExecPrize(void) {
} else {
var_r28 = lotteryMessBase + 8;
}
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[2], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[2], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardWinCreate(2, var_r28, BoardWinPortraitGet());
BoardWinWait();
BoardWinKill();
@ -1968,7 +1968,7 @@ static void ExecLose(s32 arg0) {
temp_r30 = GWPlayer[arg0].character;
loseMot = BoardPlayerMotionCreate(arg0, loseMotTbl[temp_r30]);
BoardPlayerMotionShiftSet(arg0, loseMot, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(arg0, loseMot, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
while (!BoardPlayerMotionEndCheck(arg0)) {
HuPrcVSleep();
@ -2043,14 +2043,14 @@ void BoardLotteryTutorialExec(void) {
while (!BoardModelMotionEndCheck(lotteryMdl[0])) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[3], 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
while (!BoardModelMotionEndCheck(BoardShopHostGet())) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[0], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardTutorialHookExec(0x1C, 0);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[2], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[2], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(30);
BoardModelMotionStart(lotteryMdl[0], 0, 0x40000004);
while (!BoardModelMotionEndCheck(lotteryMdl[0])) {

2
src/game/board/main.c
View file

@ -1322,7 +1322,7 @@ static void ExecBoardMG(omObjData *object)
return;
}
if(GWPlayer[GWSystem.player_curr].moving == 0) {
BoardPlayerMotionShiftSet(GWSystem.player_curr, 1, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
if(!_CheckFlag(FLAG_ID_MAKE(1, 21))) {
_SetFlag(FLAG_ID_MAKE(1, 20));
object->func = KillBoardMG;

2
src/game/board/mushroom.c
View file

@ -166,7 +166,7 @@ static void MushroomMain(void) {
var_r27 = MAKE_MESSID(5, 2);
}
BoardPlayerMotionShiftSet(curPlayer, 0xC, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(curPlayer, 0xC, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(4);
BoardWinCreate(0, var_r27, -1);
BoardWinWait();

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

@ -1703,7 +1703,7 @@ void BoardPlayerPosLerpStart(s32 arg0, Vec *arg1, Vec *arg2, s16 arg3)
temp_r21 = BoardPlayerGet(arg0);
if (playerMot[temp_r21->player_idx] != 3) {
var_r25 = BoardModelMotionShiftSet(BoardPlayerModelGet(arg0), 3, 0.0f, 4.0f, 0x40000001);
var_r25 = BoardModelMotionShiftSet(BoardPlayerModelGet(arg0), 3, 0.0f, 4.0f, HU3D_MOTATTR_LOOP);
if (var_r25 == 0) {
playerMot[temp_r21->player_idx] = 3;
}
@ -1909,7 +1909,7 @@ void BoardPlayerIdleSet(s32 arg0)
BoardBowserSuitMotionSetWait();
BoardBowserSuitPlayerModelKill();
}
BoardPlayerMotionShiftSet(arg0, 1, 0.0f, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(arg0, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
static void ExecMotBlend(omObjData *arg0);
@ -1992,7 +1992,7 @@ void BoardPlayerMotBlendSet(s32 arg0, s16 arg1, s16 arg2)
}
else if (var_f21 = 8.0f * temp_f26, abs(sp1C) > 45) {
var_r22 = temp_r26->unk_04h;
BoardPlayerMotionShiftSet(arg0, var_r22, var_f24, var_f21, 0);
BoardPlayerMotionShiftSet(arg0, var_r22, var_f24, var_f21, HU3D_MOTATTR_NONE);
BoardPlayerMotionSpeedSet(arg0, var_f27);
}
OSs16tof32(&arg2, &var_f27);
@ -2387,7 +2387,7 @@ void BoardBowserSuitMotionCreate(void)
void BoardBowserSuitMotionSetWait(void)
{
if (suitCurrMot != 0) {
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[0], 0.0f, 4.0f, 0x40000001);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[0], 0.0f, 4.0f, HU3D_MOTATTR_LOOP);
suitCurrMot = 0;
}
}
@ -2402,13 +2402,13 @@ void BoardBowserSuitMotionSetWalk(void)
void BoardBowserSuitMotionSetWin(void)
{
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[3], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[3], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
suitCurrMot = 3;
}
void BoardBowserSuitMotionSetJump(void)
{
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[2], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[2], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
suitCurrMot = 2;
}
@ -2519,10 +2519,10 @@ static s32 DoSparkSpace(s32 player, s32 pause_cam)
if (GWPlayer[i].space_curr == sp34) {
sp124[sp134++] = i;
sp15C[i] = BoardPlayerMotionCreate(i, sparkMotTbl[GWPlayer[i].character]);
BoardPlayerMotionShiftSet(i, sp15C[i], 0, 8, 0);
BoardPlayerMotionShiftSet(i, sp15C[i], 0, 8, HU3D_MOTATTR_NONE);
HuAudFXPlay(boardSparkSfxTblAlt[GWPlayer[i].character]);
if (GWPlayer[i].bowser_suit) {
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[4], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[4], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
sp128 = i;
}
}
@ -2883,7 +2883,7 @@ static s32 MegaPlayerPassFunc(s32 player, s32 space)
spAC.z /= 60.0f;
BoardPlayerRotYSet(player, 90.0 - (180.0 * (atan2(spAC.z, spAC.x) / M_PI)));
sp98[1] = BoardVecDistXZCalc(&spC4, &spB8);
BoardPlayerMotionShiftSet(player, 4, 0, 8, 0);
BoardPlayerMotionShiftSet(player, 4, 0, 8, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
temp_r24 = 0;
for (temp_f30 = 0; temp_f30 < 60.0f; temp_f30++) {
@ -2906,7 +2906,7 @@ static s32 MegaPlayerPassFunc(s32 player, s32 space)
}
if (spB8.y <= spC4.y) {
spB8.y = spC4.y;
BoardPlayerMotionShiftSet(player, 5, 0, 4, 0);
BoardPlayerMotionShiftSet(player, 5, 0, 4, HU3D_MOTATTR_NONE);
}
BoardPlayerPosSetV(player, &spB8);
HuPrcVSleep();
@ -2987,7 +2987,7 @@ static s32 MegaExecJump(s32 player, s32 space)
BoardPlayerIdleSet(player);
HuPrcSleep(10);
sp90[1] = BoardVecDistXZCalc(&spC4, &spB8);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[3], 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[3], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
BoardModelMotionSpeedSet(suitMdl, 2.0f);
HuPrcSleep(8);
HuAudFXPlay(809);

10
src/game/board/shop.c
View file

@ -273,7 +273,7 @@ static void ExecShop(void) {
HuAudFXPlay(0x330);
HuAudFXPlay(0x32D);
PopupShop();
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[2], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[2], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(4);
BoardPlayerRotSet(shopPlayer, 0.0f, temp_f31, 0.0f);
BoardPlayerMoveBetween(shopPlayer, temp_r28, temp_r25);
@ -366,7 +366,7 @@ static void ExecShop(void) {
if (activeItemTbl[itemCurChoice] != 0xD) {
BoardPlayerItemAdd(shopPlayer, activeItemTbl[itemCurChoice]);
}
BoardPlayerMotionShiftSet(shopPlayer, 0xC, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(shopPlayer, 0xC, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(5);
BoardPlayerMotionEndWait(shopPlayer);
HuPrcSleep(15);
@ -375,7 +375,7 @@ static void ExecShop(void) {
}
BoardAudSeqFadeOut(1, 1000);
BoardModelVisibilitySet(itemMdl, 0);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardStatusShowSet(shopPlayer, 0);
BoardCameraTargetPlayerSet(shopPlayer);
BoardCameraMotionWait();
@ -1148,14 +1148,14 @@ void BoardShopTutorialExec(s32 arg0) {
HuAudFXPlay(0x330);
HuAudFXPlay(0x32D);
PopupShop();
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[2], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[2], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(4);
while (!BoardModelMotionEndCheck(BoardShopHostGet())) {
HuPrcVSleep();
}
BoardModelMotionStart(BoardShopHostGet(), shopMot[0], 0x40000001);
BoardTutorialHookExec(0x1C, 0);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(30);
CloseShop();
for (i = 0; i < 2; i++) {

2
src/game/board/space.c
View file

@ -734,7 +734,7 @@ static s32 ExecPipeSpace(s32 player, s32 space)
if(pos.y <= pos_link.y) {
pos.y = pos_link.y;
if(!mot_disable) {
BoardPlayerMotionShiftSet(player, 3, 0, 4, 0x40000001);
BoardPlayerMotionShiftSet(player, 3, 0, 4, HU3D_MOTATTR_LOOP);
break;
}
} else {

14
src/game/board/star.c
View file

@ -233,7 +233,7 @@ static void ExecStar(void) {
}
if (var_r26 != 0) {
var_f31 /= var_r25;
BoardModelMotionShiftSet(temp_r30, hostMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r30, hostMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardModelMotionSpeedSet(temp_r30, 2.0f);
}
while (!BoardPlayerMotBlendCheck(temp_r31)) {
@ -243,7 +243,7 @@ static void ExecStar(void) {
}
HuPrcVSleep();
}
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardCameraViewSet(3);
BoardCameraMotionWait();
if (GWStarsGet(temp_r31) >= 999) {
@ -337,7 +337,7 @@ block_A:
HuAudFXPlay(0xF);
}
_SetFlag(0x10017);
BoardModelMotionShiftSet(temp_r30, hostMot[0], 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(temp_r30, hostMot[0], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(30);
starDoneF = 1;
BoardAudSeqFadeOut(0, 1000);
@ -348,7 +348,7 @@ block_A:
while (!BoardStatusStopCheck(temp_r31)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardStarShowNext(temp_r31);
BoardMusStartBoard();
BoardModelRotYSet(temp_r30, 0.0f);
@ -358,7 +358,7 @@ block_B:
var_f31 = -BoardModelRotYGet(temp_r30);
if (var_r26 != 0) {
var_f31 /= var_r25;
BoardModelMotionShiftSet(temp_r30, hostMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r30, hostMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardModelMotionSpeedSet(temp_r30, 3.0f);
}
BoardPlayerMotBlendSet(temp_r31, 0, var_r25);
@ -370,7 +370,7 @@ block_B:
HuPrcVSleep();
}
BoardModelRotYSet(temp_r30, 0.0f);
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
if (!_CheckFlag(FLAG_ID_MAKE(1, 22))) {
BoardCameraViewSet(1);
BoardCameraTargetPlayerSet(temp_r31);
@ -622,7 +622,7 @@ void BoardStarGive(s32 arg0, Vec *arg1) {
StarInlineFunc02();
StarInlineFunc01();
BoardPlayerVoiceEnableSet(arg0, 7, 0);
BoardPlayerMotionShiftSet(arg0, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(arg0, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(boardStarSndTbl[GWPlayer[arg0].character]);
BoardPlayerStarsAdd(arg0, 1);
HuAudFXPlay(8);

8
src/game/board/start.c
View file

@ -331,7 +331,7 @@ static void CreatePlayerStart(void) {
var_r29->trans.y = spC.y + 700.0f;
var_r29->trans.z = spC.z + 100.0f;
BoardPlayerPosSet(playerOrderOld[var_r30->unk00_field2], var_r29->trans.x, var_r29->trans.y, var_r29->trans.z);
BoardPlayerMotionShiftSet(playerOrderOld[var_r30->unk00_field2], 4, 10.0f, 1.0f, 0);
BoardPlayerMotionShiftSet(playerOrderOld[var_r30->unk00_field2], 4, 10.0f, 1.0f, HU3D_MOTATTR_NONE);
}
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardMusStart(0, 0xC, 0x7F, 0);
@ -400,7 +400,7 @@ static void PlayerFall(omObjData *arg0, PlayerStartWork *arg1) {
if (arg0->trans.y < spacePos.y) {
arg0->trans.y = spacePos.y;
arg1->unk02 = 0;
BoardPlayerMotionShiftSet(playerOrderOld[arg1->unk00_field2], 5, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(playerOrderOld[arg1->unk00_field2], 5, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
arg1->unk01 = 0xC;
arg1->unk00_field3 = 1;
}
@ -704,7 +704,7 @@ static void ExecStartRoll(void) {
}
BoardStatusShowSet(i, 1);
SetPlayerStartState(playerOrderOld[i], 6);
BoardPlayerMotionShiftSet(i, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(i, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while (!BoardPlayerMotionEndCheck(i)) {
HuPrcVSleep();
@ -734,7 +734,7 @@ static void ExecStartRoll(void) {
HuPrcSleep(var_r23);
}
for (i = 0; i < 4; i++) {
BoardPlayerMotionShiftSet(i, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(i, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
}
HuAudFXPlay(0xF);
while (1) {