Merge branch 'mr-origin-89'

2024-10-08 02:06:56 -05:00
parent 680cf7a950 4bf7028254
commit 3cd3b3e5da
40 changed files with 709 additions and 585 deletions
--- a/src/CC/code_13C0.c
+++ b/src/CC/code_13C0.c
@@ -121,7 +121,7 @@ void CC_func_80387A40(Struct_CC_13C0_1* arg0, Struct68s* arg1, f32 arg2) {
        }
    }
    if ((arg0->unk4 == 0) || (arg0->unk4 == 1)) {
-        func_8035179C(arg1, sp38);
+        func_8035179C_copyPosition(arg1, sp38);
        func_80351814(arg1, sp2C);
        sp44[0] = 0.0f;
        sp44[1] = 0.0f;