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

Applied DATA_MAKE_NUM and MAKE_MESSID macros

Browse source
This commit is contained in:
kabiskac 2024-08-09 01:37:36 +02:00
parent c1c506360c
commit a0ebc7588d
116 changed files with 38174 additions and 37156 deletions
Download patch file Download diff file Expand all files Collapse all files

90
src/REL/m417Dll/player.c
View file

@ -243,9 +243,9 @@ void fn_1_7C8C(omObjData *object)
if (lbl_1_data_90[var_r29][var_r27 + 1]) {
if (lbl_1_data_90[var_r29][0] < 65536) {
object->motion[var_r29] = CharModelMotionCreate(var_r28, lbl_1_data_90[var_r29][0]);
} else {
object->motion[var_r29]
= Hu3DJointMotion(object->model[0], HuDataSelHeapReadNum(var_r28 + lbl_1_data_90[var_r29][0], MEMORY_DEFAULT_NUM, HEAP_DATA));
}
else {
object->motion[var_r29] = Hu3DJointMotionFile(object->model[0], var_r28 + lbl_1_data_90[var_r29][0]);
}
}
}
@ -271,7 +271,8 @@ void fn_1_7C8C(omObjData *object)
if (var_r31->unk_0C) {
Vec sp18 = { 0.0f, 1.0f, 0.0f };
PSMTXRotAxisRad(var_r31->unk_1C4, &sp18, 0.017453292f * var_r31->unk_64);
} else {
}
else {
Vec spC = { 0.0f, 1.0f, 0.0f };
PSMTXIdentity(var_r31->unk_1C4);
C_QUATRotAxisRad(&var_r31->unk_184, &spC, 0.0f);
@ -322,7 +323,8 @@ void fn_1_82FC(omObjData *object)
if (fn_1_26F8() == 2) {
if (var_r31->unk_44) {
fn_1_ADC4(object);
} else {
}
else {
var_r31->unk_14 = HuPadBtn[GWPlayerCfg[object->work[0]].pad_idx];
var_r31->unk_10 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx];
var_f31 = HuPadStkX[GWPlayerCfg[object->work[0]].pad_idx];
@ -336,7 +338,8 @@ void fn_1_82FC(omObjData *object)
}
if ((s32)var_r31->unk_50 != 0) {
(void)var_r29;
} else {
}
else {
var_r29 = 1;
}
fn_1_9FF0(object);
@ -348,7 +351,8 @@ void fn_1_82FC(omObjData *object)
var_r31->unk_50 = 0;
object->func = fn_1_8B0C;
}
} else if (var_r31->unk_3C) {
}
else if (var_r31->unk_3C) {
var_r31->unk_40 = 1;
fn_1_2728(2);
var_r31->unk_50 = 0;
@ -377,7 +381,8 @@ void fn_1_86E8(omObjData *object)
if (var_r31->unk_44 != 0) {
var_r31->unk_1C = 0;
fn_1_B2C0(object);
} else {
}
else {
var_r31->unk_14 = HuPadBtn[GWPlayerCfg[object->work[0]].pad_idx];
var_r31->unk_10 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx];
var_f31 = HuPadStkX[GWPlayerCfg[object->work[0]].pad_idx];
@ -398,7 +403,8 @@ void fn_1_86E8(omObjData *object)
fn_1_9298(object);
if ((s32)var_r31->unk_50 != 0) {
(void)var_r29;
} else if (var_r31->unk_2C) {
}
else if (var_r31->unk_2C) {
var_r29 = 1;
}
fn_1_91E0(object);
@ -435,7 +441,8 @@ void fn_1_8B0C(omObjData *object)
if (var_r31->unk_24 > 1.0f) {
var_r31->unk_24 = 1.0f;
}
} else {
}
else {
var_r31->unk_20 = 0.0f;
var_r31->unk_24 = 0.01f;
fn_1_2770(object->work[0]);
@ -447,7 +454,8 @@ void fn_1_8B0C(omObjData *object)
var_r31->unk_28 = 0;
if (fn_1_2740(object->work[0]) >= 0) {
fn_1_B8A0(object, 1);
} else {
}
else {
fn_1_B8A0(object, 2);
}
var_r31->unk_50++;
@ -481,7 +489,8 @@ void fn_1_8D30(omObjData *object)
if (fn_1_2740(object->work[0]) >= 0) {
var_r31->unk_68 = 0.0f;
fn_1_B8A0(object, 1);
} else {
}
else {
fn_1_B8A0(object, 2);
}
var_r31->unk_50++;
@ -518,7 +527,8 @@ void fn_1_8E44(omObjData *object)
sp8.y = 0.0f;
if (PSVECMag(&sp8) > 0.0f) {
PSVECNormalize(&sp8, &sp8);
} else {
}
else {
sp8.x = 1.0f;
sp8.z = 0.0f;
}
@ -539,7 +549,8 @@ void fn_1_8E44(omObjData *object)
sp8.y = 0.0f;
if (PSVECMag(&sp8) > 0.0f) {
PSVECNormalize(&sp8, &sp8);
} else {
}
else {
sp8.x = 0.0f;
sp8.z = 1.0f;
}
@ -619,7 +630,8 @@ void fn_1_9298(omObjData *object)
var_r31->unk_B4.x += var_r31->unk_B4.y;
if (var_r31->unk_B4.x >= 360.0f) {
var_r31->unk_B4.x -= 360.0f;
} else if (var_r31->unk_B4.x < 0.0f) {
}
else if (var_r31->unk_B4.x < 0.0f) {
var_r31->unk_B4.x += 360.0f;
}
PSMTXRotAxisRad(var_r31->unk_1C4, &sp8, 0.017453292f * var_r31->unk_B4.x);
@ -661,7 +673,8 @@ void fn_1_9298(omObjData *object)
case 2:
if (var_r31->unk_E0.y >= 0.0f) {
var_r31->unk_AC += (1.0f / 60.0f);
} else {
}
else {
var_r31->unk_AC -= (1.0f / 60.0f);
}
var_r31->unk_34 = 0;
@ -681,7 +694,8 @@ void fn_1_9298(omObjData *object)
var_r31->unk_E0.y = 0.0f;
fn_1_B8A0(object, 9);
var_r31->unk_A0++;
} else {
}
else {
var_r31->unk_E0.y += (0.016666668f * (0.016666668f * var_r31->unk_11C.w));
var_r31->unk_D4.y += var_r31->unk_E0.y;
if (var_r31->unk_D4.y <= var_r31->unk_F8.y) {
@ -762,7 +776,8 @@ void fn_1_9A1C(omObjData *object)
}
if (var_f31 == 0.0f) {
var_f30 = 11.5f;
} else {
}
else {
var_f30 = 23.0 - fabs(var_f31);
var_f30 = (0.5f * var_f30) * (var_f31 / fabs(var_f31));
}
@ -803,13 +818,15 @@ void fn_1_9C14(omObjData *object)
if (var_r31->unk_24 > var_f30) {
fn_1_B8A0(object, 4);
var_f29 = var_r31->unk_24;
} else {
}
else {
fn_1_B8A0(object, 3);
var_f29 = var_r31->unk_24 / var_f30;
}
CharModelMotionSpeedSet(var_r31->unk_00, var_f29);
}
} else {
}
else {
var_r31->unk_E0.x = var_r31->unk_E0.y = var_r31->unk_E0.z = 0.0f;
if (var_r31->unk_28 && CharModelMotionShiftIDGet(var_r31->unk_00) < 0) {
fn_1_B8A0(object, 0);
@ -890,7 +907,8 @@ void fn_1_9FF0(omObjData *object)
var_r31->unk_98 = var_r31->unk_F8.y - var_r31->unk_104.y;
var_r31->unk_98 += -0.27222225f;
var_r31->unk_30 = 0;
} else {
}
else {
var_r31->unk_98 = var_r31->unk_F8.y - var_r31->unk_104.y;
var_r31->unk_98 += -0.8166667f;
var_r31->unk_30 = 1;
@ -923,7 +941,8 @@ void fn_1_9FF0(omObjData *object)
var_f31 = 0.0f;
sp8.x = 1.0f;
sp8.y = sp8.z = 0.0f;
} else {
}
else {
if (var_f31 > 1.0f) {
var_f31 = 1.0f;
}
@ -1003,7 +1022,8 @@ void fn_1_9FF0(omObjData *object)
}
PSVECScale(&sp14, &sp14, (0.0033333336f * var_f29) + var_r31->unk_144);
PSVECAdd(&var_r31->unk_14C, &sp14, &var_r31->unk_14C);
} else {
}
else {
PSVECScale(&var_r31->unk_14C, &var_r31->unk_14C, 0.98f);
}
var_r31->unk_14C.y = 0.0f;
@ -1020,12 +1040,14 @@ void fn_1_9FF0(omObjData *object)
sp8.x = var_r31->unk_14C.z;
sp8.y = 0.0f;
sp8.z = -var_r31->unk_14C.x;
} else {
}
else {
sp8.x = 1.0f;
sp8.y = sp8.z = 0.0f;
}
C_QUATRotAxisRad(&var_r31->unk_184, &sp8, 0.9424779f * var_f31);
} else {
}
else {
sp8.x = var_r31->unk_14C.z;
sp8.y = 0.0f;
sp8.z = -var_r31->unk_14C.x;
@ -1090,7 +1112,8 @@ void fn_1_ADC4(omObjData *object)
var_r31->unk_110 = sp28;
}
var_r31->unk_84 = 60.0f * ((0.23f - (0.04f * var_r31->unk_74)) + (0.001f * ((0.4f - (0.15f * var_r31->unk_74)) * frandmod(1000))));
} else {
}
else {
var_r31->unk_84--;
}
sp28 = var_r31->unk_110;
@ -1101,7 +1124,8 @@ void fn_1_ADC4(omObjData *object)
var_f31 = PSVECMag(&sp10);
if (var_r31->unk_48) {
var_r30 = 1;
} else {
}
else {
var_r30 = 0;
}
var_r29 = var_r30;
@ -1129,7 +1153,8 @@ void fn_1_B2C0(omObjData *object)
var_r29 = 0;
if (var_r31->unk_90) {
var_r31->unk_90--;
} else {
}
else {
var_r31->unk_88 = 1.0f;
if (frandmod(1000) < 500) {
var_r31->unk_88 = -1.0f;
@ -1142,7 +1167,8 @@ void fn_1_B2C0(omObjData *object)
if (lbl_1_bss_884 >= object->work[0]) {
if (lbl_1_bss_880) {
lbl_1_bss_880--;
} else {
}
else {
lbl_1_bss_880 = 60.0f * (8.0f + (0.004f * frandmod(1000)));
}
}
@ -1160,11 +1186,13 @@ void fn_1_B2C0(omObjData *object)
if (var_r31->unk_80 > 240.0f) {
var_r31->unk_80 = 1;
}
} else {
}
else {
var_r31->unk_80 = 60.0f * (0.00080000004f * ((1.05f - var_r31->unk_74) * frandmod(1000)));
var_r31->unk_80 += (var_r31->unk_8C * (30.0f + (0.03f * frandmod(1000))));
}
} else {
}
else {
var_r31->unk_80--;
if (!var_r31->unk_80) {
var_r31->unk_10 |= 256;

46
src/REL/m417Dll/water.c
View file

@ -164,7 +164,7 @@ UnkM417Struct3 *fn_1_3574(omObjData *arg0, s16 arg1, s16 arg2)
var_r31 = var_r30;
for (var_r29 = 0; var_r29 < arg2; var_r29++, var_r31++, arg1++) {
var_r31->unk_00 = arg1;
arg0->model[arg1] = Hu3DModelCreate(HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M417, 3), MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->model[arg1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M417, 3));
Hu3DModelLayerSet(arg0->model[var_r31->unk_00], 0);
var_f30 = frandmod(360);
var_f29 = frandmod(640);
@ -196,7 +196,8 @@ void fn_1_37A0(omObjData *object, UnkM417Struct3 *arg1)
var_r29 = 0;
if (arg1->unk_30 > arg1->unk_34) {
var_r29 = 1;
} else {
}
else {
PSVECSubtract(&arg1->unk_14, &arg1->unk_08, &sp8);
var_f31 = PSVECMag(&sp8);
if (var_f31 < 50.0f) {
@ -247,7 +248,7 @@ void fn_1_3BC4(omObjData *object)
Hu3DModelLayerSet(object->model[1], 1);
object->model[2] = Hu3DHookFuncCreate(fn_1_6B60);
Hu3DModelLayerSet(object->model[2], 7);
var_r30 = Hu3DParticleCreate(HuSprAnimRead(HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M417, 17), MEMORY_DEFAULT_NUM, HEAP_DATA)), 512);
var_r30 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M417, 17)), 512);
object->model[3] = var_r30;
Hu3DModelLayerSet(var_r30, 4);
Hu3DParticleColSet(var_r30, 255, 255, 255);
@ -339,7 +340,8 @@ void fn_1_3D58(omObjData *object)
lbl_1_bss_178.unk_24[var_r29] = 0.0f;
var_f31 = 850.0f / var_f31;
PSVECScale(var_r28, var_r28, var_f31);
} else {
}
else {
lbl_1_bss_178.unk_28[var_r31] = 1;
lbl_1_bss_178.unk_1C[var_r31] = var_r30;
lbl_1_bss_178.unk_24[var_r30] = 1.0f;
@ -368,7 +370,8 @@ void fn_1_3D58(omObjData *object)
(*var_r27)[1] = lbl_1_bss_178.unk_1C[var_r29 + 30];
(*var_r27)[2] = lbl_1_bss_178.unk_1C[var_r29 + 1];
(*var_r27)[3] = lbl_1_bss_178.unk_1C[var_r29 + 31];
} else {
}
else {
var_r29 = var_r30 + (var_r31 * 30);
(*var_r27)[1] = lbl_1_bss_178.unk_1C[var_r29];
(*var_r27)[3] = lbl_1_bss_178.unk_1C[var_r29 + 30];
@ -447,7 +450,8 @@ void fn_1_4BC8(float arg8, float arg9)
if (arg9 < 0.0f) {
arg9 = 0.0f;
} else if (arg9 > 1.0f) {
}
else if (arg9 > 1.0f) {
arg9 = 1.0f;
}
var_f30 = 1.0f - arg9;
@ -474,7 +478,7 @@ void fn_1_4BC8(float arg8, float arg9)
return;
}
}
(void)var_r31;
(void)var_r31;
}
void fn_1_4E64(omObjData *object)
@ -521,12 +525,14 @@ void fn_1_4E64(omObjData *object)
}
if (PSVECMag(&var_r31->unk_04) > 800.0f && var_r31->unk_00 >= 2 && (var_r31->unk_1C -= 0.033333335f, var_r31->unk_1C < 0.0f)) {
var_r31->unk_00 = 0;
} else {
}
else {
if (var_r31->unk_00 < 2) {
PSVECSubtract(&sp8, &var_r31->unk_04, &sp20);
if (PSVECDotProduct(&sp14, &sp20) <= 0.0f) {
var_r31->unk_00 = 2;
} else {
}
else {
var_f31 = 1.2f * (PSVECMag(&sp20) / (var_r31->unk_18 * var_r31->unk_28));
if (var_f31 < 1.2f) {
if (var_f31 > 1.0f) {
@ -538,7 +544,8 @@ void fn_1_4E64(omObjData *object)
var_r29->unk_0C = var_f31;
}
}
} else if (var_r31->unk_00 == 2 && PSVECMag(&var_r31->unk_04) > ((800.0f - (100.0f * (2.0f * var_r31->unk_20))) - 30.000002f)) {
}
else if (var_r31->unk_00 == 2 && PSVECMag(&var_r31->unk_04) > ((800.0f - (100.0f * (2.0f * var_r31->unk_20))) - 30.000002f)) {
var_r31->unk_00 = 3;
fn_1_6D64(lbl_1_bss_58, 0, var_r31->unk_10, 20.0f + (40.0f * var_r31->unk_20), var_r31->unk_20);
sp2C.x = sind(var_r31->unk_10);
@ -631,7 +638,8 @@ void fn_1_57B0(omObjData *object)
var_r29->unk_0C += var_r29->unk_18;
if (var_r29->unk_0C >= 360.0f) {
var_r29->unk_0C -= 360.0f;
} else if (var_r29->unk_0C < 0.0f) {
}
else if (var_r29->unk_0C < 0.0f) {
var_r29->unk_0C += 360.0f;
}
var_f31 = var_r29->unk_0C;
@ -688,8 +696,8 @@ void fn_1_57B0(omObjData *object)
DCStoreRangeNoSync(lbl_1_bss_178.unk_6CC[lbl_1_bss_178.unk_6B4], 1080 * sizeof(GXColor));
DCStoreRangeNoSync(lbl_1_bss_178.unk_6D4[lbl_1_bss_178.unk_6B4], 30 * 36 * sizeof(Vec2f));
PPCSync();
(void)var_r30;
(void)var_r30;
(void)var_r30;
(void)var_r30;
}
void fn_1_5E3C(omObjData *object)
@ -714,7 +722,8 @@ void fn_1_5E3C(omObjData *object)
GXColor1x16(var_r31);
GXTexCoord1x16(var_r31);
}
} else {
}
else {
GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 59);
for (var_r30 = 29; var_r30 >= 0; var_r30--) {
var_r31 = lbl_1_bss_178.unk_1C[var_r30 + (var_r29 * 30)];
@ -936,7 +945,8 @@ void fn_1_6D64(s32 arg0, u32 arg1, float arg8, float arg9, float argA)
arg8 += 180.0f;
arg9 = 60.0f;
var_f27 = fn_1_75BC();
} else {
}
else {
var_r28 = 20.0f + (80.0f * argA);
var_f27 = 0.0f;
}
@ -972,7 +982,8 @@ void fn_1_6D64(s32 arg0, u32 arg1, float arg8, float arg9, float argA)
var_r31->unk40.r = 200.0f + (55.0f * var_f31);
var_r31->unk40.g = 220.0f + (20.0f * var_f31);
var_r31->unk40.b = 245.0f + (10.0f * var_f31);
} else {
}
else {
var_r31->unk2C = 100.0f + frandmod(100);
var_r31->unk40.a = frandmod(100) + 80;
var_r31->unk40.r = 200.0f + (55.0f * var_f31);
@ -1087,7 +1098,8 @@ void fn_1_7968(float arg8, float arg9, float argA, Vec *arg0)
if (var_r30 < 0) {
arg0->x = arg0->z = 0.0f;
arg0->y = 1.0f;
} else {
}
else {
*arg0 = lbl_1_bss_178.unk_6C4[lbl_1_bss_178.unk_6B4][var_r30];
}
}