Merge branch 'mr-origin-96'

src/FP/ch/bearcub.c

@@ -84,7 +84,7 @@ void func_8038A318(ActorMarker *caller, enum asset_e text_id, s32 arg1){
         func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
         func_8025A6EC(COMUSIC_5B_FP_IGLOO_HAPPY, 25000);
         func_8025A58C(0, 4000);
-        func_8024BD08(0);
+        core1_ce60_incOrDecCounter(FALSE);
     }
 }
 

src/FP/ch/boggy2.c

@@ -201,7 +201,7 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
         case 0xc29://L80388DC4
             func_8025A6EC(COMUSIC_3A_FP_BOGGY_RACE, 25000);
             func_8025A58C(0, 4000);
-            func_8024BD08(0);
+            core1_ce60_incOrDecCounter(FALSE);
             func_802BE720();
             local->unk0 = partEmitMgr_newEmitter(16);
             local->unk4 = partEmitMgr_newEmitter(16);

src/FP/ch/scarfsled.c

@@ -1,7 +1,6 @@
 #include <ultra64.h>
 #include "functions.h"
 #include "variables.h"
-#include "ml/mtx.h"
 
 void chScarfSled_update(Actor *this);
 

src/FP/ch/twinklybox.c

@@ -199,7 +199,7 @@ void func_8038D3D8(void){
     comusic_8025AB44(COMUSIC_68_TWINKLY_MINIGAME, 0, 4000);
     func_8025AABC(COMUSIC_68_TWINKLY_MINIGAME);
     func_8025A58C(-1, 4000);
-    func_8024BD08(1);
+    core1_ce60_incOrDecCounter(TRUE);
 }
 
 void func_8038D41C(ActorMarker *marker){
@@ -265,7 +265,7 @@ void func_8038D5C8(ActorMarker *this_marker, ActorMarker *other_marker){
         this->unk1C[1] = 0.0f;
         func_8025A6EC(COMUSIC_68_TWINKLY_MINIGAME, 25000);
         func_8025A58C(0, 4000);
-        func_8024BD08(0);
+        core1_ce60_incOrDecCounter(FALSE);
         this->unk1C[2] = 428571.0f;
         func_8025AEA0(0x68, (s32)this->unk1C[2]);
         subaddie_set_state_with_direction(this, 3, 0.001f, 1);

src/FP/ch/wozza.c

@@ -140,7 +140,7 @@ bool func_8038F5D4(Actor *this, f32 arg1[3], f32 arg2, f32 arg3, s32 arg4){
     }
     this->actor_specific_1_f = (1.0f- sp24)*arg2;
     func_80329054(this, 2);
-    if(ml_distance_vec3f(this->position, arg1) <= arg4)
+    if(ml_vec3f_distance(this->position, arg1) <= arg4)
         return TRUE;
     return FALSE;
 

src/FP/ch/xmastreeeggtoll.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 void func_80390EB0(Actor *this);
 

src/FP/code_ABD0.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "prop.h"
-#include "SnS.h"
 #include "actor.h"
 
 extern ActorInfo D_80367FE0;

src/FP/racectrl.c

@@ -69,7 +69,7 @@ void func_8038ABDC(void){
     comusic_8025AB44(COMUSIC_3A_FP_BOGGY_RACE, 0, 4000);
     func_8025AABC(COMUSIC_3A_FP_BOGGY_RACE);
     func_8025A58C(-1, 4000);
-    func_8024BD08(1);
+    core1_ce60_incOrDecCounter(TRUE);
 }
 
 void func_8038AC20(s32 gate_indx, s32 arg1){