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

Change unk_120 to void *

Browse source
This commit is contained in:
gamemasterplc 2024-06-05 11:40:49 -05:00
parent 24fa3369d7
commit ee1aa02f88
5 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/REL/m408Dll/camera.c
View file

@ -75,8 +75,8 @@ void fn_1_8A20(omObjData *object)
Hu3DParticleColSet(temp_r31, 255, 255, 255);
Hu3DParticleHookSet(temp_r31, fn_1_A894);
Hu3DModelPosSet(temp_r31, 0, 0, 0);
Hu3DData[temp_r31].unk_120->unk_00 = 0;
Hu3DData[temp_r31].unk_120->unk_02 = 0;
((ParticleData *)Hu3DData[temp_r31].unk_120)->unk_00 = 0;
((ParticleData *)Hu3DData[temp_r31].unk_120)->unk_02 = 0;
temp_r31 = Hu3DParticleCreate(HuSprAnimReadFile(0x27000D), 1);
object->model[3] = temp_r31;
Hu3DParticleBlendModeSet(temp_r31, 1);
@ -84,16 +84,16 @@ void fn_1_8A20(omObjData *object)
Hu3DParticleColSet(temp_r31, 255, 255, 255);
Hu3DParticleHookSet(temp_r31, fn_1_A894);
Hu3DModelPosSet(temp_r31, 0, 0, 0);
Hu3DData[temp_r31].unk_120->unk_00 = 0;
Hu3DData[temp_r31].unk_120->unk_02 = 1;
((ParticleData *)Hu3DData[temp_r31].unk_120)->unk_00 = 0;
((ParticleData *)Hu3DData[temp_r31].unk_120)->unk_02 = 1;
temp_r31 = Hu3DParticleCreate(HuSprAnimReadFile(0x270011), 1);
object->model[5] = temp_r31;
Hu3DModelLayerSet(temp_r31, 7);
Hu3DParticleColSet(temp_r31, 255, 255, 255);
Hu3DParticleHookSet(temp_r31, fn_1_A894);
Hu3DModelPosSet(temp_r31, 0, 0, 0);
Hu3DData[temp_r31].unk_120->unk_00 = 0;
Hu3DData[temp_r31].unk_120->unk_02 = 2;
((ParticleData *)Hu3DData[temp_r31].unk_120)->unk_00 = 0;
((ParticleData *)Hu3DData[temp_r31].unk_120)->unk_02 = 2;
temp_r31 = Hu3DParticleCreate(HuSprAnimReadFile(0x270010), 8);
object->model[6] = temp_r31;
Hu3DParticleBlendModeSet(temp_r31, 1);
@ -249,7 +249,7 @@ void fn_1_9770(omObjData *object)
Hu3DParticleColSet(temp_r29, 255, 255, 255);
Hu3DParticleHookSet(temp_r29, fn_1_A37C);
Hu3DModelPosSet(temp_r29, 0, 0, 0);
Hu3DData[temp_r29].unk_120->unk_00 = 0;
((ParticleData *)Hu3DData[temp_r29].unk_120)->unk_00 = 0;
temp_r31->unk30.y = -35;
temp_r31->unk30.z = 350;
temp_r31->unk18.y = 800+object->trans.y;

4
src/REL/m408Dll/main.c
View file

@ -672,7 +672,7 @@ void fn_1_26E4(omObjData *object)
Hu3DParticleColSet(temp_r27, 255, 255, 255);
Hu3DParticleHookSet(temp_r27, fn_1_5AB4);
Hu3DModelPosSet(temp_r27, 0, 0, 0);
Hu3DData[temp_r27].unk_120->unk_00 = 0;
((ParticleData *)Hu3DData[temp_r27].unk_120)->unk_00 = 0;
temp_r31->unk74 = temp_r31->unk78 = 0;
temp_r31->unk7C[0] = temp_r31->unk7C[1] = 0;
temp_r31->unk8C = -1;
@ -765,7 +765,7 @@ void fn_1_2FAC(omObjData *object)
object->trans.z = temp_r31->unk1C.z = temp_r31->unk94.z = lbl_1_data_104[temp_r31->unk0][1];
object->rot.y = temp_r31->unk58.x = atan2d(object->trans.x, object->trans.z)+180.0;
Hu3DModelAttrReset(object->model[1], 1);
Hu3DData[object->model[2]].unk_120->unk_00 = 0;
((ParticleData *)Hu3DData[object->model[2]].unk_120)->unk_00 = 0;
object->func = fn_1_3E80;
}
}

16
src/REL/m408Dll/stage.c
View file

@ -142,7 +142,7 @@ void fn_1_C530(omObjData *object)
Hu3DModelLayerSet(temp_r31, 1);
Hu3DModelPosSet(temp_r31, 0, 5100, 0);
Hu3DParticleBlendModeSet(temp_r31, 1);
temp_r29 = Hu3DData[temp_r31].unk_120->unk_1C;
temp_r29 = ((ParticleData *)Hu3DData[temp_r31].unk_120)->unk_1C;
temp_r29[2] = 140;
object->model[14] = Hu3DModelCreateFile(0x270021);
object->model[15] = Hu3DModelCreateFile(0x270022);
@ -161,7 +161,7 @@ void fn_1_C530(omObjData *object)
Hu3DModelLayerSet(temp_r31, 3);
Hu3DModelAttrReset(temp_r31, 1);
Hu3DParticleBlendModeSet(temp_r31, 1);
temp_r29 = Hu3DData[temp_r31].unk_120->unk_1C;
temp_r29 = ((ParticleData *)Hu3DData[temp_r31].unk_120)->unk_1C;
temp_r29[1] = 800;
object->func = fn_1_CD14;
}
@ -296,7 +296,7 @@ void fn_1_D004(omObjData *object)
temp_f29 = 1.0f-((temp_f30-5000)/15000);
Hu3DMotionTimeSet(object->model[12], 95.0f*temp_f29);
temp_r27 = object->model[6];
temp_r28 = Hu3DData[temp_r27].unk_120->unk_1C;
temp_r28 = ((ParticleData *)Hu3DData[temp_r27].unk_120)->unk_1C;
temp_r28[2] = 1.0f-((temp_f30-5000)/(temp_f28-5000));
if(temp_f30 <= 5400 && temp_r30[2] == 0) {
temp_r30[2] = 30;
@ -343,7 +343,7 @@ void fn_1_D004(omObjData *object)
temp_r27 = object->model[6];
if(temp_r27 != 0) {
Hu3DModelPosSet(temp_r27, 0, 200+temp_f30, 0);
temp_r28 = Hu3DData[temp_r27].unk_120->unk_1C;
temp_r28 = ((ParticleData *)Hu3DData[temp_r27].unk_120)->unk_1C;
temp_r28[2] -= 0.025f;
if(temp_r28[2] <= 0) {
Hu3DModelAttrReset(temp_r27, 0x20);
@ -757,7 +757,7 @@ WorkF4B0 *fn_1_F4B0(s16 arg0, s16 arg1)
ModelData *temp_r29;
temp_r29 = &Hu3DData[arg0];
temp_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(WorkF4B0), MEMORY_DEFAULT_NUM);
temp_r29->unk_120 = (void *)temp_r31;
temp_r29->unk_120 = temp_r31;
temp_r31->unk0 = arg0;
temp_r31->unk2 = arg1;
temp_r31->unk4 = NULL;
@ -778,7 +778,7 @@ void fn_1_F564(s16 arg0)
ModelData *temp_r27;
temp_r27 = &Hu3DData[arg0];
temp_r29 = temp_r27->hsfData->root;
temp_r31 = (WorkF4B0 *)temp_r27->unk_120;
temp_r31 = temp_r27->unk_120;
if(temp_r31->unk8 == NULL) {
temp_r31->unk8 = HuMemDirectMallocNum(HEAP_SYSTEM, temp_r29->data.st->count*sizeof(HsfVector2f), MEMORY_DEFAULT_NUM);
temp_r31->unkC = HuMemDirectMallocNum(HEAP_SYSTEM, temp_r29->data.st->count, MEMORY_DEFAULT_NUM);
@ -838,7 +838,7 @@ void fn_1_F8A0(ModelData *arg0, Mtx arg1)
Mtx sp40;
Mtx sp10;
s16 spC = 0;
temp_r31 = (void *)arg0->unk_120;
temp_r31 = arg0->unk_120;
spA0.unk0 = &Hu3DData[temp_r31->unk2];
spA0.unk4 = spA0.unk0->hsfData->root;
MTXCopy(arg1, spA0.unkC);
@ -901,7 +901,7 @@ void fn_1_FB98(ModelData *arg0, Mtx arg1)
float sp50[2][8];
float sp10[2][8];
s16 spC = 0;
temp_r31 = (void *)arg0->unk_120;
temp_r31 = arg0->unk_120;
sp120.unk0 = &Hu3DData[temp_r31->unk2];
sp120.unk4 = sp120.unk0->hsfData->root;
MTXCopy(arg1, sp120.unkC);

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

@ -253,7 +253,7 @@ void fn_1_3BC4(omObjData *object)
Hu3DParticleColSet(var_r30, 255, 255, 255);
Hu3DParticleHookSet(var_r30, fn_1_6B94);
Hu3DModelPosSet(var_r30, 0.0f, 0.0f, 0.0f);
Hu3DData[var_r30].unk_120->unk_00 = 0;
((ParticleData *)Hu3DData[var_r30].unk_120)->unk_00 = 0;
lbl_1_bss_58 = var_r30;
fn_1_3D58(object);
object->func = fn_1_3D54;