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

Applied more Attr defines

Browse source
This commit is contained in:
dbalatoni13 2024-11-04 00:05:52 +01:00
parent c9f46f9418
commit f1c171b33f
51 changed files with 336 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/REL/modeltestDll/main.c
View file

@ -245,7 +245,7 @@ void fn_1_29C(omObjData *arg0)
lbl_1_bss_88A[var_r31][7] = CharModelMotionCreate(chrIdx, lbl_1_data_0[7]);
lbl_1_bss_88A[var_r31][0] = CharModelMotionCreate(chrIdx, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x4D));
CharModelMotionSet(chrIdx, lbl_1_bss_88A[var_r31][0]);
Hu3DModelAttrSet(lbl_1_bss_98A[var_r31], 0x40000001U);
Hu3DModelAttrSet(lbl_1_bss_98A[var_r31], HU3D_MOTATTR_LOOP);
Hu3DModelPosSet(lbl_1_bss_98A[var_r31], (var_r31 / 4 * 0xC8) - 100, 0.0f, -(var_r31 % 4) * 0x96);
CharModelMotionDataClose(chrIdx);
}
@ -263,7 +263,7 @@ void fn_1_29C(omObjData *arg0)
var_r31 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M407, 0x1E));
temp_r27 = Hu3DJointMotion(var_r31, HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M407, 0x2F), MEMORY_DEFAULT_NUM, 2));
Hu3DMotionSet(var_r31, temp_r27);
Hu3DModelAttrSet(var_r31, 0x40000001U);
Hu3DModelAttrSet(var_r31, HU3D_MOTATTR_LOOP);
for (var_r31 = 0; var_r31 < 10; ++var_r31) {
if (var_r31 == 0) {
@ -274,8 +274,8 @@ void fn_1_29C(omObjData *arg0)
}
Hu3DModelShadowSet(lbl_1_bss_664[var_r31]);
Hu3DModelPosSet(lbl_1_bss_664[var_r31], (((var_r31 / 5) * 0x1F4) + 0xC8), 0.0f, (-(var_r31 % 5) * 0x12C));
Hu3DModelAttrSet(lbl_1_bss_664[var_r31], 0x4000U);
Hu3DModelAttrSet(lbl_1_bss_664[var_r31], 0x40000001U);
Hu3DModelAttrSet(lbl_1_bss_664[var_r31], HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(lbl_1_bss_664[var_r31], HU3D_MOTATTR_LOOP);
}
temp_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_SAF, 0x13), MEMORY_DEFAULT_NUM, 2);
temp_r28 = HuSprAnimRead(temp_r29);

2
src/REL/modeltestDll/modeltest00.c
View file

@ -199,7 +199,7 @@ void fn_1_46F0(void)
Hu3DModelShadowSet(lbl_1_bss_9EC[var_r31]);
lbl_1_bss_9AC[var_r31][0] = CharModelMotionCreate(var_r30, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02));
CharModelMotionSet(var_r30, lbl_1_bss_9AC[var_r31][0]);
Hu3DModelAttrSet(lbl_1_bss_9EC[var_r31], 0x40000001U);
Hu3DModelAttrSet(lbl_1_bss_9EC[var_r31], HU3D_MOTATTR_LOOP);
Hu3DModelCameraSet(lbl_1_bss_9EC[var_r31], lbl_1_data_358[var_r31]);
Hu3DModelPosSet(lbl_1_bss_9EC[var_r31], ((( var_r31 / 4) * 200) - 100), 0.0f, (-( var_r31 % 4) * 150));
Hu3DModelPosSet(lbl_1_bss_9EC[var_r31], 0.0f, 0.0f, 0.0f);

24
src/REL/modeltestDll/modeltest01.c
View file

@ -299,9 +299,9 @@ void fn_1_5DA8(void)
Hu3DModelAttrSet(sp16[2], HU3D_MOTATTR_LOOP);
}
else {
Hu3DModelAttrReset(sp16[0], 0x40000001);
Hu3DModelAttrReset(sp16[1], 0x40000001);
Hu3DModelAttrReset(sp16[2], 0x40000001);
Hu3DModelAttrReset(sp16[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[2], HU3D_MOTATTR_LOOP);
}
fn_1_69C8(temp_r28, sp16[0], 0);
fn_1_69C8(temp_r28, sp16[1], 1);
@ -322,9 +322,9 @@ void fn_1_5DA8(void)
Hu3DModelAttrSet(sp16[2], HU3D_MOTATTR_LOOP);
}
else {
Hu3DModelAttrReset(sp16[0], 0x40000001);
Hu3DModelAttrReset(sp16[1], 0x40000001);
Hu3DModelAttrReset(sp16[2], 0x40000001);
Hu3DModelAttrReset(sp16[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[2], HU3D_MOTATTR_LOOP);
}
fn_1_69C8(temp_r28, sp16[0], 0);
fn_1_69C8(temp_r28, sp16[1], 1);
@ -340,9 +340,9 @@ void fn_1_5DA8(void)
}
else {
if (temp_r30 != 3 && temp_r30 != 2) {
Hu3DModelAttrReset(sp16[0], 0x40000001);
Hu3DModelAttrReset(sp16[1], 0x40000001);
Hu3DModelAttrReset(sp16[2], 0x40000001);
Hu3DModelAttrReset(sp16[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[2], HU3D_MOTATTR_LOOP);
}
}
}
@ -351,9 +351,9 @@ void fn_1_5DA8(void)
Hu3DMotionSet(sp16[0], sp40[0][temp_r30]);
Hu3DMotionSet(sp16[1], sp40[1][temp_r30]);
Hu3DMotionSet(sp16[2], sp40[2][temp_r30]);
Hu3DModelAttrReset(sp16[0], 0x40000001);
Hu3DModelAttrReset(sp16[1], 0x40000001);
Hu3DModelAttrReset(sp16[2], 0x40000001);
Hu3DModelAttrReset(sp16[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(sp16[2], HU3D_MOTATTR_LOOP);
for (temp_r29 = 0; temp_r29 <= 30; temp_r29++) {
Hu3DModelPosSet(sp16[0], 0, sind(temp_r29 * 6.0f) * 150, 0);
Hu3DModelPosSet(sp16[1], 0, sind(temp_r29 * 6.0f) * 150, 0);