diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile index e18c33de..9f09b2b9 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile @@ -41,6 +41,7 @@ SRCS = main.c HWInfoWriter.c \ LINCLUDES = $(MISC_DIR)/include MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' +MAKETAD_FLAGS += -s include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf b/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf index bc961281..625d2777 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf @@ -151,7 +151,7 @@ AppendProperty # # Boot allowed Media: [GameCard/NAND] # - Media GameCard + Media NAND # # GameCode for TitleID : Your GameCode in 4 ascii words diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c index 0d3d1750..3e31e407 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c @@ -250,7 +250,7 @@ int MachineSettingMain( void ) break; case 6: //pictochat起動テスト - OS_SetLauncherParamAndResetHardware( 0, 0x0001000150434854, &tempflag ); + OS_SetLauncherParamAndResetHardware( 0, 0x0003000550434854, &tempflag ); } } } diff --git a/build/tests/AppliCooperation/CooperationA/ARM9/src/CooperationA.c b/build/tests/AppliCooperation/CooperationA/ARM9/src/CooperationA.c index dc8e66e6..1958bb39 100644 --- a/build/tests/AppliCooperation/CooperationA/ARM9/src/CooperationA.c +++ b/build/tests/AppliCooperation/CooperationA/ARM9/src/CooperationA.c @@ -496,12 +496,12 @@ static void MenuScene(void) // メーカーコードとゲームコードのセット(Launcher側でやるべき?) OS_SetMakerCodeToDeliveryArgumentInfo( *maker_code_src_addr ); OS_SetGameCodeToDeliveryArgumentInfo( *game_code_src_addr ); - OS_SetTitleIdToDeliveryArgumentInfo( 0x00010001434f5041 ); + OS_SetTitleIdToDeliveryArgumentInfo( 0x00030004434f5041 ); // アプリ専用引数のセット OS_SetDeliveryArgments( (const char *)s_work.parameter ); } //B起動 - OS_SetLauncherParamAndResetHardware( 0, 0x00010001434f5042, &tempflag ); + OS_SetLauncherParamAndResetHardware( 0, 0x00030004434f5042, &tempflag ); break; case 2: OS_SetLauncherParamAndResetHardware( 0, NULL, &tempflag ); diff --git a/build/tests/AppliCooperation/CooperationB/ARM9/src/CooperationB.c b/build/tests/AppliCooperation/CooperationB/ARM9/src/CooperationB.c index b2b9114b..26d1e248 100644 --- a/build/tests/AppliCooperation/CooperationB/ARM9/src/CooperationB.c +++ b/build/tests/AppliCooperation/CooperationB/ARM9/src/CooperationB.c @@ -161,7 +161,7 @@ static void MenuScene(void) // メーカーコードとゲームコードのセット(Launcher側でやるべき?) OS_SetMakerCodeToDeliveryArgumentInfo( *maker_code_src_addr ); OS_SetGameCodeToDeliveryArgumentInfo( *game_code_src_addr ); - OS_SetTitleIdToDeliveryArgumentInfo( 0x00010001434f5042 ); + OS_SetTitleIdToDeliveryArgumentInfo( 0x00030004434f5042 ); // アプリ専用引数のセット OS_SetDeliveryArgments( "-r" ); diff --git a/build/tests/AppliCooperation/CooperationC/ARM9/src/CooperationC.c b/build/tests/AppliCooperation/CooperationC/ARM9/src/CooperationC.c index 3498fbf1..b951b3ec 100644 --- a/build/tests/AppliCooperation/CooperationC/ARM9/src/CooperationC.c +++ b/build/tests/AppliCooperation/CooperationC/ARM9/src/CooperationC.c @@ -496,12 +496,12 @@ static void MenuScene(void) // メーカーコードとゲームコードのセット(Launcher側でやるべき?) OS_SetMakerCodeToDeliveryArgumentInfo( *maker_code_src_addr ); OS_SetGameCodeToDeliveryArgumentInfo( *game_code_src_addr ); - OS_SetTitleIdToDeliveryArgumentInfo( 0x00010001434f5043 ); + OS_SetTitleIdToDeliveryArgumentInfo( 0x00030004434f5043 ); // アプリ専用引数のセット OS_SetDeliveryArgments( (const char *)s_work.parameter ); } //B起動 - OS_SetLauncherParamAndResetHardware( 0, 0x00010001434f5042, &tempflag ); + OS_SetLauncherParamAndResetHardware( 0, 0x00030004434f5042, &tempflag ); break; case 2: OS_SetLauncherParamAndResetHardware( 0, NULL, &tempflag ); diff --git a/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c b/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c index 6a4a876c..fd275df9 100644 --- a/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c +++ b/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c @@ -135,27 +135,27 @@ static void MenuScene(void) switch( s_csr ) { case 0: //アプリ起動 - OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b30, &tempflag ); // RCK0 + OS_SetLauncherParamAndResetHardware( 0, 0x0003000452434b30, &tempflag ); // RCK0 break; case 1: //アプリ起動 - OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b31, &tempflag ); // RCK1 + OS_SetLauncherParamAndResetHardware( 0, 0x0003000452434b31, &tempflag ); // RCK1 break; case 2: //アプリ起動 - OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b32, &tempflag ); // RCK2 + OS_SetLauncherParamAndResetHardware( 0, 0x0003000452434b32, &tempflag ); // RCK2 break; case 3: //アプリ起動 - OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b33, &tempflag ); // RCK3 + OS_SetLauncherParamAndResetHardware( 0, 0x0003000452434b33, &tempflag ); // RCK3 break; case 4: //アプリ起動 - OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b34, &tempflag ); // RCK4 + OS_SetLauncherParamAndResetHardware( 0, 0x0003000452434b34, &tempflag ); // RCK4 break; case 5: //アプリ起動 - OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b35, &tempflag ); // RCK5 + OS_SetLauncherParamAndResetHardware( 0, 0x0003000452434b35, &tempflag ); // RCK5 break; case 6: OS_SetLauncherParamAndResetHardware( 0, NULL, &tempflag );