X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcmd4.c;h=e0f5397df71fb0844e50d344fe24b52d18f9676b;hb=3745f703078b3622802d35bbbef074179d612ae6;hp=09587d5d85db063ee62ca96d5dce1cbe9ebd8db6;hpb=70d8da47fe2992c60bd214d8111d0595f6b5ea2f;p=hengband%2Fhengband.git

diff --git a/src/cmd4.c b/src/cmd4.c
index 09587d5d8..e0f5397df 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -41,6 +41,14 @@
 
 #include "angband.h"
 #include "cmd-pet.h"
+#include "world.h"
+#include "player-status.h"
+#include "sort.h"
+#include "mutation.h"
+#include "quest.h"
+#include "store.h"
+#include "artifact.h"
+#include "avatar.h"
 
 
 /*
@@ -56,7 +64,7 @@ static char auto_dump_footer[] = "# ^^^^^^^== %s ==^^^^^^^";
  * Variables for auto dump
  */
 static FILE *auto_dump_stream;
-static cptr auto_dump_mark;
+static concptr auto_dump_mark;
 static int auto_dump_line_num;
 
 
@@ -65,7 +73,7 @@ static int auto_dump_line_num;
  * Remove old lines automatically generated before.
  * @param orig_file 消去を行うファイル名
  */
-static void remove_auto_dump(cptr orig_file)
+static void remove_auto_dump(concptr orig_file)
 {
 	FILE *tmp_fff, *orig_fff;
 
@@ -227,9 +235,9 @@ static void remove_auto_dump(cptr orig_file)
  * Dump a formatted line, using "vstrnfmt()".
  * @param fmt 出力内容
  */
-static void auto_dump_printf(cptr fmt, ...)
+static void auto_dump_printf(concptr fmt, ...)
 {
-	cptr p;
+	concptr p;
 	va_list vp;
 
 	char buf[1024];
@@ -261,7 +269,7 @@ static void auto_dump_printf(cptr fmt, ...)
  * @param mark 出力するヘッダマーク
  * @return ファイルポインタを取得できたらTRUEを返す
  */
-static bool open_auto_dump(cptr buf, cptr mark)
+static bool open_auto_dump(concptr buf, concptr mark)
 {
 
 	char header_mark_str[80];
@@ -334,7 +342,7 @@ static void close_auto_dump(void)
  * @param num number
  * @return pointer of suffix string.
  */
-cptr get_ordinal_number_suffix(int num)
+concptr get_ordinal_number_suffix(int num)
 {
 	num = ABS(num) % 100;
 	switch (num % 10)
@@ -360,16 +368,16 @@ cptr get_ordinal_number_suffix(int num)
  * @param note 日記内容のIDに応じた文字列参照ポインタ
  * @return エラーID
  */
-errr do_cmd_write_nikki(int type, int num, cptr note)
+errr do_cmd_write_nikki(int type, int num, concptr note)
 {
 	int day, hour, min;
 	FILE *fff = NULL;
-	char file_name[80];
+	GAME_TEXT file_name[MAX_NLEN];
 	char buf[1024];
-	cptr note_level = "";
+	concptr note_level = "";
 	bool do_level = TRUE;
 	char note_level_buf[40];
-	int q_idx;
+	QUEST_IDX q_idx;
 
 	static bool disable_nikki = FALSE;
 
@@ -383,7 +391,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 	    type == NIKKI_RAND_QUEST_F ||
 	    type == NIKKI_TO_QUEST)
 	{
-		IDX old_quest;
+		QUEST_IDX old_quest;
 
 		old_quest = p_ptr->inside_quest;
 		p_ptr->inside_quest = (quest[num].type == QUEST_TYPE_RANDOM) ? 0 : num;
@@ -490,7 +498,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 		}
 		case NIKKI_RAND_QUEST_C:
 		{
-			char name[80];
+			GAME_TEXT name[MAX_NLEN];
 			strcpy(name, r_name+r_info[quest[num].r_idx].name);
 			fprintf(fff, _(" %2d:%02d %20s ランダムクエスト(%s)を達成した。\n",
 						   " %2d:%02d %20s completed random quest '%s'\n"), hour, min, note_level, name);
@@ -498,7 +506,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 		}
 		case NIKKI_RAND_QUEST_F:
 		{
-			char name[80];
+			GAME_TEXT name[MAX_NLEN];
 			strcpy(name, r_name+r_info[quest[num].r_idx].name);
 			fprintf(fff, _(" %2d:%02d %20s ランダムクエスト(%s)から逃げ出した。\n",
 						   " %2d:%02d %20s ran away from quest '%s'.\n"), hour, min, note_level, name);
@@ -522,7 +530,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 		}
 		case NIKKI_STAIR:
 		{
-			cptr to;
+			concptr to;
 			if (q_idx && (is_fixed_quest_idx(q_idx)
 			     && !((q_idx == QUEST_OBERON) || (q_idx == QUEST_SERPENT))))
 			{
@@ -596,7 +604,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 		}
 		case NIKKI_WIZ_TELE:
 		{
-			cptr to;
+			concptr to;
 			if (!dun_level)
 				to = _("地上", "the surface");
 			else
@@ -608,7 +616,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 		}
 		case NIKKI_PAT_TELE:
 		{
-			cptr to;
+			concptr to;
 			if (!dun_level)
 				to = _("地上", "the surface");
 			else
@@ -721,7 +729,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 static void do_cmd_disp_nikki(void)
 {
 	char nikki_title[256];
-	char file_name[80];
+	GAME_TEXT file_name[MAX_NLEN];
 	char buf[1024];
 	char tmp[80];
 #ifdef JP
@@ -803,11 +811,9 @@ static void do_cmd_disp_nikki(void)
 	else strcpy(tmp,subtitle[randint0(MAX_SUBTITLE-2)+1]);
 
 #ifdef JP
-	sprintf(nikki_title, "「%s%s%sの伝説 -%s-」",
-		ap_ptr->title, ap_ptr->no ? "の" : "", p_ptr->name, tmp);
+	sprintf(nikki_title, "「%s%s%sの伝説 -%s-」", ap_ptr->title, ap_ptr->no ? "の" : "", p_ptr->name, tmp);
 #else
-	sprintf(nikki_title, "Legend of %s %s '%s'",
-		ap_ptr->title, p_ptr->name, tmp);
+	sprintf(nikki_title, "Legend of %s %s '%s'", ap_ptr->title, p_ptr->name, tmp);
 #endif
 
 	/* Display the file contents */
@@ -858,7 +864,7 @@ static void do_cmd_last_get(void)
  */
 static void do_cmd_erase_nikki(void)
 {
-	char file_name[80];
+	GAME_TEXT file_name[MAX_NLEN];
 	char buf[256];
 	FILE *fff = NULL;
 
@@ -891,14 +897,11 @@ void do_cmd_nikki(void)
 
 	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
-
-	/* Save the screen */
 	screen_save();
 
 	/* Interact until done */
 	while (1)
 	{
-		/* Clear screen */
 		Term_clear();
 
 		/* Ask for a choice */
@@ -918,7 +921,6 @@ void do_cmd_nikki(void)
 		/* Prompt */
 		i = inkey();
 
-		/* Done */
 		if (i == ESCAPE) break;
 
 		switch (i)
@@ -943,11 +945,8 @@ void do_cmd_nikki(void)
 			bell();
 		}
 
-		/* Flush messages */
-		msg_print(NULL);
+		msg_erase();
 	}
-
-	/* Restore the screen */
 	screen_load();
 }
 
@@ -969,45 +968,27 @@ void do_cmd_nikki(void)
 void do_cmd_redraw(void)
 {
 	int j;
-
 	term *old = Term;
 
 
 	/* Hack -- react to changes */
 	Term_xtra(TERM_XTRA_REACT, 0);
 
-
 	/* Combine and Reorder the pack (later) */
-	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-
-	/* Update torch */
+	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 	p_ptr->update |= (PU_TORCH);
-
-	/* Update stuff */
 	p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
-
-	/* Forget lite/view */
 	p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
-
-	/* Update lite/view */
 	p_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE);
-
-	/* Update monsters */
 	p_ptr->update |= (PU_MONSTERS);
 
-	/* Redraw everything */
 	p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
-
-	/* Window stuff */
 	p_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT);
 
 	update_playtime();
 
-	/* Hack -- update */
 	handle_stuff();
 
 	if (p_ptr->prace == RACE_ANDROID) calc_android_exp();
@@ -1021,14 +1002,8 @@ void do_cmd_redraw(void)
 
 		/* Activate */
 		Term_activate(angband_term[j]);
-
-		/* Redraw */
 		Term_redraw();
-
-		/* Refresh */
 		Term_fresh();
-
-		/* Restore */
 		Term_activate(old);
 	}
 }
@@ -1047,8 +1022,6 @@ void do_cmd_change_name(void)
 
 	char	tmp[160];
 
-
-	/* Save the screen */
 	screen_save();
 
 	/* Forever */
@@ -1108,21 +1081,14 @@ void do_cmd_change_name(void)
 		{
 			mode++;
 		}
-
-		/* Oops */
 		else
 		{
 			bell();
 		}
 
-		/* Flush messages */
-		msg_print(NULL);
+		msg_erase();
 	}
-
-	/* Restore the screen */
 	screen_load();
-
-	/* Redraw everything */
 	p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
 
 	handle_stuff();
@@ -1136,7 +1102,7 @@ void do_cmd_change_name(void)
  */
 void do_cmd_message_one(void)
 {
-	/* Recall one message XXX XXX XXX */
+	/* Recall one message */
 	prt(format("> %s", message_str(0)), 0, 0);
 }
 
@@ -1169,11 +1135,10 @@ void do_cmd_messages(int num_now)
 	char shower_str[81];
 	char finder_str[81];
 	char back_str[81];
-	cptr shower = NULL;
+	concptr shower = NULL;
 	int wid, hgt;
 	int num_lines;
 
-	/* Get size */
 	Term_get_size(&wid, &hgt);
 
 	/* Number of message lines in a screen */
@@ -1190,11 +1155,7 @@ void do_cmd_messages(int num_now)
 
 	/* Start on first message */
 	i = 0;
-
-	/* Save the screen */
 	screen_save();
-
-	/* Clear screen */
 	Term_clear();
 
 	/* Process requests until done */
@@ -1206,7 +1167,7 @@ void do_cmd_messages(int num_now)
 		/* Dump up to 20 lines of messages */
 		for (j = 0; (j < num_lines) && (i + j < n); j++)
 		{
-			cptr msg = message_str(i+j);
+			concptr msg = message_str(i+j);
 
 			/* Dump the messages, bottom to top */
 			c_prt((i + j < num_now ? TERM_WHITE : TERM_SLATE), msg, num_lines + 1 - j, 0);
@@ -1214,7 +1175,7 @@ void do_cmd_messages(int num_now)
 			/* Hilite "shower" */
 			if (shower && shower[0])
 			{
-				cptr str = msg;
+				concptr str = msg;
 
 				/* Display matches */
 				while ((str = my_strstr(str, shower)) != NULL)
@@ -1236,7 +1197,7 @@ void do_cmd_messages(int num_now)
 			Term_erase(0, num_lines + 1 - j, 255);
 		}
 
-		/* Display header XXX XXX XXX */
+		/* Display header */
 		/* translation */
 		prt(format(_("以前のメッセージ %d-%d 全部で(%d)", "Message Recall (%d-%d of %d)"),
 			   i, i + j - 1, n), 0, 0);
@@ -1245,7 +1206,6 @@ void do_cmd_messages(int num_now)
 		prt(_("[ 'p' で更に古いもの, 'n' で更に新しいもの, '/' で検索, ESC で中断 ]",
 			  "[Press 'p' for older, 'n' for newer, ..., or ESCAPE]"), hgt - 1, 0);
 
-		/* Get a command */
 		skey = inkey_special(TRUE);
 
 		/* Exit on Escape */
@@ -1270,7 +1230,6 @@ void do_cmd_messages(int num_now)
 			}
 			else strcpy(shower_str, back_str);
 
-			/* Okay */
 			continue;
 
 		/* Hack -- handle find */
@@ -1301,7 +1260,7 @@ void do_cmd_messages(int num_now)
 				/* Scan messages */
 				for (z = i + 1; z < n; z++)
 				{
-					cptr msg = message_str(z);
+					concptr msg = message_str(z);
 
 					/* Search for it */
 					if (my_strstr(msg, finder_str))
@@ -1309,7 +1268,6 @@ void do_cmd_messages(int num_now)
 						/* New location */
 						i = z;
 
-						/* Done */
 						break;
 					}
 				}
@@ -1377,8 +1335,6 @@ void do_cmd_messages(int num_now)
 		/* Hack -- Error of some kind */
 		if (i == j) bell();
 	}
-
-	/* Restore the screen */
 	screen_load();
 }
 
@@ -1389,13 +1345,11 @@ void do_cmd_messages(int num_now)
  * @param info 表示メッセージ
  * @return なし
  */
-static void do_cmd_options_cheat(cptr info)
+static void do_cmd_options_cheat(concptr info)
 {
 	char	ch;
 	int		i, k = 0, n = CHEAT_MAX;
 	char	buf[80];
-
-	/* Clear screen */
 	Term_clear();
 
 	/* Interact with the player */
@@ -1403,7 +1357,7 @@ static void do_cmd_options_cheat(cptr info)
 	{
 		DIRECTION dir;
 
-		/* Prompt XXX XXX XXX */
+		/* Prompt */
 		sprintf(buf, _("%s ( リターンで次へ, y/n でセット, ESC で決定 )", "%s (RET to advance, y/n to set, ESC to accept) "), info);
 
 		prt(buf, 0, 0);
@@ -1539,22 +1493,18 @@ static s16b toggle_frequency(s16b current)
  * @param info 表示メッセージ
  * @return なし
  */
-static void do_cmd_options_autosave(cptr info)
+static void do_cmd_options_autosave(concptr info)
 {
-	char	ch;
-
-	int     i, k = 0, n = 2;
-
-	char	buf[80];
-
+	char ch;
+	int i, k = 0, n = 2;
+	char buf[80];
 
-	/* Clear screen */
 	Term_clear();
 
 	/* Interact with the player */
 	while (TRUE)
 	{
-		/* Prompt XXX XXX XXX */
+		/* Prompt */
 		sprintf(buf, _("%s ( リターンで次へ, y/n でセット, F で頻度を入力, ESC で決定 ) ", 
 					   "%s (RET to advance, y/n to set, 'F' for frequency, ESC to accept) "), info);
 
@@ -1570,9 +1520,9 @@ static void do_cmd_options_autosave(cptr info)
 
 			/* Display the option text */
 			sprintf(buf, "%-48s: %s (%s)",
-			    autosave_info[i].o_desc,
-			    (*autosave_info[i].o_var ? _("はい  ", "yes") : _("いいえ", "no ")),
-			    autosave_info[i].o_text);
+				autosave_info[i].o_desc,
+				(*autosave_info[i].o_var ? _("はい  ", "yes") : _("いいえ", "no ")),
+				autosave_info[i].o_text);
 			c_prt(a, buf, i + 2, 0);
 		}
 		prt(format(_("自動セーブの頻度： %d ターン毎", "Timed autosave frequency: every %d turns"),  autosave_freq), 5, 0);
@@ -1658,7 +1608,7 @@ static void do_cmd_options_autosave(cptr info)
  * @param info 表示メッセージ
  * @return なし
  */
-void do_cmd_options_aux(int page, cptr info)
+void do_cmd_options_aux(int page, concptr info)
 {
 	char    ch;
 	int     i, k = 0, n = 0, l;
@@ -1677,9 +1627,6 @@ void do_cmd_options_aux(int page, cptr info)
 		/* Notice options on this "page" */
 		if (option_info[i].o_page == page) opt[n++] = i;
 	}
-
-
-	/* Clear screen */
 	Term_clear();
 
 	/* Interact with the player */
@@ -1687,7 +1634,7 @@ void do_cmd_options_aux(int page, cptr info)
 	{
 		DIRECTION dir;
 
-		/* Prompt XXX XXX XXX */
+		/* Prompt */
 		sprintf(buf, _("%s (リターン:次, %sESC:終了, ?:ヘルプ) ", "%s (RET:next, %s, ?:help) "),
 					info, browse_only ? _("", "ESC:exit") : _("y/n:変更, ", "y/n:change, ESC:accept"));
 		prt(buf, 0, 0);
@@ -1824,14 +1771,12 @@ static void do_cmd_options_win(void)
 		old_flag[j] = window_flag[j];
 	}
 
-
-	/* Clear screen */
 	Term_clear();
 
 	/* Interact */
 	while (go)
 	{
-		/* Prompt XXX XXX XXX */
+		/* Prompt */
 		prt(_("ウィンドウ・フラグ (<方向>で移動, tでチェンジ, y/n でセット, ESC)", "Window Flags (<dir>, t, y, n, ESC) "), 0, 0);
 
 		/* Display the windows */
@@ -1839,7 +1784,7 @@ static void do_cmd_options_win(void)
 		{
 			byte a = TERM_WHITE;
 
-			cptr s = angband_term_name[j];
+			concptr s = angband_term_name[j];
 
 			/* Use color */
 			if (j == x) a = TERM_L_BLUE;
@@ -1853,7 +1798,7 @@ static void do_cmd_options_win(void)
 		{
 			byte a = TERM_WHITE;
 
-			cptr str = window_flag_desc[i];
+			concptr str = window_flag_desc[i];
 
 			/* Use color */
 			if (i == y) a = TERM_L_BLUE;
@@ -1966,14 +1911,8 @@ static void do_cmd_options_win(void)
 
 		/* Activate */
 		Term_activate(angband_term[j]);
-
-		/* Erase */
 		Term_clear();
-
-		/* Refresh */
 		Term_fresh();
-
-		/* Restore */
 		Term_activate(old);
 	}
 }
@@ -1985,7 +1924,7 @@ static void do_cmd_options_win(void)
 static struct opts
 {
 	char key;
-	cptr name;
+	concptr name;
 	int row;
 }
 option_fields[OPT_NUM] =
@@ -2043,10 +1982,8 @@ option_fields[OPT_NUM] =
 void do_cmd_options(void)
 {
 	char k;
-	int i, d, skey;
-	int y = 0;
-
-	/* Save the screen */
+	int d, skey;
+	TERM_LEN i, y = 0;
 	screen_save();
 
 	/* Interact */
@@ -2056,8 +1993,6 @@ void do_cmd_options(void)
 
 		/* Does not list cheat option when cheat option is off */
 		if (!p_ptr->noscore && !allow_debug_opts) n--;
-
-		/* Clear screen */
 		Term_clear();
 
 		/* Why are we here */
@@ -2311,18 +2246,14 @@ void do_cmd_options(void)
 			/* Unknown option */
 			default:
 			{
-				/* Oops */
 				bell();
 				break;
 			}
 		}
 
-		/* Flush messages */
-		msg_print(NULL);
+		msg_erase();
 	}
 
-
-	/* Restore the screen */
 	screen_load();
 
 	/* Hack - Redraw equippy chars */
@@ -2336,7 +2267,7 @@ void do_cmd_options(void)
  * Ask for a "user pref line" and process it
  * @return なし
  * @details
- * XXX XXX XXX Allow absolute file names?
+ * Allow absolute file names?
  */
 void do_cmd_pref(void)
 {
@@ -2370,9 +2301,9 @@ void do_cmd_reload_autopick(void)
  * @param fname ファイル名
  * @return なし
  */
-static errr macro_dump(cptr fname)
+static errr macro_dump(concptr fname)
 {
-	static cptr mark = "Macro Dump";
+	static concptr mark = "Macro Dump";
 
 	int i;
 
@@ -2435,7 +2366,6 @@ static void do_cmd_macro_aux(char *buf)
 	int n = 0;
 	char tmp[1024];
 
-	/* Flush */
 	flush();
 
 	/* Do not process macros */
@@ -2463,10 +2393,8 @@ static void do_cmd_macro_aux(char *buf)
 	/* Terminate */
 	buf[n] = '\0';
 
-	/* Flush */
 	flush();
 
-
 	/* Convert the trigger */
 	ascii_to_text(tmp, buf);
 
@@ -2484,31 +2412,25 @@ static void do_cmd_macro_aux(char *buf)
  * @details
  * <pre>
  * Note that both "flush()" calls are extremely important.  This may
- * no longer be true, since "util.c" is much simpler now.  XXX XXX XXX
+ * no longer be true, since "util.c" is much simpler now.  
  * </pre>
  */
 static void do_cmd_macro_aux_keymap(char *buf)
 {
 	char tmp[1024];
 
-
-	/* Flush */
 	flush();
 
-
 	/* Get a key */
 	buf[0] = inkey();
 	buf[1] = '\0';
 
-
 	/* Convert to ascii */
 	ascii_to_text(tmp, buf);
 
 	/* Hack -- display the trigger */
 	Term_addstr(-1, TERM_WHITE, tmp);
 
-
-	/* Flush */
 	flush();
 }
 
@@ -2520,9 +2442,9 @@ static void do_cmd_macro_aux_keymap(char *buf)
  * @return エラーコード
  * @details
  */
-static errr keymap_dump(cptr fname)
+static errr keymap_dump(concptr fname)
 {
-	static cptr mark = "Keymap Dump";
+	static concptr mark = "Keymap Dump";
 	int i;
 
 	char key[1024];
@@ -2558,7 +2480,7 @@ static errr keymap_dump(cptr fname)
 	/* Dump them */
 	for (i = 0; i < 256; i++)
 	{
-		cptr act;
+		concptr act;
 
 		/* Loop up the keymap */
 		act = keymap_act[mode][i];
@@ -2595,7 +2517,7 @@ static errr keymap_dump(cptr fname)
  * <pre>
  * Note that the macro "action" must be defined before the trigger.
  *
- * Could use some helpful instructions on this page.  XXX XXX XXX
+ * Could use some helpful instructions on this page.  
  * </pre>
  */
 void do_cmd_macros(void)
@@ -2624,18 +2546,13 @@ void do_cmd_macros(void)
 	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
 
-
-	/* Save screen */
 	screen_save();
 
 
 	/* Process requests until done */
 	while (1)
 	{
-		/* Clear screen */
 		Term_clear();
-
-		/* Describe */
 		prt(_("[ マクロの設定 ]", "Interact with Macros"), 2, 0);
 
 		/* Describe that action */
@@ -2665,7 +2582,6 @@ void do_cmd_macros(void)
 		/* Prompt */
 		prt(_("コマンド: ", "Command: "), 16, 0);
 
-		/* Get a command */
 		i = inkey();
 
 		/* Leave */
@@ -2854,7 +2770,7 @@ void do_cmd_macros(void)
 		/* Query a keymap */
 		else if (i == '7')
 		{
-			cptr act;
+			concptr act;
 
 			/* Prompt */
 			prt(_("コマンド: キー配置の確認", "Command: Query a keymap"), 16, 0);
@@ -2984,25 +2900,20 @@ void do_cmd_macros(void)
 
 #endif /* ALLOW_MACROS */
 
-		/* Oops */
 		else
 		{
-			/* Oops */
 			bell();
 		}
 
-		/* Flush messages */
-		msg_print(NULL);
+		msg_erase();
 	}
-
-	/* Load screen */
 	screen_load();
 }
 
 /*!
  * @brief キャラクタ色の明暗表現
  */
-static cptr lighting_level_str[F_LIT_MAX] =
+static concptr lighting_level_str[F_LIT_MAX] =
 {
 #ifdef JP
 	"標準色",
@@ -3052,7 +2963,7 @@ static bool cmd_visuals_aux(int i, IDX *num, IDX max)
  * @param choice_msg 選択メッセージ
  * @return なし
  */
-static void print_visuals_menu(cptr choice_msg)
+static void print_visuals_menu(concptr choice_msg)
 {
 	prt(_("[ 画面表示の設定 ]", "Interact with Visuals"), 1, 0);
 	
@@ -3090,20 +3001,17 @@ void do_cmd_visuals(void)
 	char tmp[160];
 	char buf[1024];
 	bool need_redraw = FALSE;
-	const char *empty_symbol = "<< ? >>";
+	concptr empty_symbol = "<< ? >>";
 
 	if (use_bigtile) empty_symbol = "<< ?? >>";
 
 	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
-
-	/* Save the screen */
 	screen_save();
 
 	/* Interact until done */
 	while (1)
 	{
-		/* Clear screen */
 		Term_clear();
 
 		/* Ask for a choice */
@@ -3112,7 +3020,6 @@ void do_cmd_visuals(void)
 		/* Prompt */
 		i = inkey();
 
-		/* Done */
 		if (i == ESCAPE) break;
 
 		switch (i)
@@ -3142,7 +3049,7 @@ void do_cmd_visuals(void)
 		/* Dump monster attr/chars */
 		case '1':
 		{
-			static cptr mark = "Monster attr/chars";
+			static concptr mark = "Monster attr/chars";
 
 			/* Prompt */
 			prt(_("コマンド: モンスターの[色/文字]をファイルに書き出します", "Command: Dump monster attr/chars"), 15, 0);
@@ -3184,7 +3091,6 @@ void do_cmd_visuals(void)
 			/* Close */
 			close_auto_dump();
 
-			/* Message */
 			msg_print(_("モンスターの[色/文字]をファイルに書き出しました。", "Dumped monster attr/chars."));
 
 			break;
@@ -3193,8 +3099,8 @@ void do_cmd_visuals(void)
 		/* Dump object attr/chars */
 		case '2':
 		{
-			static cptr mark = "Object attr/chars";
-			IDX k_idx;
+			static concptr mark = "Object attr/chars";
+			KIND_OBJECT_IDX k_idx;
 
 			/* Prompt */
 			prt(_("コマンド: アイテムの[色/文字]をファイルに書き出します", "Command: Dump object attr/chars"), 15, 0);
@@ -3220,7 +3126,7 @@ void do_cmd_visuals(void)
 			/* Dump objects */
 			for (k_idx = 0; k_idx < max_k_idx; k_idx++)
 			{
-				char o_name[80];
+				GAME_TEXT o_name[MAX_NLEN];
 				object_kind *k_ptr = &k_info[k_idx];
 
 				/* Skip non-entries */
@@ -3253,7 +3159,6 @@ void do_cmd_visuals(void)
 			/* Close */
 			close_auto_dump();
 
-			/* Message */
 			msg_print(_("アイテムの[色/文字]をファイルに書き出しました。", "Dumped object attr/chars."));
 
 			break;
@@ -3262,7 +3167,7 @@ void do_cmd_visuals(void)
 		/* Dump feature attr/chars */
 		case '3':
 		{
-			static cptr mark = "Feature attr/chars";
+			static concptr mark = "Feature attr/chars";
 
 			/* Prompt */
 			prt(_("コマンド: 地形の[色/文字]をファイルに書き出します", "Command: Dump feature attr/chars"), 15, 0);
@@ -3309,7 +3214,6 @@ void do_cmd_visuals(void)
 			/* Close */
 			close_auto_dump();
 
-			/* Message */
 			msg_print(_("地形の[色/文字]をファイルに書き出しました。", "Dumped feature attr/chars."));
 
 			break;
@@ -3318,8 +3222,8 @@ void do_cmd_visuals(void)
 		/* Modify monster attr/chars (numeric operation) */
 		case '4':
 		{
-			static cptr choice_msg = _("モンスターの[色/文字]を変更します", "Change monster attr/chars");
-			static IDX r = 0;
+			static concptr choice_msg = _("モンスターの[色/文字]を変更します", "Change monster attr/chars");
+			static MONRACE_IDX r = 0;
 
 			prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0);
 
@@ -3357,7 +3261,6 @@ void do_cmd_visuals(void)
 				Term_putstr(0, 22, -1, TERM_WHITE, 
 					_("コマンド (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ", "Command (n/N/^N/a/A/^A/c/C/^C/v/V/^V): "));
 
-				/* Get a command */
 				i = inkey();
 
 				/* All done */
@@ -3397,8 +3300,6 @@ void do_cmd_visuals(void)
 					break;
 				case 'v':
 					do_cmd_knowledge_monsters(&need_redraw, TRUE, r);
-
-					/* Clear screen */
 					Term_clear();
 					print_visuals_menu(choice_msg);
 					break;
@@ -3411,7 +3312,7 @@ void do_cmd_visuals(void)
 		/* Modify object attr/chars (numeric operation) */
 		case '5':
 		{
-			static cptr choice_msg = _("アイテムの[色/文字]を変更します", "Change object attr/chars");
+			static concptr choice_msg = _("アイテムの[色/文字]を変更します", "Change object attr/chars");
 			static IDX k = 0;
 			prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0);
 
@@ -3450,7 +3351,6 @@ void do_cmd_visuals(void)
 				Term_putstr(0, 22, -1, TERM_WHITE,
 					    _("コマンド (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ", "Command (n/N/^N/a/A/^A/c/C/^C/v/V/^V): "));
 
-				/* Get a command */
 				i = inkey();
 
 				/* All done */
@@ -3490,8 +3390,6 @@ void do_cmd_visuals(void)
 					break;
 				case 'v':
 					do_cmd_knowledge_objects(&need_redraw, TRUE, k);
-
-					/* Clear screen */
 					Term_clear();
 					print_visuals_menu(choice_msg);
 					break;
@@ -3504,7 +3402,7 @@ void do_cmd_visuals(void)
 		/* Modify feature attr/chars (numeric operation) */
 		case '6':
 		{
-			static cptr choice_msg = _("地形の[色/文字]を変更します", "Change feature attr/chars");
+			static concptr choice_msg = _("地形の[色/文字]を変更します", "Change feature attr/chars");
 			static IDX f = 0;
 			static IDX lighting_level = F_LIT_STANDARD;
 			prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0);
@@ -3555,7 +3453,6 @@ void do_cmd_visuals(void)
 					    "Command (n/N/^N/a/A/^A/c/C/^C/l/L/^L/d/D/^D/v/V/^V): ");
 #endif
 
-				/* Get a command */
 				i = inkey();
 
 				/* All done */
@@ -3602,8 +3499,6 @@ void do_cmd_visuals(void)
 					break;
 				case 'v':
 					do_cmd_knowledge_features(&need_redraw, TRUE, f, &lighting_level);
-
-					/* Clear screen */
 					Term_clear();
 					print_visuals_menu(choice_msg);
 					break;
@@ -3639,7 +3534,6 @@ void do_cmd_visuals(void)
 			/* Reset */
 			reset_visuals();
 
-			/* Message */
 			msg_print(_("画面上の[色/文字]を初期値にリセットしました。", "Visual attr/char tables reset."));
 			need_redraw = TRUE;
 			break;
@@ -3650,11 +3544,8 @@ void do_cmd_visuals(void)
 			break;
 		}
 
-		/* Flush messages */
-		msg_print(NULL);
+		msg_erase();
 	}
-
-	/* Restore the screen */
 	screen_load();
 
 	if (need_redraw) do_cmd_redraw();
@@ -3676,15 +3567,12 @@ void do_cmd_colors(void)
 	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
 
-
-	/* Save the screen */
 	screen_save();
 
 
 	/* Interact until done */
 	while (1)
 	{
-		/* Clear screen */
 		Term_clear();
 
 		/* Ask for a choice */
@@ -3703,7 +3591,6 @@ void do_cmd_colors(void)
 		/* Prompt */
 		i = inkey();
 
-		/* Done */
 		if (i == ESCAPE) break;
 
 		/* Load a 'pref' file */
@@ -3736,7 +3623,7 @@ void do_cmd_colors(void)
 		/* Dump colors */
 		else if (i == '2')
 		{
-			static cptr mark = "Colors";
+			static concptr mark = "Colors";
 
 			/* Prompt */
 			prt(_("コマンド: カラーの設定をファイルに書き出します", "Command: Dump colors"), 8, 0);
@@ -3767,7 +3654,7 @@ void do_cmd_colors(void)
 				int gv = angband_color_table[i][2];
 				int bv = angband_color_table[i][3];
 
-				cptr name = _("未知", "unknown");
+				concptr name = _("未知", "unknown");
 
 				/* Skip non-entries */
 				if (!kv && !rv && !gv && !bv) continue;
@@ -3786,7 +3673,6 @@ void do_cmd_colors(void)
 			/* Close */
 			close_auto_dump();
 
-			/* Message */
 			msg_print(_("カラーの設定をファイルに書き出しました。", "Dumped color redefinitions."));
 		}
 
@@ -3801,7 +3687,7 @@ void do_cmd_colors(void)
 			/* Hack -- query until done */
 			while (1)
 			{
-				cptr name;
+				concptr name;
 				byte j;
 
 				/* Clear */
@@ -3836,8 +3722,6 @@ void do_cmd_colors(void)
 				Term_putstr(0, 14, -1, TERM_WHITE,
 					_("コマンド (n/N/k/K/r/R/g/G/b/B): ", "Command (n/N/k/K/r/R/g/G/b/B): "));
 
-
-				/* Get a command */
 				i = inkey();
 
 				/* All done */
@@ -3871,12 +3755,9 @@ void do_cmd_colors(void)
 			bell();
 		}
 
-		/* Flush messages */
-		msg_print(NULL);
+		msg_erase();
 	}
 
-
-	/* Restore the screen */
 	screen_load();
 }
 
@@ -3907,8 +3788,6 @@ void do_cmd_note(void)
  */
 void do_cmd_version(void)
 {
-	/* Silly message */
-
 #if FAKE_VER_EXTRA > 0
 	msg_format(_("変愚蛮怒(Hengband) %d.%d.%d.%d", "You are playing Hengband %d.%d.%d.%d."),
 		FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH, FAKE_VER_EXTRA);
@@ -3923,7 +3802,7 @@ void do_cmd_version(void)
 /*
  * Array of feeling strings
  */
-static cptr do_cmd_feeling_text[11] =
+static concptr do_cmd_feeling_text[11] =
 {
 	_("この階の雰囲気を感じとれなかった...", "Looks like any other level."),
 	_("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."),
@@ -3938,7 +3817,7 @@ static cptr do_cmd_feeling_text[11] =
 	_("なんて退屈なところだ...", "What a boring place...")
 };
 
-static cptr do_cmd_feeling_text_combat[11] =
+static concptr do_cmd_feeling_text_combat[11] =
 {
 	_("この階の雰囲気を感じとれなかった...", "Looks like any other level."),
 	_("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."),
@@ -3953,7 +3832,7 @@ static cptr do_cmd_feeling_text_combat[11] =
 	_("なんて退屈なところだ...", "What a boring place...")
 };
 
-static cptr do_cmd_feeling_text_lucky[11] =
+static concptr do_cmd_feeling_text_lucky[11] =
 {
 	_("この階の雰囲気を感じとれなかった...", "Looks like any other level."),
 	_("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."),
@@ -3975,6 +3854,8 @@ static cptr do_cmd_feeling_text_lucky[11] =
  */
 void do_cmd_feeling(void)
 {
+	if (p_ptr->wild_mode) return;
+
 	/* No useful feeling in quests */
 	if (p_ptr->inside_quest && !random_quest_number(dun_level))
 	{
@@ -4019,7 +3900,7 @@ void do_cmd_feeling(void)
 /*
  * Description of each monster group.
  */
-static cptr monster_group_text[] = 
+static concptr monster_group_text[] = 
 {
 #ifdef JP
 	"ユニーク",	/* "Uniques" */
@@ -4152,7 +4033,7 @@ static cptr monster_group_text[] =
  * Symbols of monsters in each group. Note the "Uniques" group
  * is handled differently.
  */
-static cptr monster_group_char[] =
+static concptr monster_group_char[] =
 {
 	(char *) -1L,
 	(char *) -2L,
@@ -4256,7 +4137,7 @@ static IDX collect_monsters(IDX grp_cur, IDX mon_idx[], BIT_FLAGS8 mode)
 	int dummy_why;
 
 	/* Get a list of x_char in this group */
-	cptr group_char = monster_group_char[grp_cur];
+	concptr group_char = monster_group_char[grp_cur];
 
 	/* XXX Hack -- Check if this is the "Uniques" group */
 	bool grp_unique = (monster_group_char[grp_cur] == (char *) -1L);
@@ -4345,7 +4226,7 @@ static IDX collect_monsters(IDX grp_cur, IDX mon_idx[], BIT_FLAGS8 mode)
 /*
  * Description of each monster group.
  */
-static cptr object_group_text[] = 
+static concptr object_group_text[] = 
 {
 #ifdef JP
 	"キノコ",	/* "Mushrooms" */
@@ -4496,10 +4377,10 @@ static byte object_group_tval[] =
  * mode & 0x01 : check for non-empty group
  * mode & 0x02 : visual operation only
  */
-static int collect_objects(int grp_cur, IDX object_idx[], BIT_FLAGS8 mode)
+static KIND_OBJECT_IDX collect_objects(int grp_cur, KIND_OBJECT_IDX object_idx[], BIT_FLAGS8 mode)
 {
-	IDX i;
-	int j, k, object_cnt = 0;
+	KIND_OBJECT_IDX i, object_cnt = 0;
+	int j, k;
 
 	/* Get a list of x_char in this group */
 	byte group_tval = object_group_tval[grp_cur];
@@ -4566,7 +4447,7 @@ static int collect_objects(int grp_cur, IDX object_idx[], BIT_FLAGS8 mode)
 /*
  * Description of each feature group.
  */
-static cptr feature_group_text[] = 
+static concptr feature_group_text[] = 
 {
 	"terrains",
 	NULL
@@ -4579,10 +4460,10 @@ static cptr feature_group_text[] =
  *
  * mode & 0x01 : check for non-empty group
  */
-static int collect_features(int grp_cur, IDX *feat_idx, BIT_FLAGS8 mode)
+static FEAT_IDX collect_features(int grp_cur, FEAT_IDX *feat_idx, BIT_FLAGS8 mode)
 {
-	IDX i;
-	int feat_cnt = 0;
+	FEAT_IDX i;
+	FEAT_IDX feat_cnt = 0;
 
 	/* Unused;  There is a single group. */
 	(void)grp_cur;
@@ -4666,18 +4547,14 @@ static char hack[17] = "dwsorgbuDWvyRGBU";
  */
 void do_cmd_load_screen(void)
 {
-	int i, y, x;
-
+	int i;
+	TERM_LEN y, x;
 	TERM_COLOR a = 0;
-	char c = ' ';
-
+	SYMBOL_CODE c = ' ';
 	bool okay = TRUE;
-
 	FILE *fff;
-
 	char buf[1024];
-
-	int wid, hgt;
+	TERM_LEN wid, hgt;
 
 	Term_get_size(&wid, &hgt);
 
@@ -4687,21 +4564,15 @@ void do_cmd_load_screen(void)
 	/* Append to the file */
 	fff = my_fopen(buf, "r");
 
-	/* Oops */
 	if (!fff) {
 		msg_format(_("%s を開くことができませんでした。", "Failed to open %s."), buf);
 		msg_print(NULL);
 		return;
 	}
 
-
-	/* Save the screen */
 	screen_save();
-
-	/* Clear the screen */
 	Term_clear();
 
-
 	/* Load the screen */
 	for (y = 0; okay; y++)
 	{
@@ -4758,26 +4629,21 @@ void do_cmd_load_screen(void)
 		}
 	}
 
-
 	/* Close it */
 	my_fclose(fff);
 
-
-	/* Message */
 	prt(_("ファイルに書き出された画面(記念撮影)をロードしました。", "Screen dump loaded."), 0, 0);
 
 	flush();
 	inkey();
 
-
-	/* Restore the screen */
 	screen_load();
 }
 
 
 
 
-cptr inven_res_label = _("                               酸電火冷毒光闇破轟獄因沌劣 盲怖乱痺透命感消復浮",
+concptr inven_res_label = _("                               酸電火冷毒光闇破轟獄因沌劣 盲怖乱痺透命感消復浮",
 						 "                               AcElFiCoPoLiDkShSoNtNxCaDi BlFeCfFaSeHlEpSdRgLv");
 
 
@@ -4798,10 +4664,10 @@ cptr inven_res_label = _("                               酸電火冷毒光闇
 
 
 /* XTRA HACK RESLIST */
-static void do_cmd_knowledge_inven_aux(FILE *fff, object_type *o_ptr, int *j, byte tval, char *where)
+static void do_cmd_knowledge_inven_aux(FILE *fff, object_type *o_ptr, int *j, OBJECT_TYPE_VALUE tval, char *where)
 {
-	char o_name[MAX_NLEN];
-	u32b flgs[TR_FLAG_SIZE];
+	GAME_TEXT o_name[MAX_NLEN];
+	BIT_FLAGS flgs[TR_FLAG_SIZE];
 
 	if (!o_ptr->k_idx) return;
 	if (o_ptr->tval != tval) return;
@@ -4897,16 +4763,13 @@ static void do_cmd_knowledge_inven_aux(FILE *fff, object_type *o_ptr, int *j, by
 static void do_cmd_knowledge_inven(void)
 {
 	FILE *fff;
-
-	char file_name[1024];
-
+	GAME_TEXT file_name[1024];
 	store_type  *st_ptr;
-
-	byte tval;
+	OBJECT_TYPE_VALUE tval;
 	int i = 0;
 	int j = 0;
 
-	char  where[32];
+	char where[32];
 
 	/* Open a new file */
 	fff = my_fopen_temp(file_name, 1024);
@@ -4944,8 +4807,6 @@ static void do_cmd_knowledge_inven(void)
 			do_cmd_knowledge_inven_aux(fff, &st_ptr->stock[i], &j, tval, where);
 		}
 	}
-
-	/* Close the file */
 	my_fclose(fff);
 
 	/* Display the file contents */
@@ -4958,7 +4819,8 @@ static void do_cmd_knowledge_inven(void)
 
 void do_cmd_save_screen_html_aux(char *filename, int message)
 {
-	int y, x, i;
+	TERM_LEN y, x;
+	int i;
 
 	TERM_COLOR a = 0, old_a = 0;
 	char c = ' ';
@@ -4967,25 +4829,25 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 	char buf[2048];
 
 	int yomikomu = 0;
-	cptr tags[4] = {
+	concptr tags[4] = {
 		"HEADER_START:",
 		"HEADER_END:",
 		"FOOTER_START:",
 		"FOOTER_END:",
 	};
 
-	cptr html_head[] = {
+	concptr html_head[] = {
 		"<html>\n<body text=\"#ffffff\" bgcolor=\"#000000\">\n",
 		"<pre>",
 		0,
 	};
-	cptr html_foot[] = {
+	concptr html_foot[] = {
 		"</pre>\n",
 		"</body>\n</html>\n",
 		0,
 	};
 
-	int wid, hgt;
+	TERM_LEN wid, hgt;
 
 	Term_get_size(&wid, &hgt);
 
@@ -4995,7 +4857,6 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 	/* Append to the file */
 	fff = my_fopen(filename, "w");
 
-	/* Oops */
 	if (!fff) {
 		if (message) {
 		    msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), filename);
@@ -5004,10 +4865,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 		
 		return;
 	}
-
-	/* Save the screen */
-	if (message)
-		screen_save();
+	if (message) screen_save();
 
 	/* Build the filename */
 	path_build(buf, sizeof(buf), ANGBAND_DIR_USER, "htmldump.prf");
@@ -5042,7 +4900,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 		for (x = 0; x < wid - 1; x++)
 		{
 			int rv, gv, bv;
-			cptr cc = NULL;
+			concptr cc = NULL;
 			/* Get the attr/char */
 			(void)(Term_what(x, y, &a, &c));
 
@@ -5101,13 +4959,10 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 	/* Close it */
 	my_fclose(fff);
 
-	/* Message */
 	if (message) {
 		msg_print(_("画面(記念撮影)をファイルに書き出しました。", "Screen dump saved."));
 		msg_print(NULL);
 	}
-
-	/* Restore the screen */
 	if (message)
 		screen_load();
 }
@@ -5171,11 +5026,7 @@ void do_cmd_save_screen(void)
 	{
 		use_graphics = FALSE;
 		reset_visuals();
-
-		/* Redraw everything */
 		p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
-
-		/* Hack -- update */
 		handle_stuff();
 	}
 
@@ -5193,13 +5044,10 @@ void do_cmd_save_screen(void)
 	}
 	else /* Dump the screen as text */
 	{
-		int y, x;
-
+		TERM_LEN y, x;
 		TERM_COLOR a = 0;
-		char c = ' ';
-
+		SYMBOL_CODE c = ' ';
 		FILE *fff;
-
 		char buf[1024];
 
 		/* Build the filename */
@@ -5211,7 +5059,6 @@ void do_cmd_save_screen(void)
 		/* Append to the file */
 		fff = my_fopen(buf, "w");
 
-		/* Oops */
 		if (!fff)
 		{
 			msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), buf);
@@ -5219,8 +5066,6 @@ void do_cmd_save_screen(void)
 			return;
 		}
 
-
-		/* Save the screen */
 		screen_save();
 
 
@@ -5271,15 +5116,11 @@ void do_cmd_save_screen(void)
 		/* Skip a line */
 		fprintf(fff, "\n");
 
-
 		/* Close it */
 		my_fclose(fff);
 
-		/* Message */
 		msg_print(_("画面(記念撮影)をファイルに書き出しました。", "Screen dump saved."));
 		msg_print(NULL);
-
-		/* Restore the screen */
 		screen_load();
 	}
 
@@ -5287,11 +5128,7 @@ void do_cmd_save_screen(void)
 	{
 		use_graphics = TRUE;
 		reset_visuals();
-
-		/* Redraw everything */
 		p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
-
-		/* Hack -- update */
 		handle_stuff();
 	}
 }
@@ -5385,19 +5222,16 @@ static void ang_sort_art_swap(vptr u, vptr v, int a, int b)
  */
 static void do_cmd_knowledge_artifacts(void)
 {
-	IDX i;
-	IDX k;
+	ARTIFACT_IDX i;
+	ARTIFACT_IDX k;
 	POSITION x, y;
 	int n = 0;
-	IDX z;
+	ARTIFACT_IDX z;
 	u16b why = 3;
-	IDX *who;
-
+	ARTIFACT_IDX *who;
 	FILE *fff;
-
-	char file_name[1024];
-
-	char base_name[MAX_NLEN];
+	GAME_TEXT file_name[1024];
+	GAME_TEXT base_name[MAX_NLEN];
 
 	bool *okay;
 
@@ -5411,7 +5245,7 @@ static void do_cmd_knowledge_artifacts(void)
 	}
 
 	/* Allocate the "who" array */
-	C_MAKE(who, max_a_idx, s16b);
+	C_MAKE(who, max_a_idx, ARTIFACT_IDX);
 
 	/* Allocate the "okay" array */
 	C_MAKE(okay, max_a_idx, bool);
@@ -5441,14 +5275,12 @@ static void do_cmd_knowledge_artifacts(void)
 		{
 			cave_type *c_ptr = &cave[y][x];
 
-			s16b this_o_idx, next_o_idx = 0;
+			OBJECT_IDX this_o_idx, next_o_idx = 0;
 
 			/* Scan all objects in the grid */
 			for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
 			{
 				object_type *o_ptr;
-
-				/* Acquire object */
 				o_ptr = &o_list[this_o_idx];
 
 				/* Acquire next object */
@@ -5512,8 +5344,6 @@ static void do_cmd_knowledge_artifacts(void)
 		{
 			object_type forge;
 			object_type *q_ptr;
-
-			/* Get local object */
 			q_ptr = &forge;
 
 			/* Create fake object */
@@ -5534,12 +5364,10 @@ static void do_cmd_knowledge_artifacts(void)
 	}
 
 	/* Free the "who" array */
-	C_KILL(who, max_a_idx, s16b);
+	C_KILL(who, max_a_idx, ARTIFACT_IDX);
 
 	/* Free the "okay" array */
 	C_KILL(okay, max_a_idx, bool);
-
-	/* Close the file */
 	my_fclose(fff);
 
 	/* Display the file contents */
@@ -5563,7 +5391,7 @@ static void do_cmd_knowledge_uniques(void)
 
 	FILE *fff;
 
-	char file_name[1024];
+	GAME_TEXT file_name[1024];
 
 	int n_alive[10];
 	int n_alive_surface = 0;
@@ -5578,13 +5406,13 @@ static void do_cmd_knowledge_uniques(void)
 
 	if (!fff)
 	{
-	    msg_format(_("一時ファイル %s を作成できませんでした。", "Failed to create temporary file %s."), file_name);
-	    msg_print(NULL);
-	    return;
+		msg_format(_("一時ファイル %s を作成できませんでした。", "Failed to create temporary file %s."), file_name);
+		msg_print(NULL);
+		return;
 	}
 
 	/* Allocate the "who" array */
-	C_MAKE(who, max_r_idx, s16b);
+	C_MAKE(who, max_r_idx, MONRACE_IDX);
 
 	/* Scan the monsters */
 	for (i = 1; i < max_r_idx; i++)
@@ -5660,14 +5488,11 @@ static void do_cmd_knowledge_uniques(void)
 	{
 		monster_race *r_ptr = &r_info[who[k]];
 
-		/* Print a message */
 		fprintf(fff, _("     %s (レベル%d)\n", "     %s (level %d)\n"), r_name + r_ptr->name, (int)r_ptr->level);
 	}
 
 	/* Free the "who" array */
 	C_KILL(who, max_r_idx, s16b);
-
-	/* Close the file */
 	my_fclose(fff);
 
 	/* Display the file contents */
@@ -5683,12 +5508,13 @@ static void do_cmd_knowledge_uniques(void)
  */
 static void do_cmd_knowledge_weapon_exp(void)
 {
-	int i, num, weapon_exp;
+	int i, num;
+	SUB_EXP weapon_exp;
 	KIND_OBJECT_IDX j;
 
 	FILE *fff;
 
-	char file_name[1024];
+	GAME_TEXT file_name[1024];
 	char tmp[30];
 
 	/* Open a new file */
@@ -5724,8 +5550,6 @@ static void do_cmd_knowledge_weapon_exp(void)
 			}
 		}
 	}
-
-	/* Close the file */
 	my_fclose(fff);
 
 	/* Display the file contents */
@@ -5744,12 +5568,13 @@ static void do_cmd_knowledge_weapon_exp(void)
 static void do_cmd_knowledge_spell_exp(void)
 {
 	SPELL_IDX i = 0;
-	int spell_exp, exp_level;
+	SUB_EXP spell_exp;
+	int exp_level;
 
 	FILE *fff;
 	const magic_type *s_ptr;
 
-	char file_name[1024];
+	GAME_TEXT file_name[1024];
 
 	/* Open a new file */
 	fff = my_fopen_temp(file_name, 1024);
@@ -5814,8 +5639,6 @@ static void do_cmd_knowledge_spell_exp(void)
 			fprintf(fff, "\n");
 		}
 	}
-
-	/* Close the file */
 	my_fclose(fff);
 
 	/* Display the file contents */
@@ -5838,9 +5661,13 @@ static void do_cmd_knowledge_skill_exp(void)
 	FILE *fff;
 
 	char file_name[1024];
-	char skill_name[3][20]={_("マーシャルアーツ", "Martial Arts    "),
-							_("二刀流          ", "Dual Wielding   "), 
-							_("乗馬            ", "Riding          ")};
+	char skill_name[GINOU_TEMPMAX][20] =
+	{
+		_("マーシャルアーツ", "Martial Arts    "),
+		_("二刀流          ", "Dual Wielding   "), 
+		_("乗馬            ", "Riding          "),
+		_("盾              ", "Shield          ")
+	};
 
 	/* Open a new file */
 	fff = my_fopen_temp(file_name, 1024);
@@ -5850,7 +5677,7 @@ static void do_cmd_knowledge_skill_exp(void)
 	    return;
 	}
 
-	for (i = 0; i < 3; i++)
+	for (i = 0; i < GINOU_TEMPMAX; i++)
 	{
 		skill_exp = p_ptr->skill_exp[i];
 		fprintf(fff, "%-20s ", skill_name[i]);
@@ -5860,8 +5687,6 @@ static void do_cmd_knowledge_skill_exp(void)
 		if (cheat_xtra) fprintf(fff, " %d", skill_exp);
 		fprintf(fff, "\n");
 	}
-
-	/* Close the file */
 	my_fclose(fff);
 
 	/* Display the file contents */
@@ -5899,10 +5724,10 @@ void plural_aux(char *Name)
 	}
 	else if (my_strstr(Name, " of "))
 	{
-		cptr aider = my_strstr(Name, " of ");
+		concptr aider = my_strstr(Name, " of ");
 		char dummy[80];
 		int i = 0;
-		cptr ctr = Name;
+		concptr ctr = Name;
 
 		while (ctr < aider)
 		{
@@ -6007,10 +5832,10 @@ static void do_cmd_knowledge_pets(void)
 	int             i;
 	FILE            *fff;
 	monster_type    *m_ptr;
-	char            pet_name[80];
+	GAME_TEXT pet_name[MAX_NLEN];
 	int             t_friends = 0;
 	int             show_upkeep = 0;
-	char            file_name[1024];
+	GAME_TEXT file_name[1024];
 
 
 	/* Open a new file */
@@ -6044,16 +5869,12 @@ static void do_cmd_knowledge_pets(void)
 	fprintf(fff, "----------------------------------------------\n");
 #ifdef JP
 	fprintf(fff, "    合計: %d 体のペット\n", t_friends);
-	fprintf(fff, " 維持コスト: %d%% MP\n", show_upkeep);
 #else
-	fprintf(fff, "   Total: %d pet%s.\n",
-		t_friends, (t_friends == 1 ? "" : "s"));
-	fprintf(fff, "   Upkeep: %d%% mana.\n", show_upkeep);
+	fprintf(fff, "   Total: %d pet%s.\n", t_friends, (t_friends == 1 ? "" : "s"));
 #endif
+	fprintf(fff, _(" 維持コスト: %d%% MP\n", "   Upkeep: %d%% mana.\n"), show_upkeep);
 
 
-
-	/* Close the file */
 	my_fclose(fff);
 
 	/* Display the file contents */
@@ -6068,18 +5889,16 @@ static void do_cmd_knowledge_pets(void)
  * @brief 現在のペットを表示するコマンドのメインルーチン /
  * Total kill count
  * @return なし
- * @note the player ghosts are ignored.  XXX XXX XXX
+ * @note the player ghosts are ignored.  
  */
 static void do_cmd_knowledge_kill_count(void)
 {
-	IDX i;
+	MONRACE_IDX i;
 	int k, n = 0;
 	u16b why = 2;
-	IDX *who;
-
+	MONRACE_IDX *who;
 	FILE *fff;
-
-	char file_name[1024];
+	GAME_TEXT file_name[1024];
 
 	s32b Total = 0;
 
@@ -6088,13 +5907,13 @@ static void do_cmd_knowledge_kill_count(void)
 	fff = my_fopen_temp(file_name, 1024);
 
 	if (!fff) {
-	    msg_format(_("一時ファイル %s を作成できませんでした。", "Failed to create temporary file %s."), file_name);
-	    msg_print(NULL);
-	    return;
+		msg_format(_("一時ファイル %s を作成できませんでした。", "Failed to create temporary file %s."), file_name);
+		msg_print(NULL);
+		return;
 	}
 
 	/* Allocate the "who" array */
-	C_MAKE(who, max_r_idx, s16b);
+	C_MAKE(who, max_r_idx, MONRACE_IDX);
 
 	{
 		/* Monsters slain */
@@ -6163,9 +5982,7 @@ static void do_cmd_knowledge_kill_count(void)
 
 			if (dead)
 			{
-				/* Print a message */
-				fprintf(fff, "     %s\n",
-				    (r_name + r_ptr->name));
+				fprintf(fff, "     %s\n", (r_name + r_ptr->name));
 				Total++;
 			}
 		}
@@ -6212,15 +6029,12 @@ static void do_cmd_knowledge_kill_count(void)
 #ifdef JP
 	fprintf(fff,"    合計: %lu 体を倒した。\n", (unsigned long int)Total);
 #else
-	fprintf(fff,"   Total: %lu creature%s killed.\n",
-		(unsigned long int)Total, (Total == 1 ? "" : "s"));
+	fprintf(fff,"   Total: %lu creature%s killed.\n", (unsigned long int)Total, (Total == 1 ? "" : "s"));
 #endif
 
 
 	/* Free the "who" array */
 	C_KILL(who, max_r_idx, s16b);
-
-	/* Close the file */
 	my_fclose(fff);
 
 	/* Display the file contents */
@@ -6244,8 +6058,7 @@ static void do_cmd_knowledge_kill_count(void)
  * @param grp_top 現在の選択リスト最上部ID
  * @return なし
  */
-static void display_group_list(int col, int row, int wid, int per_page,
-	IDX grp_idx[], cptr group_text[], int grp_cur, int grp_top)
+static void display_group_list(int col, int row, int wid, int per_page, IDX grp_idx[], concptr group_text[], int grp_cur, int grp_top)
 {
 	int i;
 
@@ -6256,7 +6069,7 @@ static void display_group_list(int col, int row, int wid, int per_page,
 		int grp = grp_idx[grp_top + i];
 
 		/* Choose a color */
-		byte attr = (grp_top + i == grp_cur) ? TERM_L_BLUE : TERM_WHITE;
+		TERM_COLOR attr = (grp_top + i == grp_cur) ? TERM_L_BLUE : TERM_WHITE;
 
 		/* Erase the entire line */
 		Term_erase(col, row + i, wid);
@@ -6302,7 +6115,6 @@ static void browser_cursor(char ch, int *column, IDX *grp_cur, int grp_cnt,
 		int browser_rows;
 		int wid, hgt;
 
-		/* Get size */
 		Term_get_size(&wid, &hgt);
 
 		browser_rows = hgt - 8;
@@ -6454,11 +6266,11 @@ static void place_visual_list_cursor(TERM_LEN col, TERM_LEN row, TERM_COLOR a, b
  *  Clipboard variables for copy&paste in visual mode
  */
 static TERM_COLOR attr_idx = 0;
-static byte char_idx = 0;
+static SYMBOL_CODE char_idx = 0;
 
 /* Hack -- for feature lighting */
 static TERM_COLOR attr_idx_feat[F_LIT_MAX];
-static byte char_idx_feat[F_LIT_MAX];
+static SYMBOL_CODE char_idx_feat[F_LIT_MAX];
 
 /*
  *  Do visual mode command -- Change symbols
@@ -6466,10 +6278,10 @@ static byte char_idx_feat[F_LIT_MAX];
 static bool visual_mode_command(char ch, bool *visual_list_ptr,
 				int height, int width,
 				TERM_COLOR *attr_top_ptr, byte *char_left_ptr,
-				TERM_COLOR *cur_attr_ptr, byte *cur_char_ptr, bool *need_redraw)
+				TERM_COLOR *cur_attr_ptr, SYMBOL_CODE *cur_char_ptr, bool *need_redraw)
 {
 	static TERM_COLOR attr_old = 0;
-	static byte char_old = 0;
+	static SYMBOL_CODE char_old = 0;
 
 	switch (ch)
 	{
@@ -6556,8 +6368,8 @@ static bool visual_mode_command(char ch, bool *visual_list_ptr,
 		{
 			int eff_width;
 			int d = get_keymap_dir(ch);
-			byte a = (*cur_attr_ptr & 0x7f);
-			byte c = *cur_char_ptr;
+			TERM_COLOR a = (*cur_attr_ptr & 0x7f);
+			SYMBOL_CODE c = *cur_char_ptr;
 
 			if (use_bigtile) eff_width = width / 2;
 			else eff_width = width;
@@ -6605,7 +6417,7 @@ static void display_monster_list(int col, int row, int per_page, s16b mon_idx[],
 	/* Display lines until done */
 	for (i = 0; i < per_page && (mon_idx[mon_top + i] >= 0); i++)
 	{
-		byte attr;
+		TERM_COLOR attr;
 
 		/* Get the race index */
 		MONRACE_IDX r_idx = mon_idx[mon_top + i] ;
@@ -6680,13 +6492,12 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, IDX d
 
 	BIT_FLAGS8 mode;
 
-	/* Get size */
 	Term_get_size(&wid, &hgt);
 
 	browser_rows = hgt - 8;
 
 	/* Allocate the "mon_idx" array */
-	C_MAKE(mon_idx, max_r_idx, s16b);
+	C_MAKE(mon_idx, max_r_idx, MONRACE_IDX);
 
 	max = 0;
 	grp_cnt = 0;
@@ -6746,22 +6557,12 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, IDX d
 		if (redraw)
 		{
 			clear_from(0);
-
-#ifdef JP
-			prt(format("%s - モンスター", !visual_only ? "知識" : "表示"), 2, 0);
-			if (direct_r_idx < 0) prt("グループ", 4, 0);
-			prt("名前", 4, max + 3);
+			prt(format(_("%s - モンスター", "%s - monsters"), !visual_only ? _("知識", "Knowledge") : _("表示", "Visuals")), 2, 0);
+			if (direct_r_idx < 0) prt(_("グループ", "Group"), 4, 0);
+			prt(_("名前", "Name"), 4, max + 3);
 			if (p_ptr->wizard || visual_only) prt("Idx", 4, 62);
-			prt("文字", 4, 67);
-			if (!visual_only) prt("殺害数", 4, 72);
-#else
-			prt(format("%s - monsters", !visual_only ? "Knowledge" : "Visuals"), 2, 0);
-			if (direct_r_idx < 0) prt("Group", 4, 0);
-			prt("Name", 4, max + 3);
-			if (p_ptr->wizard || visual_only) prt("Idx", 4, 62);
-			prt("Sym", 4, 68);
-			if (!visual_only) prt("Kills", 4, 73);
-#endif
+			prt(_("文字", "Sym"), 4, 67);
+			if (!visual_only) prt(_("殺害数", "Kills"), 4, 72);
 
 			for (i = 0; i < 78; i++)
 			{
@@ -6820,19 +6621,11 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, IDX d
 		}
 
 		/* Prompt */
-#ifdef JP
-		prt(format("<方向>%s%s%s, ESC",
-			(!visual_list && !visual_only) ? ", 'r'で思い出を見る" : "",
-			visual_list ? ", ENTERで決定" : ", 'v'でシンボル変更",
-			(attr_idx || char_idx) ? ", 'c', 'p'でペースト" : ", 'c'でコピー"),
-			hgt - 1, 0);
-#else
-		prt(format("<dir>%s%s%s, ESC",
-			(!visual_list && !visual_only) ? ", 'r' to recall" : "",
-			visual_list ? ", ENTER to accept" : ", 'v' for visuals",
-			(attr_idx || char_idx) ? ", 'c', 'p' to paste" : ", 'c' to copy"),
+		prt(format(_("<方向>%s%s%s, ESC", "<dir>%s%s%s, ESC"),
+			(!visual_list && !visual_only) ? _(", 'r'で思い出を見る", ", 'r' to recall") : "",
+			visual_list ? _(", ENTERで決定", ", ENTER to accept") : _(", 'v'でシンボル変更", ", 'v' for visuals"),
+			(attr_idx || char_idx) ? _(", 'c', 'p'でペースト", ", 'c', 'p' to paste") : _(", 'c'でコピー", ", 'c' to copy")),
 			hgt - 1, 0);
-#endif
 
 		/* Get the current monster */
 		r_ptr = &r_info[mon_idx[mon_cur]];
@@ -6841,8 +6634,6 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, IDX d
 		{
 			/* Mega Hack -- track this monster race */
 			if (mon_cnt) monster_race_track(mon_idx[mon_cur]);
-
-			/* Hack -- handle stuff */
 			handle_stuff();
 		}
 
@@ -6912,7 +6703,7 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, IDX d
 	}
 
 	/* Free the "mon_idx" array */
-	C_KILL(mon_idx, max_r_idx, s16b);
+	C_KILL(mon_idx, max_r_idx, MONRACE_IDX);
 }
 
 
@@ -6927,9 +6718,9 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
 	/* Display lines until done */
 	for (i = 0; i < per_page && (object_idx[object_top + i] >= 0); i++)
 	{
-		char o_name[80];
+		GAME_TEXT o_name[MAX_NLEN];
 		TERM_COLOR a;
-		byte c;
+		SYMBOL_CODE c;
 		object_kind *flavor_k_ptr;
 
 		/* Get the object index */
@@ -6939,7 +6730,7 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
 		object_kind *k_ptr = &k_info[k_idx];
 
 		/* Choose a color */
-		byte attr = ((k_ptr->aware || visual_only) ? TERM_WHITE : TERM_SLATE);
+		TERM_COLOR attr = ((k_ptr->aware || visual_only) ? TERM_WHITE : TERM_SLATE);
 		byte cursor = ((k_ptr->aware || visual_only) ? TERM_L_BLUE : TERM_BLUE);
 
 
@@ -6999,15 +6790,11 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
 /*
  * Describe fake object
  */
-static void desc_obj_fake(IDX k_idx)
+static void desc_obj_fake(KIND_OBJECT_IDX k_idx)
 {
 	object_type *o_ptr;
 	object_type object_type_body;
-
-	/* Get local object */
 	o_ptr = &object_type_body;
-
-	/* Wipe the object */
 	object_wipe(o_ptr);
 
 	/* Create the artifact */
@@ -7021,8 +6808,6 @@ static void desc_obj_fake(IDX k_idx)
 
 	/* Hack - mark as fake */
 	/* term_obj_real = FALSE; */
-
-	/* Hack -- Handle stuff */
 	handle_stuff();
 
 	if (!screen_object(o_ptr, SCROBJ_FAKE_OBJECT | SCROBJ_FORCE_DETAIL))
@@ -7046,7 +6831,7 @@ static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, IDX di
 	int grp_cnt;
 	IDX grp_idx[100];
 	int object_cnt;
-	IDX *object_idx;
+	OBJECT_IDX *object_idx;
 
 	int column = 0;
 	bool flag;
@@ -7057,17 +6842,16 @@ static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, IDX di
 	byte char_left = 0;
 
 	int browser_rows;
-	int wid, hgt;
+	TERM_LEN wid, hgt;
 
 	byte mode;
 
-	/* Get size */
 	Term_get_size(&wid, &hgt);
 
 	browser_rows = hgt - 8;
 
 	/* Allocate the "object_idx" array */
-	C_MAKE(object_idx, max_k_idx, IDX);
+	C_MAKE(object_idx, max_k_idx, KIND_OBJECT_IDX);
 
 	max = 0;
 	grp_cnt = 0;
@@ -7251,7 +7035,6 @@ static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, IDX di
 			/* The "current" object changed */
 			if (object_old != object_idx[object_cur])
 			{
-				/* Hack -- handle stuff */
 				handle_stuff();
 
 				/* Remember the "current" object */
@@ -7321,7 +7104,7 @@ static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, IDX di
 	}
 
 	/* Free the "object_idx" array */
-	C_KILL(object_idx, max_k_idx, IDX);
+	C_KILL(object_idx, max_k_idx, KIND_OBJECT_IDX);
 }
 
 
@@ -7342,7 +7125,7 @@ static void display_feature_list(int col, int row, int per_page, FEAT_IDX *feat_
 	/* Display lines until done */
 	for (i = 0; i < per_page && (feat_idx[feat_top + i] >= 0); i++)
 	{
-		byte attr;
+		TERM_COLOR attr;
 
 		/* Get the index */
 		FEAT_IDX f_idx = feat_idx[feat_top + i];
@@ -7401,16 +7184,16 @@ static void display_feature_list(int col, int row, int per_page, FEAT_IDX *feat_
  */
 static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f_idx, IDX *lighting_level)
 {
-	IDX i;
+	FEAT_IDX i;
 	int len, max;
-	IDX grp_cur, grp_top, old_grp_cur;
-	IDX feat_cur, feat_top;
+	FEAT_IDX grp_cur, grp_top, old_grp_cur;
+	FEAT_IDX feat_cur, feat_top;
 	int grp_cnt;
-	IDX grp_idx[100];
+	FEAT_IDX grp_idx[100];
 	int feat_cnt;
-	IDX *feat_idx;
+	FEAT_IDX *feat_idx;
 
-	int column = 0;
+	TERM_LEN column = 0;
 	bool flag;
 	bool redraw;
 
@@ -7418,24 +7201,23 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 	TERM_COLOR attr_top = 0;
 	byte char_left = 0;
 
-	int browser_rows;
-	int wid, hgt;
+	TERM_LEN browser_rows;
+	TERM_LEN wid, hgt;
 
 	TERM_COLOR attr_old[F_LIT_MAX];
-	byte char_old[F_LIT_MAX];
+	SYMBOL_CODE char_old[F_LIT_MAX];
 	TERM_COLOR *cur_attr_ptr;
-	byte *cur_char_ptr;
+	SYMBOL_CODE *cur_char_ptr;
 
-	(void)C_WIPE(attr_old, F_LIT_MAX, byte);
-	(void)C_WIPE(char_old, F_LIT_MAX, byte);
+	(void)C_WIPE(attr_old, F_LIT_MAX, TERM_COLOR);
+	(void)C_WIPE(char_old, F_LIT_MAX, SYMBOL_CODE);
 
-	/* Get size */
 	Term_get_size(&wid, &hgt);
 
 	browser_rows = hgt - 8;
 
 	/* Allocate the "feat_idx" array */
-	C_MAKE(feat_idx, max_f_idx, IDX);
+	C_MAKE(feat_idx, max_f_idx, FEAT_IDX);
 
 	max = 0;
 	grp_cnt = 0;
@@ -7500,35 +7282,19 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 		{
 			clear_from(0);
 
-#ifdef JP
-			prt("表示 - 地形", 2, 0);
-			if (direct_f_idx < 0) prt("グループ", 4, 0);
-			prt("名前", 4, max + 3);
-			if (use_bigtile)
-			{
-				if (p_ptr->wizard || visual_only) prt("Idx", 4, 62);
-				prt("文字 ( l/ d)", 4, 66);
-			}
-			else
-			{
-				if (p_ptr->wizard || visual_only) prt("Idx", 4, 64);
-				prt("文字 (l/d)", 4, 68);
-			}
-#else
-			prt("Visuals - features", 2, 0);
-			if (direct_f_idx < 0) prt("Group", 4, 0);
-			prt("Name", 4, max + 3);
+			prt(_("表示 - 地形", "Visuals - features"), 2, 0);
+			if (direct_f_idx < 0) prt(_("グループ", "Group"), 4, 0);
+			prt(_("名前", "Name"), 4, max + 3);
 			if (use_bigtile)
 			{
 				if (p_ptr->wizard || visual_only) prt("Idx", 4, 62);
-				prt("Sym ( l/ d)", 4, 67);
+				prt(_("文字 ( l/ d)", "Sym ( l/ d)"), 4, 66);
 			}
 			else
 			{
 				if (p_ptr->wizard || visual_only) prt("Idx", 4, 64);
-				prt("Sym (l/d)", 4, 69);
+				prt(_("文字 (l/d)", "Sym (l/d)"), 4, 68);
 			}
-#endif
 
 			for (i = 0; i < 78; i++)
 			{
@@ -7587,17 +7353,10 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 		}
 
 		/* Prompt */
-#ifdef JP
-		prt(format("<方向>%s, 'd'で標準光源効果%s, ESC",
-			visual_list ? ", ENTERで決定, 'a'で対象明度変更" : ", 'v'でシンボル変更",
-			(attr_idx || char_idx) ? ", 'c', 'p'でペースト" : ", 'c'でコピー"),
-			hgt - 1, 0);
-#else
-		prt(format("<dir>%s, 'd' for default lighting%s, ESC",
-			visual_list ? ", ENTER to accept, 'a' for lighting level" : ", 'v' for visuals",
-			(attr_idx || char_idx) ? ", 'c', 'p' to paste" : ", 'c' to copy"),
+		prt(format(_("<方向>%s, 'd'で標準光源効果%s, ESC", "<dir>%s, 'd' for default lighting%s, ESC"),
+			visual_list ? _(", ENTERで決定, 'a'で対象明度変更", ", ENTER to accept, 'a' for lighting level") : _(", 'v'でシンボル変更", ", 'v' for visuals"),
+			(attr_idx || char_idx) ? _(", 'c', 'p'でペースト", ", 'c', 'p' to paste") : _(", 'c'でコピー", ", 'c' to copy")),
 			hgt - 1, 0);
-#endif
 
 		/* Get the current feature */
 		f_ptr = &f_info[feat_idx[feat_cur]];
@@ -7741,7 +7500,7 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 	}
 
 	/* Free the "feat_idx" array */
-	C_KILL(feat_idx, max_f_idx, IDX);
+	C_KILL(feat_idx, max_f_idx, FEAT_IDX);
 }
 
 
@@ -7753,7 +7512,7 @@ static void do_cmd_knowledge_kubi(void)
 	int i;
 	FILE *fff;
 	
-	char file_name[1024];
+	GAME_TEXT file_name[1024];
 	
 	
 	/* Open a new file */
@@ -7768,15 +7527,10 @@ static void do_cmd_knowledge_kubi(void)
 	{
 		bool listed = FALSE;
 
-#ifdef JP
-		fprintf(fff, "今日のターゲット : %s\n", (p_ptr->today_mon ? r_name + r_info[p_ptr->today_mon].name : "不明"));
+		fprintf(fff, _("今日のターゲット : %s\n", "Today target : %s\n"),
+			(p_ptr->today_mon ? r_name + r_info[p_ptr->today_mon].name : _("不明", "unknown")));
 		fprintf(fff, "\n");
-		fprintf(fff, "賞金首リスト\n");
-#else
-		fprintf(fff, "Today target : %s\n", (p_ptr->today_mon ? r_name + r_info[p_ptr->today_mon].name : "unknown"));
-		fprintf(fff, "\n");
-		fprintf(fff, "List of wanted monsters\n");
-#endif
+		fprintf(fff, _("賞金首リスト\n", "List of wanted monsters\n"));
 		fprintf(fff, "----------------------------------------------\n");
 
 		for (i = 0; i < MAX_KUBI; i++)
@@ -7794,9 +7548,7 @@ static void do_cmd_knowledge_kubi(void)
 			fprintf(fff,"\n%s\n", _("賞金首はもう残っていません。", "There is no more wanted monster."));
 		}
 	}
-	
-	/* Close the file */
-	my_fclose(fff);
+		my_fclose(fff);
 	
 	/* Display the file contents */
 	show_file(TRUE, file_name, _("賞金首の一覧", "Wanted monsters"), 0, 0);
@@ -7810,11 +7562,9 @@ static void do_cmd_knowledge_kubi(void)
  */
 static void do_cmd_knowledge_virtues(void)
 {
-	FILE *fff;
-	
-	char file_name[1024];
-	
-	
+	FILE *fff;	
+	GAME_TEXT file_name[1024];
+		
 	/* Open a new file */
 	fff = my_fopen_temp(file_name, 1024);
 	if (!fff) {
@@ -7828,9 +7578,7 @@ static void do_cmd_knowledge_virtues(void)
 		fprintf(fff, _("現在の属性 : %s\n\n", "Your alighnment : %s\n\n"), your_alignment());
 		dump_virtues(fff);
 	}
-	
-	/* Close the file */
-	my_fclose(fff);
+		my_fclose(fff);
 	
 	/* Display the file contents */
 	show_file(TRUE, file_name, _("八つの徳", "Virtues"), 0, 0);
@@ -7840,17 +7588,15 @@ static void do_cmd_knowledge_virtues(void)
 }
 
 /*
-* Dungeon
-*
-*/
+ * Dungeon
+ */
 static void do_cmd_knowledge_dungeon(void)
 {
 	FILE *fff;
 	
-	char file_name[1024];
+	GAME_TEXT file_name[1024];
 	int i;
-	
-	
+		
 	/* Open a new file */
 	fff = my_fopen_temp(file_name, 1024);
 	if (!fff) {
@@ -7876,9 +7622,7 @@ static void do_cmd_knowledge_dungeon(void)
 			fprintf(fff, _("%c%-12s :  %3d 階\n", "%c%-16s :  level %3d\n"), seiha ? '!' : ' ', d_name + d_info[i].name, (int)max_dlv[i]);
 		}
 	}
-	
-	/* Close the file */
-	my_fclose(fff);
+		my_fclose(fff);
 	
 	/* Display the file contents */
 	show_file(TRUE, file_name, _("今までに入ったダンジョン", "Dungeon"), 0, 0);
@@ -7895,7 +7639,7 @@ static void do_cmd_knowledge_stat(void)
 {
 	FILE *fff;
 	
-	char file_name[1024];
+	GAME_TEXT file_name[1024];
 	int percent, v_nr;
 	
 	/* Open a new file */
@@ -7912,16 +7656,12 @@ static void do_cmd_knowledge_stat(void)
 			(2 * p_ptr->hitdie +
 			((PY_MAX_LEVEL - 1+3) * (p_ptr->hitdie + 1))));
 
-#ifdef JP
-		if (p_ptr->knowledge & KNOW_HPRATE) fprintf(fff, "現在の体力ランク : %d/100\n\n", percent);
-		else fprintf(fff, "現在の体力ランク : ???\n\n");
-		fprintf(fff, "能力の最大値\n\n");
-#else
-		if (p_ptr->knowledge & KNOW_HPRATE) fprintf(fff, "Your current Life Rating is %d/100.\n\n", percent);
-		else fprintf(fff, "Your current Life Rating is ???.\n\n");
-		fprintf(fff, "Limits of maximum stats\n\n");
-#endif
-		for (v_nr = 0; v_nr < 6; v_nr++)
+		if (p_ptr->knowledge & KNOW_HPRATE)
+			fprintf(fff, _("現在の体力ランク : %d/100\n\n", "Your current Life Rating is %d/100.\n\n"), percent);
+		else fprintf(fff, _("現在の体力ランク : ???\n\n", "Your current Life Rating is ???.\n\n"));
+
+		fprintf(fff, _("能力の最大値\n\n", "Limits of maximum stats\n\n"));
+		for (v_nr = 0; v_nr < A_MAX; v_nr++)
 		{
 			if ((p_ptr->knowledge & KNOW_STAT) || p_ptr->stat_max[v_nr] == p_ptr->stat_max_max[v_nr]) fprintf(fff, "%s 18/%d\n", stat_names[v_nr], p_ptr->stat_max_max[v_nr]-18);
 			else fprintf(fff, "%s ???\n", stat_names[v_nr]);
@@ -7929,8 +7669,6 @@ static void do_cmd_knowledge_stat(void)
 	}
 
 	dump_yourself(fff);
-
-	/* Close the file */
 	my_fclose(fff);
 	
 	/* Display the file contents */
@@ -7948,9 +7686,9 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
 {
 	char tmp_str[120];
 	char rand_tmp_str[120] = "\0";
-	char name[80];
+	GAME_TEXT name[MAX_NLEN];
 	monster_race *r_ptr;
-	IDX i;
+	QUEST_IDX i;
 	int rand_level = 100;
 	int total = 0;
 
@@ -7963,7 +7701,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
 			(quest[i].status == QUEST_STATUS_COMPLETED))
 		{
 			/* Set the quest number temporary */
-			IDX old_quest = p_ptr->inside_quest;
+			QUEST_IDX old_quest = p_ptr->inside_quest;
 			int j;
 
 			/* Clear the text */
@@ -8018,7 +7756,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
 							artifact_type *a_ptr = &a_info[quest[i].k_idx];
 							object_type forge;
 							object_type *q_ptr = &forge;
-							IDX k_idx = lookup_kind(a_ptr->tval, a_ptr->sval);
+							KIND_OBJECT_IDX k_idx = lookup_kind(a_ptr->tval, a_ptr->sval);
 							object_prep(q_ptr, k_idx);
 							q_ptr->name1 = quest[i].k_idx;
 							q_ptr->ident = IDENT_STORE;
@@ -8178,21 +7916,20 @@ static bool do_cmd_knowledge_quests_aux(FILE *fff, IDX q_idx)
 /*
  * Print all finished quests
  */
-void do_cmd_knowledge_quests_completed(FILE *fff, IDX quest_num[])
+void do_cmd_knowledge_quests_completed(FILE *fff, QUEST_IDX quest_num[])
 {
-	int i;
-	int total = 0;
+	QUEST_IDX i;
+	QUEST_IDX total = 0;
 
 	fprintf(fff, _("《達成したクエスト》\n", "< Completed Quest >\n"));
 	for (i = 1; i < max_q_idx; i++)
 	{
-		IDX q_idx = quest_num[i];
+		QUEST_IDX q_idx = quest_num[i];
 		quest_type* const q_ptr = &quest[q_idx];
 
-		if (q_ptr->status == QUEST_STATUS_FINISHED &&
-		    do_cmd_knowledge_quests_aux(fff, q_idx))
+		if (q_ptr->status == QUEST_STATUS_FINISHED && do_cmd_knowledge_quests_aux(fff, q_idx))
 		{
-			++ total;
+			++total;
 		}
 	}
 	if (!total) fprintf(fff, _("  なし\n", "  Nothing.\n"));
@@ -8202,21 +7939,21 @@ void do_cmd_knowledge_quests_completed(FILE *fff, IDX quest_num[])
 /*
  * Print all failed quests
  */
-void do_cmd_knowledge_quests_failed(FILE *fff, IDX quest_num[])
+void do_cmd_knowledge_quests_failed(FILE *fff, QUEST_IDX quest_num[])
 {
-	IDX i;
-	int total = 0;
+	QUEST_IDX i;
+	QUEST_IDX total = 0;
 
 	fprintf(fff, _("《失敗したクエスト》\n", "< Failed Quest >\n"));
 	for (i = 1; i < max_q_idx; i++)
 	{
-		IDX q_idx = quest_num[i];
+		QUEST_IDX q_idx = quest_num[i];
 		quest_type* const q_ptr = &quest[q_idx];
 
 		if (((q_ptr->status == QUEST_STATUS_FAILED_DONE) || (q_ptr->status == QUEST_STATUS_FAILED)) &&
 		    do_cmd_knowledge_quests_aux(fff, q_idx))
 		{
-			++ total;
+			++total;
 		}
 	}
 	if (!total) fprintf(fff, _("  なし\n", "  Nothing.\n"));
@@ -8228,9 +7965,9 @@ void do_cmd_knowledge_quests_failed(FILE *fff, IDX quest_num[])
  */
 static void do_cmd_knowledge_quests_wiz_random(FILE *fff)
 {
-	char tmp_str[120];
-	int i;
-	int total = 0;
+	GAME_TEXT tmp_str[120];
+	QUEST_IDX i;
+	QUEST_IDX total = 0;
 
 	fprintf(fff, _("《残りのランダムクエスト》\n", "< Remaining Random Quest >\n"));
 	for (i = 1; i < max_q_idx; i++)
@@ -8286,7 +8023,7 @@ void ang_sort_swap_quest_num(vptr u, vptr v, int a, int b)
 static void do_cmd_knowledge_quests(void)
 {
 	FILE *fff;
-	char file_name[1024];
+	GAME_TEXT file_name[1024];
 	IDX *quest_num;
 	int dummy;
 	IDX i;
@@ -8301,7 +8038,7 @@ static void do_cmd_knowledge_quests(void)
 	}
 
 	/* Allocate Memory */
-	C_MAKE(quest_num, max_q_idx, IDX);
+	C_MAKE(quest_num, max_q_idx, QUEST_IDX);
 
 	/* Sort by compete level */
 	for (i = 1; i < max_q_idx; i++) quest_num[i] = i;
@@ -8320,8 +8057,6 @@ static void do_cmd_knowledge_quests(void)
 		fputc('\n', fff);
 		do_cmd_knowledge_quests_wiz_random(fff);
 	}
-
-	/* Close the file */
 	my_fclose(fff);
 
 	/* Display the file contents */
@@ -8331,7 +8066,7 @@ static void do_cmd_knowledge_quests(void)
 	fd_kill(file_name);
 
 	/* Free Memory */
-	C_KILL(quest_num, max_q_idx, IDX);
+	C_KILL(quest_num, max_q_idx, QUEST_IDX);
 }
 
 
@@ -8343,10 +8078,10 @@ static void do_cmd_knowledge_home(void)
 	FILE *fff;
 
 	int i;
-	char file_name[1024];
+	GAME_TEXT file_name[1024];
 	store_type  *st_ptr;
-	char o_name[MAX_NLEN];
-	cptr		paren = ")";
+	GAME_TEXT o_name[MAX_NLEN];
+	concptr		paren = ")";
 
 	process_dungeon_file("w_info.txt", 0, 0, max_wild_y, max_wild_x);
 
@@ -8404,8 +8139,6 @@ static void do_cmd_knowledge_home(void)
 			fprintf(fff, "\n\n");
 		}
 	}
-
-	/* Close the file */
 	my_fclose(fff);
 
 	/* Display the file contents */
@@ -8423,7 +8156,7 @@ static void do_cmd_knowledge_autopick(void)
 {
 	int k;
 	FILE *fff;
-	char file_name[1024];
+	GAME_TEXT file_name[1024];
 
 	/* Open a new file */
 	fff = my_fopen_temp(file_name, 1024);
@@ -8447,7 +8180,7 @@ static void do_cmd_knowledge_autopick(void)
 
 	for (k = 0; k < max_autopick; k++)
 	{
-		cptr tmp;
+		concptr tmp;
 		byte act = autopick_list[k].action;
 		if (act & DONT_AUTOPICK)
 		{
@@ -8461,7 +8194,7 @@ static void do_cmd_knowledge_autopick(void)
 		{
 			tmp = _("拾う", "Pickup");
 		}
-		else /* if (act & DO_QUERY_AUTOPICK) */ /* Obvious */
+		else
 		{
 			tmp = _("確認", "Query");
 		}
@@ -8476,7 +8209,6 @@ static void do_cmd_knowledge_autopick(void)
 		string_free(tmp);
 		fprintf(fff, "\n");
 	}
-	/* Close the file */
 	my_fclose(fff);
 	/* Display the file contents */
 	show_file(TRUE, file_name, _("自動拾い/破壊 設定リスト", "Auto-picker/Destroyer"), 0, 0);
@@ -8496,24 +8228,16 @@ void do_cmd_knowledge(void)
 
 	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
-
-	/* Save the screen */
 	screen_save();
 
 	/* Interact until done */
 	while (1)
 	{
-		/* Clear screen */
 		Term_clear();
 
 		/* Ask for a choice */
-#ifdef JP
-		prt(format("%d/2 ページ", (p+1)), 2, 65);
-		prt("現在の知識を確認する", 3, 0);
-#else
-		prt(format("page %d/2", (p+1)), 2, 65);
-		prt("Display current knowledge", 3, 0);
-#endif
+		prt(format(_("%d/2 ページ", "page %d/2"), (p+1)), 2, 65);
+		prt(_("現在の知識を確認する", "Display current knowledge"), 3, 0);
 
 		/* Give some choices */
 #ifdef JP
@@ -8570,24 +8294,13 @@ void do_cmd_knowledge(void)
 		}
 #endif
 		/* Prompt */
-#ifdef JP
-		prt("-続く-", 17, 8);
-		prt("ESC) 抜ける", 21, 1);
-		prt("SPACE) 次ページ", 21, 30);
+		prt(_("-続く-", "-more-"), 17, 8);
+		prt(_("ESC) 抜ける", "ESC) Exit menu"), 21, 1);
+		prt(_("SPACE) 次ページ", "SPACE) Next page"), 21, 30);
 		/*prt("-) 前ページ", 21, 60);*/
-		prt("コマンド:", 20, 0);
-#else
-		prt("-more-", 17, 8);
-		prt("ESC) Exit menu", 21, 1);
-		prt("SPACE) Next page", 21, 30);
-		/*prt("-) Previous page", 21, 60);*/
-		prt("Command: ", 20, 0);
-#endif
-
-		/* Prompt */
+		prt(_("コマンド:", "Command: "), 20, 0);
 		i = inkey();
 
-		/* Done */
 		if (i == ESCAPE) break;
 		switch (i)
 		{
@@ -8660,11 +8373,8 @@ void do_cmd_knowledge(void)
 			bell();
 		}
 
-		/* Flush messages */
-		msg_print(NULL);
+		msg_erase();
 	}
-
-	/* Restore the screen */
 	screen_load();
 
 	if (need_redraw) do_cmd_redraw();
@@ -8678,14 +8388,10 @@ void do_cmd_checkquest(void)
 {
 	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
-
-	/* Save the screen */
 	screen_save();
 
 	/* Quest info */
 	do_cmd_knowledge_quests();
-
-	/* Restore the screen */
 	screen_load();
 }
 
@@ -8717,17 +8423,8 @@ void do_cmd_time(void)
 	if (day < MAX_DAYS) sprintf(day_buf, "%d", day);
 	else strcpy(day_buf, "*****");
 
-	/* Message */
-#ifdef JP
-	msg_format("%s日目, 時刻は%d:%02d %sです。",
-		   day_buf, (hour % 12 == 0) ? 12 : (hour % 12),
-		   min, (hour < 12) ? "AM" : "PM");
-#else
-	msg_format("This is day %s. The time is %d:%02d %s.",
-		   day_buf, (hour % 12 == 0) ? 12 : (hour % 12),
-		   min, (hour < 12) ? "AM" : "PM");
-#endif
-
+	msg_format(_("%s日目, 時刻は%d:%02d %sです。", "This is day %s. The time is %d:%02d %s."),
+		   day_buf, (hour % 12 == 0) ? 12 : (hour % 12), min, (hour < 12) ? "AM" : "PM");
 
 	/* Find the path */
 	if (!randint0(10) || p_ptr->image)
@@ -8742,7 +8439,6 @@ void do_cmd_time(void)
 	/* Open this file */
 	fff = my_fopen(buf, "rt");
 
-	/* Oops */
 	if (!fff) return;
 
 	/* Find this time */
@@ -8793,9 +8489,6 @@ void do_cmd_time(void)
 		}
 	}
 
-	/* Message */
 	msg_print(desc);
-
-	/* Close the file */
 	my_fclose(fff);
 }