From 998a215a0dbda23b8c329d54b5e1d602e87d8690 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 10 Mar 2017 18:37:52 +0100 Subject: [PATCH] Display a different error message when failing to ES_Launch the Wii Menu Trying to return to the Wii Menu from a game is the easiest way to trigger this error. Just saying 0000000100000002 when that happens doesn't mean much to most users. --- Source/Core/Core/IOS/ES/ES.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/IOS/ES/ES.cpp b/Source/Core/Core/IOS/ES/ES.cpp index c62c81ce6b..7ca9dbde21 100644 --- a/Source/Core/Core/IOS/ES/ES.cpp +++ b/Source/Core/Core/IOS/ES/ES.cpp @@ -177,9 +177,18 @@ bool ES::LaunchPPCTitle(u64 title_id, bool skip_reload) const DiscIO::CNANDContentLoader& content_loader = AccessContentDevice(title_id); if (!content_loader.IsValid()) { - PanicAlertT("Could not launch title %016" PRIx64 " because it is missing from the NAND.\n" - "The emulated software will likely hang now.", - title_id); + if (title_id == 0x0000000100000002) + { + PanicAlertT("Could not launch the Wii Menu because it is missing from the NAND.\n" + "The emulated software will likely hang now.", + title_id); + } + else + { + PanicAlertT("Could not launch title %016" PRIx64 " because it is missing from the NAND.\n" + "The emulated software will likely hang now.", + title_id); + } return false; }