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

small player update

Browse source
This commit is contained in:
CreateSource 2024-02-24 20:10:37 -05:00
parent e0a0cd7442
commit 2257e6b63d
2 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/game/board/player.h
View file

@ -149,7 +149,7 @@ void BoardDiceDigit2DShowSet(s32);
s32 DoSparkSpace(s32, s16*);
s32 MegaPlayerPassFunc(s32, s16);
s32 BoardPlayerMotBlendCheck(s32);
void BoardPlayerMoveAwayStartCurr(s16, s32);
void BoardPlayerMoveAwayStartCurr(s32, s32);
void BoardBowserSuitMotionSetWalk(void);
s16 BoardBowserSuitModelGet(void);
void UpdateDiceDigit2D(omObjData*);

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

@ -2139,7 +2139,7 @@ s32 BoardPlayerAutoSizeGet(s32 arg0) {
}
u32 BoardPlayerMoveAwayIsDone(void) {
if (!moveAwayObj) {
if (moveAwayObj) {
return 0;
}
return 1;
@ -2190,6 +2190,31 @@ void BoardPlayerMoveAwayStart(s32 arg0, s32 arg1, s32 arg2) {
}
}
void BoardPlayerMoveAwayStartCurr(s32 arg0, s32 arg1) {
BoardPlayerMoveAwayStart(GWSystem.player_curr, arg0, arg1);
}
static void MoveAwayObjFunc(omObjData* arg0) {
s32 var_r31;
bitcopy3* temp_r30;
temp_r30 = (bitcopy3*) arg0->work;
if ((temp_r30->field00_bit0 != 0) || (BoardIsKill() != 0)) {
moveAwayObj = 0;
omDelObjEx(HuPrcCurrentGet(), arg0);
return;
}
for (var_r31 = 0; var_r31 < 4; var_r31++) {
if (moveAwayPlayer[var_r31] != -1) {
if (GWPlayer[moveAwayPlayer[var_r31]].moving != 0) return;
BoardPlayerMotBlendSet(moveAwayPlayer[var_r31], 0, 15);
moveAwayPlayer[var_r31] = -1;
}
}
temp_r30->field00_bit0 = 1;
}
// ...
void BoardPlayerCopyMat(s32 arg0) {