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

130
src/REL/m407dll/effect.c
View file

@ -1,48 +1,44 @@
#include "game/process.h"
#include "game/object.h"
#include "game/hsfmotion.h"
#include "game/hsfdraw.h"
#include "game/hsfmotion.h"
#include "game/object.h"
#include "game/process.h"
#include "REL/m407dll.h"
typedef struct unkDominationData4 {
/* 0x00 */ u32 unk_00;
/* 0x04 */ u32 unk_04;
/* 0x08 */ s32 unk_08;
/* 0x0C */ s32 unk_0C;
/* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14;
/* 0x18 */ f32 unk_18;
/* 0x1C */ s32 unk_1C;
} unkDominationData4; //size of 0x20
/* 0x00 */ u32 unk_00;
/* 0x04 */ u32 unk_04;
/* 0x08 */ s32 unk_08;
/* 0x0C */ s32 unk_0C;
/* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14;
/* 0x18 */ f32 unk_18;
/* 0x1C */ s32 unk_1C;
} unkDominationData4; // size of 0x20
//function signatures
void fn_1_4858(omObjData* arg0);
void fn_1_485C(omObjData* arg0);
void fn_1_46EC(omObjData* arg0);
void fn_1_465C(omObjData* arg0, s32 arg1);
void fn_1_4808(omObjData* arg0);
// function signatures
void fn_1_4858(omObjData *arg0);
void fn_1_485C(omObjData *arg0);
void fn_1_46EC(omObjData *arg0);
void fn_1_465C(omObjData *arg0, s32 arg1);
void fn_1_4808(omObjData *arg0);
//bss
Process* lbl_1_bss_3970;
omObjData* lbl_1_bss_37E0[100];
// bss
Process *lbl_1_bss_3970;
omObjData *lbl_1_bss_37E0[100];
//data
s32 lbl_1_data_288[] = {
DATA_MAKE_NUM(DATADIR_M407, 0x15),
DATA_MAKE_NUM(DATADIR_M407, 0x16),
DATA_MAKE_NUM(DATADIR_M407, 0x17),
DATA_MAKE_NUM(DATADIR_M407, 0x18),
DATA_MAKE_NUM(DATADIR_M407, 0x19)
};
// data
s32 lbl_1_data_288[] = { DATA_MAKE_NUM(DATADIR_M407, 0x15), DATA_MAKE_NUM(DATADIR_M407, 0x16), DATA_MAKE_NUM(DATADIR_M407, 0x17),
DATA_MAKE_NUM(DATADIR_M407, 0x18), DATA_MAKE_NUM(DATADIR_M407, 0x19) };
ObjFuncs lbl_1_data_29C[] = {
fn_1_4858,
fn_1_485C,
};
void fn_1_41CC(Process* arg0) {
Process* sp8;
void fn_1_41CC(Process *arg0)
{
Process *sp8;
u32 i;
u32 temp_r30;
@ -60,15 +56,15 @@ void fn_1_41CC(Process* arg0) {
for (i = 0; i < 4; i++) {
lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC);
lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 1;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 1;
}
temp_r30 += i;
for (i = 0; i < 30; i++) {
lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC);
lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 2;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 2;
}
temp_r30 += i;
@ -76,19 +72,20 @@ void fn_1_41CC(Process* arg0) {
for (i = 0; i < 4; i++) {
lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC);
lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 3;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 3;
}
temp_r30 += i;
for (i = 0; i < 22; i++) {
lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC);
lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 4;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 4;
}
}
void fn_1_44F4(void) {
void fn_1_44F4(void)
{
u32 i;
for (i = 0; i < ARRAY_COUNT(lbl_1_bss_37E0); i++) {
@ -96,9 +93,10 @@ void fn_1_44F4(void) {
}
}
void fn_1_4544(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4) {
omObjData* temp_r29;
unkDominationData4* temp_r31;
void fn_1_4544(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4)
{
omObjData *temp_r29;
unkDominationData4 *temp_r31;
u32 i;
if ((arg4 < (Center.z - 2000.0f)) || (arg4 > (2000.0f + Center.z))) {
@ -119,24 +117,27 @@ void fn_1_4544(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4) {
}
}
void fn_1_465C(omObjData* arg0, s32 arg1) {
unkDominationData4* temp_r31;
void fn_1_465C(omObjData *arg0, s32 arg1)
{
unkDominationData4 *temp_r31;
temp_r31 = arg0->data;
temp_r31->unk_0C = arg1;
temp_r31->unk_1C = 0;
}
void fn_1_4680(omObjData* arg0) {
unkDominationData4* temp_r31;
void fn_1_4680(omObjData *arg0)
{
unkDominationData4 *temp_r31;
temp_r31 = arg0->data;
lbl_1_data_29C[temp_r31->unk_0C](arg0);
omSetTra(arg0, temp_r31->unk_10, temp_r31->unk_14, temp_r31->unk_18);
}
void fn_1_46EC(omObjData* arg0) {
unkDominationData4* temp_r30;
void fn_1_46EC(omObjData *arg0)
{
unkDominationData4 *temp_r30;
arg0->func = fn_1_4680;
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData4), MEMORY_DEFAULT_NUM);
@ -145,19 +146,20 @@ void fn_1_46EC(omObjData* arg0) {
temp_r30->unk_08 = arg0->work[1];
temp_r30->unk_1C = 0;
arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_288[temp_r30->unk_08]);
Hu3DModelAttrSet(arg0->model[0], 0x4000);
Hu3DModelAttrSet(arg0->model[0], 0x40000002);
Hu3DModelAttrSet(arg0->model[0], 1);
Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
temp_r30->unk_10 = 0.0f;
temp_r30->unk_14 = 0.0f;
temp_r30->unk_18 = 0.0f;
fn_1_465C(arg0, 0);
}
void fn_1_4808(omObjData* arg0) {
unkDominationData4* sp8;
void fn_1_4808(omObjData *arg0)
{
unkDominationData4 *sp8;
sp8 = arg0->data;
Hu3DModelKill(arg0->model[0]);
if (arg0->data) {
@ -165,31 +167,31 @@ void fn_1_4808(omObjData* arg0) {
}
}
void fn_1_4858(omObjData* arg0) {
void fn_1_4858(omObjData *arg0) { }
}
void fn_1_485C(omObjData* arg0) {
unkDominationData4* temp_r30;
void fn_1_485C(omObjData *arg0)
{
unkDominationData4 *temp_r30;
temp_r30 = arg0->data;
if (temp_r30->unk_04 != 0) {
temp_r30->unk_04--;
}
if (temp_r30->unk_1C == 0) {
Hu3DMotionTimeSet(*arg0->model, 0.0f);
Hu3DModelAttrReset(*arg0->model, 1);
Hu3DModelAttrReset(*arg0->model, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(*arg0->model, 0x40000002);
Hu3DModelAttrSet(*arg0->model, 0x40000001);
Hu3DModelAttrSet(*arg0->model, HU3D_MOTATTR_LOOP);
temp_r30->unk_1C++;
} else if (temp_r30->unk_1C == 1) {
}
else if (temp_r30->unk_1C == 1) {
Hu3DModelAttrReset(arg0->model[0], 0x40000001);
temp_r30->unk_1C++;
}
if (Hu3DMotionEndCheck(*arg0->model) != 0) {
Hu3DModelAttrSet(*arg0->model, 1);
Hu3DModelAttrSet(*arg0->model, HU3D_ATTR_DISPOFF);
fn_1_465C(arg0, 0);
}
}

6
src/REL/m407dll/map.c
View file

@ -76,7 +76,7 @@ void fn_1_162C(omObjData *arg0)
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
arg0->model[1] = Hu3DModelCreateFile(lbl_1_data_198[3]);
Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f);
Hu3DModelAttrSet(arg0->model[1], 1);
Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF);
for (i = 0; i < ARRAY_COUNT(GWPlayerCfg); i++) {
arg0->model[i + 2] = Hu3DModelCreateFile(lbl_1_data_198[GWPlayerCfg[i].character + 4]);
Hu3DModelAmbSet(arg0->model[i + 2], 1.0f, 1.0f, 1.0f);
@ -107,11 +107,11 @@ void fn_1_162C(omObjData *arg0)
Hu3DModelPosSet(arg0->model[11], 0.0f, 0.0f, -3900.0f);
Hu3DModelPosSet(arg0->model[12], 0.0f, 0.0f, 0.0f);
Hu3DModelAttrSet(arg0->model[12], 0x40000001);
Hu3DModelAttrSet(arg0->model[12], HU3D_MOTATTR_LOOP);
if (lbl_1_bss_20 > 0) {
Hu3DModelPosSet(arg0->model[1], 0.0f, 0.0f, 200.0f * (f32)lbl_1_bss_20);
Hu3DModelAttrReset(arg0->model[1], 1);
Hu3DModelAttrReset(arg0->model[1], HU3D_ATTR_DISPOFF);
}
}

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

@ -363,7 +363,7 @@ void fn_1_64C(omObjData *arg0)
Hu3DModelShadowSet(arg0->model[1]);
CharModelMotionDataClose(temp_r31->unk_01);
CharModelMotionSet(temp_r31->unk_01, arg0->motion[1]);
Hu3DModelAttrSet(arg0->model[0], 0x40000001);
Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelHookSet(arg0->model[0], lbl_1_data_13C[temp_r31->unk_01], arg0->model[1]);
temp_r31->unk_10 = (600.0f - (400.0f * temp_r29));
temp_r31->unk_14 = 0.0f;

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

@ -229,10 +229,10 @@ void fn_1_2930(omObjData *arg0)
}
if ((temp_r31->unk_08.y < 0.0f) || (temp_r31->unk_08.z < (Center.z - 2000.0f))) {
Hu3DModelAttrSet(arg0->model[0], 1);
Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
}
else {
Hu3DModelAttrReset(arg0->model[0], 1);
Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
}
omSetTra(arg0, temp_r31->unk_08.x, temp_r31->unk_08.y, temp_r31->unk_08.z);
@ -271,7 +271,7 @@ void fn_1_2B7C(omObjData *arg0)
temp_r30->unk_14.z = 0.0f;
if (temp_r30->unk_00 < 80) {
arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_228[1]);
Hu3DModelAttrSet(arg0->model[0], 0x4000);
Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_NOCULL);
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
if (temp_r30->unk_00 == 0) {
arg0->motion[5] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[5]);
@ -292,7 +292,7 @@ void fn_1_2B7C(omObjData *arg0)
lbl_1_bss_68[temp_r30->unk_00][i] = arg0->motion[i];
}
Hu3DMotionSet(arg0->model[0], arg0->motion[5]);
Hu3DModelAttrSet(arg0->model[0], 0x40000001);
Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP);
temp_r30->unk_04 = 1;
}
else {
@ -306,8 +306,8 @@ void fn_1_2B7C(omObjData *arg0)
arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_228[0]);
arg0->model[1] = Hu3DModelCreateFile(lbl_1_data_228[2]);
arg0->model[2] = Hu3DModelCreateFile(lbl_1_data_228[3]);
Hu3DModelAttrSet(arg0->model[0], 0x4000);
Hu3DModelAttrSet(arg0->model[1], 0x4000);
Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_NOCULL);
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f);
arg0->motion[2] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[2]);
@ -318,11 +318,11 @@ void fn_1_2B7C(omObjData *arg0)
Hu3DModelHookSet(arg0->model[0], "itemhook_r", arg0->model[1]);
Hu3DModelShadowSet(arg0->model[0]);
Hu3DModelShadowSet(arg0->model[1]);
Hu3DModelAttrSet(arg0->model[0], 1);
Hu3DModelAttrSet(arg0->model[1], 1);
Hu3DModelAttrSet(arg0->model[2], 1);
Hu3DModelAttrSet(arg0->model[2], 0x40000002);
Hu3DModelAttrSet(arg0->model[2], 0x40000001);
Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_LOOP);
temp_r30->unk_04 = 1;
break;
}
@ -403,7 +403,7 @@ void fn_1_3364(omObjData *arg0)
}
temp_r31->unk_08.y = -300.0f;
Hu3DModelAttrSet(arg0->model[0], 1);
Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
fn_1_290C(arg0, 0);
}
@ -414,11 +414,11 @@ void fn_1_34A4(omObjData *arg0)
temp_r30 = arg0->data;
if (temp_r30->unk_2C == 0) {
if (temp_r30->unk_28 == 1) {
Hu3DModelAttrReset(arg0->model[0], 1);
Hu3DModelAttrReset(arg0->model[1], 1);
Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->model[1], HU3D_ATTR_DISPOFF);
}
else {
Hu3DModelAttrReset(arg0->model[0], 1);
Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
}
Hu3DMotionSet(arg0->model[0], arg0->motion[3]);
Hu3DModelAttrReset(arg0->model[0], 0x40000001);
@ -466,10 +466,10 @@ void fn_1_36D0(omObjData *arg0)
sp8 = arg0->data;
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);
Hu3DModelAttrSet(arg0->model[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(arg0->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->model[2], 0x40000002);
Hu3DModelAttrSet(arg0->model[2], 0x40000001);
Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_LOOP);
fn_1_290C(arg0, 0);
}
@ -481,7 +481,7 @@ void fn_1_37B0(omObjData *arg0)
if (temp_r31->unk_2C == 0) {
temp_r31->unk_14.x = 0.0f;
temp_r31->unk_08.y = 0.0f;
Hu3DModelAttrSet(arg0->model[0], 0x40000002);
Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE);
temp_r31->unk_2C++;
}
temp_r31->unk_14.x -= 4.0f;