From 22b4df3d4620015590be0f608063cc56a615834a Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Tue, 2 Jan 2024 21:41:37 -0600 Subject: [PATCH] Fix BoardCameraMotionStartEx prototype in functions.h --- include/functions.h | 2 +- src/REL/w10Dll/scene.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/functions.h b/include/functions.h index 185f5d42..7cb9f3a0 100644 --- a/include/functions.h +++ b/include/functions.h @@ -46,7 +46,7 @@ void fn_8004D6F4(s16 arg); s32 rand8(void); void BoardCameraTargetModelSet(s16 model); -void BoardCameraMotionStartEx(s16, Vec*, s32, f32, f32, s32); +void BoardCameraMotionStartEx(s16, Vec *, Vec *, f32, f32, s16); void BoardCameraMotionWait(void); void BoardSpacePosGet(s32, s32, Vec*); void fn_8007A360(s32); diff --git a/src/REL/w10Dll/scene.c b/src/REL/w10Dll/scene.c index 4eb74119..b400f41e 100644 --- a/src/REL/w10Dll/scene.c +++ b/src/REL/w10Dll/scene.c @@ -185,29 +185,29 @@ void fn_1_13A4(void) { temp_r3_2 = BoardSpaceFlagSearch(0, 0x80000); BoardSpacePosGet(0, temp_r3_2, &sp14); BoardModelPosSetV(lbl_1_bss_0->unk8, &sp14); - BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E); + BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30); BoardCameraMotionWait(); fn_1_BA0(0x2E002C); fn_8007A360(temp_r3_2); - BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E); + BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30); BoardCameraMotionWait(); temp_r3_2 = BoardSpaceFlagSearch(0, 0x10000000); BoardSpacePosGet(0, temp_r3_2, &sp14); BoardModelPosSetV(lbl_1_bss_0->unk8, &sp14); - BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E); + BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30); BoardCameraMotionWait(); fn_1_BA0(0x2E002E); fn_8007F894(); - BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E); + BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30); BoardCameraMotionWait(); temp_r3_2 = BoardSpaceFlagSearch(0, 0x08000000); BoardSpacePosGet(0, temp_r3_2, &sp14); BoardModelPosSetV(lbl_1_bss_0->unk8, &sp14); - BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E); + BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30); BoardCameraMotionWait(); fn_1_BA0(0x2E0030); fn_800A6B10(); - BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E); + BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30); BoardCameraMotionWait(); fn_1_BA0(0x2E0032); BoardCameraTargetModelSet(fn_80083F84());