Binary files old/.DS_Store and src/.DS_Store differ
Only in src/: NPPAngband (68K).NJ
diff -ur old/cmd4.c src/cmd4.c
--- old/cmd4.c	Fri Jun 10 15:47:02 2005
+++ src/cmd4.c	Fri Jun 10 16:31:17 2005
@@ -30,6 +30,10 @@
 /*used for knowledge display*/
 #define BROWSER_ROWS			16
 
+#ifdef MAC_MPW
+static char JVERSION_NAME[] = "日本語版" VERSION_NAME;
+#endif
+
 /*
  *  Header and footer marker string for pref file dumps
  */
diff -ur old/defines.h src/defines.h
--- old/defines.h	Fri Jun 10 15:47:02 2005
+++ src/defines.h	Fri Jun 10 16:28:24 2005
@@ -64,7 +64,9 @@
  /*
   * 日本語版のバージョン
   */
+#ifndef MAC_MPW
 #define JVERSION_NAME "日本語版" VERSION_NAME
+#endif
 #define JVERSION_STRING VERSION_STRING "-j0.2.0"
 #define JVERSION_MAJOR	0
 #define JVERSION_MINOR	2
diff -ur old/files.c src/files.c
--- old/files.c	Fri Jun 10 15:47:02 2005
+++ src/files.c	Fri Jun 10 16:31:13 2005
@@ -31,6 +31,10 @@
 
 #include "angband.h"
 
+#ifdef MAC_MPW
+static char JVERSION_NAME[] = "日本語版" VERSION_NAME;
+#endif
+
 /*
  * Hack -- drop permissions
  */
diff -ur old/init1.c src/init1.c
--- old/init1.c	Fri Jun 10 15:47:02 2005
+++ src/init1.c	Fri Jun 10 16:41:15 2005
@@ -1079,7 +1079,7 @@
 	if (buf[0] == 'N')
 	{
 		/* Find the colon before the name */
-		s = strchr(buf+2, ':');
+		s = (char *)strchr(buf+2, ':');
 
 		/* Verify that colon */
 		if (!s) return (PARSE_ERROR_GENERIC);
@@ -1178,7 +1178,7 @@
 	if (buf[0] == 'N')
 	{
 		/* Find the colon before the name */
-		s = strchr(buf+2, ':');
+		s = (char *)strchr(buf+2, ':');
 
 		/* Verify that colon */
 		if (!s) return (PARSE_ERROR_GENERIC);
@@ -1369,7 +1369,7 @@
 	if (buf[0] == 'N')
 	{
 		/* Find the colon before the name */
-		s = strchr(buf+2, ':');
+		s = (char *)strchr(buf+2, ':');
 
 		/* Verify that colon */
 		if (!s) return (PARSE_ERROR_GENERIC);
@@ -1521,10 +1521,10 @@
 			k_ptr->locale[i] = atoi(s+1);
 
 			/* Find the slash */
-			t = strchr(s+1, '/');
+			t = (char *)strchr(s+1, '/');
 
 			/* Find the next colon */
-			s = strchr(s+1, ':');
+			s = (char *)strchr(s+1, ':');
 
 			/* If the slash is "nearby", use it */
 			if (t && (!s || t < s))
@@ -1682,7 +1682,7 @@
 	if (buf[0] == 'N')
 	{
 		/* Find the colon before the name */
-		s = strchr(buf+2, ':');
+		s = (char *)strchr(buf+2, ':');
 
 		/* Verify that colon */
 		if (!s) return (PARSE_ERROR_GENERIC);
@@ -1830,7 +1830,7 @@
 		if (!a_ptr) return (PARSE_ERROR_MISSING_RECORD_HEADER);
 
 		/* Find the colon before the name */
-		s = strchr(buf + 2, ':');
+		s = (char *)strchr(buf + 2, ':');
 
 		/* Verify that colon */
 		if (!s) return (PARSE_ERROR_GENERIC);
@@ -2007,7 +2007,7 @@
 	if (buf[0] == 'N')
 	{
 		/* Find the colon before the name */
-		s = strchr(buf+2, ':');
+		s = (char *)strchr(buf+2, ':');
 
 		/* Verify that colon */
 		if (!s) return (PARSE_ERROR_GENERIC);
@@ -2262,7 +2262,7 @@
 	if (buf[0] == 'N')
 	{
 		/* Find the colon before the name */
-		s = strchr(buf+2, ':');
+		s = (char *)strchr(buf+2, ':');
 
 		/* Verify that colon */
 		if (!s) return (PARSE_ERROR_GENERIC);
@@ -2616,7 +2616,7 @@
 	if (buf[0] == 'N')
 	{
 		/* Find the colon before the name */
-		s = strchr(buf+2, ':');
+		s = (char *)strchr(buf+2, ':');
 
 		/* Verify that colon */
 		if (!s) return (PARSE_ERROR_GENERIC);
@@ -2684,7 +2684,7 @@
 		for (j = 0; j < A_MAX; j++)
 		{
 			/* Find the colon before the subindex */
-			s = strchr(s, ':');
+			s = (char *)strchr(s, ':');
 
 			/* Verify that colon */
 			if (!s) return (PARSE_ERROR_GENERIC);
@@ -2899,7 +2899,7 @@
 	if (buf[0] == 'N')
 	{
 		/* Find the colon before the name */
-		s = strchr(buf+2, ':');
+		s = (char *)strchr(buf+2, ':');
 
 		/* Verify that colon */
 		if (!s) return (PARSE_ERROR_GENERIC);
@@ -2971,7 +2971,7 @@
 		for (j = 0; j < A_MAX; j++)
 		{
 			/* Find the colon before the subindex */
-			s = strchr(s, ':');
+			s = (char *)strchr(s, ':');
 
 			/* Verify that colon */
 			if (!s) return (PARSE_ERROR_GENERIC);
@@ -3309,7 +3309,7 @@
 	if (buf[0] == 'N')
 	{
 		/* Find the colon before the subindex */
-		s = strchr(buf+2, ':');
+		s = (char *)strchr(buf+2, ':');
 
 		/* Verify that colon */
 		if (!s) return (PARSE_ERROR_GENERIC);
@@ -3321,7 +3321,7 @@
 		i = atoi(buf+2);
 
 		/* Find the colon before the name */
-		t = strchr(s, ':');
+		t = (char *)strchr(s, ':');
 
 		/* Verify that colon */
 		if (!t) return (PARSE_ERROR_GENERIC);
@@ -3456,7 +3456,7 @@
 			g_ptr = (byte*)head->info_ptr + i;
 
 			/* Find the colon before the subindex */
-			s = strchr(s, ':');
+			s = (char *)strchr(s, ':');
 
 			/* Verify that colon */
 			if (!s) return (PARSE_ERROR_GENERIC);
@@ -3499,7 +3499,7 @@
 	if (buf[0] == 'N')
 	{
 		/* Find the colon before the name */
-		s = strchr(buf+2, ':');
+		s = (char *)strchr(buf+2, ':');
 
 		/* Verify that colon */
 		if (!s) return (PARSE_ERROR_GENERIC);
diff -ur old/main-mac.c src/main-mac.c
--- old/main-mac.c	Fri Jun 10 15:46:49 2005
+++ src/main-mac.c	Fri Jun 10 16:53:38 2005
@@ -259,6 +259,9 @@
 # include <EPPC.h>
 #endif /* !ANGBAND_LITE_MAC */
 
+#ifdef JP
+#include <Script.h>
+#endif
 
 #ifdef ANGBAND_LITE_MAC
 
@@ -1471,7 +1474,11 @@
 				}
 
 				/* Notify error */
+#ifdef JP
+				plog("サウンドチャンネルを初期化出来ません!");
+#else
 				plog("Cannot initialise sound channels!");
+#endif
 
 				/* Cancel request */
 				use_sound = arg_sound = FALSE;
@@ -1867,7 +1874,11 @@
 		if ((graf_mode_req != GRAF_MODE_NONE) && (globe_init() != 0))
 		{
 			/* Oops */
+#ifdef JP
+			plog("グラフィックを初期化出来ません!");
+#else
 			plog("Cannot initialize graphics!");
+#endif
 
 			/* reject request */
 			graf_mode_req = GRAF_MODE_NONE;
@@ -2313,6 +2324,21 @@
 			/* Move to the correct location */
 			MoveTo(xp, yp);
 
+#ifdef JP
+			if (iskanji(c))
+			{
+				/* Double width rectangle */
+				dst_r.right += td->tile_wid;
+
+				/* Draw the character */
+				DrawText(cp, i, 2);
+				
+				i++;
+
+				dst_r.left += td->tile_wid;
+			}
+			else
+#endif
 			/* Draw the character */
 			DrawChar(c);
 
@@ -2656,7 +2682,13 @@
 	short fid;
 
 	/* Default to Monaco font */
+#ifdef JP
+	/* Default to 等幅明朝 font (Japanese) */
+	GetFNum( "\p等幅明朝", &fid);
+  	SetFScaleDisable( true );
+#else
 	GetFNum("\pmonaco", &fid);
+#endif
 
 	/* Wipe it */
 	WIPE(td, term_data);
@@ -5245,13 +5277,25 @@
 		if (0 == fd_close(fd_open(path, O_RDONLY))) break;
 
 		/* Warning */
+#ifdef JP
+		plog_fmt("'%s' ファイルをオープン出来ません.", path);
+#else
 		plog_fmt("Unable to open the '%s' file.", path);
+#endif
 
 		/* Warning */
+#ifdef JP
+		plog("NPPAngbandの'lib'フォルダが存在しないか正しく無い可能性があります.");
+#else
 		plog("The Angband 'lib' folder is probably missing or misplaced.");
+#endif
 
 		/* Warning */
+#ifdef JP
+		plog("Please 'open' any file in any sub-folder of the 'lib' folder.");
+#else
 		plog("Please 'open' any file in any sub-folder of the 'lib' folder.");
+#endif
 
 		/* Allow "text" files */
 		types[0] = 'TEXT';
@@ -5451,6 +5495,10 @@
 	/* Initialise cursor and turn it from a "watch" to an "arrow" */
 	InitCursor();
 
+#ifdef JP
+	KeyScript(smRoman);
+#endif
+
 #ifdef ANGBAND_LITE_MAC
 
 	/* Nothing */
@@ -5618,7 +5666,11 @@
 	{
 		/* Prompt the user */
 		/* In [Z], it's currently prtf(17, 23, <msg>); */
+#ifdef JP
+		prt("'ファイル'メニューより'新規'または'開く...'を選択してください。", 23, 10);
+#else
 		prt("[Choose 'New' or 'Open' from the 'File' menu]", 23, 15);
+#endif
 
 		/* Flush the prompt */
 		Term_fresh();
Only in src/: obj-68k
Only in src/: obj-ppc
Only in src/: out