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

fix malloc convention

Browse source
This commit is contained in:
CreateSource 2024-10-29 17:00:36 -04:00
parent 1c29171173
commit f14e4bf84b
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/REL/m415Dll/map.c
View file

@ -12,9 +12,9 @@ void fn_1_8780(s16 arg0, s16 arg1) {
lbl_1_bss_36C.unk34 = Hu3DHookFuncCreate(fn_1_95C0);
Hu3DModelLayerSet(lbl_1_bss_36C.unk34, 6);
lbl_1_bss_36C.unk30 = arg0;
lbl_1_bss_36C.unk40 = var_r29 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkSubStruct2), 0x10000000);
lbl_1_bss_36C.unk40 = var_r29 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkSubStruct2), MEMORY_DEFAULT_NUM);
lbl_1_bss_36C.unk32 = arg1;
lbl_1_bss_36C.unk3C = var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkSubStruct3), 0x10000000);
lbl_1_bss_36C.unk3C = var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkSubStruct3), MEMORY_DEFAULT_NUM);
for (var_r31 = 0; var_r31 < arg0; var_r31++, var_r29++) {
var_r29->unk8 = 0;
@ -293,7 +293,7 @@ void fn_1_9750(unkStruct6** arg0, s16 arg1, f32 arg8, f32 arg9) {
s32 var_r30;
unkStruct6* var_r31;
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct6), 0x10000000);
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct6), MEMORY_DEFAULT_NUM);
for (var_r30 = 0; var_r30 < arg1; var_r31++, var_r30++) {
var_r31->unk0.x = (-0.5f * arg8);
@ -546,15 +546,15 @@ s16 fn_1_A2D0(u8 arg0, u8 arg1) {
var_r31->unk30 = NULL;
var_r31->unk2 = arg0;
var_r31->unk4 = arg1;
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkSubStruct), 0x10000000);
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkSubStruct), MEMORY_DEFAULT_NUM);
var_r31->unk3C = var_r30;
var_r31->unk34 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * 2, 0x10000000);
var_r31->unk34 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * 2, MEMORY_DEFAULT_NUM);
var_r31->unk48 = 0;
var_r31->unk4C = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkType), 0x10000000);
var_r31->unk50 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(Vec[4]), 0x10000000);
var_r31->unk54 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkType2), 0x10000000);
var_r31->unk58 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(Vec), 0x10000000);
var_r31->unk5C = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * (arg0 * sizeof(unkSubStruct4)), 0x10000000);
var_r31->unk4C = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkType), MEMORY_DEFAULT_NUM);
var_r31->unk50 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(Vec[4]), MEMORY_DEFAULT_NUM);
var_r31->unk54 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkType2), MEMORY_DEFAULT_NUM);
var_r31->unk58 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(Vec), MEMORY_DEFAULT_NUM);
var_r31->unk5C = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * (arg0 * sizeof(unkSubStruct4)), MEMORY_DEFAULT_NUM);
DCFlushRangeNoSync(var_r31->unk4C, arg0 << 8);
var_r31->unkC.x = var_r31->unkC.y = var_r31->unkC.z = 0.0f;
var_r31->unk18.x = var_r31->unk18.y = var_r31->unk18.z = 0.0f;
@ -606,7 +606,7 @@ s16 fn_1_A2D0(u8 arg0, u8 arg1) {
var_r31->unk48 += var_r30->unk38;
}
temp_r25 = var_r31->unk4C;
var_r31->unk4C = HuMemDirectMallocNum(HEAP_SYSTEM, var_r31->unk48, 0x10000000);
var_r31->unk4C = HuMemDirectMallocNum(HEAP_SYSTEM, var_r31->unk48, MEMORY_DEFAULT_NUM);
memcpy(var_r31->unk4C, temp_r25, var_r31->unk48);
HuMemDirectFree(temp_r25);
DCFlushRangeNoSync(var_r31->unk50, arg0 * 0x30);
@ -692,7 +692,7 @@ s16 fn_1_A94C(u32 arg0, s16 arg1, s16 arg2) {
var_r31->unk6 = 1;
if (((arg0 & 0xFFFF0000) + 0x10000) == 0U) {
var_r30 = HuSprAnimMake(arg1, arg2, 2);
var_r30->bmp->data = HuMemDirectMallocNum(HEAP_SYSTEM, arg2 * (arg1 * 2), 0x10000000);
var_r30->bmp->data = HuMemDirectMallocNum(HEAP_SYSTEM, arg2 * (arg1 * 2), MEMORY_DEFAULT_NUM);
arg1 = arg2 = 0;
} else {
var_r30 = HuSprAnimRead(HuDataReadNum(arg0, 0x10000000));