diff --git a/build/debugsoft/TMPJump/AppforFailedTmpJump/Makefile b/build/debugsoft/TMPJump/AppforFailedTmpJump/Makefile
index ed42ba8c..14ceddc9 100644
--- a/build/debugsoft/TMPJump/AppforFailedTmpJump/Makefile
+++ b/build/debugsoft/TMPJump/AppforFailedTmpJump/Makefile
@@ -13,8 +13,8 @@
 # in whole or in part, without the prior written consent of Nintendo.
 #
 # $Date::            $
-# $Rev:$
-# $Author:$
+# $Rev$
+# $Author$
 #----------------------------------------------------------------------------
 
 override TARGET_CODEGEN		=		ARM
@@ -28,9 +28,15 @@ INCDIR	=	../include
 SRCDIR	=	../src
 SRCS	=	common.c font.c screen.c main_f.c
 
+ifeq ($(ROMTYPE),MASTER)
+MAKEROM_ROMROOT		=	../mas_data
+else
 MAKEROM_ROMROOT		=	../data
+endif
+
 MAKEROM_ROMFILES	=	dummy.srl
 
+
 #----------------------------------------------------------------------------
 include $(TWLSDK_ROOT)/build/buildtools/commondefs
 
@@ -47,8 +53,12 @@ LIBSYSCALL			=	../458A/libsyscall.a
 endif
 
 INSTALL_TARGETS		=	$(BINDIR)/$(TARGET_BIN)
-INSTALL_DIR			=	../data
 
+ifeq ($(ROMTYPE),MASTER)
+INSTALL_DIR			=	../mas_data
+else
+INSTALL_DIR			=	../data
+endif
 #----------------------------------------------------------------------------
 
 do-build:	$(TARGETS)
diff --git a/build/debugsoft/TMPJump/AppforTmpJump/Makefile b/build/debugsoft/TMPJump/AppforTmpJump/Makefile
index 402d7daf..f6fc5c92 100644
--- a/build/debugsoft/TMPJump/AppforTmpJump/Makefile
+++ b/build/debugsoft/TMPJump/AppforTmpJump/Makefile
@@ -28,7 +28,11 @@ INCDIR	=	../include
 SRCDIR	=	./ ../src
 SRCS	=	common.c font.c screen.c main_2.c
 
+ifeq ($(ROMTYPE),MASTER)
+MAKEROM_ROMROOT		=	../mas_data
+else
 MAKEROM_ROMROOT		=	../data
+endif
 MAKEROM_ROMFILES	=	dummy.srl
 
 #----------------------------------------------------------------------------
@@ -60,8 +64,12 @@ LIBSYSCALL			=	../433A/libsyscall.a
 endif
 
 INSTALL_TARGETS		=	$(BINDIR)/$(TARGET_BIN)
-INSTALL_DIR			=	../data
 
+ifeq ($(ROMTYPE),MASTER)
+INSTALL_DIR		=	../mas_data
+else
+INSTALL_DIR			=	../data
+endif
 #----------------------------------------------------------------------------
 
 do-build:	$(TARGETS)
diff --git a/build/debugsoft/TMPJump/Makefile b/build/debugsoft/TMPJump/Makefile
index 36ff14fe..9d4a7ed4 100644
--- a/build/debugsoft/TMPJump/Makefile
+++ b/build/debugsoft/TMPJump/Makefile
@@ -46,7 +46,7 @@ include	$(TWLSDK_ROOT)/build/buildtools/modulerules
 else		# ifndef APP_TYPE
 
 TWL_NANDAPP		=	TRUE
-TARGET_NAME		= tmpjumpTest
+TARGET_NAME		= tmpjumpTest$(ROMTYPE)
 
 ifeq ($(APP_TYPE),NAND)
 TARGET_BIN	=	$(TARGET_NAME).tad
@@ -64,12 +64,16 @@ SRCDIR		=	./src
 
 SRCS		=	main.c common.c screen.c font.c
 
-
+ifeq ($(ROMTYPE),MASTER)
+MAKEROM_ROMROOT		=	./mas_data
+else
 MAKEROM_ROMROOT		=	./data
+endif
+
 MAKEROM_ROMFILES	=	TestApp.srl			\
 						TestApp_HYBRID.srl	\
 						TestApp_LIMITED.srl	\
-						Test_NITROfail.srl		\
+						Test_NITROfail.srl	\
 						Test_TWLfail.srl
 
 #----------------------------------------------------------------------------
diff --git a/build/debugsoft/TMPJump/banner/banner.bnr b/build/debugsoft/TMPJump/banner/banner.bnr
index 0e57dc8b..e234d8cd 100644
Binary files a/build/debugsoft/TMPJump/banner/banner.bnr and b/build/debugsoft/TMPJump/banner/banner.bnr differ
diff --git a/build/debugsoft/TMPJump/data/TestApp.srl b/build/debugsoft/TMPJump/data/TestApp.srl
index 82e726d0..d0ce9eb8 100644
Binary files a/build/debugsoft/TMPJump/data/TestApp.srl and b/build/debugsoft/TMPJump/data/TestApp.srl differ
diff --git a/build/debugsoft/TMPJump/data/TestApp_HYBRID.srl b/build/debugsoft/TMPJump/data/TestApp_HYBRID.srl
index 4a677ebc..f9001dab 100644
Binary files a/build/debugsoft/TMPJump/data/TestApp_HYBRID.srl and b/build/debugsoft/TMPJump/data/TestApp_HYBRID.srl differ
diff --git a/build/debugsoft/TMPJump/data/TestApp_LIMITED.srl b/build/debugsoft/TMPJump/data/TestApp_LIMITED.srl
index 3121a156..dcbaa000 100644
Binary files a/build/debugsoft/TMPJump/data/TestApp_LIMITED.srl and b/build/debugsoft/TMPJump/data/TestApp_LIMITED.srl differ
diff --git a/build/debugsoft/TMPJump/data/Test_NITROfail.srl b/build/debugsoft/TMPJump/data/Test_NITROfail.srl
index 7ea5ddd8..0574274f 100644
Binary files a/build/debugsoft/TMPJump/data/Test_NITROfail.srl and b/build/debugsoft/TMPJump/data/Test_NITROfail.srl differ
diff --git a/build/debugsoft/TMPJump/data/Test_TWLfail.srl b/build/debugsoft/TMPJump/data/Test_TWLfail.srl
index 7743a06b..17f45a43 100644
Binary files a/build/debugsoft/TMPJump/data/Test_TWLfail.srl and b/build/debugsoft/TMPJump/data/Test_TWLfail.srl differ
diff --git a/build/debugsoft/TMPJump/data/TestApp.mas.srl b/build/debugsoft/TMPJump/mas_data/TestApp.srl
similarity index 98%
rename from build/debugsoft/TMPJump/data/TestApp.mas.srl
rename to build/debugsoft/TMPJump/mas_data/TestApp.srl
index 657eac19..228b0b3a 100644
Binary files a/build/debugsoft/TMPJump/data/TestApp.mas.srl and b/build/debugsoft/TMPJump/mas_data/TestApp.srl differ
diff --git a/build/debugsoft/TMPJump/data/TestApp_HYBRID.mas.srl b/build/debugsoft/TMPJump/mas_data/TestApp_HYBRID.srl
similarity index 84%
rename from build/debugsoft/TMPJump/data/TestApp_HYBRID.mas.srl
rename to build/debugsoft/TMPJump/mas_data/TestApp_HYBRID.srl
index 80f8f1df..f9001dab 100644
Binary files a/build/debugsoft/TMPJump/data/TestApp_HYBRID.mas.srl and b/build/debugsoft/TMPJump/mas_data/TestApp_HYBRID.srl differ
diff --git a/build/debugsoft/TMPJump/data/TestApp_LIMITED.mas.srl b/build/debugsoft/TMPJump/mas_data/TestApp_LIMITED.srl
similarity index 82%
rename from build/debugsoft/TMPJump/data/TestApp_LIMITED.mas.srl
rename to build/debugsoft/TMPJump/mas_data/TestApp_LIMITED.srl
index 47833236..dcbaa000 100644
Binary files a/build/debugsoft/TMPJump/data/TestApp_LIMITED.mas.srl and b/build/debugsoft/TMPJump/mas_data/TestApp_LIMITED.srl differ
diff --git a/build/debugsoft/TMPJump/data/Test_NITROfail.mas.srl b/build/debugsoft/TMPJump/mas_data/Test_NITROfail.srl
similarity index 98%
rename from build/debugsoft/TMPJump/data/Test_NITROfail.mas.srl
rename to build/debugsoft/TMPJump/mas_data/Test_NITROfail.srl
index 952336d9..d4e163ea 100644
Binary files a/build/debugsoft/TMPJump/data/Test_NITROfail.mas.srl and b/build/debugsoft/TMPJump/mas_data/Test_NITROfail.srl differ
diff --git a/build/debugsoft/TMPJump/data/Test_TWLfail.mas.srl b/build/debugsoft/TMPJump/mas_data/Test_TWLfail.srl
similarity index 82%
rename from build/debugsoft/TMPJump/data/Test_TWLfail.mas.srl
rename to build/debugsoft/TMPJump/mas_data/Test_TWLfail.srl
index fedec0ed..17f45a43 100644
Binary files a/build/debugsoft/TMPJump/data/Test_TWLfail.mas.srl and b/build/debugsoft/TMPJump/mas_data/Test_TWLfail.srl differ
diff --git a/build/debugsoft/TMPJump/data/dummy.mas.srl b/build/debugsoft/TMPJump/mas_data/dummy.srl
similarity index 100%
rename from build/debugsoft/TMPJump/data/dummy.mas.srl
rename to build/debugsoft/TMPJump/mas_data/dummy.srl
diff --git a/build/debugsoft/TMPJump/src/main.c b/build/debugsoft/TMPJump/src/main.c
index 62d38f7b..177d9543 100644
--- a/build/debugsoft/TMPJump/src/main.c
+++ b/build/debugsoft/TMPJump/src/main.c
@@ -83,6 +83,9 @@ void TwlMain(void)
 			void *buf;
 			s32 len = 0;
 			
+			PutSubScreen(1, 8, 0xff, "now writing tmp app...");
+			OS_WaitVBlankIntr();
+			
 			// srl を NAND 上の OS_TMP_APP_PATH へコピー
 			FS_DeleteFile(OS_TMP_APP_PATH);
 			FS_CreateFile(OS_TMP_APP_PATH, FS_PERMIT_R | FS_PERMIT_W);
diff --git a/debugsoft/TMPJumpTest/ReadMe_TMPJump.txt b/debugsoft/TMPJumpTest/ReadMe_TMPJump.txt
index b233c4d1..f20823bf 100644
--- a/debugsoft/TMPJumpTest/ReadMe_TMPJump.txt
+++ b/debugsoft/TMPJumpTest/ReadMe_TMPJump.txt
@@ -50,6 +50,7 @@ TMP 
 nishimoto_takashi@nintendo.co.jp
 
 ＜更新履歴＞============================================
+2008/09/02		量産機用ロムを追加
 2008/08/28		仕様追加に伴う加筆修正
 2008/08/12		新規追加
 
diff --git a/debugsoft/TMPJumpTest/tmpjumpTest.srl b/debugsoft/TMPJumpTest/tmpjumpTest.srl
index d7a80b44..79207218 100644
Binary files a/debugsoft/TMPJumpTest/tmpjumpTest.srl and b/debugsoft/TMPJumpTest/tmpjumpTest.srl differ
diff --git a/debugsoft/TMPJumpTest/tmpjumpTest.tad b/debugsoft/TMPJumpTest/tmpjumpTest.tad
index c4b5940c..058c1da8 100644
Binary files a/debugsoft/TMPJumpTest/tmpjumpTest.tad and b/debugsoft/TMPJumpTest/tmpjumpTest.tad differ
diff --git a/debugsoft/TMPJumpTest/tmpjumpTest_m.mas.srl b/debugsoft/TMPJumpTest/tmpjumpTest_m.mas.srl
deleted file mode 100644
index 5f771280..00000000
Binary files a/debugsoft/TMPJumpTest/tmpjumpTest_m.mas.srl and /dev/null differ
diff --git a/debugsoft/TMPJumpTest/tmpjumpTest_m.nand.srl b/debugsoft/TMPJumpTest/tmpjumpTest_m.nand.srl
deleted file mode 100644
index e4d7dc0f..00000000
Binary files a/debugsoft/TMPJumpTest/tmpjumpTest_m.nand.srl and /dev/null differ
diff --git a/debugsoft/TMPJumpTest/tmpjumpTest_m.srl b/debugsoft/TMPJumpTest/tmpjumpTest_m.srl
deleted file mode 100644
index 698a8d5c..00000000
Binary files a/debugsoft/TMPJumpTest/tmpjumpTest_m.srl and /dev/null differ