diff --git a/src/P2/joy.c b/src/P2/joy.c index 14c52c43..fd28da97 100644 --- 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 index fe35b63b..c36a20a5 100644 --- 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 index 97d5b6e6..e910eaad 100644 --- 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() // {