The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-12-23 02:11:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Small fix. The Menu i did didnt show up lol.

Browse Source 
*Small change in the sh file because there was an error on linux while compiling.
This commit is contained in:
dimok321 2009-07-31 21:16:02 +00:00
parent 06889b794a
commit de01dd2a18
4 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -55,7 +55,7 @@ export DEPSDIR := $(CURDIR)/$(BUILD)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# automatically build a list of object files for our project # automatically build a list of object files for our project
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
SVNREV := $(shell sh ./svnrev.sh) SVNREV := $(shell bash ./svnrev.sh)
export CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) export CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
export CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) export CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
sFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) sFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))

14
source/main.cpp
View File

@ -59,7 +59,7 @@ static void BootUpProblems()
bootimage.SetPosition(320-1.2*bootimage.GetWidth()/2, 240-1.2*bootimage.GetHeight()/2); bootimage.SetPosition(320-1.2*bootimage.GetWidth()/2, 240-1.2*bootimage.GetHeight()/2);
bootimage.SetScale(1.2); bootimage.SetScale(1.2);
u8 i = 10; u8 i = 30;
while (i > 0) { while (i > 0) {
ret2 = IOS_ReloadIOS(249); ret2 = IOS_ReloadIOS(249);
@ -145,8 +145,7 @@ main(int argc, char *argv[]) {
if (ret < 0) { if (ret < 0) {
ret = IOS_ReloadIOS(222); ret = IOS_ReloadIOS(222);
load_ehc_module(); load_ehc_module();
if(ret <0) {
ret = WBFS_Init(WBFS_DEVICE_USB);
if(ret < 0) { if(ret < 0) {
InitVideo(); // Initialise video InitVideo(); // Initialise video
Menu_Render(); Menu_Render();
@ -154,6 +153,15 @@ main(int argc, char *argv[]) {
startupproblem = true; startupproblem = true;
ret = 1; ret = 1;
} }
ret = WBFS_Init(WBFS_DEVICE_USB);
if(ret < 0) {
InitVideo(); // Initialise video
Menu_Render();
BootUpProblems();
startupproblem = true;
ret = 1;
} }
} }

12
source/usbloader/disc.c
View File

@ -19,7 +19,6 @@
/* Disc pointers */ /* Disc pointers */
static u32 *buffer = (u32 *)0x93000000; static u32 *buffer = (u32 *)0x93000000;
static u8 *diskid = (u8 *)0x80000000; static u8 *diskid = (u8 *)0x80000000;
static char gameid[8];
void __Disc_SetLowMem(void) { void __Disc_SetLowMem(void) {
@ -38,10 +37,12 @@ void __Disc_SetLowMem(void) {
*(vu32 *)0x800000F0 = 0x01800000; // Simulated Memory Size *(vu32 *)0x800000F0 = 0x01800000; // Simulated Memory Size
//If the game is sam & max: season 1 put this shit in //If the game is sam & max: season 1 put this shit in
char tempTxt[10]; char gameid[8];
snprintf (tempTxt,sizeof(tempTxt),"%c%c%c%c%c%c", gameid[0], gameid[1], gameid[2], gameid[3], gameid[4], gameid[5]); memset(gameid, 0, 8);
if ((strcmp(tempTxt,"R3XE6U")==0)|| memcpy(gameid, (char*)0x80000000, 6);
(strcmp(tempTxt,"R3XP6V")==0))/*&&
if ((strcmp(gameid,"R3XE6U")==0)||
(strcmp(gameid,"R3XP6V")==0))/*&&
(IOS_GetVersion()==249)&& (IOS_GetVersion()==249)&&
((IOS_GetRevision()==10)||(IOS_GetRevision()==13)) I left out the ios check to see if works with other ios versions.*/ ((IOS_GetRevision()==10)||(IOS_GetRevision()==13)) I left out the ios check to see if works with other ios versions.*/
{ {
@ -278,6 +279,7 @@ s32 Disc_BootPartition(u64 offset, u8 videoselected, u8 cheat, u8 vipatch, u8 pa
__Disc_SetTime(); __Disc_SetTime();
if (cheat == 1) { if (cheat == 1) {
char gameid[8];
/* OCARINA STUFF - FISHEARS*/ /* OCARINA STUFF - FISHEARS*/
memset(gameid, 0, 8); memset(gameid, 0, 8);
memcpy(gameid, (char*)0x80000000, 6); memcpy(gameid, (char*)0x80000000, 6);

2
svnrev.sh
View File

@ -1,4 +1,4 @@
#! /bin/sh #! /bin/bash
# #
rev_new_raw=$(svnversion -n . 2>/dev/null | tr '\n' ' ' | tr -d '\r') rev_new_raw=$(svnversion -n . 2>/dev/null | tr '\n' ' ' | tr -d '\r')
[ -n "$rev_new_raw" ] || rev_new_raw=$(SubWCRev . 2>/dev/null | tr '\n' ' ' | tr -d '\r') [ -n "$rev_new_raw" ] || rev_new_raw=$(SubWCRev . 2>/dev/null | tr '\n' ' ' | tr -d '\r')