From adaa866498d88dd46acde0e22f7b9670d35792bf Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 8 Sep 2008 00:45:30 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=AC=E7=AD=89?=
 =?UTF-8?q?=E3=81=8B=E3=82=89NTR=E3=82=AB=E3=83=BC=E3=83=89ROM=E3=83=87?=
 =?UTF-8?q?=E3=83=BC=E3=82=BF=E3=82=92=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=82=93?=
 =?UTF-8?q?=E3=81=A7=E3=83=80=E3=82=A4=E3=83=AC=E3=82=AF=E3=83=88=E3=83=96?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=99=E3=82=8B=E9=9A=9B=E3=80=81=E8=B5=B7?=
 =?UTF-8?q?=E5=8B=95=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB=E3=82=92=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E3=81=99=E3=82=8BTitleProperty=E3=81=AETitleID?=
 =?UTF-8?q?=E3=81=ABGameCode=E3=81=8B=E3=82=89=E4=BD=9C=E6=88=90=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=9F=E6=93=AC=E4=BC=BCTitleID=E3=82=92=E7=AA=81?=
 =?UTF-8?q?=E3=81=A3=E8=BE=BC=E3=82=93=E3=81=A7=E3=81=8A=E3=82=89=E3=81=9A?=
 =?UTF-8?q?=E3=80=81TitleID=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=A7=E6=AD=A2?=
 =?UTF-8?q?=E3=81=BE=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=AA=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
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@2424 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../sysmenu/ARM9/src/sysmenu_lib.c            | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index f219fd12..620145e0 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -459,7 +459,15 @@ static TitleProperty *SYSMi_CheckShortcutBoot1( void )
                 (void)OS_UnlockByWord( id, &SYSMi_GetWork()->lockCardRsc, NULL );   // ARM7と排他制御する
                 OS_ReleaseLockID( id );
             }
-            s_bootTitleBuf.titleID = *(u64 *)( &SYSM_GetCardRomHeader()->titleID_Lo );
+            if( SYSM_GetCardRomHeader()->platform_code & PLATFORM_CODE_FLAG_TWL ) {
+                s_bootTitleBuf.titleID = *(u64 *)( &SYSM_GetCardRomHeader()->titleID_Lo );
+            }else{
+                // NTRアプリの時は、TitleIDがないので、GameCodeをいじって擬似的にTitleIDとする。
+                s_bootTitleBuf.titleID = (u64)( ( SYSM_GetCardRomHeader()->game_code[ 3 ] <<  0 ) |
+                                                ( SYSM_GetCardRomHeader()->game_code[ 2 ] <<  8 ) |
+                                                ( SYSM_GetCardRomHeader()->game_code[ 1 ] << 16 ) |
+                                                ( SYSM_GetCardRomHeader()->game_code[ 0 ] << 24 ) );
+            }
             SYSM_SetLogoDemoSkip( s_bootTitleBuf.flags.isLogoSkip );
             return &s_bootTitleBuf;
         }
@@ -529,7 +537,15 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
             (void)OS_UnlockByWord( id, &SYSMi_GetWork()->lockCardRsc, NULL );   // ARM7と排他制御する
             OS_ReleaseLockID( id );
         }
-        s_bootTitleBuf.titleID = *(u64 *)( &SYSM_GetCardRomHeader()->titleID_Lo );
+        if( SYSM_GetCardRomHeader()->platform_code & PLATFORM_CODE_FLAG_TWL ) {
+            s_bootTitleBuf.titleID = *(u64 *)( &SYSM_GetCardRomHeader()->titleID_Lo );
+        }else{
+            // NTRアプリの時は、TitleIDがないので、GameCodeをいじって擬似的にTitleIDとする。
+            s_bootTitleBuf.titleID = (u64)( ( SYSM_GetCardRomHeader()->game_code[ 3 ] <<  0 ) |
+                                            ( SYSM_GetCardRomHeader()->game_code[ 2 ] <<  8 ) |
+                                            ( SYSM_GetCardRomHeader()->game_code[ 1 ] << 16 ) |
+                                            ( SYSM_GetCardRomHeader()->game_code[ 0 ] << 24 ) );
+        }
         SYSM_SetLogoDemoSkip( s_bootTitleBuf.flags.isLogoSkip );
         return &s_bootTitleBuf;
     }else