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

167
src/REL/w05Dll/mg_coin.c
View file

@ -1,25 +1,27 @@
#include "REL/w05Dll.h"
#include "game/hsfdraw.h"
#include "game/audio.h"
#include "game/objsub.h"
#include "game/frand.h"
#include "game/chrman.h"
#include "game/pad.h"
#include "game/frand.h"
#include "game/hsfdraw.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/board/audio.h"
#include "game/board/model.h"
#include "game/board/window.h"
#include "game/board/audio.h"
s16 lbl_1_bss_102[3];
s16 lbl_1_bss_100;
s16 lbl_1_bss_FE;
s16 lbl_1_bss_D6[20];
s16 lbl_1_bss_D4;
omObjData* lbl_1_bss_D0;
omObjData* lbl_1_bss_CC;
omObjData* lbl_1_bss_C8;
omObjData *lbl_1_bss_D0;
omObjData *lbl_1_bss_CC;
omObjData *lbl_1_bss_C8;
s16 lbl_1_bss_C6;
s16 lbl_1_bss_C4;
s16 lbl_1_bss_C2;
@ -29,14 +31,16 @@ s32 lbl_1_bss_B8;
char *lbl_1_data_464[3] = { "gyoei", "gyoei1", "gyoei2" };
s32 lbl_1_data_470[3] = { 0x7B, 0x7C, 0x7D };
s32 lbl_1_data_47C[3] = { 0x00790016, 0x00790017, 0x00790018 };
s32 lbl_1_data_47C[3] = { DATA_MAKE_NUM(DATADIR_W05, 0x16), DATA_MAKE_NUM(DATADIR_W05, 0x17), DATA_MAKE_NUM(DATADIR_W05, 0x18) };
char *lbl_1_data_494[3] = { "uo", "uo1", "uo2" };
void fn_1_9680(void) {
void fn_1_9680(void)
{
BoardModelAttrSet(lbl_1_bss_14[1], 0x40000002U);
}
void fn_1_96B4(void) {
void fn_1_96B4(void)
{
BoardModelAttrReset(lbl_1_bss_14[1], 0x40000002);
BoardModelMotionTimeSet(lbl_1_bss_14[1], 0.0f);
@ -47,58 +51,63 @@ void fn_1_96B4(void) {
BoardModelMotionStartEndSet(lbl_1_bss_14[1], 0x3C, 0x64);
}
void fn_1_9760(void) {
void fn_1_9760(void)
{
BoardModelAttrReset(lbl_1_bss_14[1], 0x40000001);
BoardModelMotionStartEndSet(lbl_1_bss_14[1], 0, 0xA0);
}
void fn_1_97AC(void) {
void fn_1_97AC(void)
{
Vec sp8;
s32 var_r31;
lbl_1_bss_C0 = GWSystem.player_curr;
for (var_r31 = 0; var_r31 < 3; var_r31++) {
lbl_1_bss_102[var_r31] = BoardPlayerMotionCreate(lbl_1_bss_C0, lbl_1_data_470[var_r31] | lbl_1_data_124[GWPlayer[lbl_1_bss_C0].character]);
}
sp8.x = sp8.y = sp8.z = 1.0f;
lbl_1_bss_100 = BoardModelCreate(0x790015, NULL, 0);
lbl_1_bss_100 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x15), NULL, 0);
BoardModelScaleSetV(lbl_1_bss_100, &sp8);
BoardModelVisibilitySet(lbl_1_bss_100, 0);
lbl_1_bss_D4 = BoardModelCreate(0x79002C, NULL, 0);
lbl_1_bss_D4 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x2C), NULL, 0);
BoardModelVisibilitySet(lbl_1_bss_D4, 0);
lbl_1_bss_C2 = frandmod(3U);
lbl_1_bss_FE = BoardModelCreate(lbl_1_data_47C[lbl_1_bss_C2], NULL, 0);
BoardModelVisibilitySet(lbl_1_bss_FE, 0);
for (var_r31 = 0; var_r31 < 0x14; var_r31++) {
lbl_1_bss_D6[var_r31] = BoardModelCreate(0x7000A, NULL, 1);
lbl_1_bss_D6[var_r31] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 0x0A), NULL, 1);
BoardModelVisibilitySet(lbl_1_bss_D6[var_r31], 0);
}
BoardPlayerPostTurnHookSet(lbl_1_bss_C0, (s32 (*)())fn_1_9B74);
BoardPlayerPostTurnHookSet(lbl_1_bss_C0, (s32(*)())fn_1_9B74);
lbl_1_bss_CC = omAddObjEx(boardObjMan, 0x101, 0U, 0U, -1, fn_1_9A68);
lbl_1_bss_D0 = omAddObjEx(boardObjMan, 0x101, 0U, 0U, -1, fn_1_9C24);
lbl_1_bss_C6 = 0;
lbl_1_bss_C4 = 0;
}
void fn_1_9A68(omObjData* arg0) {
void fn_1_9A68(omObjData *arg0)
{
if ((lbl_1_bss_C4 != 0) && (BoardMGDoneFlagGet() == 1)) {
fn_1_9AF0();
omDelObjEx(boardObjMan, arg0);
}
}
void fn_1_9AC0(void) {
void fn_1_9AC0(void)
{
lbl_1_bss_C4 = 1;
BoardMGExit();
}
void fn_1_9AF0(void) {
void fn_1_9AF0(void)
{
s32 var_r31;
omDelObjEx(boardObjMan, lbl_1_bss_D0);
for (var_r31 = 0; var_r31 < 0x14; var_r31++) {
BoardModelKill(lbl_1_bss_D6[var_r31]);
}
@ -106,7 +115,8 @@ void fn_1_9AF0(void) {
BoardMGDoneFlagSet(0);
}
void fn_1_9B74(void) {
void fn_1_9B74(void)
{
HsfObject *var_r31;
omDelObjEx(boardObjMan, lbl_1_bss_C8);
BoardModelKill(lbl_1_bss_FE);
@ -115,7 +125,8 @@ void fn_1_9B74(void) {
BoardModelAttrReset(lbl_1_bss_14[1], 0x40000004);
}
void fn_1_9C24(omObjData* arg0) {
void fn_1_9C24(omObjData *arg0)
{
if (arg0->work[0] == 0) {
arg0->work[0] = MGSeqCreate(3, 0);
return;
@ -125,7 +136,8 @@ void fn_1_9C24(omObjData* arg0) {
}
}
void fn_1_9C98(dataCopy2* arg0) {
void fn_1_9C98(dataCopy2 *arg0)
{
Vec sp8;
Vec temp_r4;
@ -134,21 +146,22 @@ void fn_1_9C98(dataCopy2* arg0) {
BoardModelPosSetV(arg0->unk_0A, &sp8);
}
void fn_1_9D0C(omObjData* arg0) {
void fn_1_9D0C(omObjData *arg0)
{
Vec sp1C;
Vec sp10;
f32 sp8[2];
s32 var_r30;
dataCopy2* temp_r31;
dataCopy2 *temp_r31;
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x34, 0x10000000);
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x34, MEMORY_DEFAULT_NUM);
temp_r31 = arg0->data;
temp_r31->unk_02 = 5;
temp_r31->unk_04 = 0x3C;
temp_r31->unk_00 = MGSeqCreate(1, temp_r31->unk_02, 0x120, 0x40);
HuWinMesMaxSizeGet(1, sp8, 0x27000E);
HuWinMesMaxSizeGet(1, sp8, MAKE_MESSID(0x27, 0x0E));
temp_r31->unk_06 = HuWinCreate(-10000.0f, 368.0f, sp8[0], sp8[1], 0);
HuWinMesSet(temp_r31->unk_06, 0x27000E);
HuWinMesSet(temp_r31->unk_06, MAKE_MESSID(0x27, 0x0E));
HuWinBGTPLvlSet(temp_r31->unk_06, 0.0f);
HuWinMesSpeedSet(temp_r31->unk_06, 0);
temp_r31->unk_08 = 1;
@ -158,7 +171,7 @@ void fn_1_9D0C(omObjData* arg0) {
for (var_r30 = 0; var_r30 < 3; var_r30++) {
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_bss_14[1]), lbl_1_data_494[var_r30], &temp_r31->unk_0C[var_r30]);
}
temp_r31->unk_0A = BoardModelCreate(0x790019, NULL, 0);
temp_r31->unk_0A = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x19), NULL, 0);
BoardModelAttrSet(temp_r31->unk_0A, 0x40000001);
sp1C.x = sp1C.y = sp1C.z = 1.5f;
BoardModelScaleSetV(temp_r31->unk_0A, &sp1C);
@ -168,7 +181,8 @@ void fn_1_9D0C(omObjData* arg0) {
arg0->func = fn_1_9F24;
}
void fn_1_9F24(omObjData* arg0) {
void fn_1_9F24(omObjData *arg0)
{
Vec sp24;
Vec sp18;
Vec spC;
@ -176,7 +190,7 @@ void fn_1_9F24(omObjData* arg0) {
s16 sp8;
f32 var_f31;
u16 temp_r29;
dataCopy2* temp_r31;
dataCopy2 *temp_r31;
temp_r31 = arg0->data;
if (--temp_r31->unk_04 == 0) {
@ -189,7 +203,8 @@ void fn_1_9F24(omObjData* arg0) {
temp_r29 = GWPlayer[lbl_1_bss_C0].port;
if (GWPlayer[lbl_1_bss_C0].com != 0) {
fn_1_B2B0(arg0, &spA, &sp8);
} else {
}
else {
sp8 = HuPadDStkRep[temp_r29];
spA = HuPadBtnDown[temp_r29];
}
@ -201,10 +216,12 @@ void fn_1_9F24(omObjData* arg0) {
BoardPlayerMotionStart(lbl_1_bss_C0, lbl_1_bss_102[0], 0);
BoardPlayerMotionSpeedSet(lbl_1_bss_C0, 0.5f);
arg0->func = fn_1_A224;
} else if ((temp_r31->unk_08 != 0) && ((sp8 & 1) != 0)) {
}
else if ((temp_r31->unk_08 != 0) && ((sp8 & 1) != 0)) {
HuAudFXPlay(0);
temp_r31->unk_08--;
} else if ((temp_r31->unk_08 != 2) && ((sp8 & 2) != 0)) {
}
else if ((temp_r31->unk_08 != 2) && ((sp8 & 2) != 0)) {
HuAudFXPlay(0);
temp_r31->unk_08++;
}
@ -216,7 +233,8 @@ void fn_1_9F24(omObjData* arg0) {
BoardModelPosSetV(temp_r31->unk_0A, &spC);
}
void fn_1_A224(omObjData* arg0) {
void fn_1_A224(omObjData *arg0)
{
Vec sp14;
Vec sp8;
f32 temp_f31;
@ -239,21 +257,22 @@ void fn_1_A224(omObjData* arg0) {
BoardPlayerMotionStart(lbl_1_bss_C0, lbl_1_bss_102[1], 0);
BoardPlayerMotionSpeedSet(lbl_1_bss_C0, 0.5f);
switch (lbl_1_bss_C2) {
case 0:
omVibrate(lbl_1_bss_C0, 0x7FFF, 0xC, 0);
break;
case 1:
omVibrate(lbl_1_bss_C0, 0x7FFF, 4, 2);
break;
case 2:
omVibrate(lbl_1_bss_C0, 0x7FFF, 6, 6);
break;
case 0:
omVibrate(lbl_1_bss_C0, 0x7FFF, 0xC, 0);
break;
case 1:
omVibrate(lbl_1_bss_C0, 0x7FFF, 4, 2);
break;
case 2:
omVibrate(lbl_1_bss_C0, 0x7FFF, 6, 6);
break;
}
arg0->func = fn_1_A4F8;
}
}
void fn_1_A4F8(omObjData* arg0) {
void fn_1_A4F8(omObjData *arg0)
{
f32 temp_f31;
temp_f31 = BoardPlayerMotionMaxTimeGet(lbl_1_bss_C0);
@ -264,13 +283,14 @@ void fn_1_A4F8(omObjData* arg0) {
}
}
void fn_1_A5B0(omObjData* arg0) {
void fn_1_A5B0(omObjData *arg0)
{
Vec sp14;
Vec sp8;
HsfObject* temp_r28;
dataCopy2* temp_r30;
omObjData* temp_r29;
Vec* temp_r31;
HsfObject *temp_r28;
dataCopy2 *temp_r30;
omObjData *temp_r29;
Vec *temp_r31;
f32 temp_f30;
f32 var_f31;
@ -295,7 +315,7 @@ void fn_1_A5B0(omObjData* arg0) {
BoardModelVisibilitySet(lbl_1_bss_D4, 1);
BoardModelMotionTimeSet(lbl_1_bss_D4, 110.0f);
lbl_1_bss_C8 = temp_r29 = omAddObjEx(boardObjMan, 0x101, 0, 0, -1, fn_1_B3C4);
temp_r29->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, 0x10000000);
temp_r29->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM);
temp_r31 = temp_r29->data;
lbl_1_bss_C8->work[1] = 1;
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_bss_14[1]), "fish", &sp14);
@ -323,7 +343,8 @@ void fn_1_A5B0(omObjData* arg0) {
BoardModelMotionSpeedSet(lbl_1_bss_100, var_f31);
}
void fn_1_A990(omObjData* arg0) {
void fn_1_A990(omObjData *arg0)
{
Vec sp8;
Process *var_r31;
@ -344,9 +365,10 @@ void fn_1_A990(omObjData* arg0) {
}
s16 lbl_1_data_4B2[3] = { 20, 10, 5 };
s32 lbl_1_data_4B8[3] = { 0x00270013, 0x00270014, 0x00270015 };
s32 lbl_1_data_4B8[3] = { MAKE_MESSID(0x27, 0x13), MAKE_MESSID(0x27, 0x14), MAKE_MESSID(0x27, 0x15) };
void fn_1_AB24(void) {
void fn_1_AB24(void)
{
Vec sp124[20];
Vec sp34[20];
Vec sp28;
@ -359,7 +381,7 @@ void fn_1_AB24(void) {
s32 var_r29;
s32 var_r31;
f32 var_f30;
Vec* temp_r4;
Vec *temp_r4;
temp_r30 = HuPrcCurrentGet()->user_data;
spC = temp_r30->data;
@ -367,7 +389,7 @@ void fn_1_AB24(void) {
BoardModelPosGet(lbl_1_bss_14[5], &sp1C);
var_f30 = (180.0 * (atan2((sp1C.z - sp28.z), (sp1C.x - sp28.x)) / M_PI));
BoardPlayerMotBlendSet(lbl_1_bss_C0, var_f30, 0xF);
while (BoardPlayerMotBlendCheck(lbl_1_bss_C0) == 0) {
HuPrcVSleep();
}
@ -381,12 +403,12 @@ void fn_1_AB24(void) {
BoardWinWait();
BoardWinKill();
BoardPlayerMotBlendSet(lbl_1_bss_C0, 0, 0xF);
while (BoardPlayerMotBlendCheck(lbl_1_bss_C0) == 0) {
HuPrcVSleep();
}
BoardPlayerPosGet(lbl_1_bss_C0, &sp28);
for (var_r31 = 0; var_r31 < lbl_1_bss_C6; var_r31++) {
BoardModelVisibilitySet(lbl_1_bss_D6[var_r31], 1);
sp124[var_r31] = sp28;
@ -400,7 +422,7 @@ void fn_1_AB24(void) {
}
var_f31 = -1.0f;
var_r29 = 0;
while (1) {
for (var_r31 = 0; var_r31 < lbl_1_bss_C6; var_r31++) {
if (var_r31 >= var_r29) {
@ -429,11 +451,12 @@ void fn_1_AB24(void) {
if (var_r29 == lbl_1_bss_C6) {
BoardPlayerMotionShiftSet(lbl_1_bss_C0, 7, 0.0f, 10.0f, 0);
break;
} else {
}
else {
HuPrcVSleep();
}
}
while (BoardPlayerMotionEndCheck(lbl_1_bss_C0) == 0) {
HuPrcVSleep();
}
@ -444,7 +467,8 @@ void fn_1_AB24(void) {
HuPrcEnd();
}
void fn_1_B214(omObjData* arg0) {
void fn_1_B214(omObjData *arg0)
{
s32 var_r31;
for (var_r31 = 0; var_r31 < 3; var_r31++) {
@ -456,8 +480,9 @@ void fn_1_B214(omObjData* arg0) {
omDelObjEx(boardObjMan, arg0);
}
void fn_1_B2B0(omObjData* arg0, u16* arg1, s16* arg2) {
dataCopy2* temp_r31;
void fn_1_B2B0(omObjData *arg0, u16 *arg1, s16 *arg2)
{
dataCopy2 *temp_r31;
temp_r31 = arg0->data;
*arg1 = 0;
@ -490,7 +515,8 @@ void fn_1_B2B0(omObjData* arg0, u16* arg1, s16* arg2) {
*arg2 = 2;
}
void fn_1_B3C4(omObjData* arg0) {
void fn_1_B3C4(omObjData *arg0)
{
Vec sp2C;
Vec sp20;
Vec sp14;
@ -526,9 +552,10 @@ void fn_1_B3C4(omObjData* arg0) {
if ((0.0f == BoardModelMotionTimeGet(lbl_1_bss_FE)) && (arg0->work[1] != 0)) {
HuAudFXPlay(0x484);
}
} else {
}
else {
arg0->work[0] += 1;
}
BoardModelPosSetV(lbl_1_bss_FE, &sp20);
}
}
}