From 1066eadc29996bc5f7d23916ba542634a61e4bde Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 3 Sep 2008 10:47:56 +0000
Subject: [PATCH] =?UTF-8?q?nishimoto@PSEG1=20AppJumpChecker=20=E3=81=A7?=
 =?UTF-8?q?=E3=80=81=E3=82=AB=E3=83=BC=E3=83=89=E3=82=A2=E3=83=97=E3=83=AA?=
 =?UTF-8?q?=E3=81=AB=E3=82=A2=E3=83=97=E3=83=AA=E3=82=B8=E3=83=A3=E3=83=B3?=
 =?UTF-8?q?=E3=83=97=E3=81=8C=E5=87=BA=E6=9D=A5=E3=81=AA=E3=81=8B=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?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@2389 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/debugsoft/AppJumpChecker/src/main.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/debugsoft/AppJumpChecker/src/main.c b/build/debugsoft/AppJumpChecker/src/main.c
index 94da5db9..7a7e2578 100644
--- a/build/debugsoft/AppJumpChecker/src/main.c
+++ b/build/debugsoft/AppJumpChecker/src/main.c
@@ -192,14 +192,20 @@ void TwlMain(void)
 		if (gKey.trg & PAD_BUTTON_Y)
 		{
 			CARDRomHeader* rh;
-			u64 titleId;
+//			u64 titleId;
 			rh = (CARDRomHeader*)CARD_GetRomHeader();
 			
-			if ( rh->game_code != 0)
+			// TWL アプリの場合
+			if ( rh->product_id & 0x03 || rh->product_id & 0x02 )	// 刺さっているカードのロムが TWLアプリ
 			{
-				titleId = (0x00030000 << 32) | rh->game_code;
-				OS_DoApplicationJump( titleId, OS_APP_JUMP_NORMAL);
+				ROM_Header* rh2;
+				rh2 = (ROM_Header*)HW_TWL_CARD_ROM_HEADER_BUF;
+				
+				OS_DoApplicationJump( rh2->s.titleID, OS_APP_JUMP_NORMAL);
 			}
+			
+//			titleId = (0x00030000 << 32) | rh->game_code;
+			// NITRO カードアプリなら失敗（特殊なものでない限り TitleID が設定されていないため）
 
 			PrintErrMsg("Failed to App Jump.");
 		}
@@ -375,7 +381,7 @@ static void DrawScene(DataStruct* list)
 			}
 			
 			// ノーマルジャンプを許可しているかどうかを取得
-			if ( rh->reserved_A[8] & 0x80 )
+			if ( rh->reserved_A[8] & 0x01 )
 			{
 				PutSubScreen( 0, 2 + TITLE_NUM_CUL + 2, 0xf2, "   %s, %s : o", init_code, titleid_lo );
 			}