The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-23 19:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

-lets give the game sound thread its own stack again to hopefully

Browse Source 
fix that strange missing pointer problem
-fixed detection of devolution r168 or newer
-cleaned up the devolution code and added a few debug prints
This commit is contained in:
fix94.1 2012-11-17 17:30:24 +00:00
parent 5a827e48fc
commit f61d9dac0c
20 changed files with 64 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/devicemounter/DeviceHandler.cpp
View File

@ -329,20 +329,20 @@ void DeviceHandler::WaitForDevice(const DISC_INTERFACE *Handle)
} }
} }
bool DeviceHandler::MountDevolution(int CurrentPartition) bool DeviceHandler::MountDevolution()
{ {
int NewPartition = (CurrentPartition == SD ? CurrentPartition : CurrentPartition - 1); int NewPartition = (currentPartition == SD ? currentPartition : currentPartition - 1);
const DISC_INTERFACE *handle = (CurrentPartition == SD) ? &__io_wiisd : &__io_usbstorage_ogc; const DISC_INTERFACE *handle = (currentPartition == SD) ? &__io_wiisd : &__io_usbstorage_ogc;
/* We need to wait for the device to get ready for a remount */ /* We need to wait for the device to get ready for a remount */
WaitForDevice(handle); WaitForDevice(handle);
/* Only mount the partition we need */ /* Only mount the partition we need */
OGC_Device.SetDevice(handle); OGC_Device.SetDevice(handle);
return OGC_Device.Mount(NewPartition, DeviceName[CurrentPartition], true); return OGC_Device.Mount(NewPartition, DeviceName[currentPartition], true);
} }
void DeviceHandler::UnMountDevolution(int CurrentPartition) void DeviceHandler::UnMountDevolution()
{ {
int NewPartition = (CurrentPartition == SD ? CurrentPartition : CurrentPartition - 1); int NewPartition = (currentPartition == SD ? currentPartition : currentPartition - 1);
OGC_Device.UnMount(NewPartition); OGC_Device.UnMount(NewPartition);
OGC_Device.Cleanup(); OGC_Device.Cleanup();
} }

4
source/devicemounter/DeviceHandler.hpp
View File

@ -102,8 +102,8 @@ public:
int PartitionToPortPartition(int part); int PartitionToPortPartition(int part);
/* Special Devolution Stuff */ /* Special Devolution Stuff */
bool MountDevolution(int CurrentPartition); bool MountDevolution();
void UnMountDevolution(int CurrentPartition); void UnMountDevolution();
private: private:
bool MountUSB(int part); bool MountUSB(int part);

110
source/gc/gc.cpp
View File

@ -28,11 +28,13 @@
#include <dirent.h> #include <dirent.h>
#include "gc/gc.hpp" #include "gc/gc.hpp"
#include "gui/text.hpp"
#include "devicemounter/DeviceHandler.hpp" #include "devicemounter/DeviceHandler.hpp"
#include "gecko/gecko.h" #include "gecko/gecko.h"
#include "fileOps/fileOps.h" #include "fileOps/fileOps.h"
#include "loader/utils.h" #include "loader/utils.h"
#include "loader/disc.h" #include "loader/disc.h"
#include "loader/sys.h"
#include "memory/memory.h" #include "memory/memory.h"
// DIOS-MIOS // DIOS-MIOS
@ -42,7 +44,7 @@ void DML_New_SetOptions(const char *GamePath, char *CheatPath, const char *NewCh
const char *partition, bool cheats, bool debugger, u8 NMM, u8 nodisc, u8 DMLvideoMode, const char *partition, bool cheats, bool debugger, u8 NMM, u8 nodisc, u8 DMLvideoMode,
u8 videoSetting, bool widescreen, bool new_dm_cfg, bool activity_led) u8 videoSetting, bool widescreen, bool new_dm_cfg, bool activity_led)
{ {
gprintf("Wiiflow GC: Launch game '%s' through memory (new method)\n", GamePath); gprintf("DIOS-MIOS: Launch game '%s' through memory (new method)\n", GamePath);
memset(&DMLCfg, 0, sizeof(DML_CFG)); memset(&DMLCfg, 0, sizeof(DML_CFG));
DMLCfg.Magicbytes = 0xD1050CF6; DMLCfg.Magicbytes = 0xD1050CF6;
@ -77,7 +79,7 @@ void DML_New_SetOptions(const char *GamePath, char *CheatPath, const char *NewCh
else else
ptr = strstr(CheatPath, ":/") + 1; ptr = strstr(CheatPath, ":/") + 1;
strncpy(DMLCfg.CheatPath, ptr, sizeof(DMLCfg.CheatPath)); strncpy(DMLCfg.CheatPath, ptr, sizeof(DMLCfg.CheatPath));
gprintf("Cheat Path: %s\n", ptr); gprintf("DIOS-MIOS: Cheat Path %s\n", ptr);
DMLCfg.Config |= DML_CFG_CHEAT_PATH; DMLCfg.Config |= DML_CFG_CHEAT_PATH;
} }
if(activity_led) if(activity_led)
@ -106,7 +108,7 @@ void DML_New_SetOptions(const char *GamePath, char *CheatPath, const char *NewCh
void DML_Old_SetOptions(const char *GamePath) void DML_Old_SetOptions(const char *GamePath)
{ {
gprintf("Wiiflow GC: Launch game '%s' through boot.bin (old method)\n", GamePath); gprintf("DIOS-MIOS: Launch game '%s' through boot.bin (old method)\n", GamePath);
FILE *f; FILE *f;
f = fopen("sd:/games/boot.bin", "wb"); f = fopen("sd:/games/boot.bin", "wb");
fwrite(GamePath, 1, strlen(GamePath) + 1, f); fwrite(GamePath, 1, strlen(GamePath) + 1, f);
@ -122,7 +124,7 @@ void DML_Old_SetOptions(const char *GamePath)
void DML_New_SetBootDiscOption(bool new_dm_cfg) void DML_New_SetBootDiscOption(bool new_dm_cfg)
{ {
gprintf("Booting GC game\n"); gprintf("DIOS-MIOS: Booting Disc in Drive\n");
memset(&DMLCfg, 0, sizeof(DML_CFG)); memset(&DMLCfg, 0, sizeof(DML_CFG));
DMLCfg.Magicbytes = 0xD1050CF6; DMLCfg.Magicbytes = 0xD1050CF6;
@ -153,63 +155,63 @@ extern "C" { extern void __exception_closeall(); }
static gconfig *DEVO_CONFIG = (gconfig*)0x80000020; static gconfig *DEVO_CONFIG = (gconfig*)0x80000020;
#define DEVO_Entry() ((void(*)(void))loader_bin)() #define DEVO_Entry() ((void(*)(void))loader_bin)()
bool DEVO_Installed(const char* path) bool DEVO_Installed(const char *path)
{ {
bool devo = false; bool devo = false;
char loader_path[256]; const char *loader_path = fmt("%s/loader.bin", path);
snprintf(loader_path, sizeof(loader_path), "%s/loader.bin", path);
FILE *f = fopen(loader_path, "rb"); FILE *f = fopen(loader_path, "rb");
if(f) if(f != NULL)
{ {
u8 *tbuf = (u8 *)malloc(0x04); fseek(f, 0, SEEK_END);
fread(tbuf, 1, 4, f); if(ftell(f) > 0x80) //Size should be more than 128b
if(*(vu32*)tbuf == 0x4800004c) {
gprintf("Devolution: Found %s\n", loader_path);
devo = true; devo = true;
}
free(tbuf); rewind(f);
fclose(f); fclose(f);
} }
return devo; return devo;
} }
void DEVO_GetLoader(const char *loader) void DEVO_GetLoader(const char *path)
{ {
//Read in loader.bin //Read in loader.bin
char loader_path[256]; const char *loader_path = fmt("%s/loader.bin", path);
snprintf(loader_path, sizeof(loader_path), "%s/loader.bin", loader);
FILE *f = fopen(loader_path, "rb"); FILE *f = fopen(loader_path, "rb");
if(f) if(f != NULL)
{ {
gprintf("Read Devolution Loader: \"%s\"\n", loader_path); gprintf("Devolution: Reading %s\n", loader_path);
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
u32 size = ftell(f); u32 size = ftell(f);
rewind(f); rewind(f);
loader_bin = (u8*)memalign(32, size); loader_bin = (u8*)memalign(32, size);
fread(loader_bin, 1, size, f); fread(loader_bin, 1, size, f);
DCFlushRange(loader_bin, ALIGN32(size)); DCFlushRange(loader_bin, size);
fclose(f); fclose(f);
} }
else else
{ {
gprintf("Devolution loader.bin not found!\n"); gprintf("Devolution: Loader not found!\n");
return; return;
} }
gprintf("%s\n", (char*)loader_bin + 4); gprintf("%s\n", (u8*)loader_bin + 4);
} }
void DEVO_SetOptions(const char *isopath, int CurrentPartition, const char *gameID, bool memcard_emu) void DEVO_SetOptions(const char *isopath, const char *gameID, bool memcard_emu)
{ {
// re-mount device we need // re-mount device we need
DeviceHandle.MountDevolution(CurrentPartition); DeviceHandle.MountDevolution();
//start writing cfg to mem //start writing cfg to mem
struct stat st; struct stat st;
int data_fd; int data_fd;
char iso2path[256]; char iso2path[256];
iso2path[255] = '\0';
stat(isopath, &st); stat(isopath, &st);
FILE *f = fopen(isopath, "rb"); FILE *f = fopen(isopath, "rb");
gprintf("Read ISO File: \"%s\"\n", isopath); gprintf("Devolution: ISO Header %s\n", isopath);
fread((u8*)0x80000000, 1, 32, f); fread((u8*)0x80000000, 1, 32, f);
fclose(f); fclose(f);
@ -221,47 +223,44 @@ void DEVO_SetOptions(const char *isopath, int CurrentPartition, const char *game
DEVO_CONFIG->disc1_cluster = st.st_ino; DEVO_CONFIG->disc1_cluster = st.st_ino;
// If 2nd iso file tell Devo about it // If 2nd iso file tell Devo about it
strcpy(iso2path, isopath); strncpy(iso2path, isopath, 255);
char *ptz = (char *)NULL; char *ptz = strstr(iso2path, "game.iso");
ptz = strstr(iso2path, "game.iso");
if(ptz != NULL) if(ptz != NULL)
strncpy(ptz, "gam1.iso", 8); strncpy(ptz, "gam1.iso", 8);
f = fopen(iso2path, "rb"); f = fopen(iso2path, "rb");
if(f) if(f != NULL)
{ {
gprintf("Found 2nd iso file for multi DVD game: \"%s\"\n", iso2path); gprintf("Devolution: 2nd ISO File for Multi DVD Game %s\n", iso2path);
stat(iso2path, &st); stat(iso2path, &st);
DEVO_CONFIG->disc2_cluster = st.st_ino; DEVO_CONFIG->disc2_cluster = st.st_ino;
fclose(f); fclose(f);
} }
// make sure these directories exist, they are required for Devolution to function correctly // make sure these directories exist, they are required for Devolution to function correctly
char full_path[256]; fsop_MakeFolder(fmt("%s:/apps", DeviceName[currentPartition]));
snprintf(full_path, sizeof(full_path), "%s:/apps", DeviceName[CurrentPartition]); fsop_MakeFolder(fmt("%s:/apps/gc_devo", DeviceName[currentPartition]));
fsop_MakeFolder(full_path);
snprintf(full_path, sizeof(full_path), "%s:/apps/gc_devo", DeviceName[CurrentPartition]);
fsop_MakeFolder(full_path);
if(memcard_emu) if(memcard_emu)
{ {
const char *memcard_dir = NULL;
// find or create a 16MB memcard file for emulation // find or create a 16MB memcard file for emulation
// this file can be located anywhere since it's passed by cluster, not name // this file can be located anywhere since it's passed by cluster, not name
// it must be at least 512KB (smallest possible memcard = 59 blocks) // it must be at least 512KB (smallest possible memcard = 59 blocks)
if(gameID[3] == 'J') //Japanese Memory Card if(gameID[3] == 'J') //Japanese Memory Card
snprintf(full_path, sizeof(full_path), "%s:/apps/gc_devo/memcard_jap.bin", DeviceName[CurrentPartition]); memcard_dir = fmt("%s:/apps/gc_devo/memcard_jap.bin", DeviceName[currentPartition]);
else else
snprintf(full_path, sizeof(full_path), "%s:/apps/gc_devo/memcard.bin", DeviceName[CurrentPartition]); memcard_dir = fmt("%s:/apps/gc_devo/memcard.bin", DeviceName[currentPartition]);
gprintf("Devolution: Memory Card File %s\n", memcard_dir);
// check if file doesn't exist // check if file doesn't exist
if(stat(full_path, &st) == -1 || st.st_size < (1<<19)) if(stat(memcard_dir, &st) == -1 || st.st_size < (1<<19))
{ {
// need to enlarge or create it // need to enlarge or create it
data_fd = open(full_path, O_WRONLY|O_CREAT); data_fd = open(memcard_dir, O_WRONLY|O_CREAT);
if(data_fd >= 0) if(data_fd >= 0)
{ {
// try to make it 16MB (largest possible memcard = 2043 blocks) // try to make it 16MB (largest possible memcard = 2043 blocks)
gprintf("Resizing memcard file...\n"); gprintf("Devolution: Resizing Memory Card File...\n");
ftruncate(data_fd, 16<<20); ftruncate(data_fd, 16<<20);
if(fstat(data_fd, &st) == -1 || st.st_size < (1<<19)) if(fstat(data_fd, &st) == -1 || st.st_size < (1<<19))
{ {
@ -276,6 +275,7 @@ void DEVO_SetOptions(const char *isopath, int CurrentPartition, const char *game
st.st_ino = 0; st.st_ino = 0;
} }
} }
gprintf("Devolution: Memory Card at %08x\n", st.st_ino);
} }
else else
st.st_ino = 0; st.st_ino = 0;
@ -287,7 +287,7 @@ void DEVO_SetOptions(const char *isopath, int CurrentPartition, const char *game
// flush disc ID and Devolution config out to memory // flush disc ID and Devolution config out to memory
DCFlushRange((void*)0x80000000, 64); DCFlushRange((void*)0x80000000, 64);
DeviceHandle.UnMountDevolution(CurrentPartition); DeviceHandle.UnMountDevolution();
} }
void DEVO_Boot() void DEVO_Boot()
@ -437,31 +437,3 @@ void GC_SetLanguage(u8 lang)
__SYS_UnlockSram(1); // 1 -> write changes __SYS_UnlockSram(1); // 1 -> write changes
while(!__SYS_SyncSram()); while(!__SYS_SyncSram());
} }
int GC_GameIsInstalled(char *discid, const char* partition, const char* dmlgamedir)
{
char folder[50];
char source[300];
snprintf(folder, sizeof(folder), dmlgamedir, partition);
snprintf(source, sizeof(source), "%s/%s/game.iso", folder, discid);
FILE *f = fopen(source, "rb");
if(f)
{
gprintf("Found on %s: %s\n", partition, source);
fclose(f);
return 1;
}
else
{
snprintf(source, sizeof(source), "%s/%s/sys/boot.bin", folder, discid);
f = fopen(source, "rb");
if(f)
{
gprintf("Found on %s: %s\n", partition, source);
fclose(f);
return 2;
}
}
return 0;
}

5
source/gc/gc.hpp
View File

@ -82,14 +82,13 @@ typedef struct global_config
} gconfig; } gconfig;
bool DEVO_Installed(const char *path); bool DEVO_Installed(const char *path);
void DEVO_GetLoader(const char *loader); void DEVO_GetLoader(const char *path);
void DEVO_SetOptions(const char *isopath, int CurrentPartition, const char *gameID, void DEVO_SetOptions(const char *isopath, const char *gameID,
bool memcard_emum); bool memcard_emum);
void DEVO_Boot(); void DEVO_Boot();
// General // General
void GC_SetVideoMode(u8 videomode, u8 videoSetting, bool DIOSMIOS); void GC_SetVideoMode(u8 videomode, u8 videoSetting, bool DIOSMIOS);
void GC_SetLanguage(u8 lang); void GC_SetLanguage(u8 lang);
int GC_GameIsInstalled(char *discid, const char* partition, const char* dmlgamedir);
#endif //_GC_HPP_ #endif //_GC_HPP_

1
source/loader/alt_ios.cpp
View File

@ -24,7 +24,6 @@
#include "dip_plugin_249.h" #include "dip_plugin_249.h"
#include "mload_modules.h" #include "mload_modules.h"
extern "C" { extern u8 currentPartition; }
u8 use_port1 = 0; u8 use_port1 = 0;
static int load_ehc_module_ex(void) static int load_ehc_module_ex(void)

3
source/loader/sys.h
View File

@ -41,9 +41,12 @@ void Open_Inputs(void);
void Close_Inputs(void); void Close_Inputs(void);
bool AHBRPOT_Patched(void); bool AHBRPOT_Patched(void);
/* All our extern C stuff */
extern void __exception_setreload(int t); extern void __exception_setreload(int t);
extern int mainIOS; extern int mainIOS;
extern bool useMainIOS; extern bool useMainIOS;
extern u8 currentPartition;
#ifdef __cplusplus #ifdef __cplusplus
} }

1
source/menu/menu.cpp
View File

@ -21,7 +21,6 @@
#include "loader/fs.h" #include "loader/fs.h"
#include "loader/nk.h" #include "loader/nk.h"
#include "loader/playlog.h" #include "loader/playlog.h"
#include "loader/sys.h"
#include "loader/wbfs.h" #include "loader/wbfs.h"
#include "music/SoundHandler.hpp" #include "music/SoundHandler.hpp"
#include "network/gcard.h" #include "network/gcard.h"

3
source/menu/menu.hpp
View File

@ -19,6 +19,7 @@
#include "gui/gui.hpp" #include "gui/gui.hpp"
#include "list/ListGenerator.hpp" #include "list/ListGenerator.hpp"
#include "loader/disc.h" #include "loader/disc.h"
#include "loader/sys.h"
#include "loader/gc_disc_dump.hpp" #include "loader/gc_disc_dump.hpp"
#include "loader/wbfs.h" #include "loader/wbfs.h"
#include "music/gui_sound.h" #include "music/gui_sound.h"
@ -28,8 +29,6 @@
using namespace std; using namespace std;
extern "C" { extern u8 currentPartition; }
class CMenu class CMenu
{ {
public: public:

1
source/menu/menu_about.cpp
View File

@ -3,7 +3,6 @@
#include "channel/nand.hpp" #include "channel/nand.hpp"
#include "loader/alt_ios.h" #include "loader/alt_ios.h"
#include "loader/cios.h" #include "loader/cios.h"
#include "loader/sys.h"
#include "const_str.hpp" #include "const_str.hpp"
const int pixels_to_skip = 10; const int pixels_to_skip = 10;

1
source/menu/menu_cheat.cpp
View File

@ -4,7 +4,6 @@
#include "menu.hpp" #include "menu.hpp"
#include "lockMutex.hpp" #include "lockMutex.hpp"
#include "gui/text.hpp" #include "gui/text.hpp"
#include "loader/sys.h"
#include "network/http.h" #include "network/http.h"
#define GECKOURL "http://geckocodes.org/codes/%c/%s.txt" #define GECKOURL "http://geckocodes.org/codes/%c/%s.txt"

1
source/menu/menu_config.cpp
View File

@ -2,7 +2,6 @@
#include "menu.hpp" #include "menu.hpp"
#include "channel/nand.hpp" #include "channel/nand.hpp"
#include "loader/nk.h" #include "loader/nk.h"
#include "loader/sys.h"
const int CMenu::_nbCfgPages = 6; const int CMenu::_nbCfgPages = 6;
static const int g_curPage = 1; static const int g_curPage = 1;

1
source/menu/menu_config4.cpp
View File

@ -6,7 +6,6 @@
#include "gecko/gecko.h" #include "gecko/gecko.h"
#include "loader/cios.h" #include "loader/cios.h"
#include "loader/nk.h" #include "loader/nk.h"
#include "loader/sys.h"
static const int g_curPage = 4; static const int g_curPage = 4;

1
source/menu/menu_config_game.cpp
View File

@ -3,7 +3,6 @@
#include "types.h" #include "types.h"
#include "gecko/gecko.h" #include "gecko/gecko.h"
#include "loader/wbfs.h" #include "loader/wbfs.h"
#include "loader/sys.h"
#include "libwbfs/wiidisc.h" #include "libwbfs/wiidisc.h"
#define ARRAY_SIZE(a) (sizeof a / sizeof a[0]) #define ARRAY_SIZE(a) (sizeof a / sizeof a[0])

1
source/menu/menu_download.cpp
View File

@ -14,7 +14,6 @@
#include "gui/GameTDB.hpp" #include "gui/GameTDB.hpp"
#include "gui/pngu.h" #include "gui/pngu.h"
#include "loader/fs.h" #include "loader/fs.h"
#include "loader/sys.h"
#include "loader/wbfs.h" #include "loader/wbfs.h"
#include "loader/wdvd.h" #include "loader/wdvd.h"
#include "network/http.h" #include "network/http.h"

12
source/menu/menu_game.cpp
View File

@ -25,7 +25,6 @@
#include "gui/Gekko.h" #include "gui/Gekko.h"
#include "homebrew/homebrew.h" #include "homebrew/homebrew.h"
#include "loader/alt_ios.h" #include "loader/alt_ios.h"
#include "loader/sys.h"
#include "loader/wdvd.h" #include "loader/wdvd.h"
#include "loader/alt_ios.h" #include "loader/alt_ios.h"
#include "loader/playlog.h" #include "loader/playlog.h"
@ -911,7 +910,7 @@ void CMenu::_launchGC(dir_discHdr *hdr, bool disc)
else //use cIOS instead to make sure Devolution works anyways else //use cIOS instead to make sure Devolution works anyways
loadIOS(mainIOS, false); loadIOS(mainIOS, false);
ShutdownBeforeExit(); ShutdownBeforeExit();
DEVO_SetOptions(path.c_str(), currentPartition, id.c_str(), memcard_emu); DEVO_SetOptions(path.c_str(), id.c_str(), memcard_emu);
DEVO_Boot(); DEVO_Boot();
} }
Sys_Exit(); Sys_Exit();
@ -1618,6 +1617,8 @@ void CMenu::_gameSoundThread(CMenu *m)
m->m_soundThrdBusy = false; m->m_soundThrdBusy = false;
} }
u8 *GameSoundStack = NULL;
u32 GameSoundSize = 0x10000; //64kb
void CMenu::_playGameSound(void) void CMenu::_playGameSound(void)
{ {
m_gamesound_changed = false; m_gamesound_changed = false;
@ -1626,7 +1627,8 @@ void CMenu::_playGameSound(void)
if(m_gameSoundThread != LWP_THREAD_NULL) if(m_gameSoundThread != LWP_THREAD_NULL)
CheckGameSoundThread(); CheckGameSoundThread();
LWP_CreateThread(&m_gameSoundThread, (void *(*)(void *))CMenu::_gameSoundThread, (void *)this, NULL, 0, 60); GameSoundStack = (u8*)MEM2_alloc(GameSoundSize);
LWP_CreateThread(&m_gameSoundThread, (void *(*)(void *))CMenu::_gameSoundThread, (void*)this, GameSoundStack, GameSoundSize, 60);
} }
void CMenu::CheckGameSoundThread() void CMenu::CheckGameSoundThread()
@ -1642,4 +1644,8 @@ void CMenu::CheckGameSoundThread()
LWP_JoinThread(m_gameSoundThread, NULL); LWP_JoinThread(m_gameSoundThread, NULL);
m_gameSoundThread = LWP_THREAD_NULL; m_gameSoundThread = LWP_THREAD_NULL;
if(GameSoundStack)
free(GameSoundStack);
GameSoundStack = NULL;
} }

2
source/menu/menu_gameinfo.cpp
View File

@ -1,7 +1,5 @@
#include "menu.hpp" #include "menu.hpp"
#include "gui/GameTDB.hpp" #include "gui/GameTDB.hpp"
#include "loader/sys.h"
extern const u8 wifi1_png[]; extern const u8 wifi1_png[];
extern const u8 wifi2_png[]; extern const u8 wifi2_png[];

1
source/menu/menu_home.cpp
View File

@ -2,7 +2,6 @@
#include "menu.hpp" #include "menu.hpp"
#include "loader/cios.h" #include "loader/cios.h"
#include "loader/nk.h" #include "loader/nk.h"
#include "loader/sys.h"
#include "const_str.hpp" #include "const_str.hpp"
s16 m_homeLblTitle; s16 m_homeLblTitle;

1
source/menu/menu_main.cpp
View File

@ -11,7 +11,6 @@
#include "loader/cios.h" #include "loader/cios.h"
#include "loader/disc.h" #include "loader/disc.h"
#include "loader/nk.h" #include "loader/nk.h"
#include "loader/sys.h"
#include "loader/wbfs.h" #include "loader/wbfs.h"
#include "loader/wdvd.h" #include "loader/wdvd.h"
#include "network/gcard.h" #include "network/gcard.h"

1
source/menu/menu_nandemu.cpp
View File

@ -8,7 +8,6 @@
#include "fileOps/fileOps.h" #include "fileOps/fileOps.h"
#include "loader/cios.h" #include "loader/cios.h"
#include "loader/nk.h" #include "loader/nk.h"
#include "loader/sys.h"
// NandEmulation menu // NandEmulation menu
s16 m_nandemuLblTitle; s16 m_nandemuLblTitle;

1
source/menu/menu_system.cpp
View File

@ -2,7 +2,6 @@
#include "menu.hpp" #include "menu.hpp"
#include "const_str.hpp" #include "const_str.hpp"
#include "lockMutex.hpp" #include "lockMutex.hpp"
#include "loader/sys.h"
#include "loader/wbfs.h" #include "loader/wbfs.h"
int version_num = 0, num_versions = 0, i; int version_num = 0, num_versions = 0, i;