fix CI; more compatibility

kirby.us.ld

@@ -205,8 +205,8 @@ SECTIONS
         BUILD_DIR/libultra.a:visetyscale.o(.text);
         BUILD_DIR/libultra.a:aisetnextbuf.o(.text);
         BUILD_DIR/libultra.a:ai.o(.text);
-        BUILD_DIR/libultra.a:conteepread.o(.text);
-        /*BUILD_DIR/asm/ovl0/func_80038F60.o(.text);*/
+        /*BUILD_DIR/libultra.a:conteepread.o(.text);*/
+        BUILD_DIR/asm/ovl0/func_80038F60.o(.text);
         BUILD_DIR/libultra.a:vigetcurrframebuf.o(.text);
         BUILD_DIR/libultra.a:spsetpc.o(.text);
     }

libreultra

@@ -1 +1 @@
-Subproject commit d3404e12582b2501260b7fe5ade9529c58b7ef3b
+Subproject commit 21c7277aaa5ec3e727770bdda8890733dfb512e3

tools/new_asset_extractor/extract_assets.cpp

@@ -276,14 +276,24 @@ int main(int argc, char **argv) {
         extract_bin(key, value);
     }
 
+    inline const char* get_file_extension(const char* file_path) {
+      // Find the last occurrence of '.' in the file path
+      const char* dot = strrchr(file_path, '.');
+      // If '.' was not found, return null
+      if (!dot || dot == file_path) return nullptr;
+      // Return a pointer to the character after the '.'
+      return dot + 1;
+    }
+
     #pragma omp task
     for (auto& [key, value] : pics.items()) {
-        fs::path p = key;
+        const char* extension = get_file_extension(path);
 
-        String s = p.extension();
-
-             if (s == ".bin") extract_bin(key, value);
-        else if (s == ".png") extract_img(pics, key, value);
+        if (extension && strcmp(extension, "bin") == 0) {
+          extract_bin(key, value);
+        } else if (extension && strcmp(extension, "png") == 0) {
+          extract_img(pics, key, value);
+        }
     }
 
     #pragma omp task

undefined_syms.txt

@@ -10,6 +10,7 @@ osSpTaskStartGo = 0x8002DB4C;
 sPakDevices = 0x800490F0;
 osMotorInit = 0x8002F2B4;
 __osPackRequestData = 0x8002F4D0;
+osEepromRead = 0x80038F60;
 osEepromWrite = 0x8002F810;
 gDynamicBuffer1 = 0x8004A3F8;
 gDisplayListHeads = 0x8004A3D0;