AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't differentiate export path between standalone and Trilogy extracts, minor fix in CMetroidPrimeEssence, update submodules

This commit is contained in:
Phillip Stephens 2021-02-26 01:35:54 -08:00
parent e39fee8154
commit 172eae4a61
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
7 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DataSpec/SpecMP1.cpp
View File

@ -318,7 +318,7 @@ struct SpecMP1 : SpecBase {
hecl::ProjectPath outPath(m_project.getProjectWorkingPath(), _SYS_STR("out")); hecl::ProjectPath outPath(m_project.getProjectWorkingPath(), _SYS_STR("out"));
outPath.makeDir(); outPath.makeDir();
disc.getDataPartition()->extractSysFiles(outPath.getAbsolutePath(), ctx); disc.getDataPartition()->extractSysFiles(outPath.getAbsolutePath(), ctx);
hecl::ProjectPath mp1OutPath(outPath, m_standalone ? _SYS_STR("files") : _SYS_STR("files/MP1")); hecl::ProjectPath mp1OutPath(outPath, _SYS_STR("files/MP1"));
mp1OutPath.makeDirChain(true); mp1OutPath.makeDirChain(true);
/* Extract non-pak files */ /* Extract non-pak files */
@ -382,12 +382,7 @@ struct SpecMP1 : SpecBase {
TextureCache::Generate(m_pakRouter, m_project, noAramPath); TextureCache::Generate(m_pakRouter, m_project, noAramPath);
/* Write version data */ /* Write version data */
hecl::ProjectPath versionPath; hecl::ProjectPath versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files/MP1"));
if (m_standalone) {
versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files"));
} else {
versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files/MP1"));
}
WriteVersionInfo(m_project, versionPath); WriteVersionInfo(m_project, versionPath);
return true; return true;
} }

9
DataSpec/SpecMP2.cpp
View File

@ -278,7 +278,7 @@ struct SpecMP2 : SpecBase {
hecl::ProjectPath outPath(m_project.getProjectWorkingPath(), _SYS_STR("out")); hecl::ProjectPath outPath(m_project.getProjectWorkingPath(), _SYS_STR("out"));
outPath.makeDir(); outPath.makeDir();
disc.getDataPartition()->extractSysFiles(outPath.getAbsolutePath(), ctx); disc.getDataPartition()->extractSysFiles(outPath.getAbsolutePath(), ctx);
hecl::ProjectPath mp2OutPath(outPath, m_standalone ? _SYS_STR("files") : _SYS_STR("files/MP2")); hecl::ProjectPath mp2OutPath(outPath, _SYS_STR("files/MP2"));
mp2OutPath.makeDirChain(true); mp2OutPath.makeDirChain(true);
progress.startNewLine(); progress.startNewLine();
@ -321,12 +321,7 @@ struct SpecMP2 : SpecBase {
TextureCache::Generate(m_pakRouter, m_project, noAramPath); TextureCache::Generate(m_pakRouter, m_project, noAramPath);
/* Write version data */ /* Write version data */
hecl::ProjectPath versionPath; hecl::ProjectPath versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files/MP2"));
if (m_standalone) {
versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files"));
} else {
versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files/MP2"));
}
WriteVersionInfo(m_project, versionPath); WriteVersionInfo(m_project, versionPath);
return true; return true;
} }

2
DataSpec/SpecMP3.cpp
View File

@ -388,7 +388,7 @@ struct SpecMP3 : SpecBase {
hecl::ProjectPath outPath(m_project.getProjectWorkingPath(), _SYS_STR("out")); hecl::ProjectPath outPath(m_project.getProjectWorkingPath(), _SYS_STR("out"));
outPath.makeDir(); outPath.makeDir();
disc.getDataPartition()->extractSysFiles(outPath.getAbsolutePath(), ctx); disc.getDataPartition()->extractSysFiles(outPath.getAbsolutePath(), ctx);
m_outPath = {outPath, m_standalone ? _SYS_STR("files") : _SYS_STR("files/MP3")}; m_outPath = {outPath, _SYS_STR("files/MP3")};
m_outPath.makeDirChain(true); m_outPath.makeDirChain(true);
currentTarget = _SYS_STR("MP3 Root"); currentTarget = _SYS_STR("MP3 Root");

2
Runtime/MP1/World/CMetroidPrimeEssence.cpp
View File

@ -395,7 +395,7 @@ bool CMetroidPrimeEssence::ShouldCrouch(CStateManager& mgr, float dt) {
return false; return false;
} }
x6f4_ = std::min(static_cast<u32>(3.f * (1.f - x6c4_ * GetHealthInfo(mgr)->GetHP())), x6ec_); x6f4_ = std::min(x6e8_ + static_cast<u32>(3.f * (1.f - x6c4_ * GetHealthInfo(mgr)->GetHP())), x6ec_);
x6f0_ = 0; x6f0_ = 0;
return true; return true;
} }

2
hecl

@ -1 +1 @@
Subproject commit ec30cc090a2fcb14acb79f745a16d1bbb5b913f5 Subproject commit 867cb0704dfd7a24031cfa59fcd8de1b54ac5a37

2
hecl-gui

@ -1 +1 @@
Subproject commit ce8dc3ddc55d00051c834d2971cb3f24417076b9 Subproject commit b0969a4b72d8e7b7183a6e54e6c3bd934d9f93e3

2
specter

@ -1 +1 @@
Subproject commit c1aa9824749f15a729166dc8b93ff5ee0eae2a29 Subproject commit e061a0ef216523ee76783e4b0d6c1dfc70944037