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

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

@ -14,11 +14,11 @@ unkStruct3* lbl_1_bss_18;
unkStruct2* fn_1_1C64(s32 arg0) {
unkStruct2* temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, 0x10000000U);
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM);
if (!temp_r3) {
return NULL;
}
temp_r3->unk0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 4, 0x10000000U);
temp_r3->unk0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 4, MEMORY_DEFAULT_NUM);
if (!temp_r3->unk0) {
HuMemDirectFree(temp_r3);
return NULL;
@ -75,7 +75,7 @@ s32 fn_1_1DEC(unkStruct2* arg0) {
unkStruct3* fn_1_1DF4(void* arg0) {
unkStruct3* temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, 0x10000000);
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM);
if (!temp_r3) {
return NULL;
}
@ -250,7 +250,7 @@ unkStruct4* m446CardCreate(s32 arg0) {
unkStruct4* temp_r31;
unkStruct3* temp_r30;
temp_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x98, 0x10000000U);
temp_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x98, MEMORY_DEFAULT_NUM);
if (!temp_r31) {
OSReport("[!] m446CardCreate ERROR...\n");
return NULL;
@ -521,4 +521,4 @@ void fn_1_2F64(unkStruct4* arg0) {
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);
}
}

72
src/REL/m446Dll/cursor.c
View file

@ -1,27 +1,25 @@
#include "REL/m446Dll.h"
#include "math.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "math.h"
// bss
unkStruct3* lbl_1_bss_98;
unkStruct3 *lbl_1_bss_98;
// data
s32 lbl_1_data_3C8[9] = {
0x4D0012, 0x4D0013, 0x4D0014,
0x4D0015, 0x4D0016, 0x4D0017,
0x4D0018, 0x4D0019, 0x4D001A
};
s32 lbl_1_data_3C8[9] = { 0x4D0012, 0x4D0013, 0x4D0014, 0x4D0015, 0x4D0016, 0x4D0017, 0x4D0018, 0x4D0019, 0x4D001A };
s32 fn_1_72E0(void) {
s32 fn_1_72E0(void)
{
lbl_1_bss_98 = NULL;
return 1;
}
void fn_1_72F8(void) {
unkStruct3* var_r31;
unkStruct7* var_r30;
void fn_1_72F8(void)
{
unkStruct3 *var_r31;
unkStruct7 *var_r30;
var_r31 = lbl_1_bss_98;
if (var_r31) {
@ -33,10 +31,11 @@ void fn_1_72F8(void) {
}
}
void fn_1_7350(void) {
void fn_1_7350(void)
{
f32 temp_f31;
unkStruct3* var_r30;
unkStruct7* temp_r31;
unkStruct3 *var_r30;
unkStruct7 *temp_r31;
var_r30 = lbl_1_bss_98;
if (var_r30) {
@ -65,12 +64,13 @@ void fn_1_7350(void) {
}
}
unkStruct7* m446CursorCreate(s32 arg0) {
unkStruct7 *m446CursorCreate(s32 arg0)
{
s32 var_r30;
unkStruct7* var_r31;
unkStruct3* var_r29;
unkStruct7 *var_r31;
unkStruct3 *var_r29;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x54, 0x10000000);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x54, MEMORY_DEFAULT_NUM);
if (!var_r31) {
return NULL;
}
@ -84,7 +84,7 @@ unkStruct7* m446CursorCreate(s32 arg0) {
var_r31->field00_bit3 = 0;
var_r31->unk8 = arg0;
var_r31->unk48 = 0;
var_r31->unkC[0] = Hu3DModelCreateFile(0x4D0009);
var_r31->unkC[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M446, 0x09));
Hu3DModelLayerSet(var_r31->unkC[0], 6);
if (var_r31->unk8 == 0) {
for (var_r30 = 0; var_r30 < 9; var_r30++) {
@ -101,15 +101,17 @@ unkStruct7* m446CursorCreate(s32 arg0) {
}
if (lbl_1_bss_98) {
fn_1_1EC8(lbl_1_bss_98, var_r29);
} else {
}
else {
lbl_1_bss_98 = var_r29;
}
return var_r31;
}
void fn_1_76E8(unkStruct7* arg0) {
void fn_1_76E8(unkStruct7 *arg0)
{
s32 var_r29;
unkStruct3* var_r31;
unkStruct3 *var_r31;
var_r31 = lbl_1_bss_98;
if (var_r31) {
@ -134,7 +136,8 @@ void fn_1_76E8(unkStruct7* arg0) {
}
}
void fn_1_77C8(unkStruct7* arg0, u8 arg1) {
void fn_1_77C8(unkStruct7 *arg0, u8 arg1)
{
s32 var_r30;
arg0->field00_bit0 = 1;
@ -144,14 +147,16 @@ void fn_1_77C8(unkStruct7* arg0, u8 arg1) {
for (var_r30 = 0; var_r30 < 9; var_r30++) {
if (var_r30 == arg1) {
Hu3DModelAttrReset(arg0->unkC[var_r30 + 1], 1);
} else {
}
else {
Hu3DModelAttrSet(arg0->unkC[var_r30 + 1], 1);
}
}
}
}
void fn_1_7884(unkStruct7* arg0) {
void fn_1_7884(unkStruct7 *arg0)
{
s32 var_r30;
arg0->field00_bit0 = 0;
@ -163,7 +168,8 @@ void fn_1_7884(unkStruct7* arg0) {
}
}
void fn_1_7908(unkStruct7* arg0, Vec* arg1, s32 arg2) {
void fn_1_7908(unkStruct7 *arg0, Vec *arg1, s32 arg2)
{
arg0->unk38 = *arg1;
arg0->unk2C = arg0->unk20;
arg0->unk4C = 0.0f;
@ -171,7 +177,8 @@ void fn_1_7908(unkStruct7* arg0, Vec* arg1, s32 arg2) {
arg0->field00_bit1 = 1;
}
void fn_1_799C(unkStruct7* arg0) {
void fn_1_799C(unkStruct7 *arg0)
{
s32 var_r30;
if (arg0->unk8 == 0) {
@ -183,7 +190,8 @@ void fn_1_799C(unkStruct7* arg0) {
arg0->field00_bit3 = 1;
}
void fn_1_7A38(unkStruct7* arg0) {
void fn_1_7A38(unkStruct7 *arg0)
{
s32 var_r31;
if (arg0->unk8 == 0) {
@ -194,7 +202,8 @@ void fn_1_7A38(unkStruct7* arg0) {
arg0->field00_bit3 = 0;
}
void fn_1_7AB4(unkStruct7* arg0) {
void fn_1_7AB4(unkStruct7 *arg0)
{
f32 var_f31;
s32 temp_r29;
s32 var_r30;
@ -208,10 +217,11 @@ void fn_1_7AB4(unkStruct7* arg0) {
Hu3DModelScaleSet(arg0->unkC[temp_r29], arg0->unk44, arg0->unk44, arg0->unk44);
if (arg0->field00_bit2 != 0) {
var_f31 = 180.0f;
} else {
}
else {
var_f31 = 0.0f;
}
Hu3DModelRotSet(arg0->unkC[temp_r29], 0.0f, var_f31, 0.0f);
}
}
}
}

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

@ -18,7 +18,7 @@ unkStruct5* fn_1_3064(void) {
s32 var_r30;
unkStruct5* temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x10, 0x10000000);
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x10, MEMORY_DEFAULT_NUM);
if (!temp_r3) {
return NULL;
}
@ -184,4 +184,4 @@ void fn_1_38E0(u32 arg0) {
s32 fn_1_38F0(void) {
return ((lbl_1_bss_20 = (lbl_1_bss_20 * 0x41C64E6D) + 0x3039) >> 16) % 32768;
}
}

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

@ -96,7 +96,7 @@ unkStruct* m446FlowCreate(void) {
s32 var_r30;
unkStruct* temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x9C, 0x10000000);
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x9C, MEMORY_DEFAULT_NUM);
if (temp_r3 == 0) {
OSReport("[!] m446FlowCreate() ERROR...\n");
return NULL;
@ -635,9 +635,9 @@ s32 fn_1_1970(s16 arg0, s32 arg1, s32 arg2, s32 arg3) {
}
static const s32 lbl_1_rodata_18[12] = {
0x180003, 0x180004, 0x180005, 0x180006,
0x180007, 0x180008, 0x180009, 0x18000A,
0x18000B, 0x18000C, 0x18000D, 0
MAKE_MESSID(0x18, 0x03), MAKE_MESSID(0x18, 0x04), MAKE_MESSID(0x18, 0x05), MAKE_MESSID(0x18, 0x06),
MAKE_MESSID(0x18, 0x07), MAKE_MESSID(0x18, 0x08), MAKE_MESSID(0x18, 0x09), MAKE_MESSID(0x18, 0x0A),
MAKE_MESSID(0x18, 0x0B), MAKE_MESSID(0x18, 0x0C), MAKE_MESSID(0x18, 0x0D), 0
};
void fn_1_19D4(void) {
@ -652,11 +652,11 @@ void fn_1_19D4(void) {
HuWinBGTPLvlSet(temp_r3, 0.8f);
HuWinMesSpeedSet(temp_r3, 1);
HuWinMesColSet(temp_r3, 0);
HuWinMesSet(temp_r3, 0x180001);
HuWinMesSet(temp_r3, MAKE_MESSID(0x18, 0x01));
fn_1_18EC(temp_r3, 0x3C);
if (lbl_1_bss_10 < 2) {
HuWinMesColSet(temp_r3, 0);
HuWinMesSet(temp_r3, 0x180002);
HuWinMesSet(temp_r3, MAKE_MESSID(0x18, 0x02));
var_r30 = fn_1_1970(temp_r3, 0, 1, 0x3C);
} else {
var_r30 = 1;
@ -670,7 +670,7 @@ void fn_1_19D4(void) {
}
} else {
HuWinMesColSet(temp_r3, 0);
HuWinMesSet(temp_r3, 0x18000D);
HuWinMesSet(temp_r3, MAKE_MESSID(0x18, 0x0D));
fn_1_18EC(temp_r3, 0x3C);
}
HuWinExAnimOut(temp_r3);

381
src/REL/m446Dll/player.c
View file

@ -1,48 +1,102 @@
#include "REL/m446Dll.h"
#include "math.h"
#include "game/chrman.h"
#include "game/gamework_data.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/chrman.h"
#include "game/pad.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "math.h"
// cursor.c
extern unkStruct7 *m446CursorCreate(s32);
extern void fn_1_76E8(unkStruct7*);
extern void fn_1_77C8(unkStruct7*, u8);
extern void fn_1_76E8(unkStruct7 *);
extern void fn_1_77C8(unkStruct7 *, u8);
// bss
unkStruct3 *lbl_1_bss_30;
// data
s32 lbl_1_data_228[9] = {
0x4D000A, 0x4D000B, 0x4D000C,
0x4D000D, 0x4D000E, 0x4D000F,
0x4D0010, 0x4D0011, 0x4D0021
DATA_MAKE_NUM(DATADIR_M446, 10),
DATA_MAKE_NUM(DATADIR_M446, 11),
DATA_MAKE_NUM(DATADIR_M446, 12),
DATA_MAKE_NUM(DATADIR_M446, 13),
DATA_MAKE_NUM(DATADIR_M446, 14),
DATA_MAKE_NUM(DATADIR_M446, 15),
DATA_MAKE_NUM(DATADIR_M446, 16),
DATA_MAKE_NUM(DATADIR_M446, 17),
DATA_MAKE_NUM(DATADIR_M446, 33),
};
s32 lbl_1_data_24C[9][4] = {
{ 0x5F0000, 0x5F0036, 0x5F0017, 0x5F0072 },
{ 0x1A0000, 0x1A0036, 0x1A0017, 0x1A0072 },
{ 0x6D0000, 0x6D0036, 0x6D0017, 0x6D0072 },
{ 0x8A0000, 0x8A0036, 0x8A0017, 0x8A0072 },
{ 0x850000, 0x850036, 0x850017, 0x850072 },
{ 0x110000, 0x110036, 0x110017, 0x110072 },
{ 0x0D0000, 0x0D0036, 0x0D0017, 0x0D0072 },
{ 0x810000, 0x810036, 0x810017, 0x810072 },
{ 0x4D0022, 0x4D0023, 0x4D0025, 0x4D0024 }
};
m446Func8 lbl_1_data_2DC[5] = {NULL, fn_1_5B48, fn_1_5C24, fn_1_5D00, fn_1_6074};
s32 fn_1_480C(void) {
s32 lbl_1_data_24C[9][4] = {
{
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 54),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 23),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 114),
},
{
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 54),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 23),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 114),
},
{
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 54),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 23),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 114),
},
{
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 54),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 23),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 114),
},
{
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 54),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 23),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 114),
},
{
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 54),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 23),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 114),
},
{
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 54),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 23),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 114),
},
{
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 54),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 23),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 114),
},
{
DATA_MAKE_NUM(DATADIR_M446, 0x22),
DATA_MAKE_NUM(DATADIR_M446, 0x23),
DATA_MAKE_NUM(DATADIR_M446, 0x25),
DATA_MAKE_NUM(DATADIR_M446, 0x24),
},
};
m446Func8 lbl_1_data_2DC[5] = { NULL, fn_1_5B48, fn_1_5C24, fn_1_5D00, fn_1_6074 };
s32 fn_1_480C(void)
{
lbl_1_bss_30 = 0;
return 1;
}
void fn_1_4824(void) {
unkStruct3* var_r31;
void* var_r30;
void fn_1_4824(void)
{
unkStruct3 *var_r31;
void *var_r30;
var_r31 = lbl_1_bss_30;
if (var_r31) {
@ -54,10 +108,11 @@ void fn_1_4824(void) {
}
}
void fn_1_487C(void) {
void fn_1_487C(void)
{
f32 temp_f31;
unkStruct8* temp_r31;
unkStruct3* var_r30;
unkStruct8 *temp_r31;
unkStruct3 *var_r30;
var_r30 = lbl_1_bss_30;
if (var_r30) {
@ -100,43 +155,48 @@ void fn_1_487C(void) {
}
}
unkStruct8* m446PlayerCreate(s32 arg0, unkStruct6* arg1) {
unkStruct8 *m446PlayerCreate(s32 arg0, unkStruct6 *arg1)
{
f32 var_f31;
s32 var_r27;
s32 var_r26;
s16 var_r25;
s16 var_r24;
unkStruct3* var_r28;
unkStruct3 *var_r28;
s32 var_r30;
unkStruct8* var_r31;
unkStruct8 *var_r31;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xCC, 0x10000000);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xCC, MEMORY_DEFAULT_NUM);
if (!var_r31) {
return NULL;
}
var_r31->unk0 = arg0;
if (GWPlayerCfg[arg0].iscom != 0) {
var_r27 = 1;
} else {
}
else {
var_r27 = 0;
}
var_r31->unk68 = var_r27;
var_r31->unk4 = arg1;
if (GWPlayerCfg[arg0].character == 0xB) {
var_r26 = 1;
} else {
}
else {
var_r26 = 0;
}
var_r31->unk70 = var_r26;
if (var_r31->unk70 != 0) {
var_r25 = 8;
} else {
}
else {
var_r25 = GWPlayerCfg[arg0].character;
}
var_r31->unk64 = var_r25;
if (var_r31->unk68 != 0) {
var_r24 = 4;
} else {
}
else {
var_r24 = GWPlayerCfg[arg0].pad_idx;
}
var_r31->unk66 = var_r24;
@ -147,7 +207,8 @@ unkStruct8* m446PlayerCreate(s32 arg0, unkStruct6* arg1) {
var_r31->unk48.x = 0.0f;
if (var_r31->unk70 != 0) {
var_f31 = 70.0f;
} else {
}
else {
var_f31 = 0.0f;
}
var_r31->unk48.y = var_f31;
@ -163,7 +224,7 @@ unkStruct8* m446PlayerCreate(s32 arg0, unkStruct6* arg1) {
var_r31->unk1C = 0;
var_r31->unk98 = 0;
var_r31->unkB4 = 0;
for (var_r30 = 0; var_r30 < 3; var_r30++) {
var_r31->unk2C[var_r30] = NULL;
}
@ -174,19 +235,20 @@ unkStruct8* m446PlayerCreate(s32 arg0, unkStruct6* arg1) {
}
fn_1_7884(var_r31->unk8);
switch (var_r31->unk0) {
case 0:
var_r31->unk48.z = 150.0f;
var_r31->unk54.y = 180.0f;
break;
case 1:
var_r31->unk48.z = -150.0f;
var_r31->unk54.y = 0.0f;
break;
case 0:
var_r31->unk48.z = 150.0f;
var_r31->unk54.y = 180.0f;
break;
case 1:
var_r31->unk48.z = -150.0f;
var_r31->unk54.y = 0.0f;
break;
}
if (var_r31->unk70 != 0) {
var_r31->unk3C[0] = Hu3DModelCreateFile(0x4D0020);
var_r31->unk3C[1] = Hu3DModelCreateFile(0x4D0021);
} else {
var_r31->unk3C[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M446, 0x20));
var_r31->unk3C[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M446, 0x21));
}
else {
var_r31->unk3C[0] = CharModelCreate(var_r31->unk64, 2);
var_r31->unk3C[1] = Hu3DModelCreateFile(lbl_1_data_228[var_r31->unk64]);
}
@ -199,11 +261,12 @@ unkStruct8* m446PlayerCreate(s32 arg0, unkStruct6* arg1) {
Hu3DModelAttrSet(var_r31->unk3C[1], 1);
Hu3DModelPosSet(var_r31->unk3C[1], 2000.0f, 2000.0f, 2000.0f);
fn_1_637C(var_r31, 0);
for (var_r30 = 0; var_r30 < 4; var_r30++) {
if (var_r31->unk70 != 0) {
var_r31->unk40[var_r30] = Hu3DJointMotionFile(var_r31->unk3C[0], lbl_1_data_24C[var_r31->unk64][var_r30]);
} else {
}
else {
var_r31->unk40[var_r30] = CharModelMotionCreate(var_r31->unk64, lbl_1_data_24C[var_r31->unk64][var_r30]);
}
}
@ -212,7 +275,8 @@ unkStruct8* m446PlayerCreate(s32 arg0, unkStruct6* arg1) {
}
if (var_r31->unk70 != 0) {
Hu3DMotionSet(var_r31->unk3C[0], var_r31->unk40[0]);
} else {
}
else {
CharModelMotionSet(var_r31->unk64, var_r31->unk40[0]);
}
Hu3DModelAttrSet(var_r31->unk3C[0], 0x40000001);
@ -224,18 +288,20 @@ unkStruct8* m446PlayerCreate(s32 arg0, unkStruct6* arg1) {
}
if (lbl_1_bss_30) {
fn_1_1EC8(lbl_1_bss_30, var_r28);
} else {
}
else {
lbl_1_bss_30 = var_r28;
}
return var_r31;
}
void fn_1_509C(unkStruct8* arg0) {
void fn_1_509C(unkStruct8 *arg0)
{
s32 var_r29;
unkStruct3* var_r30;
unkStruct3 *var_r30;
var_r30 = lbl_1_bss_30;
do {
if (arg0 == var_r30->unk0) {
if (var_r30 == lbl_1_bss_30) {
@ -243,18 +309,20 @@ void fn_1_509C(unkStruct8* arg0) {
}
fn_1_1F04(var_r30);
fn_1_1E5C(var_r30);
for (var_r29 = 0; var_r29 < 4; var_r29++) {
if (arg0->unk70 != 0) {
Hu3DMotionKill(arg0->unk40[var_r29]);
} else {
}
else {
CharModelMotionKill(arg0->unk64, arg0->unk40[var_r29]);
}
}
if (arg0->unk70 != 0) {
Hu3DModelKill(arg0->unk3C[0]);
Hu3DModelKill(arg0->unk3C[1]);
} else {
}
else {
CharModelKill(arg0->unk64);
Hu3DModelKill(arg0->unk3C[1]);
}
@ -266,7 +334,8 @@ void fn_1_509C(unkStruct8* arg0) {
} while (var_r30);
}
s32 m446PlayerAppendCard(unkStruct8* arg0, unkStruct4* arg1, s32 arg2) {
s32 m446PlayerAppendCard(unkStruct8 *arg0, unkStruct4 *arg1, s32 arg2)
{
Vec sp18;
Vec spC;
s32 temp_r0_2;
@ -278,13 +347,13 @@ s32 m446PlayerAppendCard(unkStruct8* arg0, unkStruct4* arg1, s32 arg2) {
OSReport("m446PlayerAppendCard ERROR...\n");
return 0;
}
for (var_r29 = 0; var_r29 < 3; var_r29++) {
if (!arg0->unk2C[var_r29]) {
break;
}
}
if (var_r29 == 3) {
OSReport("m446PlayerAppendCard ERROR...\n");
return 0;
@ -302,15 +371,15 @@ s32 m446PlayerAppendCard(unkStruct8* arg0, unkStruct4* arg1, s32 arg2) {
sp18.z = -45.0f;
break;
}
spC = arg1->unk34;
switch (arg0->unk0) {
case 0:
spC.y = 0.0f;
break;
case 1:
spC.y = 180.0f;
break;
case 0:
spC.y = 0.0f;
break;
case 1:
spC.y = 180.0f;
break;
}
switch (arg2) {
case 0:
@ -336,14 +405,16 @@ s32 m446PlayerAppendCard(unkStruct8* arg0, unkStruct4* arg1, s32 arg2) {
if ((arg0->unk24 != 0) && (temp_r28 == 0)) {
HuAudFXPlay(0x76B);
fn_1_64BC(arg0, 1, 0x3C);
} else if ((arg0->unk20 != 0) && (temp_r27 == 0)) {
}
else if ((arg0->unk20 != 0) && (temp_r27 == 0)) {
HuAudFXPlay(0x76B);
fn_1_64BC(arg0, 0, 0x3C);
}
return 1;
}
s32 m446PlayerRemoveCard(unkStruct8* arg0, unkStruct4* arg1, s32 arg2) {
s32 m446PlayerRemoveCard(unkStruct8 *arg0, unkStruct4 *arg1, s32 arg2)
{
Vec spC;
s32 var_r30;
@ -351,7 +422,7 @@ s32 m446PlayerRemoveCard(unkStruct8* arg0, unkStruct4* arg1, s32 arg2) {
OSReport("m446PlayerRemoveCard ERROR...\n");
return 0;
}
for (var_r30 = 0; var_r30 < 3; var_r30++) {
if (arg0->unk2C[var_r30] == arg1) {
break;
@ -377,7 +448,8 @@ s32 m446PlayerRemoveCard(unkStruct8* arg0, unkStruct4* arg1, s32 arg2) {
return 1;
}
s32 fn_1_5648(unkStruct8* arg0, s32 arg1, unkStruct4** arg2) {
s32 fn_1_5648(unkStruct8 *arg0, s32 arg1, unkStruct4 **arg2)
{
if ((arg1 < 0) || (arg1 >= 3)) {
return 0;
}
@ -385,7 +457,8 @@ s32 fn_1_5648(unkStruct8* arg0, s32 arg1, unkStruct4** arg2) {
return 1;
}
s32 fn_1_5678(unkStruct8* arg0, unkStruct4** arg1, s32 arg2) {
s32 fn_1_5678(unkStruct8 *arg0, unkStruct4 **arg1, s32 arg2)
{
s32 sp14[3];
Vec sp8;
s32 var_r28;
@ -394,7 +467,7 @@ s32 fn_1_5678(unkStruct8* arg0, unkStruct4** arg1, s32 arg2) {
s32 var_r24;
s32 var_r27;
s32 var_r26;
unkStruct4* var_r29;
unkStruct4 *var_r29;
var_r27 = 0;
var_r26 = 0;
@ -412,14 +485,15 @@ s32 fn_1_5678(unkStruct8* arg0, unkStruct4** arg1, s32 arg2) {
break;
}
}
} else {
}
else {
for (var_r30 = 0; var_r30 < 3; var_r30++) {
var_r29 = arg0->unk2C[var_r30];
if (var_r29->unk0 != arg0->unk28) {
break;
}
}
var_r24 = fn_1_4720(arg0->unk4, var_r29->unk0);
if (var_r24 >= 2) {
for (var_r30 = 0; var_r30 < 3; var_r30++) {
@ -429,11 +503,13 @@ s32 fn_1_5678(unkStruct8* arg0, unkStruct4** arg1, s32 arg2) {
break;
}
}
} else {
}
else {
arg0->unk74 = (fn_1_38F0() % 3);
}
}
} else {
}
else {
for (var_r30 = 0; var_r30 < 3; var_r30++) {
var_r29 = arg0->unk2C[var_r30];
sp14[var_r30] = fn_1_4720(arg0->unk4, var_r29->unk0);
@ -450,7 +526,8 @@ s32 fn_1_5678(unkStruct8* arg0, unkStruct4** arg1, s32 arg2) {
}
if (var_r28 == 5) {
arg0->unk74 = (fn_1_38F0() % 3);
} else {
}
else {
arg0->unk74 = var_r30;
}
}
@ -459,22 +536,24 @@ s32 fn_1_5678(unkStruct8* arg0, unkStruct4** arg1, s32 arg2) {
}
if (arg0->unk7C > 0) {
arg0->unk7C--;
} else {
}
else {
var_r27 = arg0->unk74 < arg0->unk10;
var_r26 = arg0->unk74 > arg0->unk10;
var_r25 = arg0->unk74 == arg0->unk10;
arg0->unk7C = 0x12;
}
} else {
}
else {
switch (arg0->unk0) {
case 0:
var_r27 = (HuPadDStkRep[arg0->unk66] & 1) != 0;
var_r26 = (HuPadDStkRep[arg0->unk66] & 2) != 0;
break;
case 1:
var_r27 = (HuPadDStkRep[arg0->unk66] & 2) != 0;
var_r26 = (HuPadDStkRep[arg0->unk66] & 1) != 0;
break;
case 0:
var_r27 = (HuPadDStkRep[arg0->unk66] & 1) != 0;
var_r26 = (HuPadDStkRep[arg0->unk66] & 2) != 0;
break;
case 1:
var_r27 = (HuPadDStkRep[arg0->unk66] & 2) != 0;
var_r26 = (HuPadDStkRep[arg0->unk66] & 1) != 0;
break;
}
var_r25 = (HuPadBtnDown[arg0->unk66] & 0x100) != 0;
}
@ -513,19 +592,22 @@ s32 fn_1_5678(unkStruct8* arg0, unkStruct4** arg1, s32 arg2) {
return 0;
}
void fn_1_5B34(unkStruct8* arg0) {
void fn_1_5B34(unkStruct8 *arg0)
{
arg0->unk18 = 1;
arg0->unk1C = 0;
}
static const s32 lbl_1_rodata_1C8[4] = {0, 1, 2, 3};
static const s32 lbl_1_rodata_1C8[4] = { 0, 1, 2, 3 };
void fn_1_5B48(unkStruct8* arg0) {
void fn_1_5B48(unkStruct8 *arg0)
{
switch (arg0->unk1C) {
case 0:
if (arg0->unk70 != 0) {
Hu3DMotionShiftSet(arg0->unk3C[0], arg0->unk40[2], 0.0f, 10.0f, 0);
} else {
}
else {
CharModelMotionShiftSet(arg0->unk64, arg0->unk40[2], 0.0f, 10.0f, 0);
}
arg0->unk1C = 1;
@ -537,17 +619,20 @@ void fn_1_5B48(unkStruct8* arg0) {
}
}
void fn_1_5C10(unkStruct8* arg0) {
void fn_1_5C10(unkStruct8 *arg0)
{
arg0->unk18 = 2;
arg0->unk1C = 0;
}
void fn_1_5C24(unkStruct8* arg0) {
void fn_1_5C24(unkStruct8 *arg0)
{
switch (arg0->unk1C) {
case 0:
if (arg0->unk70 != 0) {
Hu3DMotionShiftSet(arg0->unk3C[0], arg0->unk40[3], 0.0f, 10.0f, 0);
} else {
}
else {
CharModelMotionShiftSet(arg0->unk64, arg0->unk40[3], 0.0f, 10.0f, 0);
}
arg0->unk1C = 1;
@ -559,12 +644,14 @@ void fn_1_5C24(unkStruct8* arg0) {
}
}
void fn_1_5CEC(unkStruct8* arg0) {
void fn_1_5CEC(unkStruct8 *arg0)
{
arg0->unk18 = 3;
arg0->unk1C = 0;
}
void fn_1_5D00(unkStruct8* arg0) {
void fn_1_5D00(unkStruct8 *arg0)
{
Vec sp8;
sp8 = arg0->unk54;
@ -573,7 +660,8 @@ void fn_1_5D00(unkStruct8* arg0) {
Hu3DModelAmbSet(arg0->unk3C[0], 0.8f, 0.8f, 0.8f);
if (arg0->unk70 != 0) {
Hu3DMotionShiftSet(arg0->unk3C[0], arg0->unk40[1], 0.0f, 10.0f, 0U);
} else {
}
else {
CharModelMotionShiftSet(arg0->unk64, arg0->unk40[1], 0.0f, 10.0f, 0x40000001U);
Hu3DMotionStartEndSet(arg0->unk3C[0], 0.0f, 59.0f);
}
@ -589,7 +677,8 @@ void fn_1_5D00(unkStruct8* arg0) {
}
}
void fn_1_5E54(unkStruct8* arg0, s32 arg1) {
void fn_1_5E54(unkStruct8 *arg0, s32 arg1)
{
Vec sp14;
Vec sp8;
f32 var_f31;
@ -598,11 +687,12 @@ void fn_1_5E54(unkStruct8* arg0, s32 arg1) {
if (arg0->unk70 != 0) {
var_f31 = 95.0f;
} else {
}
else {
var_f31 = 80.0f;
}
sp14.y = var_f31;
switch (arg0->unk0) {
case 0:
sp14.x = -30.0f + (30.0f * arg1);
@ -615,14 +705,16 @@ void fn_1_5E54(unkStruct8* arg0, s32 arg1) {
sp14.x = 30.0f - (30.0f * arg1);
if (arg0->unk70 != 0) {
var_f30 = 30.0f;
} else {
}
else {
var_f30 = 55.0f;
}
sp14.z = -50.0f - var_f30;
sp8.x = 0.0f;
if (arg0->unk70 != 0) {
var_f29 = 180.0f;
} else {
}
else {
var_f29 = -90.0f;
}
sp8.y = var_f29;
@ -635,11 +727,12 @@ void fn_1_5E54(unkStruct8* arg0, s32 arg1) {
arg0->unk1C = 0;
}
void fn_1_6074(unkStruct8* arg0) {
void fn_1_6074(unkStruct8 *arg0)
{
Vec sp8;
f32 var_f31;
f32 var_f30;
switch (arg0->unk1C) {
case 0:
arg0->unk1C = 1;
@ -648,7 +741,8 @@ void fn_1_6074(unkStruct8* arg0) {
sp8 = arg0->unk48;
if (arg0->unk0 == 0) {
var_f31 = -25.0f;
} else {
}
else {
var_f31 = 25.0f;
}
sp8.z += var_f31;
@ -658,7 +752,8 @@ void fn_1_6074(unkStruct8* arg0) {
arg0->unk14 = 0;
break;
case 2:
if (arg0->unk14++ < 0x1E) break;
if (arg0->unk14++ < 0x1E)
break;
arg0->unk1C = 3;
case 3:
Hu3DModelAttrSet(arg0->unk3C[1], 0x40000001);
@ -669,13 +764,15 @@ void fn_1_6074(unkStruct8* arg0) {
if (arg0->unk14 == 1) {
Hu3DModelAttrReset(arg0->unk3C[1], 0x40000001);
}
if (arg0->unk14++ < 0x1E) break;
if (arg0->unk14++ < 0x1E)
break;
arg0->unk1C = 5;
case 5:
sp8 = arg0->unk48;
if (arg0->unk0 == 0) {
var_f30 = -50.0f;
} else {
}
else {
var_f30 = 50.0f;
}
sp8.z -= var_f30;
@ -691,7 +788,8 @@ void fn_1_6074(unkStruct8* arg0) {
}
}
void fn_1_6264(unkStruct8* arg0, Vec* arg1, s32 arg2) {
void fn_1_6264(unkStruct8 *arg0, Vec *arg1, s32 arg2)
{
arg0->unk8C = *arg1;
arg0->unk80 = arg0->unk54;
arg0->unkB8 = 0.0f;
@ -699,7 +797,8 @@ void fn_1_6264(unkStruct8* arg0, Vec* arg1, s32 arg2) {
arg0->unk98 = 1;
}
void fn_1_62F0(unkStruct8* arg0, Vec* arg1, s32 arg2) {
void fn_1_62F0(unkStruct8 *arg0, Vec *arg1, s32 arg2)
{
arg0->unkA8 = *arg1;
arg0->unk9C = arg0->unk48;
arg0->unkC0 = 0.0f;
@ -707,7 +806,8 @@ void fn_1_62F0(unkStruct8* arg0, Vec* arg1, s32 arg2) {
arg0->unkB4 = 1;
}
void fn_1_637C(unkStruct8* arg0, s32 arg1) {
void fn_1_637C(unkStruct8 *arg0, s32 arg1)
{
f32 var_f31;
arg0->unkC8 = arg1;
@ -719,7 +819,8 @@ void fn_1_637C(unkStruct8* arg0, s32 arg1) {
arg0->unk48.x = 0.0f;
if (arg0->unk70 != 0) {
var_f31 = 70.0f;
} else {
}
else {
var_f31 = 0.0f;
}
arg0->unk48.y = var_f31;
@ -732,8 +833,8 @@ void fn_1_637C(unkStruct8* arg0, s32 arg1) {
arg0->unk48.z = -150.0f;
arg0->unk54.y = 0.0f;
return;
}
break;
}
break;
case 1:
Hu3DModelAttrReset(arg0->unk3C[1], 1);
Hu3DModelAttrSet(arg0->unk3C[0], 1);
@ -741,31 +842,35 @@ void fn_1_637C(unkStruct8* arg0, s32 arg1) {
}
}
void fn_1_64BC(unkStruct8* arg0, s32 arg1, s32 arg2) {
void fn_1_64BC(unkStruct8 *arg0, s32 arg1, s32 arg2)
{
if (arg0->unk70 == 0) {
switch (arg1) {
case 0:
omVibrate(arg0->unk0, arg2, 6, 6);
return;
case 1:
omVibrate(arg0->unk0, arg2, 4, 2);
return;
case 2:
omVibrate(arg0->unk0, arg2, 12, 0);
break;
case 0:
omVibrate(arg0->unk0, arg2, 6, 6);
return;
case 1:
omVibrate(arg0->unk0, arg2, 4, 2);
return;
case 2:
omVibrate(arg0->unk0, arg2, 12, 0);
break;
}
}
}
static inline unkStruct8UnkC8(unkStruct8* arg0) {
static inline unkStruct8UnkC8(unkStruct8 *arg0)
{
if (arg0->unkC8 == 0) {
return 0;
} else {
}
else {
return 1;
}
}
void fn_1_6578(unkStruct8* arg0) {
void fn_1_6578(unkStruct8 *arg0)
{
s32 var_r30;
var_r30 = unkStruct8UnkC8(arg0);
@ -774,16 +879,17 @@ void fn_1_6578(unkStruct8* arg0) {
Hu3DModelScaleSet(arg0->unk3C[var_r30], arg0->unk60, arg0->unk60, arg0->unk60);
}
void fn_1_6620(unkStruct8* arg0) {
void fn_1_6620(unkStruct8 *arg0)
{
s32 var_r26;
unkStruct4* temp_r27;
unkStruct4* temp_r30;
unkStruct4 *temp_r27;
unkStruct4 *temp_r30;
s32 var_r29;
s32 var_r28;
arg0->unk20 = 0;
arg0->unk24 = 0;
for (var_r29 = 0; var_r29 < 3; var_r29++) {
temp_r30 = arg0->unk2C[var_r29];
if (temp_r30) {
@ -794,7 +900,7 @@ void fn_1_6620(unkStruct8* arg0) {
var_r26 = 0;
temp_r30 = arg0->unk2C[var_r29];
if (temp_r30) {
for (var_r28 = 0; var_r28 < 3; var_r28++) {
temp_r27 = arg0->unk2C[var_r28];
if ((var_r29 != var_r28) && (temp_r27) && (temp_r30->unk0 == temp_r27->unk0)) {
@ -805,10 +911,11 @@ void fn_1_6620(unkStruct8* arg0) {
arg0->unk28 = temp_r30->unk0;
if (var_r26 == 1) {
arg0->unk20 = 1;
} else if (var_r26 == 2) {
}
else if (var_r26 == 2) {
arg0->unk24 = 1;
}
for (var_r28 = 0; var_r28 < 3; var_r28++) {
temp_r27 = arg0->unk2C[var_r28];
if ((temp_r27) && (temp_r30->unk0 == temp_r27->unk0)) {
@ -819,4 +926,4 @@ void fn_1_6620(unkStruct8* arg0) {
}
}
}
}
}

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

@ -108,7 +108,7 @@ unkStruct9* m446StageCreate(void) {
unkStruct3* temp_ret;
unkStruct9* var_r31;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x30, 0x10000000);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x30, MEMORY_DEFAULT_NUM);
if (!var_r31) {
return NULL;
}
@ -208,4 +208,4 @@ void fn_1_852C(unkStruct9* arg0) {
void fn_1_860C(unkStruct9* arg0) {
arg0->unk28 = 1;
}
}

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);
}
}
}
}