diff --git a/data/images/hbc_icon.png b/data/images/hbc_icon.png
deleted file mode 100644
index 71416d0..0000000
Binary files a/data/images/hbc_icon.png and /dev/null differ
diff --git a/installer/wad/0001000154484246.tmd b/installer/wad/0001000154484246.tmd
index 8f5436b..1b1f2f8 100644
Binary files a/installer/wad/0001000154484246.tmd and b/installer/wad/0001000154484246.tmd differ
diff --git a/source/BootHomebrew/BootHomebrew.cpp b/source/BootHomebrew/BootHomebrew.cpp
index 8a870bf..63612bb 100644
--- a/source/BootHomebrew/BootHomebrew.cpp
+++ b/source/BootHomebrew/BootHomebrew.cpp
@@ -228,8 +228,6 @@ int BootGameCubeHomebrew()
ES_GetTicketViews(BC, &view, 1);
int ret = ES_LaunchTitle(BC, &view);
- if(ret < 0)
- LoadHBC();
return ret;
}
diff --git a/source/Prompts/prompt_app_info.cpp b/source/Prompts/prompt_app_info.cpp
index 776bb13..2fbf71d 100644
--- a/source/Prompts/prompt_app_info.cpp
+++ b/source/Prompts/prompt_app_info.cpp
@@ -32,25 +32,15 @@ AppInfo(const char *title, string dir, u8* icon)
string line, quelltext = "", version, coder, descriptionTxt;
- if(strcasecmp(title, "the homebrew channel") == 0)
- {
- string space = " ";
- version = tr("Version:") + space + HBC_version;
- coder = tr("Coder:") + space + "HBC Team";
- descriptionTxt = "The Homebrew Channel is a channel for launching Wii homebrew applications. It will list homebrew applications stored and organised on an SD card or USB mass storage device in a nice little GUI, which you can very easily customise with descriptions and shiny little icons all by yourself. You can also launch applications via TCP (with a correctly configured PC) or a USBGecko. Both of those built in options make it extremely convenient for testing out new code, as well as a general purpose homebrew launcher.";
- }
- else
- {
- ifstream in(dir.c_str());
- while(getline(in, line))
- quelltext = quelltext + line + "\n";
+ ifstream in(dir.c_str());
+ while(getline(in, line))
+ quelltext = quelltext + line + "\n";
+
+ string space = " ";
+ version = tr("Version:") + space + parser(quelltext, "", "");
+ coder = tr("Coder:") + space + parser(quelltext, "", "");
+ descriptionTxt = parser(quelltext, "", "");
- string space = " ";
- version = tr("Version:") + space + parser(quelltext, "", "");
- coder = tr("Coder:") + space + parser(quelltext, "", "");
- descriptionTxt = parser(quelltext, "", "");
- }
-
GuiWindow promptWindow(520, 360);
promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
promptWindow.SetPosition(0, -10);
diff --git a/source/Tools/app_list.cpp b/source/Tools/app_list.cpp
index 48c9e8e..0662d77 100644
--- a/source/Tools/app_list.cpp
+++ b/source/Tools/app_list.cpp
@@ -228,8 +228,5 @@ void app_list()
// sortieren
std::sort(vechomebrew_list_category[0].begin(),vechomebrew_list_category[0].end(), sort_name_a_z);
- // suchen nach hbc
- //if(DetectHBC() != 0 && Settings.system != 0)
- // vechomebrew_list_category[0].insert(vechomebrew_list_category[0].begin(), homebrew_list("the homebrew channel", "the homebrew channel", "the homebrew channel", (u8*)hbc_icon_png, "the homebrew channel", ""));
}
diff --git a/source/Tools/copy_app_in_category.cpp b/source/Tools/copy_app_in_category.cpp
index 42e8be1..46105b2 100644
--- a/source/Tools/copy_app_in_category.cpp
+++ b/source/Tools/copy_app_in_category.cpp
@@ -82,7 +82,6 @@ void copy_app_in_category(int category) //Apps im Kategorie kopieren
{
copy_app_in_unassigned();
vechomebrew_list_category[category].clear();
- bool hbc = false;
for(int a = 0; a < (signed)AvailableCategory.apps[category].size(); a++)
{
@@ -131,10 +130,6 @@ void copy_app_in_category(int category) //Apps im Kategorie kopieren
strcasecmp(AvailableCategory.apps[category][a].c_str(), "the homebrew channel") == 0
)
{
- if(strcasecmp(AvailableCategory.apps[category][a].c_str(), "the homebrew channel") == 0 && !hbc)
- hbc = true;
- else if(strcasecmp(AvailableCategory.apps[category][a].c_str(), "the homebrew channel") == 0 && hbc)
- break;
vechomebrew_list_category[category].push_back(homebrew_list(
vechomebrew_list_category[0][i].name,
diff --git a/source/Tools/load_channel.cpp b/source/Tools/load_channel.cpp
index 9954c6d..8351717 100644
--- a/source/Tools/load_channel.cpp
+++ b/source/Tools/load_channel.cpp
@@ -8,8 +8,6 @@
#include "filelist.h"
using namespace std;
-string HBC_version;
-
template
s8 free_pointer(pointer*& ptr)
{
@@ -30,108 +28,6 @@ s8 free_pointer(pointer*& ptr)
}
}
-char * DetectHBC_version(const tmd *t)
-{
- static char desc[10];
- if (t->title_version)
- snprintf(desc, sizeof(desc), "%d.%d", t->title_version >> 8, t->title_version & 0xFF);
-/* if (t->sys_version)
- snprintf(desc, sizeof(desc), "%s FW: IOS%llu ", desc, t->sys_version & 0xff);
-*/
- return desc;
-}
-
-u64 DetectHBC()
-{
- u64 *list;
- u32 titlecount;
- s32 ret;
-
- vector TitleID;
- TitleID.push_back(0x0001000148415858LL); //HAXX
- TitleID.push_back(0x000100014A4F4449LL); //JODI
- TitleID.push_back(0x00010001AF1BF516LL); //>=0.7
-
-
- ret = ES_GetNumTitles(&titlecount);
- if(ret < 0)
- {
- printf("DetectHBC: ES_GetNumTitles Fehler\n");
- return 0;
- }
-
- list = (u64*)memalign(32, titlecount * sizeof(u64) + 32);
-
- ret = ES_GetTitles(list, titlecount);
- if(ret < 0) {
- printf("DetectHBC: ES_GetTitles Error\n");
- free_pointer(list);
- return 0;
- }
- ret = 0;
-
- //lets check for known HBC title id's.
- for(u32 i=0; i=0.7
- {
- if(ret < 3)
- {
- ret = 3;
- HBC_version = DetectHBC_version((tmd *)SIGNATURE_PAYLOAD(s_tmd));
- }
- }
- }
- free_pointer(list);
- if(ret != 0)
- return TitleID[ret -1];
- else
- printf("ERROR_FIND_HBC\n");
-
- return 0;
-}
-
-void LoadHBC()
-{
- u64 TitleID = DetectHBC();
- if(TitleID != 0)
- {
- u32 cnt ATTRIBUTE_ALIGN(32);
- ES_GetNumTicketViews(TitleID, &cnt);
- tikview *views = (tikview *)memalign( 32, sizeof(tikview)*cnt );
- ES_GetTicketViews(TitleID, views, cnt);
- ES_LaunchTitle(TitleID, &views[0]);
- }
- else
- {
- //well that went wrong
- printf("ERROR_BOOT_HBC\n");
- }
-
-}
-
bool CheckAppFound(u64 title)
{
@@ -152,20 +48,6 @@ bool CheckAppFound(u64 title)
return false;
}
-u8 hbcStubAvailable()
-{
- char * sig = (char *)0x80001804;
- return (
- sig[0] == 'S' &&
- sig[1] == 'T' &&
- sig[2] == 'U' &&
- sig[3] == 'B' &&
- sig[4] == 'H' &&
- sig[5] == 'A' &&
- sig[6] == 'X' &&
- sig[7] == 'X') ? 1 : 0;
-}
-
int DetectHBF()
{
u64 *list;
@@ -214,15 +96,7 @@ int DetectHBF()
}
*/ }
free_pointer(list);
- if(ret != 0)
- {
- memcpy((void*)0x80001800, stub_bin, stub_bin_size);
- DCFlushRange((void*)0x80001800,stub_bin_size);
-
- hbcStubAvailable();
- return ret;
- }
-
+
return 0;
}
@@ -240,4 +114,4 @@ void LoadHBF()
*(vu16*)0x800024D2 = 0x4630;//"F0";
}
*/
-}
\ No newline at end of file
+}
diff --git a/source/Tools/load_channel.h b/source/Tools/load_channel.h
index 751184d..87b27bf 100644
--- a/source/Tools/load_channel.h
+++ b/source/Tools/load_channel.h
@@ -1,6 +1 @@
-
-extern string HBC_version;
-u64 DetectHBC();
-void LoadHBC();
-
void LoadHBF();
diff --git a/source/filelist.h b/source/filelist.h
index 73e2796..b359548 100644
--- a/source/filelist.h
+++ b/source/filelist.h
@@ -269,9 +269,6 @@ extern const u32 edit_active_png_size;
extern const u8 edit_inactive_png[];
extern const u32 edit_inactive_png_size;
-extern const u8 hbc_icon_png[];
-extern const u32 hbc_icon_png_size;
-
extern const u8 recycle_bin_png[];
extern const u32 recycle_bin_png_size;
diff --git a/source/main.cpp b/source/main.cpp
index 96a94b2..e4222a4 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -159,6 +159,7 @@ DefaultOptions()
int
main(int argc, char *argv[])
{
+
SYS_SetResetCallback(WiiResetPressed);
SYS_SetPowerCallback(WiiPowerPressed);
WPAD_SetPowerButtonCallback(WiimotePowerPressed);
@@ -229,16 +230,11 @@ main(int argc, char *argv[])
if(SelectedIOS() != IOS_GetVersion())
IOS_ReloadIOS(SelectedIOS());
- if(Settings.forwarder_path != "the homebrew channel")
- {
- if(strstr(Settings.forwarder_path.c_str(), ":/apps/") != 0)
- BootHomebrew();
- else if(strstr(Settings.forwarder_path.c_str(), ":/gc_apps/") != 0)
- BootGameCubeHomebrew();
- }
- else
- LoadHBC();
- }
+ if(strstr(Settings.forwarder_path.c_str(), ":/apps/") != 0)
+ BootHomebrew();
+ else if(strstr(Settings.forwarder_path.c_str(), ":/gc_apps/") != 0)
+ BootGameCubeHomebrew();
+ }
else if(boot_buffer)
BootHomebrew();