diff --git a/build/tests/FatalErrorMaker/ARM9/Makefile b/build/tests/FatalErrorMaker/ARM9/Makefile
index f3fb64d0..4144a38b 100644
--- a/build/tests/FatalErrorMaker/ARM9/Makefile
+++ b/build/tests/FatalErrorMaker/ARM9/Makefile
@@ -1,77 +1,32 @@
-#/*---------------------------------------------------------------------------*
-#  Project:  TwlIPL - tests - FatalErrorMaker
-#  File:     makefile
-#
-#  Copyright **** Nintendo.  All rights reserved.
-#
-#  These coded instructions, statements, and computer programs contain
-#  proprietary information of Nintendo of America Inc. and/or Nintendo
-#  Company Ltd., and are protected by Federal copyright law.  They may
-#  not be disclosed to third parties or copied or duplicated in any form,
-#  in whole or in part, without the prior written consent of Nintendo.
-#
-#  $Date::            $
-#  $Rev$
-#  $Author$
-# *---------------------------------------------------------------------------*/
-TARGET_FIRM	= SYSTEMMENU
-TARGET_PLATFORM	=	TWL
-TWL_ARCHGEN   = LIMITED
-
-SUBDIRS          =
-
-MISC_DIR	=	../../../systemMenu_RED/misc
-
-SRCS			=	main.c	fatalErrorMaker.c \
-				$(MISC_DIR)/src/misc.c	\
-				$(MISC_DIR)/src/cmn.c
-
-LINCLUDES		+=	$(MISC_DIR)/include 
-
-ROM_SPEC	=	main.rsf
-
-TARGET_BIN		=	FatalErrorMaker.srl
-
-SYSMENU_LIBS			=	\
-							liblcfg$(TWL_LIBSUFFIX).a \
-							libsysmenu$(TWL_LIBSUFFIX).a \
-							libsysmmcu$(TWL_LIBSUFFIX).a \
-							libsysmutil$(TWL_LIBSUFFIX).a \
-							libboot$(TWL_LIBSUFFIX).a \
-							libds$(TWL_LIBSUFFIX).a \
-							libhotsw$(TWL_LIBSUFFIX).a \
-							libdht$(TWL_LIBSUFFIX).a \
-							libreloc_info$(TWL_LIBSUFFIX).a \
-							libnamut$(TWL_LIBSUFFIX).a \
-							libsharedfont_launcher$(TWL_LIBSUFFIX).a \
-							WDS$(TWL_LIBSUFFIX).a
-
-SDK_APPEND_LIBS		=		\
-							libes$(TWL_LIBSUFFIX).a		\
-							libboc$(TWL_LIBSUFFIX).a	\
-							libsfs$(TWL_LIBSUFFIX).a	\
-							libnam$(TWL_LIBSUFFIX).a	\
-							libsea$(TWL_LIBSUFFIX).a	\
-							libreboot$(TWL_LIBSUFFIX).a	\
-							libna$(TWL_LIBSUFFIX).a
-
-LLIBRARIES	+=	$(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
-
-
-include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-MAKEROM			=	$(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
-DEFAULT_MAKEROM_ARM7_BASE	= $(TWL_COMPONENTSDIR)/armadillo/$(TWL_BUILDTYPE_ARM7)/armadillo
-DEFAULT_MAKEROM_ARM7		= $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT)
-
-
-
+#! make -f
 #----------------------------------------------------------------------------
-do-build:		$(TARGETS)
+# Project:  TwlSDK - demos - simpleShoot-1
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date:: $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
+SUBDIRS					=	
+SUBMAKES		=	Makefile.0 Makefile.1
+
+include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/commondefs
 
 #----------------------------------------------------------------------------
 
-include	$(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+do-build : $(TARGETS)
 
+include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/modulerules
+
+#----------------------------------------------------------------------------
 
 #===== End of Makefile =====
diff --git a/build/tests/FatalErrorMaker/ARM9/Makefile.0 b/build/tests/FatalErrorMaker/ARM9/Makefile.0
new file mode 100644
index 00000000..4b3cb1c8
--- /dev/null
+++ b/build/tests/FatalErrorMaker/ARM9/Makefile.0
@@ -0,0 +1,85 @@
+#/*---------------------------------------------------------------------------*
+#  Project:  TwlIPL - tests - FatalErrorMaker
+#  File:     makefile
+#
+#  Copyright **** Nintendo.  All rights reserved.
+#
+#  These coded instructions, statements, and computer programs contain
+#  proprietary information of Nintendo of America Inc. and/or Nintendo
+#  Company Ltd., and are protected by Federal copyright law.  They may
+#  not be disclosed to third parties or copied or duplicated in any form,
+#  in whole or in part, without the prior written consent of Nintendo.
+#
+#  $Date::            $
+#  $Rev$
+#  $Author$
+# *---------------------------------------------------------------------------*/
+TARGET_FIRM	= SYSTEMMENU
+TARGET_PLATFORM	=	TWL
+TWL_ARCHGEN   = LIMITED
+TWL_NANDAPP	=	TRUE
+
+SUBDIRS          =
+
+MEDIA		=	NAND
+GAMECODE	=	012A
+TARGET_BIN		=	FatalErrorMaker.tad
+BINDIR		=	./bin/$(TWL_BUILDTYPE)/$(MEDIA)
+
+MISC_DIR	=	../../../systemMenu_RED/misc
+
+SRCS			=	main.c	fatalErrorMaker.c \
+				$(MISC_DIR)/src/misc.c	\
+				$(MISC_DIR)/src/cmn.c
+
+LINCLUDES		+=	$(MISC_DIR)/include 
+
+ROM_SPEC	=	main.rsf
+
+
+
+SYSMENU_LIBS			=	\
+							liblcfg$(TWL_LIBSUFFIX).a \
+							libsysmenu$(TWL_LIBSUFFIX).a \
+							libsysmmcu$(TWL_LIBSUFFIX).a \
+							libsysmutil$(TWL_LIBSUFFIX).a \
+							libboot$(TWL_LIBSUFFIX).a \
+							libds$(TWL_LIBSUFFIX).a \
+							libhotsw$(TWL_LIBSUFFIX).a \
+							libdht$(TWL_LIBSUFFIX).a \
+							libreloc_info$(TWL_LIBSUFFIX).a \
+							libnamut$(TWL_LIBSUFFIX).a \
+							libsharedfont_launcher$(TWL_LIBSUFFIX).a \
+							WDS$(TWL_LIBSUFFIX).a
+
+SDK_APPEND_LIBS		=		\
+							libes$(TWL_LIBSUFFIX).a		\
+							libboc$(TWL_LIBSUFFIX).a	\
+							libsfs$(TWL_LIBSUFFIX).a	\
+							libnam$(TWL_LIBSUFFIX).a	\
+							libsea$(TWL_LIBSUFFIX).a	\
+							libreboot$(TWL_LIBSUFFIX).a	\
+							libna$(TWL_LIBSUFFIX).a
+
+LLIBRARIES	+=	$(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
+MAKETAD_OPTION	+=	-s
+
+include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+MAKEROM			=	$(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
+
+MAKEROM_FLAGS	+=	-DFATALMAKER_GAMECODE=$(GAMECODE)	\
+					-DFATALMAKER_MEDIA=$(MEDIA)
+
+DEFAULT_MAKEROM_ARM7_BASE	= $(TWL_COMPONENTSDIR)/armadillo/$(TWL_BUILDTYPE_ARM7)/armadillo
+DEFAULT_MAKEROM_ARM7		= $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT)
+
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+#----------------------------------------------------------------------------
+
+include	$(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+
+#===== End of Makefile =====
diff --git a/build/tests/FatalErrorMaker/ARM9/Makefile.1 b/build/tests/FatalErrorMaker/ARM9/Makefile.1
new file mode 100644
index 00000000..c1ff790d
--- /dev/null
+++ b/build/tests/FatalErrorMaker/ARM9/Makefile.1
@@ -0,0 +1,85 @@
+#/*---------------------------------------------------------------------------*
+#  Project:  TwlIPL - tests - FatalErrorMaker
+#  File:     makefile
+#
+#  Copyright **** Nintendo.  All rights reserved.
+#
+#  These coded instructions, statements, and computer programs contain
+#  proprietary information of Nintendo of America Inc. and/or Nintendo
+#  Company Ltd., and are protected by Federal copyright law.  They may
+#  not be disclosed to third parties or copied or duplicated in any form,
+#  in whole or in part, without the prior written consent of Nintendo.
+#
+#  $Date::            $
+#  $Rev$
+#  $Author$
+# *---------------------------------------------------------------------------*/
+TARGET_FIRM	= SYSTEMMENU
+TARGET_PLATFORM	=	TWL
+TWL_ARCHGEN   = LIMITED
+TWL_NANDAPP	=	TRUE
+
+SUBDIRS          =
+
+MEDIA		=	GameCard
+GAMECODE	=	0B4A
+TARGET_BIN		=	FatalErrorMaker.srl
+BINDIR		=	./bin/$(TWL_BUILDTYPE)/$(MEDIA)
+
+MISC_DIR	=	../../../systemMenu_RED/misc
+
+SRCS			=	main.c	fatalErrorMaker.c \
+				$(MISC_DIR)/src/misc.c	\
+				$(MISC_DIR)/src/cmn.c
+
+LINCLUDES		+=	$(MISC_DIR)/include 
+
+ROM_SPEC	=	main.rsf
+
+
+
+SYSMENU_LIBS			=	\
+							liblcfg$(TWL_LIBSUFFIX).a \
+							libsysmenu$(TWL_LIBSUFFIX).a \
+							libsysmmcu$(TWL_LIBSUFFIX).a \
+							libsysmutil$(TWL_LIBSUFFIX).a \
+							libboot$(TWL_LIBSUFFIX).a \
+							libds$(TWL_LIBSUFFIX).a \
+							libhotsw$(TWL_LIBSUFFIX).a \
+							libdht$(TWL_LIBSUFFIX).a \
+							libreloc_info$(TWL_LIBSUFFIX).a \
+							libnamut$(TWL_LIBSUFFIX).a \
+							libsharedfont_launcher$(TWL_LIBSUFFIX).a \
+							WDS$(TWL_LIBSUFFIX).a
+
+SDK_APPEND_LIBS		=		\
+							libes$(TWL_LIBSUFFIX).a		\
+							libboc$(TWL_LIBSUFFIX).a	\
+							libsfs$(TWL_LIBSUFFIX).a	\
+							libnam$(TWL_LIBSUFFIX).a	\
+							libsea$(TWL_LIBSUFFIX).a	\
+							libreboot$(TWL_LIBSUFFIX).a	\
+							libna$(TWL_LIBSUFFIX).a
+
+LLIBRARIES	+=	$(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
+MAKETAD_OPTION	+=	-s
+
+include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+MAKEROM			=	$(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
+
+MAKEROM_FLAGS	+=	-DFATALMAKER_GAMECODE=$(GAMECODE)	\
+					-DFATALMAKER_MEDIA=$(MEDIA)
+
+DEFAULT_MAKEROM_ARM7_BASE	= $(TWL_COMPONENTSDIR)/armadillo/$(TWL_BUILDTYPE_ARM7)/armadillo
+DEFAULT_MAKEROM_ARM7		= $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT)
+
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+#----------------------------------------------------------------------------
+
+include	$(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+
+#===== End of Makefile =====
diff --git a/build/tests/FatalErrorMaker/ARM9/main.rsf b/build/tests/FatalErrorMaker/ARM9/main.rsf
index 2b08f05f..dc0fc39f 100644
--- a/build/tests/FatalErrorMaker/ARM9/main.rsf
+++ b/build/tests/FatalErrorMaker/ARM9/main.rsf
@@ -57,7 +57,7 @@ Property
 	#
 	# TITLE NAME: Your product name within 12bytes
 	#
-	TitleName		"DispInfo"
+	TitleName		"FatalMaker"
 
 	#
 	# MAKER CODE: Your company ID# in 2 ascii words
@@ -95,7 +95,7 @@ Property
 	# BANNER FILE: generated from Banner Spec File
 	#
 	#BannerFile		./etc/myGameBanner.bnr
-	BannerFile		$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
+	BannerFile		../banner/banner.bnr
 
 	#
 	# Permit LandingNormalJump: for TWL "ApplicationJump" function [TRUE/FALSE]
@@ -201,7 +201,7 @@ AppendProperty
 	#
 	# Boot allowed Media: [GameCard]
 	#
-	Media					NAND
+	Media					$(FATALMAKER_MEDIA)
 
 	#
 	# Data only title : [TRUE/FALSE]
@@ -216,7 +216,7 @@ AppendProperty
 	#
 	# GameCode for TitleID : Your GameCode in 4 ascii words
 	#
-	GameCode				ABCZ
+	GameCode				$(FATALMAKER_GAMECODE)
 
 	#
 	# Public save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M]
diff --git a/build/tests/FatalErrorMaker/about.txt b/build/tests/FatalErrorMaker/about.txt
new file mode 100644
index 00000000..c58fb52b
--- /dev/null
+++ b/build/tests/FatalErrorMaker/about.txt
@@ -0,0 +1,22 @@
+FatalErrorMaker
+
+NAND、無線ファーム、共有フォント、ノーマルHW情報、セキュアHW情報を
+破壊し、意図的にFatal Errorを引き起こすテストです。
+起動するとメニューが表示されるので、破壊したい項目にカーソルを合わせてAボタンを押してください。
+共有フォント以外は次回起動時に確実にFatal Errorを引き起こすと考えられるので、
+NAND Initializerが利用できることを確認したうえで実行したほうがよいと思います。
+
+手法としては、NAND以外の各データはそれぞれのファイルをFS_DeleteFile()で削除することで、
+NANDに関してはNORフラッシュにおけるNAND FATALエラーフラグ(IPL/docs/フラッシュマップ_NOR.xls参照)を
+立てることで該当項目の破壊を実現しています。
+
+
+破壊しているファイルは具体的に以下の通りです。
+
+共有フォント：nand:/sys/TWLFontTable.dat
+ノーマル情報：nand:/sys/HWINFO_N.dat
+セキュア情報：nand:/sys/HWINFO_S.dat
+
+また、無線ファームに関してはコンテンツとしてtitleフォルダ以下に配置されているので、
+NAMライブラリを利用してパスを取得してから削除しにいっています。
+
diff --git a/build/tests/FatalErrorMaker/banner/icon/gameIcon.bmp b/build/tests/FatalErrorMaker/banner/icon/gameIcon.bmp
index 8ec56f1c..876eca5b 100644
Binary files a/build/tests/FatalErrorMaker/banner/icon/gameIcon.bmp and b/build/tests/FatalErrorMaker/banner/icon/gameIcon.bmp differ