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

Applied some Attr defines

Browse source
This commit is contained in:
dbalatoni13 2024-11-03 23:53:45 +01:00
parent 348cdffb0e
commit c9f46f9418
99 changed files with 15333 additions and 15096 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,7 @@ typedef struct {
/* 0x008 */ OptionWindow *window[10];
/* 0x030 */ s32 execMode;
/* 0x034 */ s16 sprList[153];
/* 0x166 */ s16 unk166[3];
/* 0x166 */ s16 unk166[3];
/* 0x16C */ s32 recordType;
/* 0x170 */ s32 board;
/* 0x174 */ s32 mgPage;
@ -199,7 +199,7 @@ static void ExecRecord(omObjData *object)
OptionWinAnimIn(work->window[1]);
OptionWinMesSet(work->window[1], MAKE_MESSID(47, 169));
if (!work->cameraDoneF) {
Hu3DModelAttrReset(work->hand->model[0], 1);
Hu3DModelAttrReset(work->hand->model[0], HU3D_ATTR_DISPOFF);
work->cameraDoneF = TRUE;
}
pos.x = 505.0 * -sin(305 * M_PI / 180.0);
@ -287,7 +287,7 @@ static void ExecRecord(omObjData *object)
}
OptionWinAnimOut(work->window[0]);
OptionWinAnimOut(work->window[1]);
Hu3DModelAttrSet(work->hand->model[0], 1);
Hu3DModelAttrSet(work->hand->model[0], HU3D_ATTR_DISPOFF);
object->unk10 = 6;
/* fallthrough */
case 6:
@ -312,7 +312,7 @@ static omObjData *CreateSystem(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 1));
Hu3DModelAttrSet(object->model[0], 0x40000002);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[0], 0);
Hu3DMotionStartEndSet(object->model[0], 0.0f, 6.0f);
Hu3DMotionTimeSet(object->model[0], 6.0f);
@ -352,10 +352,10 @@ static omObjData *CreateHand(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 14));
Hu3DModelLayerSet(object->model[0], 2);
Hu3DModelAttrSet(object->model[0], 0x40000001);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
omSetRot(object, 30.0f, 190.0f, 0.0f);
omSetSca(object, 0.6f, 0.6f, 0.6f);
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
return object;
}
@ -646,23 +646,8 @@ static void ShowBoard(omObjData *object, s32 board)
#define BOARD_SPR_HIDE_COUNT 53
static const s32 boardSprHideTbl[BOARD_SPR_HIDE_COUNT] =
{
0, 1, 2, 3, 4, 5,
49, 50, 51, 52, 53, 54, 55, 56,
8, 9, 10,
11, 12, 13, 14,
23, 24, 25,
26, 27, 28,
29, 30, 31,
32, 33, 34,
38, 39, 40,
35, 36, 37,
41, 42, 43,
44, 45, 46,
15, 16, 17, 18,
19, 20, 21, 22
};
static const s32 boardSprHideTbl[BOARD_SPR_HIDE_COUNT] = { 0, 1, 2, 3, 4, 5, 49, 50, 51, 52, 53, 54, 55, 56, 8, 9, 10, 11, 12, 13, 14, 23, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 38, 39, 40, 35, 36, 37, 41, 42, 43, 44, 45, 46, 15, 16, 17, 18, 19, 20, 21, 22 };
static void HideBoard(omObjData *object)
{
@ -709,19 +694,8 @@ static void ShowTotal(omObjData *object)
#define TOTAL_SPR_HIDE_COUNT 33
static const s32 totalSprHideTbl[TOTAL_SPR_HIDE_COUNT] =
{
6,
57, 58, 59, 60, 61, 62, 63, 64,
65, 66, 67,
68, 69, 70,
71, 72, 73,
74, 75, 76,
77, 78, 79,
80, 81, 82,
83, 84, 85,
86, 87, 88
};
static const s32 totalSprHideTbl[TOTAL_SPR_HIDE_COUNT]
= { 6, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88 };
static void HideTotal(omObjData *object)
{
@ -844,18 +818,9 @@ static void ShowMG(omObjData *object, s32 page)
#define MG_SPR_HIDE_COUNT 65
static const s32 mgSprHideTbl[65] =
{
7,
89, 90, 91, 92, 93, 94, 95, 96,
97, 98, 99, 100, 101, 102, 103, 104,
105, 106, 107, 108, 109, 110, 111, 112,
113, 114, 115, 116, 117, 118, 119, 120,
121, 122, 123, 124, 125, 126, 127, 128,
129, 130, 131, 132, 133, 134, 135, 136,
137, 138, 139, 140, 141, 142, 143, 144,
145, 146, 147, 148, 149, 150, 151, 152
};
static const s32 mgSprHideTbl[65] = { 7, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152 };
static void HideMG(omObjData *object)
{

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

@ -112,7 +112,7 @@ static void ExecRumble(omObjData *object)
break;
}
if (!work->cameraDoneF) {
Hu3DModelAttrReset(work->hand->model[0], 1);
Hu3DModelAttrReset(work->hand->model[0], HU3D_ATTR_DISPOFF);
work->cameraDoneF = TRUE;
Hu3DModelHookSet(work->system->model[0], "target", work->hand->model[0]);
}
@ -156,10 +156,10 @@ static void ExecRumble(omObjData *object)
if (work->rumbleF) {
HuPadRumbleSet(0, 60, 10, 5);
Hu3DMotionTimeSet(work->hiliteOn->model[0], 0.0f);
Hu3DModelAttrReset(work->hiliteOn->model[0], 1);
Hu3DModelAttrReset(work->hiliteOn->model[0], HU3D_ATTR_DISPOFF);
}
else {
Hu3DModelAttrSet(work->hiliteOn->model[0], 1);
Hu3DModelAttrSet(work->hiliteOn->model[0], HU3D_ATTR_DISPOFF);
}
object->unk10 = 1;
}
@ -167,7 +167,7 @@ static void ExecRumble(omObjData *object)
case 4:
OptionWinAnimOut(work->window[1]);
OptionWinAnimOut(work->window[0]);
Hu3DModelAttrSet(work->hand->model[0], 1);
Hu3DModelAttrSet(work->hand->model[0], HU3D_ATTR_DISPOFF);
OptionRumbleMotionHideStart(object);
object->unk10 = 5;
/* fallthrough */
@ -193,7 +193,7 @@ static omObjData *CreateHand(void)
hand->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 15));
Hu3DModelLayerSet(hand->model[0], 3);
omSetRot(hand, 0.0f, 180.0f, 0.0f);
Hu3DModelAttrSet(hand->model[0], 1);
Hu3DModelAttrSet(hand->model[0], HU3D_ATTR_DISPOFF);
return hand;
}
@ -212,7 +212,7 @@ static omObjData *CreateSystem(void)
system = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
system->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 2));
Hu3DModelAttrSet(system->model[0], 0x40000002);
Hu3DModelAttrSet(system->model[0], HU3D_MOTATTR_PAUSE);
if (GWRumbleGet()) {
Hu3DMotionTimeSet(system->model[0], 60.0f);
}
@ -263,7 +263,7 @@ static omObjData *CreatePad(void)
pad = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
pad->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 9));
Hu3DModelAttrSet(pad->model[0], 0x40000001);
Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_LOOP);
return pad;
}
@ -280,10 +280,10 @@ static void ShakePad(omObjData *pad, BOOL on)
{
if (on) {
Hu3DModelAttrReset(pad->model[0], 0x40000002);
Hu3DModelAttrSet(pad->model[0], 0x40000001);
Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_LOOP);
}
else {
Hu3DModelAttrSet(pad->model[0], 0x40000002);
Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(pad->model[0], 0x40000001);
}
}
@ -294,7 +294,7 @@ static omObjData *CreatePadFilter(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 10));
Hu3DModelAttrSet(object->model[0], 0x40000002);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[0], 2);
return object;
@ -349,10 +349,10 @@ static omObjData *CreateHiliteOn(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 11));
if (GWRumbleGet()) {
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
}
else {
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
}
return object;
}

9
src/REL/option/scene.c
View file

@ -52,7 +52,8 @@ void OptionFadeSprite(s16 sprite, BOOL inF, s32 duration)
if (inF) {
work->speed = work->speed;
work->tplvl = 0.0f;
} else {
}
else {
work->speed = -work->speed;
work->tplvl = 1.0f;
}
@ -103,7 +104,7 @@ void OptionFadeModel(s16 model, BOOL inF, s32 duration)
work->speed = -work->speed;
work->tplvl = 1.0f;
}
Hu3DModelAttrReset(work->id, 1);
Hu3DModelAttrReset(work->id, HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(work->id, work->tplvl);
process = HuPrcChildCreate(FadeModel, 0x3000, 0x1500, 0, HuPrcCurrentGet());
process->user_data = work;
@ -128,7 +129,7 @@ static void FadeModel(void)
}
Hu3DModelTPLvlSet(work->id, work->tplvl);
if (work->tplvl <= 0.0f) {
Hu3DModelAttrSet(work->id, 1);
Hu3DModelAttrSet(work->id, HU3D_ATTR_DISPOFF);
}
HuMemDirectFree(work);
HuPrcEnd();
@ -199,7 +200,7 @@ static void KillScene(void)
HuPrcVSleep();
sprite = espEntry(0x860020, 0x1388, 0);
espPosSet(sprite, 288.0f, 240.0f);
espAttrReset(sprite, 4);
espAttrReset(sprite, HUSPR_ATTR_DISPOFF);
Hu3DBGColorSet(0, 0, 0);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10);
while (WipeStatGet() != 0) {

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

@ -624,7 +624,7 @@ static void ExecOptionSel(omObjData *object)
OptionWinAnimIn(work->window[0]);
OptionWinMesSet(work->window[0], choiceMess[work->cursorPos]);
if (!work->cameraDoneF) {
Hu3DModelAttrReset(work->object[7]->model[0], 1);
Hu3DModelAttrReset(work->object[7]->model[0], HU3D_ATTR_DISPOFF);
work->cameraDoneF = TRUE;
}
omSetTra(work->object[7], -34.0f + 40.0f * work->cursorPos, 120.0f, -500.0f);
@ -661,7 +661,7 @@ static void ExecOptionSel(omObjData *object)
if (!work->optionSelected) {
OptionRumbleMotionHideStart(optionRumble);
}
Hu3DModelAttrSet(work->object[7]->model[0], 1);
Hu3DModelAttrSet(work->object[7]->model[0], HU3D_ATTR_DISPOFF);
object->unk10 = 4;
/* fallthrough */
case 4:
@ -715,7 +715,7 @@ static void ExecOutputMode(omObjData *object)
OptionWinAnimIn(work->window[0]);
OptionWinMesSet(work->window[0], soundModeNameTbl[work->soundMode]);
if (!work->cameraDoneF) {
Hu3DModelAttrReset(work->object[8]->model[0], 1);
Hu3DModelAttrReset(work->object[8]->model[0], HU3D_ATTR_DISPOFF);
work->cameraDoneF = TRUE;
}
pos.x = -38.0f;
@ -768,7 +768,7 @@ static void ExecOutputMode(omObjData *object)
KillNoteSpawner(object);
OptionWinAnimOut(work->window[1]);
OptionWinAnimOut(work->window[0]);
Hu3DModelAttrSet(work->object[8]->model[0], 1);
Hu3DModelAttrSet(work->object[8]->model[0], HU3D_ATTR_DISPOFF);
object->unk10 = 5;
/* fallthrough */
case 5:
@ -1204,10 +1204,10 @@ static omObjData *CreateHand(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 13));
Hu3DModelLayerSet(object->model[0], 2);
Hu3DModelAttrSet(object->model[0], 0x40000001);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
omSetRot(object, -80.0f, 45.0f, 0.0f);
omSetSca(object, 0.6f, 0.6f, 0.6f);
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
return object;
}
@ -1227,10 +1227,10 @@ static omObjData *CreateOutputModeHand(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 14));
Hu3DModelLayerSet(object->model[0], 2);
Hu3DModelAttrSet(object->model[0], 0x40000001);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
omSetRot(object, 0.0f, -90.0f, 0.0f);
omSetSca(object, 0.6f, 0.6f, 0.6f);
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
return object;
}
@ -1249,7 +1249,7 @@ static omObjData *CreateSystem(void)
system = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
system->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 3));
Hu3DModelAttrSet(system->model[0], 0x40000001);
Hu3DModelAttrSet(system->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(system->model[0], 0);
return system;
}
@ -1276,7 +1276,7 @@ static omObjData *CreateLightObj(s32 id, BOOL off)
else {
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 4));
}
Hu3DModelAttrSet(object->model[0], 0x40000001);
Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[0], 0);
omSetTra(object, lightPosTbl[id].x, lightPosTbl[id].y, lightPosTbl[id].z);
return object;
@ -1293,12 +1293,12 @@ static void KillLightObj(omObjData *object)
static void LightDispOff(omObjData *indicator)
{
Hu3DModelAttrReset(indicator->model[0], 1);
Hu3DModelAttrReset(indicator->model[0], HU3D_ATTR_DISPOFF);
}
static void LightDispOn(omObjData *indicator)
{
Hu3DModelAttrSet(indicator->model[0], 1);
Hu3DModelAttrSet(indicator->model[0], HU3D_ATTR_DISPOFF);
}
static s32 spriteDataTbl[] = {
@ -1392,7 +1392,7 @@ static void OptionSelDisp(omObjData *object)
static void OptionSelHide(omObjData *object)
{
static const s32 sprHideTbl[] = { 12, 0, 1, 2, 3, 4, 5 };
static const s32 sprHideTbl[] = { 12, 0, 1, 2, 3, 4, 5 };
SoundWork *work = object->data;
s32 i;
@ -1443,11 +1443,9 @@ static void OutputModeDisp(omObjData *object)
}
}
static void OutputModeHide(omObjData *object)
{
static const s32 sprHideTbl[] = { 13, 6, 7, 8, 9 };
static const s32 sprHideTbl[] = { 13, 6, 7, 8, 9 };
SoundWork *work = object->data;
s32 i;
@ -1474,10 +1472,9 @@ static void MusicPageDisp(omObjData *object, s32 page)
}
}
static void MusicPageHide(omObjData *object)
{
static const s32 sprHideTbl[] = { 10 };
static const s32 sprHideTbl[] = { 10 };
SoundWork *work = object->data;
s32 i;
@ -1508,11 +1505,9 @@ static void VoicePageDisp(omObjData *object, s32 character)
}
}
static void VoicePageHide(omObjData *object)
{
static const s32 sprHideTbl[] = { 11, 0 };
static const s32 sprHideTbl[] = { 11, 0 };
SoundWork *work = object->data;
s32 i;
@ -1538,7 +1533,7 @@ static omObjData *CreateNoteObj(s32 type)
noteWork->enabled = FALSE;
noteWork->type = type;
note->model[0] = Hu3DModelCreateFile(noteMdlTbl[type]);
Hu3DModelAttrSet(note->model[0], 0x40000001);
Hu3DModelAttrSet(note->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(note->model[0], 2);
Hu3DModelAttrReset(note->model[0], 2);
return note;
@ -1568,7 +1563,7 @@ static void HandleNote(omObjData *note)
float y;
float tplvl;
Hu3DModelAttrReset(note->model[0], 1);
Hu3DModelAttrReset(note->model[0], HU3D_ATTR_DISPOFF);
time = sind(45.0f * noteWork->pos);
time = time * time;
switch (noteWork->side) {
@ -1595,7 +1590,7 @@ static void HandleNote(omObjData *note)
return;
}
noteWork->enabled = FALSE;
Hu3DModelAttrSet(note->model[0], 1);
Hu3DModelAttrSet(note->model[0], HU3D_ATTR_DISPOFF);
note->func = NULL;
note->unk10 = 0;
}