Match itmariofireball

configure.py

@@ -905,7 +905,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
             Object(NonMatching, "melee/it/items/itfflowerflame.c"),
             Object(NonMatching, "melee/it/items/itevyoshiegg.c"),
             # Fighter-related items
-            Object(NonMatching, "melee/it/items/itmariofireball.c"),
+            Object(Matching, "melee/it/items/itmariofireball.c"),
             Object(NonMatching, "melee/it/items/itkirbycutterbeam.c"),
             Object(Matching, "melee/it/items/itfoxlaser.c"),
             Object(Matching, "melee/it/items/itfoxillusion.c"),

obj_files.mk

@@ -604,7 +604,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/melee/it/items/itevyoshiegg.s.o\
 
 TEXT_O_FILES +=\
-    $(BUILD_DIR)/asm/melee/it/items/itmariofireball.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itmariofireball.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itkirbycutterbeam.s.o\
     $(BUILD_DIR)/src/melee/it/items/itfoxlaser.c.o\
     $(BUILD_DIR)/src/melee/it/items/itfoxillusion.c.o\
@@ -794,6 +794,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/src/MSL/math_1.c.o\
     $(BUILD_DIR)/asm/MSL/trigf.s.o\
     $(BUILD_DIR)/asm/MSL/math.s.o\
+    $(BUILD_DIR)/src/MSL/math_ppc.c.o\
 
 TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/MetroTRK/mainloop.s.o\

src/MSL/math.h

@@ -22,25 +22,6 @@ static float const rad_to_deg = 180 / M_PI;
 
 #define FLT_EPSILON 1.00000001335e-10F
 
-extern inline float sqrtf(float x)
-{
-    static const double _half = .5;
-    static const double _three = 3.0;
-    volatile float y;
-    if (x > 0.0f) {
-        double guess = __frsqrte((double) x); // returns an approximation to
-        guess = _half * guess *
-                (_three - guess * guess * x); // now have 12 sig bits
-        guess = _half * guess *
-                (_three - guess * guess * x); // now have 24 sig bits
-        guess = _half * guess *
-                (_three - guess * guess * x); // now have 32 sig bits
-        y = (float) (x * guess);
-        return y;
-    }
-    return x;
-}
-
 #ifdef __MWERKS__
 #pragma pop
 #endif
@@ -103,24 +84,6 @@ static inline f32 fabs_inline(f32 x)
     }
 }
 
-inline float sqrtf_accurate(float x)
-{
-    volatile float y;
-    if (x > 0.0f) {
-        double guess = __frsqrte((double) x); // returns an approximation to
-        guess =
-            0.5 * guess * (3.0 - guess * guess * x); // now have 12 sig bits
-        guess =
-            0.5 * guess * (3.0 - guess * guess * x); // now have 24 sig bits
-        guess =
-            0.5 * guess * (3.0 - guess * guess * x); // now have 32 sig bits
-        guess = 0.5 * guess * (3.0 - guess * guess * x); // extra iteration
-        y = (float) (x * guess);
-        return y;
-    }
-    return x;
-}
-
 double frexp(double x, int* exponent);
 double fabsf__Ff(double);
 float tanf(float x);

src/MSL/math_ppc.c

@@ -0,0 +1 @@
+#include "math_ppc.h"