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

Label board roll code

Browse source
This commit is contained in:
gamemasterplc 2024-01-17 13:01:22 -06:00
parent 9d5032f3ec
commit e90eb84206
10 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/REL/w03Dll/main.c
View file

@ -173,7 +173,7 @@ void BoardCreate(void) {
BoardSpaceWalkEventFuncSet(&fn_1_910);
BoardSpaceWalkMiniEventFuncSet(&fn_1_A74);
BoardSpaceLandEventFuncSet((void*)&fn_1_AF8);
fn_80083EDC(lbl_1_data_1E4);
BoardStarHostSet(lbl_1_data_1E4);
fn_800A4F6C(lbl_1_data_1E6);
BoardLotteryHostSet(lbl_1_data_1E6);
BoardShopHostSet(lbl_1_data_1E6);

2
src/REL/w10Dll/main.c
View file

@ -127,7 +127,7 @@ void BoardCreate(void) {
BoardSpaceWalkEventFuncSet(&fn_1_90C);
BoardSpaceWalkMiniEventFuncSet(&fn_1_91C);
BoardSpaceLandEventFuncSet(&fn_1_908);
fn_80083EDC(lbl_1_data_2C);
BoardStarHostSet(lbl_1_data_2C);
fn_800A4F6C(lbl_1_data_32);
BoardShopHostSet(lbl_1_data_2E);
BoardLotteryHostSet(lbl_1_data_30);

2
src/REL/w10Dll/tutorial.c
View file

@ -198,7 +198,7 @@ int fn_1_1AAC(s16 arg0, s32 arg1) {
lbl_1_bss_0->unk0, arg0, arg1, lbl_1_bss_0->unk4, lbl_1_bss_0->unk6);
if (lbl_1_data_108[lbl_1_bss_0->unk0].unk0 != -1) {
if (arg0 == 5) {
fn_8008831C(&lbl_1_data_C6[lbl_1_bss_0->unk4++]);
BoardRollTutorialSet(&lbl_1_data_C6[lbl_1_bss_0->unk4++]);
}
if (arg0 == lbl_1_data_108[lbl_1_bss_0->unk0].unk0) {
void (*temp_r3_3)() = lbl_1_data_108[lbl_1_bss_0->unk0++].unk4;

12
src/game/board/basic_space.c
View file

@ -41,8 +41,8 @@ extern void BoardPlayerMotionEndWait(s32);
extern void BoardPlayerMotionShiftSet(s32, s32, f32, f32, s32);
extern void BoardPlayerCoinsAdd(s32, s32);
extern void BoardRotateDiceNumbers(s32);
extern void BoardCameraAnimBlendSet(s32, s16, s16);
extern s32 BoardPlayerAnimBlendCheck(s32);
extern void BoardCameraMotBlendSet(s32, s16, s16);
extern s32 BoardPlayerMotBlendCheck(s32);
static omObjData *coinChgObj[4] = {
NULL,
@ -72,8 +72,8 @@ void BoardLandBlueExec(s32 player, s32 space) {
BoardCameraViewSet(2);
BoardPlayerAnimBlendSet(player, 0, 15);
while (BoardPlayerAnimBlendCheck(player) == 0) {
BoardPlayerMotBlendSet(player, 0, 15);
while (BoardPlayerMotBlendCheck(player) == 0) {
HuPrcVSleep();
}
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
@ -113,8 +113,8 @@ void BoardLandRedExec(s32 player, s32 space) {
BoardCameraViewSet(2);
omVibrate(player, 12, 6, 6);
BoardPlayerAnimBlendSet(player, 0, 15);
while (BoardPlayerAnimBlendCheck(player) == 0) {
BoardPlayerMotBlendSet(player, 0, 15);
while (BoardPlayerMotBlendCheck(player) == 0) {
HuPrcVSleep();
}
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {

14
src/game/board/player.c
View file

@ -58,11 +58,11 @@ extern void BoardModelAttrReset(s16, s32);
//// #include "game/board/tutorial.h"
extern BoardTutorialHookExec(s16, s32);
//// #include "game/board/com.h"
extern void fn_8007185C(s32, s32);
extern void BoardComUseItemSet(s32, s32);
//// #include "game/board/overhead.h"
extern void fn_800729A4(s32);
extern void fn_80072DA8(s32);
//// #include "game/board/dice_roll.h"
extern void BoardViewOverheadExec(s32);
extern void BoardViewMapExec(s32);
//// #include "game/board/roll.h"
extern s32 fn_80085CC8(s32);
extern void fn_80085EB4(void);
//// #include "game/chrman.h"
@ -733,7 +733,7 @@ void BoardPlayerPostTurnHookSet(s32 arg0, s32 (*arg1)()) {
void BoardPlayerTurnExec(s32 arg0) {
BoardPauseEnableSet(1);
fn_8007185C(arg0, -1);
BoardComUseItemSet(arg0, -1);
GWSystem.field31_bit4 = 0xF;
_ClearFlag(0x10016);
_ClearFlag(0x1000E);
@ -792,11 +792,11 @@ void BoardPlayerTurnRollExec(s32 arg0) {
break;
case -3:
fn_80085EB4();
fn_80072DA8(arg0);
BoardViewMapExec(arg0);
break;
case -4:
fn_80085EB4();
fn_800729A4(arg0);
BoardViewOverheadExec(arg0);
break;
}
} while (temp_r30 <= 0);

6
src/game/board/warp.c
View file

@ -66,9 +66,9 @@ void WarpProcess(void) {
HuAudFXPlay(842);
BoardCameraViewSet(3);
BoardCameraMotionWait();
BoardPlayerAnimBlendSet(curr_player, 0, 15);
BoardPlayerMotBlendSet(curr_player, 0, 15);
while (BoardPlayerAnimBlendCheck(curr_player) == 0) {
while (BoardPlayerMotBlendCheck(curr_player) == 0) {
HuPrcVSleep();
}
@ -232,7 +232,7 @@ static void WarpImpact(s32 player) {
BoardModelMotionStart(warpImpactMdl, 0, 0x40000001);
for (i = 0; i < warpImpactCnt; i++) {
s32 player = warpImpactPlayer[i];
s16 player = warpImpactPlayer[i];
omVibrate(player, 0xC, 4, 2);
BoardPlayerMotionStart(player, 6, 0x40000001);
}