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_6D270.c
+++ b/src/core2/code_6D270.c
@@ -1,6 +1,7 @@
 #include <ultra64.h>
 #include "functions.h"
 #include "variables.h"
+#include <core1/viewport.h>

 extern func_802EFAB0(ParticleEmitter *, s32, f32);

@@ -36,7 +37,7 @@ ParticleEmitter *func_802F4274(f32 arg0[3]) {
    ml_vec3f_copy(sp2C, arg0);
    func_8024559C(sp2C, &sp20, &sp28);
    sp2C[1] = sp28 + 14.0f;
-    viewport_get_position_vec3f(sp38);
+    viewport_getPosition_vec3f(sp38);
    sp44[0] = sp38[0] - sp2C[0];
    sp44[2] = sp38[2] - sp2C[2];
    sp44[1] = 0.0f;