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

130
src/REL/m446Dll/table.c
View file

@ -3,16 +3,18 @@
#include "game/pad.h"
// bss
unkStruct3* lbl_1_bss_28;
unkStruct3 *lbl_1_bss_28;
s32 fn_1_3924(void) {
s32 fn_1_3924(void)
{
lbl_1_bss_28 = NULL;
return 1;
}
void fn_1_393C(void) {
unkStruct3* var_r31;
unkStruct6* var_r30;
void fn_1_393C(void)
{
unkStruct3 *var_r31;
unkStruct6 *var_r30;
var_r31 = lbl_1_bss_28;
if (var_r31) {
@ -24,9 +26,10 @@ void fn_1_393C(void) {
}
}
void fn_1_3994(void) {
unkStruct4* sp8;
unkStruct3* var_r31;
void fn_1_3994(void)
{
unkStruct4 *sp8;
unkStruct3 *var_r31;
var_r31 = lbl_1_bss_28;
if (var_r31) {
@ -37,16 +40,17 @@ void fn_1_3994(void) {
}
}
unkStruct6* fn_1_39D0(void) {
unkStruct6 *fn_1_39D0(void)
{
s32 var_r30;
unkStruct3* var_r29;
unkStruct6* var_r31;
unkStruct3 *var_r29;
unkStruct6 *var_r31;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x70, 0x10000000);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x70, MEMORY_DEFAULT_NUM);
if (!var_r31) {
return NULL;
}
var_r31->unk4 = Hu3DModelCreateFile(0x4D0005);
var_r31->unk4 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M446, 0x05));
Hu3DModelAmbSet(var_r31->unk4, 0.0f, 0.0f, 0.0f);
Hu3DModelShadowMapSet(var_r31->unk4);
Hu3DModelLayerSet(var_r31->unk4, 0);
@ -55,7 +59,7 @@ unkStruct6* fn_1_39D0(void) {
var_r31->unk60 = 10;
var_r31->unk5C = 0;
var_r31->unk6C = 0;
for (var_r30 = 0; var_r30 < 21; var_r30++) {
var_r31->unk8[var_r30] = NULL;
}
@ -68,14 +72,16 @@ unkStruct6* fn_1_39D0(void) {
}
if (lbl_1_bss_28) {
fn_1_1EC8(lbl_1_bss_28, var_r29);
} else {
}
else {
lbl_1_bss_28 = var_r29;
}
return var_r31;
}
void fn_1_3B4C(unkStruct6* arg0) {
unkStruct3* var_r31;
void fn_1_3B4C(unkStruct6 *arg0)
{
unkStruct3 *var_r31;
var_r31 = lbl_1_bss_28;
do {
@ -94,11 +100,12 @@ void fn_1_3B4C(unkStruct6* arg0) {
} while (var_r31);
}
s32 fn_1_3BF0(unkStruct6* arg0, unkStruct4* arg1, s32 arg2) {
s32 fn_1_3BF0(unkStruct6 *arg0, unkStruct4 *arg1, s32 arg2)
{
Vec sp18;
Vec spC;
s32 temp_r29;
if (arg0->unk5C >= 21) {
return 0;
}
@ -138,10 +145,11 @@ s32 fn_1_3BF0(unkStruct6* arg0, unkStruct4* arg1, s32 arg2) {
return 1;
}
s32 fn_1_3EB4(unkStruct6* arg0, unkStruct4* arg1, s32 arg2) {
s32 fn_1_3EB4(unkStruct6 *arg0, unkStruct4 *arg1, s32 arg2)
{
Vec spC;
s32 var_r31;
for (var_r31 = 0; var_r31 < 0x15; var_r31++) {
if (arg0->unk8[var_r31] == arg1) {
arg0->unk8[var_r31] = NULL;
@ -165,7 +173,8 @@ s32 fn_1_3EB4(unkStruct6* arg0, unkStruct4* arg1, s32 arg2) {
return 1;
}
s32 fn_1_3FD0(unkStruct6* arg0, s32 arg1, unkStruct4** arg2) {
s32 fn_1_3FD0(unkStruct6 *arg0, s32 arg1, unkStruct4 **arg2)
{
if ((arg1 < 0) || (arg1 >= 0x15)) {
return 0;
}
@ -173,21 +182,24 @@ s32 fn_1_3FD0(unkStruct6* arg0, s32 arg1, unkStruct4** arg2) {
return 1;
}
void fn_1_4000(unkStruct6* arg0, s32 arg1) {
void fn_1_4000(unkStruct6 *arg0, s32 arg1)
{
s32 var_r31;
unkStruct4* var_r30;
unkStruct4 *var_r30;
for (var_r31 = 0; var_r31 < 21; var_r31++) {
if (arg1 != 0) {
var_r30 = arg0->unk8[20 - var_r31];
} else {
}
else {
var_r30 = arg0->unk8[var_r31];
}
if ((var_r30) && (var_r30->unk64 == 0)) {
if (arg1 != 0) {
arg0->unk60 = (0x14 - var_r31);
return;
} else {
}
else {
arg0->unk60 = var_r31;
return;
}
@ -195,11 +207,12 @@ void fn_1_4000(unkStruct6* arg0, s32 arg1) {
}
}
s32 fn_1_4088(unkStruct6* arg0, u8 arg1, u8 arg2, s32 arg3, unkStruct4** arg4, s32 arg5) {
s32 fn_1_4088(unkStruct6 *arg0, u8 arg1, u8 arg2, s32 arg3, unkStruct4 **arg4, s32 arg5)
{
Vec sp10;
s32 var_r28;
s32 var_r27;
unkStruct4* temp_r26;
unkStruct4 *temp_r26;
s32 var_r25;
s32 var_r24;
s32 var_r23;
@ -214,11 +227,13 @@ s32 fn_1_4088(unkStruct6* arg0, u8 arg1, u8 arg2, s32 arg3, unkStruct4** arg4, s
*arg4 = NULL;
if (arg2 >= 4) {
if (arg0->unk6C == 0) {
arg0->unk64 = (s32) (fn_1_38F0() % 21);
arg0->unk64 = (s32)(fn_1_38F0() % 21);
do {
if (!(temp_r26 = arg0->unk8[arg0->unk64]) || temp_r26->unk64 != 0) {
arg0->unk64 = ++arg0->unk64 % 21;
} else break;
}
else
break;
(void)temp_r26;
} while (TRUE);
arg0->unk6C = 1;
@ -226,7 +241,8 @@ s32 fn_1_4088(unkStruct6* arg0, u8 arg1, u8 arg2, s32 arg3, unkStruct4** arg4, s
}
if ((arg0->unk68 > 0) && (arg5 == 0)) {
arg0->unk68 = (arg0->unk68 - 1);
} else {
}
else {
var_r28 = (arg0->unk64 / 7) < (arg0->unk60 / 7);
var_r27 = (arg0->unk64 / 7) > (arg0->unk60 / 7);
if ((var_r28 == 0) && (var_r27 == 0)) {
@ -236,7 +252,8 @@ s32 fn_1_4088(unkStruct6* arg0, u8 arg1, u8 arg2, s32 arg3, unkStruct4** arg4, s
var_r23 = arg0->unk64 == arg0->unk60;
arg0->unk68 = 0x12;
}
} else if (arg5 == 0) {
}
else if (arg5 == 0) {
var_r25 = (HuPadDStkRep[arg2] & 1) != 0;
var_r24 = (HuPadDStkRep[arg2] & 2) != 0;
var_r28 = (HuPadDStkRep[arg2] & 8) != 0;
@ -246,7 +263,8 @@ s32 fn_1_4088(unkStruct6* arg0, u8 arg1, u8 arg2, s32 arg3, unkStruct4** arg4, s
if (var_r25 != 0) {
if ((arg0->unk60 % 7) == 0) {
arg0->unk60 = (arg0->unk60 + 6);
} else {
}
else {
arg0->unk60 = (arg0->unk60 - 1);
}
HuAudFXPlay(0);
@ -254,7 +272,8 @@ s32 fn_1_4088(unkStruct6* arg0, u8 arg1, u8 arg2, s32 arg3, unkStruct4** arg4, s
if (var_r24 != 0) {
if ((arg0->unk60 % 7) == 6) {
arg0->unk60 = (arg0->unk60 - 6);
} else {
}
else {
arg0->unk60 = (arg0->unk60 + 1);
}
HuAudFXPlay(0);
@ -262,7 +281,8 @@ s32 fn_1_4088(unkStruct6* arg0, u8 arg1, u8 arg2, s32 arg3, unkStruct4** arg4, s
if (var_r28 != 0) {
if ((arg0->unk60 / 7) == 0) {
arg0->unk60 = (arg0->unk60 + 0xE);
} else {
}
else {
arg0->unk60 = (arg0->unk60 - 7);
}
HuAudFXPlay(0);
@ -270,7 +290,8 @@ s32 fn_1_4088(unkStruct6* arg0, u8 arg1, u8 arg2, s32 arg3, unkStruct4** arg4, s
if (var_r27 != 0) {
if ((arg0->unk60 / 7) == 2) {
arg0->unk60 = (arg0->unk60 - 0xE);
} else {
}
else {
arg0->unk60 = (arg0->unk60 + 7);
}
HuAudFXPlay(0);
@ -295,36 +316,39 @@ s32 fn_1_4088(unkStruct6* arg0, u8 arg1, u8 arg2, s32 arg3, unkStruct4** arg4, s
return 1;
}
HuAudFXPlay(4);
} else {
HuAudFXPlay(4);
}
else {
HuAudFXPlay(4);
}
}
return 0;
}
void fn_1_46AC(unkStruct6* arg0) {
arg0->unk8[0] = (unkStruct4*)-1;
arg0->unk8[6] = (unkStruct4*)-1;
arg0->unk8[14] = (unkStruct4*)-1;
arg0->unk8[20] = (unkStruct4*)-1;
void fn_1_46AC(unkStruct6 *arg0)
{
arg0->unk8[0] = (unkStruct4 *)-1;
arg0->unk8[6] = (unkStruct4 *)-1;
arg0->unk8[14] = (unkStruct4 *)-1;
arg0->unk8[20] = (unkStruct4 *)-1;
}
void fn_1_46D0(unkStruct6* arg0) {
void fn_1_46D0(unkStruct6 *arg0)
{
s32 var_r31;
for (var_r31 = 0; var_r31 < 21; var_r31++) {
if (arg0->unk8[var_r31] == (unkStruct4*)-1) {
if (arg0->unk8[var_r31] == (unkStruct4 *)-1) {
arg0->unk8[var_r31] = 0;
}
}
}
s32 fn_1_4720(unkStruct6* arg0, s32 arg1) {
s32 fn_1_4720(unkStruct6 *arg0, s32 arg1)
{
s32 var_r29;
s32 var_r30;
unkStruct4* temp_r31;
unkStruct4 *temp_r31;
for (var_r29 = 0, var_r30 = 0; var_r30 < 21; var_r30++) {
temp_r31 = arg0->unk8[var_r30];
if ((temp_r31) && (temp_r31->unk64 == 0) && ((temp_r31->unk0 == arg1) || (arg1 == 5))) {
@ -334,15 +358,15 @@ s32 fn_1_4720(unkStruct6* arg0, s32 arg1) {
return var_r29;
}
void fn_1_4798(unkStruct6* arg0) {
unkStruct4* temp_r31;
void fn_1_4798(unkStruct6 *arg0)
{
unkStruct4 *temp_r31;
s32 var_r30;
for (var_r30 = 0; var_r30 < 0x15; var_r30++) {
temp_r31 = arg0->unk8[var_r30];
if (temp_r31 && (temp_r31->unk64 != 0)) {
fn_1_2794(temp_r31);
}
}
}
}