Cleanup and unblock AddFcht

TheOnlyZac · Dec 5, 2024 · 49825dd · 49825dd
1 parent e5db3e5
commit 49825dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/P2/joy.c b/src/P2/joy.c
@@ -233,15 +233,14 @@ void ClearFchts()
     ResetWorld(FTRANS_None);
 }
 
-INCLUDE_ASM(const s32, "P2/joy", AddFcht__Fi);
-// void AddFcht(int nParam)
-// {
-//     g_grfcht |= nParam & ~FCHT_ResetWorld;
-//     if (nParam & FCHT_ResetWorld)
-//     {
-//         ResetWorld(FTRANS_None);
-//     }
-// }
+void AddFcht(int nParam)
+{
+    g_grfcht |= nParam & ~FCHT_ResetWorld;
+    if (nParam & FCHT_ResetWorld)
+    {
+        ResetWorld(FTRANS_None);
+    }
+}
 
 INCLUDE_ASM(const s32, "P2/joy", func_0016F470);
 

diff --git a/src/P2/jt2.c b/src/P2/jt2.c
@@ -13,9 +13,8 @@ INCLUDE_ASM(const s32, "P2/jt2", EnableJtActadj__FP2JTi);
 
 INCLUDE_ASM(const s32, "P2/jt2", SetJtJts__FP2JT3JTS4JTBS);
 
-//INCLUDE_ASM(const s32, "P2/jt2", ProfileJt__FP2JTi);
-void ProfileJt(JT* pjt, int fProfile) {
-    // Does nothing.
+void ProfileJt(JT *pjt, int fProfile)
+{
     return;
 }
 

diff --git a/src/P2/splice/spliceutils.cpp b/src/P2/splice/spliceutils.cpp
@@ -7,6 +7,7 @@
 
 extern CGc g_gc;
 
+// todo: fix blocked references
 INCLUDE_ASM(const s32, "P2/splice/spliceutils", StartupSplice__Fv);
 // void StartupSplice()
 // {