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

32
src/REL/m409Dll/cursor.c
View file

@ -13,10 +13,10 @@ void fn_1_BF88(s16 arg0, s16 arg1) {
lbl_1_bss_F0.unk4 = Hu3DHookFuncCreate(fn_1_CB98);
Hu3DModelLayerSet(lbl_1_bss_F0.unk4, 6);
lbl_1_bss_F0.unk0 = arg0;
var_r29 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkStruct8), 0x10000000);
var_r29 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkStruct8), MEMORY_DEFAULT_NUM);
lbl_1_bss_F0.unk10 = var_r29;
lbl_1_bss_F0.unk2 = arg1;
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct9Sub), 0x10000000);
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct9Sub), MEMORY_DEFAULT_NUM);
lbl_1_bss_F0.unkC = var_r30;
for (var_r31 = 0; var_r31 < arg0; var_r31++, var_r29++) {
@ -264,7 +264,7 @@ void fn_1_CCF8(unkStruct11** arg0, s16 arg1, f32 arg8, f32 arg9) {
s32 var_r30;
unkStruct11* var_r31;
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct11), 0x10000000);
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct11), MEMORY_DEFAULT_NUM);
for (var_r30 = 0; var_r30 < arg1; var_r31++, var_r30++) {
var_r31->unk0.x = (-0.5f * arg8);
@ -287,7 +287,7 @@ void fn_1_CE7C(Vec** arg0, s16 arg1, Vec* arg2) {
s32 var_r28;
Vec* var_r31;
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(Vec[4]), 0x10000000);
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(Vec[4]), MEMORY_DEFAULT_NUM);
for (var_r29 = 0; var_r29 < arg1; var_r29++) {
for (var_r28 = 0; var_r28 < 4; var_r31++, arg2++, var_r28++) {
@ -303,7 +303,7 @@ void fn_1_CF1C(GXColor** arg0, s16 arg1, GXColor* arg2) {
s32 var_r28;
GXColor* var_r31;
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(GXColor[4]), 0x10000000U);
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(GXColor[4]), MEMORY_DEFAULT_NUM);
for (var_r29 = 0; var_r29 < arg1; var_r29++) {
for (var_r28 = 0; var_r28 < 4; var_r31++, arg2++, var_r28++) {
@ -319,7 +319,7 @@ void fn_1_CFC4(Vec** arg0, s16 arg1, Vec* arg2) {
s32 var_r29;
Vec* var_r31;
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(Vec), 0x10000000U);
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(Vec), MEMORY_DEFAULT_NUM);
for (var_r29 = 0; var_r29 < arg1; var_r31++, arg2++, var_r29++) {
var_r31->x = arg2->x;
@ -333,7 +333,7 @@ void fn_1_D050(HsfVector2f** arg0, s16 arg1, HsfVector2f* arg2) {
s32 var_r29;
HsfVector2f* var_r31;
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(HsfVector2f[4]), 0x10000000U);
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(HsfVector2f[4]), MEMORY_DEFAULT_NUM);
for (var_r28 = 0; var_r28 < arg1; var_r28++) {
for (var_r29 = 0; var_r29 < 4; var_r31++, arg2++, var_r29++) {
@ -371,14 +371,14 @@ void fn_1_D0E8(unkStruct8Sub* arg0) {
if (arg0->unk48 != NULL) {
HuMemDirectFree(arg0->unk48);
}
arg0->unk48 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Vec), 0x10000000);
arg0->unk48 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Vec), MEMORY_DEFAULT_NUM);
arg0->unk48->x = 0.0f;
arg0->unk48->y = 0.0f;
arg0->unk48->z = 1.0f;
if (arg0->unk3C != NULL) {
HuMemDirectFree(arg0->unk3C);
}
temp_r3_3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x1000, 0x10000000);
temp_r3_3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x1000, MEMORY_DEFAULT_NUM);
arg0->unk3C = temp_r3_3;
DCFlushRange(arg0->unk3C, 0x1000);
GXBeginDisplayList(temp_r3_3, 0x1000);
@ -526,9 +526,9 @@ s16 fn_1_DA48(u8 arg0, u8 arg1) {
var_r30->unk30 = NULL;
var_r30->unk2 = arg0;
var_r30->unk4 = arg1;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkStruct8Sub), 0x10000000);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkStruct8Sub), MEMORY_DEFAULT_NUM);
var_r30->unk3C = var_r31;
var_r30->unk34 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(s16), 0x10000000);
var_r30->unk34 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(s16), MEMORY_DEFAULT_NUM);
var_r30->unkC.x = var_r30->unkC.y = var_r30->unkC.z = 0.0f;
var_r30->unk18.x = var_r30->unk18.y = var_r30->unk18.z = 0.0f;
var_r30->unk24.x = var_r30->unk24.y = var_r30->unk24.z = 1.0f;
@ -551,7 +551,7 @@ s16 fn_1_DA48(u8 arg0, u8 arg1) {
var_r31->unk4C.a = 0xFF;
var_r31->unk50.r = var_r31->unk50.g = var_r31->unk50.b = 0xFF;
var_r31->unk50.a = 0xFF;
var_r31->unk54 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct12), 0x10000000);
var_r31->unk54 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct12), MEMORY_DEFAULT_NUM);
for (var_r28 = 0; var_r28 < arg1; var_r28++) {
var_r31->unk54[var_r28].unk0 = var_r31->unk54[var_r28].unk1 = 0;
@ -644,7 +644,7 @@ s16 fn_1_DF20(u32 arg0, s16 arg1, s16 arg2) {
}
var_r31->unk8 = arg0;
var_r31->unk6 = 1;
temp_r30 = HuSprAnimRead(HuDataReadNum(arg0, 0x10000000));
temp_r30 = HuSprAnimRead(HuDataReadNum(arg0, MEMORY_DEFAULT_NUM));
if ((arg1 == 0) || (arg2 == 0)) {
arg1 = temp_r30->bmp->sizeX;
arg2 = temp_r30->bmp->sizeY;
@ -716,7 +716,7 @@ s32 fn_1_E2A8(s16 arg0, u8 arg1, u32 arg2, s16 arg3, s16 arg4) {
}
temp_f30 = temp_r30->unk50;
temp_f31 = temp_r30->unk4E;
var_r29 = var_r28->unk40 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x30, 0x10000000);
var_r29 = var_r28->unk40 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x30, MEMORY_DEFAULT_NUM);
for (var_r25 = 0; var_r25 < 1; var_r29++, var_r25++) {
var_r29->unk0.x = (-0.5f * temp_f31);
@ -739,7 +739,7 @@ s32 fn_1_E2A8(s16 arg0, u8 arg1, u32 arg2, s16 arg3, s16 arg4) {
temp_r31->unkC = 1.0f;
temp_r31->unk10 = 0.0f;
if (temp_r31->unk4 == NULL) {
temp_r31->unk4 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x20, 0x10000000U);
temp_r31->unk4 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x20, MEMORY_DEFAULT_NUM);
}
temp_r31->unk4[0].x = temp_r31->unk0 * temp_r30->unk54;
temp_r31->unk4[0].y = temp_r31->unk0 * temp_r30->unk58;
@ -1205,4 +1205,4 @@ void fn_1_F4F0(s16 arg0, u8 arg1) {
}
}
}
}
}

506
src/REL/m409Dll/main.c
View file

File diff suppressed because it is too large Load diff

36
src/REL/m409Dll/player.c
View file

@ -21,7 +21,7 @@ unkStruct9 lbl_1_bss_F0;
// data
u32 lbl_1_data_138 = 0xFFFF0000;
s32 lbl_1_data_13C[7] = { 0x30, 0x2D, 0x3A, 0x2E, 0x280032, 0x17, 0x18 };
s32 lbl_1_data_13C[7] = { 0x30, 0x2D, 0x3A, 0x2E, DATA_MAKE_NUM(DATADIR_M409, 0x32), 0x17, 0x18 };
GXColor lbl_1_data_158[8] = {
{ 0xFF, 0x00, 0x00, 0xFF },
{ 0x00, 0x00, 0xFF, 0xFF },
@ -61,7 +61,7 @@ void fn_1_67E0(Process* arg0) {
}
lbl_1_bss_39C = var_r30 = omAddObjEx(arg0, 0x40, 8, 0xA, 4, fn_1_91C0);
fn_1_BF88(0x40, 0x40);
fn_1_DF20(0x28002C, 0x40, 0x40);
fn_1_DF20(DATA_MAKE_NUM(DATADIR_M409, 0x2C), 0x40, 0x40);
temp_r28 = (u8)frand();
for (var_r31 = 0; var_r31 < (temp_r28 + 1); var_r31++) {
@ -95,7 +95,7 @@ void fn_1_6928(omObjData* arg0) {
s32 var_r30;
s32 var_r28;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct7), 0x10000000);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct7), MEMORY_DEFAULT_NUM);
arg0->data = var_r31;
var_r31->unk0 = arg0->work[0];
var_r31->unk1 = GWPlayerCfg[var_r31->unk0].character;
@ -133,12 +133,12 @@ void fn_1_6928(omObjData* arg0) {
Hu3DModelPosSet(var_r30, var_r31->unk24.x, var_r31->unk24.y, var_r31->unk24.z);
Hu3DModelRotSet(var_r30, 0.0f, 30.0f, 0.0f);
CharModelStepTypeSet(var_r31->unk1, 0);
arg0->model[1] = var_r30 = Hu3DModelCreate(HuDataSelHeapReadNum(0x280012, 0x10000000, HEAP_DATA));
arg0->model[1] = var_r30 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x12));
Hu3DModelHookSet(arg0->model[0], (char*)sp38[var_r31->unk1], arg0->model[1]);
var_r30 = fn_1_DA48(2, 1);
var_r31->unk57 = var_r30;
lbl_1_bss_F0.unk10[var_r30].unk30 = fn_1_8838;
fn_1_E2A8(var_r30, 0, 0x28002B, 0x40, 0x40);
fn_1_E2A8(var_r30, 0, DATA_MAKE_NUM(DATADIR_M409, 0x2B), 0x40, 0x40);
fn_1_F098(var_r30, lbl_1_data_158[var_r31->unk1].r, lbl_1_data_158[var_r31->unk1].g, lbl_1_data_158[var_r31->unk1].b, lbl_1_data_158[var_r31->unk1].a);
fn_1_F024(var_r30, 1, lbl_1_data_158[var_r31->unk1].r, lbl_1_data_158[var_r31->unk1].g, lbl_1_data_158[var_r31->unk1].b, 0x98);
fn_1_E85C(var_r30, 0, var_r31->unk24.x, 100.0f + var_r31->unk24.y, -1200.0f);
@ -149,7 +149,7 @@ void fn_1_6928(omObjData* arg0) {
fn_1_F408(var_r30, 1, 1);
var_r30 = fn_1_DA48(1, 1);
fn_1_DEF4(var_r30, 0, 0);
fn_1_E7C8(lbl_1_bss_F0.unk6, 0, 0x28002D);
fn_1_E7C8(lbl_1_bss_F0.unk6, 0, DATA_MAKE_NUM(DATADIR_M409, 0x2D));
var_r31->unk58 = var_r30;
lbl_1_bss_F0.unk10[var_r30].unk30 = &fn_1_8D6C;
fn_1_ED44(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 4);
@ -158,27 +158,27 @@ void fn_1_6928(omObjData* arg0) {
fn_1_EC1C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 0.5f, 0.5f, 1.0f);
var_r31->unk59 = 0;
var_r31->unk60 = 0;
var_r30 = espEntry(0x280031, 1, 0);
var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_M409, 0x31), 1, 0);
var_r31->unk55 = var_r30;
espColorSet(var_r30, 0, 0, 0);
espTPLvlSet(var_r30, 0.5);
espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x, lbl_1_data_178[var_r31->unk0].y);
espAttrSet(var_r30, 4);
var_r30 = espEntry(0x280030, 1, 0);
var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_M409, 0x30), 1, 0);
var_r31->unk54 = var_r30;
espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x, lbl_1_data_178[var_r31->unk0].y);
espAttrSet(var_r30, 4);
var_r30 = espEntry(var_r31->unk1 + 0x610000, 1, 0);
var_r30 = espEntry(var_r31->unk1 + DATA_MAKE_NUM(DATADIR_MGCONST, 0x00), 1, 0);
var_r31->unk56 = var_r30;
espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x - 27.0f, lbl_1_data_178[var_r31->unk0].y - 20.0f);
espAttrSet(var_r30, 4);
for (var_r28 = 0; var_r28 < 3; var_r28++) {
var_r30 = espEntry(0x61000A, 0, 0);
var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x0A), 0, 0);
var_r31->unk5A[var_r28][0] = var_r30;
espAttrSet(var_r30, 4);
espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x - 32.0f + (var_r28 * 0x1E), 16.0f + lbl_1_data_178[var_r31->unk0].y);
var_r30 = espEntry(0x61000B, 0, 0);
var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x0B), 0, 0);
var_r31->unk5A[var_r28][1] = var_r30;
espAttrSet(var_r30, 4);
espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x - 32.0f + (var_r28 * 0x1E), 16.0f + lbl_1_data_178[var_r31->unk0].y);
@ -286,7 +286,7 @@ void fn_1_7344(omObjData* arg0) {
Hu3DModelAttrSet(arg0->model[1], 1);
temp_r23 = fn_1_DA48(1, 1);
fn_1_DEF4(temp_r23, 0, 0);
fn_1_E7C8(lbl_1_bss_F0.unk6, 0, 0x28002C);
fn_1_E7C8(lbl_1_bss_F0.unk6, 0, DATA_MAKE_NUM(DATADIR_M409, 0x2C));
fn_1_E85C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 20.0f + temp_r31->unk24.x, 100.0f + temp_r31->unk24.y, temp_r31->unk24.z - 25.0f);
fn_1_EC1C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 2.0f, 2.0f, 1.0f);
fn_1_ED44(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 0x80000000);
@ -693,7 +693,7 @@ void fn_1_91C0(omObjData* arg0) {
Hu3DModelAttrSet(var_r28, 0x40000001);
for (var_r30 = 0; var_r30 < 3; var_r30++) {
arg0->motion[var_r30] = Hu3DJointMotion(var_r28, HuDataSelHeapReadNum(var_r30 + 0x28000F, 0x10000000, HEAP_DATA));
arg0->motion[var_r30] = Hu3DJointMotion(var_r28, HuDataSelHeapReadNum(var_r30 + DATA_MAKE_NUM(DATADIR_M409, 0x0F), MEMORY_DEFAULT_NUM, HEAP_DATA));
}
Hu3DMotionSet(var_r28, arg0->motion[0]);
omSetTra(arg0, 419.99997f, 250.0f, -180.0f);
@ -704,7 +704,7 @@ void fn_1_91C0(omObjData* arg0) {
}
for (var_r30 = 0; var_r30 < 8; var_r30++) {
var_r28 = Hu3DModelCreateFile(var_r30 + 0x28001B);
var_r28 = Hu3DModelCreateFile(var_r30 + DATA_MAKE_NUM(DATADIR_M409, 0x1B));
arg0->model[var_r30 + 1] = var_r28;
Hu3DModelAttrSet(var_r28, 1);
}
@ -712,7 +712,7 @@ void fn_1_91C0(omObjData* arg0) {
for (var_r31 = lbl_1_bss_10C, var_r30 = 0; var_r30 < 8; var_r30++, var_r31++) {
var_r28 = Hu3DModelCreateFile(var_r30 + 0x280013);
var_r28 = Hu3DModelCreateFile(var_r30 + DATA_MAKE_NUM(DATADIR_M409, 0x13));
var_r31->unk0 = var_r28;
Hu3DModelLayerSet(var_r28, 3);
var_r31->unkC.x = -400.0f + (100.0f * var_r30);
@ -728,7 +728,7 @@ void fn_1_91C0(omObjData* arg0) {
var_r31->unk30.z = var_r31->unkC.z;
var_r31->unk48 = var_r30;
fn_1_DEF4((var_r31->unk1 = fn_1_DA48(1, 1)), 0, 0);
fn_1_E2A8(lbl_1_bss_F0.unk6, 0, var_r30 + 0x280023, 0x40, 0x40);
fn_1_E2A8(lbl_1_bss_F0.unk6, 0, var_r30 + DATA_MAKE_NUM(DATADIR_M409, 0x23), 0x40, 0x40);
fn_1_EC1C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 2.0f, 2.0f, 1.0f);
fn_1_F024(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 0xFF, 0xFF, 0xFF, 0xA0);
fn_1_ED44(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 0x40000004);
@ -892,7 +892,7 @@ void fn_1_962C(omObjData* arg0) {
}
var_r26 = fn_1_DA48(1, 1);
fn_1_DEF4(var_r26, 0, 0);
fn_1_E7C8(lbl_1_bss_F0.unk6, 0, 0x28002C);
fn_1_E7C8(lbl_1_bss_F0.unk6, 0, DATA_MAKE_NUM(DATADIR_M409, 0x2C));
fn_1_E85C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, var_r31->unkC.x, var_r31->unkC.y, var_r31->unkC.z);
fn_1_EC1C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 4.0f, 4.0f, 1.0f);
fn_1_ED44(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 0x80000000);
@ -1232,4 +1232,4 @@ f32 fn_1_BF38(s16 arg0) {
hsfMotionData = motionData->unk_04->motion;
length = hsfMotionData->len;
return length;
}
}