From 89d3199de8b4d1e3f2c0f4abfb9ac902e5faeba1 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Sun, 21 Jan 2024 20:58:03 -0600 Subject: [PATCH 1/2] Fix some player.h functions --- include/game/board/player.h | 4 ++-- src/REL/w03Dll/main.c | 2 +- src/game/board/player.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/game/board/player.h b/include/game/board/player.h index 2f09383f..8158254a 100644 --- a/include/game/board/player.h +++ b/include/game/board/player.h @@ -68,9 +68,9 @@ f32 BoardPlayerRotYGet(s32); void BoardPlayerScaleSetV(s32, Vec*); void BoardPlayerScaleSet(s32, f32, f32, f32); s16 BoardPlayerCurrMotionGet(s32); -void BoardPlayerMotionCreate(s32, s32); +s32 BoardPlayerMotionCreate(s32, s32); void BoardPlayerMotionKill(s32, s32); -void BoardPlayerMotionEndCheck(s32); +s32 BoardPlayerMotionEndCheck(s32); void BoardPlayerMotionEndWait(s32); void BoardPlayerMotionStart(s32, s32, s32); void BoardPlayerMotionShiftSet(s32, s32, f32, f32, u32); diff --git a/src/REL/w03Dll/main.c b/src/REL/w03Dll/main.c index 697b0d50..d7d5e61d 100644 --- a/src/REL/w03Dll/main.c +++ b/src/REL/w03Dll/main.c @@ -17,7 +17,7 @@ s32 BoardModelMotionStart(s16, s32, s32); void fn_8005B150(void*, void*); void fn_1_740(void); void fn_1_E0(void); -void fn_1_2930(void); +s32 fn_1_2930(s32 arg0); void fn_1_884(void); void fn_1_8F0(void); s32 fn_1_910(void); diff --git a/src/game/board/player.c b/src/game/board/player.c index ece9bc77..92660475 100644 --- a/src/game/board/player.c +++ b/src/game/board/player.c @@ -497,16 +497,16 @@ void BoardPlayerVoiceEnableSet(s32 arg0, s32 arg1, s32 arg2) { BoardModelVoiceEnableSet(BoardPlayerModelGet(arg0), arg1, arg2); } -void BoardPlayerMotionCreate(s32 arg0, s32 arg1) { - BoardModelMotionCreate(BoardPlayerModelGet(arg0), arg1); +s32 BoardPlayerMotionCreate(s32 arg0, s32 arg1) { + return BoardModelMotionCreate(BoardPlayerModelGet(arg0), arg1); } void BoardPlayerMotionKill(s32 arg0, s32 arg1) { BoardModelMotionKill(BoardPlayerModelGet(arg0), arg1); } -void BoardPlayerMotionEndCheck(s32 arg0) { - BoardModelMotionEndCheck(BoardPlayerModelGet(arg0)); +s32 BoardPlayerMotionEndCheck(s32 arg0) { + return BoardModelMotionEndCheck(BoardPlayerModelGet(arg0)); } void BoardPlayerMotionEndWait(s32 arg0) { From 224823160a6ad98988783fb3fe84974b3aad9499 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Sun, 21 Jan 2024 20:58:54 -0600 Subject: [PATCH 2/2] Fix player.c build --- src/game/board/player.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/board/player.c b/src/game/board/player.c index 92660475..ced05d79 100644 --- a/src/game/board/player.c +++ b/src/game/board/player.c @@ -36,7 +36,7 @@ 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 s32 BoardModelMotionCreate(s16, s32); extern void BoardModelMotionKill(s16, s32); extern s32 BoardModelMotionEndCheck(s16); extern s32 BoardModelMotionStart(s16, s32, s32);