diff --git a/config.yml b/config.yml index 6657c490..f1dd049c 100644 --- 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 index 3cfa5086..27cb469e 100644 --- a/src/port/Engine.cpp +++ b/src/port/Engine.cpp @@ -60,6 +60,7 @@ GameEngine::GameEngine() { std::vector 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 index 3f167c86..359d70e9 100644 --- a/src/port/extractor/GameExtractor.cpp +++ b/src/port/extractor/GameExtractor.cpp @@ -12,11 +12,13 @@ std::unordered_map 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 index 7da8ae8e..c11ad9e2 160000 --- a/tools/Torch +++ b/tools/Torch @@ -1 +1 @@ -Subproject commit 7da8ae8e25d6c1267792941bf9ac56c1acc384ae +Subproject commit c11ad9e2a2b2cffd7108d1ea03fad65d825a6683