Merge pull request #99 from abnormalhare/main

player.c... so far
This commit is contained in:
gamemasterplc 2024-01-06 14:55:42 -06:00 committed by GitHub
commit 6cc662ed1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 996 additions and 13 deletions

View file

@ -58,7 +58,7 @@ typedef struct player_state {
u16 com : 1;
u16 character : 4;
u16 auto_size : 2;
u16 field00_bit9 : 1;
u16 field01_bit9 : 1;
};
/* 0x02 */ struct {
u8 team : 1;
@ -77,6 +77,7 @@ typedef struct player_state {
u16 field08_bit7 : 2;
u16 rank : 2;
u16 bowser_suit : 1;
u16 field08_bit11 : 1;
};
/* 0x0A */ s8 roll;
/* 0x0C */ s16 space_curr;

View file

@ -60,21 +60,21 @@ void BoardTutorialItemSet(s32);
void fn_80082AAC(s32);
void BoardTutorialDirInputSet(s32, s32, s32);
void BoardSpaceStarSetIndex(s32);
void BoardModelRotYSet(s32, f32);
f32 BoardModelRotYGet(s32);
void BoardModelLayerSet(s16, s32);
void BoardModelRotYSet(s16, f32);
f32 BoardModelRotYGet(s16);
void BoardModelLayerSet(s16, u8);
void BoardTutorialHostSet(s16);
s16 BoardModelIDGet(s16);
void BoardModelScaleSetV(s32, Vec*);
void BoardModelScaleSetV(s16, Vec*);
void BoardLightHookSet(void*, void*);
s16 BoardModelCreate(s32, void*, s32);
void BoardModelKill(s16);
void fn_8006DDE8(s16, f32);
void BoardModelMotionStart(s16, s32, s32);
s32 BoardModelMotionStart(s16, s32, s32);
void BoardModelMotionSpeedSet(s16, f32);
void BoardModelPosSetV(s16, void*);
void BoardModelPosSetV(s16, Vec*);
void BoardModelPosSet(s16, f32, f32, f32);
s32 BoardModelRotSetV(s16 arg0, Vec* arg1);
void BoardModelRotSetV(s16 arg0, Vec* arg1);
void BoardModelVisibilitySet(s16, s32);
void BoardSpaceWalkEventFuncSet(void*);
void BoardSpaceWalkMiniEventFuncSet(void*);

View file

@ -29,7 +29,7 @@ void GWCoinsSet(int player, s16 value);
void GWCoinsAdd(int player, s16 amount);
void GWStarsSet(int player, s16 value);
void GWStarsAdd(int player, s16 amount);
s16 GWStarsGet(int player);
s32 GWStarsGet(int player);
void GWTotalStarsSet(s16 value);
void GWTotalStarsAdd(s16 amount);
u16 GWTotalStarsGet(void);

View file

@ -112,7 +112,7 @@ void BoardCreate(void) {
if (temp_r30->unk24 != -1) {
lbl_1_bss_8 = NULL;
lbl_1_bss_10[i] = BoardModelCreate(temp_r30->unk24, lbl_1_bss_8, 0);
BoardModelPosSetV(lbl_1_bss_10[i], temp_r30);
BoardModelPosSetV(lbl_1_bss_10[i], &temp_r30->unk0);
BoardModelRotSetV(lbl_1_bss_10[i], &temp_r30->unk0C);
BoardModelScaleSetV(lbl_1_bss_10[i], &temp_r30->unk18);
BoardModelVisibilitySet(lbl_1_bss_10[i], 1);
@ -201,7 +201,7 @@ void fn_1_918(void) {
void fn_1_91C(void) {
}
s32 fn_1_920(s32 arg0, f32 arg8, f32 arg9) {
s32 fn_1_920(s16 arg0, f32 arg8, f32 arg9) {
s32 var_r31;
f32 var_f29;
f32 var_f31;

View file

@ -33,7 +33,7 @@ extern void BoardTutorialHookExec(s16, s32);
extern void BoardCameraViewSet(s32);
extern void omVibrate(s16, s16, s16, s16);
extern void BoardPlayerPosGet(s32, Vec*);
extern s32 BoardModelPosGet(s16, Vec*);
extern void BoardModelPosGet(s16, Vec*);
extern void BoardPlayerMotionEndWait(s32);
extern void BoardPlayerMotionShiftSet(s32, s32, f32, f32, s32);
extern void BoardPlayerCoinsAdd(s32, s32);

982
src/game/board/player.c Normal file
View file

@ -0,0 +1,982 @@
#include "common.h"
#include "game/gamework.h"
#include "game/window.h"
#include "game/object.h"
#include "game/process.h"
//// #include "game/board/main.h"
extern s32 BoardIsStarted(void);
extern void BoardCameraMoveSet(s32);
extern void BoardCameraViewSet(s32);
extern void BoardPauseEnableSet(s32);
extern void BoardCameraTargetPlayerSet(s32);
extern void BoardCameraOffsetSet(float, float, float);
extern void BoardCameraTargetModelSet(s16);
extern void BoardCameraTargetPlayerSet(s32);
extern Process* boardObjMan;
//// #include "game/board/space.h"
extern s32 BoardSpaceFlagPosGet(s32, s32, u32);
extern void BoardSpaceDirPosGet(s32, s32, Vec*);
extern void BoardSpaceLandExec(s32, s16);
extern s32 BoardSpaceFlagGet(s32, s16);
extern s32 BoardSpaceHiddenBlockExec(s32, s16);
extern void BoardSpaceLandExec(s32, s16);
extern s32 BoardSpaceTypeGet(s32, s16);
extern s32 BoardSpaceWalkEventExec(void);
extern s32 BoardSpaceWalkExec(s32, s32);
extern PlayerState* BoardSpaceGet(s32, s32);
//// #include "game/board/ui.h"
extern void BoardStatusHammerShowSet(s32, s32);
extern void BoardYourTurnExec(s32);
extern s32 BoardItemUseExec(s32);
//// #include "game/board/model.h"
extern s16 BoardModelCreateCharacter(s32, s32, s32*, s32);
extern void BoardModelExistCheck(s16, s32);
extern void BoardModelExistDupe(s16, s32);
extern void BoardModelCameraSet(s16, u16);
extern void BoardItemStatusKill(s32);
extern void BoardModelAmbSet(s16, f32, f32, f32);
extern void BoardModelMtxSet(s16, Mtx);
extern void BoardModelPosSetV(s16, Vec*);
extern void BoardModelPosSet(s16, f32, f32, f32);
extern s32 BoardModelPosGet(s16, Vec*);
extern void BoardModelRotSetV(s16, Vec*);
extern void BoardModelRotSet(s16, f32, f32, f32);
extern s32 BoardModelRotGet(s16, Vec*);
extern void BoardModelRotYSet(s16, f32);
extern f32 BoardModelRotYGet(s16);
extern void BoardModelScaleSetV(s16, Vec*);
extern void BoardModelScaleSet(s16, f32, f32, f32);
extern void BoardModelScaleGet(s16, s32*);
extern void BoardModelVoiceEnableSet(s16, s32, s32);
extern void BoardModelMotionCreate(s16, s32);
extern void BoardModelMotionKill(s16, s32);
extern s32 BoardModelMotionEndCheck(s16);
extern s32 BoardModelMotionStart(s16, s32, s32);
extern s32 BoardModelMotionShiftSet(s16, s32, f32, f32, s32);
extern void BoardModelMotionSpeedSet(s16, f32);
extern void BoardModelMotionTimeSet(s16, f32);
extern f32 BoardModelMotionTimeGet(s16);
extern f32 BoardModelMotionMaxTimeGet(s16);
extern void BoardModelMotionTimeRangeSet(s16, s32, s32);
extern void BoardModelAttrSet(s16, s32);
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);
//// #include "game/board/overhead.h"
extern void fn_800729A4(s32);
extern void fn_80072DA8(s32);
//// #include "game/board/dice_roll.h"
extern s32 fn_80085CC8(s32);
extern void fn_80085EB4(void);
//// #include "game/chrman.h"
extern void CharModelKillIndex(s16);
extern void CharModelSetStepType(s16, s32);
////
s32 BoardRollTypeGet(void);
void BoardRollTypeSet(s32 type);
s32 BoardPlayerGetCharMess(s32 player);
char* BoardPlayerGetCharName(s32 player);
s32 BoardPlayerIsAllCom(void);
void BoardPlayerInit(void);
void BoardPlayerModelInit(void);
void BoardPlayerModelKill(void);
void BoardPlayerLayerSet(s32, s32);
void BoardPlayerCameraSet(s32, u16);
void fn_80062A40(s32, f32);
void BoardPlayerExistCheck(s32, s32);
s32 BoardPlayerItemAdd(s32, s32);
s32 BoardPlayerItemRemove(s32, s32);
s32 BoardPlayerItemFind(s32, s32);
s32 BoardPlayerItemCount(s32);
void fn_80062D90(s32);
void BoardPlayerCurrSpacePosDirGet(s32, Vec*);
void BoardPlayerAmbSet(s32, f32, f32, f32);
void BoardPlayerMtxSet(s32, Mtx);
void BoardPlayerPosSetV(s32, Vec*);
void BoardPlayerPosSet(s32, f32, f32, f32);
void BoardPlayerPosGet(s32, Vec*);
void BoardPlayerRotSetV(s32, Vec*);
void BoardPlayerRotSet(s32, f32, f32, f32);
void BoardPlayerRotGet(s32, Vec*);
void BoardPlayerRotYSet(s32, f32);
f32 BoardPlayerRotYGet(s32);
void BoardPlayerScaleSetV(s32, Vec*);
void BoardPlayerScaleSet(s32, f32, f32, f32);
s16 BoardPlayerCurrMotionGet(s32);
void BoardPlayerMotionCreate(s32, s32);
void BoardPlayerMotionKill(s32, s32);
void BoardPlayerMotionEndCheck(s32);
void BoardPlayerMotionEndWait(s32);
void BoardPlayerMotionStart(s32, s32, s32);
void BoardPlayerMotionShiftSet(s32, s32, f32, f32, s32);
void BoardPlayerMotionSpeedSet(s32, f32);
void BoardPlayerMotionTimeSet(s32, f32);
f32 BoardPlayerMotionTimeGet(s32);
f32 BoardPlayerMotionMaxTimeGet(s32);
void BoardPlayerMotionTimeRangeSet(s32, f32, f32);
void BoardPlayerModelAttrSet(s32, s32);
void BoardPlayerModelAttrReset(s32, s32);
void BoardPlayerCoinsSet(s32, s32);
s32 BoardPlayerCoinsGet(s32);
void BoardPlayerCoinsAdd(s32, s32);
void BoardPlayerStarsAdd(s32, s32);
void BoardPlayerSizeSet(s32, s32);
s32 BoardPlayerSizeGet(s32);
s32 BoardPlayerSameTeamFind(s32);
s32 BoardPlayerTeamFind(s32);
s32 BoardPlayerRankCalc(s32);
void BoardPlayerPreTurnHookSet(s32, s32 (*)());
void BoardPlayerPostTurnHookSet(s32, s32 (*)());
void BoardPlayerTurnExec(s32);
void BoardPlayerTurnRollExec(s32);
void BoardPlayerTurnMoveExec(s32);
void BoardPlayerPostTurnHookExec(s32);
void BoardPlayerSizeRestore(s32);
void BoardPlayerZoomRestore(s32);
void BoardJunctionMaskSet(s32);
void BoardJunctionMaskReset(s32);
void BoardJunctionMaskZero(void);
//...
s32 BoardPlayerAutoSizeGet(s32);
void BoardPlayerAutoSizeSet(s32, s32);
void BoardPlayerCopyMat(s32);
void BoardBowserSuitKill(s32);
void SetRollPlayerSize(s32);
void BoardDiceDigit2DUpdateEnable(s32);
void BoardPlayerMoveTo(s32, s16);
void BoardPlayerZoomRestore(s32);
void BoardRotateDiceNumbers(s32);
s32 DoDebugMove(s32, s16*);
s32 DoSparkSpace(s32, s16*);
s32 ExecJunction(s32, s16*);
s32 MegaPlayerPassFunc(s32, s16);
s32 BoardPlayerAnimBlendCheck(s32);
static void (*playerMatCopy[4])();
static s32 (*postTurnHook[4])();
static s32 (*preTurnHook[4])();
static s32 diceJumpObj[4] = {0, 0, 0, 0};
static s32 animDoneF[4] = {0, 0, 0, 0};
static s16 bowserSuitMot[5] = {-1, -1, -1, -1, -1};
s16 boardPlayerMdl[4];
static s16 playerMot[4];
static s16 junctionArrowRot[4];
static s8 rollType;
static omObjData* junctionObj;
static s32 junctionMask;
static s32 rollResized;
static s16 suitMdl = -1;
static s16 suitPlayerMdl = -1;
static s16 suitCurrMot = -1;
inline PlayerState* GetPlayer(s32 index) {
return &GWPlayer[index];
}
inline s16 GetBoardPlayer(s32 index) {
PlayerState *player = GetPlayer(index);
return boardPlayerMdl[player->player_idx];
}
s32 BoardRollTypeGet(void) {
return rollType;
}
void BoardRollTypeSet(s32 type) {
rollType = type;
}
s32 BoardPlayerGetCharMess(s32 player) {
s32 charMess[8] = {0, 1, 2, 3, 4, 5, 6, 7};
return charMess[GWPlayer[player].character];
}
char* BoardPlayerGetCharName(s32 player) {
char* charNames[8] = {"Mario", "Luigi", "Peach", "Yoshi", "Wario", "Donky", "Daisy", "Waluigi"};
return charNames[GWPlayer[player].character];
}
s32 BoardPlayerIsAllCom(void) {
if ((GWPlayer[0].com != 0) && (GWPlayer[1].com != 0) && (GWPlayer[2].com != 0) && (GWPlayer[3].com != 0)) {
return 1;
}
return 0;
}
void BoardPlayerInit(void) {
s32 temp_r30;
s32 var_r31;
if (BoardIsStarted() == 0) {
GWSystem.player_curr = 0;
temp_r30 = BoardSpaceFlagPosGet(0, 0x80000000, 0);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
GWPlayer[var_r31].space_curr = temp_r30;
fn_80062D90(var_r31);
BoardPlayerSizeSet(var_r31, 0);
GWPlayer[var_r31].color = 0;
GWPlayer[var_r31].bowser_suit = 0;
GWPlayer[var_r31].field01_bit9 = 0;
GWPlayer[var_r31].field08_bit3 = 0;
}
return;
}
for (var_r31 = 0; var_r31 < 4; var_r31++) {
fn_80062D90(var_r31);
if (BoardPlayerAutoSizeGet(var_r31) != 0) {
BoardPlayerAutoSizeSet(var_r31, BoardPlayerAutoSizeGet(var_r31));
BoardStatusHammerShowSet(var_r31, 0);
}
}
}
void BoardPlayerModelInit(void) {
s32 sp64[0x10];
s32 var_r31;
s32 var_r30;
s32 temp_r29;
s32 temp_r25;
s32 temp_r24;
s16 temp_r3;
s32 temp_r4;
PlayerState* temp_r22;
PlayerState* temp_r27;
s32 ro0[8] = { 0x5E0000, 0x190000, 0x6C0000, 0x890000, 0x840000, 0x100000, 0xC0000, 0x800000 };
s32 ro1[8] = { 0x5F0000, 0x1A0000, 0x6D0000, 0x8A0000, 0x850000, 0x110000, 0xD0000, 0x810000 };
u16 ro2[13] = { 0, 2, 3, 5, 6, 22, 23, 24, 27, 31, 47, 72, 73 };
memset(&boardPlayerMdl, 0, 8);
suitMdl = -1;
suitPlayerMdl = -1;
if ((_CheckFlag(0x10005U) != 0) || ((_CheckFlag(0x10006U) != 0) && (temp_r4 = GWSystem.board, temp_r4 == 5))) {
for (var_r31 = 0; var_r31 < 4; var_r31++) {
temp_r25 = GWPlayer[var_r31].field08_bit11;
GWPlayer[var_r31].team = temp_r25;
GWPlayerCfg[var_r31].group = temp_r25;
}
}
for (var_r31 = 0; var_r31 < 4; var_r31++) {
preTurnHook[var_r31] = 0;
postTurnHook[var_r31] = 0;
animDoneF[var_r31] = 0;
diceJumpObj[var_r31] = 0;
temp_r22 = &GWPlayer[var_r31];
temp_r27 = temp_r22;
temp_r29 = GWPlayerCfg[var_r31].character;
temp_r27->player_idx = var_r31;
GWPlayer[var_r31].character = temp_r29;
GWPlayerCfg[var_r31].character = temp_r29;
for (var_r30 = 0; var_r30 < 0xD; var_r30++) {
sp64[var_r30] = ro1[temp_r29] | ro2[var_r30];
}
sp64[var_r30] = -1;
temp_r3 = BoardModelCreateCharacter(temp_r29, ro0[temp_r29], sp64, 0);
boardPlayerMdl[var_r31] = temp_r3;
BoardPlayerCopyMat(var_r31);
playerMot[var_r31] = 1;
BoardModelMotionStart(temp_r3, playerMot[var_r31], 0x40000001);
if (BoardIsStarted() == 0) {
for (var_r30 = 0; var_r30 < 3; var_r30++) {
temp_r27->items[var_r30] = -1;
}
temp_r24 = GWPlayerCfg[var_r31].group;
GWPlayer[var_r31].team = temp_r24;
GWPlayerCfg[var_r31].group = temp_r24;
}
GWPlayer[var_r31].show_next = 1;
GWPlayer[var_r31].bowser_suit = 0;
BoardModelExistDupe(temp_r3, 1);
BoardModelExistCheck(temp_r3, 1);
fn_8006DDE8(temp_r3, -1.0f);
GWPlayer[var_r31].com = GWPlayerCfg[var_r31].iscom;
GWPlayerCfg[var_r31].iscom = GWPlayerCfg[var_r31].iscom;
GWPlayer[var_r31].port = GWPlayerCfg[var_r31].pad_idx;
GWPlayerCfg[var_r31].pad_idx = GWPlayerCfg[var_r31].pad_idx;
GWPlayer[var_r31].diff = GWPlayerCfg[var_r31].diff;
GWPlayerCfg[var_r31].diff = GWPlayerCfg[var_r31].diff;
temp_r27->space_prev = -1;
CharModelKillIndex(GWPlayer[var_r31].character);
}
CharModelLayerSetAll(2);
}
void BoardPlayerModelKill(void) {
s32 var_r31;
PlayerState* temp_r30;
PlayerState* temp_r29;
for (var_r31 = 0; var_r31 < 4; var_r31++) {
temp_r30 = GetPlayer(var_r31);
if (boardPlayerMdl[temp_r30->player_idx] != -1) {
BoardModelKill(boardPlayerMdl[temp_r30->player_idx]);
boardPlayerMdl[temp_r30->player_idx] = -1;
}
if (playerMatCopy[var_r31] != 0) {
HuMemDirectFree(playerMatCopy[var_r31]);
playerMatCopy[var_r31] = 0;
}
BoardBowserSuitKill(var_r31);
}
}
void BoardPlayerLayerSet(s32 arg0, s32 arg1) {
BoardModelLayerSet(GetBoardPlayer(arg0), arg1);
}
void BoardPlayerCameraSet(s32 arg0, u16 arg1) {
BoardModelCameraSet(GetBoardPlayer(arg0), arg1);
}
void fn_80062A40(s32 arg0, f32 arg8) {
fn_8006DDE8(GetBoardPlayer(arg0), arg8);
}
void BoardPlayerExistCheck(s32 arg0, s32 arg1) {
if (arg1 == 0) {
BoardModelExistCheck(GetBoardPlayer(arg0), 0);
} else {
BoardModelExistCheck(GetBoardPlayer(arg0), 1);
}
}
s32 BoardPlayerItemAdd(s32 arg0, s32 arg1) {
PlayerState* var_r30;
s32 var_r29;
s32 var_r31;
var_r29 = -1;
var_r30 = GetPlayer(arg0);
for (var_r31 = 0; var_r31 < 3; var_r31++) {
if (GWPlayer[arg0].items[var_r31] == -1) {
HuAudFXPlay(0x360);
var_r30->items[var_r31] = arg1;
BoardItemStatusKill(arg0);
var_r29 = var_r31;
break;
}
}
return var_r29;
}
s32 BoardPlayerItemRemove(s32 arg0, s32 arg1) {
s32 temp_r29;
PlayerState* temp_r28;
temp_r28 = GetPlayer(arg0);
temp_r29 = temp_r28->items[arg1];
if (temp_r28->items[arg1] == -1) {
return temp_r29;
}
if (arg1 == 0) {
temp_r28->items[0] = temp_r28->items[1];
}
if ((arg1 == 1) || (arg1 == 0)) {
temp_r28->items[1] = temp_r28->items[2];
}
temp_r28->items[2] = -1;
HuAudFXPlay(0x363);
BoardItemStatusKill(arg0);
return temp_r29;
}
s32 BoardPlayerItemFind(s32 arg0, s32 arg1) {
s32 var_r31;
for (var_r31 = 0; var_r31 < 3; var_r31++) {
if (arg1 == GWPlayer[arg0].items[var_r31]) {
return var_r31;
}
}
return -1;
}
s32 BoardPlayerItemCount(s32 arg0) {
s32 var_r30;
s32 var_r31;
for (var_r31 = 0, var_r30 = var_r31; var_r31 < 3; var_r31++) {
if (GWPlayer[arg0].items[var_r31] != -1) {
var_r30++;
}
}
return var_r30;
}
void fn_80062D90(s32 arg0) {
Vec sp8;
BoardPlayerCurrSpacePosDirGet(arg0, &sp8);
BoardPlayerPosSetV(arg0, &sp8);
}
void BoardPlayerCurrSpacePosDirGet(s32 arg0, Point3d* arg1) {
s32 var_r31;
s32 var_r30;
s32 var_r29;
s32 temp_r28;
if (arg1 != 0) {
temp_r28 = GWPlayer[arg0].space_curr;
var_r31 = GWSystem.player_curr;
if (var_r31 == -1) {
var_r31 = 0;
}
for (var_r30 = 0, var_r29 = var_r30; var_r30 < 4; var_r31 = (var_r31 + 1) & 3, var_r30++) {
if (var_r31 == arg0) break;
if (temp_r28 == GWPlayer[var_r31].space_curr) {
var_r29 += 1;
}
}
BoardSpaceDirPosGet(temp_r28, var_r29, arg1);
}
}
void BoardPlayerAmbSet(s32 arg0, f32 arg8, f32 arg9, f32 argA) {
BoardModelAmbSet(GetBoardPlayer(arg0), arg8, arg9, argA);
}
void BoardPlayerMtxSet(s32 arg0, Mtx arg1) {
BoardModelMtxSet(GetBoardPlayer(arg0), arg1);
}
void BoardPlayerPosSetV(s32 arg0, Vec* arg1) {
BoardModelPosSetV(GetBoardPlayer(arg0), arg1);
if (GWPlayer[arg0].bowser_suit != 0) {
BoardModelPosSetV(suitMdl, arg1);
}
}
void BoardPlayerPosSet(s32 arg0, f32 arg8, f32 arg9, f32 argA) {
BoardModelPosSet(GetBoardPlayer(arg0), arg8, arg9, argA);
if (GWPlayer[arg0].bowser_suit != 0) {
BoardModelPosSet(suitMdl, arg8, arg9, argA);
}
}
void BoardPlayerPosGet(s32 arg0, Vec* arg1) {
BoardModelPosGet(GetBoardPlayer(arg0), arg1);
}
void BoardPlayerRotSetV(s32 arg0, Vec* arg1) {
BoardModelRotSetV(GetBoardPlayer(arg0), arg1);
if (GWPlayer[arg0].bowser_suit != 0) {
BoardModelRotSetV(suitMdl, arg1);
}
}
void BoardPlayerRotSet(s32 arg0, f32 arg8, f32 arg9, f32 argA) {
BoardModelRotSet(GetBoardPlayer(arg0), arg8, arg9, argA);
if (GWPlayer[arg0].bowser_suit != 0) {
BoardModelRotSet(suitMdl, arg8, arg9, argA);
}
}
void BoardPlayerRotGet(s32 arg0, Vec* arg1) {
BoardModelRotGet(GetBoardPlayer(arg0), arg1);
}
void BoardPlayerRotYSet(s32 arg0, f32 arg8) {
if (arg8 < 0.0f) {
arg8 += 360.0f;
}
if (arg8 > 360.0f) {
arg8 -= 360.0f;
}
BoardModelRotYSet(GetBoardPlayer(arg0), arg8);
if (GWPlayer[arg0].bowser_suit != 0) {
BoardModelRotYSet(suitMdl, arg8);
}
}
f32 BoardPlayerRotYGet(s32 arg0) {
f32 var_f31;
if (GWPlayer[arg0].bowser_suit != 0) {
var_f31 = BoardModelRotYGet(suitMdl);
} else {
var_f31 = BoardModelRotYGet(GetBoardPlayer(arg0));
}
return var_f31;
}
void BoardPlayerScaleSetV(s32 arg0, Vec* arg1) {
BoardModelScaleSetV(GetBoardPlayer(arg0), arg1);
}
void BoardPlayerScaleSet(s32 arg0, f32 arg8, f32 arg9, f32 argA) {
BoardModelScaleSet(GetBoardPlayer(arg0), arg8, arg9, argA);
}
void BoardPlayerScaleGet(s32 arg0, s32 *arg1) {
BoardModelScaleGet(GetBoardPlayer(arg0), arg1);
}
s16 BoardPlayerCurrMotionGet(s32 arg0) {
PlayerState* player = GetPlayer(arg0);
return playerMot[player->player_idx];
}
void BoardPlayerVoiceEnableSet(s32 arg0, s32 arg1, s32 arg2) {
BoardModelVoiceEnableSet(GetBoardPlayer(arg0), arg1, arg2);
}
void BoardPlayerMotionCreate(s32 arg0, s32 arg1) {
BoardModelMotionCreate(GetBoardPlayer(arg0), arg1);
}
void BoardPlayerMotionKill(s32 arg0, s32 arg1) {
BoardModelMotionKill(GetBoardPlayer(arg0), arg1);
}
void BoardPlayerMotionEndCheck(s32 arg0) {
BoardModelMotionEndCheck(GetBoardPlayer(arg0));
}
void BoardPlayerMotionEndWait(s32 arg0) {
while (BoardModelMotionEndCheck(GetBoardPlayer(arg0)) == 0) {
HuPrcVSleep();
}
}
void BoardPlayerMotionStart(s32 arg0, s32 arg1, s32 arg2) {
PlayerState* player;
s32 temp_r29;
player = GetPlayer(arg0);
if (arg1 == 0) {
}
if (arg1 != playerMot[player->player_idx]) {
temp_r29 = BoardModelMotionStart(GetBoardPlayer(arg0), arg1, arg2);
if (temp_r29 == 0) {
playerMot[player->player_idx] = arg1;
}
}
}
void BoardPlayerMotionShiftSet(s32 arg0, s32 arg1, f32 arg8, f32 arg9, s32 arg2) {
PlayerState* player;
s32 temp_r29;
player = GetPlayer(arg0);
if (arg1 == 0) {
}
if (arg1 != playerMot[player->player_idx]) {
temp_r29 = BoardModelMotionShiftSet(GetBoardPlayer(arg0), arg1, arg8, arg9, arg2);
if (temp_r29 == 0) {
playerMot[player->player_idx] = arg1;
}
}
}
void BoardPlayerMotionSpeedSet(s32 arg0, f32 arg8) {
BoardModelMotionSpeedSet(GetBoardPlayer(arg0), arg8);
}
void BoardPlayerMotionTimeSet(s32 arg0, f32 arg8) {
BoardModelMotionTimeSet(GetBoardPlayer(arg0), arg8);
}
f32 BoardPlayerMotionTimeGet(s32 arg0) {
BoardModelMotionTimeGet(GetBoardPlayer(arg0));
}
f32 BoardPlayerMotionMaxTimeGet(s32 arg0) {
BoardModelMotionMaxTimeGet(GetBoardPlayer(arg0));
}
void BoardPlayerMotionTimeRangeSet(s32 arg0, f32 arg8, f32 arg9) {
BoardModelMotionTimeRangeSet(GetBoardPlayer(arg0), arg8, arg9);
}
void BoardPlayerModelAttrSet(s32 arg0, s32 arg1) {
BoardModelAttrSet(GetBoardPlayer(arg0), arg1);
}
void BoardPlayerModelAttrReset(s32 arg0, s32 arg1) {
BoardModelAttrReset(GetBoardPlayer(arg0), arg1);
}
void BoardPlayerCoinsSet(s32 arg0, s32 arg1) {
GWCoinsSet(arg0, arg1);
}
s32 BoardPlayerCoinsGet(s32 arg0) {
return GWCoinsGet(arg0);
}
void BoardPlayerCoinsAdd(s32 arg0, s32 arg1) {
PlayerState* player;
s16 coins;
player = GetPlayer(arg0);
if ((arg1 > 0) && (player->coins_total < 0x3E7)) {
player->coins_total += arg1;
if (player->coins_total > 0x3E7) {
player->coins_total = 0x3E7;
}
}
BoardPlayerCoinsSet(arg0, arg1 + BoardPlayerCoinsGet(arg0));
}
void BoardPlayerStarsAdd(s32 arg0, s32 arg1) {
GWStarsSet(arg0, (arg1 + GWStarsGet(arg0)));
}
void BoardPlayerSizeSet(s32 arg0, s32 arg1) {
PlayerState* temp_r27;
Vec temp_r4[3] = { { 1, 1, 1 }, { 0.3, 0.3, 0.3 }, { 2.5, 2.5, 2.5 } };
temp_r27 = GetPlayer(arg0);
temp_r27->size = arg1;
if (arg1 == 2) {
CharModelSetStepType(GWPlayer[arg0].character, 4);
} else if (arg1 == 1) {
CharModelSetStepType(GWPlayer[arg0].character, 5);
} else {
CharModelSetStepType(GWPlayer[arg0].character, 0);
}
BoardModelScaleSetV(GetBoardPlayer(arg0), &temp_r4[arg1]);
}
s32 BoardPlayerSizeGet(s32 arg0) {
PlayerState* temp_r30;
temp_r30 = GetPlayer(arg0);
if (temp_r30 != 0) {
arg0 = temp_r30->size;
}
return arg0;
}
s32 BoardPlayerSameTeamFind(s32 arg0) {
s32 var_r31;
s32 team2;
s32 team;
for (var_r31 = 0; var_r31 < 4; var_r31++) {
if (var_r31 == arg0) continue;
team2 = GWPlayer[var_r31].team;
team = GWPlayer[arg0].team;
if (team == team2) break;
}
return var_r31;
}
s32 BoardPlayerTeamFind(s32 arg0) {
s32 var_r31;
s32 team2;
s32 team;
for (var_r31 = 0; var_r31 < 4; var_r31++) {
if (var_r31 == arg0) continue;
team2 = GWPlayer[var_r31].team;
team = GWPlayer[arg0].team;
if (team != team2) break;
}
return var_r31;
}
s32 BoardPlayerRankCalc(s32 arg0) {
s32 temp_r29;
s32 var_r30;
s32 var_r31;
s32 sp8[4];
for (var_r31 = 0; var_r31 < 4; var_r31++) {
temp_r29 = GWCoinsGet(var_r31);
sp8[var_r31] = temp_r29 | (GWStarsGet(var_r31) << 0xA);
}
for (var_r30 = 0, var_r31 = 0; var_r31 < 4; var_r31++) {
if ((var_r31 != arg0) && (sp8[arg0] < sp8[var_r31])) {
var_r30++;
}
}
return var_r30;
}
void BoardPlayerPreTurnHookSet(s32 arg0, s32 (*arg1)()) {
preTurnHook[arg0] = arg1;
}
void BoardPlayerPostTurnHookSet(s32 arg0, s32 (*arg1)()) {
postTurnHook[arg0] = arg1;
}
void BoardPlayerTurnExec(s32 arg0) {
BoardPauseEnableSet(1);
fn_8007185C(arg0, -1);
GWSystem.field31_bit4 = 0xF;
_ClearFlag(0x10016);
_ClearFlag(0x1000E);
BoardCameraMoveSet(1);
if (_CheckFlag(0x10006U) == 0) {
BoardCameraViewSet(2);
omVibrate((s16) arg0, 0xC, 4, 2);
rollType = -1;
BoardYourTurnExec(arg0);
rollResized = 0;
SetRollPlayerSize(arg0);
if (preTurnHook[arg0] != 0U) {
if (preTurnHook[arg0]() != 0) {
preTurnHook[arg0] = 0;
}
}
if (_CheckFlag(0x1000BU) != 0) {
BoardTutorialHookExec(5, 0);
}
BoardPlayerTurnRollExec(arg0);
} else {
BoardCameraViewSet(1);
BoardCameraMotionWait();
}
BoardPlayerTurnMoveExec(arg0);
}
static inline s32 PlayerItemUseExec(s32 arg0) {
return BoardItemUseExec(arg0);
}
void BoardPlayerTurnRollExec(s32 arg0) {
s32 temp_r28;
s32 temp_r30;
GWPlayer[arg0].roll = 0;
GWPlayer[arg0].field08_bit7 = 1;
BoardPauseEnableSet(0);
do {
temp_r30 = fn_80085CC8(arg0);
switch (temp_r30) {
case -2:
BoardPauseEnableSet(1);
fn_80085EB4();
BoardCameraTargetPlayerSet(arg0);
BoardCameraMotionWait();
rollType = PlayerItemUseExec(arg0);
if (BoardRollTypeGet() == 0xC) {
_SetFlag(0x10016);
BoardSpaceLandExec(arg0, GWPlayer[arg0].space_curr);
BoardCameraMoveSet(1);
BoardCameraViewSet(2);
_ClearFlag(0x10016);
}
BoardPauseEnableSet(0);
break;
case -3:
fn_80085EB4();
fn_80072DA8(arg0);
break;
case -4:
fn_80085EB4();
fn_800729A4(arg0);
break;
}
} while (temp_r30 <= 0);
}
void BoardPlayerTurnMoveExec(s32 arg0) {
s16 sp8;
u32 temp_r27;
s32 temp_r30;
s32 var_r29;
s32 var_r28;
s32 temp_r0;
s32 temp_r1;
BoardPauseEnableSet(1);
var_r28 = 0;
if (_CheckFlag(0x10006U) == 0) {
BoardCameraMoveSet(1);
var_r29 = 1;
BoardCameraViewSet(1);
BoardCameraMotionWait();
sp8 = -1;
GWPlayer[arg0].space_next = -1;
if (GWPlayer[arg0].bowser_suit != 0) {
BoardCameraTargetModelSet(suitMdl);
BoardCameraOffsetSet(0.0f, 100.0f, 0.0f);
}
} else {
var_r29 = 0;
var_r28 = 1;
_ClearFlag(0x10006);
_ClearFlag(0x10007);
sp8 = GWPlayer[arg0].space_next;
goto block_14;
}
do {
BoardPauseEnableSet(1);
GWPlayer[arg0].space_prev = GWPlayer[arg0].space_curr;
if (_CheckFlag(0x20001U) == 0) {
if (ExecJunction(arg0, &sp8) != 0) {
break;
}
} else if (DoDebugMove(arg0, &sp8) != 0) {
break;
}
GWPlayer[arg0].space_next = sp8;
StopJunctionPlayer(0);
if (MegaPlayerPassFunc(arg0, sp8) == 0) {
BoardPauseEnableSet(0);
BoardPlayerMoveTo(arg0, sp8);
BoardPauseEnableSet(1);
}
GWPlayer[arg0].space_prev = GWPlayer[arg0].space_curr;
GWPlayer[arg0].space_curr = sp8;
if (var_r29 != 0) {
BoardPlayerCurrMoveAwayStart(GWPlayer[arg0].space_prev, 0);
var_r29 = 0;
}
DoSparkSpace(arg0, 0);
if (BoardSpaceWalkEventExec() != 0) {
continue;
}
if (BoardSpaceWalkExec(arg0, sp8) != 0) {
continue;
}
block_14:
temp_r30 = BoardSpaceTypeGet(0, sp8);
temp_r27 = BoardSpaceFlagGet(0, sp8);
if ((temp_r30 == 0 || temp_r30 == 8 || temp_r30 == 10) && ((temp_r27 & 0x20000000) == 0) || var_r28 != 0) {
var_r28 = 0;
continue;
}
HuAudFXPlay(0x301);
if (--GWPlayer[arg0].roll == 0) break;
} while (1);
BoardPauseEnableSet(1);
BoardDiceDigit2DUpdateEnable(arg0);
BoardRotateDiceNumbers(arg0);
if (GWPlayer[arg0].bowser_suit != 0) {
BoardCameraTargetPlayerSet(arg0);
}
if (_CheckFlag(0x1000BU) != 0) {
BoardTutorialHookExec(7, 0);
}
if (BoardRollTypeGet() != -1) {
fn_8008EEB8(arg0, BoardRollTypeGet());
while (fn_8008EE9C() == 0) {
HuPrcVSleep();
}
rollType = -1;
}
BoardPlayerSizeRestore(arg0);
rollResized = 0;
if (_CheckFlag(0x1000BU) != 0) {
BoardTutorialHookExec(8, 0);
}
BoardSpaceHiddenBlockExec(arg0, sp8);
BoardSpaceLandExec(arg0, sp8);
_SetFlag(0x1000E);
if (GWSystem.field31_bit4 != 1) {
BoardCameraViewSet(2);
BoardCameraMotionWait();
} else {
GWSystem.field31_bit4 = 0xF;
}
BoardPlayerZoomRestore(arg0);
return;
}
void BoardPlayerPostTurnHookExec(s32 arg0) {
if (postTurnHook[arg0] != 0U) {
if (postTurnHook[arg0]() != 0) {
postTurnHook[arg0] = 0;
}
}
}
void BoardPlayerSizeRestore(s32 arg0) {
PlayerState* temp_r24;
PlayerState* temp_r23;
s32 var_r28;
s32 var_r27;
temp_r24 = GetPlayer(arg0);
if (temp_r24 != 0) {
var_r28 = temp_r24->size;
}
if (var_r28 != 0) {
temp_r23 = GetPlayer(arg0);
if (temp_r23 != 0) {
var_r27 = temp_r23->size;
}
if (var_r27 == 1) {
HuAudFXPlay(0x313);
} else {
HuAudFXPlay(0x311);
}
BoardPlayerResizeAnimExec(arg0, 0);
BoardPlayerSizeSet(arg0, 0);
while (fn_8008EE9C() == 0) {
HuPrcVSleep();
}
}
}
void BoardPlayerZoomRestore(s32 arg0) {
PlayerState* sp8;
s32 var_r31;
s32 var_r29;
s32 var_r28;
s32 temp_r27;
Vec sp18;
Vec spC;
sp8 = GetPlayer(arg0);
BoardModelPosGet(GetBoardPlayer(arg0), &spC);
temp_r27 = GWPlayer[arg0].space_curr;
var_r31 = GWSystem.player_curr;
if (var_r31 == -1) {
var_r31 = 0;
}
for (var_r28 = 0, var_r29 = var_r28; var_r28 < 4; var_r28++) {
if (var_r31 == arg0) break;
if (temp_r27 == GWPlayer[var_r31].space_curr) {
var_r29++;
}
var_r31 = (var_r31 + 1) & 3;
(void)var_r29; //
}
BoardSpaceDirPosGet(temp_r27, var_r29, &sp18);
BoardPlayerAnimBlendSet(arg0, 0, 0xF);
while (BoardPlayerAnimBlendCheck(arg0) == 0) {
HuPrcVSleep();
}
BoardRotateDiceNumbers(arg0);
}
void BoardJunctionMaskSet(s32 arg0) {
junctionMask |= arg0;
}
void BoardJunctionMaskReset(s32 arg0) {
junctionMask &= ~arg0;
}
void BoardJunctionMaskZero(void) {
junctionMask = 0;
}

View file

@ -336,7 +336,7 @@ void GWStarsAdd(int player, s16 amount)
GWStarsSet(player, GWPlayer[player].stars+amount);
}
s16 GWStarsGet(int player)
s32 GWStarsGet(int player)
{
return GWPlayer[player].stars;
}