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

Merge branch 'main' of https://github.com/abnormalhare/marioparty4

Browse source
This commit is contained in:
CreateSource 2024-06-14 22:40:58 -04:00
commit 9bdbeb0bc7
7 changed files with 3409 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config/GMPE01_00/rels/m406Dll/symbols.txt
View file

@ -248,7 +248,7 @@ lbl_1_rodata_278 = .rodata:0x00000278; // type:object size:0x8 scope:local data:
lbl_1_rodata_280 = .rodata:0x00000280; // type:object size:0x8 scope:local data:double
lbl_1_rodata_288 = .rodata:0x00000288; // type:object size:0x4 scope:local data:float
lbl_1_rodata_290 = .rodata:0x00000290; // type:object size:0x8 scope:local data:double
lbl_1_rodata_298 = .rodata:0x00000298; // type:object size:0x1 scope:local data:byte
lbl_1_rodata_298 = .rodata:0x00000298; // type:object size:0x4 scope:local data:byte
lbl_1_rodata_29C = .rodata:0x0000029C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2A0 = .rodata:0x000002A0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2A4 = .rodata:0x000002A4; // type:object size:0x4 scope:local data:float
@ -358,7 +358,7 @@ lbl_1_data_82C = .data:0x0000082C; // type:object size:0xC
lbl_1_data_838 = .data:0x00000838; // type:object size:0xC
lbl_1_data_844 = .data:0x00000844; // type:object size:0xC
lbl_1_data_850 = .data:0x00000850; // type:object size:0x20
lbl_1_data_870 = .data:0x00000870; // type:object size:0x1F data:string
lbl_1_data_870 = .data:0x00000870; // type:object size:0x1F scope:local data:string
lbl_1_data_88F = .data:0x0000088F; // type:object size:0x4 data:byte
lbl_1_data_893 = .data:0x00000893; // type:object size:0x4 data:byte
lbl_1_data_897 = .data:0x00000897; // type:object size:0x4 data:byte
@ -403,7 +403,8 @@ lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:4byte
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:4byte
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0xC data:4byte
lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0xC data:4byte
lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x50
lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x44 data:4byte
lbl_1_bss_8C = .bss:0x0000008C; // type:object size:0xC data:4byte
lbl_1_bss_98 = .bss:0x00000098; // type:object size:0x4 data:4byte
lbl_1_bss_9C = .bss:0x0000009C; // type:object size:0x4 data:4byte
lbl_1_bss_A0 = .bss:0x000000A0; // type:object size:0x4 data:4byte

2
configure.py
View file

@ -861,7 +861,7 @@ config.libs = [
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m406Dll/main.c"),
Object(NonMatching, "REL/m406Dll/map.c"),
Object(Matching, "REL/m406Dll/map.c"),
Object(NonMatching, "REL/m406Dll/player.c"),
},
),

12
include/REL/m406Dll.h
View file

@ -4,16 +4,16 @@
#include "game/object.h"
#include "game/process.h"
u32 fn_1_122C(void);
// ? fn_1_2308(Process *);
// ? fn_1_2BEC(void);
s32 fn_1_122C(void);
omObjData *fn_1_2308(Process *arg0);
void fn_1_2BEC(void);
void fn_1_3064(s32 arg0);
void fn_1_696C(float arg8);
void fn_1_6B5C(void);
void fn_1_B104(float arg8);
void fn_1_B25C(void);
// ? fn_1_B41C(void);
// ? fn_1_D65C(Process *);
// ? fn_1_D8B0(void);
void fn_1_B41C(void);
void fn_1_D65C(Process *arg0);
void fn_1_D8B0(void);
#endif

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

@ -377,7 +377,7 @@ void fn_1_1168(omObjData *object)
}
}
u32 fn_1_122C(void)
s32 fn_1_122C(void)
{
return lbl_1_bss_1C;
}

3382
src/REL/m406Dll/map.c Normal file
View file

File diff suppressed because it is too large Load diff

22
src/REL/m426Dll/main.c
View file

@ -2758,7 +2758,7 @@ s16 fn_1_795C(AnimData *arg0, s16 arg1)
var_r23 = Hu3DHookFuncCreate(fn_1_80DC);
var_r27 = &Hu3DData[var_r23];
var_r31 = HuMemDirectMallocNum(HEAP_DATA, sizeof(UnkModelDataUnk120Struct), (u32)var_r27->unk_48);
var_r31 = HuMemDirectMallocNum(HEAP_DATA, sizeof(UnkModelDataUnk120Struct), var_r27->unk_48);
var_r27->unk_120 = var_r31;
var_r31->unk_38 = arg0;
var_r31->unk_24 = arg1;
@ -2769,7 +2769,7 @@ s16 fn_1_795C(AnimData *arg0, s16 arg1)
var_r31->unk_21 = 0;
var_r31->unk_30 = 0;
var_r31->unk_00 = var_r31->unk_02 = 0;
var_r28 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(UnkM426Struct8), (u32)var_r27->unk_48);
var_r28 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(UnkM426Struct8), var_r27->unk_48);
var_r31->unk_3C = var_r28;
for (var_r30 = 0; var_r30 < arg1; var_r30++, var_r28++) {
var_r28->unk_28 = 0.0f;
@ -2780,12 +2780,12 @@ s16 fn_1_795C(AnimData *arg0, s16 arg1)
var_r28->unk_3C.r = var_r28->unk_3C.g = var_r28->unk_3C.b = var_r28->unk_3C.a = 255;
var_r28->unk_40 = 0;
}
var_r26 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(Vec) * 4, (u32)var_r27->unk_48);
var_r26 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(Vec) * 4, var_r27->unk_48);
var_r31->unk_40 = var_r26;
for (var_r30 = 0; var_r30 < arg1 * 4; var_r30++, var_r26++) {
var_r26->x = var_r26->y = var_r26->z = 0.0f;
}
var_r29 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(Vec2f) * 4, (u32)var_r27->unk_48);
var_r29 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(Vec2f) * 4, var_r27->unk_48);
var_r31->unk_44 = var_r29;
for (var_r30 = 0; var_r30 < arg1; var_r30++) {
var_r29->x = 0.0f;
@ -2801,7 +2801,7 @@ s16 fn_1_795C(AnimData *arg0, s16 arg1)
var_r29->y = 1.0f;
var_r29++;
}
var_r24 = HuMemDirectMallocNum(HEAP_DATA, 0x4000, (u32)var_r27->unk_48);
var_r24 = HuMemDirectMallocNum(HEAP_DATA, 0x4000, var_r27->unk_48);
var_r22 = var_r24;
DCFlushRange(var_r24, 0x4000);
GXBeginDisplayList(var_r22, 0x4000);
@ -2824,7 +2824,7 @@ s16 fn_1_795C(AnimData *arg0, s16 arg1)
GXTexCoord1x16(var_r30 * 4 + 3);
}
var_r31->unk_34 = GXEndDisplayList();
var_r31->unk_48 = HuMemDirectMallocNum(HEAP_DATA, var_r31->unk_34, (u32)var_r27->unk_48);
var_r31->unk_48 = HuMemDirectMallocNum(HEAP_DATA, var_r31->unk_34, var_r27->unk_48);
memcpy(var_r31->unk_48, var_r24, var_r31->unk_34);
DCFlushRange(var_r31->unk_48, var_r31->unk_34);
HuMemDirectFree(var_r24);
@ -2848,7 +2848,7 @@ s16 fn_1_7DC8(s16 arg0)
var_r26 = var_r23->unk_120;
var_r22 = Hu3DHookFuncCreate(var_r23->hook);
var_r27 = &Hu3DData[var_r22];
var_r31 = HuMemDirectMallocNum(HEAP_DATA, sizeof(UnkModelDataUnk120Struct), (u32)var_r27->unk_48); // TODO fix
var_r31 = HuMemDirectMallocNum(HEAP_DATA, sizeof(UnkModelDataUnk120Struct), var_r27->unk_48); // TODO fix
var_r27->unk_120 = var_r31;
var_r31->unk_38 = var_r26->unk_38;
var_r31->unk_24 = var_r26->unk_24;
@ -2860,7 +2860,7 @@ s16 fn_1_7DC8(s16 arg0)
var_r31->unk_21 = 0;
var_r31->unk_30 = 0;
var_r31->unk_00 = var_r31->unk_02 = 0;
var_r29 = HuMemDirectMallocNum(HEAP_DATA, var_r24 * sizeof(UnkM426Struct8), (u32)var_r27->unk_48);
var_r29 = HuMemDirectMallocNum(HEAP_DATA, var_r24 * sizeof(UnkM426Struct8), var_r27->unk_48);
var_r31->unk_3C = var_r29;
for (var_r28 = 0; var_r28 < var_r24; var_r28++, var_r29++) {
var_r29->unk_28 = 0.0f;
@ -2872,12 +2872,12 @@ s16 fn_1_7DC8(s16 arg0)
var_r29->unk_40 = 0;
}
var_r25 = HuMemDirectMallocNum(HEAP_DATA, var_r24 * sizeof(Vec) * 4, (u32)var_r27->unk_48);
var_r25 = HuMemDirectMallocNum(HEAP_DATA, var_r24 * sizeof(Vec) * 4, var_r27->unk_48);
var_r31->unk_40 = var_r25;
for (var_r28 = 0; var_r28 < (4 * var_r24); var_r28++, var_r25++) {
var_r25->x = var_r25->y = var_r25->z = 0.0f;
}
var_r30 = HuMemDirectMallocNum(HEAP_DATA, var_r24 * sizeof(Vec2f) * 4, (u32)var_r27->unk_48);
var_r30 = HuMemDirectMallocNum(HEAP_DATA, var_r24 * sizeof(Vec2f) * 4, var_r27->unk_48);
var_r31->unk_44 = var_r30;
for (var_r28 = 0; var_r28 < var_r24; var_r28++) {
var_r30->x = 0.0f;
@ -3433,6 +3433,6 @@ void fn_1_995C(s16 arg0)
}
DCStoreRangeNoSync(var_r30->data, var_r30->count * sizeof(UnkM426Struct12));
}
HuMemDirectFreeNum(HEAP_DATA, (u32)var_r29->unk_48);
HuMemDirectFreeNum(HEAP_DATA, var_r29->unk_48);
MakeDisplayList(arg0, var_r29->unk_48);
}

8
src/game/hsfanim.c
View file

@ -496,7 +496,7 @@ s16 Hu3DParticleCreate(AnimData *arg0, s16 arg1) {
temp_r25 = Hu3DHookFuncCreate((void*) &_Hu3DParticleAttrReset);
temp_r28 = &Hu3DData[temp_r25];
Hu3DModelAttrSet(temp_r25, 0x20);
temp_r31 = HuMemDirectMallocNum(HEAP_DATA, sizeof(ParticleData), (u32) temp_r28->unk_48);
temp_r31 = HuMemDirectMallocNum(HEAP_DATA, sizeof(ParticleData), temp_r28->unk_48);
temp_r28->unk_120 = temp_r31;
temp_r31->unk_44 = arg0;
arg0->useNum++;
@ -507,7 +507,7 @@ s16 Hu3DParticleCreate(AnimData *arg0, s16 arg1) {
temp_r31->unk_2D = 0;
temp_r31->unk_3C = 0;
temp_r31->unk_00 = temp_r31->unk_02 = 0;
var_r30 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(HsfanimStruct01), (u32) temp_r28->unk_48);
var_r30 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(HsfanimStruct01), temp_r28->unk_48);
temp_r31->unk_48 = var_r30;
temp_r31->unk_38 = -1;
for (i = 0; i < arg1; i++, var_r30++) {
@ -520,12 +520,12 @@ s16 Hu3DParticleCreate(AnimData *arg0, s16 arg1) {
var_r30->unk34.z = ((s32) (frand() & 0x7F) - 0x40) * 0x14;
var_r30->unk40.r = var_r30->unk40.g = var_r30->unk40.b = var_r30->unk40.a = 0xFF;
}
var_r27 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(Vec) * 4, (u32) temp_r28->unk_48);
var_r27 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(Vec) * 4, temp_r28->unk_48);
temp_r31->unk_4C = var_r27;
for (i = 0; i < arg1 * 4; i++, var_r27++) {
var_r27->x = var_r27->y = var_r27->z = 0.0f;
}
temp_r24 = HuMemDirectMallocNum(HEAP_DATA, arg1 * 0x60 + 0x80, (u32) temp_r28->unk_48);
temp_r24 = HuMemDirectMallocNum(HEAP_DATA, arg1 * 0x60 + 0x80, temp_r28->unk_48);
temp_r31->unk_50 = temp_r24;
DCInvalidateRange(temp_r24, arg1 * 0x60 + 0x80);
GXBeginDisplayList(temp_r24, 0x20000);