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

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