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

Applied more Attr defines

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

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

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

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

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

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

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