Merge branch 'mr-origin-96'

2024-10-19 23:10:46 -05:00
parent 9443a276c5 0ba0a22549
commit a59e1abddf
291 changed files with 2238 additions and 2204 deletions
--- a/src/core2/code_6D270.c
+++ b/src/core2/code_6D270.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>

 extern func_802EFAB0(ParticleEmitter *, s32, f32);