From 772fef439d9e3890e51b8d35b85a9ac9896e8741 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 3 Jul 2008 01:44:38 +0000
Subject: [PATCH] =?UTF-8?q?NitroSDK=E3=81=AEROM=E3=82=B3=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=AB=E5=8F=82=E7=85=A7=E3=83=90=E3=82=B0?=
 =?UTF-8?q?=E5=AF=BE=E7=AD=96=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@1758 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/boot/ARM9/src/bootAPI.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
index 5e28ffbb..7d40b91f 100644
--- a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
@@ -26,6 +26,7 @@
 #include <firm/hw/ARM9/mmap_firm.h>
 #include <firm/format/from_firm.h>
 #include "reboot.h"
+#include "../../../hotsw/ARM7/include/hotswTypes.h"
 
 
 // define data-------------------------------------------------------
@@ -203,10 +204,10 @@ static void BOOTi_RebootCallback( void** entryp, void* mem_list_v, REBOOTTarget*
 
         // デバッガによるROMエミュレーション時はNTR-ROMヘッダバッファの
         // ゲームコマンドパラメータをスクランブルOFF設定に書き換える
-        if ( SYSMi_GetWork()->appBootType == OS_BOOTTYPE_ROM )
+        if ( SYSM_IsRunOnDebugger() )
         {
-            // ブート対象のROMヘッダはカードブート時のみ
-            dh->s.game_cmd_param = SYSMi_GetWork()->gameCommondParam;
+            // NitroSDKバグ対策でブートメディア種別に関わらずROMヘッダを常時書き換え
+            dh->s.game_cmd_param &= ~SCRAMBLE_MASK;
         }
         {
             // カードROMヘッダは常時設定