From 74c62098c323c03358a2414e04e506c4734dfeae Mon Sep 17 00:00:00 2001 From: kamikawa Date: Tue, 7 Oct 2008 00:51:56 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=82=921.0a=E3=81=B8=E5=A4=89=E6=9B=B4=E3=80=82=20L&R&Start&S?= =?UTF-8?q?elect=E5=90=8C=E6=99=82=E6=8A=BC=E3=81=97=E3=81=A7=E5=BC=B7?= =?UTF-8?q?=E5=88=B6=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88?= =?UTF-8?q?=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86=E3=81=AE=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2591 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../ARM9.TWL/include/kami_global.h | 2 +- .../ARM9.TWL/src/process_format.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h index 1cdb4405..25435018 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h @@ -47,7 +47,7 @@ typedef enum 定数定義 *---------------------------------------------------------------------------*/ -#define SYSTEM_UPDATER_NAME L"SystemUpdater ver.1.0" +#define SYSTEM_UPDATER_NAME L"SystemUpdater ver.1.0a" #define SYSTEM_UPDATER_LOG_PATH "nand:/sys/log/updater.log" #define SYSTEM_UPDATER_MAGIC_CODE 44001111 diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_format.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_format.c index 5f6f9108..ec89bd78 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_format.c +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_format.c @@ -64,12 +64,17 @@ BOOL ProcessFormat(void) { FSArchiveResource resource; - // 既に最新フォーマットであればフォーマットしない - if (FS_GetArchiveResource("nand:/", &resource)) - { - if (resource.totalSize == CORRECT_NAND_ARCHIVE_SIZE) + // L & R & Start & Select ボタン押しで強制フォーマット + if (!(kamiPadIsPress(PAD_BUTTON_L) && kamiPadIsPress(PAD_BUTTON_R) && + kamiPadIsPress(PAD_BUTTON_START) && kamiPadIsPress(PAD_BUTTON_SELECT))) + { + // 既に最新フォーマットであればフォーマットしない + if (FS_GetArchiveResource("nand:/", &resource)) { - return TRUE; + if (resource.totalSize == CORRECT_NAND_ARCHIVE_SIZE) + { + return TRUE; + } } }