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/code_A5BC0.c
+++ b/src/core2/code_A5BC0.c
@@ -3,6 +3,7 @@
 #include "variables.h"
 #include "enums.h"

+#include <core1/viewport.h>
 #include <core2/file.h>

 #define AssetCacheSize 0x3D5
@@ -103,7 +104,7 @@ void func_8032CB50(Cube *cube, bool global) {

    if (cube->prop2Cnt >= 2) {
        if (global == 0) {
-            veiwport_get_position_vec3w(ref_position); //distance from viewport
+            viewport_getPosition_vec3w(ref_position); //distance from viewport
        } else {
            ref_position[0] = 0;
            ref_position[1] = 0;