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

Sync bugfixing

Browse source
This commit is contained in:
CreateSource 2024-01-21 13:32:23 -05:00
parent 83df5dfe18
commit 4fa3ee8b10
2 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,10 +53,10 @@ s32 BoardPlayerItemAdd(s32, s32);
s32 BoardPlayerItemRemove(s32, s32); s32 BoardPlayerItemRemove(s32, s32);
s32 BoardPlayerItemFind(s32, s32); s32 BoardPlayerItemFind(s32, s32);
s32 BoardPlayerItemCount(s32); s32 BoardPlayerItemCount(s32);
void fn_80062D90(s32); void BoardPlayerCornerPosSet(s32 arg0);
void BoardPlayerCurrSpacePosDirGet(s32, Vec*); void BoardPlayerCornerPosGet(s32, Vec*);
void BoardPlayerAmbSet(s32, f32, f32, f32); void BoardPlayerAmbSet(s32, f32, f32, f32);
void BoardPlayerMtxSet(s32, Mtx); void BoardPlayerMtxSet(s32, Mtx*);
void BoardPlayerPosSetV(s32, Vec*); void BoardPlayerPosSetV(s32, Vec*);
void BoardPlayerPosSet(s32, f32, f32, f32); void BoardPlayerPosSet(s32, f32, f32, f32);
void BoardPlayerPosGet(s32, Vec*); void BoardPlayerPosGet(s32, Vec*);
@ -73,7 +73,7 @@ void BoardPlayerMotionKill(s32, s32);
void BoardPlayerMotionEndCheck(s32); void BoardPlayerMotionEndCheck(s32);
void BoardPlayerMotionEndWait(s32); void BoardPlayerMotionEndWait(s32);
void BoardPlayerMotionStart(s32, s32, s32); void BoardPlayerMotionStart(s32, s32, s32);
void BoardPlayerMotionShiftSet(s32, s32, f32, f32, s32); void BoardPlayerMotionShiftSet(s32, s32, f32, f32, u32);
void BoardPlayerMotionSpeedSet(s32, f32); void BoardPlayerMotionSpeedSet(s32, f32);
void BoardPlayerMotionTimeSet(s32, f32); void BoardPlayerMotionTimeSet(s32, f32);
f32 BoardPlayerMotionTimeGet(s32); f32 BoardPlayerMotionTimeGet(s32);
@ -120,7 +120,6 @@ void BoardPlayerCoinsSet(s32 player, s32 value);
s32 BoardPlayerSizeGet(s32 player); s32 BoardPlayerSizeGet(s32 player);
void BoardPlayerAutoSizeSet(s32 player, s32 value); void BoardPlayerAutoSizeSet(s32 player, s32 value);
void BoardPlayerMotionStart(s32, s32, s32); void BoardPlayerMotionStart(s32, s32, s32);
void BoardPlayerMotionShiftSet(s32 player, s32 arg1, float start, float end, u32 attr);
void BoardPlayerRotYSet(s32 player, float rot_y); void BoardPlayerRotYSet(s32 player, float rot_y);
void BoardPlayerZoomRestore(s32 player); void BoardPlayerZoomRestore(s32 player);

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

@ -16,7 +16,7 @@ extern void BoardStatusHammerShowSet(s32, s32);
extern void BoardYourTurnExec(s32); extern void BoardYourTurnExec(s32);
extern s32 BoardItemUseExec(s32); extern s32 BoardItemUseExec(s32);
//// #include "game/board/main.h" //// #include "game/board/main.h"
extern f32 BoardVecCalcDAngle(f32); extern f32 BoardDAngleCalc(f32);
//// #include "game/board/model.h" //// #include "game/board/model.h"
extern s16 BoardModelCreateCharacter(s32, s32, s32*, s32); extern s16 BoardModelCreateCharacter(s32, s32, s32*, s32);
extern void BoardModelExistCheck(s16, s32); extern void BoardModelExistCheck(s16, s32);
@ -24,7 +24,6 @@ extern void BoardModelExistDupe(s16, s32);
extern void BoardModelCameraSet(s16, u16); extern void BoardModelCameraSet(s16, u16);
extern void BoardItemStatusKill(s32); extern void BoardItemStatusKill(s32);
extern void BoardModelAmbSet(s16, f32, f32, f32); extern void BoardModelAmbSet(s16, f32, f32, f32);
extern void BoardModelMtxSet(s16, Mtx);
extern void BoardModelPosSetV(s16, Vec*); extern void BoardModelPosSetV(s16, Vec*);
extern void BoardModelPosSet(s16, f32, f32, f32); extern void BoardModelPosSet(s16, f32, f32, f32);
extern s32 BoardModelPosGet(s16, Vec*); extern s32 BoardModelPosGet(s16, Vec*);
@ -408,7 +407,7 @@ void BoardPlayerAmbSet(s32 arg0, f32 arg8, f32 arg9, f32 argA) {
BoardModelAmbSet(BoardPlayerModelGet(arg0), arg8, arg9, argA); BoardModelAmbSet(BoardPlayerModelGet(arg0), arg8, arg9, argA);
} }
void BoardPlayerMtxSet(s32 arg0, Mtx arg1) { void BoardPlayerMtxSet(s32 arg0, Mtx *arg1) {
BoardModelMtxSet(BoardPlayerModelGet(arg0), arg1); BoardModelMtxSet(BoardPlayerModelGet(arg0), arg1);
} }
@ -1150,11 +1149,11 @@ static void RestoreJunction(f32 arg8, s32 arg0) {
} }
} }
static inline f32 BoardAbsAngle(f32 startA, f32 endA) { static inline f32 BoardDAngleAbs(f32 startA, f32 endA) {
if (BoardVecCalcDAngle(startA - endA) < 0.0f) { if (BoardDAngleCalc(startA - endA) < 0.0f) {
return -BoardVecCalcDAngle(startA - endA); return -BoardDAngleCalc(startA - endA);
} else { } else {
return BoardVecCalcDAngle(startA - endA); return BoardDAngleCalc(startA - endA);
} }
} }
@ -1166,12 +1165,12 @@ static s32 GetDefaultDirection(f32 arg0, f32* arg1, s32 arg2) {
s32 var_r30; s32 var_r30;
s32 var_r31; s32 var_r31;
temp_f30 = BoardVecCalcDAngle(arg0); temp_f30 = BoardDAngleCalc(arg0);
var_f28 = 999.0f; var_f28 = 999.0f;
for (var_r31 = 0, var_r30 = var_r31; var_r31 < arg2; var_r31++) { for (var_r31 = 0, var_r30 = var_r31; var_r31 < arg2; var_r31++) {
temp_f1 = BoardVecCalcDAngle(arg1[var_r31]); temp_f1 = BoardDAngleCalc(arg1[var_r31]);
var_f27 = BoardAbsAngle(temp_f1, temp_f30); var_f27 = BoardDAngleAbs(temp_f1, temp_f30);
if (var_f27 < var_f28) { if (var_f27 < var_f28) {
var_f28 = var_f27; var_f28 = var_f27;