diff --git a/resources/app_booter/source/string.c b/resources/app_booter/source/string.c index a3e36a63..016396b8 100644 --- a/resources/app_booter/source/string.c +++ b/resources/app_booter/source/string.c @@ -23,17 +23,3 @@ void *memcpy(void *dst, const void *src, size_t len) return dst; } - -void *memmove(void *dst, const void *src, size_t len) -{ - size_t i; - unsigned char Current; - for (i = 0; i < len; i++) - { - Current = ((unsigned char *)src)[i]; - ((unsigned char *)src)[i] = 0x00; - ((unsigned char *)dst)[i] = Current; - } - - return dst; -} diff --git a/source/defines.h b/source/defines.h index 977782b9..3bcef340 100644 --- a/source/defines.h +++ b/source/defines.h @@ -1,5 +1,5 @@ #define APP_NAME "WiiFlow" -#define APP_VERSION "Beta 4.0.3" +#define APP_VERSION "Beta 4.0.4" #define APPDATA_DIR "wiiflow" #define APPDATA_DIR2 "apps/wiiflow" diff --git a/source/main.cpp b/source/main.cpp index c8fbd364..db876b3c 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -99,9 +99,9 @@ int main(int argc, char **argv) { if(useMainIOS || !DeviceHandle.UsablePartitionMounted()) { - iosOK = loadIOS(mainIOS, true) && CustomIOS(CurrentIOS.Type); - Open_Inputs(); - //mainMenu->init(); + useMainIOS = false; + mainMenu._TempLoadIOS(); + iosOK = CustomIOS(CurrentIOS.Type); } } if(CurrentIOS.Version == mainIOS) diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp index be7e6704..00147fad 100644 --- a/source/menu/menu.hpp +++ b/source/menu/menu.hpp @@ -40,6 +40,7 @@ public: void exitHandler(int ExitTo); int main(void); void cleanup(void); + void _TempLoadIOS(int IOS = 0); u8 m_current_view; private: struct SZone @@ -1074,7 +1075,6 @@ private: static void _gameSoundThread(CMenu *m); static void _load_installed_cioses(); - void _TempLoadIOS(int IOS = 0); struct SOption { const char id[10]; const wchar_t text[16]; }; static const string _translations[23]; diff --git a/source/unzip/ZipFile.cpp b/source/unzip/ZipFile.cpp index 5b9f2f66..42d32841 100644 --- a/source/unzip/ZipFile.cpp +++ b/source/unzip/ZipFile.cpp @@ -62,7 +62,7 @@ bool ZipFile::ExtractAll(const char *dest) bool Stop = false; - u32 blocksize = 1024*50; + u32 blocksize = 1024 * 50; u8 *buffer = (u8*)MEM2_memalign(32, blocksize); if(buffer == NULL) return false; diff --git a/wii/apps/wiiflow/meta.xml b/wii/apps/wiiflow/meta.xml index e04b20da..aa3f56f9 100644 --- a/wii/apps/wiiflow/meta.xml +++ b/wii/apps/wiiflow/meta.xml @@ -1,8 +1,8 @@  - + WiiFlow OverjoY, FIX94 - r431 + r433 TBD USB Loader / Nand Emulator diff --git a/wii/apps/wiiflow/wiiflow.ini b/wii/apps/wiiflow/wiiflow.ini deleted file mode 100644 index e48f42f8..00000000 --- a/wii/apps/wiiflow/wiiflow.ini +++ /dev/null @@ -1,129 +0,0 @@ -[DEBUG] -#Boolean: Enable the gecko log to write to SD - Defaults to false -sd_write_log= -#Boolean: Enable the wifi gecko - Defaults to false -wifi_gecko= -#Integer: The IP of the machine to send wifi gecko output to - Blank by default -wifi_gecko_ip= -#Integer: The port the machine is listenning on for gecko output - Blank by default -wifi_gecko_port= - -[GAMERCARD] -#Boolean: Enable the gamercards notification code - Defaults to false -wiinnertag_enable= -#Vectored String: URL's of the gamercard services, seperated by | -gamercards= - -[GAMES] -#Integer: The currently selected partition for Wii Games, defaults to the first partition with a WBFS folder, or the apps/wiiflow dir otherwise. -partition= -#Boolean: Whether to redirect Wii Saves to USB, Nand emulation must be enabled - Defaults to false -save_emulation= -#Boolean: Whether to use full emulation or partial for savegame emulation - Defaults to false -full_emulation= -#Boolean: Enable or disable cheating/ocarina globally - Defaults to false -cheat= -#Boolean: Whether the favorites view is currently selected or not - Defaults to false -favorites= -#Boolean: Whether to dump the game list to wiiflow/settings/titlesdump.ini - True until the list is dumped, then is false -dump_list= -#Integer: The currently selected coverflow layout - Defaults to 1 -last_cf_mode= -#Integer: The currently selected sorting method - Defaults to 0 (Alphabetical) -sort= - -[GENERAL] -#Integer: Age where any game rated above will not be shown. Range 2-19. 2=not many, 19=all -age_lock= -#Integer: What age to use if no age rating is found for a game -age_lock_default= -#Boolean: Hide the coverflow icons to switch modes - Defaults to false -hideviews= -#Boolean: Whether to use favorites last state or not - Defaults to false -save_favorites_mode= -#Boolean: To configure watchdog for the ehci Module in d2xv7, not in use until v7 ehci is stable, ehci v6 has time hardcoded to 10s - Defaults to 10 -watchdog_timeout= -#String: Name of the currently selected theme - Defaults to DEFAULT -theme= -#Integer: Sets where wiiflow exits to. 0 = system Menu, 1 = HBC, 2 = Priiloader, 3 = Disable Exitting, 4 = BootMii - Defaults to 0 -exit_to=0 -#Integer: The coverflow sounds volume - Defaults to 255 -sound_volume_coverflow= -#Integer: The change the button sounds volume - Defaults to 255 -sound_volume_gui= -#Integer: The banner sound volume - Defaults to 255 -sound_volume_bnr= -#Integer: The music volume - Defaults to 255 -sound_volume_music= -#Boolean: Compresses the png cache files to save space - Defaults to false -compress_cache= -#Integer: Max anti aliasing - Defaults to 3 -max_fsaa= -#Boolean: When enabled, coverflow can be scrolled by tilting the wiimote while holding B - Defaults to false -wiimote_gestures= -#Boolean: Whether to use 3D boxcovers - Defaults to true -box_mode= -#Boolean: Compresses the covers png files to save space - Defaults to true -allow_texture_compression= -#Integer: The maximum rendered boxcovers on screen - Defaults to 120 -cover_buffer= -#Integer: How fast music and banners fade in and out - Defaults to 8 -music_fade_rate= -#Boolean: Whether to use the disc drive light during the wait screen animation - Defaults to true -waitmessage_wiilight= -#Integer: Global setting of video mode for all games, overridden by game specific setting if set - Defaults to 0 (Default) -video_mode= -#Integer: Global setting of video mode for all games, overridden by game specific setting if set - Defaults to 0 (Default) -game_language= -#Boolean: Initialize the network on startup - Defaults to false -async_network= -#Boolean: The translation to be used inside wiiflow, Defaults to 0 (English) -language= -#Integer: the width wiiflow is drawn on screen - Defaults to 640 -tv_width= -#Integer: The height wiiflow is drawn on screen - Defaults to 480 -tv_height= -#Integer: X offset from the left side of the screen where wiiflow should be drawn - Defaults to 0 -tv_x=0 -#Integer: Y offset from the top of the screen where wiiflow should be drawn - Defaults to 0 -tv_y=0 -#Boolean: Keep covers after they are cached - Defaults to true -keep_png= -#Boolean: Patch video modes for games - Defaults to false -vipatch= -#Boolean: Patch country strings for games - Defaults to false -country_patch= -#Boolean: The Channel ID you want to return to when exitting games - Default is Blank -returnto= -#Boolean: Enable grabbing with B and dragging coverflow - Default is false -use_grab=false - -[HOMEBREW] -#Boolean: Whether to hide the homebrew mode icon - Defaults to false -disable=false -#Boolean: Whether the favorites view is currently selected or not - Defaults to false -favorites= -#Boolean: Whether to dump the game list to wiiflow/settings/titlesdump.ini - True until the list is dumped, then is false -dump_list= -#Integer: The currently selected coverflow layout - Defaults to 1 -last_cf_mode= -#Integer: The currently selected sorting method - Defaults to 0 (Alphabetical) -sort=0 - -[NAND] -#Boolean: Whether to disable the emulation - Defaults to true -disable=true -#Boolean: Whether to use full emulation or partial for nand emulation - Defaults to true -full_emulation= -#String: Path to your emulated nand -path= -#Boolean: Enable or disable cheating/ocarina globally - Defaults to false -cheat= -#Boolean: Whether the favorites view is currently selected or not - Defaults to false -favorites= -#Boolean: Whether to dump the game list to wiiflow/settings/titlesdump.ini - True until the list is dumped, then is false -dump_list= -#Integer: The currently selected coverflow layout - Defaults to 1 -last_cf_mode= -#Integer: The currently selected sorting method - Defaults to 0 (Alphabetical) -sort= \ No newline at end of file diff --git a/wiiflow.pnproj b/wiiflow.pnproj index 8b6ef7ef..d90e6245 100644 --- a/wiiflow.pnproj +++ b/wiiflow.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file