From 9e72c098b91b4d49a2cdee4e697dc7dd13852c5c Mon Sep 17 00:00:00 2001 From: d0k3 Date: Tue, 15 Oct 2019 23:08:06 +0200 Subject: [PATCH] Make gamecart handling a little less annoying --- arm9/source/godmode.c | 3 ++- arm9/source/virtual/vcart.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arm9/source/godmode.c b/arm9/source/godmode.c index 26693d0..f24b3f8 100644 --- a/arm9/source/godmode.c +++ b/arm9/source/godmode.c @@ -2606,7 +2606,8 @@ u32 GodMode(int entrypoint) { break; } } else if (pad_state & (CART_INSERT|CART_EJECT)) { - if (!InitVCartDrive() && (pad_state & CART_INSERT)) // reinit virtual cart drive + if (!InitVCartDrive() && (pad_state & CART_INSERT) && + (curr_drvtype & DRV_CART)) // reinit virtual cart drive ShowPrompt(false, "Cart init failed!"); if (!(*current_path) || (curr_drvtype & DRV_CART)) GetDirContents(current_dir, current_path); // refresh dir contents diff --git a/arm9/source/virtual/vcart.c b/arm9/source/virtual/vcart.c index eefa390..0eb274a 100644 --- a/arm9/source/virtual/vcart.c +++ b/arm9/source/virtual/vcart.c @@ -99,7 +99,7 @@ u64 GetVCartDriveSize(void) { void GetVCartTypeString(char* typestr) { // typestr needs to be at least 11 + 1 chars big - if (!cart_init || !cdata) sprintf(typestr, cart_checked ? "EMPTY" : "INIT"); + if (!cart_init || !cdata) sprintf(typestr, cart_checked ? "EMPTY" : ""); else sprintf(typestr, "%s%08lX", (cdata->cart_type & CART_CTR) ? "CTR" : (cdata->cart_type & CART_TWL) ? "TWL" :