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

Rename m02Dice to m02GenDice

Browse source
This commit is contained in:
gamemasterplc 2024-06-10 17:30:27 -05:00
parent f77ef40a9f
commit 741bdc1552
3 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/REL/w02Dll.h
View file

@ -42,7 +42,7 @@ typedef struct m02_dice {
/* 0x96 */ s16 unk96; /* 0x96 */ s16 unk96;
/* 0x98 */ f32 unk98; /* 0x98 */ f32 unk98;
/* 0x9C */ s16 unk9C; /* 0x9C */ s16 unk9C;
} m02Dice; } m02GenDice;
extern s16 lbl_1_bss_30[0x10]; // Model List extern s16 lbl_1_bss_30[0x10]; // Model List
@ -57,9 +57,9 @@ extern void fn_1_92C();
extern s32 fn_1_1128(); extern s32 fn_1_1128();
extern void fn_1_121C(u32); extern void fn_1_121C(u32);
void fn_1_1254(m02Dice* arg0); void fn_1_1254(m02GenDice* arg0);
void fn_1_1518(m02Dice* arg0); void fn_1_1518(m02GenDice* arg0);
s32 fn_1_17F4(m02Dice* arg0); s32 fn_1_17F4(m02GenDice* arg0);
// roulette.c // roulette.c
extern void fn_1_D3AC(); extern void fn_1_D3AC();

66
src/REL/w02Dll/dice.c
View file

@ -21,20 +21,20 @@ typedef struct {
/* EXTERN FUNCTIONS */ /* EXTERN FUNCTIONS */
void fn_1_13D0(void); void fn_1_13D0(void);
void fn_1_1574(m02Dice *arg0); void fn_1_1574(m02GenDice *arg0);
void fn_1_1794(m02Dice *arg0); void fn_1_1794(m02GenDice *arg0);
void fn_1_1850(omObjData *object); void fn_1_1850(omObjData *object);
void fn_1_1F94(m02Dice* arg0, s32 arg1); void fn_1_1F94(m02GenDice* arg0, s32 arg1);
void fn_1_2030(m02Dice *arg0); void fn_1_2030(m02GenDice *arg0);
void fn_1_2100(m02Dice *arg0, s32 arg1); void fn_1_2100(m02GenDice *arg0, s32 arg1);
void fn_1_2220(m02Dice *arg0); void fn_1_2220(m02GenDice *arg0);
s32 fn_1_233C(m02Dice *arg0); s32 fn_1_233C(m02GenDice *arg0);
void fn_1_23FC(m02Dice *arg0, s32 arg1); void fn_1_23FC(m02GenDice *arg0, s32 arg1);
void fn_1_23B4(m02Dice *arg0, s32 arg1); void fn_1_23B4(m02GenDice *arg0, s32 arg1);
void fn_1_272C(m02Dice *arg0); void fn_1_272C(m02GenDice *arg0);
/* LOCAL FUNCTIONS */ /* LOCAL FUNCTIONS */
void fn_1_1254(m02Dice* arg0) { void fn_1_1254(m02GenDice* arg0) {
Vec sp8; Vec sp8;
s32 i; s32 i;
@ -65,7 +65,7 @@ void fn_1_13D0(void) {
s32 var_r29; s32 var_r29;
s32 i; s32 i;
s32 var_r30_2; s32 var_r30_2;
m02Dice* temp_r31; m02GenDice* temp_r31;
temp_r31 = HuPrcCurrentGet()->user_data; temp_r31 = HuPrcCurrentGet()->user_data;
temp_r31->unk36[0] = temp_r31->unk36[1] = temp_r31->unk36[2] = 0; temp_r31->unk36[0] = temp_r31->unk36[1] = temp_r31->unk36[2] = 0;
@ -106,7 +106,7 @@ void fn_1_13D0(void) {
} }
} }
void fn_1_1518(m02Dice* arg0) { void fn_1_1518(m02GenDice* arg0) {
OSReport("m02GenDiceKill\n"); OSReport("m02GenDiceKill\n");
if (arg0->unk2C) { if (arg0->unk2C) {
HuPrcKill(arg0->unk2C); HuPrcKill(arg0->unk2C);
@ -115,7 +115,7 @@ void fn_1_1518(m02Dice* arg0) {
fn_1_272C(arg0); fn_1_272C(arg0);
} }
void fn_1_1574(m02Dice* arg0) { void fn_1_1574(m02GenDice* arg0) {
Vec sp8; Vec sp8;
f32 temp_f0; f32 temp_f0;
omObjData* temp_r3; omObjData* temp_r3;
@ -153,7 +153,7 @@ void fn_1_1574(m02Dice* arg0) {
HuAudFXPlay(0x302); HuAudFXPlay(0x302);
} }
void fn_1_1794(m02Dice* arg0) { void fn_1_1794(m02GenDice* arg0) {
WorkDice* temp_r30; WorkDice* temp_r30;
temp_r30 = OM_GET_WORK_PTR(arg0->unk3C[arg0->unk96], WorkDice); temp_r30 = OM_GET_WORK_PTR(arg0->unk3C[arg0->unk96], WorkDice);
@ -162,7 +162,7 @@ void fn_1_1794(m02Dice* arg0) {
} }
} }
s32 fn_1_17F4(m02Dice* arg0) s32 fn_1_17F4(m02GenDice* arg0)
{ {
WorkDice* temp; WorkDice* temp;
if ( arg0->unk96 < 0) { if ( arg0->unk96 < 0) {
@ -178,13 +178,13 @@ s32 fn_1_17F4(m02Dice* arg0)
void fn_1_1850(omObjData *object) void fn_1_1850(omObjData *object)
{ {
WorkDice *temp_r29; WorkDice *temp_r29;
m02Dice *temp_r27; m02GenDice *temp_r27;
s16 temp_r26; s16 temp_r26;
s16 temp_r25; s16 temp_r25;
float temp_f29; float temp_f29;
float temp_f28; float temp_f28;
float temp_f27; float temp_f27;
temp_r27 = (m02Dice *)object->unk10; temp_r27 = (m02GenDice *)object->unk10;
temp_r29 = OM_GET_WORK_PTR(object, WorkDice); temp_r29 = OM_GET_WORK_PTR(object, WorkDice);
if(temp_r29->unk7 || BoardIsKill()) { if(temp_r29->unk7 || BoardIsKill()) {
fn_1_1F94(temp_r27, temp_r29->unk1); fn_1_1F94(temp_r27, temp_r29->unk1);
@ -291,7 +291,7 @@ void fn_1_1850(omObjData *object)
BoardModelScaleSet(temp_r27->unk30[temp_r29->unk1], object->scale.x, object->scale.y, object->scale.z); BoardModelScaleSet(temp_r27->unk30[temp_r29->unk1], object->scale.x, object->scale.y, object->scale.z);
} }
void fn_1_1F94(m02Dice* arg0, s32 arg1) { void fn_1_1F94(m02GenDice* arg0, s32 arg1) {
if (arg0->unk30[arg1] != -1) { if (arg0->unk30[arg1] != -1) {
BoardModelKill(arg0->unk30[arg1]); BoardModelKill(arg0->unk30[arg1]);
arg0->unk30[arg1] = -1; arg0->unk30[arg1] = -1;
@ -303,7 +303,7 @@ void fn_1_1F94(m02Dice* arg0, s32 arg1) {
} }
} }
void fn_1_2030(m02Dice *arg0) void fn_1_2030(m02GenDice *arg0)
{ {
fn_1_1F94(arg0, 0); fn_1_1F94(arg0, 0);
fn_1_1F94(arg0, 1); fn_1_1F94(arg0, 1);
@ -337,7 +337,7 @@ HsfanimStruct00 lbl_1_data_2D8 = {
} }
}; };
void fn_1_2100(m02Dice *arg0, s32 arg1) void fn_1_2100(m02GenDice *arg0, s32 arg1)
{ {
s16 temp_r29; s16 temp_r29;
AnimData *temp_r28; AnimData *temp_r28;
@ -353,7 +353,7 @@ void fn_1_2100(m02Dice *arg0, s32 arg1)
Hu3DParticleBlendModeSet(temp_r29, 0); Hu3DParticleBlendModeSet(temp_r29, 0);
} }
void fn_1_2220(m02Dice *arg0) void fn_1_2220(m02GenDice *arg0)
{ {
s32 temp_r30; s32 temp_r30;
WorkDice *temp_r29; WorkDice *temp_r29;
@ -377,7 +377,7 @@ typedef struct {
float unk08; float unk08;
} WorkDiceNum; } WorkDiceNum;
void fn_1_22BC(m02Dice *arg0) void fn_1_22BC(m02GenDice *arg0)
{ {
s32 temp_r31; s32 temp_r31;
WorkDiceNum *temp_r30; WorkDiceNum *temp_r30;
@ -391,7 +391,7 @@ void fn_1_22BC(m02Dice *arg0)
} }
} }
s32 fn_1_233C(m02Dice* arg0) s32 fn_1_233C(m02GenDice* arg0)
{ {
s32 temp_r31; s32 temp_r31;
WorkDiceNum *temp_r30; WorkDiceNum *temp_r30;
@ -407,7 +407,7 @@ s32 fn_1_233C(m02Dice* arg0)
return 1; return 1;
} }
void fn_1_23B4(m02Dice *arg0, s32 arg1) void fn_1_23B4(m02GenDice *arg0, s32 arg1)
{ {
WorkDiceNum *work; WorkDiceNum *work;
if(!arg0->unk50[arg1]) { if(!arg0->unk50[arg1]) {
@ -419,7 +419,7 @@ void fn_1_23B4(m02Dice *arg0, s32 arg1)
void fn_1_25D0(omObjData *object); void fn_1_25D0(omObjData *object);
void fn_1_23FC(m02Dice *arg0, s32 arg1) void fn_1_23FC(m02GenDice *arg0, s32 arg1)
{ {
Vec spC; Vec spC;
s16 sp8[2]; s16 sp8[2];
@ -459,14 +459,14 @@ void fn_1_23FC(m02Dice *arg0, s32 arg1)
} }
void fn_1_2694(WorkDiceNum *arg0); void fn_1_2694(WorkDiceNum *arg0);
void fn_1_2830(m02Dice *arg0, WorkDiceNum *arg1, s32 arg2); void fn_1_2830(m02GenDice *arg0, WorkDiceNum *arg1, s32 arg2);
void fn_1_2BE4(m02Dice *arg0, WorkDiceNum *arg1, s32 arg2); void fn_1_2BE4(m02GenDice *arg0, WorkDiceNum *arg1, s32 arg2);
void fn_1_25D0(omObjData *object) void fn_1_25D0(omObjData *object)
{ {
WorkDiceNum *temp_r31; WorkDiceNum *temp_r31;
m02Dice *temp_r30; m02GenDice *temp_r30;
temp_r30 = (m02Dice *)object->unk10; temp_r30 = (m02GenDice *)object->unk10;
temp_r31 = OM_GET_WORK_PTR(object, WorkDiceNum); temp_r31 = OM_GET_WORK_PTR(object, WorkDiceNum);
if(temp_r31->field0_bit0 || BoardIsKill()) { if(temp_r31->field0_bit0 || BoardIsKill()) {
fn_1_2694(temp_r31); fn_1_2694(temp_r31);
@ -495,7 +495,7 @@ void fn_1_2694(WorkDiceNum *arg0)
} }
} }
void fn_1_272C(m02Dice *arg0) void fn_1_272C(m02GenDice *arg0)
{ {
s32 i; s32 i;
WorkDiceNum *work; WorkDiceNum *work;
@ -519,7 +519,7 @@ void fn_1_272C(m02Dice *arg0)
} }
void fn_1_2830(m02Dice *arg0, WorkDiceNum *arg1, s32 arg2) void fn_1_2830(m02GenDice *arg0, WorkDiceNum *arg1, s32 arg2)
{ {
float temp_f31; float temp_f31;
s16 temp_r31; s16 temp_r31;
@ -588,7 +588,7 @@ void fn_1_2830(m02Dice *arg0, WorkDiceNum *arg1, s32 arg2)
} }
} }
void fn_1_2BE4(m02Dice *arg0, WorkDiceNum *arg1, s32 arg2) void fn_1_2BE4(m02GenDice *arg0, WorkDiceNum *arg1, s32 arg2)
{ {
s32 temp_r29; s32 temp_r29;
float temp_f30; float temp_f30;

4
src/REL/w02Dll/gamble.c
View file

@ -14,8 +14,8 @@ void fn_1_2D04(void)
float temp_f30; float temp_f30;
float temp_f29; float temp_f29;
m02Dice spEC; m02GenDice spEC;
m02Dice sp4C; m02GenDice sp4C;
s32 sp24[10] = { s32 sp24[10] = {
0x0076001C, 0x0076001C,
0x0076001D, 0x0076001D,