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

Match m446dll/stage.c

Browse source 
main.c is broken due to fn_1_CA0, otherwise, m446ddl is complete
This commit is contained in:
CreateSource 2024-05-24 14:56:11 -04:00
parent d430953293
commit 285ecc1bf2
7 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/REL/m446Dll/card.c
View file

@ -43,7 +43,7 @@ s32 fn_1_1D30(unkStruct2* arg0, void* arg1) {
}
}
s32 fn_1_1D6C(unkStruct2* arg0, void** arg1) {
s32 fn_1_1D6C(unkStruct2* arg0, unkStruct4** arg1) {
if (arg0->unk8 <= 0) {
return 0;
} else {
@ -174,7 +174,7 @@ s32 fn_1_2064(void) {
}
void fn_1_207C(void) {
unkStruct9* var_r30;
unkStruct4* var_r30;
unkStruct3* var_r31;
var_r31 = lbl_1_bss_18;
@ -271,14 +271,14 @@ unkStruct4* m446CardCreate(s32 arg0) {
temp_r31->unk74 = 0;
temp_r31->unk78 = 0;
temp_r31->unk7C = 0;
temp_r31->unkA = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_rodata_58[arg0], 0x10000000, HEAP_DATA));
Hu3DModelAmbSet(temp_r31->unkA, 0.0f, 0.0f, 0.0f);
Hu3DModelShadowSet(temp_r31->unkA);
Hu3DModelLayerSet(temp_r31->unkA, 0);
temp_r31->unkC = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_rodata_6C[arg0], 0x10000000, HEAP_DATA));
Hu3DModelAmbSet(temp_r31->unkC, 1.0f, 1.0f, 1.0f);
Hu3DModelAttrSet(temp_r31->unkC, 0x40000001U);
Hu3DModelLayerSet(temp_r31->unkA, 0);
temp_r31->unkA[0] = Hu3DModelCreateFile(lbl_1_rodata_58[arg0]);
Hu3DModelAmbSet(temp_r31->unkA[0], 0.0f, 0.0f, 0.0f);
Hu3DModelShadowSet(temp_r31->unkA[0]);
Hu3DModelLayerSet(temp_r31->unkA[0], 0);
temp_r31->unkA[1] = Hu3DModelCreateFile(lbl_1_rodata_6C[arg0]);
Hu3DModelAmbSet(temp_r31->unkA[1], 1.0f, 1.0f, 1.0f);
Hu3DModelAttrSet(temp_r31->unkA[1], 0x40000001U);
Hu3DModelLayerSet(temp_r31->unkA[0], 0);
fn_1_2A58(temp_r31);
fn_1_2EC0(temp_r31, 1);
temp_r30 = fn_1_1DF4(temp_r31);
@ -295,7 +295,7 @@ unkStruct4* m446CardCreate(s32 arg0) {
return temp_r31;
}
void fn_1_2688(unkStruct9* arg0) {
void fn_1_2688(unkStruct4* arg0) {
unkStruct3* var_r31 = lbl_1_bss_18;
do {
if (arg0 == var_r31->unk0) {
@ -367,12 +367,12 @@ void fn_1_29B4(unkStruct4* arg0, f32 arg8, s32 arg1) {
}
void fn_1_2A1C(unkStruct4* arg0) {
Hu3DModelAttrReset(arg0->unkC, 1);
Hu3DModelAttrReset(arg0->unkA[1], 1);
arg0->unk6C = 1;
}
void fn_1_2A58(unkStruct4* arg0) {
Hu3DModelAttrSet(arg0->unkC, 1);
Hu3DModelAttrSet(arg0->unkA[1], 1);
arg0->unk6C = 0;
}
@ -387,7 +387,7 @@ void fn_1_2AA8(unkStruct4* arg0) {
switch (arg0->unk8) {
case 0:
arg0->unk8 = 1;
Hu3DModelAttrReset(arg0->unkC, 1);
Hu3DModelAttrReset(arg0->unkA[1], 1);
arg0->unk6C = 1;
arg0->unk8 = 1; // ?
case 1:
@ -455,7 +455,7 @@ void fn_1_2AA8(unkStruct4* arg0) {
if (arg0->unk78 != 0) break;
arg0->unk4 = 0;
arg0->unk8 = 0;
Hu3DModelAttrSet(arg0->unkC, 1);
Hu3DModelAttrSet(arg0->unkA[1], 1);
arg0->unk6C = 0;
return;
}
@ -500,25 +500,25 @@ void fn_1_2DA8(unkStruct4* arg0) {
void fn_1_2EC0(unkStruct4* arg0, s32 arg1) {
if (arg1 != 0) {
Hu3DModelShadowDispOn(arg0->unkA);
Hu3DModelAmbSet(arg0->unkA, 0.0f, 0.0f, 0.0f);
Hu3DModelShadowDispOn(arg0->unkA[0]);
Hu3DModelAmbSet(arg0->unkA[0], 0.0f, 0.0f, 0.0f);
return;
}
Hu3DModelShadowDispOff(arg0->unkA);
Hu3DModelAmbSet(arg0->unkA, 1.0f, 1.0f, 1.0f);
Hu3DModelShadowDispOff(arg0->unkA[0]);
Hu3DModelAmbSet(arg0->unkA[0], 1.0f, 1.0f, 1.0f);
}
void fn_1_2F64(unkStruct4* arg0) {
if ((arg0->unk58 > 1.0f) || (arg0->unk58 < 1.0f)) {
Hu3DModelLayerSet(arg0->unkA, 1);
Hu3DModelLayerSet(arg0->unkC, 1);
Hu3DModelLayerSet(arg0->unkA[0], 1);
Hu3DModelLayerSet(arg0->unkA[1], 1);
} else {
Hu3DModelLayerSet(arg0->unkA, 0);
Hu3DModelLayerSet(arg0->unkC, 0);
Hu3DModelLayerSet(arg0->unkA[0], 0);
Hu3DModelLayerSet(arg0->unkA[1], 0);
}
Hu3DModelPosSet(arg0->unkA, arg0->unk10.x, arg0->unk10.y, arg0->unk10.z);
Hu3DModelPosSet(arg0->unkC, arg0->unk10.x, 0.1f + arg0->unk10.y, arg0->unk10.z);
Hu3DModelScaleSet(arg0->unkA, arg0->unk58, arg0->unk58, arg0->unk58);
Hu3DModelScaleSet(arg0->unkC, arg0->unk58, arg0->unk58, arg0->unk58);
Hu3DModelRotSet(arg0->unkA, arg0->unk34.x, arg0->unk34.y, arg0->unk34.z);
Hu3DModelPosSet(arg0->unkA[0], arg0->unk10.x, arg0->unk10.y, arg0->unk10.z);
Hu3DModelPosSet(arg0->unkA[1], arg0->unk10.x, 0.1f + arg0->unk10.y, arg0->unk10.z);
Hu3DModelScaleSet(arg0->unkA[0], arg0->unk58, arg0->unk58, arg0->unk58);
Hu3DModelScaleSet(arg0->unkA[1], arg0->unk58, arg0->unk58, arg0->unk58);
Hu3DModelRotSet(arg0->unkA[0], arg0->unk34.x, arg0->unk34.y, arg0->unk34.z);
}

4
src/REL/m446Dll/deck.c
View file

@ -39,8 +39,8 @@ unkStruct5* fn_1_3064(void) {
return temp_r3;
}
void fn_1_3180(unkStruct2** arg0) { // typing nightmare
unkStruct9* sp8;
void fn_1_3180(unkStruct2** arg0) {
unkStruct4* sp8;
while (fn_1_1D6C(*arg0, &sp8) != 0) {
fn_1_2688(sp8);

2
src/REL/m446Dll/main.c
View file

@ -98,7 +98,7 @@ unkStruct* m446FlowCreate(void) {
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x9C, 0x10000000);
if (temp_r3 == 0) {
OSReport("[!] m446FlowCreate() ERROR");
OSReport("[!] m446FlowCreate() ERROR...\n");
return NULL;
}
temp_r3->unk4 = -1;

2
src/REL/m446Dll/stage.c
View file

@ -51,7 +51,7 @@ void fn_1_7C08(void) {
if (var_r31) {
do {
var_r30 = var_r31->unk0;
fn_1_2688(var_r30);
fn_1_2688((unkStruct4*)var_r30); // ???
var_r31 = var_r31->unk8;
} while (var_r31);
}