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

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

@ -8,6 +8,7 @@
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/sprite.h"
#include "game/wipe.h"
#include "math.h"
#include "rel_sqrt_consts.h"
@ -630,7 +631,7 @@ void fn_1_2DD8(M443DllUnkStruct *arg0)
arg0->unk_1C[var_r30] = -1;
if (lbl_1_data_108[var_r30].unk_00 != 0) {
arg0->unk_1C[var_r30] = espEntry(lbl_1_data_108[var_r30].unk_00, lbl_1_data_108[var_r30].unk_04, 0);
espAttrSet(arg0->unk_1C[var_r30], 8);
espAttrSet(arg0->unk_1C[var_r30], HUSPR_ATTR_LINEAR);
espDispOff(arg0->unk_1C[var_r30]);
}
}
@ -840,10 +841,10 @@ void fn_1_3770(omObjData *arg0)
break;
}
if (var_r24 != 0) {
Hu3DModelAttrReset(arg0->model[0], 1);
Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
}
else {
Hu3DModelAttrSet(arg0->model[0], 1);
Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
}
for (var_r30 = 0; var_r30 < 4; var_r30++) {
sp30[var_r30] = var_r28[var_r30 + 6].unk_04;

8
src/REL/m443Dll/map.c
View file

@ -29,7 +29,7 @@ void fn_1_4AB4(omObjData *object)
Hu3DModelLayerSet(object->model[0], 2);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M443, 2));
Hu3DModelLayerSet(object->model[2], 2);
Hu3DModelAttrSet(object->model[2], 1);
Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M443, 4));
Hu3DModelLayerSet(object->model[3], 2);
Hu3DMotionSpeedSet(object->model[3], 0.0f);
@ -148,7 +148,7 @@ void fn_1_4D14(omObjData *object)
}
Hu3DMotionSpeedSet(object->model[var_r29 + 9], 0.95f);
if (var_r28 == 0) {
Hu3DModelAttrSet(object->model[var_r29 + 9], 1);
Hu3DModelAttrSet(object->model[var_r29 + 9], HU3D_ATTR_DISPOFF);
}
}
}
@ -172,10 +172,10 @@ void fn_1_4D14(omObjData *object)
Hu3DMotionSpeedSet(object->model[3], 1.0f);
}
else if (fn_1_42E4() == 5) {
Hu3DModelAttrSet(object->model[3], 1);
Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
}
if (fn_1_42E4() == 5) {
Hu3DModelAttrReset(object->model[2], 1);
Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelShadowMapSet(object->model[0]);
Hu3DModelShadowMapSet(object->model[2]);
}

443
src/REL/m443Dll/player.c
View file

@ -75,8 +75,8 @@ typedef struct M443DllWorkStruct {
Vec unkDC;
Vec unkE8;
char unkF4[0xC];
M443DllCameraStruct* unk100;
M443DllCameraStruct* unk104;
M443DllCameraStruct *unk100;
M443DllCameraStruct *unk104;
union {
M443DllUnkStruct unk108s;
struct {
@ -94,88 +94,81 @@ typedef struct M443DllStruct8 {
u32 unk10;
} M443DllStruct8; // copy of UnkM417Struct8
void fn_1_5680(omObjData* object);
void fn_1_5BD4(omObjData* object);
void fn_1_6458(omObjData* object);
void fn_1_6674(omObjData* object);
void fn_1_6750(omObjData* object);
void fn_1_69B4(omObjData* object);
void fn_1_6B90(omObjData* object);
void fn_1_6DA8(omObjData* object);
void fn_1_7130(omObjData* object);
void fn_1_7340(omObjData* object);
void fn_1_8138(omObjData*, u32);
s32 fn_1_82C4(omObjData* object);
void fn_1_8508(omObjData*);
void fn_1_8680(omObjData* object);
void fn_1_5680(omObjData *object);
void fn_1_5BD4(omObjData *object);
void fn_1_6458(omObjData *object);
void fn_1_6674(omObjData *object);
void fn_1_6750(omObjData *object);
void fn_1_69B4(omObjData *object);
void fn_1_6B90(omObjData *object);
void fn_1_6DA8(omObjData *object);
void fn_1_7130(omObjData *object);
void fn_1_7340(omObjData *object);
void fn_1_8138(omObjData *, u32);
s32 fn_1_82C4(omObjData *object);
void fn_1_8508(omObjData *);
void fn_1_8680(omObjData *object);
f32 fn_1_8AC8(u32, f32);
f32 fn_1_8C68(f32);
f32 fn_1_8C8C(s32, f32);
f32 fn_1_8D00(u32, f32);
f32 fn_1_8D74(f32);
void fn_1_8E34(s32);
void fn_1_8FFC(u32, Vec*, f32, f32);
void fn_1_8FFC(u32, Vec *, f32, f32);
void fn_1_95A4(u32);
omObjData* lbl_1_bss_90[4];
omObjData *lbl_1_bss_90[4];
s32 lbl_1_bss_78[6];
char* lbl_1_data_264[0x8] = {
"itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r",
"itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r"
};
char *lbl_1_data_264[0x8] = { "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r" };
u32 lbl_1_data_284[8][2] = {
{0x4A0005, 0x4A0006}, {0x4A0007, 0x4A0008},
{0x4A0009, 0x4A000A}, {0x4A000B, 0x4A000C},
{0x4A000D, 0x4A000E}, {0x4A000F, 0x4A0010},
{0x4A0011, 0x4A0012}, {0x4A0013, 0x4A0014},
};
u32 lbl_1_data_2C4[4] = {
0, 0x4A0020, 0x17, 0x72
{ 0x4A0005, 0x4A0006 },
{ 0x4A0007, 0x4A0008 },
{ 0x4A0009, 0x4A000A },
{ 0x4A000B, 0x4A000C },
{ 0x4A000D, 0x4A000E },
{ 0x4A000F, 0x4A0010 },
{ 0x4A0011, 0x4A0012 },
{ 0x4A0013, 0x4A0014 },
};
u32 lbl_1_data_2C4[4] = { 0, 0x4A0020, 0x17, 0x72 };
M443DllStruct8 lbl_1_data_2D4[4] = {
{ 0x0, 0.2f, 0.0f, -1.0f, 0x40000001 },
{ 0x1, 0.2f, 0.0f, -1.0f, 0x40000001 },
{ 0x2, 0.2f, 0.0f, -1.0f, 0x0 },
{ 0x3, 0.2f, 0.0f, -1.0f, 0x0 }
};
M443DllStruct8 lbl_1_data_2D4[4] = { { 0x0, 0.2f, 0.0f, -1.0f, 0x40000001 }, { 0x1, 0.2f, 0.0f, -1.0f, 0x40000001 }, { 0x2, 0.2f, 0.0f, -1.0f, 0x0 },
{ 0x3, 0.2f, 0.0f, -1.0f, 0x0 } };
s32 lbl_1_data_324[4] = {
0x727, 0x728, 0x729, 0x72A,
0x727,
0x728,
0x729,
0x72A,
};
s32 lbl_1_data_334[4] = {
0x72B, 0x72C, 0x72D, 0x72E,
0x72B,
0x72C,
0x72D,
0x72E,
};
s32 lbl_1_data_344[4] = {
0x72F, 0x730, 0x731, 0x732,
0x72F,
0x730,
0x731,
0x732,
};
s32 lbl_1_data_354[4] = {
0x736, 0x737, 0x738, 0x739,
};
Vec lbl_1_data_364[4] = {
{ 0.0f, 180.0f, 500.0f },
{ -150.0f, 110.0f, 500.0f },
{ 170.0f, 80.0f, 500.0f },
{ 350.0f, 0.0f, 500.0f }
};
Vec lbl_1_data_394[4] = {
{ -225.0f, 0.0f, 1000.0f },
{ -75.0f, 0.0f, 1000.0f },
{ 75.0f, 0.0f, 1000.0f },
{ 225.0f, 0.0f, 1000.0f }
};
Vec lbl_1_data_3C4[4] = {
{ 250.0f, 0.0f, -1000.0f },
{ -350.0f, 0.0f, -1700.0f },
{ 450.0f, 0.0f, -2200.0f },
{ 0.0f, 0.0f, -3000.0f }
0x736,
0x737,
0x738,
0x739,
};
Vec lbl_1_data_364[4] = { { 0.0f, 180.0f, 500.0f }, { -150.0f, 110.0f, 500.0f }, { 170.0f, 80.0f, 500.0f }, { 350.0f, 0.0f, 500.0f } };
Vec lbl_1_data_394[4] = { { -225.0f, 0.0f, 1000.0f }, { -75.0f, 0.0f, 1000.0f }, { 75.0f, 0.0f, 1000.0f }, { 225.0f, 0.0f, 1000.0f } };
Vec lbl_1_data_3C4[4] = { { 250.0f, 0.0f, -1000.0f }, { -350.0f, 0.0f, -1700.0f }, { 450.0f, 0.0f, -2200.0f }, { 0.0f, 0.0f, -3000.0f } };
void fn_1_5444(Process* arg0) {
void fn_1_5444(Process *arg0)
{
u32 sp18[4];
u32 sp8[4];
omObjData* var_r28;
omObjData *var_r28;
u32 var_r29;
s16 var_r30;
s16 var_r31;
@ -184,7 +177,7 @@ void fn_1_5444(Process* arg0) {
sp18[var_r31] = GWPlayerCfg[var_r31].group;
sp8[var_r31] = var_r31;
}
for (var_r31 = 0; var_r31 < 3; var_r31++) {
for (var_r30 = var_r31 + 1; var_r30 < 4; var_r30++) {
if (sp18[var_r31] > sp18[var_r30]) {
@ -197,33 +190,35 @@ void fn_1_5444(Process* arg0) {
}
}
}
for (var_r31 = 0; var_r31 < 4; var_r31++) {
lbl_1_bss_78[sp8[var_r31]] = (s16)var_r31;
}
omMakeGroupEx(arg0, 0, 4);
omGetGroupMemberListEx(arg0, 0);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
var_r28 = lbl_1_bss_90[var_r31] = omAddObjEx(arg0, 0x28, 5, 4, 0, fn_1_5680);
var_r28->work[0] = var_r31;
}
}
void fn_1_565C(void) {
void fn_1_565C(void)
{
CharModelKill(-1);
}
void fn_1_5680(omObjData* object) {
f32 spC[4] = {0.25f, 0.5f, 0.75f, 1.0f};
void fn_1_5680(omObjData *object)
{
f32 spC[4] = { 0.25f, 0.5f, 0.75f, 1.0f };
s32 sp8;
f32 temp_f0;
s32 temp_r27;
s32 temp_r3;
s32 var_r29;
u32 temp_r25;
M443DllWorkStruct* temp_r31;
HsfanimStruct01* var_r28;
M443DllWorkStruct *temp_r31;
HsfanimStruct01 *var_r28;
object->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x134, MEMORY_DEFAULT_NUM);
temp_r31 = object->data;
@ -244,32 +239,33 @@ void fn_1_5680(omObjData* object) {
object->model[2] = Hu3DModelCreateFile(lbl_1_data_284[temp_r27][1]);
Hu3DModelLayerSet(object->model[2], 4);
Hu3DMotionSpeedSet(object->model[2], 0.0f);
Hu3DModelAttrSet(object->model[2], 1);
Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
for (var_r29 = 0; var_r29 < 4; var_r29++) {
if (lbl_1_data_2C4[var_r29] < 0x10000) {
object->motion[var_r29] = CharModelMotionCreate(temp_r27, lbl_1_data_2C4[var_r29]);
} else {
object->motion[var_r29] = Hu3DJointMotion(object->model[0], HuDataSelHeapReadNum(temp_r27 + lbl_1_data_2C4[var_r29], 0x10000000, HEAP_DATA));
}
else {
object->motion[var_r29]
= Hu3DJointMotion(object->model[0], HuDataSelHeapReadNum(temp_r27 + lbl_1_data_2C4[var_r29], 0x10000000, HEAP_DATA));
}
}
CharModelMotionDataClose(temp_r27);
temp_r3 = Hu3DParticleCreate(HuSprAnimReadFile(0x4A001D), 0xC8);
object->model[3] = temp_r3;
Hu3DModelLayerSet(temp_r3, 4);
var_r28 = ((ParticleData*)Hu3DData[temp_r3].unk_120)->unk_48;
var_r28 = ((ParticleData *)Hu3DData[temp_r3].unk_120)->unk_48;
for (var_r29 = 0; var_r29 < 0xC8; var_r29++, var_r28++) {
var_r28->unk2C = 0.0f;
var_r28->unk40.a = 0;
var_r28->unk00 = 0;
}
object->trans.x = temp_r31->unkC4.x = temp_r31->unkDC.x = (100.0f * (4.0f * object->work[0])) - 600.0f;
object->trans.y = temp_r31->unkC4.y = temp_r31->unkDC.y = 0.0f;
object->trans.z = temp_r31->unkC4.z = temp_r31->unkDC.z = 0.0f;
temp_r31->unkD0.x = temp_r31->unkD0.y = temp_r31->unkD0.z = 0.0f;
temp_r31->unkE8.x = temp_r31->unkE8.y = temp_r31->unkE8.z = 0.0f;
temp_r31->unk48 = temp_r31->unk4C = 0.0f;
@ -300,12 +296,13 @@ void fn_1_5680(omObjData* object) {
object->func = fn_1_5BD4;
}
void fn_1_5BD4(omObjData* object) {
void fn_1_5BD4(omObjData *object)
{
Vec sp8;
f32 var_f29;
f32 var_f30;
f32 var_f31;
M443DllWorkStruct* temp_r31;
M443DllWorkStruct *temp_r31;
temp_r31 = object->data;
temp_r31->unk10 = 0;
@ -314,7 +311,8 @@ void fn_1_5BD4(omObjData* object) {
if (temp_r31->unk108 != 0) {
if (temp_r31->unk24 != 0) {
fn_1_6DA8(object);
} else {
}
else {
temp_r31->unk14 = HuPadBtn[GWPlayerCfg[object->work[0]].pad_idx];
temp_r31->unk10 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx];
var_f29 = HuPadTrigR[GWPlayerCfg[object->work[0]].pad_idx];
@ -361,7 +359,7 @@ void fn_1_5BD4(omObjData* object) {
sp8.y = 240.0 + (120.0 * (var_f31 * sin(M_PI * ((450.0f * var_f31) + (90.0f * object->work[0])) / 180.0)));
temp_r31->unk100->unk_44 = sp8.x + (var_f30 * (temp_r31->unk100->unk_78 - sp8.x));
temp_r31->unk100->unk_48 = sp8.y + (var_f30 * (temp_r31->unk100->unk_7C - sp8.y));
temp_r31->unk100->unk_40 = 0.01f + ((temp_r31->unk100->unk_80 - 0.01f) * var_f31);
temp_r31->unk100->unk_40 = 0.01f + ((temp_r31->unk100->unk_80 - 0.01f) * var_f31);
temp_r31->unk100->unk_28.y = 90.0f + ((temp_r31->unk100->unk_70 - 90.0f) * var_f31);
temp_r31->unk100->unk_34 = 500.0f + (-200.0f * var_f30);
if (var_f31 >= 1.0f) {
@ -379,7 +377,7 @@ void fn_1_5BD4(omObjData* object) {
var_f31 = 0.2f;
}
temp_r31->unk100->unk_28.x = fn_1_488C(temp_r31->unk100->unk_28.x, -12.0f, var_f31);
temp_r31->unk100->unk_28.y = fn_1_488C(temp_r31->unk100->unk_28.y, 0.0f, var_f31);
temp_r31->unk100->unk_28.y = fn_1_488C(temp_r31->unk100->unk_28.y, 0.0f, var_f31);
temp_r31->unk100->unk_34 += ((1000.0f - temp_r31->unk100->unk_34) * (0.5f * var_f31));
break;
}
@ -387,7 +385,7 @@ void fn_1_5BD4(omObjData* object) {
PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4);
fn_1_7130(object);
fn_1_69B4(object);
if (fn_1_42CC() == 2) {
temp_r31->unk100->unk_1C = temp_r31->unkDC;
temp_r31->unk100->unk_1C.y += 150.0f;
@ -400,11 +398,12 @@ void fn_1_5BD4(omObjData* object) {
}
}
void fn_1_6458(omObjData* object) {
void fn_1_6458(omObjData *object)
{
f32 var_f31;
s32 var_r29;
M443DllWorkStruct* temp_r31;
void* temp_r4;
M443DllWorkStruct *temp_r31;
void *temp_r4;
temp_r31 = object->data;
var_r29 = 0;
@ -413,7 +412,8 @@ void fn_1_6458(omObjData* object) {
temp_r31->unk18 = 0.0f;
if (temp_r31->unk24 != 0) {
fn_1_6DA8(object);
} else {
}
else {
temp_r31->unk14 = HuPadBtn[GWPlayerCfg[object->work[0]].pad_idx];
temp_r31->unk10 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx];
var_f31 = HuPadTrigR[GWPlayerCfg[object->work[0]].pad_idx];
@ -441,9 +441,10 @@ void fn_1_6458(omObjData* object) {
}
}
void fn_1_6674(omObjData* object) {
M443DllWorkStruct* temp_r31;
void* temp_r4;
void fn_1_6674(omObjData *object)
{
M443DllWorkStruct *temp_r31;
void *temp_r4;
temp_r31 = object->data;
temp_r31->unk10 = 0;
@ -462,8 +463,9 @@ void fn_1_6674(omObjData* object) {
}
}
void fn_1_6750(omObjData* object) {
M443DllWorkStruct* temp_r31;
void fn_1_6750(omObjData *object)
{
M443DllWorkStruct *temp_r31;
temp_r31 = object->data;
PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4);
@ -471,8 +473,8 @@ void fn_1_6750(omObjData* object) {
fn_1_69B4(object);
switch (temp_r31->unk34) {
case 0:
Hu3DModelAttrSet(object->model[2], 1);
Hu3DModelAttrSet(object->model[3], 1);
Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
fn_1_95A4(object->work[0]);
Hu3DModelShadowSet(object->model[0]);
temp_r31->unk8 = -1;
@ -481,8 +483,9 @@ void fn_1_6750(omObjData* object) {
temp_r31->unkC4 = lbl_1_data_364[fn_1_4368(object->work[0])];
temp_r31->unkDC = lbl_1_data_3C4[fn_1_4368(object->work[0])];
temp_r31->unk58 = 30.0f;
} else {
Hu3DModelAttrSet(object->model[1], 1);
}
else {
Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
temp_r31->unkC4 = lbl_1_data_394[object->work[0]];
}
temp_r31->unk34++;
@ -499,7 +502,8 @@ void fn_1_6750(omObjData* object) {
if (fn_1_42FC() == 1) {
if (fn_1_4368(object->work[0]) == 0) {
fn_1_8138(object, 2);
} else {
}
else {
fn_1_8138(object, 3);
}
temp_r31->unk34++;
@ -514,8 +518,9 @@ void fn_1_6750(omObjData* object) {
}
}
void fn_1_69B4(omObjData* object) {
M443DllWorkStruct* temp_r31;
void fn_1_69B4(omObjData *object)
{
M443DllWorkStruct *temp_r31;
temp_r31 = object->data;
temp_r31->unk40++;
@ -533,10 +538,11 @@ void fn_1_69B4(omObjData* object) {
if (temp_r31->unk20 == 0) {
Hu3DModelHookSet(object->model[1], "hook", object->model[0]);
}
temp_r31->unkDC.z = temp_r31->unkC4.z= -(temp_r31->unk78 - temp_r31->unkBC);
temp_r31->unkDC.z = temp_r31->unkC4.z = -(temp_r31->unk78 - temp_r31->unkBC);
fn_1_8138(object, 1);
} else {
}
else {
if (temp_r31->unk20 != 0) {
Hu3DModelHookReset(object->model[1]);
}
@ -550,18 +556,17 @@ void fn_1_69B4(omObjData* object) {
Hu3DModelRotSet(object->model[2], 0.0f, temp_r31->unk58, 0.0f);
}
void fn_1_6B90(omObjData* object) {
M443DllWorkStruct* temp_r29;
M443DllWorkStruct* temp_r27 = object->data;
void fn_1_6B90(omObjData *object)
{
M443DllWorkStruct *temp_r29;
M443DllWorkStruct *temp_r27 = object->data;
s32 sp28[4][4] = {
{ 0, 1, 2, 3 },
{ 0, 1, 2, 3 },
{ 1, 0, 1, 2 },
{ 2, 1, 0, 1 },
{ 3, 2, 1, 0 },
};
f32 sp18[4] = {
0.0f, -700.0f, 600.0f, 1200.0f
};
f32 sp18[4] = { 0.0f, -700.0f, 600.0f, 1200.0f };
s32 sp14;
s32 sp10;
s32 spC;
@ -571,7 +576,7 @@ void fn_1_6B90(omObjData* object) {
u32 var_r30;
var_r28 = sp8[object->work[0]] | 1;
for (var_r30 = 0; var_r30 < 4; var_r30++) {
if (var_r30 != object->work[0]) {
temp_r29 = lbl_1_bss_90[var_r30]->data;
@ -591,9 +596,10 @@ void fn_1_6B90(omObjData* object) {
fn_1_421C(object->model[3], var_r28);
}
void fn_1_6DA8(omObjData* object) {
void fn_1_6DA8(omObjData *object)
{
f32 var_f31;
M443DllWorkStruct* temp_r31;
M443DllWorkStruct *temp_r31;
temp_r31 = object->data;
switch (temp_r31->unk60) {
@ -611,7 +617,7 @@ void fn_1_6DA8(omObjData* object) {
temp_r31->unk18 = 1.0f;
}
if (temp_r31->unkA0 >= 1.0f) {
temp_r31->unk60 = (s32) (temp_r31->unk60 + 1);
temp_r31->unk60 = (s32)(temp_r31->unk60 + 1);
}
break;
case 2:
@ -622,7 +628,8 @@ void fn_1_6DA8(omObjData* object) {
var_f31 = 1.2f - temp_r31->unk5C;
var_f31 *= (0.5f + 0.0005f * frandmod(0x3E8));
temp_r31->unk6C = 8000.0f - 1500.0f * var_f31;
} else {
}
else {
var_f31 = 1.2f - temp_r31->unk5C;
var_f31 *= (0.5f + 0.0005f * frandmod(0x3E8));
temp_r31->unk70 = 0.016666668f + var_f31;
@ -631,15 +638,16 @@ void fn_1_6DA8(omObjData* object) {
temp_r31->unk68 = temp_r31->unk80;
if (temp_r31->unk6C > 0.0f) {
if (temp_r31->unk88 > temp_r31->unk6C) {
temp_r31->unk10 = (s32) (temp_r31->unk10 | 0x100);
temp_r31->unk10 = (s32)(temp_r31->unk10 | 0x100);
temp_r31->unk6C = 0.0f;
break;
}
} else if (temp_r31->unk70 > 0.0f) {
}
else if (temp_r31->unk70 > 0.0f) {
if (temp_r31->unk88 >= 8000.0f) {
temp_r31->unk70 = (temp_r31->unk70 - 0.016666668f);
if (temp_r31->unk70 <= 0.0f) {
temp_r31->unk10 = (s32) (temp_r31->unk10 | 0x100);
temp_r31->unk10 = (s32)(temp_r31->unk10 | 0x100);
temp_r31->unk70 = 0.0f;
}
}
@ -648,20 +656,20 @@ void fn_1_6DA8(omObjData* object) {
}
}
void fn_1_7130(omObjData* object) {
void fn_1_7130(omObjData *object)
{
Vec sp8;
f32 var_f31;
s32 var_r27;
s32 var_r29;
s32 var_r28;
M443DllWorkStruct* temp_r30;
M443DllWorkStruct* temp_r31;
M443DllWorkStruct *temp_r30;
M443DllWorkStruct *temp_r31;
for (var_r27 = 0; var_r27 < 2; var_r27++) {
for (var_r29 = 0; var_r29 < 4; var_r29++) {
temp_r31 = lbl_1_bss_90[var_r29]->data;
for (var_r28 = 0; var_r28 < 4; var_r28++) {
if (var_r29 != var_r28) {
temp_r30 = lbl_1_bss_90[var_r28]->data;
@ -671,7 +679,8 @@ void fn_1_7130(omObjData* object) {
if (var_f31 < (temp_r31->unkC0 + temp_r30->unkC0)) {
if (var_f31 > 0.0f) {
var_f31 = 0.5f * ((temp_r31->unkC0 + temp_r30->unkC0) - var_f31);
} else {
}
else {
var_f31 = 0.5f * (temp_r31->unkC0 + temp_r30->unkC0);
sp8.x = (frandmod(0x3E8) - 0x1F4);
sp8.z = (frandmod(0x3E8) - 0x1F4);
@ -690,13 +699,11 @@ void fn_1_7130(omObjData* object) {
}
}
void fn_1_7340(omObjData* object) {
M443DllWorkStruct* temp_r31 = object->data;
HsfObject* var_r29;
f32 sp28[8] = {
0.0f, 40.0f, 0.0f, 0.0f,
-16.0f, 40.0f, -16.0f, 0.0f
};
void fn_1_7340(omObjData *object)
{
M443DllWorkStruct *temp_r31 = object->data;
HsfObject *var_r29;
f32 sp28[8] = { 0.0f, 40.0f, 0.0f, 0.0f, -16.0f, 40.0f, -16.0f, 0.0f };
f32 var_f31;
f32 var_f29;
u32 temp_r24;
@ -711,16 +718,19 @@ void fn_1_7340(omObjData* object) {
temp_r31->unk80++;
temp_r31->unk84 = 30;
}
} else {
}
else {
if (temp_r31->unk88 >= 8000.0f) {
temp_r31->unk10C = 1;
}
}
} else {
}
else {
temp_r31->unk84--;
}
}
} else if ((temp_r31->unk88 < 1500.0f) && (temp_r31->unk80 != 0)) {
}
else if ((temp_r31->unk88 < 1500.0f) && (temp_r31->unk80 != 0)) {
temp_r31->unk80--;
temp_r31->unk84 = 30;
}
@ -756,7 +766,8 @@ void fn_1_7340(omObjData* object) {
if (temp_r31->unk88 > 9500.0f) {
temp_r31->unk88 = 9000.0f;
temp_r31->unk90 = fn_1_8C8C(temp_r31->unk80, temp_r31->unk88);
} else if (temp_r31->unk88 < 1000.0f) {
}
else if (temp_r31->unk88 < 1000.0f) {
temp_r31->unk88 = 1000.0f;
temp_r31->unk90 = fn_1_8C8C(temp_r31->unk80, temp_r31->unk88);
}
@ -779,7 +790,8 @@ void fn_1_7340(omObjData* object) {
if (temp_r31->unkA0 < 0.0001f) {
temp_r31->unkA0 = 0.0001f;
}
} else {
}
else {
temp_r31->unkA0 = 1.0f;
}
}
@ -851,7 +863,8 @@ void fn_1_7340(omObjData* object) {
}
HuAudFXVolSet(temp_r31->unkA8, var_f31);
}
} else if (fn_1_42E4() <= 2) {
}
else if (fn_1_42E4() <= 2) {
if (temp_r31->unkA8 < 0) {
temp_r31->unkA8 = HuAudFXPlay(lbl_1_data_344[object->work[0]]);
}
@ -863,7 +876,8 @@ void fn_1_7340(omObjData* object) {
}
HuAudFXVolSet(temp_r31->unkA8, var_f31);
}
} else if (temp_r31->unkA8 >= 0) {
}
else if (temp_r31->unkA8 >= 0) {
HuAudFXStop(temp_r31->unkA8);
temp_r31->unkA8 = -1;
}
@ -885,9 +899,10 @@ void fn_1_7340(omObjData* object) {
}
}
void fn_1_8138(omObjData* object, u32 arg1) { // near replica of fn_1_B8A0 of m417Dll
void fn_1_8138(omObjData *object, u32 arg1)
{ // near replica of fn_1_B8A0 of m417Dll
f32 var_f31;
M443DllWorkStruct* temp_r30;
M443DllWorkStruct *temp_r30;
temp_r30 = object->data;
if ((temp_r30->unk8 != arg1) && (arg1 < 4)) {
@ -896,16 +911,18 @@ void fn_1_8138(omObjData* object, u32 arg1) { // near replica of fn_1_B8A0 of m4
var_f31 = 0.0f;
}
temp_r30->unk8 = arg1;
CharModelMotionShiftSet(temp_r30->unk0, object->motion[lbl_1_data_2D4[arg1].unk0], 60.0f * lbl_1_data_2D4[arg1].unk8, var_f31, lbl_1_data_2D4[arg1].unk10);
CharModelMotionShiftSet(
temp_r30->unk0, object->motion[lbl_1_data_2D4[arg1].unk0], 60.0f * lbl_1_data_2D4[arg1].unk8, var_f31, lbl_1_data_2D4[arg1].unk10);
if (lbl_1_data_2D4[arg1].unkC >= 0.0f) {
Hu3DMotionShiftStartEndSet(object->model[0], 60.0f * lbl_1_data_2D4[arg1].unk8, 60.0f * lbl_1_data_2D4[arg1].unkC);
}
}
}
s32 fn_1_82C4(omObjData* object) {
s32 fn_1_82C4(omObjData *object)
{
s32 var_r30;
M443DllWorkStruct* temp_r31;
M443DllWorkStruct *temp_r31;
temp_r31 = object->data;
var_r30 = 0;
@ -915,10 +932,11 @@ s32 fn_1_82C4(omObjData* object) {
return var_r30;
}
s32 fn_1_8338(omObjData* object, u32 arg1) {
s32 fn_1_8338(omObjData *object, u32 arg1)
{
s32 var_r27;
s32 var_r26;
M443DllWorkStruct* temp_r31;
M443DllWorkStruct *temp_r31;
var_r27 = 0;
temp_r31 = object->data;
@ -926,7 +944,7 @@ s32 fn_1_8338(omObjData* object, u32 arg1) {
if ((CharModelMotionEndCheck(temp_r31->unk0) != 0) && (CharModelMotionShiftIDGet(temp_r31->unk0) < 0)) {
var_r26 = 1;
}
if (var_r26 != 0) {
fn_1_8138(object, arg1);
var_r27 = 1;
@ -955,15 +973,16 @@ Vec2f lbl_1_data_468[4] = {
{ 46.0f, 44.0f },
};
void fn_1_8508(omObjData* object) {
void fn_1_8508(omObjData *object)
{
s32 var_r30;
M443DllWorkStruct* temp_r28;
M443DllUnkStruct* temp_r31;
f32* temp_r4;
M443DllWorkStruct *temp_r28;
M443DllUnkStruct *temp_r31;
f32 *temp_r4;
temp_r28 = object->data;
temp_r31 = &temp_r28->unk108s;
for (var_r30 = 0; var_r30 < 11; var_r30++) {
temp_r31->unk14[var_r30] = -1;
if (lbl_1_data_410[var_r30][0] != 0) {
@ -980,42 +999,41 @@ void fn_1_8508(omObjData* object) {
}
f32 lbl_1_data_488[][2] = {
{ 20.0f, 4.0f },
{ 18.0f, 6.0f },
{ 46.0f, 33.0f },
{ 72.0f, 32.0f },
{ 72.0f, 14.0f },
{ 72.0f, -4.0f },
{ 72.0f, -22.0f },
{ -140.0f, 32.0f },
{ -158.0f, 32.0f },
{ -176.0f, 32.0f },
{ -96.0f, 32.0f },
{ 20.0f, 4.0f },
{ 18.0f, 6.0f },
{ 46.0f, 33.0f },
{ 72.0f, 32.0f },
{ 72.0f, 14.0f },
{ 72.0f, -4.0f },
{ 72.0f, -22.0f },
{ -140.0f, 32.0f },
{ -158.0f, 32.0f },
{ -176.0f, 32.0f },
{ -96.0f, 32.0f },
};
void fn_1_8680(omObjData* object) {
void fn_1_8680(omObjData *object)
{
f32 var_f31;
s32 var_r27;
s32 var_r30;
u32 var_r28;
M443DllWorkStruct* temp_r29;
M443DllUnkStruct* temp_r31;
M443DllWorkStruct *temp_r29;
M443DllUnkStruct *temp_r31;
temp_r29 = object->data;
temp_r31 = &temp_r29->unk108s;
temp_r31->unk8++;
for (var_r30 = 0; var_r30 < 11; var_r30++) {
if (temp_r31->unk14[var_r30] >= 0) {
if (temp_r31->unk0 == 0) {
espDispOff(temp_r31->unk14[var_r30]);
} else {
}
else {
espDispOn(temp_r31->unk14[var_r30]);
espPosSet(
temp_r31->unk14[var_r30],
0.9f * (temp_r29->unk104->unk_44 + temp_r31->unkC.x + lbl_1_data_488[var_r30][0]),
temp_r29->unk104->unk_48 + temp_r31->unkC.y + lbl_1_data_488[var_r30][1]
);
espPosSet(temp_r31->unk14[var_r30], 0.9f * (temp_r29->unk104->unk_44 + temp_r31->unkC.x + lbl_1_data_488[var_r30][0]),
temp_r29->unk104->unk_48 + temp_r31->unkC.y + lbl_1_data_488[var_r30][1]);
}
}
}
@ -1024,12 +1042,13 @@ void fn_1_8680(omObjData* object) {
var_f31 = (0.004f * frandmod(0x3E8)) - 2.0f;
}
espZRotSet(temp_r31->unk14[2], (90.0f * (0.0001f * temp_r29->unk88)) + var_f31);
for (var_r30 = 0; var_r30 < 4; var_r30++) {
var_r27 = 0;
if (temp_r29->unk80 == var_r30) {
var_r27 = 2;
} else if (((temp_r29->unk80 + 1) == var_r30) && (temp_r31->unk4 != 0)) {
}
else if (((temp_r29->unk80 + 1) == var_r30) && (temp_r31->unk4 != 0)) {
var_r27 += (temp_r31->unk8 >> 1) & 1;
}
espBankSet(temp_r31->unk14[var_r30 + 3], var_r27);
@ -1045,19 +1064,18 @@ void fn_1_8680(omObjData* object) {
espBankSet(temp_r31->unk14[9], var_r30);
}
f32 lbl_1_data_4E0[4] = {
18.5f, 9.25f, 6.66f, 5.55f
};
f32 lbl_1_data_4E0[4] = { 18.5f, 9.25f, 6.66f, 5.55f };
f32 fn_1_8958(u32 arg0) {
f32 fn_1_8958(u32 arg0)
{
if (arg0 >= 4) {
if (arg0 >= 4) {
}
if (arg0 >= 4) { }
}
return lbl_1_data_4E0[arg0];
}
f32 fn_1_8990(f32 arg8) {
f32 fn_1_8990(f32 arg8)
{
f32 var_f30;
f32 var_f31;
@ -1076,41 +1094,49 @@ f32 fn_1_8990(f32 arg8) {
return 55.0f * var_f30;
}
f32 fn_1_8AC8(u32 arg0, f32 arg1) {
f32 fn_1_8AC8(u32 arg0, f32 arg1)
{
return 1.7647059f * (fn_1_8990(arg1) * fn_1_8958(arg0));
}
f32 fn_1_8C68(f32 arg0) {
f32 fn_1_8C68(f32 arg0)
{
return 9.8f * (0.0012820513f * arg0);
}
f32 fn_1_8C8C(s32 arg0, f32 arg1) {
f32 fn_1_8C8C(s32 arg0, f32 arg1)
{
return 3.204422f * ((0.016666668f * arg1) / fn_1_8958(arg0));
}
f32 fn_1_8D00(u32 arg0, f32 arg1) {
f32 fn_1_8D00(u32 arg0, f32 arg1)
{
return 0.31206876f * (60.0f * arg1) * fn_1_8958(arg0);
}
f32 fn_1_8D74(f32 arg0) {
f32 fn_1_8D74(f32 arg0)
{
return 0.024899999f * (arg0 * arg0);
}
f32 fn_1_8D8C(u32 arg0, f32 arg8) {
f32 fn_1_8D8C(u32 arg0, f32 arg8)
{
return arg8 / fn_1_8958(arg0);
}
f32 fn_1_8DE0(u32 arg0, f32 arg8) {
f32 fn_1_8DE0(u32 arg0, f32 arg8)
{
return arg8 * fn_1_8958(arg0);
}
void fn_1_8E34(s32 arg0) {
void fn_1_8E34(s32 arg0)
{
s32 var_r29;
ParticleData* temp_r30;
HsfanimStruct01* var_r31;
ParticleData *temp_r30;
HsfanimStruct01 *var_r31;
temp_r30 = Hu3DData[arg0].unk_120;
var_r31 = temp_r30->unk_48;
for (var_r29 = 0; var_r29 < temp_r30->unk_30; var_r29++, var_r31++) {
if (var_r31->unk00_s16 != 0) {
PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34);
@ -1130,31 +1156,36 @@ void fn_1_8E34(s32 arg0) {
DCStoreRange(temp_r30->unk_48, temp_r30->unk_30 * 0x44);
}
static inline f32 isEven(u32 arg) {
static inline f32 isEven(u32 arg)
{
if ((arg & 1) != 0) {
return 1.0f;
} else {
}
else {
return -1.0f;
}
}
void fn_1_8FFC(u32 arg0, Point3d* arg1, f32 arg2, f32 arg3) {
void fn_1_8FFC(u32 arg0, Point3d *arg1, f32 arg2, f32 arg3)
{
f32 temp_f31;
f32 var_f29;
ParticleData* temp_r29;
ParticleData *temp_r29;
s32 var_r28;
u32 var_r27;
HsfanimStruct01* var_r31;
HsfanimStruct01 *var_r31;
temp_r29 = Hu3DData[lbl_1_bss_90[arg0]->model[3]].unk_120;
if (frandmod(0x3E8) > 1000.0f * arg2) return;
if (frandmod(0x3E8) > 1000.0f * arg2)
return;
var_r27 = 2;
var_r31 = temp_r29->unk_48;
for (var_r28 = 0; var_r28 < temp_r29->unk_30; var_r28++, var_r31++) {
if (var_r31->unk00_s16 != 0) continue;
if (var_r31->unk00_s16 != 0)
continue;
var_r31->unk00_s16 = (60.0f * (0.6f + (0.0005f * frandmod(0x3E8))));
var_f29 = isEven(var_r27);
temp_f31 = 0.030000001f * frandmod(0x3E8);
@ -1173,18 +1204,20 @@ void fn_1_8FFC(u32 arg0, Point3d* arg1, f32 arg2, f32 arg3) {
var_r31->unk40.r = (50.0f + (145.0f * temp_f31));
var_r31->unk40.g = (55.0f + (140.0f * temp_f31));
var_r31->unk40.b = (70.0f + (125.0f * temp_f31));
if (--var_r27 < 1) break;
if (--var_r27 < 1)
break;
}
}
void fn_1_95A4(u32 arg0) {
void fn_1_95A4(u32 arg0)
{
s32 var_r29;
ParticleData* temp_r30;
HsfanimStruct01* var_r31;
ParticleData *temp_r30;
HsfanimStruct01 *var_r31;
temp_r30 = Hu3DData[lbl_1_bss_90[arg0]->model[3]].unk_120;
var_r31 = temp_r30->unk_48;
for (var_r29 = 0; var_r29 < temp_r30->unk_30; var_r29++, var_r31++) {
var_r31->unk00 = 0;
var_r31->unk2C = 0.0f;