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

Found new inlines

Browse source
This commit is contained in:
dbalatoni13 2024-11-10 06:53:40 +01:00
parent afb776544c
commit c59fd4d490
3 changed files with 15 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/REL/m443Dll/main.c
View file

@ -806,7 +806,6 @@ void fn_1_3770(omObjData *arg0)
s32 var_r30; s32 var_r30;
s32 var_r29; s32 var_r29;
M443DllCameraStruct *var_r28; M443DllCameraStruct *var_r28;
omObjData *var_r27;
s32 var_r26; s32 var_r26;
u32 var_r25; u32 var_r25;
s32 var_r24; s32 var_r24;

54
src/REL/m450Dll/main.c
View file

@ -930,7 +930,7 @@ void fn_1_2C1C(WorkPlayerOld *player, omObjData *obj, s32 arg2, s32 arg3, s32 *a
player->unk_10 = NULL; player->unk_10 = NULL;
player->unk_50 = NULL; player->unk_50 = NULL;
player->unk_64 = 0; player->unk_64 = 0;
player->unk_68 = 0; player->unk_68 = NULL;
player->unk_38 = 0; player->unk_38 = 0;
player->unk_3C = 0; player->unk_3C = 0;
player->unk_44 = arg5; player->unk_44 = arg5;
@ -978,7 +978,7 @@ void fn_1_2DC8(WorkPlayerOld *player, s32 count, Vec *data)
void fn_1_2DD4(WorkPlayerOld *player) void fn_1_2DD4(WorkPlayerOld *player)
{ {
omSetTra(player->unk_00, player->unk_6C.x, player->unk_6C.y, player->unk_6C.z); omSetTra(player->unk_00, player->unk_6C.x, player->unk_6C.y, player->unk_6C.z);
omSetRot(player->unk_00, 0, player->unk_9C, 0); omSetRot(player->unk_00, 0.0f, player->unk_9C, 0.0f);
} }
void fn_1_2E34(WorkPlayerOld *player) void fn_1_2E34(WorkPlayerOld *player)
@ -1123,12 +1123,7 @@ void fn_1_3CE0(WorkPlayerOld *player, s32 *state, u32 *motAttr)
} }
if (player->unk_14[3] >= 0 && (player->unk_28 & 0x100)) { if (player->unk_14[3] >= 0 && (player->unk_28 & 0x100)) {
player->unk_38 = 1; fn_1_2BD0(player, 26.766666f, 1.0f);
player->unk_84.y = 26.766666f;
player->unk_A4 = 1;
if (player->unk_3C & 0x2) {
player->unk_3C &= ~0x2;
}
*motAttr = HU3D_MOTATTR_NONE; *motAttr = HU3D_MOTATTR_NONE;
*state = 3; *state = 3;
} }
@ -1181,12 +1176,7 @@ void fn_1_3ECC(WorkPlayerOld *player, s32 *state, u32 *motAttr)
void fn_1_3F84(WorkPlayerOld *player, s32 *state, u32 *motAttr) void fn_1_3F84(WorkPlayerOld *player, s32 *state, u32 *motAttr)
{ {
if (Hu3DMotionShiftIDGet(player->unk_00->model[0]) < 0 && Hu3DMotionEndCheck(player->unk_00->model[0])) { if (Hu3DMotionShiftIDGet(player->unk_00->model[0]) < 0 && Hu3DMotionEndCheck(player->unk_00->model[0])) {
player->unk_38 = 1; fn_1_2BD0(player, 0.0f, 0.0f);
player->unk_84.y = 0;
player->unk_A4 = 0;
if (player->unk_3C & 0x2) {
player->unk_3C &= ~0x2;
}
} }
} }
@ -1352,12 +1342,8 @@ void fn_1_40C0(WorkPlayerOld *player)
player->unk_3C |= 0x800; player->unk_3C |= 0x800;
} }
else { else {
player->unk_38 = 1; fn_1_2BD0(player, 0.0f, 0.0f);
player->unk_84.y = 0.0f;
player->unk_A4 = 0.0f;
if ((player->unk_3C & 2) != 0) {
player->unk_3C &= ~2;
}
motAttr = HU3D_MOTATTR_NONE; motAttr = HU3D_MOTATTR_NONE;
state = 3; state = 3;
} }
@ -6582,12 +6568,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
HuAudCharVoicePlay(var_r31->unk_11C, 0x123); HuAudCharVoicePlay(var_r31->unk_11C, 0x123);
var_r31->unk_FC |= 0x10; var_r31->unk_FC |= 0x10;
var_r31->unk_00.unk_3C |= 0x210; var_r31->unk_00.unk_3C |= 0x210;
var_r31->unk_00.unk_38 = 1; fn_1_2BD0(&var_r31->unk_00, 48.179996f, 0.0f);
var_r31->unk_00.unk_84.y = 48.179996f;
var_r31->unk_00.unk_A4 = 0.0f;
if (var_r31->unk_00.unk_3C & 2) {
var_r31->unk_00.unk_3C &= ~0x2;
}
Hu3DMotionShiftSet(var_r30->model[0], var_r30->motion[8], 0.0f, 8.0f, 0); Hu3DMotionShiftSet(var_r30->model[0], var_r30->motion[8], 0.0f, 8.0f, 0);
if (fn_1_125C0(0, 1) <= 0) { if (fn_1_125C0(0, 1) <= 0) {
var_r31->unk_FC |= 0x80000; var_r31->unk_FC |= 0x80000;
@ -6599,12 +6580,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
HuAudCharVoicePlay(var_r31->unk_11C, 0x123); HuAudCharVoicePlay(var_r31->unk_11C, 0x123);
var_r31->unk_FC |= 0x100; var_r31->unk_FC |= 0x100;
var_r31->unk_00.unk_3C |= 0x210; var_r31->unk_00.unk_3C |= 0x210;
var_r31->unk_00.unk_38 = 1; fn_1_2BD0(&var_r31->unk_00, 0.0f, 0.0f);
var_r31->unk_00.unk_84.y = 0.0f;
var_r31->unk_00.unk_A4 = 0.0f;
if (var_r31->unk_00.unk_3C & 2) {
var_r31->unk_00.unk_3C &= ~0x2;
}
if (fn_1_125C0(0, 1) <= 0) { if (fn_1_125C0(0, 1) <= 0) {
var_r31->unk_FC |= 0x80000; var_r31->unk_FC |= 0x80000;
} }
@ -6715,12 +6691,7 @@ void fn_1_1E150(omObjData *var_r29)
HuAudCharVoicePlay(var_r31->unk_11C, 0x123); HuAudCharVoicePlay(var_r31->unk_11C, 0x123);
var_r31->unk_FC |= 0x800000; var_r31->unk_FC |= 0x800000;
var_r31->unk_118 = 0x7EB; var_r31->unk_118 = 0x7EB;
var_r31->unk_00.unk_38 = 1; fn_1_2BD0(&var_r31->unk_00, 53.533333f, 0.0f);
var_r31->unk_00.unk_84.y = 53.533333f;
var_r31->unk_00.unk_A4 = 0.0f;
if (var_r31->unk_00.unk_3C & 2) {
var_r31->unk_00.unk_3C &= ~0x2;
}
Hu3DMotionSet(var_r29->model[0], var_r29->motion[8]); Hu3DMotionSet(var_r29->model[0], var_r29->motion[8]);
Hu3DModelAttrReset(var_r29->model[0], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(var_r29->model[0], HU3D_ATTR_DISPOFF);
fn_1_125C0(0, 0); fn_1_125C0(0, 0);
@ -7129,12 +7100,7 @@ void fn_1_20170(omObjData *var_r30)
var_r29->unk_00.unk_A8 = MapPos( var_r29->unk_00.unk_A8 = MapPos(
var_r29->unk_00.unk_6C.x, var_r29->unk_00.unk_6C.y, var_r29->unk_00.unk_6C.z, var_r29->unk_00.unk_C0, &var_r29->unk_00.unk_AC); var_r29->unk_00.unk_6C.x, var_r29->unk_00.unk_6C.y, var_r29->unk_00.unk_6C.z, var_r29->unk_00.unk_C0, &var_r29->unk_00.unk_AC);
if (var_r29->unk_00.unk_A8 > var_r29->unk_00.unk_6C.y) { if (var_r29->unk_00.unk_A8 > var_r29->unk_00.unk_6C.y) {
var_r31->unk_00.unk_38 = 1; fn_1_2BD0(&var_r31->unk_00, 53.533333f, 0.0f);
var_r31->unk_00.unk_84.y = 53.533333f;
var_r31->unk_00.unk_A4 = 0.0f;
if (var_r31->unk_00.unk_3C & 2) {
var_r31->unk_00.unk_3C &= ~2;
}
} }
var_f31 = var_r29->unk_00.unk_6C.x; var_f31 = var_r29->unk_00.unk_6C.x;
var_f30 = var_r29->unk_00.unk_6C.z; var_f30 = var_r29->unk_00.unk_6C.z;

20
src/REL/m461Dll/main.c
View file

@ -702,7 +702,7 @@ void fn_1_2DC8(WorkPlayerOld *player, s32 count, Vec *data)
void fn_1_2DD4(WorkPlayerOld *player) void fn_1_2DD4(WorkPlayerOld *player)
{ {
omSetTra(player->unk0, player->unk6C.x, player->unk6C.y, player->unk6C.z); omSetTra(player->unk0, player->unk6C.x, player->unk6C.y, player->unk6C.z);
omSetRot(player->unk0, 0, player->unk9C, 0); omSetRot(player->unk0, 0.0f, player->unk9C, 0.0f);
} }
void fn_1_2E34(WorkPlayerOld *player) void fn_1_2E34(WorkPlayerOld *player)
@ -840,12 +840,7 @@ void fn_1_3C74(WorkPlayerOld *player, s32 *state, u32 *motAttr)
} }
if(player->unk14[3] >= 0 && (player->unk28 & 0x100)) { if(player->unk14[3] >= 0 && (player->unk28 & 0x100)) {
player->unk38 = 1; fn_1_2BD0(player, 26.766666f, 1.0f);
player->unk84.y = 26.766666f;
player->unkA4 = 1;
if(player->unk3C & 0x2) {
player->unk3C &= ~0x2;
}
*motAttr = HU3D_MOTATTR_NONE; *motAttr = HU3D_MOTATTR_NONE;
*state = 3; *state = 3;
} }
@ -868,7 +863,7 @@ void fn_1_3D4C(WorkPlayerOld *player, s32 *state, u32 *motAttr)
player->unk84.y += -2.4333334f; player->unk84.y += -2.4333334f;
if(player->unk14[5] >= 0 && (player->unk28 & 0x140)) { if(player->unk14[5] >= 0 && (player->unk28 & 0x140)) {
player->unk38 = 3; player->unk38 = 3;
player->unk84.y = 0; player->unk84.y = 0.0f;
player->unk3C &= ~0x3; player->unk3C &= ~0x3;
player->unk3C |= 0x4; player->unk3C |= 0x4;
*motAttr = HU3D_MOTATTR_NONE; *motAttr = HU3D_MOTATTR_NONE;
@ -895,12 +890,7 @@ void fn_1_3E60(WorkPlayerOld *player, s32 *state, u32 *motAttr)
void fn_1_3F18(WorkPlayerOld *player, s32 *state, u32 *motAttr) void fn_1_3F18(WorkPlayerOld *player, s32 *state, u32 *motAttr)
{ {
if(Hu3DMotionShiftIDGet(player->unk0->model[0]) < 0 && Hu3DMotionEndCheck(player->unk0->model[0])) { if(Hu3DMotionShiftIDGet(player->unk0->model[0]) < 0 && Hu3DMotionEndCheck(player->unk0->model[0])) {
player->unk38 = 1; fn_1_2BD0(player, 0.0f, 0.0f);
player->unk84.y = 0;
player->unkA4 = 0;
if(player->unk3C & 0x2) {
player->unk3C &= ~0x2;
}
} }
} }
@ -2329,4 +2319,4 @@ void fn_1_D70C(omObjData *obj)
CharModelKill(lbl_1_data_0[GWPlayerCfg[i].character]); CharModelKill(lbl_1_data_0[GWPlayerCfg[i].character]);
} }
omOvlReturnEx(1, 1); omOvlReturnEx(1, 1);
} }