diff -urN jnethack-cvs/include/hack.h jnethack/include/hack.h
--- jnethack-cvs/include/hack.h	2003-09-04 04:05:08.000000000 +0900
+++ jnethack/include/hack.h	2003-09-10 00:22:50.000000000 +0900
@@ -64,11 +64,7 @@
  * in end.c and topten.c will need to be changed.  Some parts of the
  * code assume that PANIC separates the deaths from the non-deaths.
  */
-#if 0 /*JP*/
-#define DIED		 0
-#else
 #define KILLED		 0
-#endif
 #define CHOKING		 1
 #define POISONING	 2
 #define STARVING	 3
@@ -77,24 +73,15 @@
 #define DISSOLVED	 6
 #define CRUSHING	 7
 #define STONING		 8
-#if 0 /*JP*/
-#define TURNED_SLIME	 9
-#define GENOCIDED	10
-#define PANICKED	11
-#define TRICKED		12
-#define QUIT		13
-#define ESCAPED		14
-#define ASCENDED	15
-#else
 #define DIED		 9
-#define TURNED_SLIME	10
-#define GENOCIDED	11
+#define TURNED_SLIME	10
+#define GENOCIDED	11
 #define PANICKED	12
 #define TRICKED		13
-#define QUIT		14
-#define ESCAPED		15
-#define ASCENDED	16
-#endif
+#define QUIT		14
+#define ESCAPED		15
+#define ASCENDED	16
+
 
 #include "align.h"
 #include "dungeon.h"

diff -urN jnethack-cvs/src/end.c jnethack/src/end.c
--- jnethack-cvs/src/end.c	2003-09-05 04:48:47.000000000 +0900
+++ jnethack/src/end.c	2003-09-10 00:29:48.000000000 +0900
@@ -79,26 +79,6 @@
 */
 
 #if 0 /*JP*/
-#define DIED		 0
-#define CHOKING		 1
-#define POISONING	 2
-#define STARVING	 3
-#define DROWNING	 4
-#define BURNING		 5
-#define DISSOLVED	 6
-#define CRUSHING	 7
-#define STONING		 8
-#define TURNED_SLIME	 9
-#define GENOCIDED	10
-#define PANICKED	11
-#define TRICKED		12
-#define QUIT		13
-#define ESCAPED		14
-#define ASCENDED	15
-#define DIED		16 <- (追加)
-#endif
-
-#if 0 /*JP*/
 /*
  * The order of these needs to match the macros in hack.h.
  */
@@ -113,12 +93,12 @@
 
 #if 1 /*JP*/
 static NEARDATA const char *ends[] = {		/* "when you..." */
-	"死んだ", "窒息した", "毒におかされた", "餓死した", "溺死した",
+	"殺された", "窒息した", "毒におかされた", "餓死した", "溺死した",
 	"焼死した", "溶岩に溶けた",
-	"押し潰された", "石になった", "どろどろに溶けた",
+	"押し潰された", "石になった", "死んだ", "どろどろに溶けた",
 	"虐殺された",
 	"パニックにおちいった", "奇妙な出来事に会った",
-	"抜けた", "脱出した", "昇天した", "殺された"
+	"抜けた", "脱出した", "昇天した",
 };
 #else
 static NEARDATA const char *ends[] = {		/* "when you..." */

diff -urN jnethack-cvs/src/topten.c jnethack/src/topten.c
--- jnethack-cvs/src/topten.c	2003-09-05 04:48:47.000000000 +0900
+++ jnethack/src/topten.c	2003-09-10 00:47:40.000000000 +0900
@@ -82,9 +82,12 @@
 	"burned by ", "dissolved in ", "crushed to death by ", "petrified by ",
 	"turned to slime by ", "killed by ", "", "", "", "", ""
 #else
-	"死んだ", "で窒息した", "の毒で死んだ", "", "溺死した",
-	"焼死した", "溶岩に溶けた", "押し潰された", "石化した",
-	"", "虐殺された", "", "", "", "", "", "に殺された"
+	"に殺された", "で窒息した", "の毒で死んだ", "", "溺死した",
+	"焼死した", "溶岩に溶けた",
+	"押し潰された", "石化した", "死んだ", "によりスライム化した",
+	"虐殺された",
+	"", "",
+	"", "", "",
 #endif
 };