Fixed O2R Extraction

HarbourMasters · Jan 16, 2025 · 6eae88d · 6eae88d
1 parent 62a88a5
commit 6eae88d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/config.yml b/config.yml
@@ -73,7 +73,7 @@ d064229a32cc05ab85e2381ce07744eb3ffaf530:
   config:
     gbi: F3DEX
     sort: OFFSET
-    logging: ERROR
+    logging: INFO
     output:
       binary: ./mods/sf64jp.o2r
       code: src/assets

diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
@@ -60,6 +60,7 @@ GameEngine::GameEngine() {
     std::vector<std::string> archiveFiles;
     const std::string main_path = Ship::Context::GetPathRelativeToAppDirectory("sf64.o2r");
     const std::string assets_path = Ship::Context::GetPathRelativeToAppDirectory("starship.o2r");
+    const std::string mod_path = Ship::Context::GetPathRelativeToAppDirectory("mods/sf64jp.o2r");
 
 #ifdef _WIN32
     AllocConsole();
@@ -75,6 +76,14 @@ GameEngine::GameEngine() {
             } else {
                 archiveFiles.push_back(main_path);
             }
+
+            if (ShowYesNoBox("Extraction Complete", "ROM Extracted. Extract another?") == IDYES) {
+                if(!GenAssetFile()){
+                    ShowMessage("Error", "An error occured, no O2R file was generated.");
+                } else {
+                    archiveFiles.push_back(mod_path);
+                }
+            }
         } else {
             exit(1);
         }

diff --git a/src/port/extractor/GameExtractor.cpp b/src/port/extractor/GameExtractor.cpp
@@ -12,11 +12,13 @@ std::unordered_map<std::string, std::string> mGameList = {
     { "63b69f0ef36306257481afc250f9bc304c7162b2", "Star Fox 64 (U) (V1.0) (Uncompressed)" },
     { "09f0d105f476b00efa5303a3ebc42e60a7753b7a", "Star Fox 64 (U) (V1.1)" },
     { "f7475fb11e7e6830f82883412638e8390791ab87", "Star Fox 64 (U) (V1.1) (Uncompressed)" },
+    { "9bd71afbecf4d0a43146e4e7a893395e19bf3220", "Star Fox 64 (J) (V1.0)" },
+    { "d064229a32cc05ab85e2381ce07744eb3ffaf530", "Star Fox 64 (J) (V1.0) (Uncompressed)" },
 };
 
 bool GameExtractor::SelectGameFromUI() {
 #if !defined(__IOS__) || !defined(__ANDROID__) || !defined(__SWITCH__)
-    auto selection = pfd::open_file("Select a file", ".", { "N64 Roms", "*.z64 *.n64 *.v64" }).result();
+    auto selection = pfd::open_file("Select a file", ".", { "N64 Roms", "*.z64" }).result();
 
     if (selection.empty()) {
         return false;

diff --git a/tools/Torch b/tools/Torch
+2 −2		src/Companion.cpp
+7 −0		src/archive/ZWrapper.cpp
+4 −0		src/factories/naudio/v1/BookFactory.cpp