提交: f3edabeafea9ccd198f21e7301b54e91006fe782 - hengband (git)

変愚蛮怒のメインリポジトリです

Commit MetaInfo

• 修訂: f3edabeafea9ccd198f21e7301b54e91006fe782 (tree)
• 時間: 2020-03-14 03:50:36
• 作者: deskull <deskull@user...>
• Commiter: deskull

Log Message

Merge remote-tracking branch 'remotes/origin/For2.2.2-Fix-Hourier' into For2.2.2-Refactoring

Change Summary

• modified: Hengband_vcs2017/Hengband/Hengband.vcxproj
• modified: Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
• modified: src/Makefile.am
• modified: src/birth.c
• modified: src/bldg.c
• modified: src/cmd/cmd-basic.c
• modified: src/cmd/cmd-dump.c
• modified: src/cmd/cmd-dump.h
• modified: src/cmd/cmd-gameoption.c
• modified: src/cmd/cmd-pet.c
• modified: src/cmd/cmd-save.c
• modified: src/cmd/cmd-spell.c
• add: src/cmd/diary-subtitle-table.c
• add: src/cmd/diary-subtitle-table.h
• add: src/cmd/feeling-table.c
• add: src/cmd/feeling-table.h
• add: src/cmd/monster-group-table.c
• add: src/cmd/monster-group-table.h
• add: src/cmd/object-group-table.c
• add: src/cmd/object-group-table.h
• modified: src/core.c
• modified: src/floor-generate.c
• modified: src/floor-save.c
• add: src/io/write-diary.c
• add: src/io/write-diary.h
• modified: src/main-win.c
• modified: src/monster-process.c
• modified: src/monster-status.c
• modified: src/monster1.c
• modified: src/monster2.c
• modified: src/mutation.c
• modified: src/object2.c
• modified: src/patron.c
• modified: src/player-damage.c
• modified: src/player-status.c
• modified: src/quest.c
• modified: src/scores.c
• modified: src/signal-handlers.c
• modified: src/spells-floor.c
• modified: src/spells1.c
• modified: src/spells2.c
• modified: src/spells3.c
• modified: src/store.c
• modified: src/trap.c
• modified: src/util.c
• modified: src/wizard2.c

差異

--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -175,6 +175,10 @@
     <ClCompile Include="..\..\src\cmd\cmd-usestaff.c" />
     <ClCompile Include="..\..\src\cmd\cmd-zaprod.c" />
     <ClCompile Include="..\..\src\cmd\cmd-zapwand.c" />
+    <ClCompile Include="..\..\src\cmd\diary-subtitle-table.c" />
+    <ClCompile Include="..\..\src\cmd\feeling-table.c" />
+    <ClCompile Include="..\..\src\cmd\monster-group-table.c" />
+    <ClCompile Include="..\..\src\cmd\object-group-table.c" />
     <ClCompile Include="..\..\src\combat\melee1.c" />
     <ClCompile Include="..\..\src\combat\shoot.c" />
     <ClCompile Include="..\..\src\core.c" />
@@ -199,6 +203,7 @@
     <ClCompile Include="..\..\src\io\read-pref-file.c" />
     <ClCompile Include="..\..\src\io\special-class-dump.c" />
     <ClCompile Include="..\..\src\io\tokenizer.c" />
+    <ClCompile Include="..\..\src\io\write-diary.c" />
     <ClCompile Include="..\..\src\monster-dist-offsets.c" />
     <ClCompile Include="..\..\src\monster-process.c" />
     <ClCompile Include="..\..\src\monster-status.c" />
@@ -348,6 +353,10 @@
     <ClInclude Include="..\..\src\cmd\cmd-usestaff.h" />
     <ClInclude Include="..\..\src\cmd\cmd-zaprod.h" />
     <ClInclude Include="..\..\src\cmd\cmd-zapwand.h" />
+    <ClInclude Include="..\..\src\cmd\diary-subtitle-table.h" />
+    <ClInclude Include="..\..\src\cmd\feeling-table.h" />
+    <ClInclude Include="..\..\src\cmd\monster-group-table.h" />
+    <ClInclude Include="..\..\src\cmd\object-group-table.h" />
     <ClInclude Include="..\..\src\combat\melee.h" />
     <ClInclude Include="..\..\src\combat\shoot.h" />
     <ClInclude Include="..\..\src\core\show-file.h" />
@@ -359,6 +368,7 @@
     <ClInclude Include="..\..\src\io\read-pref-file.h" />
     <ClInclude Include="..\..\src\io\special-class-dump.h" />
     <ClInclude Include="..\..\src\io\tokenizer.h" />
+    <ClInclude Include="..\..\src\io\write-diary.h" />
     <ClInclude Include="..\..\src\monster-dist-offsets.h" />
     <ClInclude Include="..\..\src\monster\monster-attack.h" />
     <ClInclude Include="..\..\src\monster\monster-direction.h" />

--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -508,6 +508,21 @@
     <ClCompile Include="..\..\src\monster\monster-sweep-grid.c">
       <Filter>monster</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\io\write-diary.c">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cmd\feeling-table.c">
+      <Filter>cmd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cmd\monster-group-table.c">
+      <Filter>cmd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cmd\diary-subtitle-table.c">
+      <Filter>cmd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cmd\object-group-table.c">
+      <Filter>cmd</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -998,6 +1013,21 @@
     <ClInclude Include="..\..\src\monster\monster-sweep-grid.h">
       <Filter>monster</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\io\write-diary.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\cmd\feeling-table.h">
+      <Filter>cmd</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\cmd\monster-group-table.h">
+      <Filter>cmd</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\cmd\diary-subtitle-table.h">
+      <Filter>cmd</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\cmd\object-group-table.h">
+      <Filter>cmd</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,6 +131,10 @@ hengband_SOURCES = \
 	z-form.c z-form.h z-rand.c z-rand.h z-term.c z-term.h z-util.c z-util.h \
 	z-virt.c z-virt.h \
 	\
+	cmd/feeling-table.c cmd/feeling-table.h \
+	cmd/monster-group-table.c cmd/monster-group-table.h \
+	cmd/diary-subtitle-table.c cmd/diary-subtitle-table.h \
+	cmd/object-group-table.c cmd/object-group-table.h \
 	cmd/cmd-activate.c cmd/cmd-activate.h cmd/cmd-basic.c cmd/cmd-basic.h \
 	cmd/cmd-dump.c cmd/cmd-dump.h cmd/cmd-eat.c cmd/cmd-eat.h \
 	cmd/cmd-gameoption.c cmd/cmd-gameoption.h cmd/cmd-help.c cmd/cmd-help.h \

--- a/src/birth.c
+++ b/src/birth.c
@@ -22,7 +22,8 @@
 #include "object-ego.h"
 #include "artifact.h"
 #include "avatar.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "dungeon.h"
 #include "history.h"
 #include "monster.h"

--- a/src/bldg.c
+++ b/src/bldg.c
@@ -18,8 +18,9 @@
 
 #include "core.h"
 #include "core/show-file.h"
-#include "cmd-dump.h"
-#include "cmd-magiceat.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
+#include "cmd/cmd-magiceat.h"
 #include "floor.h"
 #include "floor-events.h"
 #include "floor-save.h"

--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -14,6 +14,7 @@
 #include "core.h"
 #include "term.h"
 
+#include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-save.h"
 #include "chest.h"

--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -45,6 +45,7 @@
 #include "core.h"
 #include "core/show-file.h"
 #include "io/read-pref-file.h"
+#include "io/write-diary.h"
 #include "chuukei.h"
 
 #include "autopick.h"
@@ -76,11 +77,15 @@
 #include "spells.h"
 #include "objectkind.h"
 #include "floor-town.h"
+#include "cmd/feeling-table.h"
+#include "cmd/monster-group-table.h"
+#include "cmd/diary-subtitle-table.h"
+#include "cmd/object-group-table.h"
 #include "view-mainwindow.h" // 暫定。後で消す
 
 #include "english.h"
 
- // Mark strings for auto dump
+// Mark strings for auto dump
 static char auto_dump_header[] = "# vvvvvvv== %s ==vvvvvvv";
 static char auto_dump_footer[] = "# ^^^^^^^== %s ==^^^^^^^";
 
@@ -97,16 +102,12 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 static TERM_COLOR attr_idx = 0;
 static SYMBOL_CODE char_idx = 0;
 
-/* Hack -- for feature lighting */
 static TERM_COLOR attr_idx_feat[F_LIT_MAX];
 static SYMBOL_CODE char_idx_feat[F_LIT_MAX];
 
 // Encode the screen colors
 static char hack[17] = "dwsorgbuDWvyRGBU";
 
-// todo *抹殺* したい…
-bool write_level;
-
 /*!
  * @brief prf出力内容を消去する /
  * Remove old lines automatically generated before.
@@ -115,7 +116,6 @@ bool write_level;
 static void remove_auto_dump(concptr orig_file)
 {
 	FILE *tmp_fff, *orig_fff;
-
 	char tmp_file[1024];
 	char buf[1024];
 	bool between_mark = FALSE;
@@ -124,23 +124,14 @@ static void remove_auto_dump(concptr orig_file)
 	long header_location = 0;
 	char header_mark_str[80];
 	char footer_mark_str[80];
-	size_t mark_len;
 
-	/* Prepare a header/footer mark string */
 	sprintf(header_mark_str, auto_dump_header, auto_dump_mark);
 	sprintf(footer_mark_str, auto_dump_footer, auto_dump_mark);
-
-	mark_len = strlen(footer_mark_str);
-
-	/* Open an old dump file in read-only mode */
+	size_t mark_len = strlen(footer_mark_str);
 	orig_fff = my_fopen(orig_file, "r");
-
-	/* If original file does not exist, nothing to do */
 	if (!orig_fff) return;
 
-	/* Open a new (temporary) file */
 	tmp_fff = my_fopen_temp(tmp_file, 1024);
-
 	if (!tmp_fff)
 	{
 		msg_format(_("一時ファイル %s を作成できませんでした。", "Failed to create temporary file %s."), tmp_file);
@@ -148,110 +139,62 @@ static void remove_auto_dump(concptr orig_file)
 		return;
 	}
 
-	/* Loop for every line */
 	while (TRUE)
 	{
-		/* Read a line */
 		if (my_fgets(orig_fff, buf, sizeof(buf)))
 		{
-			/* Read error: Assume End of File */
-
-			/*
-			 * Was looking for the footer, but not found.
-			 *
-			 * Since automatic dump might be edited by hand,
-			 * it's dangerous to kill these lines.
-			 * Seek back to the next line of the (pseudo) header,
-			 * and read again.
-			 */
 			if (between_mark)
 			{
 				fseek(orig_fff, header_location, SEEK_SET);
 				between_mark = FALSE;
 				continue;
 			}
-
-			/* Success -- End the loop */
 			else
 			{
 				break;
 			}
 		}
 
-		/* We are looking for the header mark of automatic dump */
 		if (!between_mark)
 		{
-			/* Is this line a header? */
 			if (!strcmp(buf, header_mark_str))
 			{
-				/* Memorise seek point of this line */
 				header_location = ftell(orig_fff);
-
-				/* Initialize counter for number of lines */
 				line_num = 0;
-
-				/* Look for the footer from now */
 				between_mark = TRUE;
-
-				/* There are some changes */
 				changed = TRUE;
 			}
-
-			/* Not a header */
 			else
 			{
-				/* Copy orginally lines */
 				fprintf(tmp_fff, "%s\n", buf);
 			}
 
 			continue;
 		}
 
-		/* todo 処理よりもコメントが邪魔でif文を反転できない*/
-		/* We are looking for the footer mark of automatic dump */
-		/* Is this line a footer? */
 		if (!strncmp(buf, footer_mark_str, mark_len))
 		{
 			int tmp;
-
-			/*
-			 * Compare the number of lines
-			 *
-			 * If there is an inconsistency between
-			 * actual number of lines and the
-			 * number here, the automatic dump
-			 * might be edited by hand.  So it's
-			 * dangerous to kill these lines.
-			 * Seek back to the next line of the
-			 * (pseudo) header, and read again.
-			 */
 			if (!sscanf(buf + mark_len, " (%d)", &tmp)
 				|| tmp != line_num)
 			{
 				fseek(orig_fff, header_location, SEEK_SET);
 			}
 
-			/* Look for another header */
 			between_mark = FALSE;
 			continue;
 		}
 
-		/* Not a footer */
-		/* Ignore old line, and count number of lines */
 		line_num++;
 	}
 
-	/* Close files */
 	my_fclose(orig_fff);
 	my_fclose(tmp_fff);
 
-	/* If there are some changes, overwrite the original file with new one */
 	if (changed)
 	{
-		/* Copy contents of temporary file */
 		tmp_fff = my_fopen(tmp_file, "r");
 		orig_fff = my_fopen(orig_file, "w");
-
 		while (!my_fgets(tmp_fff, buf, sizeof(buf)))
 			fprintf(orig_fff, "%s\n", buf);
 
@@ -270,27 +213,16 @@ static void remove_auto_dump(concptr orig_file)
  */
 static void auto_dump_printf(concptr fmt, ...)
 {
-	concptr p;
 	va_list vp;
-
 	char buf[1024];
-
-	/* Begin the Varargs Stuff */
 	va_start(vp, fmt);
-
-	/* Format the args, save the length */
 	(void)vstrnfmt(buf, sizeof(buf), fmt, vp);
-
-	/* End the Varargs Stuff */
 	va_end(vp);
-
-	/* Count number of lines */
-	for (p = buf; *p; p++)
+	for (concptr p = buf; *p; p++)
 	{
 		if (*p == '\n') auto_dump_line_num++;
 	}
 
-	/* Dump it */
 	fprintf(auto_dump_stream, "%s", buf);
 }
 
@@ -305,35 +237,19 @@ static void auto_dump_printf(concptr fmt, ...)
 static bool open_auto_dump(concptr buf, concptr mark)
 {
 	char header_mark_str[80];
-
-	/* Save the mark string */
 	auto_dump_mark = mark;
-
-	/* Prepare a header mark string */
 	sprintf(header_mark_str, auto_dump_header, auto_dump_mark);
-
-	/* Remove old macro dumps */
 	remove_auto_dump(buf);
-
-	/* Append to the file */
 	auto_dump_stream = my_fopen(buf, "a");
-
-	/* Failure */
 	if (!auto_dump_stream)
 	{
 		msg_format(_("%s を開くことができませんでした。", "Failed to open %s."), buf);
 		msg_print(NULL);
-
-		/* Failed */
 		return FALSE;
 	}
 
-	/* Start dumping */
 	fprintf(auto_dump_stream, "%s\n", header_mark_str);
-
-	/* Initialize counter */
 	auto_dump_line_num = 0;
-
 	auto_dump_printf(_("# *警告!!* 以降の行は自動生成されたものです。\n",
 		"# *Warning!*  The lines below are an automatic dump.\n"));
 	auto_dump_printf(_("# *警告!!* 後で自動的に削除されるので編集しないでください。\n",
@@ -349,17 +265,12 @@ static bool open_auto_dump(concptr buf, concptr mark)
 static void close_auto_dump(void)
 {
 	char footer_mark_str[80];
-
-	/* Prepare a footer mark string */
 	sprintf(footer_mark_str, auto_dump_footer, auto_dump_mark);
-
 	auto_dump_printf(_("# *警告!!* 以降の行は自動生成されたものです。\n",
 		"# *Warning!*  The lines below are an automatic dump.\n"));
 	auto_dump_printf(_("# *警告!!* 後で自動的に削除されるので編集しないでください。\n",
 		"# Don't edit them; changes will be deleted and replaced automatically.\n"));
-	/* End of dump */
 	fprintf(auto_dump_stream, "%s (%d)\n", footer_mark_str, auto_dump_line_num);
-
 	my_fclose(auto_dump_stream);
 }
 
@@ -390,367 +301,9 @@ concptr get_ordinal_number_suffix(int num)
 
 
 /*!
- * @brief 日記にメッセージを追加する /
- * Take note to the diary.
- * @param type 日記内容のID
- * @param num 日記内容のIDに応じた数値
- * @param note 日記内容のIDに応じた文字列参照ポインタ
- * @return エラーID
- */
-errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note)
-{
-	int day, hour, min;
-	FILE *fff = NULL;
-	GAME_TEXT file_name[MAX_NLEN];
-	char buf[1024];
-	concptr note_level = "";
-	bool do_level = TRUE;
-	char note_level_buf[40];
-	QUEST_IDX q_idx;
-
-	static bool disable_diary = FALSE;
-
-	extract_day_hour_min(creature_ptr, &day, &hour, &min);
-
-	if (disable_diary) return(-1);
-
-	if (type == DIARY_FIX_QUEST_C ||
-		type == DIARY_FIX_QUEST_F ||
-		type == DIARY_RAND_QUEST_C ||
-		type == DIARY_RAND_QUEST_F ||
-		type == DIARY_TO_QUEST)
-	{
-		QUEST_IDX old_quest;
-
-		old_quest = creature_ptr->current_floor_ptr->inside_quest;
-		creature_ptr->current_floor_ptr->inside_quest = (quest[num].type == QUEST_TYPE_RANDOM) ? 0 : num;
-
-		/* Get the quest text */
-		init_flags = INIT_NAME_ONLY;
-
-		process_dungeon_file(creature_ptr, "q_info.txt", 0, 0, 0, 0);
-
-		/* Reset the old quest number */
-		creature_ptr->current_floor_ptr->inside_quest = old_quest;
-	}
-
-	/* different filne name to avoid mixing */
-	sprintf(file_name, _("playrecord-%s.txt", "playrec-%s.txt"), savefile_base);
-	path_build(buf, sizeof(buf), ANGBAND_DIR_USER, file_name);
-
-	/* File type is "TEXT" */
-	FILE_TYPE(FILE_TYPE_TEXT);
-
-	fff = my_fopen(buf, "a");
-
-	/* Failure */
-	if (!fff)
-	{
-		msg_format(_("%s を開くことができませんでした。プレイ記録を一時停止します。", "Failed to open %s. Play-Record is disabled temporarily."), buf);
-		msg_format(NULL);
-		disable_diary = TRUE;
-		return -1;
-	}
-
-	q_idx = quest_number(creature_ptr, creature_ptr->current_floor_ptr->dun_level);
-
-	if (write_level)
-	{
-		if (creature_ptr->current_floor_ptr->inside_arena)
-			note_level = _("アリーナ:", "Arane:");
-		else if (!creature_ptr->current_floor_ptr->dun_level)
-			note_level = _("地上:", "Surface:");
-		else if (q_idx && (is_fixed_quest_idx(q_idx)
-			&& !((q_idx == QUEST_OBERON) || (q_idx == QUEST_SERPENT))))
-			note_level = _("クエスト:", "Quest:");
-		else
-		{
-#ifdef JP
-			sprintf(note_level_buf, "%d階(%s):", (int)creature_ptr->current_floor_ptr->dun_level, d_name + d_info[creature_ptr->dungeon_idx].name);
-#else
-			sprintf(note_level_buf, "%s L%d:", d_name + d_info[creature_ptr->dungeon_idx].name, (int)creature_ptr->current_floor_ptr->dun_level);
-#endif
-			note_level = note_level_buf;
-		}
-	}
-
-	switch (type)
-	{
-	case DIARY_DIALY:
-	{
-		if (day < MAX_DAYS) fprintf(fff, _("%d日目\n", "Day %d\n"), day);
-		else fputs(_("*****日目\n", "Day *****\n"), fff);
-		do_level = FALSE;
-		break;
-	}
-	case DIARY_DESCRIPTION:
-	{
-		if (num)
-		{
-			fprintf(fff, "%s\n", note);
-			do_level = FALSE;
-		}
-		else
-			fprintf(fff, " %2d:%02d %20s %s\n", hour, min, note_level, note);
-		break;
-	}
-	case DIARY_ART:
-	{
-		fprintf(fff, _(" %2d:%02d %20s %sを発見した。\n", " %2d:%02d %20s discovered %s.\n"), hour, min, note_level, note);
-		break;
-	}
-	case DIARY_ART_SCROLL:
-	{
-		fprintf(fff, _(" %2d:%02d %20s 巻物によって%sを生成した。\n", " %2d:%02d %20s created %s by scroll.\n"), hour, min, note_level, note);
-		break;
-	}
-	case DIARY_UNIQUE:
-	{
-		fprintf(fff, _(" %2d:%02d %20s %sを倒した。\n", " %2d:%02d %20s defeated %s.\n"), hour, min, note_level, note);
-		break;
-	}
-	case DIARY_FIX_QUEST_C:
-	{
-		if (quest[num].flags & QUEST_FLAG_SILENT) break;
-		fprintf(fff, _(" %2d:%02d %20s クエスト「%s」を達成した。\n",
-			" %2d:%02d %20s completed quest '%s'.\n"), hour, min, note_level, quest[num].name);
-		break;
-	}
-	case DIARY_FIX_QUEST_F:
-	{
-		if (quest[num].flags & QUEST_FLAG_SILENT) break;
-		fprintf(fff, _(" %2d:%02d %20s クエスト「%s」から命からがら逃げ帰った。\n",
-			" %2d:%02d %20s run away from quest '%s'.\n"), hour, min, note_level, quest[num].name);
-		break;
-	}
-	case DIARY_RAND_QUEST_C:
-	{
-		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);
-		break;
-	}
-	case DIARY_RAND_QUEST_F:
-	{
-		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);
-		break;
-	}
-	case DIARY_MAXDEAPTH:
-	{
-		fprintf(fff, _(" %2d:%02d %20s %sの最深階%d階に到達した。\n",
-			" %2d:%02d %20s reached level %d of %s for the first time.\n"), hour, min, note_level,
-			_(d_name + d_info[creature_ptr->dungeon_idx].name, num),
-			_(num, d_name + d_info[creature_ptr->dungeon_idx].name));
-		break;
-	}
-	case DIARY_TRUMP:
-	{
-		fprintf(fff, _(" %2d:%02d %20s %s%sの最深階を%d階にセットした。\n",
-			" %2d:%02d %20s reset recall level of %s to %d %s.\n"), hour, min, note_level, note,
-			_(d_name + d_info[num].name, (int)max_dlv[num]),
-			_((int)max_dlv[num], d_name + d_info[num].name));
-		break;
-	}
-	case DIARY_STAIR:
-	{
-		concptr to;
-		if (q_idx && (is_fixed_quest_idx(q_idx)
-			&& !((q_idx == QUEST_OBERON) || (q_idx == QUEST_SERPENT))))
-		{
-			to = _("地上", "the surface");
-		}
-		else
-		{
-			if (!(creature_ptr->current_floor_ptr->dun_level + num)) to = _("地上", "the surface");
-			else to = format(_("%d階", "level %d"), creature_ptr->current_floor_ptr->dun_level + num);
-		}
-		fprintf(fff, _(" %2d:%02d %20s %sへ%s。\n", " %2d:%02d %20s %s %s.\n"), hour, min, note_level, _(to, note), _(note, to));
-		break;
-	}
-	case DIARY_RECALL:
-	{
-		if (!num)
-			fprintf(fff, _(" %2d:%02d %20s 帰還を使って%sの%d階へ下りた。\n", " %2d:%02d %20s recalled to dungeon level %d of %s.\n"),
-				hour, min, note_level, _(d_name + d_info[creature_ptr->dungeon_idx].name, (int)max_dlv[creature_ptr->dungeon_idx]),
-				_((int)max_dlv[creature_ptr->dungeon_idx], d_name + d_info[creature_ptr->dungeon_idx].name));
-		else
-			fprintf(fff, _(" %2d:%02d %20s 帰還を使って地上へと戻った。\n", " %2d:%02d %20s recalled from dungeon to surface.\n"), hour, min, note_level);
-		break;
-	}
-	case DIARY_TO_QUEST:
-	{
-		if (quest[num].flags & QUEST_FLAG_SILENT) break;
-		fprintf(fff, _(" %2d:%02d %20s クエスト「%s」へと突入した。\n", " %2d:%02d %20s entered the quest '%s'.\n"),
-			hour, min, note_level, quest[num].name);
-		break;
-	}
-	case DIARY_TELEPORT_LEVEL:
-	{
-		fprintf(fff, _(" %2d:%02d %20s レベル・テレポートで脱出した。\n", " %2d:%02d %20s Got out using teleport level.\n"),
-			hour, min, note_level);
-		break;
-	}
-	case DIARY_BUY:
-	{
-		fprintf(fff, _(" %2d:%02d %20s %sを購入した。\n", " %2d:%02d %20s bought %s.\n"), hour, min, note_level, note);
-		break;
-	}
-	case DIARY_SELL:
-	{
-		fprintf(fff, _(" %2d:%02d %20s %sを売却した。\n", " %2d:%02d %20s sold %s.\n"), hour, min, note_level, note);
-		break;
-	}
-	case DIARY_ARENA:
-	{
-		if (num < 0)
-		{
-			int n = -num;
-			fprintf(fff, _(" %2d:%02d %20s 闘技場の%d%s回戦で、%sの前に敗れ去った。\n", " %2d:%02d %20s beaten by %s in the %d%s fight.\n"),
-				hour, min, note_level, _(n, note), _("", n), _(note, get_ordinal_number_suffix(n)));
-			break;
-		}
-		fprintf(fff, _(" %2d:%02d %20s 闘技場の%d%s回戦(%s)に勝利した。\n", " %2d:%02d %20s won the %d%s fight (%s).\n"),
-			hour, min, note_level, num, _("", get_ordinal_number_suffix(num)), note);
-
-		if (num == MAX_ARENA_MONS)
-		{
-			fprintf(fff, _("                 闘技場のすべての敵に勝利し、チャンピオンとなった。\n",
-				"                 won all fights to become a Champion.\n"));
-			do_level = FALSE;
-		}
-		break;
-	}
-	case DIARY_FOUND:
-	{
-		fprintf(fff, _(" %2d:%02d %20s %sを識別した。\n", " %2d:%02d %20s identified %s.\n"), hour, min, note_level, note);
-		break;
-	}
-	case DIARY_WIZ_TELE:
-	{
-		concptr to;
-		if (!creature_ptr->current_floor_ptr->dun_level)
-			to = _("地上", "the surface");
-		else
-			to = format(_("%d階(%s)", "level %d of %s"), creature_ptr->current_floor_ptr->dun_level, d_name + d_info[creature_ptr->dungeon_idx].name);
-
-		fprintf(fff, _(" %2d:%02d %20s %sへとウィザード・テレポートで移動した。\n",
-			" %2d:%02d %20s wizard-teleport to %s.\n"), hour, min, note_level, to);
-		break;
-	}
-	case DIARY_PAT_TELE:
-	{
-		concptr to;
-		if (!creature_ptr->current_floor_ptr->dun_level)
-			to = _("地上", "the surface");
-		else
-			to = format(_("%d階(%s)", "level %d of %s"), creature_ptr->current_floor_ptr->dun_level, d_name + d_info[creature_ptr->dungeon_idx].name);
-
-		fprintf(fff, _(" %2d:%02d %20s %sへとパターンの力で移動した。\n",
-			" %2d:%02d %20s used Pattern to teleport to %s.\n"), hour, min, note_level, to);
-		break;
-	}
-	case DIARY_LEVELUP:
-	{
-		fprintf(fff, _(" %2d:%02d %20s レベルが%dに上がった。\n", " %2d:%02d %20s reached player level %d.\n"), hour, min, note_level, num);
-		break;
-	}
-	case DIARY_GAMESTART:
-	{
-		time_t ct = time((time_t*)0);
-		do_level = FALSE;
-		if (num)
-		{
-			fprintf(fff, "%s %s", note, ctime(&ct));
-		}
-		else
-			fprintf(fff, " %2d:%02d %20s %s %s", hour, min, note_level, note, ctime(&ct));
-		break;
-	}
-	case DIARY_NAMED_PET:
-	{
-		fprintf(fff, " %2d:%02d %20s ", hour, min, note_level);
-		switch (num)
-		{
-		case RECORD_NAMED_PET_NAME:
-			fprintf(fff, _("%sを旅の友にすることに決めた。\n", "decided to travel together with %s.\n"), note);
-			break;
-		case RECORD_NAMED_PET_UNNAME:
-			fprintf(fff, _("%sの名前を消した。\n", "unnamed %s.\n"), note);
-			break;
-		case RECORD_NAMED_PET_DISMISS:
-			fprintf(fff, _("%sを解放した。\n", "dismissed %s.\n"), note);
-			break;
-		case RECORD_NAMED_PET_DEATH:
-			fprintf(fff, _("%sが死んでしまった。\n", "%s died.\n"), note);
-			break;
-		case RECORD_NAMED_PET_MOVED:
-			fprintf(fff, _("%sをおいて別のマップへ移動した。\n", "moved to another map leaving %s behind.\n"), note);
-			break;
-		case RECORD_NAMED_PET_LOST_SIGHT:
-			fprintf(fff, _("%sとはぐれてしまった。\n", "lost sight of %s.\n"), note);
-			break;
-		case RECORD_NAMED_PET_DESTROY:
-			fprintf(fff, _("%sが*破壊*によって消え去った。\n", "%s was killed by *destruction*.\n"), note);
-			break;
-		case RECORD_NAMED_PET_EARTHQUAKE:
-			fprintf(fff, _("%sが岩石に押し潰された。\n", "%s was crushed by falling rocks.\n"), note);
-			break;
-		case RECORD_NAMED_PET_GENOCIDE:
-			fprintf(fff, _("%sが抹殺によって消え去った。\n", "%s was a victim of genocide.\n"), note);
-			break;
-		case RECORD_NAMED_PET_WIZ_ZAP:
-			fprintf(fff, _("%sがデバッグコマンドによって消え去った。\n", "%s was removed by debug command.\n"), note);
-			break;
-		case RECORD_NAMED_PET_TELE_LEVEL:
-			fprintf(fff, _("%sがテレポート・レベルによって消え去った。\n", "%s was lost after teleporting a level.\n"), note);
-			break;
-		case RECORD_NAMED_PET_BLAST:
-			fprintf(fff, _("%sを爆破した。\n", "blasted %s.\n"), note);
-			break;
-		case RECORD_NAMED_PET_HEAL_LEPER:
-			fprintf(fff, _("%sの病気が治り旅から外れた。\n", "%s was healed and left.\n"), note);
-			break;
-		case RECORD_NAMED_PET_COMPACT:
-			fprintf(fff, _("%sがモンスター情報圧縮によって消え去った。\n", "%s was lost when the monster list was pruned.\n"), note);
-			break;
-		case RECORD_NAMED_PET_LOSE_PARENT:
-			fprintf(fff, _("%sの召喚者が既にいないため消え去った。\n", "%s disappeared because its summoner left.\n"), note);
-			break;
-
-		default:
-			fprintf(fff, "\n");
-			break;
-		}
-		break;
-	}
-
-	case DIARY_WIZARD_LOG:
-		fprintf(fff, "%s\n", note);
-		break;
-
-	default:
-		break;
-	}
-
-	my_fclose(fff);
-
-	if (do_level) write_level = FALSE;
-
-	return 0;
-}
-
-
-#define MAX_SUBTITLE (sizeof(subtitle)/sizeof(subtitle[0]))
-
-/*!
- * @brief 日記のタイトル表記と内容出力 /
+ * @brief 日記のタイトル表記と内容出力
+ * @param creature_ptr プレーヤーへの参照ポインタ
  * @return なし
- * @details
- * 日記のタイトルは本関数の subtitle ローカル変数で定義されている。
  */
 static void display_diary(player_type *creature_ptr)
 {
@@ -758,76 +311,6 @@ static void display_diary(player_type *creature_ptr)
 	GAME_TEXT file_name[MAX_NLEN];
 	char buf[1024];
 	char tmp[80];
-#ifdef JP
-	static const char subtitle[][30] = {
-		"最強の肉体を求めて",
-		"人生それははかない",
-		"明日に向かって",
-		"棚からぼたもち",
-		"あとの祭り",
-		"それはいい考えだ",
-		"何とでも言え",
-		"兎にも角にも",
-		"ウソだけど",
-		"もはやこれまで",
-		"なんでこうなるの",
-		"それは無理だ",
-		"倒すべき敵はゲ○ツ",
-		"ん～？聞こえんなぁ",
-		"オレの名を言ってみろ",
-		"頭が変になっちゃった",
-		"互換しません",
-		"せっかくだから",
-		"まだまだ甘いね",
-		"むごいむごすぎる",
-		"こんなもんじゃない",
-		"だめだこりゃ",
-		"次いってみよう",
-		"ちょっとだけよ",
-		"哀しき冒険者",
-		"野望の果て",
-		"無限地獄",
-		"神に喧嘩を売る者",
-		"未知の世界へ",
-		"最高の頭脳を求めて"
-	};
-#else
-	static const char subtitle[][51] = {
-		"Quest of The World's Toughest Body",
-		"Attack is the best form of defence.",
-		"Might is right.",
-		"An unexpected windfall",
-		"A drowning man will catch at a straw",
-		"Don't count your chickens before they are hatched.",
-		"It is no use crying over spilt milk.",
-		"Seeing is believing.",
-		"Strike the iron while it is hot.",
-		"I don't care what follows.",
-		"To dig a well to put out a house on fire.",
-		"Tomorrow is another day.",
-		"Easy come, easy go.",
-		"The more haste, the less speed.",
-		"Where there is life, there is hope.",
-		"There is no royal road to *WINNER*.",
-		"Danger past, God forgotten.",
-		"The best thing to do now is to run away.",
-		"Life is but an empty dream.",
-		"Dead men tell no tales.",
-		"A book that remains shut is but a block.",
-		"Misfortunes never come singly.",
-		"A little knowledge is a dangerous thing.",
-		"History repeats itself.",
-		"*WINNER* was not built in a day.",
-		"Ignorance is bliss.",
-		"To lose is to win?",
-		"No medicine can cure folly.",
-		"All good things come to an end.",
-		"M$ Empire strikes back.",
-		"To see is to believe",
-		"Time is money.",
-		"Quest of The World's Greatest Brain"
-	};
-#endif
 	sprintf(file_name, _("playrecord-%s.txt", "playrec-%s.txt"), savefile_base);
 	path_build(buf, sizeof(buf), ANGBAND_DIR_USER, file_name);
 
@@ -843,7 +326,6 @@ static void display_diary(player_type *creature_ptr)
 	sprintf(diary_title, "Legend of %s %s '%s'", ap_ptr->title, creature_ptr->name, tmp);
 #endif
 
-	/* Display the file contents */
 	(void)show_file(creature_ptr, FALSE, buf, diary_title, -1, 0);
 }
 
@@ -856,7 +338,6 @@ static void add_diary_note(player_type *creature_ptr)
 {
 	char tmp[80] = "\0";
 	char bunshou[80] = "\0";
-
 	if (get_string(_("内容: ", "diary note: "), tmp, 79))
 	{
 		strcpy(bunshou, tmp);
@@ -921,33 +402,20 @@ static void do_cmd_erase_diary(void)
  */
 void do_cmd_diary(player_type *creature_ptr)
 {
-	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
 	screen_save();
-
-	/* Interact until done */
 	int i;
 	while (TRUE)
 	{
 		Term_clear();
-
-		/* Ask for a choice */
 		prt(_("[ 記録の設定 ]", "[ Play Record ]"), 2, 0);
-
-		/* Give some choices */
 		prt(_("(1) 記録を見る", "(1) Display your record"), 4, 5);
 		prt(_("(2) 文章を記録する", "(2) Add record"), 5, 5);
 		prt(_("(3) 直前に入手又は鑑定したものを記録する", "(3) Record the last item you got or identified"), 6, 5);
 		prt(_("(4) 記録を消去する", "(4) Delete your record"), 7, 5);
-
 		prt(_("(R) プレイ動画を記録する/中止する", "(R) Record playing movie / or stop it"), 9, 5);
-
-		/* Prompt */
 		prt(_("コマンド:", "Command: "), 18, 0);
-
-		/* Prompt */
 		i = inkey();
-
 		if (i == ESCAPE) break;
 
 		switch (i)
@@ -968,7 +436,7 @@ void do_cmd_diary(player_type *creature_ptr)
 			screen_load();
 			prepare_movie_hooks();
 			return;
-		default: /* Unknown option */
+		default:
 			bell();
 		}
 
@@ -999,7 +467,6 @@ void do_cmd_redraw(player_type *creature_ptr)
 {
 	Term_xtra(TERM_XTRA_REACT, 0);
 
-	/* Combine and Reorder the pack (later) */
 	creature_ptr->update |= (PU_COMBINE | PU_REORDER);
 	creature_ptr->update |= (PU_TORCH);
 	creature_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
@@ -1014,17 +481,13 @@ void do_cmd_redraw(player_type *creature_ptr)
 
 	update_playtime();
 	handle_stuff(creature_ptr);
-
 	if (creature_ptr->prace == RACE_ANDROID) calc_android_exp(creature_ptr);
 
-	/* Redraw every window */
 	term *old = Term;
 	for (int j = 0; j < 8; j++)
 	{
-		/* Dead window */
 		if (!angband_term[j]) continue;
 
-		/* Activate */
 		Term_activate(angband_term[j]);
 		Term_redraw();
 		Term_fresh();
@@ -1039,12 +502,9 @@ void do_cmd_redraw(player_type *creature_ptr)
  */
 void do_cmd_player_status(player_type *creature_ptr)
 {
-	char c;
 	int mode = 0;
 	char tmp[160];
 	screen_save();
-
-	/* Forever */
 	while (TRUE)
 	{
 		update_playtime();
@@ -1056,24 +516,16 @@ void do_cmd_player_status(player_type *creature_ptr)
 			display_player(creature_ptr, mode, map_name);
 		}
 
-		/* Prompt */
 		Term_putstr(2, 23, -1, TERM_WHITE,
 			_("['c'で名前変更, 'f'でファイルへ書出, 'h'でモード変更, ESCで終了]", "['c' to change name, 'f' to file, 'h' to change mode, or ESC]"));
-
-		/* Query */
-		c = inkey();
+		char c = inkey();
 		if (c == ESCAPE) break;
 
-		/* Change name */
 		if (c == 'c')
 		{
 			get_name(creature_ptr);
-
-			/* Process the player name */
 			process_player_name(creature_ptr, FALSE);
 		}
-
-		/* File dump */
 		else if (c == 'f')
 		{
 			sprintf(tmp, "%s.txt", creature_ptr->base_name);
@@ -1085,7 +537,6 @@ void do_cmd_player_status(player_type *creature_ptr)
 				}
 			}
 		}
-
 		else if (c == 'h')
 		{
 			mode++;
@@ -1100,7 +551,6 @@ void do_cmd_player_status(player_type *creature_ptr)
 
 	screen_load();
 	creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
-
 	handle_stuff(creature_ptr);
 }
 
@@ -1112,7 +562,6 @@ void do_cmd_player_status(player_type *creature_ptr)
  */
 void do_cmd_message_one(void)
 {
-	/* Recall one message */
 	prt(format("> %s", message_str(0)), 0, 0);
 }
 
@@ -1145,107 +594,59 @@ void do_cmd_messages(int num_now)
 	char back_str[81];
 	concptr shower = NULL;
 	int wid, hgt;
-	int num_lines;
-
 	Term_get_size(&wid, &hgt);
-
-	/* Number of message lines in a screen */
-	num_lines = hgt - 4;
-
-	/* Wipe finder */
+	int num_lines = hgt - 4;
 	strcpy(finder_str, "");
-
-	/* Wipe shower */
 	strcpy(shower_str, "");
-
-	/* Total messages */
 	int n = message_num();
-
-	/* Start on first message */
 	int i = 0;
 	screen_save();
 	Term_clear();
-
-	/* Process requests until done */
 	while (TRUE)
 	{
 		int j;
 		int skey;
-
-		/* Dump up to 20 lines of messages */
 		for (j = 0; (j < num_lines) && (i + j < n); 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);
-
 			if (!shower || !shower[0]) continue;
 
-			/* Hilite "shower" */
 			concptr str = msg;
-
-			/* Display matches */
 			while ((str = my_strstr(str, shower)) != NULL)
 			{
 				int len = strlen(shower);
-
-				/* Display the match */
 				Term_putstr(str - msg, num_lines + 1 - j, len, TERM_YELLOW, shower);
-
-				/* Advance */
 				str += len;
 			}
 		}
 
-		/* Erase remaining lines */
-		for (; j < num_lines; j++) Term_erase(0, num_lines + 1 - j, 255);
+		for (; j < num_lines; j++)
+			Term_erase(0, num_lines + 1 - j, 255);
 
-		/* Display header */
-		/* translation */
 		prt(format(_("以前のメッセージ %d-%d 全部で(%d)", "Message Recall (%d-%d of %d)"),
 			i, i + j - 1, n), 0, 0);
-
-		/* Display prompt (not very informative) */
 		prt(_("[ 'p' で更に古いもの, 'n' で更に新しいもの, '/' で検索, ESC で中断 ]",
 			"[Press 'p' for older, 'n' for newer, ..., or ESCAPE]"), hgt - 1, 0);
-
 		skey = inkey_special(TRUE);
-
-		/* Exit on Escape */
 		if (skey == ESCAPE) break;
 
-		/* Hack -- Save the old index */
 		j = i;
-
 		switch (skey)
 		{
-			/* Hack -- handle show */
 		case '=':
-			/* Prompt */
 			prt(_("強調: ", "Show: "), hgt - 1, 0);
-
-			/* Get a "shower" string, or continue */
 			strcpy(back_str, shower_str);
 			if (askfor(shower_str, 80))
-			{
-				/* Show it */
 				shower = shower_str[0] ? shower_str : NULL;
-			}
-			else strcpy(shower_str, back_str);
+			else
+				strcpy(shower_str, back_str);
 
 			continue;
-
-			/* Hack -- handle find */
 		case '/':
 		case KTRL('s'):
 		{
-			int z;
-
-			/* Prompt */
 			prt(_("検索: ", "Find: "), hgt - 1, 0);
-
-			/* Get a "finder" string, or continue */
 			strcpy(back_str, finder_str);
 			if (!askfor(finder_str, 80))
 			{
@@ -1254,89 +655,59 @@ void do_cmd_messages(int num_now)
 			}
 			else if (!finder_str[0])
 			{
-				shower = NULL; /* Stop showing */
+				shower = NULL;
 				continue;
 			}
 
-			/* Show it */
 			shower = finder_str;
-
-			/* Scan messages */
-			for (z = i + 1; z < n; z++)
+			for (int z = i + 1; z < n; z++)
 			{
 				concptr msg = message_str(z);
-
-				/* Search for it */
 				if (my_strstr(msg, finder_str))
 				{
-					/* New location */
 					i = z;
-
 					break;
 				}
 			}
 		}
+
 		break;
 
-		/* Recall 1 older message */
 		case SKEY_TOP:
-			/* Go to the oldest line */
 			i = n - num_lines;
 			break;
-
-			/* Recall 1 newer message */
 		case SKEY_BOTTOM:
-			/* Go to the newest line */
 			i = 0;
 			break;
-
-			/* Recall 1 older message */
 		case '8':
 		case SKEY_UP:
 		case '\n':
 		case '\r':
-			/* Go older if legal */
 			i = MIN(i + 1, n - num_lines);
 			break;
-
-			/* Recall 10 older messages */
 		case '+':
-			/* Go older if legal */
 			i = MIN(i + 10, n - num_lines);
 			break;
-
-			/* Recall 20 older messages */
 		case 'p':
 		case KTRL('P'):
 		case ' ':
 		case SKEY_PGUP:
-			/* Go older if legal */
 			i = MIN(i + num_lines, n - num_lines);
 			break;
-
-			/* Recall 20 newer messages */
 		case 'n':
 		case KTRL('N'):
 		case SKEY_PGDOWN:
-			/* Go newer (if able) */
 			i = MAX(0, i - num_lines);
 			break;
-
-			/* Recall 10 newer messages */
 		case '-':
-			/* Go newer (if able) */
 			i = MAX(0, i - 10);
 			break;
-
-			/* Recall 1 newer messages */
 		case '2':
 		case SKEY_DOWN:
-			/* Go newer (if able) */
 			i = MAX(0, i - 1);
 			break;
 		}
 
-		/* Hack -- Error of some kind */
 		if (i == j) bell();
 	}
 
@@ -1356,11 +727,8 @@ void do_cmd_pref(player_type *creature_ptr)
 {
 	char buf[80];
 	strcpy(buf, "");
-
-	/* Ask for a "user pref command" */
 	if (!get_string(_("設定変更コマンド: ", "Pref: "), buf, 80)) return;
 
-	/* Process that pref command */
 	(void)interpret_pref_file(creature_ptr, buf);
 }
 
@@ -1372,8 +740,9 @@ void do_cmd_pref(player_type *creature_ptr)
  */
 void do_cmd_reload_autopick(player_type *creature_ptr)
 {
-	if (!get_check(_("自動拾い設定ファイルをロードしますか? ", "Reload auto-pick preference file? "))) return;
-	/* Load the file with messages */
+	if (!get_check(_("自動拾い設定ファイルをロードしますか? ", "Reload auto-pick preference file? ")))
+		return;
+
 	autopick_load_pref(creature_ptr, TRUE);
 }
 
@@ -1388,32 +757,16 @@ static errr macro_dump(concptr fname)
 	static concptr mark = "Macro Dump";
 	char buf[1024];
 	path_build(buf, sizeof(buf), ANGBAND_DIR_USER, fname);
-
-	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
-
-	/* Append to the file */
 	if (!open_auto_dump(buf, mark)) return -1;
 
-	/* Start dumping */
 	auto_dump_printf(_("\n# 自動マクロセーブ\n\n", "\n# Automatic macro dump\n\n"));
-
-	/* Dump them */
 	for (int i = 0; i < macro__num; i++)
 	{
-		/* Extract the action */
 		ascii_to_text(buf, macro__act[i]);
-
-		/* Dump the macro */
 		auto_dump_printf("A:%s\n", buf);
-
-		/* Extract the action */
 		ascii_to_text(buf, macro__pat[i]);
-
-		/* Dump normal macros */
 		auto_dump_printf("P:%s\n", buf);
-
-		/* End the macro */
 		auto_dump_printf("\n");
 	}
 
@@ -1437,40 +790,21 @@ static errr macro_dump(concptr fname)
 static void do_cmd_macro_aux(char *buf)
 {
 	flush();
-
-	/* Do not process macros */
 	inkey_base = TRUE;
-
-	/* First key */
 	char i = inkey();
-
-	/* Read the pattern */
 	int n = 0;
 	while (i)
 	{
-		/* Save the key */
 		buf[n++] = i;
-
-		/* Do not process macros */
 		inkey_base = TRUE;
-
-		/* Do not wait for keys */
 		inkey_scan = TRUE;
-
-		/* Attempt to read a key */
 		i = inkey();
 	}
 
-	/* Terminate */
 	buf[n] = '\0';
-
 	flush();
-
-	/* Convert the trigger */
 	char tmp[1024];
 	ascii_to_text(tmp, buf);
-
-	/* Hack -- display the trigger */
 	Term_addstr(-1, TERM_WHITE, tmp);
 }
 
@@ -1489,19 +823,11 @@ static void do_cmd_macro_aux(char *buf)
 static void do_cmd_macro_aux_keymap(char *buf)
 {
 	char tmp[1024];
-
 	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();
 }
 
@@ -1518,52 +844,31 @@ static errr keymap_dump(concptr fname)
 	static concptr mark = "Keymap Dump";
 	char key[1024];
 	char buf[1024];
-
 	BIT_FLAGS mode;
-
-	/* Roguelike */
 	if (rogue_like_commands)
 	{
 		mode = KEYMAP_MODE_ROGUE;
 	}
-
-	/* Original */
 	else
 	{
 		mode = KEYMAP_MODE_ORIG;
 	}
 
 	path_build(buf, sizeof(buf), ANGBAND_DIR_USER, fname);
-
-	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
-
-	/* Append to the file */
 	if (!open_auto_dump(buf, mark)) return -1;
 
-	/* Start dumping */
 	auto_dump_printf(_("\n# 自動キー配置セーブ\n\n", "\n# Automatic keymap dump\n\n"));
-
-	/* Dump them */
 	for (int i = 0; i < 256; i++)
 	{
 		concptr act;
-
-		/* Loop up the keymap */
 		act = keymap_act[mode][i];
-
-		/* Skip empty keymaps */
 		if (!act) continue;
 
-		/* Encode the key */
 		buf[0] = (char)i;
 		buf[1] = '\0';
 		ascii_to_text(key, buf);
-
-		/* Encode the action */
 		ascii_to_text(buf, act);
-
-		/* Dump the macro */
 		auto_dump_printf("A:%s\n", buf);
 		auto_dump_printf("C:%d:%s\n", mode, key);
 	}
@@ -1586,45 +891,28 @@ static errr keymap_dump(concptr fname)
  */
 void do_cmd_macros(player_type *creature_ptr)
 {
-	int i;
 	char tmp[1024];
 	char buf[1024];
 	BIT_FLAGS mode;
-
-	/* Roguelike */
 	if (rogue_like_commands)
 	{
 		mode = KEYMAP_MODE_ROGUE;
 	}
-
-	/* Original */
 	else
 	{
 		mode = KEYMAP_MODE_ORIG;
 	}
 
-	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
-
 	screen_save();
-
-	/* Process requests until done */
 	while (TRUE)
 	{
 		Term_clear();
 		prt(_("[ マクロの設定 ]", "Interact with Macros"), 2, 0);
-
-		/* Describe that action */
 		prt(_("マクロ行動が(もしあれば)下に表示されます:", "Current action (if any) shown below:"), 20, 0);
-
-		/* Analyze the current action */
 		ascii_to_text(buf, macro__buf);
-
-		/* Display the current action */
 		prt(buf, 22, 0);
 
-
-		/* Selections */
 		prt(_("(1) ユーザー設定ファイルのロード", "(1) Load a user pref file"), 4, 5);
 		prt(_("(2) ファイルにマクロを追加", "(2) Append macros to a file"), 5, 5);
 		prt(_("(3) マクロの確認", "(3) Query a macro"), 6, 5);
@@ -1636,317 +924,145 @@ void do_cmd_macros(player_type *creature_ptr)
 		prt(_("(9) キー配置の削除", "(9) Remove a keymap"), 12, 5);
 		prt(_("(0) マクロ行動の入力", "(0) Enter a new action"), 13, 5);
 
-		/* Prompt */
 		prt(_("コマンド: ", "Command: "), 16, 0);
-
-		i = inkey();
-
-		/* Leave */
+		int i = inkey();
 		if (i == ESCAPE) break;
 
-		/* Load a 'macro' file */
 		else if (i == '1')
 		{
-			errr err;
-
-			/* Prompt */
 			prt(_("コマンド: ユーザー設定ファイルのロード", "Command: Load a user pref file"), 16, 0);
-
-			/* Prompt */
 			prt(_("ファイル: ", "File: "), 18, 0);
-
-			/* Default filename */
 			sprintf(tmp, "%s.prf", creature_ptr->base_name);
-
-			/* Ask for a file */
 			if (!askfor(tmp, 80)) continue;
 
-			/* Process the given filename */
-			err = process_pref_file(creature_ptr, tmp);
+			errr err = process_pref_file(creature_ptr, tmp);
 			if (-2 == err)
-			{
 				msg_format(_("標準の設定ファイル'%s'を読み込みました。", "Loaded default '%s'."), tmp);
-			}
 			else if (err)
-			{
-				/* Prompt */
 				msg_format(_("'%s'の読み込みに失敗しました！", "Failed to load '%s'!"), tmp);
-			}
 			else
-			{
 				msg_format(_("'%s'を読み込みました。", "Loaded '%s'."), tmp);
-			}
 		}
-
-		/* Save macros */
 		else if (i == '2')
 		{
-			/* Prompt */
 			prt(_("コマンド: マクロをファイルに追加する", "Command: Append macros to a file"), 16, 0);
-
-			/* Prompt */
 			prt(_("ファイル: ", "File: "), 18, 0);
-
-			/* Default filename */
 			sprintf(tmp, "%s.prf", creature_ptr->base_name);
-
-			/* Ask for a file */
 			if (!askfor(tmp, 80)) continue;
 
-			/* Dump the macros */
 			(void)macro_dump(tmp);
-
-			/* Prompt */
 			msg_print(_("マクロを追加しました。", "Appended macros."));
 		}
-
-		/* Query a macro */
 		else if (i == '3')
 		{
-			int k;
-
-			/* Prompt */
 			prt(_("コマンド: マクロの確認", "Command: Query a macro"), 16, 0);
-
-
-			/* Prompt */
 			prt(_("トリガーキー: ", "Trigger: "), 18, 0);
-
-			/* Get a macro trigger */
 			do_cmd_macro_aux(buf);
-
-			/* Acquire action */
-			k = macro_find_exact(buf);
-
-			/* Nothing found */
+			int k = macro_find_exact(buf);
 			if (k < 0)
 			{
-				/* Prompt */
 				msg_print(_("そのキーにはマクロは定義されていません。", "Found no macro."));
 			}
-
-			/* Found one */
 			else
 			{
-				/* Obtain the action */
 				strcpy(macro__buf, macro__act[k]);
-
-				/* Analyze the current action */
 				ascii_to_text(buf, macro__buf);
-
-				/* Display the current action */
 				prt(buf, 22, 0);
-
-				/* Prompt */
 				msg_print(_("マクロを確認しました。", "Found a macro."));
 			}
 		}
-
-		/* Create a macro */
 		else if (i == '4')
 		{
-			/* Prompt */
 			prt(_("コマンド: マクロの作成", "Command: Create a macro"), 16, 0);
-
-			/* Prompt */
 			prt(_("トリガーキー: ", "Trigger: "), 18, 0);
-
-			/* Get a macro trigger */
 			do_cmd_macro_aux(buf);
 			clear_from(20);
-
-			/* Help message */
 			c_prt(TERM_L_RED, _("カーソルキーの左右でカーソル位置を移動。BackspaceかDeleteで一文字削除。",
 				"Press Left/Right arrow keys to move cursor. Backspace/Delete to delete a char."), 22, 0);
-
-			/* Prompt */
 			prt(_("マクロ行動: ", "Action: "), 20, 0);
-
-			/* Convert to text */
 			ascii_to_text(tmp, macro__buf);
-
-			/* Get an encoded action */
 			if (askfor(tmp, 80))
 			{
-				/* Convert to ascii */
 				text_to_ascii(macro__buf, tmp);
-
-				/* Link the macro */
 				macro_add(buf, macro__buf);
-
-				/* Prompt */
 				msg_print(_("マクロを追加しました。", "Added a macro."));
 			}
 		}
-
-		/* Remove a macro */
 		else if (i == '5')
 		{
-			/* Prompt */
 			prt(_("コマンド: マクロの削除", "Command: Remove a macro"), 16, 0);
-
-			/* Prompt */
 			prt(_("トリガーキー: ", "Trigger: "), 18, 0);
-
-			/* Get a macro trigger */
 			do_cmd_macro_aux(buf);
-
-			/* Link the macro */
 			macro_add(buf, buf);
-
-			/* Prompt */
 			msg_print(_("マクロを削除しました。", "Removed a macro."));
 		}
-
-		/* Save keymaps */
 		else if (i == '6')
 		{
-			/* Prompt */
 			prt(_("コマンド: キー配置をファイルに追加する", "Command: Append keymaps to a file"), 16, 0);
-
-			/* Prompt */
 			prt(_("ファイル: ", "File: "), 18, 0);
-
-			/* Default filename */
 			sprintf(tmp, "%s.prf", creature_ptr->base_name);
-
-			/* Ask for a file */
 			if (!askfor(tmp, 80)) continue;
 
-			/* Dump the macros */
 			(void)keymap_dump(tmp);
-
-			/* Prompt */
 			msg_print(_("キー配置を追加しました。", "Appended keymaps."));
 		}
-
-		/* Query a keymap */
 		else if (i == '7')
 		{
-			concptr act;
-
-			/* Prompt */
 			prt(_("コマンド: キー配置の確認", "Command: Query a keymap"), 16, 0);
-
-			/* Prompt */
 			prt(_("押すキー: ", "Keypress: "), 18, 0);
-
-			/* Get a keymap trigger */
 			do_cmd_macro_aux_keymap(buf);
-
-			/* Look up the keymap */
-			act = keymap_act[mode][(byte)(buf[0])];
-
-			/* Nothing found */
+			concptr act = keymap_act[mode][(byte)(buf[0])];
 			if (!act)
 			{
-				/* Prompt */
 				msg_print(_("キー配置は定義されていません。", "Found no keymap."));
 			}
-
-			/* Found one */
 			else
 			{
-				/* Obtain the action */
 				strcpy(macro__buf, act);
-
-				/* Analyze the current action */
 				ascii_to_text(buf, macro__buf);
-
-				/* Display the current action */
 				prt(buf, 22, 0);
-
-				/* Prompt */
 				msg_print(_("キー配置を確認しました。", "Found a keymap."));
 			}
 		}
-
-		/* Create a keymap */
 		else if (i == '8')
 		{
-			/* Prompt */
 			prt(_("コマンド: キー配置の作成", "Command: Create a keymap"), 16, 0);
-
-			/* Prompt */
 			prt(_("押すキー: ", "Keypress: "), 18, 0);
-
-			/* Get a keymap trigger */
 			do_cmd_macro_aux_keymap(buf);
 			clear_from(20);
-
-			/* Help message */
 			c_prt(TERM_L_RED, _("カーソルキーの左右でカーソル位置を移動。BackspaceかDeleteで一文字削除。",
 				"Press Left/Right arrow keys to move cursor. Backspace/Delete to delete a char."), 22, 0);
-
-			/* Prompt */
 			prt(_("行動: ", "Action: "), 20, 0);
-
-			/* Convert to text */
 			ascii_to_text(tmp, macro__buf);
-
-			/* Get an encoded action */
 			if (askfor(tmp, 80))
 			{
-				/* Convert to ascii */
 				text_to_ascii(macro__buf, tmp);
-
-				/* Free old keymap */
 				string_free(keymap_act[mode][(byte)(buf[0])]);
-
-				/* Make new keymap */
 				keymap_act[mode][(byte)(buf[0])] = string_make(macro__buf);
-
-				/* Prompt */
 				msg_print(_("キー配置を追加しました。", "Added a keymap."));
 			}
 		}
-
-		/* Remove a keymap */
 		else if (i == '9')
 		{
-			/* Prompt */
 			prt(_("コマンド: キー配置の削除", "Command: Remove a keymap"), 16, 0);
-
-			/* Prompt */
 			prt(_("押すキー: ", "Keypress: "), 18, 0);
-
-			/* Get a keymap trigger */
 			do_cmd_macro_aux_keymap(buf);
-
-			/* Free old keymap */
 			string_free(keymap_act[mode][(byte)(buf[0])]);
-
-			/* Make new keymap */
 			keymap_act[mode][(byte)(buf[0])] = NULL;
-
-			/* Prompt */
 			msg_print(_("キー配置を削除しました。", "Removed a keymap."));
 		}
-
-		/* Enter a new action */
 		else if (i == '0')
 		{
-			/* Prompt */
 			prt(_("コマンド: マクロ行動の入力", "Command: Enter a new action"), 16, 0);
 			clear_from(20);
-
-			/* Help message */
 			c_prt(TERM_L_RED, _("カーソルキーの左右でカーソル位置を移動。BackspaceかDeleteで一文字削除。",
 				"Press Left/Right arrow keys to move cursor. Backspace/Delete to delete a char."), 22, 0);
-
-			/* Prompt */
 			prt(_("マクロ行動: ", "Action: "), 20, 0);
-
-			/* Hack -- limit the value */
 			tmp[80] = '\0';
-
-			/* Get an encoded action */
 			if (!askfor(buf, 80)) continue;
 
-			/* Extract an action */
 			text_to_ascii(macro__buf, buf);
 		}
-
 		else
 		{
 			bell();
@@ -1964,15 +1080,9 @@ void do_cmd_macros(player_type *creature_ptr)
  */
 static concptr lighting_level_str[F_LIT_MAX] =
 {
-#ifdef JP
-	"標準色",
-	"明色",
-	"暗色",
-#else
-	"standard",
-	"brightly lit",
-	"darkened",
-#endif
+	_("標準色", "standard"),
+	_("明色", "brightly lit"),
+	_("暗色", "darkened"),
 };
 
 
@@ -1988,14 +1098,11 @@ static bool cmd_visuals_aux(int i, IDX *num, IDX max)
 	if (iscntrl(i))
 	{
 		char str[10] = "";
-		IDX tmp;
-
 		sprintf(str, "%d", *num);
-
 		if (!get_string(format("Input new number(0-%d): ", max - 1), str, 4))
 			return FALSE;
 
-		tmp = (IDX)strtol(str, NULL, 0);
+		IDX tmp = (IDX)strtol(str, NULL, 0);
 		if (tmp >= 0 && tmp < max)
 			*num = tmp;
 	}
@@ -2015,8 +1122,6 @@ static bool cmd_visuals_aux(int i, IDX *num, IDX max)
 static void print_visuals_menu(concptr choice_msg)
 {
 	prt(_("[ 画面表示の設定 ]", "Interact with Visuals"), 1, 0);
-
-	/* Give some choices */
 	prt(_("(0) ユーザー設定ファイルのロード", "(0) Load a user pref file"), 3, 5);
 	prt(_("(1) モンスターの 色/文字 をファイルに書き出す", "(1) Dump monster attr/chars"), 4, 5);
 	prt(_("(2) アイテムの   色/文字 をファイルに書き出す", "(2) Dump object attr/chars"), 5, 5);
@@ -2028,8 +1133,6 @@ static void print_visuals_menu(concptr choice_msg)
 	prt(_("(8) アイテムの   色/文字 を変更する (シンボルエディタ)", "(8) Change object attr/chars (visual mode)"), 11, 5);
 	prt(_("(9) 地形の       色/文字 を変更する (シンボルエディタ)", "(9) Change feature attr/chars (visual mode)"), 12, 5);
 	prt(_("(R) 画面表示方法の初期化", "(R) Reset visuals"), 13, 5);
-
-	/* Prompt */
 	prt(format("コマンド: %s", choice_msg ? choice_msg : _("", "")), 15, 0);
 }
 
@@ -2039,229 +1142,132 @@ static void print_visuals_menu(concptr choice_msg)
  */
 void do_cmd_visuals(player_type *creature_ptr)
 {
-	int i;
 	char tmp[160];
 	char buf[1024];
 	bool need_redraw = FALSE;
 	concptr empty_symbol = "<< ? >>";
-
 	if (use_bigtile) empty_symbol = "<< ?? >>";
 
-	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
 	screen_save();
-
-	/* Interact until done */
 	while (TRUE)
 	{
 		Term_clear();
-
-		/* Ask for a choice */
 		print_visuals_menu(NULL);
-
-		/* Prompt */
-		i = inkey();
-
+		int i = inkey();
 		if (i == ESCAPE) break;
 
 		switch (i)
 		{
-			/* Load a 'pref' file */
 		case '0':
-			/* Prompt */
+		{
 			prt(_("コマンド: ユーザー設定ファイルのロード", "Command: Load a user pref file"), 15, 0);
-
-			/* Prompt */
 			prt(_("ファイル: ", "File: "), 17, 0);
-
-			/* Default filename */
 			sprintf(tmp, "%s.prf", creature_ptr->base_name);
-
-			/* Query */
 			if (!askfor(tmp, 70)) continue;
 
-			/* Process the given filename */
 			(void)process_pref_file(creature_ptr, tmp);
-
 			need_redraw = TRUE;
 			break;
-
-			/* Dump monster attr/chars */
+		}
 		case '1':
 		{
 			static concptr mark = "Monster attr/chars";
-
-			/* Prompt */
 			prt(_("コマンド: モンスターの[色/文字]をファイルに書き出します", "Command: Dump monster attr/chars"), 15, 0);
-
-			/* Prompt */
 			prt(_("ファイル: ", "File: "), 17, 0);
-
-			/* Default filename */
 			sprintf(tmp, "%s.prf", creature_ptr->base_name);
-
-			/* Get a filename */
 			if (!askfor(tmp, 70)) continue;
-			path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 
-			/* Append to the file */
+			path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 			if (!open_auto_dump(buf, mark)) continue;
 
-			/* Start dumping */
 			auto_dump_printf(_("\n# モンスターの[色/文字]の設定\n\n", "\n# Monster attr/char definitions\n\n"));
-
-			/* Dump monsters */
 			for (i = 0; i < max_r_idx; i++)
 			{
 				monster_race *r_ptr = &r_info[i];
-
-				/* Skip non-entries */
 				if (!r_ptr->name) continue;
 
-				/* Dump a comment */
 				auto_dump_printf("# %s\n", (r_name + r_ptr->name));
-
-				/* Dump the monster attr/char info */
 				auto_dump_printf("R:%d:0x%02X/0x%02X\n\n", i,
 					(byte)(r_ptr->x_attr), (byte)(r_ptr->x_char));
 			}
 
-			/* Close */
 			close_auto_dump();
-
 			msg_print(_("モンスターの[色/文字]をファイルに書き出しました。", "Dumped monster attr/chars."));
-
 			break;
 		}
-
-		/* Dump object attr/chars */
 		case '2':
 		{
 			static concptr mark = "Object attr/chars";
-			KIND_OBJECT_IDX k_idx;
-
-			/* Prompt */
 			prt(_("コマンド: アイテムの[色/文字]をファイルに書き出します", "Command: Dump object attr/chars"), 15, 0);
-
-			/* Prompt */
 			prt(_("ファイル: ", "File: "), 17, 0);
-
-			/* Default filename */
 			sprintf(tmp, "%s.prf", creature_ptr->base_name);
-
-			/* Get a filename */
 			if (!askfor(tmp, 70)) continue;
-			path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 
-			/* Append to the file */
+			path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 			if (!open_auto_dump(buf, mark)) continue;
 
-			/* Start dumping */
 			auto_dump_printf(_("\n# アイテムの[色/文字]の設定\n\n", "\n# Object attr/char definitions\n\n"));
-
-			/* Dump objects */
-			for (k_idx = 0; k_idx < max_k_idx; k_idx++)
+			for (KIND_OBJECT_IDX k_idx = 0; k_idx < max_k_idx; k_idx++)
 			{
 				GAME_TEXT o_name[MAX_NLEN];
 				object_kind *k_ptr = &k_info[k_idx];
-
-				/* Skip non-entries */
 				if (!k_ptr->name) continue;
 
 				if (!k_ptr->flavor)
 				{
-					/* Tidy name */
 					strip_name(o_name, k_idx);
 				}
 				else
 				{
 					object_type forge;
-
-					/* Prepare dummy object */
 					object_prep(&forge, k_idx);
-
-					/* Get un-shuffled flavor name */
 					object_desc(creature_ptr, o_name, &forge, OD_FORCE_FLAVOR);
 				}
 
-				/* Dump a comment */
 				auto_dump_printf("# %s\n", o_name);
-
-				/* Dump the object attr/char info */
 				auto_dump_printf("K:%d:0x%02X/0x%02X\n\n", (int)k_idx,
 					(byte)(k_ptr->x_attr), (byte)(k_ptr->x_char));
 			}
 
-			/* Close */
 			close_auto_dump();
-
 			msg_print(_("アイテムの[色/文字]をファイルに書き出しました。", "Dumped object attr/chars."));
-
 			break;
 		}
-
-		/* Dump feature attr/chars */
 		case '3':
 		{
 			static concptr mark = "Feature attr/chars";
-
-			/* Prompt */
 			prt(_("コマンド: 地形の[色/文字]をファイルに書き出します", "Command: Dump feature attr/chars"), 15, 0);
-
-			/* Prompt */
 			prt(_("ファイル: ", "File: "), 17, 0);
-
-			/* Default filename */
 			sprintf(tmp, "%s.prf", creature_ptr->base_name);
-
-			/* Get a filename */
 			if (!askfor(tmp, 70)) continue;
-			path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 
-			/* Append to the file */
+			path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 			if (!open_auto_dump(buf, mark)) continue;
 
-			/* Start dumping */
 			auto_dump_printf(_("\n# 地形の[色/文字]の設定\n\n", "\n# Feature attr/char definitions\n\n"));
-
-			/* Dump features */
 			for (i = 0; i < max_f_idx; i++)
 			{
 				feature_type *f_ptr = &f_info[i];
-
-				/* Skip non-entries */
 				if (!f_ptr->name) continue;
-
-				/* Skip mimiccing features */
 				if (f_ptr->mimic != i) continue;
 
-				/* Dump a comment */
 				auto_dump_printf("# %s\n", (f_name + f_ptr->name));
-
-				/* Dump the feature attr/char info */
 				auto_dump_printf("F:%d:0x%02X/0x%02X:0x%02X/0x%02X:0x%02X/0x%02X\n\n", i,
 					(byte)(f_ptr->x_attr[F_LIT_STANDARD]), (byte)(f_ptr->x_char[F_LIT_STANDARD]),
 					(byte)(f_ptr->x_attr[F_LIT_LITE]), (byte)(f_ptr->x_char[F_LIT_LITE]),
 					(byte)(f_ptr->x_attr[F_LIT_DARK]), (byte)(f_ptr->x_char[F_LIT_DARK]));
 			}
 
-			/* Close */
 			close_auto_dump();
-
 			msg_print(_("地形の[色/文字]をファイルに書き出しました。", "Dumped feature attr/chars."));
-
 			break;
 		}
-
-		/* Modify monster attr/chars (numeric operation) */
 		case '4':
 		{
 			static concptr choice_msg = _("モンスターの[色/文字]を変更します", "Change monster attr/chars");
 			static MONRACE_IDX r = 0;
-
 			prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0);
-
-			/* Hack -- query until done */
 			while (TRUE)
 			{
 				monster_race *r_ptr = &r_info[r];
@@ -2273,31 +1279,19 @@ void do_cmd_visuals(player_type *creature_ptr)
 				TERM_COLOR ca = r_ptr->x_attr;
 				byte cc = r_ptr->x_char;
 
-				/* Label the object */
 				Term_putstr(5, 17, -1, TERM_WHITE,
 					format(_("モンスター = %d, 名前 = %-40.40s", "Monster = %d, Name = %-40.40s"), r, (r_name + r_ptr->name)));
-
-				/* Label the Default values */
 				Term_putstr(10, 19, -1, TERM_WHITE,
 					format(_("初期値  色 / 文字 = %3u / %3u", "Default attr/char = %3u / %3u"), da, dc));
-
 				Term_putstr(40, 19, -1, TERM_WHITE, empty_symbol);
 				Term_queue_bigchar(43, 19, da, dc, 0, 0);
-
-				/* Label the Current values */
 				Term_putstr(10, 20, -1, TERM_WHITE,
 					format(_("現在値  色 / 文字 = %3u / %3u", "Current attr/char = %3u / %3u"), ca, cc));
-
 				Term_putstr(40, 20, -1, TERM_WHITE, empty_symbol);
 				Term_queue_bigchar(43, 20, ca, cc, 0, 0);
-
-				/* Prompt */
 				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): "));
-
 				i = inkey();
-
-				/* All done */
 				if (i == ESCAPE) break;
 
 				if (iscntrl(i)) c = 'a' + i - KTRL('A');
@@ -2318,6 +1312,7 @@ void do_cmd_visuals(player_type *creature_ptr)
 						}
 					} while (!r_info[r].name);
 				}
+
 				break;
 				case 'a':
 					t = (int)r_ptr->x_attr;
@@ -2341,15 +1336,11 @@ void do_cmd_visuals(player_type *creature_ptr)
 
 			break;
 		}
-
-		/* Modify object attr/chars (numeric operation) */
 		case '5':
 		{
 			static concptr choice_msg = _("アイテムの[色/文字]を変更します", "Change object attr/chars");
 			static IDX k = 0;
 			prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0);
-
-			/* Hack -- query until done */
 			while (TRUE)
 			{
 				object_kind *k_ptr = &k_info[k];
@@ -2361,32 +1352,21 @@ void do_cmd_visuals(player_type *creature_ptr)
 				TERM_COLOR ca = k_ptr->x_attr;
 				SYMBOL_CODE cc = k_ptr->x_char;
 
-				/* Label the object */
 				Term_putstr(5, 17, -1, TERM_WHITE,
 					format(_("アイテム = %d, 名前 = %-40.40s", "Object = %d, Name = %-40.40s"),
 						k, k_name + (!k_ptr->flavor ? k_ptr->name : k_ptr->flavor_name)));
-
-				/* Label the Default values */
 				Term_putstr(10, 19, -1, TERM_WHITE,
 					format(_("初期値  色 / 文字 = %3d / %3d", "Default attr/char = %3d / %3d"), da, dc));
-
 				Term_putstr(40, 19, -1, TERM_WHITE, empty_symbol);
 				Term_queue_bigchar(43, 19, da, dc, 0, 0);
-
-				/* Label the Current values */
 				Term_putstr(10, 20, -1, TERM_WHITE,
 					format(_("現在値  色 / 文字 = %3d / %3d", "Current attr/char = %3d / %3d"), ca, cc));
-
 				Term_putstr(40, 20, -1, TERM_WHITE, empty_symbol);
 				Term_queue_bigchar(43, 20, ca, cc, 0, 0);
-
-				/* Prompt */
 				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): "));
 
 				i = inkey();
-
-				/* All done */
 				if (i == ESCAPE) break;
 
 				if (iscntrl(i)) c = 'a' + i - KTRL('A');
@@ -2407,6 +1387,7 @@ void do_cmd_visuals(player_type *creature_ptr)
 						}
 					} while (!k_info[k].name);
 				}
+
 				break;
 				case 'a':
 					t = (int)k_ptr->x_attr;
@@ -2430,16 +1411,12 @@ void do_cmd_visuals(player_type *creature_ptr)
 
 			break;
 		}
-
-		/* Modify feature attr/chars (numeric operation) */
 		case '6':
 		{
 			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);
-
-			/* Hack -- query until done */
 			while (TRUE)
 			{
 				feature_type *f_ptr = &f_info[f];
@@ -2451,43 +1428,22 @@ void do_cmd_visuals(player_type *creature_ptr)
 				TERM_COLOR ca = f_ptr->x_attr[lighting_level];
 				byte cc = f_ptr->x_char[lighting_level];
 
-				/* Label the object */
 				prt("", 17, 5);
 				Term_putstr(5, 17, -1, TERM_WHITE,
 					format(_("地形 = %d, 名前 = %s, 明度 = %s", "Terrain = %d, Name = %s, Lighting = %s"),
 						f, (f_name + f_ptr->name), lighting_level_str[lighting_level]));
-
-				/* Label the Default values */
 				Term_putstr(10, 19, -1, TERM_WHITE,
 					format(_("初期値  色 / 文字 = %3d / %3d", "Default attr/char = %3d / %3d"), da, dc));
-
 				Term_putstr(40, 19, -1, TERM_WHITE, empty_symbol);
 				Term_queue_bigchar(43, 19, da, dc, 0, 0);
-
-				/* Label the Current values */
-#ifdef JP
-				Term_putstr(10, 20, -1, TERM_WHITE,
-					format("現在値  色 / 文字 = %3d / %3d", ca, cc));
-#else
 				Term_putstr(10, 20, -1, TERM_WHITE,
-					format("Current attr/char = %3d / %3d", ca, cc));
-#endif
-
+					format(_("現在値  色 / 文字 = %3d / %3d", "Current attr/char = %3d / %3d"), ca, cc));
 				Term_putstr(40, 20, -1, TERM_WHITE, empty_symbol);
 				Term_queue_bigchar(43, 20, ca, cc, 0, 0);
-
-				/* Prompt */
-#ifdef JP
-				Term_putstr(0, 22, -1, TERM_WHITE,
-					"コマンド (n/N/^N/a/A/^A/c/C/^C/l/L/^L/d/D/^D/v/V/^V): ");
-#else
 				Term_putstr(0, 22, -1, TERM_WHITE,
-					"Command (n/N/^N/a/A/^A/c/C/^C/l/L/^L/d/D/^D/v/V/^V): ");
-#endif
+					_("コマンド (n/N/^N/a/A/^A/c/C/^C/l/L/^L/d/D/^D/v/V/^V): ", "Command (n/N/^N/a/A/^A/c/C/^C/l/L/^L/d/D/^D/v/V/^V): "));
 
 				i = inkey();
-
-				/* All done */
 				if (i == ESCAPE) break;
 
 				if (iscntrl(i)) c = 'a' + i - KTRL('A');
@@ -2508,6 +1464,7 @@ void do_cmd_visuals(player_type *creature_ptr)
 						}
 					} while (!f_info[f].name || (f_info[f].mimic != f));
 				}
+
 				break;
 				case 'a':
 					t = (int)f_ptr->x_attr[lighting_level];
@@ -2538,36 +1495,24 @@ void do_cmd_visuals(player_type *creature_ptr)
 
 			break;
 		}
-
-		/* Modify monster attr/chars (visual mode) */
 		case '7':
 			do_cmd_knowledge_monsters(creature_ptr, &need_redraw, TRUE, -1);
 			break;
-
-			/* Modify object attr/chars (visual mode) */
 		case '8':
 			do_cmd_knowledge_objects(creature_ptr, &need_redraw, TRUE, -1);
 			break;
-
-			/* Modify feature attr/chars (visual mode) */
 		case '9':
 		{
 			IDX lighting_level = F_LIT_STANDARD;
 			do_cmd_knowledge_features(&need_redraw, TRUE, -1, &lighting_level);
 			break;
 		}
-
-		/* Reset visuals */
 		case 'R':
 		case 'r':
-			/* Reset */
 			reset_visuals(creature_ptr);
-
 			msg_print(_("画面上の[色/文字]を初期値にリセットしました。", "Visual attr/char tables reset."));
 			need_redraw = TRUE;
 			break;
-
-			/* Unknown option */
 		default:
 			bell();
 			break;
@@ -2577,7 +1522,6 @@ void do_cmd_visuals(player_type *creature_ptr)
 	}
 
 	screen_load();
-
 	if (need_redraw) do_cmd_redraw(creature_ptr);
 }
 
@@ -2590,82 +1534,42 @@ void do_cmd_colors(player_type *creature_ptr)
 	int i;
 	char tmp[160];
 	char buf[1024];
-
-	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
-
 	screen_save();
-
-	/* Interact until done */
 	while (TRUE)
 	{
 		Term_clear();
-
-		/* Ask for a choice */
 		prt(_("[ カラーの設定 ]", "Interact with Colors"), 2, 0);
-
-		/* Give some choices */
 		prt(_("(1) ユーザー設定ファイルのロード", "(1) Load a user pref file"), 4, 5);
 		prt(_("(2) カラーの設定をファイルに書き出す", "(2) Dump colors"), 5, 5);
 		prt(_("(3) カラーの設定を変更する", "(3) Modify colors"), 6, 5);
-
-		/* Prompt */
 		prt(_("コマンド: ", "Command: "), 8, 0);
-		/* Prompt */
 		i = inkey();
-
 		if (i == ESCAPE) break;
 
-		/* Load a 'pref' file */
 		if (i == '1')
 		{
-			/* Prompt */
 			prt(_("コマンド: ユーザー設定ファイルをロードします", "Command: Load a user pref file"), 8, 0);
-
-			/* Prompt */
 			prt(_("ファイル: ", "File: "), 10, 0);
-
-			/* Default file */
 			sprintf(tmp, "%s.prf", creature_ptr->base_name);
-
-			/* Query */
 			if (!askfor(tmp, 70)) continue;
 
-			/* Process the given filename */
 			(void)process_pref_file(creature_ptr, tmp);
-
-			/* Mega-Hack -- react to changes */
 			Term_xtra(TERM_XTRA_REACT, 0);
-
-			/* Mega-Hack -- redraw */
 			Term_redraw();
 		}
-
-		/* Dump colors */
 		else if (i == '2')
 		{
 			static concptr mark = "Colors";
-
-			/* Prompt */
 			prt(_("コマンド: カラーの設定をファイルに書き出します", "Command: Dump colors"), 8, 0);
-
-			/* Prompt */
 			prt(_("ファイル: ", "File: "), 10, 0);
-
-			/* Default filename */
 			sprintf(tmp, "%s.prf", creature_ptr->base_name);
-
-			/* Get a filename */
 			if (!askfor(tmp, 70)) continue;
-			path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 
-			/* Append to the file */
+			path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 			if (!open_auto_dump(buf, mark)) continue;
 
-			/* Start dumping */
 			auto_dump_printf(_("\n# カラーの設定\n\n", "\n# Color redefinitions\n\n"));
-
-			/* Dump colors */
 			for (i = 0; i < 256; i++)
 			{
 				int kv = angband_color_table[i][0];
@@ -2674,77 +1578,46 @@ void do_cmd_colors(player_type *creature_ptr)
 				int bv = angband_color_table[i][3];
 
 				concptr name = _("未知", "unknown");
-
-				/* Skip non-entries */
 				if (!kv && !rv && !gv && !bv) continue;
 
-				/* Extract the color name */
 				if (i < 16) name = color_names[i];
 
-				/* Dump a comment */
 				auto_dump_printf(_("# カラー '%s'\n", "# Color '%s'\n"), name);
-
-				/* Dump the monster attr/char info */
 				auto_dump_printf("V:%d:0x%02X:0x%02X:0x%02X:0x%02X\n\n",
 					i, kv, rv, gv, bv);
 			}
 
-			/* Close */
 			close_auto_dump();
-
 			msg_print(_("カラーの設定をファイルに書き出しました。", "Dumped color redefinitions."));
 		}
-
-		/* Edit colors */
 		else if (i == '3')
 		{
 			static byte a = 0;
-
-			/* Prompt */
 			prt(_("コマンド: カラーの設定を変更します", "Command: Modify colors"), 8, 0);
-
-			/* Hack -- query until done */
 			while (TRUE)
 			{
 				concptr name;
-				byte j;
 				clear_from(10);
-
-				/* Exhibit the normal colors */
-				for (j = 0; j < 16; j++)
+				for (byte j = 0; j < 16; j++)
 				{
-					/* Exhibit this color */
 					Term_putstr(j * 4, 20, -1, a, "###");
-
-					/* Exhibit all colors */
 					Term_putstr(j * 4, 22, -1, j, format("%3d", j));
 				}
 
-				/* Describe the color */
 				name = ((a < 16) ? color_names[a] : _("未定義", "undefined"));
-
-				/* Describe the color */
 				Term_putstr(5, 10, -1, TERM_WHITE,
 					format(_("カラー = %d, 名前 = %s", "Color = %d, Name = %s"), a, name));
-
-				/* Label the Current values */
 				Term_putstr(5, 12, -1, TERM_WHITE,
 					format("K = 0x%02x / R,G,B = 0x%02x,0x%02x,0x%02x",
 						angband_color_table[a][0],
 						angband_color_table[a][1],
 						angband_color_table[a][2],
 						angband_color_table[a][3]));
-
-				/* Prompt */
 				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): "));
-
 				i = inkey();
-
-				/* All done */
 				if (i == ESCAPE) break;
 
-				/* Analyze */
 				if (i == 'n') a = (byte)(a + 1);
 				if (i == 'N') a = (byte)(a - 1);
 				if (i == 'k') angband_color_table[a][0] = (byte)(angband_color_table[a][0] + 1);
@@ -2756,15 +1629,10 @@ void do_cmd_colors(player_type *creature_ptr)
 				if (i == 'b') angband_color_table[a][3] = (byte)(angband_color_table[a][3] + 1);
 				if (i == 'B') angband_color_table[a][3] = (byte)(angband_color_table[a][3] - 1);
 
-				/* Hack -- react to changes */
 				Term_xtra(TERM_XTRA_REACT, 0);
-
-				/* Hack -- redraw */
 				Term_redraw();
 			}
 		}
-
-		/* Unknown option */
 		else
 		{
 			bell();
@@ -2783,17 +1651,10 @@ void do_cmd_colors(player_type *creature_ptr)
 void do_cmd_note(void)
 {
 	char buf[80];
-
-	/* Default */
 	strcpy(buf, "");
-
-	/* Input */
 	if (!get_string(_("メモ: ", "Note: "), buf, 60)) return;
-
-	/* Ignore empty notes */
 	if (!buf[0] || (buf[0] == ' ')) return;
 
-	/* Add the note to the message recall */
 	msg_format(_("メモ: %s", "Note: %s"), buf);
 }
 
@@ -2814,55 +1675,6 @@ void do_cmd_version(void)
 
 
 /*
- * Array of feeling strings
- */
-static concptr do_cmd_feeling_text[11] =
-{
-	_("この階の雰囲気を感じとれなかった...", "Looks like any other level."),
-	_("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."),
-	_("恐ろしい死の幻が目に浮かび、気絶しそうになった！", "You nearly faint as horrible visions of death fill your mind!"),
-	_("この階はとても危険なようだ。", "This level looks very dangerous."),
-	_("とても悪い予感がする...", "You have a very bad feeling..."),
-	_("悪い予感がする...", "You have a bad feeling..."),
-	_("何か緊張する。", "You feel nervous."),
-	_("少し不運な気がする...", "You feel your luck is turning..."),
-	_("この場所は好きになれない。", "You don't like the look of this place."),
-	_("この階はそれなりに安全なようだ。", "This level looks reasonably safe."),
-	_("なんて退屈なところだ...", "What a boring place...")
-};
-
-static concptr do_cmd_feeling_text_combat[11] =
-{
-	_("この階の雰囲気を感じとれなかった...", "Looks like any other level."),
-	_("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."),
-	_("今夜もまた、誰かが命を落とす...", "You nearly faint as horrible visions of death fill your mind!"),
-	_("この階はとても危険なようだ。", "This level looks very dangerous."),
-	_("とても悪い予感がする...", "You have a very bad feeling..."),
-	_("悪い予感がする...", "You have a bad feeling..."),
-	_("何か緊張する。", "You feel nervous."),
-	_("少し不運な気がする...", "You feel your luck is turning..."),
-	_("この場所は好きになれない。", "You don't like the look of this place."),
-	_("この階はそれなりに安全なようだ。", "This level looks reasonably safe."),
-	_("なんて退屈なところだ...", "What a boring place...")
-};
-
-static concptr do_cmd_feeling_text_lucky[11] =
-{
-	_("この階の雰囲気を感じとれなかった...", "Looks like any other level."),
-	_("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."),
-	_("この階はこの上なく素晴らしい感じがする。", "You have a superb feeling about this level."),
-	_("素晴らしい感じがする...", "You have an excellent feeling..."),
-	_("とても良い感じがする...", "You have a very good feeling..."),
-	_("良い感じがする...", "You have a good feeling..."),
-	_("ちょっと幸運な感じがする...", "You feel strangely lucky..."),
-	_("多少は運が向いてきたか...", "You feel your luck is turning..."),
-	_("見た感じ悪くはない...", "You like the look of this place..."),
-	_("全然駄目ということはないが...", "This level can't be all bad..."),
-	_("なんて退屈なところだ...", "What a boring place...")
-};
-
-
-/*
  * Note that "feeling" is set to zero unless some time has passed.
  * Note that this is done when the level is GENERATED, not entered.
  */
@@ -2870,14 +1682,12 @@ void do_cmd_feeling(player_type *creature_ptr)
 {
 	if (creature_ptr->wild_mode) return;
 
-	/* No useful feeling in quests */
 	if (creature_ptr->current_floor_ptr->inside_quest && !random_quest_number(creature_ptr, creature_ptr->current_floor_ptr->dun_level))
 	{
 		msg_print(_("典型的なクエストのダンジョンのようだ。", "Looks like a typical quest level."));
 		return;
 	}
 
-	/* No useful feeling in town */
 	if (creature_ptr->town_num && !creature_ptr->current_floor_ptr->dun_level)
 	{
 		if (!strcmp(town_info[creature_ptr->town_num].name, _("荒野", "wilderness")))
@@ -2890,14 +1700,12 @@ void do_cmd_feeling(player_type *creature_ptr)
 		return;
 	}
 
-	/* No useful feeling in the wilderness */
 	if (!creature_ptr->current_floor_ptr->dun_level)
 	{
 		msg_print(_("典型的な荒野のようだ。", "Looks like a typical wilderness."));
 		return;
 	}
 
-	/* Display the feeling */
 	if (creature_ptr->muta3 & MUT3_GOOD_LUCK)
 		msg_print(do_cmd_feeling_text_lucky[creature_ptr->feeling]);
 	else if (IS_ECHIZEN(creature_ptr))
@@ -2908,208 +1716,6 @@ void do_cmd_feeling(player_type *creature_ptr)
 
 
 /*
- * Description of each monster group.
- */
-static concptr monster_group_text[] =
-{
-#ifdef JP
-	"ユニーク",	/* "Uniques" */
-	"乗馬可能なモンスター",	/* "Riding" */
-	"賞金首", /* "Wanted */
-	"アンバーの王族", /* "Amberite" */
-	"アリ",
-	"コウモリ",
-	"ムカデ",
-	"ドラゴン",
-	"目玉",
-	"ネコ",
-	"ゴーレム",
-	"標準人間型生物",
-	"ベトベト",
-	"ゼリー",
-	"コボルド",
-	"水棲生物",
-	"モルド",
-	"ナーガ",
-	"オーク",
-	"人間",
-	"四足獣",
-	"ネズミ",
-	"スケルトン",
-	"デーモン",
-	"ボルテックス",
-	"イモムシ/大群",
-	/* "unused", */
-	"イーク",
-	"ゾンビ/ミイラ",
-	"天使",
-	"鳥",
-	"犬",
-	/* "古代ドラゴン/ワイアーム", */
-	"エレメンタル",
-	"トンボ",
-	"ゴースト",
-	"雑種",
-	"昆虫",
-	"ヘビ",
-	"キラー・ビートル",
-	"リッチ",
-	"多首の爬虫類",
-	"謎の生物",
-	"オーガ",
-	"巨大人間型生物",
-	"クイルスルグ",
-	"爬虫類/両生類",
-	"蜘蛛/サソリ/ダニ",
-	"トロル",
-	/* "上級デーモン", */
-	"バンパイア",
-	"ワイト/レイス/等",
-	"ゾーン/ザレン/等",
-	"イエティ",
-	"ハウンド",
-	"ミミック",
-	"壁/植物/気体",
-	"おばけキノコ",
-	"球体",
-	"プレイヤー",
-#else
-	"Uniques",
-	"Ridable monsters",
-	"Wanted monsters",
-	"Amberite",
-	"Ant",
-	"Bat",
-	"Centipede",
-	"Dragon",
-	"Floating Eye",
-	"Feline",
-	"Golem",
-	"Hobbit/Elf/Dwarf",
-	"Icky Thing",
-	"Jelly",
-	"Kobold",
-	"Aquatic monster",
-	"Mold",
-	"Naga",
-	"Orc",
-	"Person/Human",
-	"Quadruped",
-	"Rodent",
-	"Skeleton",
-	"Demon",
-	"Vortex",
-	"Worm/Worm-Mass",
-	/* "unused", */
-	"Yeek",
-	"Zombie/Mummy",
-	"Angel",
-	"Bird",
-	"Canine",
-	/* "Ancient Dragon/Wyrm", */
-	"Elemental",
-	"Dragon Fly",
-	"Ghost",
-	"Hybrid",
-	"Insect",
-	"Snake",
-	"Killer Beetle",
-	"Lich",
-	"Multi-Headed Reptile",
-	"Mystery Living",
-	"Ogre",
-	"Giant Humanoid",
-	"Quylthulg",
-	"Reptile/Amphibian",
-	"Spider/Scorpion/Tick",
-	"Troll",
-	/* "Major Demon", */
-	"Vampire",
-	"Wight/Wraith/etc",
-	"Xorn/Xaren/etc",
-	"Yeti",
-	"Zephyr Hound",
-	"Mimic",
-	"Wall/Plant/Gas",
-	"Mushroom patch",
-	"Ball",
-	"Player",
-#endif
-	NULL
-};
-
-
-/*
- * Symbols of monsters in each group. Note the "Uniques" group
- * is handled differently.
- */
-static concptr monster_group_char[] =
-{
-	(char *)-1L,
-	(char *)-2L,
-	(char *)-3L,
-	(char *)-4L,
-	"a",
-	"b",
-	"c",
-	"dD",
-	"e",
-	"f",
-	"g",
-	"h",
-	"i",
-	"j",
-	"k",
-	"l",
-	"m",
-	"n",
-	"o",
-	"pt",
-	"q",
-	"r",
-	"s",
-	"uU",
-	"v",
-	"w",
-	/* "x", */
-	"y",
-	"z",
-	"A",
-	"B",
-	"C",
-	/* "D", */
-	"E",
-	"F",
-	"G",
-	"H",
-	"I",
-	"J",
-	"K",
-	"L",
-	"M",
-	"N",
-	"O",
-	"P",
-	"Q",
-	"R",
-	"S",
-	"T",
-	/* "U", */
-	"V",
-	"W",
-	"X",
-	"Y",
-	"Z",
-	"!$&()+./=>?[\\]`{|~",
-	"#%",
-	",",
-	"*",
-	"@",
-	NULL
-};
-
-
-/*
  * todo 引数と戻り値について追記求む
  * Build a list of monster indexes in the given group.
  *
@@ -3124,42 +1730,31 @@ static concptr monster_group_char[] =
  */
 static IDX collect_monsters(player_type *creature_ptr, IDX grp_cur, IDX mon_idx[], BIT_FLAGS8 mode)
 {
-	/* Get a list of x_char in this group */
 	concptr group_char = monster_group_char[grp_cur];
-
 	bool grp_unique = (monster_group_char[grp_cur] == (char *)-1L);
 	bool grp_riding = (monster_group_char[grp_cur] == (char *)-2L);
 	bool grp_wanted = (monster_group_char[grp_cur] == (char *)-3L);
 	bool grp_amberite = (monster_group_char[grp_cur] == (char *)-4L);
 
-	/* Check every race */
 	IDX mon_cnt = 0;
 	for (IDX i = 0; i < max_r_idx; i++)
 	{
-		/* Access the race */
 		monster_race *r_ptr = &r_info[i];
-
-		/* Skip empty race */
 		if (!r_ptr->name) continue;
-
-		/* Require known monsters */
 		if (!(mode & 0x02) && !cheat_know && !r_ptr->r_sights) continue;
 
 		if (grp_unique)
 		{
 			if (!(r_ptr->flags1 & RF1_UNIQUE)) continue;
 		}
-
 		else if (grp_riding)
 		{
 			if (!(r_ptr->flags7 & RF7_RIDING)) continue;
 		}
-
 		else if (grp_wanted)
 		{
 			bool wanted = FALSE;
-			int j;
-			for (j = 0; j < MAX_BOUNTY; j++)
+			for (int j = 0; j < MAX_BOUNTY; j++)
 			{
 				if (current_world_ptr->bounty_r_idx[j] == i || current_world_ptr->bounty_r_idx[j] - 10000 == i ||
 					(creature_ptr->today_mon && creature_ptr->today_mon == i))
@@ -3168,186 +1763,30 @@ static IDX collect_monsters(player_type *creature_ptr, IDX grp_cur, IDX mon_idx[
 					break;
 				}
 			}
+
 			if (!wanted) continue;
 		}
-
 		else if (grp_amberite)
 		{
 			if (!(r_ptr->flags3 & RF3_AMBERITE)) continue;
 		}
-
 		else
 		{
-			/* Check for race in the group */
 			if (!my_strchr(group_char, r_ptr->d_char)) continue;
 		}
 
-		/* Add the race */
 		mon_idx[mon_cnt++] = i;
-
-		/* XXX Hack -- Just checking for non-empty group */
 		if (mode & 0x01) break;
 	}
 
-	/* Terminate the list */
 	mon_idx[mon_cnt] = -1;
-
 	int dummy_why;
 	ang_sort(mon_idx, &dummy_why, mon_cnt, ang_sort_comp_monster_level, ang_sort_swap_hook);
-
-	/* Return the number of races */
 	return mon_cnt;
 }
 
 
 /*
- * Description of each monster group.
- */
-static concptr object_group_text[] =
-{
-#ifdef JP
-	"キノコ",	/* "Mushrooms" */
-	"薬",		/* "Potions" */
-	"油つぼ",	/* "Flasks" */
-	"巻物",		/* "Scrolls" */
-	"指輪",		/* "Rings" */
-	"アミュレット",	/* "Amulets" */
-	"笛",		/* "Whistle" */
-	"光源",		/* "Lanterns" */
-	"魔法棒",	/* "Wands" */
-	"杖",		/* "Staffs" */
-	"ロッド",	/* "Rods" */
-	"カード",	/* "Cards" */
-	"キャプチャー・ボール",
-	"羊皮紙",
-	"くさび",
-	"箱",
-	"人形",
-	"像",
-	"ゴミ",
-	"空のビン",
-	"骨",
-	"死体",
-	"刀剣類",	/* "Swords" */
-	"鈍器",		/* "Blunt Weapons" */
-	"長柄武器",	/* "Polearms" */
-	"採掘道具",	/* "Diggers" */
-	"飛び道具",	/* "Bows" */
-	"弾",
-	"矢",
-	"ボルト",
-	"軽装鎧",	/* "Soft Armor" */
-	"重装鎧",	/* "Hard Armor" */
-	"ドラゴン鎧",	/* "Dragon Armor" */
-	"盾",	/* "Shields" */
-	"クローク",	/* "Cloaks" */
-	"籠手",	/* "Gloves" */
-	"ヘルメット",	/* "Helms" */
-	"冠",	/* "Crowns" */
-	"ブーツ",	/* "Boots" */
-	"魔法書",
-	"財宝",
-	"何か",
-#else
-	"Mushrooms",
-	"Potions",
-	"Flasks",
-	"Scrolls",
-	"Rings",
-	"Amulets",
-	"Whistle",
-	"Lanterns",
-	"Wands",
-	"Staffs",
-	"Rods",
-	"Cards",
-	"Capture Balls",
-	"Parchments",
-	"Spikes",
-	"Boxs",
-	"Figurines",
-	"Statues",
-	"Junks",
-	"Bottles",
-	"Skeletons",
-	"Corpses",
-	"Swords",
-	"Blunt Weapons",
-	"Polearms",
-	"Diggers",
-	"Bows",
-	"Shots",
-	"Arrows",
-	"Bolts",
-	"Soft Armor",
-	"Hard Armor",
-	"Dragon Armor",
-	"Shields",
-	"Cloaks",
-	"Gloves",
-	"Helms",
-	"Crowns",
-	"Boots",
-	"Spellbooks",
-	"Treasure",
-	"Something",
-#endif
-	NULL
-};
-
-
-/*
- * TVALs of items in each group
- */
-static byte object_group_tval[] =
-{
-	TV_FOOD,
-	TV_POTION,
-	TV_FLASK,
-	TV_SCROLL,
-	TV_RING,
-	TV_AMULET,
-	TV_WHISTLE,
-	TV_LITE,
-	TV_WAND,
-	TV_STAFF,
-	TV_ROD,
-	TV_CARD,
-	TV_CAPTURE,
-	TV_PARCHMENT,
-	TV_SPIKE,
-	TV_CHEST,
-	TV_FIGURINE,
-	TV_STATUE,
-	TV_JUNK,
-	TV_BOTTLE,
-	TV_SKELETON,
-	TV_CORPSE,
-	TV_SWORD,
-	TV_HAFTED,
-	TV_POLEARM,
-	TV_DIGGING,
-	TV_BOW,
-	TV_SHOT,
-	TV_ARROW,
-	TV_BOLT,
-	TV_SOFT_ARMOR,
-	TV_HARD_ARMOR,
-	TV_DRAG_ARMOR,
-	TV_SHIELD,
-	TV_CLOAK,
-	TV_GLOVES,
-	TV_HELM,
-	TV_CROWN,
-	TV_BOOTS,
-	TV_LIFE_BOOK, /* Hack -- all spellbooks */
-	TV_GOLD,
-	0,
-	0,
-};
-
-
-/*
  * Build a list of object indexes in the given group. Return the number
  * of objects in the group.
  *
@@ -3356,63 +1795,47 @@ static byte object_group_tval[] =
  */
 static KIND_OBJECT_IDX collect_objects(int grp_cur, KIND_OBJECT_IDX object_idx[], BIT_FLAGS8 mode)
 {
-	KIND_OBJECT_IDX i, object_cnt = 0;
-	int j, k;
-
-	/* Get a list of x_char in this group */
+	KIND_OBJECT_IDX object_cnt = 0;
 	byte group_tval = object_group_tval[grp_cur];
-
-	/* Check every object */
-	for (i = 0; i < max_k_idx; i++)
+	for (KIND_OBJECT_IDX i = 0; i < max_k_idx; i++)
 	{
-		/* Access the object */
 		object_kind *k_ptr = &k_info[i];
-
-		/* Skip empty objects */
 		if (!k_ptr->name) continue;
 
 		if (!(mode & 0x02))
 		{
 			if (!current_world_ptr->wizard)
 			{
-				/* Skip non-flavoured objects */
 				if (!k_ptr->flavor) continue;
-
-				/* Require objects ever seen */
 				if (!k_ptr->aware) continue;
 			}
 
-			/* Skip items with no distribution (special artifacts) */
-			for (j = 0, k = 0; j < 4; j++) k += k_ptr->chance[j];
+			int k = 0;
+			for (int j = 0; j < 4; j++)
+				k += k_ptr->chance[j];
 			if (!k) continue;
 		}
 
-		/* Check for objects in the group */
 		if (TV_LIFE_BOOK == group_tval)
 		{
-			/* Hack -- All spell books */
 			if (TV_LIFE_BOOK <= k_ptr->tval && k_ptr->tval <= TV_HEX_BOOK)
 			{
-				/* Add the object */
 				object_idx[object_cnt++] = i;
 			}
-			else continue;
+			else
+				continue;
 		}
 		else if (k_ptr->tval == group_tval)
 		{
-			/* Add the object */
 			object_idx[object_cnt++] = i;
 		}
-		else continue;
+		else
+			continue;
 
-		/* XXX Hack -- Just checking for non-empty group */
 		if (mode & 0x01) break;
 	}
 
-	/* Terminate the list */
 	object_idx[object_cnt] = -1;
-
-	/* Return the number of objects */
 	return object_cnt;
 }
 
@@ -3435,29 +1858,18 @@ static concptr feature_group_text[] =
  */
 static FEAT_IDX collect_features(FEAT_IDX *feat_idx, BIT_FLAGS8 mode)
 {
-	/* Check every feature */
 	FEAT_IDX feat_cnt = 0;
 	for (FEAT_IDX i = 0; i < max_f_idx; i++)
 	{
 		feature_type *f_ptr = &f_info[i];
-
-		/* Skip empty index */
 		if (!f_ptr->name) continue;
-
-		/* Skip mimiccing features */
 		if (f_ptr->mimic != i) continue;
 
-		/* Add the index */
 		feat_idx[feat_cnt++] = i;
-
-		/* XXX Hack -- Just checking for non-empty group */
 		if (mode & 0x01) break;
 	}
 
-	/* Terminate the list */
 	feat_idx[feat_cnt] = -1;
-
-	/* Return the number of races */
 	return feat_cnt;
 }
 
@@ -3467,20 +1879,15 @@ static FEAT_IDX collect_features(FEAT_IDX *feat_idx, BIT_FLAGS8 mode)
  */
 void do_cmd_load_screen(void)
 {
-	TERM_LEN y, x;
 	TERM_COLOR a = 0;
 	SYMBOL_CODE c = ' ';
 	bool okay = TRUE;
 	FILE *fff;
 	char buf[1024];
 	TERM_LEN wid, hgt;
-
 	Term_get_size(&wid, &hgt);
 	path_build(buf, sizeof(buf), ANGBAND_DIR_USER, "dump.txt");
-
-	/* Append to the file */
 	fff = my_fopen(buf, "r");
-
 	if (!fff)
 	{
 		msg_format(_("%s を開くことができませんでした。", "Failed to open %s."), buf);
@@ -3490,70 +1897,46 @@ void do_cmd_load_screen(void)
 
 	screen_save();
 	Term_clear();
-
-	/* Load the screen */
-	for (y = 0; okay; y++)
+	for (TERM_LEN y = 0; okay; y++)
 	{
-		/* Get a line of data including control code */
 		if (!fgets(buf, 1024, fff)) okay = FALSE;
 
-		/* Get the blank line */
 		if (buf[0] == '\n' || buf[0] == '\0') break;
-
-		/* Ignore too large screen image */
 		if (y >= hgt) continue;
 
-		/* Show each row */
-		for (x = 0; x < wid - 1; x++)
+		for (TERM_LEN x = 0; x < wid - 1; x++)
 		{
-			/* End of line */
 			if (buf[x] == '\n' || buf[x] == '\0') break;
 
-			/* Put the attr/char */
 			Term_draw(x, y, TERM_WHITE, buf[x]);
 		}
 	}
 
-	/* Dump the screen */
-	for (y = 0; okay; y++)
+	for (TERM_LEN y = 0; okay; y++)
 	{
-		/* Get a line of data including control code */
 		if (!fgets(buf, 1024, fff)) okay = FALSE;
 
-		/* Get the blank line */
 		if (buf[0] == '\n' || buf[0] == '\0') break;
-
-		/* Ignore too large screen image */
 		if (y >= hgt) continue;
 
-		/* Dump each row */
-		for (x = 0; x < wid - 1; x++)
+		for (TERM_LEN x = 0; x < wid - 1; x++)
 		{
-			/* End of line */
 			if (buf[x] == '\n' || buf[x] == '\0') break;
 
-			/* Get the attr/char */
 			(void)(Term_what(x, y, &a, &c));
-
-			/* Look up the attr */
 			for (int i = 0; i < 16; i++)
 			{
-				/* Use attr matches */
 				if (hack[i] == buf[x]) a = (byte)i;
 			}
 
-			/* Put the attr/char */
 			Term_draw(x, y, a, c);
 		}
 	}
 
 	my_fclose(fff);
-
 	prt(_("ファイルに書き出された画面(記念撮影)をロードしました。", "Screen dump loaded."), 0, 0);
-
 	flush();
 	inkey();
-
 	screen_load();
 }
 
@@ -3577,22 +1960,14 @@ concptr inven_res_label = _("                               酸電火冷毒光
 }
 
 
-/* XTRA HACK RESLIST */
 static void do_cmd_knowledge_inven_aux(player_type *creature_ptr, FILE *fff, object_type *o_ptr, int *j, OBJECT_TYPE_VALUE tval, char *where)
 {
 	GAME_TEXT o_name[MAX_NLEN];
 	BIT_FLAGS flgs[TR_FLAG_SIZE];
-
 	if (!o_ptr->k_idx) return;
 	if (o_ptr->tval != tval) return;
-
-	/* Identified items only */
 	if (!object_is_known(o_ptr)) return;
 
-	/*
-	 * HACK:Ring of Lordly protection and Dragon equipment
-	 * have random resistances.
-	 */
 	bool is_special_item_type = (object_is_wearable(o_ptr) && object_is_ego(o_ptr))
 		|| ((tval == TV_AMULET) && (o_ptr->sval == SV_AMULET_RESISTANCE))
 		|| ((tval == TV_RING) && (o_ptr->sval == SV_RING_LORDLY))
@@ -3608,7 +1983,6 @@ static void do_cmd_knowledge_inven_aux(player_type *creature_ptr, FILE *fff, obj
 
 	int i = 0;
 	object_desc(creature_ptr, o_name, o_ptr, OD_NAME_ONLY);
-
 	while (o_name[i] && (i < 26))
 	{
 #ifdef JP
@@ -3685,12 +2059,9 @@ static void do_cmd_knowledge_inven(player_type *creature_ptr)
 	GAME_TEXT file_name[1024];
 	store_type  *st_ptr;
 	OBJECT_TYPE_VALUE tval;
-	int i = 0;
 	int j = 0;
 
 	char where[32];
-
-	/* Open a new file */
 	fff = my_fopen_temp(file_name, 1024);
 	if (!fff)
 	{
@@ -3700,7 +2071,6 @@ static void do_cmd_knowledge_inven(player_type *creature_ptr)
 	}
 
 	fprintf(fff, "%s\n", inven_res_label);
-
 	for (tval = TV_WEARABLE_BEGIN; tval <= TV_WEARABLE_END; tval++)
 	{
 		if (j != 0)
@@ -3711,28 +2081,26 @@ static void do_cmd_knowledge_inven(player_type *creature_ptr)
 		}
 
 		strcpy(where, _("装", "E "));
-		for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
+		for (int i = INVEN_RARM; i < INVEN_TOTAL; i++)
 		{
 			do_cmd_knowledge_inven_aux(creature_ptr, fff, &creature_ptr->inventory_list[i], &j, tval, where);
 		}
 
 		strcpy(where, _("持", "I "));
-		for (i = 0; i < INVEN_PACK; i++)
+		for (int i = 0; i < INVEN_PACK; i++)
 		{
 			do_cmd_knowledge_inven_aux(creature_ptr, fff, &creature_ptr->inventory_list[i], &j, tval, where);
 		}
 
 		st_ptr = &town_info[1].store[STORE_HOME];
 		strcpy(where, _("家", "H "));
-		for (i = 0; i < st_ptr->stock_num; i++)
+		for (int i = 0; i < st_ptr->stock_num; i++)
 		{
 			do_cmd_knowledge_inven_aux(creature_ptr, fff, &st_ptr->stock[i], &j, tval, where);
 		}
 	}
 
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("*鑑定*済み武器/防具の耐性リスト", "Resistances of *identified* equipment"), 0, 0);
 	fd_kill(file_name);
 }
@@ -3759,14 +2127,9 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 
 	TERM_LEN wid, hgt;
 	Term_get_size(&wid, &hgt);
-
-	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
-
-	/* Append to the file */
 	FILE *fff;
 	fff = my_fopen(filename, "w");
-
 	if (!fff)
 	{
 		if (message)
@@ -3779,6 +2142,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 	}
 
 	if (message) screen_save();
+
 	char buf[2048];
 	path_build(buf, sizeof(buf), ANGBAND_DIR_USER, "htmldump.prf");
 	FILE *tmpfff;
@@ -3807,21 +2171,16 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 		}
 	}
 
-	/* Dump the screen */
 	for (TERM_LEN y = 0; y < hgt; y++)
 	{
-		/* Start the row */
 		if (y != 0) fprintf(fff, "\n");
 
-		/* Dump each row */
 		TERM_COLOR a = 0, old_a = 0;
 		char c = ' ';
 		for (TERM_LEN x = 0; x < wid - 1; x++)
 		{
 			concptr cc = NULL;
-			/* Get the attr/char */
 			(void)(Term_what(x, y, &a, &c));
-
 			switch (c)
 			{
 			case '&': cc = "&amp;"; break;
@@ -3852,7 +2211,6 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 	}
 
 	fprintf(fff, "</font>");
-
 	if (!tmpfff)
 	{
 		for (int i = 0; html_foot[i]; i++)
@@ -3880,10 +2238,8 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 		my_fclose(tmpfff);
 	}
 
-	/* Skip a line */
 	fprintf(fff, "\n");
 	my_fclose(fff);
-
 	if (message)
 	{
 		msg_print(_("画面(記念撮影)をファイルに書き出しました。", "Screen dump saved."));
@@ -3894,6 +2250,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 		screen_load();
 }
 
+
 /*
  * Hack -- save a screen dump to a file
  */
@@ -3960,14 +2317,11 @@ void do_cmd_save_screen(player_type *creature_ptr)
 		do_cmd_save_screen_html();
 		do_cmd_redraw(creature_ptr);
 	}
-
-	/* Do we use a special screendump function ? */
 	else if (screendump_aux)
 	{
-		/* Dump the screen to a graphics file */
 		(*screendump_aux)();
 	}
-	else /* Dump the screen as text */
+	else
 	{
 		TERM_LEN y, x;
 		TERM_COLOR a = 0;
@@ -3975,13 +2329,8 @@ void do_cmd_save_screen(player_type *creature_ptr)
 		FILE *fff;
 		char buf[1024];
 		path_build(buf, sizeof(buf), ANGBAND_DIR_USER, "dump.txt");
-
-		/* File type is "TEXT" */
 		FILE_TYPE(FILE_TYPE_TEXT);
-
-		/* Append to the file */
 		fff = my_fopen(buf, "w");
-
 		if (!fff)
 		{
 			msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), buf);
@@ -3990,55 +2339,33 @@ void do_cmd_save_screen(player_type *creature_ptr)
 		}
 
 		screen_save();
-
-		/* Dump the screen */
 		for (y = 0; y < hgt; y++)
 		{
-			/* Dump each row */
 			for (x = 0; x < wid - 1; x++)
 			{
-				/* Get the attr/char */
 				(void)(Term_what(x, y, &a, &c));
-
-				/* Dump it */
 				buf[x] = c;
 			}
 
-			/* Terminate */
 			buf[x] = '\0';
-
-			/* End the row */
 			fprintf(fff, "%s\n", buf);
 		}
 
-		/* Skip a line */
 		fprintf(fff, "\n");
-
-
-		/* Dump the screen */
 		for (y = 0; y < hgt; y++)
 		{
-			/* Dump each row */
 			for (x = 0; x < wid - 1; x++)
 			{
-				/* Get the attr/char */
 				(void)(Term_what(x, y, &a, &c));
-
-				/* Dump it */
 				buf[x] = hack[a & 0x0F];
 			}
 
-			/* Terminate */
 			buf[x] = '\0';
-
-			/* End the row */
 			fprintf(fff, "%s\n", buf);
 		}
 
-		/* Skip a line */
 		fprintf(fff, "\n");
 		my_fclose(fff);
-
 		msg_print(_("画面(記念撮影)をファイルに書き出しました。", "Screen dump saved."));
 		msg_print(NULL);
 		screen_load();
@@ -4062,7 +2389,6 @@ void do_cmd_save_screen(player_type *creature_ptr)
  */
 static void do_cmd_knowledge_artifacts(player_type *player_ptr)
 {
-	/* Open a new file */
 	FILE *fff;
 	GAME_TEXT file_name[1024];
 	fff = my_fopen_temp(file_name, 1024);
@@ -4073,75 +2399,47 @@ static void do_cmd_knowledge_artifacts(player_type *player_ptr)
 		return;
 	}
 
-	/* Allocate the "who" array */
 	ARTIFACT_IDX *who;
 	C_MAKE(who, max_a_idx, ARTIFACT_IDX);
-
-	/* Allocate the "okay" array */
 	bool *okay;
 	C_MAKE(okay, max_a_idx, bool);
 
-	/* Scan the artifacts */
 	for (ARTIFACT_IDX k = 0; k < max_a_idx; k++)
 	{
 		artifact_type *a_ptr = &a_info[k];
-
-		/* Default */
 		okay[k] = FALSE;
-
-		/* Skip "empty" artifacts */
 		if (!a_ptr->name) continue;
-
-		/* Skip "uncreated" artifacts */
 		if (!a_ptr->cur_num) continue;
 
-		/* Assume okay */
 		okay[k] = TRUE;
 	}
 
-	/* Check the dungeon */
 	for (POSITION y = 0; y < player_ptr->current_floor_ptr->height; y++)
 	{
 		for (POSITION x = 0; x < player_ptr->current_floor_ptr->width; x++)
 		{
 			grid_type *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
-
 			OBJECT_IDX this_o_idx, next_o_idx = 0;
-
-			/* Scan all objects in the grid */
 			for (this_o_idx = g_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
 			{
 				object_type *o_ptr;
 				o_ptr = &player_ptr->current_floor_ptr->o_list[this_o_idx];
 				next_o_idx = o_ptr->next_o_idx;
-
-				/* Ignore non-artifacts */
 				if (!object_is_fixed_artifact(o_ptr)) continue;
-
-				/* Ignore known items */
 				if (object_is_known(o_ptr)) continue;
 
-				/* Note the artifact */
 				okay[o_ptr->name1] = FALSE;
 			}
 		}
 	}
 
-	/* Check the player_ptr->inventory_list and equipment */
 	for (ARTIFACT_IDX i = 0; i < INVEN_TOTAL; i++)
 	{
 		object_type *o_ptr = &player_ptr->inventory_list[i];
-
-		/* Ignore non-objects */
 		if (!o_ptr->k_idx) continue;
-
-		/* Ignore non-artifacts */
 		if (!object_is_fixed_artifact(o_ptr)) continue;
-
-		/* Ignore known items */
 		if (object_is_known(o_ptr)) continue;
 
-		/* Note the artifact */
 		okay[o_ptr->name1] = FALSE;
 	}
 
@@ -4153,49 +2451,29 @@ static void do_cmd_knowledge_artifacts(player_type *player_ptr)
 
 	u16b why = 3;
 	ang_sort(who, &why, n, ang_sort_art_comp, ang_sort_art_swap);
-
-	/* Scan the artifacts */
 	for (ARTIFACT_IDX k = 0; k < n; k++)
 	{
 		artifact_type *a_ptr = &a_info[who[k]];
 		GAME_TEXT base_name[MAX_NLEN];
 		strcpy(base_name, _("未知の伝説のアイテム", "Unknown Artifact"));
-
-		/* Obtain the base object type */
 		ARTIFACT_IDX z = lookup_kind(a_ptr->tval, a_ptr->sval);
-
-		/* Real object */
 		if (z)
 		{
 			object_type forge;
 			object_type *q_ptr;
 			q_ptr = &forge;
-
-			/* Create fake object */
 			object_prep(q_ptr, z);
-
-			/* Make it an artifact */
 			q_ptr->name1 = (byte)who[k];
-
-			/* Display as if known */
 			q_ptr->ident |= IDENT_STORE;
-
-			/* Describe the artifact */
 			object_desc(player_ptr, base_name, q_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 		}
 
-		/* Hack -- Build the artifact name */
 		fprintf(fff, _("     %s\n", "     The %s\n"), base_name);
 	}
 
-	/* Free the "who" array */
 	C_KILL(who, max_a_idx, ARTIFACT_IDX);
-
-	/* Free the "okay" array */
 	C_KILL(okay, max_a_idx, bool);
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(player_ptr, TRUE, file_name, _("既知の伝説のアイテム", "Artifacts Seen"), 0, 0);
 	fd_kill(file_name);
 }
@@ -4209,22 +2487,17 @@ static void do_cmd_knowledge_uniques(player_type *creature_ptr)
 {
 	u16b why = 2;
 	IDX *who;
-
-	FILE *fff;
-
 	GAME_TEXT file_name[1024];
-
 	int n_alive[10];
 	int n_alive_surface = 0;
 	int n_alive_over100 = 0;
 	int n_alive_total = 0;
 	int max_lev = -1;
+	for (IDX i = 0; i < 10; i++)
+		n_alive[i] = 0;
 
-	for (IDX i = 0; i < 10; i++) n_alive[i] = 0;
-
-	/* Open a new file */
+	FILE *fff;
 	fff = my_fopen_temp(file_name, 1024);
-
 	if (!fff)
 	{
 		msg_format(_("一時ファイル %s を作成できませんでした。", "Failed to create temporary file %s."), file_name);
@@ -4232,49 +2505,35 @@ static void do_cmd_knowledge_uniques(player_type *creature_ptr)
 		return;
 	}
 
-	/* Allocate the "who" array */
 	C_MAKE(who, max_r_idx, MONRACE_IDX);
-
-	/* Scan the monsters */
 	int n = 0;
 	for (IDX i = 1; i < max_r_idx; i++)
 	{
 		monster_race *r_ptr = &r_info[i];
-		int          lev;
-
 		if (!r_ptr->name) continue;
-
-		/* Require unique monsters */
 		if (!(r_ptr->flags1 & RF1_UNIQUE)) continue;
-
-		/* Only display "known" uniques */
 		if (!cheat_know && !r_ptr->r_sights) continue;
-
-		/* Only print rarity <= 100 uniques */
 		if (!r_ptr->rarity || ((r_ptr->rarity > 100) && !(r_ptr->flags1 & RF1_QUESTOR))) continue;
-
-		/* Only "alive" uniques */
 		if (r_ptr->max_num == 0) continue;
 
 		if (r_ptr->level)
 		{
-			lev = (r_ptr->level - 1) / 10;
+			int lev = (r_ptr->level - 1) / 10;
 			if (lev < 10)
 			{
 				n_alive[lev]++;
 				if (max_lev < lev) max_lev = lev;
 			}
-			else n_alive_over100++;
+			else
+				n_alive_over100++;
 		}
-		else n_alive_surface++;
+		else
+			n_alive_surface++;
 
-		/* Collect "appropriate" monsters */
 		who[n++] = i;
 	}
 
-	/* Sort the array by dungeon depth of monsters */
 	ang_sort(who, &why, n, ang_sort_comp_hook, ang_sort_swap_hook);
-
 	if (n_alive_surface)
 	{
 		fprintf(fff, _("     地上  生存: %3d体\n", "      Surface  alive: %3d\n"), n_alive_surface);
@@ -4303,18 +2562,14 @@ static void do_cmd_knowledge_uniques(player_type *creature_ptr)
 		fputs(_("現在は既知の生存ユニークはいません。\n", "No known uniques alive.\n"), fff);
 	}
 
-	/* Scan the monster races */
 	for (int k = 0; k < n; k++)
 	{
 		monster_race *r_ptr = &r_info[who[k]];
 		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);
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("まだ生きているユニーク・モンスター", "Alive Uniques"), 0, 0);
 	fd_kill(file_name);
 }
@@ -4325,7 +2580,6 @@ static void do_cmd_knowledge_uniques(player_type *creature_ptr)
  */
 static void do_cmd_knowledge_weapon_exp(player_type *creature_ptr)
 {
-	/* Open a new file */
 	FILE *fff;
 	GAME_TEXT file_name[1024];
 	fff = my_fopen_temp(file_name, 1024);
@@ -4363,8 +2617,6 @@ static void do_cmd_knowledge_weapon_exp(player_type *creature_ptr)
 	}
 
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("武器の経験値", "Weapon Proficiency"), 0, 0);
 	fd_kill(file_name);
 }
@@ -4377,7 +2629,6 @@ static void do_cmd_knowledge_weapon_exp(player_type *creature_ptr)
  */
 static void do_cmd_knowledge_spell_exp(player_type *creature_ptr)
 {
-	/* Open a new file */
 	FILE *fff;
 	GAME_TEXT file_name[1024];
 	fff = my_fopen_temp(file_name, 1024);
@@ -4450,8 +2701,6 @@ static void do_cmd_knowledge_spell_exp(player_type *creature_ptr)
 	}
 
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("魔法の経験値", "Spell Proficiency"), 0, 0);
 	fd_kill(file_name);
 }
@@ -4472,7 +2721,6 @@ static void do_cmd_knowledge_skill_exp(player_type *creature_ptr)
 		_("盾              ", "Shield          ")
 	};
 
-	/* Open a new file */
 	FILE *fff;
 	char file_name[1024];
 	fff = my_fopen_temp(file_name, 1024);
@@ -4495,8 +2743,6 @@ static void do_cmd_knowledge_skill_exp(player_type *creature_ptr)
 	}
 
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("技能の経験値", "Miscellaneous Proficiency"), 0, 0);
 	fd_kill(file_name);
 }
@@ -4510,7 +2756,6 @@ static void do_cmd_knowledge_skill_exp(player_type *creature_ptr)
  */
 static void do_cmd_knowledge_pets(player_type *creature_ptr)
 {
-	/* Open a new file */
 	GAME_TEXT file_name[1024];
 	FILE *fff;
 	fff = my_fopen_temp(file_name, 1024);
@@ -4521,18 +2766,13 @@ static void do_cmd_knowledge_pets(player_type *creature_ptr)
 		return;
 	}
 
-	/* Process the monsters (backwards) */
 	monster_type *m_ptr;
 	GAME_TEXT pet_name[MAX_NLEN];
 	int t_friends = 0;
 	for (int i = creature_ptr->current_floor_ptr->m_max - 1; i >= 1; i--)
 	{
 		m_ptr = &creature_ptr->current_floor_ptr->m_list[i];
-
-		/* Ignore "dead" monsters */
 		if (!monster_is_valid(m_ptr)) continue;
-
-		/* Calculate "upkeep" for pets */
 		if (!is_pet(m_ptr)) continue;
 
 		t_friends++;
@@ -4551,8 +2791,6 @@ static void do_cmd_knowledge_pets(player_type *creature_ptr)
 	fprintf(fff, _(" 維持コスト: %d%% MP\n", "   Upkeep: %d%% mana.\n"), show_upkeep);
 
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("現在のペット", "Current Pets"), 0, 0);
 	fd_kill(file_name);
 }
@@ -4567,7 +2805,6 @@ static void do_cmd_knowledge_pets(player_type *creature_ptr)
  */
 static void do_cmd_knowledge_kill_count(player_type *creature_ptr)
 {
-	/* Open a new file */
 	FILE *fff;
 	GAME_TEXT file_name[1024];
 	fff = my_fopen_temp(file_name, 1024);
@@ -4578,72 +2815,58 @@ static void do_cmd_knowledge_kill_count(player_type *creature_ptr)
 		return;
 	}
 
-	/* Allocate the "who" array */
 	MONRACE_IDX *who;
 	C_MAKE(who, max_r_idx, MONRACE_IDX);
-
 	s32b total = 0;
+	for (int kk = 1; kk < max_r_idx; kk++)
 	{
-		/* Monsters slain */
-		for (int kk = 1; kk < max_r_idx; kk++)
+		monster_race *r_ptr = &r_info[kk];
+
+		if (r_ptr->flags1 & (RF1_UNIQUE))
 		{
-			monster_race *r_ptr = &r_info[kk];
+			bool dead = (r_ptr->max_num == 0);
 
-			if (r_ptr->flags1 & (RF1_UNIQUE))
+			if (dead)
 			{
-				bool dead = (r_ptr->max_num == 0);
-
-				if (dead)
-				{
-					total++;
-				}
+				total++;
 			}
-			else
-			{
-				MONSTER_NUMBER this_monster = r_ptr->r_pkills;
+		}
+		else
+		{
+			MONSTER_NUMBER this_monster = r_ptr->r_pkills;
 
-				if (this_monster > 0)
-				{
-					total += this_monster;
-				}
+			if (this_monster > 0)
+			{
+				total += this_monster;
 			}
 		}
+	}
 
-		if (total < 1)
-			fprintf(fff, _("あなたはまだ敵を倒していない。\n\n", "You have defeated no enemies yet.\n\n"));
-		else
+	if (total < 1)
+		fprintf(fff, _("あなたはまだ敵を倒していない。\n\n", "You have defeated no enemies yet.\n\n"));
+	else
 #ifdef JP
-			fprintf(fff, "あなたは%ld体の敵を倒している。\n\n", (long int)total);
+		fprintf(fff, "あなたは%ld体の敵を倒している。\n\n", (long int)total);
 #else
-			fprintf(fff, "You have defeated %ld %s.\n\n", (long int)total, (total == 1) ? "enemy" : "enemies");
+		fprintf(fff, "You have defeated %ld %s.\n\n", (long int)total, (total == 1) ? "enemy" : "enemies");
 #endif
-	}
 
 	total = 0;
-
-	/* Scan the monsters */
 	int n = 0;
 	for (MONRACE_IDX i = 1; i < max_r_idx; i++)
 	{
 		monster_race *r_ptr = &r_info[i];
-
-		/* Use that monster */
 		if (r_ptr->name) who[n++] = i;
 	}
 
-	/* Sort the array by dungeon depth of monsters */
 	u16b why = 2;
 	ang_sort(who, &why, n, ang_sort_comp_hook, ang_sort_swap_hook);
-
-	/* Scan the monster races */
 	for (int k = 0; k < n; k++)
 	{
 		monster_race *r_ptr = &r_info[who[k]];
-
 		if (r_ptr->flags1 & (RF1_UNIQUE))
 		{
 			bool dead = (r_ptr->max_num == 0);
-
 			if (dead)
 			{
 				fprintf(fff, "     %s\n", (r_name + r_ptr->name));
@@ -4654,11 +2877,9 @@ static void do_cmd_knowledge_kill_count(player_type *creature_ptr)
 		}
 
 		MONSTER_NUMBER this_monster = r_ptr->r_pkills;
-
 		if (this_monster <= 0) continue;
 
 #ifdef JP
-		/* p,tは人と数える by ita */
 		if (my_strchr("pt", r_ptr->d_char))
 			fprintf(fff, "     %3d 人の %s\n", (int)this_monster, r_name + r_ptr->name);
 		else
@@ -4693,11 +2914,8 @@ static void do_cmd_knowledge_kill_count(player_type *creature_ptr)
 	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);
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("倒した敵の数", "Kill Count"), 0, 0);
 	fd_kill(file_name);
 }
@@ -4718,19 +2936,11 @@ static void do_cmd_knowledge_kill_count(player_type *creature_ptr)
  */
 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)
 {
-	/* Display lines until done */
 	for (int i = 0; i < per_page && (grp_idx[i] >= 0); i++)
 	{
-		/* Get the group index */
 		int grp = grp_idx[grp_top + i];
-
-		/* Choose a color */
 		TERM_COLOR attr = (grp_top + i == grp_cur) ? TERM_L_BLUE : TERM_WHITE;
-
-		/* Erase the entire line */
 		Term_erase(col, row + i, wid);
-
-		/* Display the group label */
 		c_put_str(attr, group_text[grp], row + i, col);
 	}
 }
@@ -4739,70 +2949,44 @@ static void display_group_list(int col, int row, int wid, int per_page, IDX grp_
 /*
  * Move the cursor in a browser window
  */
-static void browser_cursor(char ch, int *column, IDX *grp_cur, int grp_cnt,
-	IDX *list_cur, int list_cnt)
+static void browser_cursor(char ch, int *column, IDX *grp_cur, int grp_cnt, IDX *list_cur, int list_cnt)
 {
 	int d;
 	int col = *column;
 	IDX grp = *grp_cur;
 	IDX list = *list_cur;
-
-	/* Extract direction */
 	if (ch == ' ')
-	{
-		/* Hack -- scroll up full screen */
 		d = 3;
-	}
 	else if (ch == '-')
-	{
-		/* Hack -- scroll down full screen */
 		d = 9;
-	}
 	else
-	{
 		d = get_keymap_dir(ch);
-	}
 
 	if (!d) return;
 
-	/* Diagonals - hack */
 	if ((ddx[d] > 0) && ddy[d])
 	{
 		int browser_rows;
 		int wid, hgt;
-
 		Term_get_size(&wid, &hgt);
-
 		browser_rows = hgt - 8;
-
-		/* Browse group list */
 		if (!col)
 		{
 			int old_grp = grp;
-
-			/* Move up or down */
 			grp += ddy[d] * (browser_rows - 1);
-
-			/* Verify */
 			if (grp >= grp_cnt)	grp = grp_cnt - 1;
 			if (grp < 0) grp = 0;
 			if (grp != old_grp)	list = 0;
 		}
-
-		/* Browse sub-list list */
 		else
 		{
-			/* Move up or down */
 			list += ddy[d] * browser_rows;
-
-			/* Verify */
 			if (list >= list_cnt) list = list_cnt - 1;
 			if (list < 0) list = 0;
 		}
 
 		(*grp_cur) = grp;
 		(*list_cur) = list;
-
 		return;
 	}
 
@@ -4813,31 +2997,20 @@ static void browser_cursor(char ch, int *column, IDX *grp_cur, int grp_cnt,
 		if (col > 1) col = 1;
 
 		(*column) = col;
-
 		return;
 	}
 
-	/* Browse group list */
 	if (!col)
 	{
 		int old_grp = grp;
-
-		/* Move up or down */
 		grp += (IDX)ddy[d];
-
-		/* Verify */
 		if (grp >= grp_cnt)	grp = grp_cnt - 1;
 		if (grp < 0) grp = 0;
 		if (grp != old_grp)	list = 0;
 	}
-
-	/* Browse sub-list list */
 	else
 	{
-		/* Move up or down */
 		list += (IDX)ddy[d];
-
-		/* Verify */
 		if (list >= list_cnt) list = list_cnt - 1;
 		if (list < 0) list = 0;
 	}
@@ -4852,42 +3025,31 @@ static void browser_cursor(char ch, int *column, IDX *grp_cur, int grp_cnt,
  */
 static void display_visual_list(int col, int row, int height, int width, TERM_COLOR attr_top, byte char_left)
 {
-	/* Clear the display lines */
 	for (int i = 0; i < height; i++)
 	{
 		Term_erase(col, row + i, width);
 	}
 
-	/* Bigtile mode uses double width */
 	if (use_bigtile) width /= 2;
 
-	/* Display lines until done */
 	for (int i = 0; i < height; i++)
 	{
-		/* Display columns until done */
 		for (int j = 0; j < width; j++)
 		{
 			TERM_LEN x = col + j;
 			TERM_LEN y = row + i;
-
-			/* Bigtile mode uses double width */
 			if (use_bigtile) x += j;
 
 			TERM_COLOR ia = attr_top + i;
 			SYMBOL_CODE ic = char_left + j;
-
-			/* Ignore illegal characters */
 			if (ia > 0x7f || ic > 0xff || ic < ' ' ||
 				(!use_graphics && ic > 0x7f))
 				continue;
 
 			TERM_COLOR a = ia;
 			SYMBOL_CODE c = ic;
-
-			/* Force correct code for both ASCII character and tile */
 			if (c & 0x80) a |= 0x80;
 
-			/* Display symbol */
 			Term_queue_bigchar(x, y, a, c, 0, 0);
 		}
 	}
@@ -4904,11 +3066,8 @@ static void place_visual_list_cursor(TERM_LEN col, TERM_LEN row, TERM_COLOR a, b
 
 	TERM_LEN x = col + j;
 	TERM_LEN y = row + i;
-
-	/* Bigtile mode uses double width */
 	if (use_bigtile) x += j;
 
-	/* Place the cursor */
 	Term_gotoxy(x, y);
 }
 
@@ -4929,25 +3088,25 @@ static bool visual_mode_command(char ch, bool *visual_list_ptr,
 	case ESCAPE:
 		if (*visual_list_ptr)
 		{
-			/* Cancel change */
 			*cur_attr_ptr = attr_old;
 			*cur_char_ptr = char_old;
 			*visual_list_ptr = FALSE;
 
 			return TRUE;
 		}
+
 		break;
 
 	case '\n':
 	case '\r':
 		if (*visual_list_ptr)
 		{
-			/* Accept change */
 			*visual_list_ptr = FALSE;
 			*need_redraw = TRUE;
 
 			return TRUE;
 		}
+
 		break;
 
 	case 'V':
@@ -4964,31 +3123,27 @@ static bool visual_mode_command(char ch, bool *visual_list_ptr,
 
 			return TRUE;
 		}
+
 		break;
 
 	case 'C':
 	case 'c':
 	{
-		int i;
-
-		/* Set the visual */
 		attr_idx = *cur_attr_ptr;
 		char_idx = *cur_char_ptr;
-
-		/* Hack -- for feature lighting */
-		for (i = 0; i < F_LIT_MAX; i++)
+		for (int i = 0; i < F_LIT_MAX; i++)
 		{
 			attr_idx_feat[i] = 0;
 			char_idx_feat[i] = 0;
 		}
 	}
+
 	return TRUE;
 
 	case 'P':
 	case 'p':
-		if (attr_idx || (!(char_idx & 0x80) && char_idx)) /* Allow TERM_DARK text */
+		if (attr_idx || (!(char_idx & 0x80) && char_idx))
 		{
-			/* Set the char */
 			*cur_attr_ptr = attr_idx;
 			*attr_top_ptr = MAX(0, (*cur_attr_ptr & 0x7f) - 5);
 			if (!*visual_list_ptr) *need_redraw = TRUE;
@@ -5015,7 +3170,6 @@ static bool visual_mode_command(char ch, bool *visual_list_ptr,
 			if (use_bigtile) eff_width = width / 2;
 			else eff_width = width;
 
-			/* Restrict direction */
 			if ((a == 0) && (ddy[d] < 0)) d = 0;
 			if ((c == 0) && (ddx[d] < 0)) d = 0;
 			if ((a == 0x7f) && (ddy[d] > 0)) d = 0;
@@ -5023,26 +3177,20 @@ static bool visual_mode_command(char ch, bool *visual_list_ptr,
 
 			a += (TERM_COLOR)ddy[d];
 			c += (SYMBOL_CODE)ddx[d];
-
-			/* Force correct code for both ASCII character and tile */
 			if (c & 0x80) a |= 0x80;
 
-			/* Set the visual */
 			*cur_attr_ptr = a;
 			*cur_char_ptr = c;
-
-
-			/* Move the frame */
 			if ((ddx[d] < 0) && *char_left_ptr > MAX(0, (int)c - 10)) (*char_left_ptr)--;
 			if ((ddx[d] > 0) && *char_left_ptr + eff_width < MIN(0xff, (int)c + 10)) (*char_left_ptr)++;
 			if ((ddy[d] < 0) && *attr_top_ptr > MAX(0, (int)(a & 0x7f) - 4)) (*attr_top_ptr)--;
 			if ((ddy[d] > 0) && *attr_top_ptr + height < MIN(0x7f, (a & 0x7f) + 4)) (*attr_top_ptr)++;
 			return TRUE;
 		}
+
 		break;
 	}
 
-	/* Visual mode command is not used */
 	return FALSE;
 }
 
@@ -5050,28 +3198,16 @@ static bool visual_mode_command(char ch, bool *visual_list_ptr,
 /*
  * Display the monsters in a group.
  */
-static void display_monster_list(int col, int row, int per_page, s16b mon_idx[],
-	int mon_cur, int mon_top, bool visual_only)
+static void display_monster_list(int col, int row, int per_page, s16b mon_idx[], int mon_cur, int mon_top, bool visual_only)
 {
-	/* Display lines until done */
 	int i;
 	for (i = 0; i < per_page && (mon_idx[mon_top + i] >= 0); i++)
 	{
 		TERM_COLOR attr;
-
-		/* Get the race index */
 		MONRACE_IDX r_idx = mon_idx[mon_top + i];
-
-		/* Access the race */
 		monster_race *r_ptr = &r_info[r_idx];
-
-		/* Choose a color */
 		attr = ((i + mon_top == mon_cur) ? TERM_L_BLUE : TERM_WHITE);
-
-		/* Display the name */
 		c_prt(attr, (r_name + r_ptr->name), row + i, col);
-
-		/* Hack -- visual_list mode */
 		if (per_page == 1)
 		{
 			c_prt(attr, format("%02x/%02x", r_ptr->x_attr, r_ptr->x_char), row + i, (current_world_ptr->wizard || visual_only) ? 56 : 61);
@@ -5082,15 +3218,10 @@ static void display_monster_list(int col, int row, int per_page, s16b mon_idx[],
 			c_prt(attr, format("%d", r_idx), row + i, 62);
 		}
 
-		/* Erase chars before overwritten by the race letter */
 		Term_erase(69, row + i, 255);
-
-		/* Display symbol */
 		Term_queue_bigchar(use_bigtile ? 69 : 70, row + i, r_ptr->x_attr, r_ptr->x_char, 0, 0);
-
 		if (!visual_only)
 		{
-			/* Display kills */
 			if (!(r_ptr->flags1 & RF1_UNIQUE))
 				put_str(format("%5d", r_ptr->r_pkills), row + i, 73);
 			else
@@ -5099,7 +3230,6 @@ static void display_monster_list(int col, int row, int per_page, s16b mon_idx[],
 		}
 	}
 
-	/* Clear remaining lines */
 	for (; i < per_page; i++)
 	{
 		Term_erase(col, row + i, 255);
@@ -5120,8 +3250,6 @@ static void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redr
 {
 	TERM_LEN wid, hgt;
 	Term_get_size(&wid, &hgt);
-
-	/* Allocate the "mon_idx" array */
 	IDX *mon_idx;
 	C_MAKE(mon_idx, max_r_idx, MONRACE_IDX);
 
@@ -5137,21 +3265,14 @@ static void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redr
 	if (direct_r_idx < 0)
 	{
 		mode = visual_only ? 0x03 : 0x01;
-
-		/* Check every group */
 		int len;
 		for (IDX i = 0; monster_group_text[i] != NULL; i++)
 		{
-			/* Measure the label */
 			len = strlen(monster_group_text[i]);
-
-			/* Save the maximum length */
 			if (len > max) max = len;
 
-			/* See if any monsters are known */
 			if ((monster_group_char[i] == ((char *)-1L)) || collect_monsters(creature_ptr, i, mon_idx, mode))
 			{
-				/* Build a list of groups with known monsters */
 				grp_idx[grp_cnt++] = i;
 			}
 		}
@@ -5162,17 +3283,13 @@ static void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redr
 	{
 		mon_idx[0] = direct_r_idx;
 		mon_cnt = 1;
-
-		/* Terminate the list */
 		mon_idx[1] = -1;
 
 		(void)visual_mode_command('v', &visual_list, browser_rows - 1, wid - (max + 3),
 			&attr_top, &char_left, &r_info[direct_r_idx].x_attr, &r_info[direct_r_idx].x_char, need_redraw);
 	}
 
-	/* Terminate the list */
 	grp_idx[grp_cnt] = -1;
-
 	mode = visual_only ? 0x02 : 0x00;
 	IDX old_grp_cur = -1;
 	IDX grp_cur = 0;
@@ -5212,22 +3329,16 @@ static void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redr
 
 		if (direct_r_idx < 0)
 		{
-			/* Scroll group list */
 			if (grp_cur < grp_top) grp_top = grp_cur;
 			if (grp_cur >= grp_top + browser_rows) grp_top = grp_cur - browser_rows + 1;
 
-			/* Display a list of monster groups */
 			display_group_list(0, 6, max, browser_rows, grp_idx, monster_group_text, grp_cur, grp_top);
-
 			if (old_grp_cur != grp_cur)
 			{
 				old_grp_cur = grp_cur;
-
-				/* Get a list of monsters in the current group */
 				mon_cnt = collect_monsters(creature_ptr, grp_idx[grp_cur], mon_idx, mode);
 			}
 
-			/* Scroll monster list */
 			while (mon_cur < mon_top)
 				mon_top = MAX(0, mon_top - browser_rows / 2);
 			while (mon_cur >= mon_top + browser_rows)
@@ -5236,34 +3347,26 @@ static void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redr
 
 		if (!visual_list)
 		{
-			/* Display a list of monsters in the current group */
 			display_monster_list(max + 3, 6, browser_rows, mon_idx, mon_cur, mon_top, visual_only);
 		}
 		else
 		{
 			mon_top = mon_cur;
-
-			/* Display a monster name */
 			display_monster_list(max + 3, 6, 1, mon_idx, mon_cur, mon_top, visual_only);
-
-			/* Display visual list below first monster */
 			display_visual_list(max + 3, 7, browser_rows - 1, wid - (max + 3), attr_top, char_left);
 		}
 
-		/* Prompt */
 		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);
 
-		/* Get the current monster */
 		monster_race *r_ptr;
 		r_ptr = &r_info[mon_idx[mon_cur]];
 
 		if (!visual_only)
 		{
-			/* Mega Hack -- track this monster race */
 			if (mon_cnt) monster_race_track(creature_ptr, mon_idx[mon_cur]);
 			handle_stuff(creature_ptr);
 		}
@@ -5282,8 +3385,6 @@ static void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redr
 		}
 
 		char ch = inkey();
-
-		/* Do visual mode command if needed */
 		if (visual_mode_command(ch, &visual_list, browser_rows - 1, wid - (max + 3), &attr_top, &char_left, &r_ptr->x_attr, &r_ptr->x_char, need_redraw))
 		{
 			if (direct_r_idx >= 0)
@@ -5312,7 +3413,6 @@ static void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redr
 		case 'R':
 		case 'r':
 		{
-			/* Recall on screen */
 			if (!visual_list && !visual_only && (mon_idx[mon_cur] > 0))
 			{
 				screen_roff(creature_ptr, mon_idx[mon_cur], 0);
@@ -5327,7 +3427,6 @@ static void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redr
 
 		default:
 		{
-			/* Move the cursor */
 			browser_cursor(ch, &column, &grp_cur, grp_cnt, &mon_cur, mon_cnt);
 
 			break;
@@ -5335,7 +3434,6 @@ static void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redr
 		}
 	}
 
-	/* Free the "mon_idx" array */
 	C_KILL(mon_idx, max_r_idx, MONRACE_IDX);
 }
 
@@ -5346,7 +3444,6 @@ static void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redr
 static void display_object_list(int col, int row, int per_page, IDX object_idx[],
 	int object_cur, int object_top, bool visual_only)
 {
-	/* Display lines until done */
 	int i;
 	for (i = 0; i < per_page && (object_idx[object_top + i] >= 0); i++)
 	{
@@ -5354,45 +3451,30 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
 		TERM_COLOR a;
 		SYMBOL_CODE c;
 		object_kind *flavor_k_ptr;
-
-		/* Get the object index */
 		KIND_OBJECT_IDX k_idx = object_idx[object_top + i];
-
-		/* Access the object */
 		object_kind *k_ptr = &k_info[k_idx];
-
-		/* Choose a color */
 		TERM_COLOR attr = ((k_ptr->aware || visual_only) ? TERM_WHITE : TERM_SLATE);
 		byte cursor = ((k_ptr->aware || visual_only) ? TERM_L_BLUE : TERM_BLUE);
-
 		if (!visual_only && k_ptr->flavor)
 		{
-			/* Appearance of this object is shuffled */
 			flavor_k_ptr = &k_info[k_ptr->flavor];
 		}
 		else
 		{
-			/* Appearance of this object is very normal */
 			flavor_k_ptr = k_ptr;
 		}
 
 		attr = ((i + object_top == object_cur) ? cursor : attr);
-
 		if (!k_ptr->flavor || (!visual_only && k_ptr->aware))
 		{
-			/* Tidy name */
 			strip_name(o_name, k_idx);
 		}
 		else
 		{
-			/* Flavor name */
 			strcpy(o_name, k_name + flavor_k_ptr->flavor_name);
 		}
 
-		/* Display the name */
 		c_prt(attr, o_name, row + i, col);
-
-		/* Hack -- visual_list mode */
 		if (per_page == 1)
 		{
 			c_prt(attr, format("%02x/%02x", flavor_k_ptr->x_attr, flavor_k_ptr->x_char), row + i, (current_world_ptr->wizard || visual_only) ? 64 : 68);
@@ -5406,11 +3488,9 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
 		a = flavor_k_ptr->x_attr;
 		c = flavor_k_ptr->x_char;
 
-		/* Display symbol */
 		Term_queue_bigchar(use_bigtile ? 76 : 77, row + i, a, c, 0, 0);
 	}
 
-	/* Clear remaining lines */
 	for (; i < per_page; i++)
 	{
 		Term_erase(col, row + i, 255);
@@ -5429,7 +3509,6 @@ static void desc_obj_fake(player_type *creature_ptr, KIND_OBJECT_IDX k_idx)
 	object_wipe(o_ptr);
 	object_prep(o_ptr, k_idx);
 
-	/* It's fully know */
 	o_ptr->ident |= IDENT_KNOWN;
 	handle_stuff(creature_ptr);
 
@@ -5459,8 +3538,6 @@ static void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redra
 	Term_get_size(&wid, &hgt);
 
 	int browser_rows = hgt - 8;
-
-	/* Allocate the "object_idx" array */
 	C_MAKE(object_idx, max_k_idx, KIND_OBJECT_IDX);
 
 	int len;
@@ -5469,20 +3546,13 @@ static void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redra
 	if (direct_k_idx < 0)
 	{
 		mode = visual_only ? 0x03 : 0x01;
-
-		/* Check every group */
 		for (IDX i = 0; object_group_text[i] != NULL; i++)
 		{
-			/* Measure the label */
 			len = strlen(object_group_text[i]);
-
-			/* Save the maximum length */
 			if (len > max) max = len;
 
-			/* See if any monsters are known */
 			if (collect_objects(i, object_idx, mode))
 			{
-				/* Build a list of groups with known monsters */
 				grp_idx[grp_cnt++] = i;
 			}
 		}
@@ -5497,29 +3567,22 @@ static void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redra
 
 		if (!visual_only && k_ptr->flavor)
 		{
-			/* Appearance of this object is shuffled */
 			flavor_k_ptr = &k_info[k_ptr->flavor];
 		}
 		else
 		{
-			/* Appearance of this object is very normal */
 			flavor_k_ptr = k_ptr;
 		}
 
 		object_idx[0] = direct_k_idx;
 		object_old = direct_k_idx;
 		object_cnt = 1;
-
-		/* Terminate the list */
 		object_idx[1] = -1;
-
 		(void)visual_mode_command('v', &visual_list, browser_rows - 1, wid - (max + 3),
 			&attr_top, &char_left, &flavor_k_ptr->x_attr, &flavor_k_ptr->x_char, need_redraw);
 	}
 
-	/* Terminate the list */
 	grp_idx[grp_cnt] = -1;
-
 	mode = visual_only ? 0x02 : 0x00;
 	IDX old_grp_cur = -1;
 	IDX grp_cur = 0;
@@ -5568,22 +3631,16 @@ static void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redra
 
 		if (direct_k_idx < 0)
 		{
-			/* Scroll group list */
 			if (grp_cur < grp_top) grp_top = grp_cur;
 			if (grp_cur >= grp_top + browser_rows) grp_top = grp_cur - browser_rows + 1;
 
-			/* Display a list of object groups */
 			display_group_list(0, 6, max, browser_rows, grp_idx, object_group_text, grp_cur, grp_top);
-
 			if (old_grp_cur != grp_cur)
 			{
 				old_grp_cur = grp_cur;
-
-				/* Get a list of objects in the current group */
 				object_cnt = collect_objects(grp_idx[grp_cur], object_idx, mode);
 			}
 
-			/* Scroll object list */
 			while (object_cur < object_top)
 				object_top = MAX(0, object_top - browser_rows / 2);
 			while (object_cur >= object_top + browser_rows)
@@ -5592,35 +3649,26 @@ static void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redra
 
 		if (!visual_list)
 		{
-			/* Display a list of objects in the current group */
 			display_object_list(max + 3, 6, browser_rows, object_idx, object_cur, object_top, visual_only);
 		}
 		else
 		{
 			object_top = object_cur;
-
-			/* Display a list of objects in the current group */
 			display_object_list(max + 3, 6, 1, object_idx, object_cur, object_top, visual_only);
-
-			/* Display visual list below first object */
 			display_visual_list(max + 3, 7, browser_rows - 1, wid - (max + 3), attr_top, char_left);
 		}
 
-		/* Get the current object */
 		k_ptr = &k_info[object_idx[object_cur]];
 
 		if (!visual_only && k_ptr->flavor)
 		{
-			/* Appearance of this object is shuffled */
 			flavor_k_ptr = &k_info[k_ptr->flavor];
 		}
 		else
 		{
-			/* Appearance of this object is very normal */
 			flavor_k_ptr = k_ptr;
 		}
 
-		/* Prompt */
 #ifdef JP
 		prt(format("<方向>%s%s%s, ESC",
 			(!visual_list && !visual_only) ? ", 'r'で詳細を見る" : "",
@@ -5637,15 +3685,11 @@ static void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redra
 
 		if (!visual_only)
 		{
-			/* Mega Hack -- track this object */
 			if (object_cnt) object_kind_track(creature_ptr, object_idx[object_cur]);
 
-			/* The "current" object changed */
 			if (object_old != object_idx[object_cur])
 			{
 				handle_stuff(creature_ptr);
-
-				/* Remember the "current" object */
 				object_old = object_idx[object_cur];
 			}
 		}
@@ -5664,8 +3708,6 @@ static void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redra
 		}
 
 		char ch = inkey();
-
-		/* Do visual mode command if needed */
 		if (visual_mode_command(ch, &visual_list, browser_rows - 1, wid - (max + 3), &attr_top, &char_left, &flavor_k_ptr->x_attr, &flavor_k_ptr->x_char, need_redraw))
 		{
 			if (direct_k_idx >= 0)
@@ -5693,25 +3735,23 @@ static void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redra
 		case 'R':
 		case 'r':
 		{
-			/* Recall on screen */
 			if (!visual_list && !visual_only && (grp_cnt > 0))
 			{
 				desc_obj_fake(creature_ptr, object_idx[object_cur]);
 				redraw = TRUE;
 			}
+
 			break;
 		}
 
 		default:
 		{
-			/* Move the cursor */
 			browser_cursor(ch, &column, &grp_cur, grp_cnt, &object_cur, object_cnt);
 			break;
 		}
 		}
 	}
 
-	/* Free the "object_idx" array */
 	C_KILL(object_idx, max_k_idx, KIND_OBJECT_IDX);
 }
 
@@ -5725,31 +3765,21 @@ static void display_feature_list(int col, int row, int per_page, FEAT_IDX *feat_
 	int lit_col[F_LIT_MAX], i;
 	int f_idx_col = use_bigtile ? 62 : 64;
 
-	/* Correct columns 1 and 4 */
 	lit_col[F_LIT_STANDARD] = use_bigtile ? (71 - F_LIT_MAX) : 71;
 	for (i = F_LIT_NS_BEGIN; i < F_LIT_MAX; i++)
 		lit_col[i] = lit_col[F_LIT_STANDARD] + 2 + (i - F_LIT_NS_BEGIN) * 2 + (use_bigtile ? i : 0);
 
-	/* Display lines until done */
 	for (i = 0; i < per_page && (feat_idx[feat_top + i] >= 0); i++)
 	{
 		TERM_COLOR attr;
 		FEAT_IDX f_idx = feat_idx[feat_top + i];
 		feature_type *f_ptr = &f_info[f_idx];
 		int row_i = row + i;
-
-		/* Choose a color */
 		attr = ((i + feat_top == feat_cur) ? TERM_L_BLUE : TERM_WHITE);
-
-		/* Display the name */
 		c_prt(attr, f_name + f_ptr->name, row_i, col);
-
-		/* Hack -- visual_list mode */
 		if (per_page == 1)
 		{
-			/* Display lighting level */
 			c_prt(attr, format("(%s)", lighting_level_str[lighting_level]), row_i, col + 1 + strlen(f_name + f_ptr->name));
-
 			c_prt(attr, format("%02x/%02x", f_ptr->x_attr[lighting_level], f_ptr->x_char[lighting_level]), row_i, f_idx_col - ((current_world_ptr->wizard || visual_only) ? 6 : 2));
 		}
 		if (current_world_ptr->wizard || visual_only)
@@ -5757,24 +3787,20 @@ static void display_feature_list(int col, int row, int per_page, FEAT_IDX *feat_
 			c_prt(attr, format("%d", f_idx), row_i, f_idx_col);
 		}
 
-		/* Display symbol */
 		Term_queue_bigchar(lit_col[F_LIT_STANDARD], row_i, f_ptr->x_attr[F_LIT_STANDARD], f_ptr->x_char[F_LIT_STANDARD], 0, 0);
-
 		Term_putch(lit_col[F_LIT_NS_BEGIN], row_i, TERM_SLATE, '(');
 		for (int j = F_LIT_NS_BEGIN + 1; j < F_LIT_MAX; j++)
 		{
 			Term_putch(lit_col[j], row_i, TERM_SLATE, '/');
 		}
-		Term_putch(lit_col[F_LIT_MAX - 1] + (use_bigtile ? 3 : 2), row_i, TERM_SLATE, ')');
 
-		/* Mega-hack -- Use non-standard colour */
+		Term_putch(lit_col[F_LIT_MAX - 1] + (use_bigtile ? 3 : 2), row_i, TERM_SLATE, ')');
 		for (int j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++)
 		{
 			Term_queue_bigchar(lit_col[j] + 1, row_i, f_ptr->x_attr[j], f_ptr->x_char[j], 0, 0);
 		}
 	}
 
-	/* Clear remaining lines */
 	for (; i < per_page; i++)
 	{
 		Term_erase(col, row + i, 255);
@@ -5795,7 +3821,6 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 	TERM_LEN wid, hgt;
 	Term_get_size(&wid, &hgt);
 
-	/* Allocate the "feat_idx" array */
 	FEAT_IDX *feat_idx;
 	C_MAKE(feat_idx, max_f_idx, FEAT_IDX);
 
@@ -5810,19 +3835,13 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 	TERM_LEN browser_rows = hgt - 8;
 	if (direct_f_idx < 0)
 	{
-		/* Check every group */
 		for (FEAT_IDX i = 0; feature_group_text[i] != NULL; i++)
 		{
-			/* Measure the label */
 			len = strlen(feature_group_text[i]);
-
-			/* Save the maximum length */
 			if (len > max) max = len;
 
-			/* See if any features are known */
 			if (collect_features(feat_idx, 0x01))
 			{
-				/* Build a list of groups with known features */
 				grp_idx[grp_cnt++] = i;
 			}
 		}
@@ -5835,8 +3854,6 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 
 		feat_idx[0] = direct_f_idx;
 		feat_cnt = 1;
-
-		/* Terminate the list */
 		feat_idx[1] = -1;
 
 		(void)visual_mode_command('v', &visual_list, browser_rows - 1, wid - (max + 3),
@@ -5849,7 +3866,6 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 		}
 	}
 
-	/* Terminate the list */
 	grp_idx[grp_cnt] = -1;
 
 	FEAT_IDX old_grp_cur = -1;
@@ -5903,22 +3919,16 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 
 		if (direct_f_idx < 0)
 		{
-			/* Scroll group list */
 			if (grp_cur < grp_top) grp_top = grp_cur;
 			if (grp_cur >= grp_top + browser_rows) grp_top = grp_cur - browser_rows + 1;
 
-			/* Display a list of feature groups */
 			display_group_list(0, 6, max, browser_rows, grp_idx, feature_group_text, grp_cur, grp_top);
-
 			if (old_grp_cur != grp_cur)
 			{
 				old_grp_cur = grp_cur;
-
-				/* Get a list of features in the current group */
 				feat_cnt = collect_features(feat_idx, 0x00);
 			}
 
-			/* Scroll feature list */
 			while (feat_cur < feat_top)
 				feat_top = MAX(0, feat_top - browser_rows / 2);
 			while (feat_cur >= feat_top + browser_rows)
@@ -5927,27 +3937,20 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 
 		if (!visual_list)
 		{
-			/* Display a list of features in the current group */
 			display_feature_list(max + 3, 6, browser_rows, feat_idx, feat_cur, feat_top, visual_only, F_LIT_STANDARD);
 		}
 		else
 		{
 			feat_top = feat_cur;
-
-			/* Display a list of features in the current group */
 			display_feature_list(max + 3, 6, 1, feat_idx, feat_cur, feat_top, visual_only, *lighting_level);
-
-			/* Display visual list below first object */
 			display_visual_list(max + 3, 7, browser_rows - 1, wid - (max + 3), attr_top, char_left);
 		}
 
-		/* Prompt */
 		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);
 
-		/* Get the current feature */
 		f_ptr = &f_info[feat_idx[feat_cur]];
 		cur_attr_ptr = &f_ptr->x_attr[*lighting_level];
 		cur_char_ptr = &f_ptr->x_char[*lighting_level];
@@ -5966,7 +3969,6 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 		}
 
 		ch = inkey();
-
 		if (visual_list && ((ch == 'A') || (ch == 'a')))
 		{
 			int prev_lighting_level = *lighting_level;
@@ -5990,7 +3992,6 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 
 			continue;
 		}
-
 		else if ((ch == 'D') || (ch == 'd'))
 		{
 			TERM_COLOR prev_x_attr = f_ptr->x_attr[*lighting_level];
@@ -6010,13 +4011,10 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 
 			continue;
 		}
-
-		/* Do visual mode command if needed */
 		else if (visual_mode_command(ch, &visual_list, browser_rows - 1, wid - (max + 3), &attr_top, &char_left, cur_attr_ptr, cur_char_ptr, need_redraw))
 		{
 			switch (ch)
 			{
-				/* Restore previous visual settings */
 			case ESCAPE:
 				for (FEAT_IDX i = 0; i < F_LIT_MAX; i++)
 				{
@@ -6025,14 +4023,11 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 				}
 
 				/* Fall through */
-
 			case '\n':
 			case '\r':
 				if (direct_f_idx >= 0) flag = TRUE;
 				else *lighting_level = F_LIT_STANDARD;
 				break;
-
-				/* Preserve current visual settings */
 			case 'V':
 			case 'v':
 				for (FEAT_IDX i = 0; i < F_LIT_MAX; i++)
@@ -6059,7 +4054,6 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 			case 'p':
 				if (!visual_list)
 				{
-					/* Allow TERM_DARK text */
 					for (FEAT_IDX i = F_LIT_NS_BEGIN; i < F_LIT_MAX; i++)
 					{
 						if (attr_idx_feat[i] || (!(char_idx_feat[i] & 0x80) && char_idx_feat[i])) f_ptr->x_attr[i] = attr_idx_feat[i];
@@ -6081,14 +4075,12 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 
 		default:
 		{
-			/* Move the cursor */
 			browser_cursor(ch, &column, &grp_cur, grp_cnt, &feat_cur, feat_cnt);
 			break;
 		}
 		}
 	}
 
-	/* Free the "feat_idx" array */
 	C_KILL(feat_idx, max_f_idx, FEAT_IDX);
 }
 
@@ -6100,7 +4092,6 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
  */
 static void do_cmd_knowledge_bounty(player_type *creature_ptr)
 {
-	/* Open a new file */
 	FILE *fff;
 	GAME_TEXT file_name[1024];
 	fff = my_fopen_temp(file_name, 1024);
@@ -6133,8 +4124,6 @@ static void do_cmd_knowledge_bounty(player_type *creature_ptr)
 	}
 
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("賞金首の一覧", "Wanted monsters"), 0, 0);
 	fd_kill(file_name);
 }
@@ -6144,7 +4133,6 @@ static void do_cmd_knowledge_bounty(player_type *creature_ptr)
  */
 static void do_cmd_knowledge_virtues(player_type *creature_ptr)
 {
-	/* Open a new file */
 	FILE *fff;
 	GAME_TEXT file_name[1024];
 	fff = my_fopen_temp(file_name, 1024);
@@ -6158,8 +4146,6 @@ static void do_cmd_knowledge_virtues(player_type *creature_ptr)
 	fprintf(fff, _("現在の属性 : %s\n\n", "Your alignment : %s\n\n"), your_alignment(creature_ptr));
 	dump_virtues(creature_ptr, fff);
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("八つの徳", "Virtues"), 0, 0);
 	fd_kill(file_name);
 }
@@ -6169,7 +4155,6 @@ static void do_cmd_knowledge_virtues(player_type *creature_ptr)
  */
 static void do_cmd_knowledge_dungeon(player_type *creature_ptr)
 {
-	/* Open a new file */
 	FILE *fff;
 	GAME_TEXT file_name[1024];
 	fff = my_fopen_temp(file_name, 1024);
@@ -6196,8 +4181,6 @@ static void do_cmd_knowledge_dungeon(player_type *creature_ptr)
 	}
 
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("今までに入ったダンジョン", "Dungeon"), 0, 0);
 	fd_kill(file_name);
 }
@@ -6209,7 +4192,6 @@ static void do_cmd_knowledge_dungeon(player_type *creature_ptr)
 */
 static void do_cmd_knowledge_stat(player_type *creature_ptr)
 {
-	/* Open a new file */
 	FILE *fff;
 	GAME_TEXT file_name[1024];
 	fff = my_fopen_temp(file_name, 1024);
@@ -6237,8 +4219,6 @@ static void do_cmd_knowledge_stat(player_type *creature_ptr)
 
 	dump_yourself(creature_ptr, fff);
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("自分に関する情報", "HP-rate & Max stat"), 0, 0);
 	fd_kill(file_name);
 }
@@ -6269,28 +4249,18 @@ static void do_cmd_knowledge_quests_current(player_type *creature_ptr, FILE *fff
 		if (!is_print)
 			continue;
 
-		/* Set the quest number temporary */
 		QUEST_IDX old_quest = creature_ptr->current_floor_ptr->inside_quest;
+		for (int j = 0; j < 10; j++)
+			quest_text[j][0] = '\0';
 
-		/* Clear the text */
-		for (int j = 0; j < 10; j++) quest_text[j][0] = '\0';
 		quest_text_line = 0;
-
 		creature_ptr->current_floor_ptr->inside_quest = i;
-
-		/* Get the quest text */
 		init_flags = INIT_SHOW_TEXT;
-
 		process_dungeon_file(creature_ptr, "q_info.txt", 0, 0, 0, 0);
-
-		/* Reset the old quest number */
 		creature_ptr->current_floor_ptr->inside_quest = old_quest;
-
-		/* No info from "silent" quests */
 		if (quest[i].flags & QUEST_FLAG_SILENT) continue;
 
 		total++;
-
 		if (quest[i].type != QUEST_TYPE_RANDOM)
 		{
 			char note[80] = "\0";
@@ -6353,12 +4323,9 @@ static void do_cmd_knowledge_quests_current(player_type *creature_ptr, FILE *fff
 				}
 			}
 
-			/* Print the quest info */
 			sprintf(tmp_str, _("  %s (危険度:%d階相当)%s\n", "  %s (Danger level: %d)%s\n"),
 				quest[i].name, (int)quest[i].level, note);
-
 			fputs(tmp_str, fff);
-
 			if (quest[i].status == QUEST_STATUS_COMPLETED)
 			{
 				sprintf(tmp_str, _("    クエスト達成 - まだ報酬を受けとってない。\n", "    Quest Completed - Unrewarded\n"));
@@ -6376,19 +4343,14 @@ static void do_cmd_knowledge_quests_current(player_type *creature_ptr, FILE *fff
 			continue;
 		}
 
-		/* QUEST_TYPE_RANDOM */
 		if (quest[i].level >= rand_level)
 			continue;
 
-		/* New random */
 		rand_level = quest[i].level;
-
 		if (max_dlv[DUNGEON_ANGBAND] < rand_level) continue;
 
-		/* Print the quest info */
 		r_ptr = &r_info[quest[i].r_idx];
 		strcpy(name, r_name + r_ptr->name);
-
 		if (quest[i].max_num <= 1)
 		{
 			sprintf(rand_tmp_str, _("  %s (%d 階) - %sを倒す。\n", "  %s (Dungeon level: %d)\n  Kill %s.\n"),
@@ -6409,7 +4371,6 @@ static void do_cmd_knowledge_quests_current(player_type *creature_ptr, FILE *fff
 #endif
 	}
 
-	/* Print the current random quest  */
 	if (rand_tmp_str[0]) fputs(rand_tmp_str, fff);
 
 	if (!total) fprintf(fff, _("  なし\n", "  Nothing.\n"));
@@ -6425,20 +4386,11 @@ static bool do_cmd_knowledge_quests_aux(player_type *player_ptr, FILE *fff, IDX
 	floor_type *floor_ptr = player_ptr->current_floor_ptr;
 	if (is_fixed_quest_idx(q_idx))
 	{
-		/* Set the quest number temporary */
 		IDX old_quest = floor_ptr->inside_quest;
-
 		floor_ptr->inside_quest = q_idx;
-
-		/* Get the quest */
 		init_flags = INIT_NAME_ONLY;
-
 		process_dungeon_file(player_ptr, "q_info.txt", 0, 0, 0, 0);
-
-		/* Reset the old quest number */
 		floor_ptr->inside_quest = old_quest;
-
-		/* No info from "silent" quests */
 		if (q_ptr->flags & QUEST_FLAG_SILENT) return FALSE;
 	}
 
@@ -6447,7 +4399,6 @@ static bool do_cmd_knowledge_quests_aux(player_type *player_ptr, FILE *fff, IDX
 
 	if (is_fixed_quest_idx(q_idx) || (q_ptr->r_idx == 0))
 	{
-		/* Print the quest info */
 		sprintf(tmp_str,
 			_("  %-35s (危険度:%3d階相当) - レベル%2d - %s\n",
 				"  %-35s (Danger  level: %3d) - level %2d - %s\n"),
@@ -6456,7 +4407,6 @@ static bool do_cmd_knowledge_quests_aux(player_type *player_ptr, FILE *fff, IDX
 		return TRUE;
 	}
 
-	/* Print the quest info */
 	if (q_ptr->complev == 0)
 	{
 		sprintf(tmp_str,
@@ -6543,14 +4493,11 @@ static void do_cmd_knowledge_quests_wiz_random(FILE *fff)
 	QUEST_IDX total = 0;
 	for (QUEST_IDX i = 1; i < max_q_idx; i++)
 	{
-		/* No info from "silent" quests */
 		if (quest[i].flags & QUEST_FLAG_SILENT) continue;
 
 		if ((quest[i].type == QUEST_TYPE_RANDOM) && (quest[i].status == QUEST_STATUS_TAKEN))
 		{
 			total++;
-
-			/* Print the quest info */
 			sprintf(tmp_str, _("  %s (%d階, %s)\n", "  %s (%d, %s)\n"),
 				quest[i].name, (int)quest[i].level, r_name + r_info[quest[i].r_idx].name);
 			fputs(tmp_str, fff);
@@ -6567,7 +4514,6 @@ static void do_cmd_knowledge_quests_wiz_random(FILE *fff)
  */
 static void do_cmd_knowledge_quests(player_type *creature_ptr)
 {
-	/* Open a new file */
 	FILE *fff;
 	GAME_TEXT file_name[1024];
 	fff = my_fopen_temp(file_name, 1024);
@@ -6578,16 +4524,15 @@ static void do_cmd_knowledge_quests(player_type *creature_ptr)
 		return;
 	}
 
-	/* Allocate Memory */
 	IDX *quest_num;
 	C_MAKE(quest_num, max_q_idx, QUEST_IDX);
 
-	/* Sort by compete level */
-	for (IDX i = 1; i < max_q_idx; i++) quest_num[i] = i;
+	for (IDX i = 1; i < max_q_idx; i++)
+		quest_num[i] = i;
+
 	int dummy;
 	ang_sort(quest_num, &dummy, max_q_idx, ang_sort_comp_quest_num, ang_sort_swap_quest_num);
 
-	/* Dump Quest Information */
 	do_cmd_knowledge_quests_current(creature_ptr, fff);
 	fputc('\n', fff);
 	do_cmd_knowledge_quests_completed(creature_ptr, fff, quest_num);
@@ -6600,12 +4545,8 @@ static void do_cmd_knowledge_quests(player_type *creature_ptr)
 	}
 
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("クエスト達成状況", "Quest status"), 0, 0);
 	fd_kill(file_name);
-
-	/* Free Memory */
 	C_KILL(quest_num, max_q_idx, QUEST_IDX);
 }
 
@@ -6630,20 +4571,15 @@ static void do_cmd_knowledge_home(player_type *player_ptr)
 		return;
 	}
 
-	/* Print all homes in the different towns */
 	store_type *st_ptr;
 	st_ptr = &town_info[1].store[STORE_HOME];
 
-	/* Home -- if anything there */
 	if (st_ptr->stock_num)
 	{
 #ifdef JP
 		TERM_LEN x = 1;
 #endif
-		/* Header with name of the town */
 		fprintf(fff, _("  [ 我が家のアイテム ]\n", "  [Home Inventory]\n"));
-
-		/* Dump all available items */
 		concptr	paren = ")";
 		GAME_TEXT o_name[MAX_NLEN];
 		for (int i = 0; i < st_ptr->stock_num; i++)
@@ -6672,13 +4608,10 @@ static void do_cmd_knowledge_home(player_type *player_ptr)
 #endif
 		}
 
-		/* Add an empty line */
 		fprintf(fff, "\n\n");
 	}
 
 	my_fclose(fff);
-
-	/* Display the file contents */
 	(void)show_file(player_ptr, TRUE, file_name, _("我が家のアイテム", "Home Inventory"), 0, 0);
 	fd_kill(file_name);
 }
@@ -6744,7 +4677,6 @@ static void do_cmd_knowledge_autopick(player_type *creature_ptr)
 
 	my_fclose(fff);
 
-	/* Display the file contents */
 	(void)show_file(creature_ptr, TRUE, file_name, _("自動拾い/破壊 設定リスト", "Auto-picker/Destroyer"), 0, 0);
 	fd_kill(file_name);
 }
@@ -6757,21 +4689,14 @@ void do_cmd_knowledge(player_type *creature_ptr)
 {
 	int i, p = 0;
 	bool need_redraw = FALSE;
-
-	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
 	screen_save();
-
-	/* Interact until done */
 	while (TRUE)
 	{
 		Term_clear();
-
-		/* Ask for a choice */
 		prt(format(_("%d/2 ページ", "page %d/2"), (p + 1)), 2, 65);
 		prt(_("現在の知識を確認する", "Display current knowledge"), 3, 0);
 
-		/* Give some choices */
 #ifdef JP
 		if (p == 0)
 		{
@@ -6825,11 +4750,9 @@ void do_cmd_knowledge(player_type *creature_ptr)
 			prt("(i) Display auto pick/destroy", 14, 5);
 		}
 #endif
-		/* Prompt */
 		prt(_("-続く-", "-more-"), 17, 8);
 		prt(_("ESC) 抜ける", "ESC) Exit menu"), 21, 1);
 		prt(_("SPACE) 次ページ", "SPACE) Next page"), 21, 30);
-		/*prt("-) 前ページ", 21, 60);*/
 		prt(_("コマンド:", "Command: "), 20, 0);
 		i = inkey();
 
@@ -6920,11 +4843,8 @@ void do_cmd_knowledge(player_type *creature_ptr)
  */
 void do_cmd_checkquest(player_type *creature_ptr)
 {
-	/* File type is "TEXT" */
 	FILE_TYPE(FILE_TYPE_TEXT);
 	screen_save();
-
-	/* Quest info */
 	do_cmd_knowledge_quests(creature_ptr);
 	screen_load();
 }
@@ -6950,7 +4870,6 @@ void do_cmd_time(player_type *creature_ptr)
 	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 */
 	char buf[1024];
 	if (!randint0(10) || creature_ptr->image)
 	{
@@ -6961,54 +4880,40 @@ void do_cmd_time(player_type *creature_ptr)
 		path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, _("timenorm_j.txt", "timenorm.txt"));
 	}
 
-	/* Open this file */
 	FILE *fff;
 	fff = my_fopen(buf, "rt");
 
 	if (!fff) return;
 
-	/* Find this time */
 	int full = hour * 100 + min;
 	int start = 9999;
 	int end = -9999;
 	int num = 0;
 	while (!my_fgets(fff, buf, sizeof(buf)))
 	{
-		/* Ignore comments */
 		if (!buf[0] || (buf[0] == '#')) continue;
-
-		/* Ignore invalid lines */
 		if (buf[1] != ':') continue;
 
-		/* Process 'Start' */
 		if (buf[0] == 'S')
 		{
-			/* Extract the starting time */
 			start = atoi(buf + 2);
-
-			/* Assume valid for an hour */
 			end = start + 59;
 			continue;
 		}
 
-		/* Process 'End' */
 		if (buf[0] == 'E')
 		{
-			/* Extract the ending time */
 			end = atoi(buf + 2);
 			continue;
 		}
 
-		/* Ignore incorrect range */
 		if ((start > full) || (full > end)) continue;
 
-		/* Process 'Description' */
 		if (buf[0] == 'D')
 		{
 			num++;
-
-			/* Apply the randomizer */
 			if (!randint0(num)) strcpy(desc, buf + 2);
+
 			continue;
 		}
 	}

--- a/src/cmd/cmd-dump.h
+++ b/src/cmd/cmd-dump.h
@@ -1,54 +1,9 @@
 #pragma once
 
-#define DIARY_DIALY				0
-#define DIARY_DESCRIPTION		1
-#define DIARY_ART				2
-#define DIARY_UNIQUE			3
-#define DIARY_FIX_QUEST_C		4
-#define DIARY_FIX_QUEST_F		5
-#define DIARY_RAND_QUEST_C		6
-#define DIARY_RAND_QUEST_F		7
-#define DIARY_MAXDEAPTH			8
-#define DIARY_TRUMP				9
-#define DIARY_STAIR				10
-#define DIARY_RECALL			11
-#define DIARY_TO_QUEST			12
-#define DIARY_TELEPORT_LEVEL	13
-#define DIARY_BUY				14
-#define DIARY_SELL				15
-#define DIARY_ARENA				16
-#define DIARY_FOUND				17
-#define DIARY_LEVELUP			18
-#define DIARY_GAMESTART			19
-#define DIARY_WIZ_TELE			20
-#define DIARY_NAMED_PET			21
-#define DIARY_PAT_TELE			22
-#define DIARY_ART_SCROLL		23
-#define DIARY_WIZARD_LOG		24
-
-#define RECORD_NAMED_PET_NAME        0
-#define RECORD_NAMED_PET_UNNAME      1
-#define RECORD_NAMED_PET_DISMISS     2
-#define RECORD_NAMED_PET_DEATH       3
-#define RECORD_NAMED_PET_MOVED       4
-#define RECORD_NAMED_PET_LOST_SIGHT  5
-#define RECORD_NAMED_PET_DESTROY     6
-#define RECORD_NAMED_PET_EARTHQUAKE  7
-#define RECORD_NAMED_PET_GENOCIDE    8
-#define RECORD_NAMED_PET_WIZ_ZAP     9
-#define RECORD_NAMED_PET_TELE_LEVEL  10
-#define RECORD_NAMED_PET_BLAST       11
-#define RECORD_NAMED_PET_HEAL_LEPER  12
-#define RECORD_NAMED_PET_COMPACT     13
-#define RECORD_NAMED_PET_LOSE_PARENT 14
-
-
-/* cmd4.c */
 #ifdef JP
 #else
 extern concptr get_ordinal_number_suffix(int num);
 #endif
-extern errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note);
 extern void do_cmd_diary(player_type *creature_ptr);
 extern void do_cmd_redraw(player_type *creature_ptr);
 extern void do_cmd_player_status(player_type *creature_ptr);
@@ -78,5 +33,3 @@ extern void do_cmd_spoilers(player_type *creature_ptr);
 
 /* wizard1.c */
 extern void spoil_random_artifact(player_type *creature_ptr, concptr fname);
-
-extern bool write_level;

--- a/src/cmd/cmd-gameoption.c
+++ b/src/cmd/cmd-gameoption.c
@@ -1,7 +1,8 @@
 #include "angband.h"
 
 #include "autopick.h"
-#include "cmd-gameoption.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-gameoption.h"
 #include "term.h"
 #include "view-mainwindow.h"
 #include "cmd/cmd-dump.h"

--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -2,7 +2,8 @@
 #include "core.h"
 #include "util.h"
 
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "floor.h"
 #include "grid.h"
 #include "melee.h"

--- a/src/cmd/cmd-save.c
+++ b/src/cmd/cmd-save.c
@@ -1,4 +1,5 @@
 #include "signal-handlers.h"
+#include "io/write-diary.h"
 #include "cmd/cmd-save.h"
 #include "cmd/cmd-dump.h"
 #include "player-move.h"

--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -9,9 +9,10 @@
 #include "angband.h"
 #include "core.h"
 #include "util.h"
-#include "cmd-spell.h"
+#include "cmd/cmd-spell.h"
 
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "selfinfo.h"
 #include "spells.h"
 #include "spells-summon.h"

--- /dev/null
+++ b/src/cmd/diary-subtitle-table.c
@@ -0,0 +1,77 @@
+/*
+ * @brief 日記のサブタイトルを表すテキストの配列群
+ * @date 2020/03/08
+ * @author Hourier
+ */
+
+#include "angband.h"
+#include "diary-subtitle-table.h"
+
+concptr subtitle[MAX_SUBTITLE] = {
+#ifdef JP
+	"最強の肉体を求めて",
+	"人生それははかない",
+	"明日に向かって",
+	"棚からぼたもち",
+	"あとの祭り",
+	"それはいい考えだ",
+	"何とでも言え",
+	"兎にも角にも",
+	"ウソだけど",
+	"もはやこれまで",
+	"なんでこうなるの",
+	"それは無理だ",
+	"倒すべき敵はゲ○ツ",
+	"ん～？聞こえんなぁ",
+	"オレの名を言ってみろ",
+	"頭が変になっちゃった",
+	"互換しません",
+	"せっかくだから",
+	"まだまだ甘いね",
+	"むごいむごすぎる",
+	"こんなもんじゃない",
+	"だめだこりゃ",
+	"次いってみよう",
+	"ちょっとだけよ",
+	"哀しき冒険者",
+	"野望の果て",
+	"無限地獄",
+	"神に喧嘩を売る者",
+	"未知の世界へ",
+	"最高の頭脳を求めて"
+#else
+	"Quest of The World's Toughest Body",
+	"Attack is the best form of defence.",
+	"Might is right.",
+	"An unexpected windfall",
+	"A drowning man will catch at a straw",
+	"Don't count your chickens before they are hatched.",
+	"It is no use crying over spilt milk.",
+	"Seeing is believing.",
+	"Strike the iron while it is hot.",
+	"I don't care what follows.",
+	"To dig a well to put out a house on fire.",
+	"Tomorrow is another day.",
+	"Easy come, easy go.",
+	"The more haste, the less speed.",
+	"Where there is life, there is hope.",
+	"There is no royal road to *WINNER*.",
+	"Danger past, God forgotten.",
+	"The best thing to do now is to run away.",
+	"Life is but an empty dream.",
+	"Dead men tell no tales.",
+	"A book that remains shut is but a block.",
+	"Misfortunes never come singly.",
+	"A little knowledge is a dangerous thing.",
+	"History repeats itself.",
+	"*WINNER* was not built in a day.",
+	"Ignorance is bliss.",
+	"To lose is to win?",
+	"No medicine can cure folly.",
+	"All good things come to an end.",
+	"M$ Empire strikes back.",
+	"To see is to believe",
+	"Time is money.",
+	"Quest of The World's Greatest Brain"
+#endif
+};

--- /dev/null
+++ b/src/cmd/diary-subtitle-table.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#define MAX_SUBTITLE 30
+
+extern concptr subtitle[MAX_SUBTITLE];

--- /dev/null
+++ b/src/cmd/feeling-table.c
@@ -0,0 +1,53 @@
+/*
+ * @brief 雰囲気を表すテキストの配列群
+ * @date 2020/03/08
+ * @author Hourier
+ */
+
+#include "angband.h"
+#include "feeling-table.h"
+
+concptr do_cmd_feeling_text[MAX_FEELING_TEXT] =
+{
+	_("この階の雰囲気を感じとれなかった...", "Looks like any other level."),
+	_("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."),
+	_("恐ろしい死の幻が目に浮かび、気絶しそうになった！", "You nearly faint as horrible visions of death fill your mind!"),
+	_("この階はとても危険なようだ。", "This level looks very dangerous."),
+	_("とても悪い予感がする...", "You have a very bad feeling..."),
+	_("悪い予感がする...", "You have a bad feeling..."),
+	_("何か緊張する。", "You feel nervous."),
+	_("少し不運な気がする...", "You feel your luck is turning..."),
+	_("この場所は好きになれない。", "You don't like the look of this place."),
+	_("この階はそれなりに安全なようだ。", "This level looks reasonably safe."),
+	_("なんて退屈なところだ...", "What a boring place...")
+};
+
+concptr do_cmd_feeling_text_combat[MAX_FEELING_TEXT] =
+{
+	_("この階の雰囲気を感じとれなかった...", "Looks like any other level."),
+	_("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."),
+	_("今夜もまた、誰かが命を落とす...", "You nearly faint as horrible visions of death fill your mind!"),
+	_("この階はとても危険なようだ。", "This level looks very dangerous."),
+	_("とても悪い予感がする...", "You have a very bad feeling..."),
+	_("悪い予感がする...", "You have a bad feeling..."),
+	_("何か緊張する。", "You feel nervous."),
+	_("少し不運な気がする...", "You feel your luck is turning..."),
+	_("この場所は好きになれない。", "You don't like the look of this place."),
+	_("この階はそれなりに安全なようだ。", "This level looks reasonably safe."),
+	_("なんて退屈なところだ...", "What a boring place...")
+};
+
+concptr do_cmd_feeling_text_lucky[MAX_FEELING_TEXT] =
+{
+	_("この階の雰囲気を感じとれなかった...", "Looks like any other level."),
+	_("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."),
+	_("この階はこの上なく素晴らしい感じがする。", "You have a superb feeling about this level."),
+	_("素晴らしい感じがする...", "You have an excellent feeling..."),
+	_("とても良い感じがする...", "You have a very good feeling..."),
+	_("良い感じがする...", "You have a good feeling..."),
+	_("ちょっと幸運な感じがする...", "You feel strangely lucky..."),
+	_("多少は運が向いてきたか...", "You feel your luck is turning..."),
+	_("見た感じ悪くはない...", "You like the look of this place..."),
+	_("全然駄目ということはないが...", "This level can't be all bad..."),
+	_("なんて退屈なところだ...", "What a boring place...")
+};

--- /dev/null
+++ b/src/cmd/feeling-table.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#define MAX_FEELING_TEXT 11
+
+extern concptr do_cmd_feeling_text[MAX_FEELING_TEXT];
+extern concptr do_cmd_feeling_text_combat[MAX_FEELING_TEXT];
+extern concptr do_cmd_feeling_text_lucky[MAX_FEELING_TEXT];

--- /dev/null
+++ b/src/cmd/monster-group-table.c
@@ -0,0 +1,201 @@
+/*
+ * @brief シンボルテキストの配列群
+ * @date 2020/03/08
+ * @author Hourier
+ */
+
+#include "angband.h"
+#include "cmd/monster-group-table.h"
+
+/*
+ * todo 元々t (町人)がいなかったが、問題ないのか？
+ * Description of each monster group.
+ */
+concptr monster_group_text[] =
+{
+#ifdef JP
+	"ユニーク",
+	"乗馬可能なモンスター",
+	"賞金首",
+	"アンバーの王族",
+	"アリ",
+	"コウモリ",
+	"ムカデ",
+	"ドラゴン",
+	"目玉",
+	"ネコ",
+	"ゴーレム",
+	"標準人間型生物",
+	"ベトベト",
+	"ゼリー",
+	"コボルド",
+	"水棲生物",
+	"モルド",
+	"ナーガ",
+	"オーク",
+	"人間",
+	"四足獣",
+	"ネズミ",
+	"スケルトン",
+	"デーモン",
+	"ボルテックス",
+	"イモムシ/大群",
+	"イーク",
+	"ゾンビ/ミイラ",
+	"天使",
+	"鳥",
+	"犬",
+	"エレメンタル",
+	"トンボ",
+	"ゴースト",
+	"雑種",
+	"昆虫",
+	"ヘビ",
+	"キラー・ビートル",
+	"リッチ",
+	"多首の爬虫類",
+	"謎の生物",
+	"オーガ",
+	"巨大人間型生物",
+	"クイルスルグ",
+	"爬虫類/両生類",
+	"蜘蛛/サソリ/ダニ",
+	"トロル",
+	"バンパイア",
+	"ワイト/レイス/等",
+	"ゾーン/ザレン/等",
+	"イエティ",
+	"ハウンド",
+	"ミミック",
+	"壁/植物/気体",
+	"おばけキノコ",
+	"球体",
+	"プレイヤー",
+#else
+	"Uniques",
+	"Ridable monsters",
+	"Wanted monsters",
+	"Amberite",
+	"Ant",
+	"Bat",
+	"Centipede",
+	"Dragon",
+	"Floating Eye",
+	"Feline",
+	"Golem",
+	"Hobbit/Elf/Dwarf",
+	"Icky Thing",
+	"Jelly",
+	"Kobold",
+	"Aquatic monster",
+	"Mold",
+	"Naga",
+	"Orc",
+	"Person/Human",
+	"Quadruped",
+	"Rodent",
+	"Skeleton",
+	"Demon",
+	"Vortex",
+	"Worm/Worm-Mass",
+	"Yeek",
+	"Zombie/Mummy",
+	"Angel",
+	"Bird",
+	"Canine",
+	"Elemental",
+	"Dragon Fly",
+	"Ghost",
+	"Hybrid",
+	"Insect",
+	"Snake",
+	"Killer Beetle",
+	"Lich",
+	"Multi-Headed Reptile",
+	"Mystery Living",
+	"Ogre",
+	"Giant Humanoid",
+	"Quylthulg",
+	"Reptile/Amphibian",
+	"Spider/Scorpion/Tick",
+	"Troll",
+	"Vampire",
+	"Wight/Wraith/etc",
+	"Xorn/Xaren/etc",
+	"Yeti",
+	"Zephyr Hound",
+	"Mimic",
+	"Wall/Plant/Gas",
+	"Mushroom patch",
+	"Ball",
+	"Player",
+#endif
+	NULL
+};
+
+
+/*
+ * Symbols of monsters in each group. Note the "Uniques" group
+ * is handled differently.
+ */
+concptr monster_group_char[] =
+{
+	(char *)-1L,
+	(char *)-2L,
+	(char *)-3L,
+	(char *)-4L,
+	"a",
+	"b",
+	"c",
+	"dD",
+	"e",
+	"f",
+	"g",
+	"h",
+	"i",
+	"j",
+	"k",
+	"l",
+	"m",
+	"n",
+	"o",
+	"pt",
+	"q",
+	"r",
+	"s",
+	"uU",
+	"v",
+	"w",
+	"y",
+	"z",
+	"A",
+	"B",
+	"C",
+	"E",
+	"F",
+	"G",
+	"H",
+	"I",
+	"J",
+	"K",
+	"L",
+	"M",
+	"N",
+	"O",
+	"P",
+	"Q",
+	"R",
+	"S",
+	"T",
+	"V",
+	"W",
+	"X",
+	"Y",
+	"Z",
+	"!$&()+./=>?[\\]`{|~",
+	"#%",
+	",",
+	"*",
+	"@",
+	NULL
+};

--- /dev/null
+++ b/src/cmd/monster-group-table.h
@@ -0,0 +1,4 @@
+#pragma once
+
+extern concptr monster_group_text[];
+extern concptr monster_group_char[];

--- /dev/null
+++ b/src/cmd/object-group-table.c
@@ -0,0 +1,156 @@
+/*
+ * @brief オブジェクト種別を表すテキストの配列群
+ * @date 2020/03/08
+ * @author Hourier
+ */
+
+#include "angband.h"
+#include "object-group-table.h"
+#include "object.h"
+
+/*
+ * todo キャプチャー・ボールではなくモンスター・ボールでは？
+ * Description of each monster group.
+ */
+concptr object_group_text[MAX_OBJECT_GROUP_TEXT] =
+{
+#ifdef JP
+	"キノコ",
+	"薬",
+	"油つぼ",
+	"巻物",
+	"指輪",
+	"アミュレット",
+	"笛",
+	"光源",
+	"魔法棒",
+	"杖",
+	"ロッド",
+	"カード",
+	"キャプチャー・ボール",
+	"羊皮紙",
+	"くさび",
+	"箱",
+	"人形",
+	"像",
+	"ゴミ",
+	"空のビン",
+	"骨",
+	"死体",
+	"刀剣類",
+	"鈍器",
+	"長柄武器",
+	"採掘道具",
+	"飛び道具",
+	"弾",
+	"矢",
+	"ボルト",
+	"軽装鎧",
+	"重装鎧",
+	"ドラゴン鎧",
+	"盾",
+	"クローク",
+	"籠手",
+	"ヘルメット",
+	"冠",
+	"ブーツ",
+	"魔法書",
+	"財宝",
+	"何か",
+#else
+	"Mushrooms",
+	"Potions",
+	"Flasks",
+	"Scrolls",
+	"Rings",
+	"Amulets",
+	"Whistle",
+	"Lanterns",
+	"Wands",
+	"Staffs",
+	"Rods",
+	"Cards",
+	"Capture Balls",
+	"Parchments",
+	"Spikes",
+	"Boxs",
+	"Figurines",
+	"Statues",
+	"Junks",
+	"Bottles",
+	"Skeletons",
+	"Corpses",
+	"Swords",
+	"Blunt Weapons",
+	"Polearms",
+	"Diggers",
+	"Bows",
+	"Shots",
+	"Arrows",
+	"Bolts",
+	"Soft Armor",
+	"Hard Armor",
+	"Dragon Armor",
+	"Shields",
+	"Cloaks",
+	"Gloves",
+	"Helms",
+	"Crowns",
+	"Boots",
+	"Spellbooks",
+	"Treasure",
+	"Something",
+#endif
+	NULL
+};
+
+
+/*
+ * TVALs of items in each group
+ */
+byte object_group_tval[MAX_OBJECT_GROUP_TVAL] =
+{
+	TV_FOOD,
+	TV_POTION,
+	TV_FLASK,
+	TV_SCROLL,
+	TV_RING,
+	TV_AMULET,
+	TV_WHISTLE,
+	TV_LITE,
+	TV_WAND,
+	TV_STAFF,
+	TV_ROD,
+	TV_CARD,
+	TV_CAPTURE,
+	TV_PARCHMENT,
+	TV_SPIKE,
+	TV_CHEST,
+	TV_FIGURINE,
+	TV_STATUE,
+	TV_JUNK,
+	TV_BOTTLE,
+	TV_SKELETON,
+	TV_CORPSE,
+	TV_SWORD,
+	TV_HAFTED,
+	TV_POLEARM,
+	TV_DIGGING,
+	TV_BOW,
+	TV_SHOT,
+	TV_ARROW,
+	TV_BOLT,
+	TV_SOFT_ARMOR,
+	TV_HARD_ARMOR,
+	TV_DRAG_ARMOR,
+	TV_SHIELD,
+	TV_CLOAK,
+	TV_GLOVES,
+	TV_HELM,
+	TV_CROWN,
+	TV_BOOTS,
+	TV_LIFE_BOOK,
+	TV_GOLD,
+	0,
+	0,
+};

--- /dev/null
+++ b/src/cmd/object-group-table.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#define MAX_OBJECT_GROUP_TEXT 43
+#define MAX_OBJECT_GROUP_TVAL 43
+
+extern concptr object_group_text[MAX_OBJECT_GROUP_TEXT];
+extern byte object_group_tval[MAX_OBJECT_GROUP_TVAL];
+

--- a/src/core.c
+++ b/src/core.c
@@ -22,6 +22,7 @@
 
 #include "birth.h"
 #include "bldg.h"
+#include "io/write-diary.h"
 #include "cmd/cmd-activate.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-eat.h"

--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -101,7 +101,8 @@
 #include "core.h"
 #include "bldg.h"
 
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "grid.h"
 #include "rooms.h"
 #include "dungeon.h"

--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -40,7 +40,8 @@
 #include "player-personality.h"
 #include "world.h"
 #include "spells.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "save.h"
 
 #include "view-mainwindow.h"

--- /dev/null
+++ b/src/io/write-diary.c
@@ -0,0 +1,385 @@
+/*!
+ * @brief 日記へのメッセージ追加処理
+ * @date 2020/03/08
+ * @author Hourier
+ */
+
+#include "io/write-diary.h"
+#include "core.h"
+#include "quest.h"
+#include "files.h"
+#include "dungeon.h"
+#include "dungeon-file.h"
+#include "world.h"
+
+// todo *抹殺* したい…
+bool write_level;
+
+/*!
+ * todo files.c に移すことも検討する？
+ * @brief 日記ファイルを開く
+ * @param fff ファイルへのポインタ
+ * @param disable_diary 日記への追加を無効化する場合TRUE
+ * @return ファイルがあったらTRUE、なかったらFALSE
+ */
+static bool open_diary_file(FILE **fff, bool *disable_diary)
+{
+	GAME_TEXT file_name[MAX_NLEN];
+	sprintf(file_name, _("playrecord-%s.txt", "playrec-%s.txt"), savefile_base);
+	char buf[1024];
+	path_build(buf, sizeof(buf), ANGBAND_DIR_USER, file_name);
+	FILE_TYPE(FILE_TYPE_TEXT);
+	*fff = my_fopen(buf, "a");
+	if (*fff) return TRUE;
+
+	msg_format(_("%s を開くことができませんでした。プレイ記録を一時停止します。", "Failed to open %s. Play-Record is disabled temporarily."), buf);
+	msg_format(NULL);
+	*disable_diary = TRUE;
+	return FALSE;
+}
+
+
+/*!
+ * @brief フロア情報を日記に追加する
+ * @param creature_ptr プレーヤーへの参照ポインタ
+ * @return クエストID
+ */
+static QUEST_IDX write_floor(player_type *creature_ptr, concptr *note_level)
+{
+	floor_type *floor_ptr = creature_ptr->current_floor_ptr;
+	QUEST_IDX q_idx = quest_number(creature_ptr, floor_ptr->dun_level);
+	if (!write_level) return q_idx;
+
+	if (floor_ptr->inside_arena)
+		*note_level = _("アリーナ:", "Arane:");
+	else if (!floor_ptr->dun_level)
+		*note_level = _("地上:", "Surface:");
+	else if (q_idx && (is_fixed_quest_idx(q_idx) && !((q_idx == QUEST_OBERON) || (q_idx == QUEST_SERPENT))))
+		*note_level = _("クエスト:", "Quest:");
+	else
+	{
+		char note_level_buf[40];
+#ifdef JP
+		sprintf(note_level_buf, "%d階(%s):", (int)floor_ptr->dun_level, d_name + d_info[creature_ptr->dungeon_idx].name);
+#else
+		sprintf(note_level_buf, "%s L%d:", d_name + d_info[creature_ptr->dungeon_idx].name, (int)floor_ptr->dun_level);
+#endif
+		*note_level = note_level_buf;
+	}
+
+	return q_idx;
+}
+
+
+/*!
+ * @brief ペットに関する日記を追加する
+ * @param fff 日記ファイル
+ * @param num 日記へ追加する内容番号
+ * @param note 日記内容のIDに応じた文字列参照ポインタ
+ * @return なし
+ */
+static void write_diary_pet(FILE *fff, int num, concptr note)
+{
+	switch (num)
+	{
+	case RECORD_NAMED_PET_NAME:
+		fprintf(fff, _("%sを旅の友にすることに決めた。\n", "decided to travel together with %s.\n"), note);
+		break;
+	case RECORD_NAMED_PET_UNNAME:
+		fprintf(fff, _("%sの名前を消した。\n", "unnamed %s.\n"), note);
+		break;
+	case RECORD_NAMED_PET_DISMISS:
+		fprintf(fff, _("%sを解放した。\n", "dismissed %s.\n"), note);
+		break;
+	case RECORD_NAMED_PET_DEATH:
+		fprintf(fff, _("%sが死んでしまった。\n", "%s died.\n"), note);
+		break;
+	case RECORD_NAMED_PET_MOVED:
+		fprintf(fff, _("%sをおいて別のマップへ移動した。\n", "moved to another map leaving %s behind.\n"), note);
+		break;
+	case RECORD_NAMED_PET_LOST_SIGHT:
+		fprintf(fff, _("%sとはぐれてしまった。\n", "lost sight of %s.\n"), note);
+		break;
+	case RECORD_NAMED_PET_DESTROY:
+		fprintf(fff, _("%sが*破壊*によって消え去った。\n", "%s was killed by *destruction*.\n"), note);
+		break;
+	case RECORD_NAMED_PET_EARTHQUAKE:
+		fprintf(fff, _("%sが岩石に押し潰された。\n", "%s was crushed by falling rocks.\n"), note);
+		break;
+	case RECORD_NAMED_PET_GENOCIDE:
+		fprintf(fff, _("%sが抹殺によって消え去った。\n", "%s was a victim of genocide.\n"), note);
+		break;
+	case RECORD_NAMED_PET_WIZ_ZAP:
+		fprintf(fff, _("%sがデバッグコマンドによって消え去った。\n", "%s was removed by debug command.\n"), note);
+		break;
+	case RECORD_NAMED_PET_TELE_LEVEL:
+		fprintf(fff, _("%sがテレポート・レベルによって消え去った。\n", "%s was lost after teleporting a level.\n"), note);
+		break;
+	case RECORD_NAMED_PET_BLAST:
+		fprintf(fff, _("%sを爆破した。\n", "blasted %s.\n"), note);
+		break;
+	case RECORD_NAMED_PET_HEAL_LEPER:
+		fprintf(fff, _("%sの病気が治り旅から外れた。\n", "%s was healed and left.\n"), note);
+		break;
+	case RECORD_NAMED_PET_COMPACT:
+		fprintf(fff, _("%sがモンスター情報圧縮によって消え去った。\n", "%s was lost when the monster list was pruned.\n"), note);
+		break;
+	case RECORD_NAMED_PET_LOSE_PARENT:
+		fprintf(fff, _("%sの召喚者が既にいないため消え去った。\n", "%s disappeared because its summoner left.\n"), note);
+		break;
+	default:
+		fprintf(fff, "\n");
+		break;
+	}
+}
+
+
+/*!
+ * @brief 日記にメッセージを追加する /
+ * Take note to the diary.
+ * @param type 日記内容のID
+ * @param num 日記内容のIDに応じた数値
+ * @param note 日記内容のIDに応じた文字列参照ポインタ
+ * @return エラーコード
+ */
+errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note)
+{
+	static bool disable_diary = FALSE;
+
+	int day, hour, min;
+	extract_day_hour_min(creature_ptr, &day, &hour, &min);
+
+	if (disable_diary) return -1;
+
+	if (type == DIARY_FIX_QUEST_C ||
+		type == DIARY_FIX_QUEST_F ||
+		type == DIARY_RAND_QUEST_C ||
+		type == DIARY_RAND_QUEST_F ||
+		type == DIARY_TO_QUEST)
+	{
+		QUEST_IDX old_quest = creature_ptr->current_floor_ptr->inside_quest;
+		creature_ptr->current_floor_ptr->inside_quest = (quest[num].type == QUEST_TYPE_RANDOM) ? 0 : num;
+		init_flags = INIT_NAME_ONLY;
+		process_dungeon_file(creature_ptr, "q_info.txt", 0, 0, 0, 0);
+		creature_ptr->current_floor_ptr->inside_quest = old_quest;
+	}
+
+	FILE *fff = NULL;
+	if (!open_diary_file(&fff, &disable_diary)) return -1;
+
+	concptr note_level = "";
+	QUEST_IDX q_idx = write_floor(creature_ptr, &note_level);
+
+	bool do_level = TRUE;
+	switch (type)
+	{
+	case DIARY_DIALY:
+	{
+		if (day < MAX_DAYS)
+			fprintf(fff, _("%d日目\n", "Day %d\n"), day);
+		else
+			fputs(_("*****日目\n", "Day *****\n"), fff);
+
+		do_level = FALSE;
+		break;
+	}
+	case DIARY_DESCRIPTION:
+	{
+		if (num)
+		{
+			fprintf(fff, "%s\n", note);
+			do_level = FALSE;
+		}
+		else
+			fprintf(fff, " %2d:%02d %20s %s\n", hour, min, note_level, note);
+
+		break;
+	}
+	case DIARY_ART:
+	{
+		fprintf(fff, _(" %2d:%02d %20s %sを発見した。\n", " %2d:%02d %20s discovered %s.\n"), hour, min, note_level, note);
+		break;
+	}
+	case DIARY_ART_SCROLL:
+	{
+		fprintf(fff, _(" %2d:%02d %20s 巻物によって%sを生成した。\n", " %2d:%02d %20s created %s by scroll.\n"), hour, min, note_level, note);
+		break;
+	}
+	case DIARY_UNIQUE:
+	{
+		fprintf(fff, _(" %2d:%02d %20s %sを倒した。\n", " %2d:%02d %20s defeated %s.\n"), hour, min, note_level, note);
+		break;
+	}
+	case DIARY_FIX_QUEST_C:
+	{
+		if (quest[num].flags & QUEST_FLAG_SILENT) break;
+
+		fprintf(fff, _(" %2d:%02d %20s クエスト「%s」を達成した。\n",
+			" %2d:%02d %20s completed quest '%s'.\n"), hour, min, note_level, quest[num].name);
+		break;
+	}
+	case DIARY_FIX_QUEST_F:
+	{
+		if (quest[num].flags & QUEST_FLAG_SILENT) break;
+
+		fprintf(fff, _(" %2d:%02d %20s クエスト「%s」から命からがら逃げ帰った。\n",
+			" %2d:%02d %20s run away from quest '%s'.\n"), hour, min, note_level, quest[num].name);
+		break;
+	}
+	case DIARY_RAND_QUEST_C:
+	{
+		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);
+		break;
+	}
+	case DIARY_RAND_QUEST_F:
+	{
+		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);
+		break;
+	}
+	case DIARY_MAXDEAPTH:
+	{
+		fprintf(fff, _(" %2d:%02d %20s %sの最深階%d階に到達した。\n",
+			" %2d:%02d %20s reached level %d of %s for the first time.\n"), hour, min, note_level,
+			_(d_name + d_info[creature_ptr->dungeon_idx].name, num),
+			_(num, d_name + d_info[creature_ptr->dungeon_idx].name));
+		break;
+	}
+	case DIARY_TRUMP:
+	{
+		fprintf(fff, _(" %2d:%02d %20s %s%sの最深階を%d階にセットした。\n",
+			" %2d:%02d %20s reset recall level of %s to %d %s.\n"), hour, min, note_level, note,
+			_(d_name + d_info[num].name, (int)max_dlv[num]),
+			_((int)max_dlv[num], d_name + d_info[num].name));
+		break;
+	}
+	case DIARY_STAIR:
+	{
+		concptr to = q_idx && (is_fixed_quest_idx(q_idx)
+			&& !((q_idx == QUEST_OBERON) || (q_idx == QUEST_SERPENT)))
+			? _("地上", "the surface")
+			: !(creature_ptr->current_floor_ptr->dun_level + num)
+			? _("地上", "the surface")
+			: format(_("%d階", "level %d"), creature_ptr->current_floor_ptr->dun_level + num);
+		fprintf(fff, _(" %2d:%02d %20s %sへ%s。\n", " %2d:%02d %20s %s %s.\n"), hour, min, note_level, _(to, note), _(note, to));
+		break;
+	}
+	case DIARY_RECALL:
+	{
+		if (!num)
+			fprintf(fff, _(" %2d:%02d %20s 帰還を使って%sの%d階へ下りた。\n", " %2d:%02d %20s recalled to dungeon level %d of %s.\n"),
+				hour, min, note_level, _(d_name + d_info[creature_ptr->dungeon_idx].name, (int)max_dlv[creature_ptr->dungeon_idx]),
+				_((int)max_dlv[creature_ptr->dungeon_idx], d_name + d_info[creature_ptr->dungeon_idx].name));
+		else
+			fprintf(fff, _(" %2d:%02d %20s 帰還を使って地上へと戻った。\n", " %2d:%02d %20s recalled from dungeon to surface.\n"), hour, min, note_level);
+
+		break;
+	}
+	case DIARY_TO_QUEST:
+	{
+		if (quest[num].flags & QUEST_FLAG_SILENT) break;
+
+		fprintf(fff, _(" %2d:%02d %20s クエスト「%s」へと突入した。\n", " %2d:%02d %20s entered the quest '%s'.\n"),
+			hour, min, note_level, quest[num].name);
+		break;
+	}
+	case DIARY_TELEPORT_LEVEL:
+	{
+		fprintf(fff, _(" %2d:%02d %20s レベル・テレポートで脱出した。\n", " %2d:%02d %20s Got out using teleport level.\n"),
+			hour, min, note_level);
+		break;
+	}
+	case DIARY_BUY:
+	{
+		fprintf(fff, _(" %2d:%02d %20s %sを購入した。\n", " %2d:%02d %20s bought %s.\n"), hour, min, note_level, note);
+		break;
+	}
+	case DIARY_SELL:
+	{
+		fprintf(fff, _(" %2d:%02d %20s %sを売却した。\n", " %2d:%02d %20s sold %s.\n"), hour, min, note_level, note);
+		break;
+	}
+	case DIARY_ARENA:
+	{
+		if (num < 0)
+		{
+			int n = -num;
+			fprintf(fff, _(" %2d:%02d %20s 闘技場の%d%s回戦で、%sの前に敗れ去った。\n", " %2d:%02d %20s beaten by %s in the %d%s fight.\n"),
+				hour, min, note_level, _(n, note), _("", n), _(note, get_ordinal_number_suffix(n)));
+			break;
+		}
+
+		fprintf(fff, _(" %2d:%02d %20s 闘技場の%d%s回戦(%s)に勝利した。\n", " %2d:%02d %20s won the %d%s fight (%s).\n"),
+			hour, min, note_level, num, _("", get_ordinal_number_suffix(num)), note);
+
+		if (num == MAX_ARENA_MONS)
+		{
+			fprintf(fff, _("                 闘技場のすべての敵に勝利し、チャンピオンとなった。\n",
+				"                 won all fights to become a Champion.\n"));
+			do_level = FALSE;
+		}
+
+		break;
+	}
+	case DIARY_FOUND:
+	{
+		fprintf(fff, _(" %2d:%02d %20s %sを識別した。\n", " %2d:%02d %20s identified %s.\n"), hour, min, note_level, note);
+		break;
+	}
+	case DIARY_WIZ_TELE:
+	{
+		concptr to = !creature_ptr->current_floor_ptr->dun_level
+			? _("地上", "the surface")
+			: format(_("%d階(%s)", "level %d of %s"), creature_ptr->current_floor_ptr->dun_level, d_name + d_info[creature_ptr->dungeon_idx].name);
+		fprintf(fff, _(" %2d:%02d %20s %sへとウィザード・テレポートで移動した。\n",
+			" %2d:%02d %20s wizard-teleport to %s.\n"), hour, min, note_level, to);
+		break;
+	}
+	case DIARY_PAT_TELE:
+	{
+		concptr to = !creature_ptr->current_floor_ptr->dun_level
+			? _("地上", "the surface")
+			: format(_("%d階(%s)", "level %d of %s"), creature_ptr->current_floor_ptr->dun_level, d_name + d_info[creature_ptr->dungeon_idx].name);
+		fprintf(fff, _(" %2d:%02d %20s %sへとパターンの力で移動した。\n",
+			" %2d:%02d %20s used Pattern to teleport to %s.\n"), hour, min, note_level, to);
+		break;
+	}
+	case DIARY_LEVELUP:
+	{
+		fprintf(fff, _(" %2d:%02d %20s レベルが%dに上がった。\n", " %2d:%02d %20s reached player level %d.\n"), hour, min, note_level, num);
+		break;
+	}
+	case DIARY_GAMESTART:
+	{
+		time_t ct = time((time_t*)0);
+		do_level = FALSE;
+		if (num)
+			fprintf(fff, "%s %s", note, ctime(&ct));
+		else
+			fprintf(fff, " %2d:%02d %20s %s %s", hour, min, note_level, note, ctime(&ct));
+
+		break;
+	}
+	case DIARY_NAMED_PET:
+	{
+		fprintf(fff, " %2d:%02d %20s ", hour, min, note_level);
+		write_diary_pet(fff, num, note);
+		break;
+	}
+	case DIARY_WIZARD_LOG:
+		fprintf(fff, "%s\n", note);
+		break;
+	default:
+		break;
+	}
+
+	my_fclose(fff);
+	if (do_level) write_level = FALSE;
+
+	return 0;
+}

--- /dev/null
+++ b/src/io/write-diary.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "angband.h"
+
+#define DIARY_DIALY				0
+#define DIARY_DESCRIPTION		1
+#define DIARY_ART				2
+#define DIARY_UNIQUE			3
+#define DIARY_FIX_QUEST_C		4
+#define DIARY_FIX_QUEST_F		5
+#define DIARY_RAND_QUEST_C		6
+#define DIARY_RAND_QUEST_F		7
+#define DIARY_MAXDEAPTH			8
+#define DIARY_TRUMP				9
+#define DIARY_STAIR				10
+#define DIARY_RECALL			11
+#define DIARY_TO_QUEST			12
+#define DIARY_TELEPORT_LEVEL	13
+#define DIARY_BUY				14
+#define DIARY_SELL				15
+#define DIARY_ARENA				16
+#define DIARY_FOUND				17
+#define DIARY_LEVELUP			18
+#define DIARY_GAMESTART			19
+#define DIARY_WIZ_TELE			20
+#define DIARY_NAMED_PET			21
+#define DIARY_PAT_TELE			22
+#define DIARY_ART_SCROLL		23
+#define DIARY_WIZARD_LOG		24
+
+#define RECORD_NAMED_PET_NAME        0
+#define RECORD_NAMED_PET_UNNAME      1
+#define RECORD_NAMED_PET_DISMISS     2
+#define RECORD_NAMED_PET_DEATH       3
+#define RECORD_NAMED_PET_MOVED       4
+#define RECORD_NAMED_PET_LOST_SIGHT  5
+#define RECORD_NAMED_PET_DESTROY     6
+#define RECORD_NAMED_PET_EARTHQUAKE  7
+#define RECORD_NAMED_PET_GENOCIDE    8
+#define RECORD_NAMED_PET_WIZ_ZAP     9
+#define RECORD_NAMED_PET_TELE_LEVEL  10
+#define RECORD_NAMED_PET_BLAST       11
+#define RECORD_NAMED_PET_HEAL_LEPER  12
+#define RECORD_NAMED_PET_COMPACT     13
+#define RECORD_NAMED_PET_LOSE_PARENT 14
+
+extern bool write_level;
+
+errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note);

--- a/src/main-win.c
+++ b/src/main-win.c
@@ -99,6 +99,7 @@
 #include "inet.h"
 #include "chuukei.h"
 
+#include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-save.h"
 #include "view-mainwindow.h"

--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -22,8 +22,9 @@
 #include "monster/monster-update.h"
 #include "monster/quantum-effect.h"
 
-#include "cmd-dump.h"
-#include "cmd-pet.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
+#include "cmd/cmd-pet.h"
 #include "creature.h"
 #include "melee.h"
 #include "spells-summon.h"

--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -3,7 +3,8 @@
 #include "util.h"
 
 #include "creature.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "dungeon.h"
 #include "floor.h"
 #include "grid.h"

--- a/src/monster1.c
+++ b/src/monster1.c
@@ -14,7 +14,8 @@
 #include "util.h"
 #include "term.h"
 
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "bldg.h"
 #include "cmd-pet.h"
 #include "floor.h"

--- a/src/monster2.c
+++ b/src/monster2.c
@@ -14,7 +14,8 @@
 #include "util.h"
 #include "core.h"
 
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "cmd-pet.h"
 #include "dungeon.h"
 #include "floor.h"

--- a/src/mutation.c
+++ b/src/mutation.c
@@ -16,6 +16,7 @@
 #include "core/show-file.h"
 #include "util.h"
 
+#include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "mutation.h"
 

--- a/src/object2.c
+++ b/src/object2.c
@@ -18,8 +18,9 @@
 
 #include "object.h"
 
-#include "cmd-dump.h"
-#include "cmd-spell.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
+#include "cmd/cmd-spell.h"
 #include "spells.h"
 #include "dungeon.h"
 #include "floor.h"

--- a/src/patron.c
+++ b/src/patron.c
@@ -2,7 +2,8 @@
 #include "angband.h"
 #include "util.h"
 
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "patron.h"
 #include "cmd-pet.h"
 #include "object-curse.h"

--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -5,7 +5,8 @@
 
 #include "avatar.h"
 #include "bldg.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "realm-song.h"
 #include "floor.h"
 #include "artifact.h"

--- a/src/player-status.c
+++ b/src/player-status.c
@@ -29,13 +29,14 @@
 #include "patron.h"
 #include "realm-hex.h"
 #include "realm-song.h"
-#include "cmd-pet.h"
-#include "cmd-spell.h"
+#include "cmd/cmd-pet.h"
+#include "cmd/cmd-spell.h"
 #include "dungeon.h"
 #include "objectkind.h"
 #include "monsterrace.h"
 #include "autopick.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "melee.h"
 #include "world.h"
 #include "view-mainwindow.h"

--- a/src/quest.c
+++ b/src/quest.c
@@ -15,7 +15,8 @@
 #include "artifact.h"
 #include "feature.h"
 #include "world.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "english.h"
 #include "view-mainwindow.h"
 

--- a/src/scores.c
+++ b/src/scores.c
@@ -27,7 +27,8 @@
 #include "scores.h"
 #include "floor.h"
 #include "world.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "report.h"
 #include "japanese.h"
 

--- a/src/signal-handlers.c
+++ b/src/signal-handlers.c
@@ -10,6 +10,7 @@
 #include "save.h"
 #include "world.h"
 #include "term.h"
+#include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "floor-events.h"
 

--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -10,8 +10,9 @@
 #include "object-flavor.h"
 #include "object-hook.h"
 
-#include "cmd-basic.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-basic.h"
+#include "cmd/cmd-dump.h"
 
 #include "floor-events.h"
 #include "floor-save.h"

--- a/src/spells1.c
+++ b/src/spells1.c
@@ -15,8 +15,9 @@
 #include "core.h"
 #include "util.h"
 
-#include "cmd-pet.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-pet.h"
+#include "cmd/cmd-dump.h"
 #include "floor.h"
 #include "trap.h"
 #include "autopick.h"

--- a/src/spells2.c
+++ b/src/spells2.c
@@ -18,8 +18,9 @@
 #include "creature.h"
 
 #include "artifact.h"
-#include "cmd-pet.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-pet.h"
+#include "cmd/cmd-dump.h"
 #include "floor.h"
 #include "grid.h"
 #include "trap.h"

--- a/src/spells3.c
+++ b/src/spells3.c
@@ -42,6 +42,7 @@
 #include "monster-process.h"
 #include "monster-status.h"
 #include "monster-spell.h"
+#include "io/write-diary.h"
 #include "cmd/cmd-save.h"
 #include "cmd/cmd-spell.h"
 #include "cmd/cmd-dump.h"

--- a/src/store.c
+++ b/src/store.c
@@ -16,6 +16,7 @@
 #include "term.h"
 
 #include "floor.h"
+#include "io/write-diary.h"
 #include "cmd/cmd-basic.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-help.h"

--- a/src/trap.c
+++ b/src/trap.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-save.h"
 #include "trap.h"

--- a/src/util.c
+++ b/src/util.c
@@ -21,7 +21,8 @@
 #include "quest.h"
 #include "floor.h"
 #include "world.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "japanese.h"
 #include "player-class.h"
 

--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -15,6 +15,7 @@
 #include "term.h"
 
 #include "dungeon.h"
+#include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-help.h"
 #include "cmd/cmd-save.h"