PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 05:25:01 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Fixed O2R Extraction

Browse Source
This commit is contained in:
KiritoDv 2025-01-16 01:31:33 -06:00
parent 62a88a558a
commit 6eae88de77
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yml
View File

@ -73,7 +73,7 @@ d064229a32cc05ab85e2381ce07744eb3ffaf530:
config: config:
gbi: F3DEX gbi: F3DEX
sort: OFFSET sort: OFFSET
logging: ERROR logging: INFO
output: output:
binary: ./mods/sf64jp.o2r binary: ./mods/sf64jp.o2r
code: src/assets code: src/assets

9
src/port/Engine.cpp
View File

@ -60,6 +60,7 @@ GameEngine::GameEngine() {
std::vector<std::string> archiveFiles; std::vector<std::string> archiveFiles;
const std::string main_path = Ship::Context::GetPathRelativeToAppDirectory("sf64.o2r"); const std::string main_path = Ship::Context::GetPathRelativeToAppDirectory("sf64.o2r");
const std::string assets_path = Ship::Context::GetPathRelativeToAppDirectory("starship.o2r"); const std::string assets_path = Ship::Context::GetPathRelativeToAppDirectory("starship.o2r");
const std::string mod_path = Ship::Context::GetPathRelativeToAppDirectory("mods/sf64jp.o2r");
#ifdef _WIN32 #ifdef _WIN32
AllocConsole(); AllocConsole();
@ -75,6 +76,14 @@ GameEngine::GameEngine() {
} else { } else {
archiveFiles.push_back(main_path); 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 { } else {
exit(1); exit(1);
} }

4
src/port/extractor/GameExtractor.cpp
View File

@ -12,11 +12,13 @@ std::unordered_map<std::string, std::string> mGameList = {
{ "63b69f0ef36306257481afc250f9bc304c7162b2", "Star Fox 64 (U) (V1.0) (Uncompressed)" }, { "63b69f0ef36306257481afc250f9bc304c7162b2", "Star Fox 64 (U) (V1.0) (Uncompressed)" },
{ "09f0d105f476b00efa5303a3ebc42e60a7753b7a", "Star Fox 64 (U) (V1.1)" }, { "09f0d105f476b00efa5303a3ebc42e60a7753b7a", "Star Fox 64 (U) (V1.1)" },
{ "f7475fb11e7e6830f82883412638e8390791ab87", "Star Fox 64 (U) (V1.1) (Uncompressed)" }, { "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() { bool GameExtractor::SelectGameFromUI() {
#if !defined(__IOS__) || !defined(__ANDROID__) || !defined(__SWITCH__) #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()) { if (selection.empty()) {
return false; return false;

2
tools/Torch

@ -1 +1 @@
Subproject commit 7da8ae8e25d6c1267792941bf9ac56c1acc384ae Subproject commit c11ad9e2a2b2cffd7108d1ea03fad65d825a6683