Merge branch 'mr-origin-69'

2024-09-13 20:26:40 -05:00
parent d55a8d829d d36f6a807c
commit 425e05a58b
80 changed files with 806 additions and 660 deletions
--- a/src/core2/nc/dynamicCamF.c
+++ b/src/core2/nc/dynamicCamF.c
@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "functions.h"
+#include <core1/viewport.h>

 static f32 __playerStartPosition[3];

@@ -7,8 +8,8 @@ void ncDynamicCamF_init(void){
    f32 sp24[3];
    f32 sp12[3];

-    viewport_get_position_vec3f(sp24);
-    viewport_get_rotation_vec3f(sp12);
+    viewport_getPosition_vec3f(sp24);
+    viewport_getRotation_vec3f(sp12);
    ncDynamicCamera_setPosition(sp24);
    ncDynamicCamera_setRotation(sp12);
    player_getPosition(__playerStartPosition);