Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Load scenes via MxScn.dat #367

Merged
merged 7 commits into from
Sep 14, 2022
Merged

Load scenes via MxScn.dat #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd8b31e
move scene data to MxScn file
UnclePunch Sep 13, 2022
47daa84
trim m-ex codeset further, remove MxDt
UnclePunch Sep 13, 2022
0d6f3a2
Update EXI_DeviceSlippi.cpp
UnclePunch Sep 14, 2022
d920ce4
chore: update bootloader
JLaferri Sep 14, 2022
18b20fe
Merge branch 'slippi' into mex-compatibility
JLaferri Sep 14, 2022
781145d
hack: prevent MxDt.dat from being loaded by Slippi
JLaferri Sep 14, 2022
8cf37f9
chore: add modified injection list
JLaferri Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Data/Sys/GameFiles/GALE01/MxDb.dat
View file
Open in desktop
Binary file not shown.
Binary file removed Data/Sys/GameFiles/GALE01/MxDt.dat
View file
Open in desktop
Binary file not shown.
Binary file added Data/Sys/GameFiles/GALE01/MxScn.dat
View file
Open in desktop
Binary file not shown.
1,803 changes: 33 additions & 1,770 deletions Data/Sys/GameSettings/GALE01r2.ini
View file
Open in desktop

Large diffs are not rendered by default.

1,803 changes: 33 additions & 1,770 deletions Data/Sys/GameSettings/GALJ01r2.ini
View file
Open in desktop

Large diffs are not rendered by default.

1,720 changes: 1,720 additions & 0 deletions Data/Sys/Slippi/InjectionLists/list_netplay-2.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified Data/Sys/bootloader.gct
View file
Open in desktop
Binary file not shown.
8 changes: 7 additions & 1 deletion Source/Core/Core/Slippi/SlippiGameFileLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ u32 SlippiGameFileLoader::LoadFile(std::string fileName, std::string &data)
}

std::string fileContents;
File::ReadFileToString(gameFilePath, fileContents);

// Don't read MxDt.dat because our Launcher may not have successfully deleted it and
// loading the old one from the file system would break m-ex based ISOs
if (fileName != "MxDt.dat")
{
File::ReadFileToString(gameFilePath, fileContents);
}

if (gameFilePath.substr(gameFilePath.length() - 5) == ".diff")
{
Expand Down