From a425f03fb90b6f9bc50ec63c060bad745e5b9aa0 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Fri, 4 Jan 2019 10:59:27 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38836=20=E5=90=8D=E7=A7=B0?=
 =?utf8?q?=E7=94=A8=E6=96=87=E5=AD=97=E9=85=8D=E5=88=97=E3=81=AE=E3=83=9E?=
 =?utf8?q?=E3=82=B8=E3=83=83=E3=82=AF=E3=83=8A=E3=83=B3=E3=83=90=E3=83=BC?=
 =?utf8?q?=E5=87=A6=E7=90=86=E3=80=82=20/=20Delete=20magic=20number=20from?=
 =?utf8?q?=20naming=20string=20array.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/artifact.c        |  2 +-
 src/bldg.c            |  8 ++++----
 src/cmd-activate.c    |  2 +-
 src/cmd-pet.c         | 10 +++++-----
 src/cmd1.c            |  6 +++---
 src/cmd2.c            | 14 +++++++-------
 src/cmd4.c            | 18 +++++++++---------
 src/dungeon.c         | 12 ++++++------
 src/files.c           |  2 +-
 src/floor-save.c      |  6 +++---
 src/mane.c            |  4 ++--
 src/melee1.c          | 14 +++++++-------
 src/mind.c            |  2 +-
 src/monster-process.c | 22 +++++++++++-----------
 src/monster-status.c  | 20 ++++++++++----------
 src/monster1.c        |  4 ++--
 src/monster2.c        | 12 ++++++------
 src/mspells1.c        |  2 +-
 src/mspells3.c        |  4 ++--
 src/mspells4.c        | 50 +++++++++++++++++++++++++-------------------------
 src/mutation.c        |  2 +-
 src/racial.c          |  4 ++--
 src/realm-hissatsu.c  |  4 ++--
 src/shoot.c           |  2 +-
 src/spells1.c         | 10 +++++-----
 src/spells2.c         | 22 +++++++++++-----------
 src/spells3.c         |  8 ++++----
 src/wizard2.c         |  4 ++--
 src/xtra2.c           | 12 ++++++------
 29 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/src/artifact.c b/src/artifact.c
index a7f4880d4..aa9d00ab9 100644
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -2027,7 +2027,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
 
 	if (a_scroll)
 	{
-		GAME_TEXT dummy_name[80] = "";
+		GAME_TEXT dummy_name[MAX_NLEN] = "";
 		cptr ask_msg = _("このアーティファクトを何と名付けますか？", "What do you want to call the artifact? ");
 
 		/* Identify it fully */
diff --git a/src/bldg.c b/src/bldg.c
index af8d2ef9d..e87ab3aa8 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -4484,10 +4484,10 @@ static cptr find_quest[] =
  */
 void quest_discovery(QUEST_IDX q_idx)
 {
-	quest_type      *q_ptr = &quest[q_idx];
-	monster_race    *r_ptr = &r_info[q_ptr->r_idx];
-	int             q_num = q_ptr->max_num;
-	char            name[80];
+	quest_type *q_ptr = &quest[q_idx];
+	monster_race *r_ptr = &r_info[q_ptr->r_idx];
+	MONSTER_NUMBER q_num = q_ptr->max_num;
+	GAME_TEXT name[MAX_NLEN];
 
 	/* No quest index */
 	if (!q_idx) return;
diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index 24d7b867a..91ea8e6dc 100644
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -1632,7 +1632,7 @@ bool activate_artifact(object_type *o_ptr)
 		}
 		else if (cave[y][x].m_idx)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_desc(m_name, &m_list[cave[y][x].m_idx], 0);
 			msg_format(_("%sが邪魔だ！", "%^s is stand in your way."), m_name);
 			p_ptr->energy_use = 0;
diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index 47555f8b6..61f8e61ed 100644
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -196,7 +196,7 @@ void do_cmd_pet_dismiss(void)
 	for (i = 0; i < max_pet; i++)
 	{
 		bool delete_this;
-		GAME_TEXT friend_name[80];
+		GAME_TEXT friend_name[MAX_NLEN];
 		bool kakunin;
 
 		/* Access the monster */
@@ -253,7 +253,7 @@ void do_cmd_pet_dismiss(void)
 		{
 			if (record_named_pet && m_ptr->nickname)
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 
 				monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 				do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_DISMISS, m_name);
@@ -396,7 +396,7 @@ bool do_riding(bool force)
 
 		if (MON_CSLEEP(m_ptr))
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_desc(m_name, m_ptr, 0);
 			(void)set_monster_csleep(c_ptr->m_idx, 0);
 			msg_format(_("%sを起こした。", "You have waked %s up."), m_name);
@@ -432,7 +432,7 @@ static void do_name_pet(void)
 {
 	monster_type *m_ptr;
 	char out_val[20];
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	bool old_name = FALSE;
 	bool old_target_pet = target_pet;
 
@@ -1041,7 +1041,7 @@ bool rakuba(HIT_POINT dam, bool force)
 {
 	int i, y, x, oy, ox;
 	int sn = 0, sy = 0, sx = 0;
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	monster_type *m_ptr = &m_list[p_ptr->riding];
 	monster_race *r_ptr = &r_info[m_ptr->r_idx];
 	bool fall_dam = FALSE;
diff --git a/src/cmd1.c b/src/cmd1.c
index 61c5ba236..eb3b01ca1 100644
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -1110,7 +1110,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
 	monster_type *riding_m_ptr = &m_list[p_ptr->riding];
 	monster_race *riding_r_ptr = &r_info[p_ptr->riding ? riding_m_ptr->r_idx : 0]; /* Paranoia */
 
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 
 	bool p_can_enter = player_can_enter(c_ptr->feat, CEM_P_CAN_ENTER_PATTERN);
 	bool p_can_kill_walls = FALSE;
@@ -1283,7 +1283,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
 		}
 		else if (MON_MONFEAR(riding_m_ptr))
 		{
-			GAME_TEXT steed_name[80];
+			GAME_TEXT steed_name[MAX_NLEN];
 			monster_desc(steed_name, riding_m_ptr, 0);
 			msg_format(_("%sが恐怖していて制御できない。", "%^s is too scared to control."), steed_name);
 			oktomove = FALSE;
@@ -1328,7 +1328,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
 
 		if (oktomove && MON_STUNNED(riding_m_ptr) && one_in_(2))
 		{
-			GAME_TEXT steed_name[80];
+			GAME_TEXT steed_name[MAX_NLEN];
 			monster_desc(steed_name, riding_m_ptr, 0);
 			msg_format(_("%sが朦朧としていてうまく動けない！", "You cannot control stunned %s!"), steed_name);
 			oktomove = FALSE;
diff --git a/src/cmd2.c b/src/cmd2.c
index 8c8684912..17a260ba4 100644
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -2926,7 +2926,7 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
 				/* Handle visible monster */
 				else
 				{
-					GAME_TEXT m_name[80];
+					GAME_TEXT m_name[MAX_NLEN];
 
 					/* Get "the monster" or "it" */
 					monster_desc(m_name, m_ptr, 0);
@@ -2948,7 +2948,7 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
 					if ((randint1(randint1(r_ptr->level / (3 + p_ptr->concent)) + (8 - p_ptr->concent)) == 1)
 						&& !(r_ptr->flags1 & RF1_UNIQUE) && !(r_ptr->flags7 & RF7_UNIQUE2))
 					{
-						GAME_TEXT m_name[80];
+						GAME_TEXT m_name[MAX_NLEN];
 
 						/* Get "the monster" or "it" */
 						monster_desc(m_name, m_ptr, 0);
@@ -3006,7 +3006,7 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
 					if (object_is_fixed_artifact(q_ptr) &&
 						(p_ptr->pclass != CLASS_SNIPER || p_ptr->concent == 0))
 					{
-						GAME_TEXT m_name[80];
+						GAME_TEXT m_name[MAX_NLEN];
 
 						monster_desc(m_name, m_ptr, 0);
 
@@ -3021,7 +3021,7 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
 
 					if (fear && m_ptr->ml)
 					{
-						GAME_TEXT m_name[80];
+						GAME_TEXT m_name[MAX_NLEN];
 						sound(SOUND_FLEE);
 						monster_desc(m_name, m_ptr, 0);
 						msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), m_name);
@@ -3515,7 +3515,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 				/* Handle visible monster */
 				else
 				{
-					GAME_TEXT m_name[80];
+					GAME_TEXT m_name[MAX_NLEN];
 					monster_desc(m_name, m_ptr, 0);
 					msg_format(_("%sが%sに命中した。", "The %s hits %s."), o_name, m_name);
 
@@ -3588,7 +3588,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 					if (fear && m_ptr->ml)
 					{
 						sound(SOUND_FLEE);
-						GAME_TEXT m_name[80];
+						GAME_TEXT m_name[MAX_NLEN];
 						monster_desc(m_name, m_ptr, 0);
 						msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), m_name);
 					}
@@ -3635,7 +3635,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 				    is_friendly(&m_list[cave[y][x].m_idx]) &&
 				    !MON_INVULNER(m_ptr))
 				{
-					GAME_TEXT m_name[80];
+					GAME_TEXT m_name[MAX_NLEN];
 					monster_desc(m_name, &m_list[cave[y][x].m_idx], 0);
 					msg_format(_("%sは怒った！", "%^s gets angry!"), m_name);
 					set_hostile(&m_list[cave[y][x].m_idx]);
diff --git a/src/cmd4.c b/src/cmd4.c
index 18b94ab29..f240616b0 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -364,7 +364,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 {
 	int day, hour, min;
 	FILE *fff = NULL;
-	GAME_TEXT file_name[80];
+	GAME_TEXT file_name[MAX_NLEN];
 	char buf[1024];
 	cptr note_level = "";
 	bool do_level = TRUE;
@@ -490,7 +490,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 		}
 		case NIKKI_RAND_QUEST_C:
 		{
-			char name[80];
+			char name[MAX_NLEN];
 			strcpy(name, r_name+r_info[quest[num].r_idx].name);
 			fprintf(fff, _(" %2d:%02d %20s ランダムクエスト(%s)を達成した。\n",
 						   " %2d:%02d %20s completed random quest '%s'\n"), hour, min, note_level, name);
@@ -498,7 +498,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 		}
 		case NIKKI_RAND_QUEST_F:
 		{
-			char name[80];
+			char 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);
@@ -721,7 +721,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 static void do_cmd_disp_nikki(void)
 {
 	char nikki_title[256];
-	GAME_TEXT file_name[80];
+	GAME_TEXT file_name[MAX_NLEN];
 	char buf[1024];
 	char tmp[80];
 #ifdef JP
@@ -858,7 +858,7 @@ static void do_cmd_last_get(void)
  */
 static void do_cmd_erase_nikki(void)
 {
-	GAME_TEXT file_name[80];
+	GAME_TEXT file_name[MAX_NLEN];
 	char buf[256];
 	FILE *fff = NULL;
 
@@ -3126,7 +3126,7 @@ void do_cmd_visuals(void)
 			/* Dump objects */
 			for (k_idx = 0; k_idx < max_k_idx; k_idx++)
 			{
-				GAME_TEXT o_name[80];
+				GAME_TEXT o_name[MAX_NLEN];
 				object_kind *k_ptr = &k_info[k_idx];
 
 				/* Skip non-entries */
@@ -5845,7 +5845,7 @@ static void do_cmd_knowledge_pets(void)
 	int             i;
 	FILE            *fff;
 	monster_type    *m_ptr;
-	GAME_TEXT pet_name[80];
+	GAME_TEXT pet_name[MAX_NLEN];
 	int             t_friends = 0;
 	int             show_upkeep = 0;
 	GAME_TEXT file_name[1024];
@@ -6753,7 +6753,7 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
 	/* Display lines until done */
 	for (i = 0; i < per_page && (object_idx[object_top + i] >= 0); i++)
 	{
-		GAME_TEXT o_name[80];
+		GAME_TEXT o_name[MAX_NLEN];
 		TERM_COLOR a;
 		byte c;
 		object_kind *flavor_k_ptr;
@@ -7754,7 +7754,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
 {
 	char tmp_str[120];
 	char rand_tmp_str[120] = "\0";
-	char name[80];
+	char name[MAX_NLEN];
 	monster_race *r_ptr;
 	IDX i;
 	int rand_level = 100;
diff --git a/src/dungeon.c b/src/dungeon.c
index 42c677889..f8e331847 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -3424,7 +3424,7 @@ static void process_world(void)
 		}
 		else if ((number_mon-1) == 0)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_type *wm_ptr;
 
 			wm_ptr = &m_list[win_m_idx];
@@ -4885,7 +4885,7 @@ static void process_player(void)
 				x = p_ptr->x + ddx[p_ptr->fishing_dir];
 				if (place_monster_aux(0, y, x, r_idx, PM_NO_KAGE))
 				{
-					GAME_TEXT m_name[80];
+					GAME_TEXT m_name[MAX_NLEN];
 					monster_desc(m_name, &m_list[cave[y][x].m_idx], 0);
 					msg_format(_("%sが釣れた！", "You have a good catch!"), m_name);
 					success = TRUE;
@@ -4928,7 +4928,7 @@ static void process_player(void)
 
 		if (MON_CSLEEP(m_ptr))
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 
 			/* Recover fully */
 			(void)set_monster_csleep(p_ptr->riding, 0);
@@ -4942,7 +4942,7 @@ static void process_player(void)
 			if (set_monster_stunned(p_ptr->riding,
 				(randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_STUNNED(m_ptr) - 1)))
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_desc(m_name, m_ptr, 0);
 				msg_format(_("%^sを朦朧状態から立ち直らせた。", "%^s is no longer stunned."), m_name);
 			}
@@ -4954,7 +4954,7 @@ static void process_player(void)
 			if (set_monster_confused(p_ptr->riding,
 				(randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_CONFUSED(m_ptr) - 1)))
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_desc(m_name, m_ptr, 0);
 				msg_format(_("%^sを混乱状態から立ち直らせた。", "%^s is no longer confused."), m_name);
 			}
@@ -4966,7 +4966,7 @@ static void process_player(void)
 			if(set_monster_monfear(p_ptr->riding,
 				(randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_MONFEAR(m_ptr) - 1)))
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_desc(m_name, m_ptr, 0);
 				msg_format(_("%^sを恐怖から立ち直らせた。", "%^s is no longer fear."), m_name);
 			}
diff --git a/src/files.c b/src/files.c
index 80ae5fb19..1e4b97255 100644
--- a/src/files.c
+++ b/src/files.c
@@ -4184,7 +4184,7 @@ static void dump_aux_pet(FILE *fff)
 	int i;
 	bool pet = FALSE;
 	bool pet_settings = FALSE;
-	GAME_TEXT pet_name[80];
+	GAME_TEXT pet_name[MAX_NLEN];
 
 	for (i = m_max - 1; i >= 1; i--)
 	{
diff --git a/src/floor-save.c b/src/floor-save.c
index 0f28fb93e..7677e237e 100644
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -439,7 +439,7 @@ static void preserve_pet(void)
 		for (i = m_max - 1; i >=1; i--)
 		{
 			monster_type *m_ptr = &m_list[i];
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 
 			if (!m_ptr->r_idx) continue;
 			if (!is_pet(m_ptr)) continue;
@@ -464,7 +464,7 @@ static void preserve_pet(void)
 
 			if (is_seen(m_ptr))
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_desc(m_name, m_ptr, 0);
 				msg_format(_("%sは消え去った！", "%^s disappears!"), m_name);
 			}
@@ -592,7 +592,7 @@ static void place_pet(void)
 		{
 			monster_type *m_ptr = &party_mon[i];
 			monster_race *r_ptr = real_r_ptr(m_ptr);
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 
 			monster_desc(m_name, m_ptr, 0);
 			msg_format(_("%sとはぐれてしまった。", "You have lost sight of %s."), m_name);
diff --git a/src/mane.c b/src/mane.c
index a12d2a792..ee4da6a58 100644
--- a/src/mane.c
+++ b/src/mane.c
@@ -688,7 +688,7 @@ static bool use_mane(int spell)
 	{
 		monster_type *m_ptr;
 		monster_race *r_ptr;
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 
 		if (!target_set(TARGET_KILL)) return FALSE;
 		if (!cave[target_row][target_col].m_idx) break;
@@ -729,7 +729,7 @@ static bool use_mane(int spell)
 		IDX target_m_idx;
 		monster_type *m_ptr;
 		monster_race *r_ptr;
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 
 		if (!target_set(TARGET_KILL)) return FALSE;
 		target_m_idx = cave[target_row][target_col].m_idx;
diff --git a/src/melee1.c b/src/melee1.c
index 71f1e1326..ca96f81e5 100644
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -246,7 +246,7 @@ static void touch_zap_player_aux(monster_type *m_ptr, bool immune, int flags_off
 
 	if ((atoffset(u32b, r_ptr, flags_offset) & aura_flag) && !immune)
 	{
-		GAME_TEXT mon_name[80];
+		GAME_TEXT mon_name[MAX_NLEN];
 		int aura_damage = damroll(1 + (r_ptr->level / 26), 1 + (r_ptr->level / 17));
 
 		/* Hack -- Get the "died from" name */
@@ -295,7 +295,7 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath)
 	int             n_weight = 0;
 	monster_type    *m_ptr = &m_list[m_idx];
 	monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 
 	int             dice_num, dice_side;
 
@@ -436,7 +436,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
 	/* Access the weapon */
 	object_type     *o_ptr = &inventory[INVEN_RARM + hand];
 
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 
 	bool            success_hit = FALSE;
 	bool            backstab = FALSE;
@@ -1323,7 +1323,7 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode)
 	cave_type       *c_ptr = &cave[y][x];
 	monster_type    *m_ptr = &m_list[c_ptr->m_idx];
 	monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 
 	disturb(FALSE, TRUE);
 
@@ -1521,7 +1521,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
 	GAME_TEXT o_name[MAX_NLEN];
 
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 
 	char ddesc[80];
 
@@ -3233,7 +3233,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
 		if (p_ptr->riding && damage)
 		{
-			char m_steed_name[80];
+			char m_steed_name[MAX_NLEN];
 			monster_desc(m_steed_name, &m_list[p_ptr->riding], 0);
 			if (rakuba((damage > 200) ? 200 : damage, FALSE))
 			{
@@ -3269,7 +3269,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
 	if ((p_ptr->counter || (p_ptr->special_defense & KATA_MUSOU)) && alive && !p_ptr->is_dead && m_ptr->ml && (p_ptr->csp > 7))
 	{
-		char m_target_name[80];
+		char m_target_name[MAX_NLEN];
 		monster_desc(m_target_name, m_ptr, 0);
 
 		p_ptr->csp -= 7;
diff --git a/src/mind.c b/src/mind.c
index 469dcee79..12bb73117 100644
--- a/src/mind.c
+++ b/src/mind.c
@@ -1645,7 +1645,7 @@ static bool cast_ninja_spell(int spell)
 	{
 		monster_type *m_ptr;
 		MONSTER_IDX m_idx;
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 		int i;
 		int path_n;
 		u16b path_g[512];
diff --git a/src/monster-process.c b/src/monster-process.c
index 9336b5961..735dc68ad 100644
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -1426,7 +1426,7 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
 	ARMOUR_CLASS ac;
 	DEPTH rlev;
 	int pt;
-	GAME_TEXT m_name[80], t_name[80];
+	GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN];
 	char            temp[MAX_NLEN];
 	bool            blinked;
 	bool            explode = FALSE, touched = FALSE, fear = FALSE, dead = FALSE;
@@ -2111,7 +2111,7 @@ void process_monster(MONSTER_IDX m_idx)
 #ifdef JP
 			msg_print("地面に落とされた。");
 #else
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_desc(m_name, &m_list[p_ptr->riding], 0);
 			msg_format("You have fallen from %s.", m_name);
 #endif
@@ -2142,14 +2142,14 @@ void process_monster(MONSTER_IDX m_idx)
 
 		if (see_m)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_desc(m_name, m_ptr, 0);
 			msg_format(_("%sは消え去った！", "%^s disappears!"), m_name);
 		}
 
 		if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 			do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_LOSE_PARENT, m_name);
 		}
@@ -2174,7 +2174,7 @@ void process_monster(MONSTER_IDX m_idx)
 
 			if (see_m)
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_desc(m_name, m_ptr, 0);
 
 				msg_format(_("%sは消え去った！", "%^s disappears!"), m_name);
@@ -2205,7 +2205,7 @@ void process_monster(MONSTER_IDX m_idx)
 
 		if (m_ptr->hp < m_ptr->maxhp/3)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_desc(m_name, m_ptr, 0);
 
 			if (is_riding_mon && riding_pinch < 2)
@@ -2269,7 +2269,7 @@ void process_monster(MONSTER_IDX m_idx)
 		/* Notice the "waking up" */
 		if (m_ptr->ml)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_desc(m_name, m_ptr, 0);
 			msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
 		}
@@ -2311,7 +2311,7 @@ void process_monster(MONSTER_IDX m_idx)
 	{
 		if (is_pet(m_ptr) || see_m)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_desc(m_name, m_ptr, is_pet(m_ptr) ? MD_ASSUME_VISIBLE : 0);
 			msg_format(_("%^sは突然敵にまわった！", "%^s suddenly becomes hostile!"), m_name);
 		}
@@ -2405,7 +2405,7 @@ void process_monster(MONSTER_IDX m_idx)
 		    player_has_los_bold(oy, ox) &&
 		    projectable(oy, ox, p_ptr->y, p_ptr->x))
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			char monmessage[1024];
 			cptr filename;
 
@@ -3066,7 +3066,7 @@ void process_monster(MONSTER_IDX m_idx)
 				for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
 				{
 					BIT_FLAGS flgs[TR_FLAG_SIZE], flg2 = 0L, flg3 = 0L, flgr = 0L;
-					GAME_TEXT m_name[80], o_name[MAX_NLEN];
+					GAME_TEXT m_name[MAX_NLEN], o_name[MAX_NLEN];
 					object_type *o_ptr = &o_list[this_o_idx];
 
 					/* Acquire next object */
@@ -3254,7 +3254,7 @@ void process_monster(MONSTER_IDX m_idx)
 		/* Message if seen */
 		if (see_m)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_desc(m_name, m_ptr, 0);
 			msg_format(_("%^sは戦いを決意した！", "%^s turns to fight!"), m_name);
 		}
diff --git a/src/monster-status.c b/src/monster-status.c
index 105554a33..bddd27ed4 100644
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -480,7 +480,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
 					/* Notice the "waking up" */
 					if (m_ptr->ml)
 					{
-						GAME_TEXT m_name[80];
+						GAME_TEXT m_name[MAX_NLEN];
 						monster_desc(m_name, m_ptr, 0);
 						msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
 					}
@@ -502,7 +502,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
 		{
 			if (is_seen(m_ptr))
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_desc(m_name, m_ptr, 0);
 				msg_format(_("%^sはもう加速されていない。", "%^s is no longer fast."), m_name);
 			}
@@ -515,7 +515,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
 		{
 			if (is_seen(m_ptr))
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_desc(m_name, m_ptr, 0);
 				msg_format(_("%^sはもう減速されていない。", "%^s is no longer slow."), m_name);
 			}
@@ -532,7 +532,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
 			/* Message if visible */
 			if (is_seen(m_ptr))
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_desc(m_name, m_ptr, 0);
 				msg_format(_("%^sは朦朧状態から立ち直った。", "%^s is no longer stunned."), m_name);
 			}
@@ -547,7 +547,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
 			/* Message if visible */
 			if (is_seen(m_ptr))
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_desc(m_name, m_ptr, 0);
 				msg_format(_("%^sは混乱から立ち直った。", "%^s is no longer confused."), m_name);
 			}
@@ -561,7 +561,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
 			/* Visual note */
 			if (is_seen(m_ptr))
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 #ifndef JP
 				char m_poss[80];
 
@@ -584,7 +584,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
 		{
 			if (is_seen(m_ptr))
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_desc(m_name, m_ptr, 0);
 				msg_format(_("%^sはもう無敵でない。", "%^s is no longer invulnerable."), m_name);
 			}
@@ -626,7 +626,7 @@ void process_monsters_mtimed(int mtimed_idx)
 void dispel_monster_status(MONSTER_IDX m_idx)
 {
 	monster_type *m_ptr = &m_list[m_idx];
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 
 	monster_desc(m_name, m_ptr, 0);
 	if (set_monster_invulner(m_idx, 0, TRUE))
@@ -658,7 +658,7 @@ bool process_the_world(int num, MONSTER_IDX who, bool vs_player)
 
 	if (vs_player)
 	{
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 		monster_desc(m_name, m_ptr, 0);
 
 		if (who == 1)
@@ -736,7 +736,7 @@ void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx)
 
 	if (m_ptr->exp >= r_ptr->next_exp)
 	{
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 		int old_hp = m_ptr->hp;
 		int old_maxhp = m_ptr->max_maxhp;
 		int old_r_idx = m_ptr->r_idx;
diff --git a/src/monster1.c b/src/monster1.c
index f8ec38d9e..78b8117d8 100644
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -754,7 +754,7 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 							r_name + rf_ptr->name));
 #else
 						bool plural = (r_ptr->reinforce_dd[n] * r_ptr->reinforce_ds[n] > 1);
-						char name[80];
+						char name[MAX_NLEN];
 						strcpy(name, r_name + rf_ptr->name);
 						if(plural) plural_aux(name);
 						hooked_roff(format(",%dd%d %s", r_ptr->reinforce_dd[n], r_ptr->reinforce_ds[n], name));
@@ -2251,7 +2251,7 @@ void anger_monster(monster_type *m_ptr)
 	if (p_ptr->inside_battle) return;
 	if (is_friendly(m_ptr))
 	{
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 
 		monster_desc(m_name, m_ptr, 0);
 		msg_format(_("%^sは怒った！", "%^s gets angry!"), m_name);
diff --git a/src/monster2.c b/src/monster2.c
index 23884e773..8647dbf0a 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -468,7 +468,7 @@ void compact_monsters(int size)
 
 			if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 				do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name);
 			}
@@ -1904,7 +1904,7 @@ void sanity_blast(monster_type *m_ptr, bool necro)
 
 	if (!necro && m_ptr)
 	{
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 		monster_race *r_ptr = &r_info[m_ptr->ap_r_idx];
 
 		power = r_ptr->level / 2;
@@ -1983,7 +1983,7 @@ void sanity_blast(monster_type *m_ptr, bool necro)
 	else if(!necro)
 	{
 		monster_race *r_ptr;
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 		cptr desc;
 
 		get_mon_num_prep(get_nightmare, NULL);
@@ -2732,7 +2732,7 @@ void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx)
 	int oldmaxhp;
 	monster_type *m_ptr = &m_list[m_idx];
 	monster_race *r_ptr;
-	char old_m_name[80];
+	char old_m_name[MAX_NLEN];
 	bool old_unique = FALSE;
 	int old_r_idx = m_ptr->r_idx;
 
@@ -2798,7 +2798,7 @@ void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx)
 
 	if (m_idx == p_ptr->riding)
 	{
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 		monster_desc(m_name, m_ptr, 0);
 		msg_format(_("突然%sが変身した。", "Suddenly, %s transforms!"), old_m_name);
 		if (!(r_ptr->flags7 & RF7_RIDING))
@@ -4047,7 +4047,7 @@ void message_pain(MONSTER_IDX m_idx, HIT_POINT dam)
 	monster_type *m_ptr = &m_list[m_idx];
 	monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 
 	/* Get the monster name */
 	monster_desc(m_name, m_ptr, 0);
diff --git a/src/mspells1.c b/src/mspells1.c
index a978e4629..625dcf4d5 100644
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1346,7 +1346,7 @@ bool make_attack_spell(MONSTER_IDX m_idx)
 	BIT_FLAGS f4, f5, f6;
 	monster_type *m_ptr = &m_list[m_idx];
 	monster_race *r_ptr = &r_info[m_ptr->r_idx];
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 #ifndef JP
 	char m_poss[80];
 #endif
diff --git a/src/mspells3.c b/src/mspells3.c
index df0e25f6d..9257783ae 100644
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -1066,7 +1066,7 @@ static bool cast_learned_spell(int spell, bool success)
 	{
 		monster_type *m_ptr;
 		monster_race *r_ptr;
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 
 		if (!target_set(TARGET_KILL)) return FALSE;
 		if (!cave[target_row][target_col].m_idx) break;
@@ -1104,7 +1104,7 @@ static bool cast_learned_spell(int spell, bool success)
 		MONSTER_IDX target_m_idx;
 		monster_type *m_ptr;
 		monster_race *r_ptr;
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 
 		if (!target_set(TARGET_KILL)) return FALSE;
 		target_m_idx = cave[target_row][target_col].m_idx;
diff --git a/src/mspells4.c b/src/mspells4.c
index e4718cb5f..72660a16d 100644
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -124,7 +124,7 @@ static void monspell_message_base(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg
 	bool see_either = see_monster(m_idx) || see_monster(t_idx);
 	bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER);
 	bool mon_to_player = (TARGET_TYPE == MONSTER_TO_PLAYER);
-	GAME_TEXT m_name[80], t_name[80];
+	GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 	monster_name(t_idx, t_name);
 
@@ -212,7 +212,7 @@ void spell_RF4_SHRIEK(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
  */
 void spell_RF4_DISPEL(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 {
-	GAME_TEXT m_name[80], t_name[80];
+	GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 	monster_name(t_idx, t_name);
 
@@ -311,7 +311,7 @@ HIT_POINT spell_RF4_BREATH(int GF_TYPE, POSITION y, POSITION x, MONSTER_IDX m_id
 	bool see_either = see_monster(m_idx) || see_monster(t_idx);
 	bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER);
 	bool mon_to_player = (TARGET_TYPE == MONSTER_TO_PLAYER);
-	GAME_TEXT m_name[80], t_name[80];
+	GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 	monster_name(t_idx, t_name);
 
@@ -749,7 +749,7 @@ HIT_POINT spell_RF5_BA_WATE(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_I
 	bool see_either = see_monster(m_idx) || see_monster(t_idx);
 	bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER);
 	bool mon_to_player = (TARGET_TYPE == MONSTER_TO_PLAYER);
-	GAME_TEXT t_name[80];
+	GAME_TEXT t_name[MAX_NLEN];
 	monster_name(t_idx, t_name);
 
 
@@ -836,7 +836,7 @@ HIT_POINT spell_RF5_BA_DARK(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_I
 HIT_POINT spell_RF5_DRAIN_MANA(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 {
 	HIT_POINT dam;
-	GAME_TEXT m_name[80], t_name[80];
+	GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 	monster_name(t_idx, t_name);
 
@@ -873,7 +873,7 @@ HIT_POINT spell_RF5_MIND_BLAST(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTE
 	monster_type	*m_ptr = &m_list[m_idx];
 	bool seen = (!p_ptr->blind && m_ptr->ml);
 	HIT_POINT dam;
-	GAME_TEXT m_name[80], t_name[80];
+	GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 	monster_name(t_idx, t_name);
 
@@ -910,7 +910,7 @@ HIT_POINT spell_RF5_BRAIN_SMASH(POSITION y, POSITION x, MONSTER_IDX m_idx, MONST
 	monster_type *m_ptr = &m_list[m_idx];
 	bool seen = (!p_ptr->blind && m_ptr->ml);
 	HIT_POINT dam;
-	GAME_TEXT m_name[80], t_name[80];
+	GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 	monster_name(t_idx, t_name);
 
@@ -950,7 +950,7 @@ HIT_POINT spell_RF5_BRAIN_SMASH(POSITION y, POSITION x, MONSTER_IDX m_idx, MONST
 */
 void spell_RF5_CAUSE(int GF_TYPE, HIT_POINT dam, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg1, cptr msg2, cptr msg3, int MS_TYPE, int TARGET_TYPE)
 {
-	GAME_TEXT m_name[80], t_name[80];
+	GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 	monster_name(t_idx, t_name);
 
@@ -1398,7 +1398,7 @@ void spell_badstatus_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg1, cp
 	bool see_either = see_monster(m_idx) || see_monster(t_idx);
 	bool see_t = see_monster(t_idx);
 	bool known = monster_near_player(m_idx, t_idx);
-	GAME_TEXT m_name[80], t_name[80];
+	GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 	monster_name(t_idx, t_name);
 
@@ -1533,7 +1533,7 @@ void spell_RF5_BLIND(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 	else if (TARGET_TYPE == MONSTER_TO_MONSTER)
 	{
 		cptr msg1;
-		GAME_TEXT t_name[80];
+		GAME_TEXT t_name[MAX_NLEN];
 		monster_name(t_idx, t_name);
 		
 		if (streq(t_name, "it"))
@@ -1646,7 +1646,7 @@ void spell_RF5_SLOW(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 	else if (TARGET_TYPE == MONSTER_TO_MONSTER)
 	{
 		cptr msg1;
-		GAME_TEXT t_name[80];
+		GAME_TEXT t_name[MAX_NLEN];
 		monster_name(t_idx, t_name);
 
 		if (streq(t_name, "it"))
@@ -1735,7 +1735,7 @@ void spell_RF6_HASTE(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 {
 	bool see_m = see_monster(m_idx);
 	monster_type	*m_ptr = &m_list[m_idx];
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 
 	monspell_message_base(m_idx, t_idx,
@@ -1796,7 +1796,7 @@ void spell_RF6_HEAL(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 	monster_type	*m_ptr = &m_list[m_idx];
 	int rlev = monster_level_idx(m_idx);
 	bool seen = (!p_ptr->blind && m_ptr->ml);
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 
 	disturb(TRUE, TRUE);
@@ -1879,7 +1879,7 @@ void spell_RF6_INVULNER(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 */
 void spell_RF6_BLINK(MONSTER_IDX m_idx, int TARGET_TYPE)
 {
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 	
 	if (TARGET_TYPE==MONSTER_TO_PLAYER)
@@ -1910,7 +1910,7 @@ void spell_RF6_BLINK(MONSTER_IDX m_idx, int TARGET_TYPE)
 */
 void spell_RF6_TPORT(MONSTER_IDX m_idx, int TARGET_TYPE)
 {	
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 	
 	if (TARGET_TYPE==MONSTER_TO_PLAYER)
@@ -1938,7 +1938,7 @@ HIT_POINT spell_RF6_WORLD(MONSTER_IDX m_idx)
 {
 	monster_type	*m_ptr = &m_list[m_idx];
 	MONSTER_IDX who = 0;
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 
 	disturb(TRUE, TRUE);
@@ -2063,7 +2063,7 @@ HIT_POINT spell_RF6_SPECIAL_B(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER
 	bool monster_to_player = (TARGET_TYPE == MONSTER_TO_PLAYER);
 	bool monster_to_monster = (TARGET_TYPE == MONSTER_TO_MONSTER);
 	bool direct = player_bold(y, x);
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 
 	disturb(TRUE, TRUE);
@@ -2210,7 +2210,7 @@ void spell_RF6_TELE_TO(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 	else if (TARGET_TYPE == MONSTER_TO_MONSTER)
 	{
 		bool resists_tele = FALSE;
-		GAME_TEXT t_name[80];
+		GAME_TEXT t_name[MAX_NLEN];
 		monster_name(t_idx, t_name);
 
 		if (tr_ptr->flagsr & RFR_RES_TELE)
@@ -2274,7 +2274,7 @@ void spell_RF6_TELE_AWAY(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 	else if (TARGET_TYPE == MONSTER_TO_MONSTER)
 	{
 		bool resists_tele = FALSE;
-		GAME_TEXT t_name[80];
+		GAME_TEXT t_name[MAX_NLEN];
 		monster_name(t_idx, t_name);
 
 		if (tr_ptr->flagsr & RFR_RES_TELE)
@@ -2402,7 +2402,7 @@ void spell_RF6_DARKNESS(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t
 	bool can_use_lite_area = FALSE;
 	bool monster_to_monster = TARGET_TYPE == MONSTER_TO_MONSTER;
 	bool monster_to_player = TARGET_TYPE == MONSTER_TO_PLAYER;
-	GAME_TEXT t_name[80];
+	GAME_TEXT t_name[MAX_NLEN];
 	monster_name(t_idx, t_name);
 
 	if ((p_ptr->pclass == CLASS_NINJA) &&
@@ -2476,7 +2476,7 @@ void spell_RF6_DARKNESS(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t
 */
 void spell_RF6_TRAPS(POSITION y, POSITION x, MONSTER_IDX m_idx)
 {
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 	disturb(TRUE, TRUE);
 
@@ -2498,7 +2498,7 @@ void spell_RF6_TRAPS(POSITION y, POSITION x, MONSTER_IDX m_idx)
 void spell_RF6_FORGET(MONSTER_IDX m_idx)
 {
 	int rlev = monster_level_idx(m_idx);
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 
 	disturb(TRUE, TRUE);
@@ -2695,7 +2695,7 @@ void spell_RF6_S_KIN(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_id
 	monster_race	*r_ptr = &r_info[m_ptr->r_idx];
 	int rlev = monster_level_idx(m_idx);
 	int count = 0;
-	GAME_TEXT m_name[80], t_name[80], m_poss[80];
+	GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN], m_poss[80];
 	monster_name(m_idx, m_name);
 	monster_name(t_idx, t_name);
 	monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
@@ -3181,7 +3181,7 @@ MONSTER_NUMBER summon_NAZGUL(POSITION y, POSITION x, MONSTER_IDX m_idx)
 	int count = 0, k;
 	POSITION cy = y;
 	POSITION cx = x;
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 
 	if (p_ptr->blind)
@@ -3242,7 +3242,7 @@ void spell_RF6_S_HI_UNDEAD(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_ID
 	monster_type	*m_ptr = &m_list[m_idx];
 	int rlev = monster_level_idx(m_idx);
 	int k, count = 0;
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	monster_name(m_idx, m_name);
 
 	disturb(TRUE, TRUE);
diff --git a/src/mutation.c b/src/mutation.c
index e8ec08069..cdde206d1 100644
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -2302,7 +2302,7 @@ bool mutation_power_aux(int power)
 				{
 					if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 					{
-						GAME_TEXT m_name[80];
+						GAME_TEXT m_name[MAX_NLEN];
 						monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 						do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
 					}
diff --git a/src/racial.c b/src/racial.c
index 17326bdd2..959187b62 100644
--- a/src/racial.c
+++ b/src/racial.c
@@ -579,7 +579,7 @@ typedef struct power_desc_type power_desc_type;
  */
 struct power_desc_type
 {
-	char name[80];      //!<レイシャル名
+	char name[MAX_NLEN];      //!<レイシャル名
 	PLAYER_LEVEL level;	//!<体得レベル
 	int cost;
 	int stat;
@@ -1045,7 +1045,7 @@ static bool cmd_racial_power_aux(s32b command)
 		}
 		case CLASS_CAVALRY:
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_type *m_ptr;
 			monster_race *r_ptr;
 			int rlev;
diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index a8d162f73..e73aa6aa1 100644
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -287,7 +287,7 @@ cptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
 				POSITION oy = y, ox = x;
 				MONSTER_IDX m_idx = cave[y][x].m_idx;
 				monster_type *m_ptr = &m_list[m_idx];
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 
 				monster_desc(m_name, m_ptr, 0);
 
@@ -533,7 +533,7 @@ cptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
 				{
 					if (!monster_living(m_ptr->r_idx))
 					{
-						GAME_TEXT m_name[80];
+						GAME_TEXT m_name[MAX_NLEN];
 
 						monster_desc(m_name, m_ptr, 0);
 						msg_format(_("%sには効果がない！", "%s is unharmed!"), m_name);
diff --git a/src/shoot.c b/src/shoot.c
index 7b6c75ffb..d4521b485 100644
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -49,7 +49,7 @@ bool test_hit_fire(int chance, monster_type *m_ptr, int vis, char* o_name)
 	{
 		if (m_ptr->r_idx == MON_GOEMON && !MON_CSLEEP(m_ptr))
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 
 			/* Extract monster name */
 			monster_desc(m_name, m_ptr, 0);
diff --git a/src/spells1.c b/src/spells1.c
index e80f2c58c..d73a74d64 100644
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -1686,7 +1686,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 	bool heal_leper = FALSE;
 
 	/* Hold the monster name */
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 	char m_poss[10];
 
 	PARAMETER_VALUE photo = 0;
@@ -4861,7 +4861,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
 		if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 		{
-			char m2_name[80];
+			char m2_name[MAX_NLEN];
 
 			monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE);
 			do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name);
@@ -5111,7 +5111,7 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
 	monster_type *m_ptr = NULL;
 
 	/* Monster name (for attacks) */
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 
 	/* Monster name (for damage) */
 	char killer[80];
@@ -6710,7 +6710,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
 	bool jump = FALSE;
 
 	/* Attacker's name (prepared before polymorph)*/
-	GAME_TEXT who_name[80];
+	GAME_TEXT who_name[MAX_NLEN];
 
 	/* Can the player see the source of this effect? */
 	bool see_s_msg = TRUE;
@@ -7699,7 +7699,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
 
 	if (p_ptr->riding)
 	{
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 
 		monster_desc(m_name, &m_list[p_ptr->riding], 0);
 
diff --git a/src/spells2.c b/src/spells2.c
index da33ca4cb..77690170e 100644
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -1011,7 +1011,7 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
 	{
 		if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 
 			monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 			do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
@@ -1023,7 +1023,7 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
 	if (resist && player_cast)
 	{
 		bool see_m = is_seen(m_ptr);
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 
 		monster_desc(m_name, m_ptr, 0);
 		if (see_m)
@@ -1235,7 +1235,7 @@ bool probing(void)
 		/* Probe visible monsters */
 		if (m_ptr->ml)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 
 			/* Start the message */
 			if (!probe)
@@ -1434,7 +1434,7 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
 				{
 					if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 					{
-						GAME_TEXT m_name[80];
+						GAME_TEXT m_name[MAX_NLEN];
 
 						monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 						do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_DESTROY, m_name);
@@ -1807,7 +1807,7 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
 
 			if (m_idx)
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 				monster_type *m_ptr = &m_list[m_idx];
 
 				/* Get the monster's real name */
@@ -1858,7 +1858,7 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
 				if (!(r_ptr->flags2 & (RF2_KILL_WALL)) &&
 				    !(r_ptr->flags2 & (RF2_PASS_WALL)))
 				{
-					GAME_TEXT m_name[80];
+					GAME_TEXT m_name[MAX_NLEN];
 
 					/* Assume not safe */
 					sn = 0;
@@ -1924,7 +1924,7 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
 						{
 							if (record_named_pet && is_pet(&m_list[c_ptr->m_idx]) && m_list[c_ptr->m_idx].nickname)
 							{
-								char m2_name[80];
+								char m2_name[MAX_NLEN];
 
 								monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE);
 								do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_EARTHQUAKE, m2_name);
@@ -2134,7 +2134,7 @@ void discharge_minion(void)
 		/* Uniques resist discharging */
 		if (r_ptr->flags1 & RF1_UNIQUE)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_desc(m_name, m_ptr, 0x00);
 			msg_format(_("%sは爆破されるのを嫌がり、勝手に自分の世界へと帰った。", "%^s resists to be blasted, and run away."), m_name);
 			delete_monster_idx(i);
@@ -2150,7 +2150,7 @@ void discharge_minion(void)
 
 		if (record_named_pet && m_ptr->nickname)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 
 			monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 			do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_BLAST, m_name);
@@ -2223,7 +2223,7 @@ static void cave_temp_room_lite(void)
 				/* Notice the "waking up" */
 				if (m_ptr->ml)
 				{
-					GAME_TEXT m_name[80];
+					GAME_TEXT m_name[MAX_NLEN];
 					monster_desc(m_name, m_ptr, 0);
 					msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
 				}
@@ -3992,7 +3992,7 @@ bool rush_attack(bool *mdeath)
 		else if (!player_bold(ty, tx))
 		{
 			/* Hold the monster name */
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 
 			/* Get the monster name (BEFORE polymorphing) */
 			monster_desc(m_name, m_ptr, 0);
diff --git a/src/spells3.c b/src/spells3.c
index 6c3975ed4..40a1b4159 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -731,7 +731,7 @@ void teleport_level(MONSTER_IDX m_idx)
 
 		if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 		{
-			char m2_name[80];
+			char m2_name[MAX_NLEN];
 
 			monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE);
 			do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_TELE_LEVEL, m2_name);
@@ -1360,7 +1360,7 @@ static bool vanish_dungeon(void)
 	cave_type *c_ptr;
 	feature_type *f_ptr;
 	monster_type *m_ptr;
-	GAME_TEXT m_name[80];
+	GAME_TEXT m_name[MAX_NLEN];
 
 	/* Prevent vasishing of quest levels and town */
 	if ((p_ptr->inside_quest && is_fixed_quest_idx(p_ptr->inside_quest)) || !dun_level)
@@ -3358,7 +3358,7 @@ void display_spell_list(void)
 	TERM_LEN y, x;
 	int m[9];
 	const magic_type *s_ptr;
-	char name[80];
+	char name[MAX_NLEN];
 	char out_val[160];
 
 
@@ -4980,7 +4980,7 @@ bool shock_power(void)
 		MONSTER_IDX m_idx = cave[y][x].m_idx;
 		monster_type *m_ptr = &m_list[m_idx];
 		monster_race *r_ptr = &r_info[m_ptr->r_idx];
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 
 		monster_desc(m_name, m_ptr, 0);
 
diff --git a/src/wizard2.c b/src/wizard2.c
index fb9fbbdf9..6962786b9 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1615,7 +1615,7 @@ static void do_cmd_wiz_zap(void)
 		{
 			if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 			{
-				GAME_TEXT m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 
 				monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 				do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
@@ -1649,7 +1649,7 @@ static void do_cmd_wiz_zap_all(void)
 
 		if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 
 			monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 			do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
diff --git a/src/xtra2.c b/src/xtra2.c
index 893bdddeb..357a2c7c7 100644
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -588,7 +588,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
 	if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 	{
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 
 		monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 		do_cmd_write_nikki(NIKKI_NAMED_PET, 3, m_name);
@@ -649,7 +649,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 		p_ptr->arena_number++;
 		if (record_arena)
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			
 			/* Extract monster name */
 			monster_desc(m_name, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
@@ -1395,7 +1395,7 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
 	/* It is dead now */
 	if (m_ptr->hp < 0)
 	{
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 
 		if (r_info[m_ptr->r_idx].flags7 & RF7_TANUKI)
 		{
@@ -2734,7 +2734,7 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
 	{
 		monster_type *m_ptr = &m_list[c_ptr->m_idx];
 		monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
-		GAME_TEXT m_name[80];
+		GAME_TEXT m_name[MAX_NLEN];
 		bool recall = FALSE;
 
 		/* Not boring */
@@ -3937,7 +3937,7 @@ bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed)
 		}
 		else
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_type *m_ptr = &m_list[p_ptr->riding];
 
 			monster_desc(m_name, m_ptr, 0);
@@ -4082,7 +4082,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
 		}
 		else
 		{
-			GAME_TEXT m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 			monster_type *m_ptr = &m_list[p_ptr->riding];
 
 			monster_desc(m_name, m_ptr, 0);
-- 
2.11.0