From e33f70b401aa93ed4be17c6ee3a539bc73a32997 Mon Sep 17 00:00:00 2001
From: kamikawa <kamikawa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 6 Apr 2009 10:50:09 +0000
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8B=95=E5=AE=9F=E8=A1=8C=E3=81=A7?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88=E3=83=87=E3=83=BC=E3=82=BF?=
 =?UTF-8?q?=E3=81=8C=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BE=E3=82=8C=E3=81=AA?=
 =?UTF-8?q?=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=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@2791 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../ARM9.TWL/src/process_write_data.c         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_write_data.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_write_data.c
index 9bdc340f..395e78c4 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_write_data.c
+++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_write_data.c
@@ -114,11 +114,16 @@ void* WriteDataProcessAfter0(void)
 	// オート実行用
 	if (gAutoFlag)
 	{
+#ifdef MARIOCLUB_VERSION
 		sMenuSelectNo = MENU_WRAP;
+#else  // MARIOCLUB_VERSION
+		sMenuSelectNo = MENU_FONT;
+#endif // MARIOCLUB_VERSION
 		FADE_IN_RETURN( WriteDataProcess2 );
 	}
 #endif
 
+// NEVER REACHED
 	FADE_IN_RETURN( WriteDataProcess1 );
 }
 
@@ -180,15 +185,6 @@ void WriteDataProcessDrawMenu(void)
 
 void* WriteDataProcess1(void)
 {
-#ifndef NAND_INITIALIZER_LIMITED_MODE
-	// オート実行用
-	if (gAutoFlag)
-	{
-		sMenuSelectNo = MENU_FONT;
-		return WriteDataProcess2;
-	}
-#endif
-
 	// 選択メニューの変更
     if ( kamiPadIsRepeatTrigger(PAD_KEY_UP) )
 	{
@@ -228,16 +224,18 @@ void* WriteDataProcess1(void)
 
 void* WriteDataProcess2(void)
 {
-	BOOL result;
+	BOOL result = TRUE;
 	s16 y_pos = (s16)(7 + sMenuSelectNo * CHAR_OF_MENU_SPACE);
 
 	switch( sMenuSelectNo )
 	{
 	case MENU_CERT:
+#ifdef   MARIOCLUB_VERSION
 		result = WriteCertData();
 		
 		// sysmenu.logの生成をこのタイミングで行っておく
 		ERRORLOG_Init(OS_AllocFromMain, OS_FreeToMain);
+#endif //MARIOCLUB_VERSION
 		break;
 	case MENU_WRAP:
 		// ダミーのDSメニューラッピング用ファイル作成（UIGランチャーが作っているもの）
@@ -274,6 +272,7 @@ void* WriteDataProcess2(void)
 		switch(sMenuSelectNo)
 		{
 		case MENU_CERT:
+#ifdef   MARIOCLUB_VERSION
 			if (total_result) 
 			{
 				gAutoProcessResult[AUTO_PROCESS_MENU_VARIOUS_DATA_1] = AUTO_PROCESS_RESULT_SUCCESS; 
@@ -284,13 +283,14 @@ void* WriteDataProcess2(void)
 				gAutoProcessResult[AUTO_PROCESS_MENU_VARIOUS_DATA_1] = AUTO_PROCESS_RESULT_FAILURE; 
 				FADE_OUT_RETURN( AutoProcess2); 
 			}
+#else  //MARIOCLUB_VERSION
+				FADE_OUT_RETURN( AutoProcess1 ); 			
+#endif //MARIOCLUB_VERSION
 			
 			/* NOTREACHED */
 		case MENU_WRAP:
-#ifdef   MARIOCLUB_VERSION
 			sMenuSelectNo++;
 			return WriteDataProcess2;
-#endif //MARIOCLUB_VERSION
 		case MENU_FONT:
 #ifdef   WRITE_DEVKP_ENABLE
 			sMenuSelectNo = MENU_DEVKP;