diff options
| author | StapleButter <thetotalworm@gmail.com> | 2018-02-19 13:08:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 13:08:34 +0100 |
| commit | aab0030137d70a7ef06c2d2e859f195dd06e0079 (patch) | |
| tree | aa30c02d16c31744dc735254f5e1c5afeb95468c /src/NDS.cpp | |
| parent | 12e33ae872795518aba882c57857dfefbc0c0eda (diff) | |
| parent | 52df6be5f8a912aeef050fa4c563cca3ef80ad5a (diff) | |
Merge pull request #224 from hcorion/alternate-loading
Load bios, firmware and melonDS.ini from exe, ~/.config/melonds or AppData
Diffstat (limited to 'src/NDS.cpp')
| -rw-r--r-- | src/NDS.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/NDS.cpp b/src/NDS.cpp index 8e5700f..34eccf7 100644 --- a/src/NDS.cpp +++ b/src/NDS.cpp @@ -18,6 +18,7 @@ #include <stdio.h> #include <string.h> +#include "Config.h" #include "NDS.h" #include "ARM.h" #include "CP15.h" @@ -244,7 +245,7 @@ void Reset() FILE* f; u32 i; - f = fopen("bios9.bin", "rb"); + f = Config::GetConfigFile("bios9.bin", "rb"); if (!f) { printf("ARM9 BIOS not found\n"); @@ -261,7 +262,7 @@ void Reset() fclose(f); } - f = fopen("bios7.bin", "rb"); + f = Config::GetConfigFile("bios7.bin", "rb"); if (!f) { printf("ARM7 BIOS not found\n"); |