add comments

refactor: create monspell_damage()

refactor: remove duplicated spell_damage definition from process_warning

diff --git a/src/defines.h b/src/defines.h
index 7b494f8..21b723a 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -5702,3 +5702,17 @@ extern int PlayerUID;
 /* summoning number */
 #define S_NUM_6     (easy_band ? 2 : 6)
 #define S_NUM_4     (easy_band ? 1 : 4)
+
+/* monster spell number */
+#define RF4_SPELL_START 32 * 3
+#define RF5_SPELL_START 32 * 4
+#define RF6_SPELL_START 32 * 5
+
+#define RF4_SPELL_SIZE 32
+#define RF5_SPELL_SIZE 32
+#define RF6_SPELL_SIZE 32
+
+/* Spell Damage Calc Flag*/
+#define DAM_ROLL 1
+#define DAM_MAX 2
+#define DAM_MIN 3

diff --git a/src/externs.h b/src/externs.h
index ed1a520..24840c8 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1594,9 +1594,11 @@ extern void learn_spell(int monspell);
 extern void set_rf_masks(s32b *f4, s32b *f5, s32b *f6, int mode);
 
 /* mspells4.c */
+extern int monspell_num(int SPELL_NUM_BASE, u32b SPELL_FLAG);
 extern bool spell_learnable(int m_idx);
 extern int monspell_to_player(int SPELL_NUM, int y, int x, int m_idx);
 extern int monspell_to_monster(int SPELL_NUM, int y, int x, int m_idx, int t_idx);
+extern int monspell_damage(int SPELL_NUM, int m_idx, int TYPE);
 
 /* hissatsu.c */
 extern void hissatsu_info(char *p, int power);

diff --git a/src/mspells1.c b/src/mspells1.c
index f950902..d862b00 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1454,9 +1454,6 @@ bool make_attack_spell(int m_idx)
        bool            no_inate = FALSE;
        bool            do_spell = DO_SPELL_NONE;
        int             dam = 0;
-       u32b mode = 0L;
-       int s_num_6 = (easy_band ? 2 : 6);
-       int s_num_4 = (easy_band ? 1 : 4);
        int rad = 0; //For elemental spells
 
        /* Target location */
@@ -1470,11 +1467,8 @@ bool make_attack_spell(int m_idx)
        /* Summon count */
        int count = 0;
 
-       /* Extract the blind-ness */
-       bool blind = (p_ptr->blind ? TRUE : FALSE);
-
        /* Extract the "see-able-ness" */
-       bool seen = (!blind && m_ptr->ml);
+    bool seen = (!p_ptr->blind && m_ptr->ml);
        bool maneable = player_has_los_bold(m_ptr->fy, m_ptr->fx);
 
        /* Check "projectable" */
@@ -1739,19 +1733,19 @@ bool make_attack_spell(int m_idx)
        /* Extract the "inate" spells */
        for (k = 0; k < 32; k++)
        {
-               if (f4 & (1L << k)) spell[num++] = k + 32 * 3;
+        if (f4 & (1L << k)) spell[num++] = k + RF4_SPELL_START;
        }
 
        /* Extract the "normal" spells */
        for (k = 0; k < 32; k++)
        {
-               if (f5 & (1L << k)) spell[num++] = k + 32 * 4;
+        if (f5 & (1L << k)) spell[num++] = k + RF5_SPELL_START;
        }
 
        /* Extract the "bizarre" spells */
        for (k = 0; k < 32; k++)
        {
-               if (f6 & (1L << k)) spell[num++] = k + 32 * 5;
+        if (f6 & (1L << k)) spell[num++] = k + RF6_SPELL_START;
        }
 
        /* No spells left */

diff --git a/src/mspells2.c b/src/mspells2.c
index 83d1138..7e8129a 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -258,13 +258,9 @@ bool monst_spell_monst(int m_idx)
        int y = 0, x = 0;
        int i, k, t_idx = 0;
        int thrown_spell, count = 0;
-       int rlev;
        int dam = 0;
        int start;
        int plus = 1;
-       u32b u_mode = 0L;
-       int s_num_6 = (easy_band ? 2 : 6);
-       int s_num_4 = (easy_band ? 1 : 4);
        int rad = 0; //For elemental balls
 
        byte spell[96], num = 0;
@@ -284,17 +280,10 @@ bool monst_spell_monst(int m_idx)
 
        u32b f4, f5, f6;
 
-       bool wake_up = FALSE;
-       bool fear = FALSE;
-
-       bool blind = (p_ptr->blind ? TRUE : FALSE);
-
        bool see_m = is_seen(m_ptr);
        bool maneable = player_has_los_bold(m_ptr->fy, m_ptr->fx);
        bool see_t;
        bool see_either;
-       bool known;
-
        bool pet = is_pet(m_ptr);
 
        bool in_no_magic_dungeon = (d_info[dungeon_type].flags1 & DF1_NO_MAGIC) && dun_level
@@ -306,9 +295,6 @@ bool monst_spell_monst(int m_idx)
 
        bool resists_tele = FALSE;
 
-       /* Prepare flags for summoning */
-       if (!pet) u_mode |= PM_ALLOW_UNIQUE;
-
        /* Cannot cast spells when confused */
        if (MON_CONFUSED(m_ptr)) return (FALSE);
 
@@ -404,9 +390,6 @@ bool monst_spell_monst(int m_idx)
        /* Forget old counter attack target */
        reset_target(m_ptr);
 
-       /* Extract the monster level */
-       rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
-
        /* Remove unimplemented spells */
        f6 &= ~(RF6_WORLD | RF6_TRAPS | RF6_FORGET);
 
@@ -666,19 +649,19 @@ bool monst_spell_monst(int m_idx)
        /* Extract the "inate" spells */
        for (k = 0; k < 32; k++)
        {
-               if (f4 & (1L << k)) spell[num++] = k + 32 * 3;
+               if (f4 & (1L << k)) spell[num++] = k + RF4_SPELL_START;
        }
 
        /* Extract the "normal" spells */
        for (k = 0; k < 32; k++)
        {
-               if (f5 & (1L << k)) spell[num++] = k + 32 * 4;
+        if (f5 & (1L << k)) spell[num++] = k + RF5_SPELL_START;
        }
 
        /* Extract the "bizarre" spells */
        for (k = 0; k < 32; k++)
        {
-               if (f6 & (1L << k)) spell[num++] = k + 32 * 5;
+        if (f6 & (1L << k)) spell[num++] = k + RF6_SPELL_START;
        }
 
        /* No spells left */
@@ -707,9 +690,6 @@ bool monst_spell_monst(int m_idx)
        see_t = is_seen(t_ptr);
        see_either = (see_m || see_t);
 
-       /* Can the player be aware of this attack? */
-       known = (m_ptr->cdis <= MAX_SIGHT) || (t_ptr->cdis <= MAX_SIGHT);
-
        if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(1, 1);
 
        /* Check for spell failure (inate attacks never fail) */
@@ -749,7 +729,7 @@ bool monst_spell_monst(int m_idx)
                                        p_ptr->mane_dam[i] = p_ptr->mane_dam[i+1];
                                }
                        }
-                       p_ptr->mane_spell[p_ptr->mane_num] = thrown_spell - 96;
+                       p_ptr->mane_spell[p_ptr->mane_num] = thrown_spell - RF4_SPELL_START;
                        p_ptr->mane_dam[p_ptr->mane_num] = dam;
                        p_ptr->mane_num++;
                        new_mane = TRUE;
@@ -762,23 +742,23 @@ bool monst_spell_monst(int m_idx)
        if (can_remember)
        {
                /* Inate spell */
-               if (thrown_spell < 32*4)
+        if (thrown_spell < RF4_SPELL_START + RF4_SPELL_SIZE)
                {
-                       r_ptr->r_flags4 |= (1L << (thrown_spell - 32*3));
+            r_ptr->r_flags4 |= (1L << (thrown_spell - RF4_SPELL_START));
                        if (r_ptr->r_cast_spell < MAX_UCHAR) r_ptr->r_cast_spell++;
                }
 
                /* Bolt or Ball */
-               else if (thrown_spell < 32*5)
+        else if (thrown_spell < RF5_SPELL_START + RF5_SPELL_SIZE)
                {
-                       r_ptr->r_flags5 |= (1L << (thrown_spell - 32*4));
+            r_ptr->r_flags5 |= (1L << (thrown_spell - RF5_SPELL_START));
                        if (r_ptr->r_cast_spell < MAX_UCHAR) r_ptr->r_cast_spell++;
                }
 
                /* Special spell */
-               else if (thrown_spell < 32*6)
+        else if (thrown_spell < RF6_SPELL_START + RF6_SPELL_SIZE)
                {
-                       r_ptr->r_flags6 |= (1L << (thrown_spell - 32*5));
+            r_ptr->r_flags6 |= (1L << (thrown_spell - RF6_SPELL_START));
                        if (r_ptr->r_cast_spell < MAX_UCHAR) r_ptr->r_cast_spell++;
                }
        }

diff --git a/src/mspells4.c b/src/mspells4.c
index aa8c147..3632e3f 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -1,13 +1,39 @@
 #include "angband.h"
 
-char* monster_name(int m_idx, char* m_name)
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼¤Î¼öʸ¤ÎÄ̤·ÈÖ¹æ¤ò¼èÆÀ¤¹¤ë /
+* @param SPELL_NUM_BASE RF4¤Ê¤éRF4_SPELL_START¤Î¤è¤¦¤Ë32¶èÀÚ¤ê¤Î¥Ù¡¼¥¹¤È¤Ê¤ë¿ôÃÍ
+* @param SPELL_FLAG RF4_SHRIEK¤Ê¤É¤Î¥¹¥Ú¥ë¥Õ¥é¥°
+* @return ¼öʸ¤ÎÄ̤·Èֹ档
+*/
+int monspell_num(int SPELL_NUM_BASE, u32b SPELL_FLAG)
+{
+    int k;
+    for (k = 0; k < 32; k++)
+    {
+        if (SPELL_FLAG & (1L << k)) return k + SPELL_NUM_BASE;
+    }
+    return 0;
+}
+
+
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼ID¤ò¼è¤ê¡¢¥â¥ó¥¹¥¿¡¼Ì¾¤òm_name¤ËÂåÆþ¤¹¤ë /
+* @param m_idx ¥â¥ó¥¹¥¿¡¼ID
+* @param m_name ¥â¥ó¥¹¥¿¡¼Ì¾¤òÆþÎϤ¹¤ëÇÛÎó
+*/
+void monster_name(int m_idx, char* m_name)
 {
     monster_type    *m_ptr = &m_list[m_idx];
     monster_desc(m_name, m_ptr, 0x00);
-    return m_name;
 }
 
-/* 2 monster each is near by player, return true */
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼2ÂΤ¬¥×¥ì¥¤¥ä¡¼¤Î¶á¤¯¤Ëµï¤ë¤«¤ÎȽÄê /
+* @param m_idx ¥â¥ó¥¹¥¿¡¼ID°ìÂÎÌÜ
+* @param t_idx ¥â¥ó¥¹¥¿¡¼IDÆóÂÎÌÜ
+* @return ¥â¥ó¥¹¥¿¡¼2ÂΤΤɤÁ¤é¤«¤¬¥×¥ì¥¤¥ä¡¼¤Î¶á¤¯¤Ëµï¤ì¤ÐTRUE¡¢¤É¤Á¤é¤â±ó¤±¤ì¤ÐFALSE¤òÊÖ¤¹¡£
+*/
 bool monster_near_player(int m_idx, int t_idx)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -15,13 +41,22 @@ bool monster_near_player(int m_idx, int t_idx)
     return (m_ptr->cdis <= MAX_SIGHT) || (t_ptr->cdis <= MAX_SIGHT);
 }
 
-/* player can see monster, return true */
+/*!
+* @brief ¥×¥ì¥¤¥ä¡¼¤¬¥â¥ó¥¹¥¿¡¼¤ò¸«¤ë¤³¤È¤¬¤Ç¤­¤ë¤«¤ÎȽÄê /
+* @param m_idx ¥â¥ó¥¹¥¿¡¼ID
+* @return ¥×¥ì¥¤¥ä¡¼¤¬¥â¥ó¥¹¥¿¡¼¤ò¸«¤ë¤³¤È¤¬¤Ç¤­¤ë¤Ê¤éTRUE¡¢¤½¤¦¤Ç¤Ê¤±¤ì¤ÐFALSE¤òÊÖ¤¹¡£
+*/
 bool see_monster(int m_idx)
 {
     monster_type    *m_ptr = &m_list[m_idx];
     return is_seen(m_ptr);
 }
 
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼¤Î¾§¤¨¤¿¼öʸ¤òÀÄËâË¡¤Ç³Ø½¬¤Ç¤­¤ë¤«È½Äꤹ¤ë /
+* @param m_idx ¥â¥ó¥¹¥¿¡¼ID
+* @return ¥×¥ì¥¤¥ä¡¼¤¬ÀÄËâË¡¤Ç³Ø½¬¤Ç¤­¤ë¤Ê¤éTRUE¡¢¤½¤¦¤Ç¤Ê¤±¤ì¤ÐFALSE¤òÊÖ¤¹¡£
+*/
 bool spell_learnable(int m_idx)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -32,6 +67,11 @@ bool spell_learnable(int m_idx)
     return (seen && maneable && !world_monster);
 }
 
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼ID¤«¤é¥â¥ó¥¹¥¿¡¼¤Î¥ì¥Ù¥ë¤ò¼èÆÀ¤¹¤ë /
+* @param m_idx ¥â¥ó¥¹¥¿¡¼ID
+* @return ¥â¥ó¥¹¥¿¡¼¤Î¥ì¥Ù¥ë
+*/
 int monster_level_idx(int m_idx)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -40,6 +80,11 @@ int monster_level_idx(int m_idx)
     return rlev;
 }
 
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼ID¤«¤éPOWERFUL¥Õ¥é¥°¤Î̵ͭ¤ò¼èÆÀ¤¹¤ë /
+* @param m_idx ¥â¥ó¥¹¥¿¡¼ID
+* @return POWERFUL¥Õ¥é¥°¤¬¤¢¤ì¤ÐTRUE¡¢¤Ê¤±¤ì¤ÐFALSE¤òÊÖ¤¹¡£
+*/
 bool monster_is_powerful(int m_idx)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -47,6 +92,11 @@ bool monster_is_powerful(int m_idx)
     return (r_ptr->flags2 & RF2_POWERFUL);
 }
 
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼¤¬¥æ¥Ë¡¼¥¯¾¤´­²Äǽ¤Ç¤¢¤ë¤«¤òȽÄꤹ¤ë /
+* @param m_idx ¥â¥ó¥¹¥¿¡¼ID
+* @return ¾¤´­²Äǽ¤Ç¤¢¤ì¤ÐPM_ALLOW_UNIQUE¤òÊÖ¤¹¡£
+*/
 u32b monster_u_mode(int m_idx)
 {
        u32b u_mode = 0L;
@@ -56,11 +106,26 @@ u32b monster_u_mode(int m_idx)
        return u_mode;
 }
 
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼¤òµ¯¤³¤¹ /
+* @param m_idx ¥â¥ó¥¹¥¿¡¼ID
+*/
 void monster_wakeup(int t_idx)
 {
     (void)set_monster_csleep(t_idx, 0);
 }
 
+/*!
+ * @brief ¥â¥ó¥¹¥¿¡¼¤¬¼öʸ¹Ô»È¤¹¤ëºÝ¤Î¥á¥Ã¥»¡¼¥¸¤ò½èÍý¤¹¤ëÈÆÍÑ´Ø¿ô /
+ * @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+ * @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+ * @param msg1 msg_flag¤¬TRUE¤Ç¡¢¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹ç¤Î¥á¥Ã¥»¡¼¥¸
+ * @param msg2 msg_flag¤¬TRUE¤Ç¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹ç¤Î¥á¥Ã¥»¡¼¥¸
+ * @param msg3 msg_flag¤¬FALSE¤Ç¡¢¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹ç¤Î¥á¥Ã¥»¡¼¥¸
+ * @param msg4 msg_flag¤¬FALSE¤Ç¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹ç¤Î¥á¥Ã¥»¡¼¥¸
+ * @param msg_flag ¥á¥Ã¥»¡¼¥¸¤òʬ´ô¤¹¤ë¤¿¤á¤Î¥Õ¥é¥°
+ * @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+ */
 void monspell_message_base(int m_idx, int t_idx, cptr msg1, cptr msg2, cptr msg3, cptr msg4, bool msg_flag, int TARGET_TYPE)
 {
     bool known = monster_near_player(m_idx, t_idx);
@@ -97,16 +162,39 @@ void monspell_message_base(int m_idx, int t_idx, cptr msg1, cptr msg2, cptr msg3
         mon_fight = TRUE;
 }
 
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼¤¬¼öʸ¹Ô»È¤¹¤ëºÝ¤Î¥á¥Ã¥»¡¼¥¸¤ò½èÍý¤¹¤ëÈÆÍÑ´Ø¿ô¡£ÌÕÌÜ»þ¤ÈÄ̾ï»þ¤Î¥á¥Ã¥»¡¼¥¸¤òÀÚ¤êÂؤ¨¤ë¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param msg1 ¥×¥ì¥¤¥ä¡¼¤¬ÌÕÌܾõÂ֤Υá¥Ã¥»¡¼¥¸
+* @param msg2 ¥×¥ì¥¤¥ä¡¼¤¬ÌÕÌܤǤʤ¯¡¢¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹ç¤Î¥á¥Ã¥»¡¼¥¸
+* @param msg3 ¥×¥ì¥¤¥ä¡¼¤¬ÌÕÌܤǤʤ¯¡¢¥â¥ó¥¹¥¿¡¼ÂоݤȤ¹¤ë¾ì¹ç¤Î¥á¥Ã¥»¡¼¥¸
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void monspell_message(int m_idx, int t_idx, cptr msg1, cptr msg2, cptr msg3, int TARGET_TYPE)
 {
     monspell_message_base(m_idx, t_idx, msg1, msg1, msg2, msg3, p_ptr->blind, TARGET_TYPE);
 }
 
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼¤¬¼öʸ¹Ô»È¤¹¤ëºÝ¤Î¥á¥Ã¥»¡¼¥¸¤ò½èÍý¤¹¤ëÈÆÍÑ´Ø¿ô¡£ÂÐ¥â¥ó¥¹¥¿¡¼¤ÈÂХץ쥤¥ä¡¼¤Î¥á¥Ã¥»¡¼¥¸¤òÀÚ¤êÂؤ¨¤ë¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param msg1 ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹ç¤Î¥á¥Ã¥»¡¼¥¸
+* @param msg2 ¥â¥ó¥¹¥¿¡¼ÂоݤȤ¹¤ë¾ì¹ç¤Î¥á¥Ã¥»¡¼¥¸
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void simple_monspell_message(int m_idx, int t_idx, cptr msg1, cptr msg2, int TARGET_TYPE)
 {
     monspell_message_base(m_idx, t_idx, msg1, msg2, msg1, msg2, p_ptr->blind, TARGET_TYPE);
 }
 
+/*!
+ * @brief RF4_SHRIEK¤Î½èÍý¡£¶«¤Ó¡£ /
+ * @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+ * @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+ * @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+ */
 void spell_RF4_SHRIEK(int m_idx, int t_idx, int TARGET_TYPE)
 {
     simple_monspell_message(m_idx, t_idx,
@@ -124,6 +212,12 @@ void spell_RF4_SHRIEK(int m_idx, int t_idx, int TARGET_TYPE)
     }
 }
 
+/*!
+* @brief RF4_DISPEL¤Î½èÍý¡£ËâÎϾõ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF4_DISPEL(int m_idx, int t_idx, int TARGET_TYPE)
 {
     bool known = monster_near_player(m_idx, t_idx);
@@ -155,10 +249,18 @@ void spell_RF4_DISPEL(int m_idx, int t_idx, int TARGET_TYPE)
     }
 }
 
+/*!
+* @brief RF4_ROCKET¤Î½èÍý¡£¥í¥±¥Ã¥È¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF4_ROCKET(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    monster_type    *m_ptr = &m_list[m_idx];
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤ò¼Í¤Ã¤¿¡£", "%^s shoots something."),
@@ -166,32 +268,49 @@ int spell_RF4_ROCKET(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¥í¥±¥Ã¥È¤òȯ¼Í¤·¤¿¡£", "%^s fires a rocket at %s."),
         TARGET_TYPE);
 
-    dam = (m_ptr->hp / 4) > 800 ? 800 : (m_ptr->hp / 4);
+    dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_ROCKET), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_ROCKET, dam, 2, FALSE, MS_ROCKET, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_SHARD);
     return dam;
 }
 
+/*!
+* @brief RF4_SHOOT¤Î½èÍý¡£¼Í·â¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF4_SHOOT(int y, int x, int m_idx, int t_idx,int TARGET_TYPE)
 {
     int dam;
-    monster_type    *m_ptr = &m_list[m_idx];
-    monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-    
+
     monspell_message(m_idx, t_idx,
         _("%^s¤¬´ñ̯¤Ê²»¤òȯ¤·¤¿¡£", "%^s makes a strange noise."),
         _("%^s¤¬Ìð¤òÊü¤Ã¤¿¡£", "%^s fires an arrow."),
         _("%^s¤¬%s¤ËÌð¤òÊü¤Ã¤¿¡£", "%^s fires an arrow at %s."),
         TARGET_TYPE);
 
-    dam = damroll(r_ptr->blow[0].d_dice, r_ptr->blow[0].d_side);
+    dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_SHOOT), m_idx, DAM_ROLL);
     bolt(m_idx, y, x, GF_ARROW, dam, MS_SHOOT, TARGET_TYPE);
     sound(SOUND_SHOOT);
 
     return dam;
 }
 
+/*!
+* @brief RF4_BR_*¤Î½èÍý¡£³Æ¼ï¥Ö¥ì¥¹¡£ /
+* @param GF_TYPE ¥Ö¥ì¥¹¤Î°À­
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF4_BREATH(int GF_TYPE, int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam, ms_type, drs_type;
@@ -209,133 +328,133 @@ int spell_RF4_BREATH(int GF_TYPE, int y, int x, int m_idx, int t_idx, int TARGET
     switch (GF_TYPE)
     {
     case GF_ACID:
-        dam = ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_ACID), m_idx, DAM_ROLL);
         type_s = _("»À", "acid");
         ms_type = MS_BR_ACID;
         drs_type = DRS_ACID;
         break;
     case GF_ELEC:
-        dam = ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_ELEC), m_idx, DAM_ROLL);
         type_s = _("°ðºÊ", "lightning");
         ms_type = MS_BR_ELEC;
         drs_type = DRS_ELEC;
         break;
     case GF_FIRE:
-        dam = ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_FIRE), m_idx, DAM_ROLL);
         type_s = _("²Ð±ê", "fire");
         ms_type = MS_BR_FIRE;
         drs_type = DRS_FIRE;
         break;
     case GF_COLD:
-        dam = ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_COLD), m_idx, DAM_ROLL);
         type_s = _("Î䵤", "frost");
         ms_type = MS_BR_COLD;
         drs_type = DRS_COLD;
         break;
     case GF_POIS:
-        dam = ((m_ptr->hp / 3) > 800 ? 800 : (m_ptr->hp / 3));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_POIS), m_idx, DAM_ROLL);
         type_s = _("¥¬¥¹", "gas");
         ms_type = MS_BR_POIS;
         drs_type = DRS_POIS;
         break;
     case GF_NETHER:
-        dam = ((m_ptr->hp / 6) > 550 ? 550 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_NETH), m_idx, DAM_ROLL);
         type_s = _("ÃϹö", "nether");
         ms_type = MS_BR_NETHER;
         drs_type = DRS_NETH;
         break;
     case GF_LITE:
-        dam = ((m_ptr->hp / 6) > 400 ? 400 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_LITE), m_idx, DAM_ROLL);
         type_s = _("Á®¸÷", "light");
         ms_type = MS_BR_LITE;
         drs_type = DRS_LITE;
         break;
     case GF_DARK:
-        dam = ((m_ptr->hp / 6) > 400 ? 400 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_DARK), m_idx, DAM_ROLL);
         type_s = _("°Å¹õ", "darkness");
         ms_type = MS_BR_DARK;
         drs_type = DRS_DARK;
         break;
     case GF_CONFUSION:
-        dam = ((m_ptr->hp / 6) > 450 ? 450 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_CONF), m_idx, DAM_ROLL);
         type_s = _("º®Íð", "confusion");
         ms_type = MS_BR_CONF;
         drs_type = DRS_CONF;
         break;
     case GF_SOUND:
-        dam = ((m_ptr->hp / 6) > 450 ? 450 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_SOUN), m_idx, DAM_ROLL);
         type_s = _("¹ì²»", "sound");
         ms_type = MS_BR_SOUND;
         drs_type = DRS_SOUND;
         break;
     case GF_CHAOS:
-        dam = ((m_ptr->hp / 6) > 600 ? 600 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_CHAO), m_idx, DAM_ROLL);
         type_s = _("¥«¥ª¥¹", "chaos");
         ms_type = MS_BR_CHAOS;
         drs_type = DRS_CHAOS;
         break;
     case GF_DISENCHANT:
-        dam = ((m_ptr->hp / 6) > 500 ? 500 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_DISE), m_idx, DAM_ROLL);
         type_s = _("Îô²½", "disenchantment");
         ms_type = MS_BR_DISEN;
         drs_type = DRS_DISEN;
         break;
     case GF_NEXUS:
-        dam = ((m_ptr->hp / 3) > 250 ? 250 : (m_ptr->hp / 3));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_NEXU), m_idx, DAM_ROLL);
         type_s = _("°ø²Ìº®Íð", "nexus");
         ms_type = MS_BR_NEXUS;
         drs_type = DRS_NEXUS;
         break;
     case GF_TIME:
-        dam = ((m_ptr->hp / 3) > 150 ? 150 : (m_ptr->hp / 3));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_TIME), m_idx, DAM_ROLL);
         type_s = _("»þ´ÖµÕž", "time");
         ms_type = MS_BR_TIME;
         smart_learn = FALSE;
         break;
     case GF_INERTIA:
-        dam = ((m_ptr->hp / 6) > 200 ? 200 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_INER), m_idx, DAM_ROLL);
         type_s = _("ÃÙÆß", "inertia");
         ms_type = MS_BR_INERTIA;
         smart_learn = FALSE;
         break;
     case GF_GRAVITY:
-        dam = ((m_ptr->hp / 3) > 200 ? 200 : (m_ptr->hp / 3));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_GRAV), m_idx, DAM_ROLL);
         type_s = _("½ÅÎÏ", "gravity");
         ms_type = MS_BR_GRAVITY;
         smart_learn = FALSE;
         break;
     case GF_SHARDS:
-        dam = ((m_ptr->hp / 6) > 500 ? 500 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_SHAR), m_idx, DAM_ROLL);
         type_s = _("ÇËÊÒ", "shards");
         ms_type = MS_BR_SHARDS;
         drs_type = DRS_SHARD;
         break;
     case GF_PLASMA:
-        dam = ((m_ptr->hp / 6) > 150 ? 150 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_PLAS), m_idx, DAM_ROLL);
         type_s = _("¥×¥é¥º¥Þ", "plasma");
         ms_type = MS_BR_PLASMA;
         smart_learn = FALSE;
         break;
     case GF_FORCE:
-        dam = ((m_ptr->hp / 6) > 200 ? 200 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_WALL), m_idx, DAM_ROLL);
         type_s = _("¥Õ¥©¡¼¥¹", "force");
         ms_type = MS_BR_FORCE;
         smart_learn = FALSE;
         break;
     case GF_MANA:
-        dam = ((m_ptr->hp / 3) > 250 ? 250 : (m_ptr->hp / 3));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_MANA), m_idx, DAM_ROLL);
         type_s = _("ËâÎÏ", "mana");
         ms_type = MS_BR_MANA;
         smart_learn = FALSE;
         break;
     case GF_NUKE:
-        dam = ((m_ptr->hp / 3) > 800 ? 800 : (m_ptr->hp / 3));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_NUKE), m_idx, DAM_ROLL);
         type_s = _("Êü¼ÍÀ­ÇÑ´þʪ", "toxic waste");
         ms_type = MS_BR_NUKE;
         drs_type = DRS_POIS;
         break;
     case GF_DISINTEGRATE:
-        dam = ((m_ptr->hp / 6) > 150 ? 150 : (m_ptr->hp / 6));
+        dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BR_DISI), m_idx, DAM_ROLL);
         type_s = _("ʬ²ò", "disintegration");
         ms_type = MS_BR_DISI;
         smart_learn = FALSE;
@@ -384,10 +503,18 @@ int spell_RF4_BREATH(int GF_TYPE, int y, int x, int m_idx, int t_idx, int TARGET
     return dam;
 }
 
+/*!
+* @brief RF4_BA_NUKE¤Î½èÍý¡£Êü¼Íǽµå¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF4_BA_NUKE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."),
@@ -395,7 +522,7 @@ int spell_RF4_BA_NUKE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤ËÊü¼Íǽµå¤òÊü¤Ã¤¿¡£", "%^s casts a ball of radiation at %s."),
         TARGET_TYPE);
 
-    dam = (rlev + damroll(10, 6)) * (monster_is_powerful(m_idx) ? 2 : 1);
+    dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BA_NUKE), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_NUKE, dam, 2, FALSE, MS_BALL_NUKE, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_POIS);
@@ -403,10 +530,18 @@ int spell_RF4_BA_NUKE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF4_BA_CHAO¤Î½èÍý¡£½ã¥í¥°¥ë¥¹¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF4_BA_CHAO(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬¶²¤í¤·¤²¤Ë¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles frighteningly."),
@@ -414,8 +549,7 @@ int spell_RF4_BA_CHAO(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë½ã¥í¥°¥ë¥¹¤òÊü¤Ã¤¿¡£", "%^s invokes raw Logrus upon %s."),
         TARGET_TYPE);
 
-    dam = (monster_is_powerful(m_idx) ? (rlev * 3) : (rlev * 2)) + damroll(10, 10);
-
+    dam = monspell_damage(monspell_num(RF4_SPELL_START, RF4_BA_CHAO), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_CHAOS, dam, 4, FALSE, MS_BALL_CHAOS, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_CHAOS);
@@ -423,10 +557,18 @@ int spell_RF4_BA_CHAO(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BA_ACID¤Î½èÍý¡£¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BA_ACID(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam, rad;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."),
@@ -435,17 +577,8 @@ int spell_RF5_BA_ACID(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
           "%^s casts an acid ball at %s."),
         TARGET_TYPE);
 
-    if (monster_is_powerful(m_idx))
-    {
-        rad = 4;
-        dam = (rlev * 4) + 50 + damroll(10, 10);
-    }
-    else
-    {
-        rad = 2;
-        dam = (randint1(rlev * 3) + 15);
-    }
-
+    rad = monster_is_powerful(m_idx) ? 4 : 2;
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BA_ACID), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_ACID, dam, rad, FALSE, MS_BALL_ACID, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_ACID);
@@ -453,10 +586,18 @@ int spell_RF5_BA_ACID(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BA_ELEC¤Î½èÍý¡£¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BA_ELEC(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam, rad;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."),
@@ -465,17 +606,8 @@ int spell_RF5_BA_ELEC(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
           "%^s casts a lightning ball at %s."),
         TARGET_TYPE);
 
-    if (monster_is_powerful(m_idx))
-    {
-        rad = 4;
-        dam = (rlev * 4) + 50 + damroll(10, 10);
-    }
-    else
-    {
-        rad = 2;
-        dam = (randint1(rlev * 3 / 2) + 8);
-    }
-    
+    rad = monster_is_powerful(m_idx) ? 4 : 2;
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BA_ELEC), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_ELEC, dam, rad, FALSE, MS_BALL_ELEC, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_ELEC);
@@ -483,11 +615,19 @@ int spell_RF5_BA_ELEC(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BA_FIRE¤Î½èÍý¡£¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BA_FIRE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam, rad;
     monster_type    *m_ptr = &m_list[m_idx];
-    int rlev = monster_level_idx(m_idx);
 
     if (m_ptr->r_idx == MON_ROLENTO)
     {
@@ -506,18 +646,8 @@ int spell_RF5_BA_FIRE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
             "%^s casts a fire ball at %s."),
             TARGET_TYPE);
     }
-
-    if (monster_is_powerful(m_idx))
-    {
-        rad = 4;
-        dam = (rlev * 4) + 50 + damroll(10, 10);
-    }
-    else
-    {
-        rad = 2;
-        dam = (randint1(rlev * 7 / 2) + 10);
-    }
-
+    rad = monster_is_powerful(m_idx) ? 4 : 2;
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BA_FIRE), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_FIRE, dam, rad, FALSE, MS_BALL_FIRE, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_FIRE);
@@ -525,10 +655,18 @@ int spell_RF5_BA_FIRE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BA_COLD¤Î½èÍý¡£¥¢¥¤¥¹¡¦¥Ü¡¼¥ë¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BA_COLD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam, rad;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."),
@@ -537,17 +675,8 @@ int spell_RF5_BA_COLD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         "%^s casts a frost ball at %s."),
         TARGET_TYPE);
 
-    if (monster_is_powerful(m_idx))
-    {
-        rad = 4;
-        dam = (rlev * 4) + 50 + damroll(10, 10);
-    }
-    else
-    {
-        rad = 2;
-        dam = (randint1(rlev * 3 / 2) + 10);
-    }
-
+    rad = monster_is_powerful(m_idx) ? 4 : 2;
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BA_COLD), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_COLD, dam, rad, FALSE, MS_BALL_COLD, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_COLD);
@@ -555,7 +684,15 @@ int spell_RF5_BA_COLD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
-
+/*!
+* @brief RF5_BA_POIS¤Î½èÍý¡£°­½­±À¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BA_POIS(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
@@ -566,7 +703,7 @@ int spell_RF5_BA_POIS(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ°­½­±À¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a stinking cloud at %s."),
         TARGET_TYPE);
 
-    dam = damroll(12, 2) * (monster_is_powerful(m_idx) ? 2 : 1);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BA_POIS), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_POIS, dam, 2, FALSE, MS_BALL_POIS, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_POIS);
@@ -574,10 +711,18 @@ int spell_RF5_BA_POIS(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BA_NETH¤Î½èÍý¡£ÃϹöµå¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BA_NETH(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."),
@@ -585,7 +730,7 @@ int spell_RF5_BA_NETH(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤ÆÃϹöµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a nether ball at %s."),
         TARGET_TYPE);
 
-    dam = 50 + damroll(10, 10) + (rlev * (monster_is_powerful(m_idx) ? 2 : 1));
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BA_NETH), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_NETHER, dam, 2, FALSE, MS_BALL_NETHER, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_NETH);
@@ -593,10 +738,18 @@ int spell_RF5_BA_NETH(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BA_WATE¤Î½èÍý¡£¥¦¥©¡¼¥¿¡¼¡¦¥Ü¡¼¥ë¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BA_WATE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
     bool known = monster_near_player(m_idx, t_idx);
     bool see_either = see_monster(m_idx) || see_monster(t_idx);
     bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER);
@@ -620,16 +773,23 @@ int spell_RF5_BA_WATE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         msg_format(_("%^s¤Ï±²´¬¤Ë°û¤ß¹þ¤Þ¤ì¤¿¡£", "%^s is engulfed in a whirlpool."), t_name);
     }
 
-    dam = (monster_is_powerful(m_idx) ? randint1(rlev * 3) : randint1(rlev * 2)) + 50;
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BA_WATE), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_WATER, dam, 4, FALSE, MS_BALL_WATER, TARGET_TYPE);
     return dam;
 }
 
-
+/*!
+* @brief RF5_BA_MANA¤Î½èÍý¡£ËâÎϤÎÍò¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BA_MANA(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles powerfully."),
@@ -637,15 +797,23 @@ int spell_RF5_BA_MANA(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤ËÂФ·¤ÆËâÎϤÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£", "%^s invokes a mana storm upon %s."),
         TARGET_TYPE);
 
-    dam = (rlev * 4) + 50 + damroll(10, 10);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BA_MANA), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_MANA, dam, 4, FALSE, MS_BALL_MANA, TARGET_TYPE);
     return dam;
 }
 
+/*!
+* @brief RF5_BA_DARK¤Î½èÍý¡£°Å¹õ¤ÎÍò¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BA_DARK(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles powerfully."),
@@ -653,7 +821,7 @@ int spell_RF5_BA_DARK(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤ËÂФ·¤Æ°Å¹õ¤ÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£", "%^s invokes a darkness storm upon %s."),
         TARGET_TYPE);
 
-    dam = (rlev * 4) + 50 + damroll(10, 10);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BA_DARK), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_DARK, dam, 4, FALSE, MS_BALL_DARK, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_DARK);
@@ -661,9 +829,17 @@ int spell_RF5_BA_DARK(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_DRAIN_MANA¤Î½èÍý¡£ËâÎϵۼý¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_DRAIN_MANA(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
-    int rlev = monster_level_idx(m_idx);
     int dam;
        char m_name[80], t_name[80];
     monster_name(m_idx, m_name);
@@ -680,7 +856,7 @@ int spell_RF5_DRAIN_MANA(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         msg_format(_("%^s¤ÏÀº¿À¥¨¥Í¥ë¥®¡¼¤ò%s¤«¤éµÛ¤¤¤È¤Ã¤¿¡£", "%^s draws psychic energy from %s."), m_name, t_name);
     }
 
-    dam = ((randint1(rlev) / 2) + 1);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_DRAIN_MANA), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_DRAIN_MANA, dam, 0, FALSE, MS_DRAIN_MANA, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_MANA);
@@ -688,11 +864,19 @@ int spell_RF5_DRAIN_MANA(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_MIND_BLAST¤Î½èÍý¡£Àº¿À¹¶·â¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_MIND_BLAST(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *m_ptr = &m_list[m_idx];
     bool seen = (!p_ptr->blind && m_ptr->ml);
-    int rlev = monster_level_idx(m_idx);
     int dam;
        char m_name[80], t_name[80];
     monster_name(m_idx, m_name);
@@ -712,16 +896,24 @@ int spell_RF5_MIND_BLAST(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         msg_format(_("%^s¤Ï%s¤ò¤¸¤Ã¤Èâˤó¤À¡£", "%^s gazes intently at %s."), m_name, t_name);
     }
 
-    dam = damroll(7, 7);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_MIND_BLAST), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_MIND_BLAST, dam, 0, FALSE, MS_MIND_BLAST, TARGET_TYPE);
     return dam;
 }
 
+/*!
+* @brief RF5_BRAIN_SMASH¤Î½èÍý¡£Ç¾¹¶·â¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BRAIN_SMASH(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *m_ptr = &m_list[m_idx];
     bool seen = (!p_ptr->blind && m_ptr->ml);
-    int rlev = monster_level_idx(m_idx);
     int dam;
        char m_name[80], t_name[80];
     monster_name(m_idx, m_name);
@@ -741,14 +933,28 @@ int spell_RF5_BRAIN_SMASH(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         msg_format(_("%^s¤Ï%s¤ò¤¸¤Ã¤Èâˤó¤À¡£", "%^s gazes intently at %s."), m_name, t_name);
     }
 
-    dam = damroll(12, 12);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BRAIN_SMASH), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_BRAIN_SMASH, dam, 0, FALSE, MS_BRAIN_SMASH, TARGET_TYPE);
     return dam;
 }
 
+/*!
+* @brief RF5_CAUSE_*¤Î¥á¥Ã¥»¡¼¥¸½èÍý´Ø¿ô /
+* @param GF_TYPE ¹¶·â¤Ë»ÈÍѤ¹¤ë°À­
+* @param dam ¹¶·â¤Ë»ÈÍѤ¹¤ë¥À¥á¡¼¥¸ÎÌ
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param msg1 ÂХץ쥤¥ä¡¼¡¢ÌÕÌÜ»þ¥á¥Ã¥»¡¼¥¸
+* @param msg2 ÂХץ쥤¥ä¡¼¡¢ÈóÌÕÌÜ»þ¥á¥Ã¥»¡¼¥¸
+* @param msg3 ÂÐ¥â¥ó¥¹¥¿¡¼¤Î¥á¥Ã¥»¡¼¥¸
+* @param MS_TYPE ¼öʸ¤ÎÈÖ¹æ
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 void spell_RF5_CAUSE(int GF_TYPE, int dam, int y, int x, int m_idx, int t_idx, cptr msg1, cptr msg2, cptr msg3, int MS_TYPE, int TARGET_TYPE)
 {
-    int rlev = monster_level_idx(m_idx);
        char m_name[80], t_name[80];
     monster_name(m_idx, m_name);
        monster_name(t_idx, t_name);
@@ -775,10 +981,20 @@ void spell_RF5_CAUSE(int GF_TYPE, int dam, int y, int x, int m_idx, int t_idx, c
     breath(y, x, m_idx, GF_TYPE, dam, 0, FALSE, MS_TYPE, TARGET_TYPE);
 }
 
+/*!
+* @brief RF5_CAUSE_1¤Î½èÍý¡£·Ú½ý¤Î¼ö¤¤¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_CAUSE_1(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     cptr msg1, msg2, msg3;
-    int dam = damroll(3, 8);
+    int dam;
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_CAUSE_1), m_idx, DAM_ROLL);
 
     msg1 = _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles.");
     msg2 = _("%^s¤¬¤¢¤Ê¤¿¤ò»Ø¤µ¤·¤Æ¼ö¤Ã¤¿¡£", "%^s points at you and curses.");
@@ -788,10 +1004,20 @@ int spell_RF5_CAUSE_1(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_CAUSE_2¤Î½èÍý¡£½Å½ý¤Î¼ö¤¤¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_CAUSE_2(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     cptr msg1, msg2, msg3;
-    int dam = damroll(8, 8);
+    int dam;
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_CAUSE_2), m_idx, DAM_ROLL);
 
     msg1 = _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles.");
     msg2 = _("%^s¤¬¤¢¤Ê¤¿¤ò»Ø¤µ¤·¤Æ¶²¤í¤·¤²¤Ë¼ö¤Ã¤¿¡£", "%^s points at you and curses horribly.");
@@ -801,10 +1027,20 @@ int spell_RF5_CAUSE_2(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_CAUSE_3¤Î½èÍý¡£Ã×Ì¿½ý¤Î¼ö¤¤¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_CAUSE_3(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     cptr msg1, msg2, msg3;
-    int dam = damroll(10, 15);
+    int dam;
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_CAUSE_3), m_idx, DAM_ROLL);
 
     msg1 = _("%^s¤¬²¿¤«¤òÂçÀ¼¤Ç¶«¤ó¤À¡£", "%^s mumbles loudly.");
     msg2 = _("%^s¤¬¤¢¤Ê¤¿¤ò»Ø¤µ¤·¤Æ¶²¤í¤·¤²¤Ë¼öʸ¤ò¾§¤¨¤¿¡ª", "%^s points at you, incanting terribly!");
@@ -814,10 +1050,20 @@ int spell_RF5_CAUSE_3(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_CAUSE_4¤Î½èÍý¡£È빦¤òÆͤ¯¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_CAUSE_4(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     cptr msg1, msg2, msg3;
-    int dam = damroll(15, 15);
+    int dam;
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_CAUSE_4), m_idx, DAM_ROLL);
 
     msg1 = _("%^s¤¬¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£", "%^s screams the word 'DIE!'");
     msg2 = _("%^s¤¬¤¢¤Ê¤¿¤ÎÈ빦¤òÆͤ¤¤Æ¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£", "%^s points at you, screaming the word DIE!");
@@ -827,10 +1073,18 @@ int spell_RF5_CAUSE_4(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BO_ACID¤Î½èÍý¡£¥¢¥·¥Ã¥É¡¦¥Ü¥ë¥È¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BO_ACID(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."),
@@ -838,7 +1092,7 @@ int spell_RF5_BO_ACID(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¢¥·¥Ã¥É¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts an acid bolt at %s."),
         TARGET_TYPE);
 
-    dam = (damroll(7, 8) + (rlev / 3)) * (monster_is_powerful(m_idx) ? 2 : 1);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BO_ACID), m_idx, DAM_ROLL);
     bolt(m_idx, y, x, GF_ACID, dam, MS_BOLT_ACID, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
     {
@@ -848,10 +1102,18 @@ int spell_RF5_BO_ACID(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BO_ELEC¤Î½èÍý¡£¥µ¥ó¥À¡¼¡¦¥Ü¥ë¥È¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BO_ELEC(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."),
@@ -859,7 +1121,7 @@ int spell_RF5_BO_ELEC(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥µ¥ó¥À¡¼¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a lightning bolt at %s."),
         TARGET_TYPE);
 
-    dam = (damroll(4, 8) + (rlev / 3)) * (monster_is_powerful(m_idx) ? 2 : 1);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BO_ELEC), m_idx, DAM_ROLL);
     bolt(m_idx, y, x, GF_ELEC, dam, MS_BOLT_ELEC, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
     {
@@ -869,10 +1131,18 @@ int spell_RF5_BO_ELEC(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BO_FIRE¤Î½èÍý¡£¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BO_FIRE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."),
@@ -880,7 +1150,7 @@ int spell_RF5_BO_FIRE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a fire bolt at %s."),
         TARGET_TYPE);
 
-    dam = (damroll(9, 8) + (rlev / 3)) * (monster_is_powerful(m_idx) ? 2 : 1);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BO_FIRE), m_idx, DAM_ROLL);
     bolt(m_idx, y, x, GF_FIRE, dam, MS_BOLT_FIRE, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
     {
@@ -890,10 +1160,18 @@ int spell_RF5_BO_FIRE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BO_COLD¤Î½èÍý¡£¥¢¥¤¥¹¡¦¥Ü¥ë¥È¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BO_COLD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."),
@@ -901,7 +1179,7 @@ int spell_RF5_BO_COLD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¢¥¤¥¹¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a frost bolt at %s."),
         TARGET_TYPE);
 
-    dam = (damroll(6, 8) + (rlev / 3)) * (monster_is_powerful(m_idx) ? 2 : 1);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BO_COLD), m_idx, DAM_ROLL);
     bolt(m_idx, y, x, GF_COLD, dam, MS_BOLT_COLD, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
     {
@@ -911,10 +1189,18 @@ int spell_RF5_BO_COLD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BA_LITE¤Î½èÍý¡£¥¹¥¿¡¼¥Ð¡¼¥¹¥È¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BA_LITE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles powerfully."),
@@ -922,7 +1208,7 @@ int spell_RF5_BA_LITE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤ËÂФ·¤Æ¥¹¥¿¡¼¥Ð¡¼¥¹¥È¤Î¼öʸ¤òÇ°¤¸¤¿¡£", "%^s invokes a starburst upon %s."),
         TARGET_TYPE);
 
-    dam = (rlev * 4) + 50 + damroll(10, 10);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BA_LITE), m_idx, DAM_ROLL);
     breath(y, x, m_idx, GF_LITE, dam, 4, FALSE, MS_STARBURST, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
         update_smart_learn(m_idx, DRS_LITE);
@@ -930,11 +1216,18 @@ int spell_RF5_BA_LITE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
-
+/*!
+* @brief RF5_BO_NETH¤Î½èÍý¡£ÃϹö¤ÎÌð¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BO_NETH(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
-    int rlev = monster_level_idx(m_idx);
 
     monspell_message(m_idx, t_idx,
         _("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."),
@@ -942,7 +1235,7 @@ int spell_RF5_BO_NETH(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤ÆÃϹö¤ÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a nether bolt at %s."),
         TARGET_TYPE);
 
-    dam = 30 + damroll(5, 5) + (rlev * 4) / (monster_is_powerful(m_idx) ? 2 : 3);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BO_NETH), m_idx, DAM_ROLL);
     bolt(m_idx, y, x, GF_NETHER, dam, MS_BOLT_NETHER, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
     {
@@ -952,6 +1245,15 @@ int spell_RF5_BO_NETH(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BO_WATE¤Î½èÍý¡£¥¦¥©¡¼¥¿¡¼¡¦¥Ü¥ë¥È¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BO_WATE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
@@ -963,7 +1265,7 @@ int spell_RF5_BO_WATE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¦¥©¡¼¥¿¡¼¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a water bolt at %s."),
         TARGET_TYPE);
 
-    dam = damroll(10, 10) + (rlev * 3 / (monster_is_powerful(m_idx) ? 2 : 3));
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BO_WATE), m_idx, DAM_ROLL);
     bolt(m_idx, y, x, GF_WATER, dam, MS_BOLT_WATER, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
     {
@@ -972,6 +1274,15 @@ int spell_RF5_BO_WATE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BO_MANA¤Î½èÍý¡£ËâÎϤÎÌð¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BO_MANA(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
@@ -983,7 +1294,7 @@ int spell_RF5_BO_MANA(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤ÆËâÎϤÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a mana bolt at %s."),
         TARGET_TYPE);
 
-    dam = randint1(rlev * 7 / 2) + 50;
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BO_MANA), m_idx, DAM_ROLL);
     bolt(m_idx, y, x, GF_MANA, dam, MS_BOLT_MANA, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
     {
@@ -992,6 +1303,15 @@ int spell_RF5_BO_MANA(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BO_PLAS¤Î½èÍý¡£¥×¥é¥º¥Þ¡¦¥Ü¥ë¥È¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BO_PLAS(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
@@ -1003,7 +1323,7 @@ int spell_RF5_BO_PLAS(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥×¥é¥º¥Þ¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a plasma bolt at %s."),
         TARGET_TYPE);
 
-    dam = 10 + damroll(8, 7) + (rlev * 3 / (monster_is_powerful(m_idx) ? 2 : 3));
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BO_PLAS), m_idx, DAM_ROLL);
     bolt(m_idx, y, x, GF_PLASMA, dam, MS_BOLT_PLASMA, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
     {
@@ -1012,6 +1332,15 @@ int spell_RF5_BO_PLAS(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_BO_ICEE¤Î½èÍý¡£¶Ë´¨¤ÎÌð¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_BO_ICEE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
@@ -1023,7 +1352,7 @@ int spell_RF5_BO_ICEE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¶Ë´¨¤ÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts an ice bolt at %s."),
         TARGET_TYPE);
 
-    dam = damroll(6, 6) + (rlev * 3 / (monster_is_powerful(m_idx) ? 2 : 3));
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_BO_ICEE), m_idx, DAM_ROLL);
     bolt(m_idx, y, x, GF_ICE, dam, MS_BOLT_ICE, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
     {
@@ -1033,6 +1362,15 @@ int spell_RF5_BO_ICEE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF5_MISSILE¤Î½èÍý¡£¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF5_MISSILE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
@@ -1044,7 +1382,7 @@ int spell_RF5_MISSILE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a magic missile at %s."),
         TARGET_TYPE);
 
-    dam = damroll(2, 6) + (rlev / 3);
+    dam = monspell_damage(monspell_num(RF5_SPELL_START, RF5_MISSILE), m_idx, DAM_ROLL);
     bolt(m_idx, y, x, GF_MISSILE, dam, MS_MAGIC_MISSILE, TARGET_TYPE);
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
     {
@@ -1053,6 +1391,18 @@ int spell_RF5_MISSILE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief ¾õÂÖ°Û¾ï¼öʸ¤Î¥á¥Ã¥»¡¼¥¸½èÍý´Ø¿ô¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param msg1 ÂХץ쥤¥ä¡¼¤Ê¤éÌÕÌÜ»þ¥á¥Ã¥»¡¼¥¸¡£ÂÐ¥â¥ó¥¹¥¿¡¼¤Ê¤éÄ̾ï»þ¥á¥Ã¥»¡¼¥¸¡£
+* @param msg2 ÂХץ쥤¥ä¡¼¤Ê¤éÈóÌÕÌÜ»þ¥á¥Ã¥»¡¼¥¸¡£ÂÐ¥â¥ó¥¹¥¿¡¼¤Ê¤éÂÑÀ­Í­¥á¥Ã¥»¡¼¥¸¡£
+* @param msg3 ÂХץ쥤¥ä¡¼¤Ê¤éÂÑÀ­Í­¥á¥Ã¥»¡¼¥¸¡£ÂÐ¥â¥ó¥¹¥¿¡¼¤Ê¤éÄñ¹³»þ¥á¥Ã¥»¡¼¥¸¡£
+* @param msg4 ÂХץ쥤¥ä¡¼¤Ê¤éÄñ¹³»þ¥á¥Ã¥»¡¼¥¸¡£ÂÐ¥â¥ó¥¹¥¿¡¼¤Ê¤éÀ®¸ù»þ¥á¥Ã¥»¡¼¥¸¡£
+* @param resist ÂÑÀ­¤Î̵ͭ¤òȽÊ̤¹¤ë¥Õ¥é¥°
+* @param saving_throw Äñ¹³¤ËÀ®¸ù¤·¤¿¤«È½Ê̤¹¤ë¥Õ¥é¥°
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_badstatus_message(int m_idx, int t_idx, cptr msg1, cptr msg2, cptr msg3, cptr msg4, bool resist, bool saving_throw, int TARGET_TYPE)
 {
     bool see_either = see_monster(m_idx) || see_monster(t_idx);
@@ -1109,6 +1459,14 @@ void spell_badstatus_message(int m_idx, int t_idx, cptr msg1, cptr msg2, cptr ms
     }
 }
 
+/*!
+* @brief RF5_SCARE¤Î½èÍý¡£¶²ÉÝ¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF5_SCARE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *t_ptr = &m_list[t_idx];
@@ -1153,6 +1511,14 @@ void spell_RF5_SCARE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     }
 }
 
+/*!
+* @brief RF5_BLIND¤Î½èÍý¡£ÌÕÌÜ¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF5_BLIND(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *t_ptr = &m_list[t_idx];
@@ -1210,6 +1576,14 @@ void spell_RF5_BLIND(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     }
 }
 
+/*!
+* @brief RF5_CONF¤Î½èÍý¡£º®Íð¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF5_CONF(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *t_ptr = &m_list[t_idx];
@@ -1254,7 +1628,14 @@ void spell_RF5_CONF(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     }
 }
 
-
+/*!
+* @brief RF5_SLOW¤Î½èÍý¡£¸ºÂ®¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF5_SLOW(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *t_ptr = &m_list[t_idx];
@@ -1312,6 +1693,14 @@ void spell_RF5_SLOW(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     }
 }
 
+/*!
+* @brief RF5_HOLD¤Î½èÍý¡£Ëãáã¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF5_HOLD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *t_ptr = &m_list[t_idx];
@@ -1356,6 +1745,12 @@ void spell_RF5_HOLD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     }
 }
 
+/*!
+* @brief RF6_HASTE¤Î½èÍý¡£²Ã®¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF6_HASTE(int m_idx, int t_idx, int TARGET_TYPE)
 {
     bool see_m = see_monster(m_idx);
@@ -1379,6 +1774,15 @@ void spell_RF6_HASTE(int m_idx, int t_idx, int TARGET_TYPE)
     }
 }
 
+/*!
+* @brief RF6_HAND_DOOM¤Î½èÍý¡£ÇËÌǤμꡣ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF6_HAND_DOOM(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
@@ -1390,7 +1794,7 @@ int spell_RF6_HAND_DOOM(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 
     if (TARGET_TYPE == MONSTER_TO_PLAYER)
     {
-        dam = (((s32b)((40 + randint1(20)) * (p_ptr->chp))) / 100);
+        dam = monspell_damage(monspell_num(RF6_SPELL_START, RF6_HAND_DOOM), m_idx, DAM_ROLL);
         breath(y, x, m_idx, GF_HAND_DOOM, dam, 0, FALSE, MS_HAND_DOOM, MONSTER_TO_PLAYER);
     }
     else if (TARGET_TYPE == MONSTER_TO_MONSTER)
@@ -1401,6 +1805,12 @@ int spell_RF6_HAND_DOOM(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     return dam;
 }
 
+/*!
+* @brief RF6_HEAL¤Î½èÍý¡£¼£Ìþ¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF6_HEAL(int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -1464,6 +1874,13 @@ void spell_RF6_HEAL(int m_idx, int t_idx, int TARGET_TYPE)
             msg_format(_("%^s¤Ïͦµ¤¤ò¼è¤êÌᤷ¤¿¡£", "%^s recovers %s courage."), m_name);
     }
 }
+
+/*!
+* @brief RF6_INVULNER¤Î½èÍý¡£ÌµÅ¨¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF6_INVULNER(int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -1480,6 +1897,11 @@ void spell_RF6_INVULNER(int m_idx, int t_idx, int TARGET_TYPE)
     if (!MON_INVULNER(m_ptr)) (void)set_monster_invulner(m_idx, randint1(4) + 4, FALSE);
 }
 
+/*!
+* @brief RF6_BLINK¤Î½èÍý¡£¥·¥ç¡¼¥È¡¦¥Æ¥ì¥Ý¡¼¥È¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF6_BLINK(int m_idx, int TARGET_TYPE)
 {
        char m_name[80];
@@ -1506,6 +1928,11 @@ void spell_RF6_BLINK(int m_idx, int TARGET_TYPE)
     }
 }
 
+/*!
+* @brief RF6_TPORT¤Î½èÍý¡£¥Æ¥ì¥Ý¡¼¥È¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF6_TPORT(int m_idx, int TARGET_TYPE)
 {      
        char m_name[80];
@@ -1528,6 +1955,10 @@ void spell_RF6_TPORT(int m_idx, int TARGET_TYPE)
     }
 }
 
+/*!
+* @brief RF6_WORLD¤Î½èÍý¡£»þ¤ò»ß¤á¤ë¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+*/
 int spell_RF6_WORLD(int m_idx)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -1542,12 +1973,17 @@ int spell_RF6_WORLD(int m_idx)
     return who;
 }
 
-int spell_RF6_SPECIAL_BANORLUPART(int m_idx, int mode)
+/*!
+* @brief ¥Ð¡¼¥Î¡¼¥ë¡¦¥ë¥Ñ¡¼¥È¤ÎRF6_SPECIAL¤Î½èÍý¡£Ê¬Îö¡¦¹çÂΡ£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+*/
+int spell_RF6_SPECIAL_BANORLUPART(int m_idx)
 {
     monster_type    *m_ptr = &m_list[m_idx];
        int dummy_hp, dummy_maxhp, k;
        int dummy_y = m_ptr->fy;
-       int dummy_x = m_ptr->fx;
+    int dummy_x = m_ptr->fx;
+    u32b mode = 0L;
 
        switch(m_ptr->r_idx)
        {
@@ -1601,11 +2037,20 @@ int spell_RF6_SPECIAL_BANORLUPART(int m_idx, int mode)
        return 0;
 }
 
-
-int spell_RF6_SPECIAL_ROLENTO(int y, int x, int m_idx, int t_idx, int mode, int TARGET_TYPE)
+/*!
+* @brief ¥í¥ì¥ó¥È¤ÎRF6_SPECIAL¤Î½èÍý¡£¼êÜØÃƤξ¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
+int spell_RF6_SPECIAL_ROLENTO(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
        int count = 0, k;
-       int num = 1 + randint1(3);
+    int num = 1 + randint1(3);
+    u32b mode = 0L;
        
        monspell_message(m_idx, t_idx,
                _("%^s¤¬²¿¤«ÂçÎ̤ËÅꤲ¤¿¡£", "%^s spreads something."),
@@ -1624,6 +2069,15 @@ int spell_RF6_SPECIAL_ROLENTO(int y, int x, int m_idx, int t_idx, int mode, int
        return 0;
 }
 
+/*!
+* @brief B¥·¥ó¥Ü¥ë¤ÎRF6_SPECIAL¤Î½èÍý¡£ÅꤲÍî¤È¤¹¹¶·â¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF6_SPECIAL_B(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
        int dam;
@@ -1712,6 +2166,15 @@ int spell_RF6_SPECIAL_B(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
        return dam;
 }
 
+/*!
+* @brief RF6_SPECIAL¤Î½èÍý¡£¥â¥ó¥¹¥¿¡¼¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¼Â½èÍý¤Ë¿¶¤êʬ¤±¤ë¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF6_SPECIAL(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -1729,10 +2192,10 @@ int spell_RF6_SPECIAL(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         case MON_BANORLUPART:
         case MON_BANOR:
         case MON_LUPART:
-                       return spell_RF6_SPECIAL_BANORLUPART(m_idx, mode);
+                       return spell_RF6_SPECIAL_BANORLUPART(m_idx);
 
         case MON_ROLENTO:
-                       return spell_RF6_SPECIAL_ROLENTO(y, x, m_idx, t_idx, mode, TARGET_TYPE);
+                       return spell_RF6_SPECIAL_ROLENTO(y, x, m_idx, t_idx, TARGET_TYPE);
             break;
 
         default:
@@ -1747,6 +2210,13 @@ int spell_RF6_SPECIAL(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     }
 }
 
+/*!
+* @brief RF6_TELE_TO¤Î½èÍý¡£¥Æ¥ì¥Ý¡¼¥È¡¦¥Ð¥Ã¥¯¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 void spell_RF6_TELE_TO(int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -1802,6 +2272,13 @@ void spell_RF6_TELE_TO(int m_idx, int t_idx, int TARGET_TYPE)
        }
 }
 
+/*!
+* @brief RF6_TELE_AWAY¤Î½èÍý¡£¥Æ¥ì¥Ý¡¼¥È¡¦¥¢¥¦¥§¥¤¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 void spell_RF6_TELE_AWAY(int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -1860,6 +2337,13 @@ void spell_RF6_TELE_AWAY(int m_idx, int t_idx, int TARGET_TYPE)
        }
 }
 
+/*!
+* @brief RF6_TELE_LEVEL¤Î½èÍý¡£¥Æ¥ì¥Ý¡¼¥È¡¦¥ì¥Ù¥ë¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 void spell_RF6_TELE_LEVEL(int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *t_ptr = &m_list[t_idx];
@@ -1905,6 +2389,15 @@ void spell_RF6_TELE_LEVEL(int m_idx, int t_idx, int TARGET_TYPE)
     }
 }
 
+/*!
+* @brief RF6_PSY_SPEAR¤Î½èÍý¡£¸÷¤Î·õ¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¥À¥á¡¼¥¸Î̤òÊÖ¤¹¡£
+*/
 int spell_RF6_PSY_SPEAR(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int dam;
@@ -1915,12 +2408,20 @@ int spell_RF6_PSY_SPEAR(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
         _("%^s¤¬¸÷¤Î·õ¤òÊü¤Ã¤¿¡£", "%^s throw a Psycho-Spear."),
         _("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¸÷¤Î·õ¤òÊü¤Ã¤¿¡£", "%^s throw a Psycho-spear at %s."),
         TARGET_TYPE);
-       
-    dam = monster_is_powerful(m_idx) ? (randint1(rlev * 2) + 150) : (randint1(rlev * 3 / 2) + 100);
+
+    dam = monspell_damage(monspell_num(RF6_SPELL_START, RF6_PSY_SPEAR), m_idx, DAM_ROLL);
     beam(m_idx, y, x, GF_PSY_SPEAR, dam, MS_PSY_SPEAR, MONSTER_TO_PLAYER);
     return dam;
 }
 
+/*!
+* @brief RF6_DARKNESS¤Î½èÍý¡£°Å°ÇorÁ®¸÷¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF6_DARKNESS(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -1995,6 +2496,12 @@ void spell_RF6_DARKNESS(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
        }
 }
 
+/*!
+* @brief RF6_TRAPS¤Î½èÍý¡£¥È¥é¥Ã¥×¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+*/
 void spell_RF6_TRAPS(int y, int x, int m_idx)
 {
        char m_name[80];
@@ -2012,6 +2519,10 @@ void spell_RF6_TRAPS(int y, int x, int m_idx)
     (void)trap_creation(y, x);
 }
 
+/*!
+* @brief RF6_FORGET¤Î½èÍý¡£µ­²±¾Ãµî¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+*/
 void spell_RF6_FORGET(int m_idx)
 {
     int rlev = monster_level_idx(m_idx);
@@ -2034,6 +2545,13 @@ void spell_RF6_FORGET(int m_idx)
     learn_spell(MS_FORGET);
 }
 
+
+/*!
+* @brief RF6_RAISE_DEAD¤Î½èÍý¡£»à¼ÔÉü³è¡£ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param t_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID¡£¥×¥ì¥¤¥ä¡¼¤Î¾ì¹ç¤Ïdummy¤Ç0¤È¤¹¤ë¡£
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+*/
 void spell_RF6_RAISE_DEAD(int m_idx, int t_idx, int TARGET_TYPE)
 {
     monster_type    *m_ptr = &m_list[m_idx];
@@ -2047,6 +2565,15 @@ void spell_RF6_RAISE_DEAD(int m_idx, int t_idx, int TARGET_TYPE)
     animate_dead(m_idx, m_ptr->fy, m_ptr->fx);
 }
 
+
+/*!
+* @brief Â뾤´­¤Î½èÍý¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param rlev ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼¤Î¥ì¥Ù¥ë
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 int summon_EAGLE(int y, int x, int rlev, int m_idx)
 {
        int k, count = 0;       
@@ -2058,8 +2585,17 @@ int summon_EAGLE(int y, int x, int rlev, int m_idx)
        return count;
 }
 
-int summon_IE(int y, int x, int rlev, int m_idx, int mode)
+/*!
+* @brief ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¡¦¥¨¥¯¥¹¥×¥í¡¼¥À¡¼¾¤´­¤Î½èÍý¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param rlev ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼¤Î¥ì¥Ù¥ë
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
+int summon_IE(int y, int x, int rlev, int m_idx)
 {
+    u32b mode = 0L;
        int k, count = 0;       
        int num = 2 + randint1(3);
     for (k = 0; k < num; k++)
@@ -2069,6 +2605,16 @@ int summon_IE(int y, int x, int rlev, int m_idx, int mode)
        return count;
 }
 
+/*!
+* @brief ¥À¥ó¥¸¥ç¥ó¡¦¥¬¡¼¥Ç¥£¥¢¥ó¾¤´­¤Î½èÍý¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param rlev ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼¤Î¥ì¥Ù¥ë
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 int summon_Guardian(int y, int x, int rlev, int m_idx, int t_idx, int TARGET_TYPE)
 {
        int k, count = 0;       
@@ -2096,9 +2642,18 @@ int summon_Guardian(int y, int x, int rlev, int m_idx, int t_idx, int TARGET_TYP
        return count;
 }
 
-int summon_LOCK_CLONE(int y, int x, int rlev, int m_idx, int mode)
+/*!
+* @brief ¥í¥Ã¥¯¤Î¥¯¥í¡¼¥ó¾¤´­¤Î½èÍý¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param rlev ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼¤Î¥ì¥Ù¥ë
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
+int summon_LOCK_CLONE(int y, int x, int rlev, int m_idx)
 {
-       int k, count = 0;       
+    u32b mode = 0L;
+       int k, count = 0;
        int num = randint1(3);
     for (k = 0; k < num; k++)
     {
@@ -2107,6 +2662,14 @@ int summon_LOCK_CLONE(int y, int x, int rlev, int m_idx, int mode)
        return count;
 }
 
+/*!
+* @brief ¥·¥é¥ß¾¤´­¤Î½èÍý¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param rlev ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼¤Î¥ì¥Ù¥ë
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 int summon_LOUSE(int y, int x, int rlev, int m_idx)
 {
        int k, count = 0;       
@@ -2118,6 +2681,14 @@ int summon_LOUSE(int y, int x, int rlev, int m_idx)
        return count;
 }
 
+/*!
+* @brief µß±ç¾¤´­¤ÎÄ̾ï½èÍý¡£Æ±¥·¥ó¥Ü¥ë¤Î¥â¥ó¥¹¥¿¡¼¤ò¾¤´­¤¹¤ë¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param rlev ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼¤Î¥ì¥Ù¥ë
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 int summon_Kin(int y, int x, int rlev, int m_idx)
 {
        int k, count = 0;
@@ -2132,6 +2703,15 @@ int summon_Kin(int y, int x, int rlev, int m_idx)
        return count;
 }
 
+/*!
+* @brief RF6_S_KIN¤Î½èÍý¡£µß±ç¾¤´­¡£»ÈÍѤ¹¤ë¥â¥ó¥¹¥¿¡¼¤Î¼ïÎà¤Ë¤è¤ê¡¢¼Â½èÍý¤Ëʬ´ô¤µ¤»¤ë¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_KIN(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
        bool known = monster_near_player(m_idx, t_idx);
@@ -2189,7 +2769,7 @@ void spell_RF6_S_KIN(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                        break;
 
         case MON_BULLGATES:
-                       count += summon_IE(y, x, rlev, m_idx, mode);
+                       count += summon_IE(y, x, rlev, m_idx);
                break;
 
         case MON_SERPENT:
@@ -2198,7 +2778,7 @@ void spell_RF6_S_KIN(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                break;
                        
         case MON_CALDARM:
-                       count += summon_LOCK_CLONE(y, x, rlev, m_idx, mode);
+                       count += summon_LOCK_CLONE(y, x, rlev, m_idx);
                        break;
 
         case MON_LOUSY:
@@ -2217,6 +2797,15 @@ void spell_RF6_S_KIN(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_CYBER¤Î½èÍý¡£¥µ¥¤¥Ð¡¼¡¦¥Ç¡¼¥â¥ó¾¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_CYBER(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0;
@@ -2247,7 +2836,15 @@ void spell_RF6_S_CYBER(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
-
+/*!
+* @brief RF6_S_MONSTER¤Î½èÍý¡£¥â¥ó¥¹¥¿¡¼°ìÂξ¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_MONSTER(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2278,6 +2875,15 @@ void spell_RF6_S_MONSTER(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_MONSTERS¤Î½èÍý¡£¥â¥ó¥¹¥¿¡¼Ê£¿ô¾¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_MONSTERS(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2308,6 +2914,15 @@ void spell_RF6_S_MONSTERS(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_ANT¤Î½èÍý¡£¥¢¥ê¾¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_ANT(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2334,6 +2949,15 @@ void spell_RF6_S_ANT(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_SPIDER¤Î½èÍý¡£¥¯¥â¾¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_SPIDER(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2360,6 +2984,15 @@ void spell_RF6_S_SPIDER(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_HOUND¤Î½èÍý¡£¥Ï¥¦¥ó¥É¾¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_HOUND(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2386,6 +3019,15 @@ void spell_RF6_S_HOUND(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_HYDRA¤Î½èÍý¡£¥Ò¥É¥é¾¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_HYDRA(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2412,6 +3054,15 @@ void spell_RF6_S_HYDRA(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_ANGEL¤Î½èÍý¡£Å·»È°ìÂξ¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_ANGEL(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2453,6 +3104,15 @@ void spell_RF6_S_ANGEL(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_DEMON¤Î½èÍý¡£¥Ç¡¼¥â¥ó°ìÂξ¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_DEMON(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2479,6 +3139,15 @@ void spell_RF6_S_DEMON(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_UNDEAD¤Î½èÍý¡£¥¢¥ó¥Ç¥Ã¥É°ìÂξ¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_UNDEAD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2505,6 +3174,15 @@ void spell_RF6_S_UNDEAD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_DRAGON¤Î½èÍý¡£¥É¥é¥´¥ó°ìÂξ¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_DRAGON(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2531,8 +3209,16 @@ void spell_RF6_S_DRAGON(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
-int summon_NAZGUL(int y, int x, int m_idx, int mode)
+/*!
+* @brief ¥Ê¥º¥°¥ëÀïÂ⾤´­¤Î½èÍý¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
+int summon_NAZGUL(int y, int x, int m_idx)
 {
+    u32b mode = 0L;
        int count = 0, k;
        int cy = y;
     int cx = x;
@@ -2581,6 +3267,15 @@ int summon_NAZGUL(int y, int x, int m_idx, int mode)
        return count;
 }
 
+/*!
+* @brief RF6_S_HI_UNDEAD¤Î½èÍý¡£¶¯ÎϤʥ¢¥ó¥Ç¥Ã¥É¾¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_HI_UNDEAD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER);
@@ -2588,7 +3283,6 @@ void spell_RF6_S_HI_UNDEAD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
     monster_type    *m_ptr = &m_list[m_idx];
     monster_race    *r_ptr = &r_info[m_ptr->r_idx];
     int rlev = monster_level_idx(m_idx);
-    u32b mode = 0L;
     int k, count = 0;
        char m_name[80];
     monster_name(m_idx, m_name);
@@ -2599,7 +3293,7 @@ void spell_RF6_S_HI_UNDEAD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                ((r_info[MON_NAZGUL].cur_num + 2) < r_info[MON_NAZGUL].max_num) &&
                mon_to_player)
     {
-        count +=  summon_NAZGUL(y, x, m_idx, mode);
+        count +=  summon_NAZGUL(y, x, m_idx);
     }
     else
     {  
@@ -2627,6 +3321,15 @@ void spell_RF6_S_HI_UNDEAD(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_HI_DRAGON¤Î½èÍý¡£¸ÅÂå¥É¥é¥´¥ó¾¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_HI_DRAGON(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2659,6 +3362,15 @@ void spell_RF6_S_HI_DRAGON(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_AMBERITES¤Î½èÍý¡£¥¢¥ó¥Ð¡¼¤Î²¦Â²¾¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_AMBERITES(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2687,6 +3399,15 @@ void spell_RF6_S_AMBERITES(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+/*!
+* @brief RF6_S_UNIQUE¤Î½èÍý¡£¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¾¤´­¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TARGET_TYPE ¥×¥ì¥¤¥ä¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_PLAYER¡¢¥â¥ó¥¹¥¿¡¼¤òÂоݤȤ¹¤ë¾ì¹çMONSTER_TO_MONSTER
+* @return ¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£
+*/
 void spell_RF6_S_UNIQUE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
 {
     int count = 0, k;
@@ -2730,210 +3451,660 @@ void spell_RF6_S_UNIQUE(int y, int x, int m_idx, int t_idx, int TARGET_TYPE)
                mon_fight = TRUE;
 }
 
+
+
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼¤«¤é¥×¥ì¥¤¥ä¡¼¤Ø¤Î¼öʸ¤Î¿¶¤êʬ¤±´Ø¿ô¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @return ¹¶·â¼öʸ¤Î¥À¥á¡¼¥¸¡¢¤Þ¤¿¤Ï¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£¤½¤Î¾¤Î¾ì¹ç0¡£°Ê¹ß¤Î½èÍý¤òÃæÃǤ¹¤ë¤Ê¤é-1¤òÊÖ¤¹¡£
+*/
 int monspell_to_player(int SPELL_NUM, int y, int x, int m_idx)
 {
     switch (SPELL_NUM)
     {
-    case 96 + 0:   spell_RF4_SHRIEK(m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF4_SHRIEK */
-    case 96 + 1:   break;   /* RF4_XXX1 */
-    case 96 + 2:   spell_RF4_DISPEL(m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF4_DISPEL */
-    case 96 + 3:   return spell_RF4_ROCKET(y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF4_ROCKET */
-    case 96 + 4:   return spell_RF4_SHOOT(y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_SHOOT */
-    case 96 + 5:   break;   /* RF4_XXX2 */
-    case 96 + 6:   break;   /* RF4_XXX3 */
-    case 96 + 7:   break;   /* RF4_XXX4 */
-    case 96 + 8:   return spell_RF4_BREATH(GF_ACID, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_ACID */
-    case 96 + 9:   return spell_RF4_BREATH(GF_ELEC, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_ELEC */
-    case 96 + 10:  return spell_RF4_BREATH(GF_FIRE, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_FIRE */
-    case 96 + 11:  return spell_RF4_BREATH(GF_COLD, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_COLD */
-    case 96 + 12:  return spell_RF4_BREATH(GF_POIS, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_POIS */
-    case 96 + 13:  return spell_RF4_BREATH(GF_NETHER, y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_BR_NETH */
-    case 96 + 14:  return spell_RF4_BREATH(GF_LITE, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_LITE */
-    case 96 + 15:  return spell_RF4_BREATH(GF_DARK, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_DARK */
-    case 96 + 16:  return spell_RF4_BREATH(GF_CONFUSION, y, x, m_idx, 0, MONSTER_TO_PLAYER);    /* RF4_BR_CONF */
-    case 96 + 17:  return spell_RF4_BREATH(GF_SOUND, y, x, m_idx, 0, MONSTER_TO_PLAYER);    /* RF4_BR_SOUN */
-    case 96 + 18:  return spell_RF4_BREATH(GF_CHAOS, y, x, m_idx, 0, MONSTER_TO_PLAYER);    /* RF4_BR_CHAO */
-    case 96 + 19:  return spell_RF4_BREATH(GF_DISENCHANT, y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_BR_DISE */
-    case 96 + 20:  return spell_RF4_BREATH(GF_NEXUS, y, x, m_idx, 0, MONSTER_TO_PLAYER);    /* RF4_BR_NEXU */
-    case 96 + 21:  return spell_RF4_BREATH(GF_TIME, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_TIME */
-    case 96 + 22:  return spell_RF4_BREATH(GF_INERTIA, y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF4_BR_INER */
-    case 96 + 23:  return spell_RF4_BREATH(GF_GRAVITY, y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF4_BR_GRAV */
-    case 96 + 24:  return spell_RF4_BREATH(GF_SHARDS, y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_BR_SHAR */
-    case 96 + 25:  return spell_RF4_BREATH(GF_PLASMA, y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_BR_PLAS */
-    case 96 + 26:  return spell_RF4_BREATH(GF_FORCE, y, x, m_idx, 0, MONSTER_TO_PLAYER);    /* RF4_BR_WALL */
-    case 96 + 27:  return spell_RF4_BREATH(GF_MANA, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_MANA */
-    case 96 + 28:  return spell_RF4_BA_NUKE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BA_NUKE */
-    case 96 + 29:  return spell_RF4_BREATH(GF_NUKE, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_NUKE */
-    case 96 + 30:  return spell_RF4_BA_CHAO(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BA_CHAO */
-    case 96 + 31:  return spell_RF4_BREATH(GF_DISINTEGRATE, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_DISI */
-    case 128 + 0:  return spell_RF5_BA_ACID(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_ACID */
-    case 128 + 1:  return spell_RF5_BA_ELEC(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_ELEC */
-    case 128 + 2:  return spell_RF5_BA_FIRE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_FIRE */
-    case 128 + 3:  return spell_RF5_BA_COLD(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_COLD */
-    case 128 + 4:  return spell_RF5_BA_POIS(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_POIS */
-    case 128 + 5:  return spell_RF5_BA_NETH(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_NETH */
-    case 128 + 6:  return spell_RF5_BA_WATE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_WATE */
-    case 128 + 7:  return spell_RF5_BA_MANA(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_MANA */
-    case 128 + 8:  return spell_RF5_BA_DARK(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_DARK */
-    case 128 + 9:  return spell_RF5_DRAIN_MANA(y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF5_DRAIN_MANA */
-    case 128 + 10: return spell_RF5_MIND_BLAST(y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF5_MIND_BLAST */
-    case 128 + 11: return spell_RF5_BRAIN_SMASH(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_MIND_BLAST */
-    case 128 + 12: return spell_RF5_CAUSE_1(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_CAUSE_1 */
-    case 128 + 13: return spell_RF5_CAUSE_2(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_CAUSE_2 */
-    case 128 + 14: return spell_RF5_CAUSE_3(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_CAUSE_3 */
-    case 128 + 15: return spell_RF5_CAUSE_4(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_CAUSE_4 */
-    case 128 + 16: return spell_RF5_BO_ACID(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_ACID */
-    case 128 + 17: return spell_RF5_BO_ELEC(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_ELEC */
-    case 128 + 18: return spell_RF5_BO_FIRE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_FIRE */
-    case 128 + 19: return spell_RF5_BO_COLD(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_COLD */
-    case 128 + 20: return spell_RF5_BA_LITE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_LITE */
-    case 128 + 21: return spell_RF5_BO_NETH(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_NETH */
-    case 128 + 22: return spell_RF5_BO_WATE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_WATE */
-    case 128 + 23: return spell_RF5_BO_MANA(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_MANA */
-    case 128 + 24: return spell_RF5_BO_PLAS(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_PLAS */
-    case 128 + 25: return spell_RF5_BO_ICEE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_ICEE */
-    case 128 + 26: return spell_RF5_MISSILE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_MISSILE */
-    case 128 + 27: spell_RF5_SCARE(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF5_SCARE */
-    case 128 + 28: spell_RF5_BLIND(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF5_BLIND */
-    case 128 + 29: spell_RF5_CONF(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF5_CONF */
-    case 128 + 30: spell_RF5_SLOW(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF5_SLOW */
-    case 128 + 31: spell_RF5_HOLD(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF5_HOLD */
-    case 160 + 0:  spell_RF6_HASTE(m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_HASTE */
-    case 160 + 1:  return spell_RF6_HAND_DOOM(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF6_HAND_DOOM */
-    case 160 + 2:  spell_RF6_HEAL(m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF6_HEAL */
-    case 160 + 3:  spell_RF6_INVULNER(m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF6_INVULNER */
-    case 160 + 4:  spell_RF6_BLINK(m_idx, MONSTER_TO_PLAYER); break;   /* RF6_BLINK */
-    case 160 + 5:  spell_RF6_TPORT(m_idx, MONSTER_TO_PLAYER); break;   /* RF6_TPORT */
-    case 160 + 6:  return spell_RF6_WORLD(m_idx); break;    /* RF6_WORLD */
-    case 160 + 7:  return spell_RF6_SPECIAL(y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF6_SPECIAL */
-    case 160 + 8:  spell_RF6_TELE_TO(m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_TELE_TO */
-    case 160 + 9:  spell_RF6_TELE_AWAY(m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_TELE_AWAY */
-    case 160 + 10: spell_RF6_TELE_LEVEL(m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_TELE_LEVEL */
-    case 160 + 11: spell_RF6_PSY_SPEAR(y, x, m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_PSY_SPEAR */
-    case 160 + 12: spell_RF6_DARKNESS(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF6_DARKNESS */
-    case 160 + 13: spell_RF6_TRAPS(y, x, m_idx); break; /* RF6_TRAPS */
-    case 160 + 14: spell_RF6_FORGET(m_idx); break;  /* RF6_FORGET */
-    case 160 + 15: spell_RF6_RAISE_DEAD(m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_RAISE_DEAD */
-    case 160 + 16: spell_RF6_S_KIN(y, x, m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_S_KIN */
-    case 160 + 17: spell_RF6_S_CYBER(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_CYBER */
-    case 160 + 18: spell_RF6_S_MONSTER(y, x, m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_S_MONSTER */
-    case 160 + 19: spell_RF6_S_MONSTERS(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF6_S_MONSTER */
-    case 160 + 20: spell_RF6_S_ANT(y, x, m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_S_ANT */
-    case 160 + 21: spell_RF6_S_SPIDER(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_S_SPIDER */
-    case 160 + 22: spell_RF6_S_HOUND(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_HOUND */
-    case 160 + 23: spell_RF6_S_HYDRA(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_HYDRA */
-    case 160 + 24: spell_RF6_S_ANGEL(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_ANGEL */
-    case 160 + 25: spell_RF6_S_DEMON(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_DEMON */
-    case 160 + 26: spell_RF6_S_UNDEAD(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_S_UNDEAD */
-    case 160 + 27: spell_RF6_S_DRAGON(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_S_DRAGON */
-    case 160 + 28: spell_RF6_S_HI_UNDEAD(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_HI_UNDEAD */
-    case 160 + 29: spell_RF6_S_HI_DRAGON(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_HI_DRAGON */
-    case 160 + 30: spell_RF6_S_AMBERITES(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_AMBERITES */
-    case 160 + 31: spell_RF6_S_UNIQUE(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_S_UNIQUE */
+    case RF4_SPELL_START + 0:   spell_RF4_SHRIEK(m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF4_SHRIEK */
+    case RF4_SPELL_START + 1:   break;   /* RF4_XXX1 */
+    case RF4_SPELL_START + 2:   spell_RF4_DISPEL(m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF4_DISPEL */
+    case RF4_SPELL_START + 3:   return spell_RF4_ROCKET(y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF4_ROCKET */
+    case RF4_SPELL_START + 4:   return spell_RF4_SHOOT(y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_SHOOT */
+    case RF4_SPELL_START + 5:   break;   /* RF4_XXX2 */
+    case RF4_SPELL_START + 6:   break;   /* RF4_XXX3 */
+    case RF4_SPELL_START + 7:   break;   /* RF4_XXX4 */
+    case RF4_SPELL_START + 8:   return spell_RF4_BREATH(GF_ACID, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_ACID */
+    case RF4_SPELL_START + 9:   return spell_RF4_BREATH(GF_ELEC, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_ELEC */
+    case RF4_SPELL_START + 10:  return spell_RF4_BREATH(GF_FIRE, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_FIRE */
+    case RF4_SPELL_START + 11:  return spell_RF4_BREATH(GF_COLD, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_COLD */
+    case RF4_SPELL_START + 12:  return spell_RF4_BREATH(GF_POIS, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_POIS */
+    case RF4_SPELL_START + 13:  return spell_RF4_BREATH(GF_NETHER, y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_BR_NETH */
+    case RF4_SPELL_START + 14:  return spell_RF4_BREATH(GF_LITE, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_LITE */
+    case RF4_SPELL_START + 15:  return spell_RF4_BREATH(GF_DARK, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_DARK */
+    case RF4_SPELL_START + 16:  return spell_RF4_BREATH(GF_CONFUSION, y, x, m_idx, 0, MONSTER_TO_PLAYER);    /* RF4_BR_CONF */
+    case RF4_SPELL_START + 17:  return spell_RF4_BREATH(GF_SOUND, y, x, m_idx, 0, MONSTER_TO_PLAYER);    /* RF4_BR_SOUN */
+    case RF4_SPELL_START + 18:  return spell_RF4_BREATH(GF_CHAOS, y, x, m_idx, 0, MONSTER_TO_PLAYER);    /* RF4_BR_CHAO */
+    case RF4_SPELL_START + 19:  return spell_RF4_BREATH(GF_DISENCHANT, y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_BR_DISE */
+    case RF4_SPELL_START + 20:  return spell_RF4_BREATH(GF_NEXUS, y, x, m_idx, 0, MONSTER_TO_PLAYER);    /* RF4_BR_NEXU */
+    case RF4_SPELL_START + 21:  return spell_RF4_BREATH(GF_TIME, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_TIME */
+    case RF4_SPELL_START + 22:  return spell_RF4_BREATH(GF_INERTIA, y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF4_BR_INER */
+    case RF4_SPELL_START + 23:  return spell_RF4_BREATH(GF_GRAVITY, y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF4_BR_GRAV */
+    case RF4_SPELL_START + 24:  return spell_RF4_BREATH(GF_SHARDS, y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_BR_SHAR */
+    case RF4_SPELL_START + 25:  return spell_RF4_BREATH(GF_PLASMA, y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_BR_PLAS */
+    case RF4_SPELL_START + 26:  return spell_RF4_BREATH(GF_FORCE, y, x, m_idx, 0, MONSTER_TO_PLAYER);    /* RF4_BR_WALL */
+    case RF4_SPELL_START + 27:  return spell_RF4_BREATH(GF_MANA, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_MANA */
+    case RF4_SPELL_START + 28:  return spell_RF4_BA_NUKE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BA_NUKE */
+    case RF4_SPELL_START + 29:  return spell_RF4_BREATH(GF_NUKE, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_NUKE */
+    case RF4_SPELL_START + 30:  return spell_RF4_BA_CHAO(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BA_CHAO */
+    case RF4_SPELL_START + 31:  return spell_RF4_BREATH(GF_DISINTEGRATE, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_DISI */
+    case RF5_SPELL_START + 0:  return spell_RF5_BA_ACID(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_ACID */
+    case RF5_SPELL_START + 1:  return spell_RF5_BA_ELEC(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_ELEC */
+    case RF5_SPELL_START + 2:  return spell_RF5_BA_FIRE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_FIRE */
+    case RF5_SPELL_START + 3:  return spell_RF5_BA_COLD(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_COLD */
+    case RF5_SPELL_START + 4:  return spell_RF5_BA_POIS(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_POIS */
+    case RF5_SPELL_START + 5:  return spell_RF5_BA_NETH(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_NETH */
+    case RF5_SPELL_START + 6:  return spell_RF5_BA_WATE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_WATE */
+    case RF5_SPELL_START + 7:  return spell_RF5_BA_MANA(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_MANA */
+    case RF5_SPELL_START + 8:  return spell_RF5_BA_DARK(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_DARK */
+    case RF5_SPELL_START + 9:  return spell_RF5_DRAIN_MANA(y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF5_DRAIN_MANA */
+    case RF5_SPELL_START + 10: return spell_RF5_MIND_BLAST(y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF5_MIND_BLAST */
+    case RF5_SPELL_START + 11: return spell_RF5_BRAIN_SMASH(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_MIND_BLAST */
+    case RF5_SPELL_START + 12: return spell_RF5_CAUSE_1(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_CAUSE_1 */
+    case RF5_SPELL_START + 13: return spell_RF5_CAUSE_2(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_CAUSE_2 */
+    case RF5_SPELL_START + 14: return spell_RF5_CAUSE_3(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_CAUSE_3 */
+    case RF5_SPELL_START + 15: return spell_RF5_CAUSE_4(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_CAUSE_4 */
+    case RF5_SPELL_START + 16: return spell_RF5_BO_ACID(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_ACID */
+    case RF5_SPELL_START + 17: return spell_RF5_BO_ELEC(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_ELEC */
+    case RF5_SPELL_START + 18: return spell_RF5_BO_FIRE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_FIRE */
+    case RF5_SPELL_START + 19: return spell_RF5_BO_COLD(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_COLD */
+    case RF5_SPELL_START + 20: return spell_RF5_BA_LITE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BA_LITE */
+    case RF5_SPELL_START + 21: return spell_RF5_BO_NETH(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_NETH */
+    case RF5_SPELL_START + 22: return spell_RF5_BO_WATE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_WATE */
+    case RF5_SPELL_START + 23: return spell_RF5_BO_MANA(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_MANA */
+    case RF5_SPELL_START + 24: return spell_RF5_BO_PLAS(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_PLAS */
+    case RF5_SPELL_START + 25: return spell_RF5_BO_ICEE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_ICEE */
+    case RF5_SPELL_START + 26: return spell_RF5_MISSILE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_MISSILE */
+    case RF5_SPELL_START + 27: spell_RF5_SCARE(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF5_SCARE */
+    case RF5_SPELL_START + 28: spell_RF5_BLIND(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF5_BLIND */
+    case RF5_SPELL_START + 29: spell_RF5_CONF(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF5_CONF */
+    case RF5_SPELL_START + 30: spell_RF5_SLOW(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF5_SLOW */
+    case RF5_SPELL_START + 31: spell_RF5_HOLD(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF5_HOLD */
+    case RF6_SPELL_START + 0:  spell_RF6_HASTE(m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_HASTE */
+    case RF6_SPELL_START + 1:  return spell_RF6_HAND_DOOM(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF6_HAND_DOOM */
+    case RF6_SPELL_START + 2:  spell_RF6_HEAL(m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF6_HEAL */
+    case RF6_SPELL_START + 3:  spell_RF6_INVULNER(m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF6_INVULNER */
+    case RF6_SPELL_START + 4:  spell_RF6_BLINK(m_idx, MONSTER_TO_PLAYER); break;   /* RF6_BLINK */
+    case RF6_SPELL_START + 5:  spell_RF6_TPORT(m_idx, MONSTER_TO_PLAYER); break;   /* RF6_TPORT */
+    case RF6_SPELL_START + 6:  return spell_RF6_WORLD(m_idx); break;    /* RF6_WORLD */
+    case RF6_SPELL_START + 7:  return spell_RF6_SPECIAL(y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF6_SPECIAL */
+    case RF6_SPELL_START + 8:  spell_RF6_TELE_TO(m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_TELE_TO */
+    case RF6_SPELL_START + 9:  spell_RF6_TELE_AWAY(m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_TELE_AWAY */
+    case RF6_SPELL_START + 10: spell_RF6_TELE_LEVEL(m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_TELE_LEVEL */
+    case RF6_SPELL_START + 11: spell_RF6_PSY_SPEAR(y, x, m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_PSY_SPEAR */
+    case RF6_SPELL_START + 12: spell_RF6_DARKNESS(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF6_DARKNESS */
+    case RF6_SPELL_START + 13: spell_RF6_TRAPS(y, x, m_idx); break; /* RF6_TRAPS */
+    case RF6_SPELL_START + 14: spell_RF6_FORGET(m_idx); break;  /* RF6_FORGET */
+    case RF6_SPELL_START + 15: spell_RF6_RAISE_DEAD(m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_RAISE_DEAD */
+    case RF6_SPELL_START + 16: spell_RF6_S_KIN(y, x, m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_S_KIN */
+    case RF6_SPELL_START + 17: spell_RF6_S_CYBER(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_CYBER */
+    case RF6_SPELL_START + 18: spell_RF6_S_MONSTER(y, x, m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_S_MONSTER */
+    case RF6_SPELL_START + 19: spell_RF6_S_MONSTERS(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;    /* RF6_S_MONSTER */
+    case RF6_SPELL_START + 20: spell_RF6_S_ANT(y, x, m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_S_ANT */
+    case RF6_SPELL_START + 21: spell_RF6_S_SPIDER(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_S_SPIDER */
+    case RF6_SPELL_START + 22: spell_RF6_S_HOUND(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_HOUND */
+    case RF6_SPELL_START + 23: spell_RF6_S_HYDRA(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_HYDRA */
+    case RF6_SPELL_START + 24: spell_RF6_S_ANGEL(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_ANGEL */
+    case RF6_SPELL_START + 25: spell_RF6_S_DEMON(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_DEMON */
+    case RF6_SPELL_START + 26: spell_RF6_S_UNDEAD(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_S_UNDEAD */
+    case RF6_SPELL_START + 27: spell_RF6_S_DRAGON(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_S_DRAGON */
+    case RF6_SPELL_START + 28: spell_RF6_S_HI_UNDEAD(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_HI_UNDEAD */
+    case RF6_SPELL_START + 29: spell_RF6_S_HI_DRAGON(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_HI_DRAGON */
+    case RF6_SPELL_START + 30: spell_RF6_S_AMBERITES(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;   /* RF6_S_AMBERITES */
+    case RF6_SPELL_START + 31: spell_RF6_S_UNIQUE(y, x, m_idx, 0, MONSTER_TO_PLAYER); break;  /* RF6_S_UNIQUE */
     }
     return 0;
 }
 
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼¤«¤é¥â¥ó¥¹¥¿¡¼¤Ø¤Î¼öʸ¤Î¿¶¤êʬ¤±´Ø¿ô¡£ /
+* @param y ÂоݤÎÃÏÅÀ¤ÎyºÂɸ
+* @param x ÂоݤÎÃÏÅÀ¤ÎxºÂɸ
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param m_idx ¼öʸ¤ò¼õ¤±¤ë¥â¥ó¥¹¥¿¡¼ID
+* @return ¹¶·â¼öʸ¤Î¥À¥á¡¼¥¸¡¢¤Þ¤¿¤Ï¾¤´­¤·¤¿¥â¥ó¥¹¥¿¡¼¤Î¿ô¤òÊÖ¤¹¡£¤½¤Î¾¤Î¾ì¹ç0¡£°Ê¹ß¤Î½èÍý¤òÃæÃǤ¹¤ë¤Ê¤é-1¤òÊÖ¤¹¡£
+*/
 int monspell_to_monster(int SPELL_NUM, int y, int x, int m_idx, int t_idx)
 {
     switch (SPELL_NUM)
     {
-    case 96 + 0:   spell_RF4_SHRIEK(m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF4_SHRIEK */
-    case 96 + 1:   return -1;   /* RF4_XXX1 */
-    case 96 + 2:   spell_RF4_DISPEL(m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF4_DISPEL */
-    case 96 + 3:   return spell_RF4_ROCKET(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF4_ROCKET */
-    case 96 + 4:   return spell_RF4_SHOOT(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_SHOOT */
-    case 96 + 5:   return -1;   /* RF4_XXX2 */
-    case 96 + 6:   return -1;   /* RF4_XXX3 */
-    case 96 + 7:   return -1;   /* RF4_XXX4 */
-    case 96 + 8:   return spell_RF4_BREATH(GF_ACID, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_ACID */
-    case 96 + 9:   return spell_RF4_BREATH(GF_ELEC, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_ELEC */
-    case 96 + 10:  return spell_RF4_BREATH(GF_FIRE, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_FIRE */
-    case 96 + 11:  return spell_RF4_BREATH(GF_COLD, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_COLD */
-    case 96 + 12:  return spell_RF4_BREATH(GF_POIS, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_POIS */
-    case 96 + 13:  return spell_RF4_BREATH(GF_NETHER, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_BR_NETH */
-    case 96 + 14:  return spell_RF4_BREATH(GF_LITE, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_LITE */
-    case 96 + 15:  return spell_RF4_BREATH(GF_DARK, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_DARK */
-    case 96 + 16:  return spell_RF4_BREATH(GF_CONFUSION, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF4_BR_CONF */
-    case 96 + 17:  return spell_RF4_BREATH(GF_SOUND, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF4_BR_SOUN */
-    case 96 + 18:  return spell_RF4_BREATH(GF_CHAOS, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF4_BR_CHAO */
-    case 96 + 19:  return spell_RF4_BREATH(GF_DISENCHANT, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_BR_DISE */
-    case 96 + 20:  return spell_RF4_BREATH(GF_NEXUS, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF4_BR_NEXU */
-    case 96 + 21:  return spell_RF4_BREATH(GF_TIME, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_TIME */
-    case 96 + 22:  return spell_RF4_BREATH(GF_INERTIA, y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF4_BR_INER */
-    case 96 + 23:  return spell_RF4_BREATH(GF_GRAVITY, y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF4_BR_GRAV */
-    case 96 + 24:  return spell_RF4_BREATH(GF_SHARDS, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_BR_SHAR */
-    case 96 + 25:  return spell_RF4_BREATH(GF_PLASMA, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_BR_PLAS */
-    case 96 + 26:  return spell_RF4_BREATH(GF_FORCE, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF4_BR_WALL */
-    case 96 + 27:  return spell_RF4_BREATH(GF_MANA, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_MANA */
-    case 96 + 28:  return spell_RF4_BA_NUKE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BA_NUKE */
-    case 96 + 29:  return spell_RF4_BREATH(GF_NUKE, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_NUKE */
-    case 96 + 30:  return spell_RF4_BA_CHAO(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BA_CHAO */
-    case 96 + 31:  return spell_RF4_BREATH(GF_DISINTEGRATE, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_DISI */
-    case 128 + 0:  return spell_RF5_BA_ACID(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_ACID */
-    case 128 + 1:  return spell_RF5_BA_ELEC(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_ELEC */
-    case 128 + 2:  return spell_RF5_BA_FIRE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_FIRE */
-    case 128 + 3:  return spell_RF5_BA_COLD(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_COLD */
-    case 128 + 4:  return spell_RF5_BA_POIS(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_POIS */
-    case 128 + 5:  return spell_RF5_BA_NETH(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_NETH */
-    case 128 + 6:  return spell_RF5_BA_WATE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_WATE */
-    case 128 + 7:  return spell_RF5_BA_MANA(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_MANA */
-    case 128 + 8:  return spell_RF5_BA_DARK(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_DARK */
-    case 128 + 9:  return spell_RF5_DRAIN_MANA(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF5_DRAIN_MANA */
-    case 128 + 10: return spell_RF5_MIND_BLAST(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF5_MIND_BLAST */
-    case 128 + 11: return spell_RF5_BRAIN_SMASH(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BRAIN_SMASH */
-    case 128 + 12: return spell_RF5_CAUSE_1(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_CAUSE_1 */
-    case 128 + 13: return spell_RF5_CAUSE_2(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_CAUSE_2 */
-    case 128 + 14: return spell_RF5_CAUSE_3(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_CAUSE_3 */
-    case 128 + 15: return spell_RF5_CAUSE_4(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_CAUSE_4 */
-    case 128 + 16: return spell_RF5_BO_ACID(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_ACID */
-    case 128 + 17: return spell_RF5_BO_ELEC(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_ELEC */
-    case 128 + 18: return spell_RF5_BO_FIRE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_FIRE */
-    case 128 + 19: return spell_RF5_BO_COLD(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_COLD */
-    case 128 + 20: return spell_RF5_BA_LITE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_LITE */
-    case 128 + 21: return spell_RF5_BO_NETH(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_NETH */
-    case 128 + 22: return spell_RF5_BO_WATE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_WATE */
-    case 128 + 23: return spell_RF5_BO_MANA(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_MANA */
-    case 128 + 24: return spell_RF5_BO_PLAS(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_PLAS */
-    case 128 + 25: return spell_RF5_BO_ICEE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_ICEE */
-    case 128 + 26: return spell_RF5_MISSILE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_MISSILE */
-    case 128 + 27: spell_RF5_SCARE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF5_SCARE */
-    case 128 + 28: spell_RF5_BLIND(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF5_BLIND */
-    case 128 + 29: spell_RF5_CONF(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF5_CONF */
-    case 128 + 30: spell_RF5_SLOW(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF5_SLOW */
-    case 128 + 31: spell_RF5_HOLD(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF5_HOLD */
-    case 160 + 0:  spell_RF6_HASTE(m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_HASTE */
-    case 160 + 1:  return spell_RF6_HAND_DOOM(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF6_HAND_DOOM */
-    case 160 + 2:  spell_RF6_HEAL(m_idx, t_idx, MONSTER_TO_MONSTER); break;    /* RF6_HEAL */
-    case 160 + 3:  spell_RF6_INVULNER(m_idx, t_idx, MONSTER_TO_MONSTER); break;    /* RF6_INVULNER */
-    case 160 + 4:  spell_RF6_BLINK(m_idx, MONSTER_TO_MONSTER); break;   /* RF6_BLINK */
-    case 160 + 5:  spell_RF6_TPORT(m_idx, MONSTER_TO_MONSTER); break;   /* RF6_TPORT */
-    case 160 + 6:  return -1; break;    /* RF6_WORLD */
-    case 160 + 7:  return spell_RF6_SPECIAL(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF6_SPECIAL */
-    case 160 + 8:  spell_RF6_TELE_TO(m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_TELE_TO */
-    case 160 + 9:  spell_RF6_TELE_AWAY(m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_TELE_AWAY */
-    case 160 + 10: spell_RF6_TELE_LEVEL(m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_TELE_LEVEL */
-    case 160 + 11: spell_RF6_PSY_SPEAR(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_PSY_SPEAR */
-    case 160 + 12: spell_RF6_DARKNESS(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;    /* RF6_DARKNESS */
-    case 160 + 13: return -1; /* RF6_TRAPS */
-    case 160 + 14: return -1;  /* RF6_FORGET */
-    case 160 + 15: spell_RF6_RAISE_DEAD(m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_RAISE_DEAD */
-    case 160 + 16: spell_RF6_S_KIN(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_S_KIN */
-    case 160 + 17: spell_RF6_S_CYBER(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_CYBER */
-    case 160 + 18: spell_RF6_S_MONSTER(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_S_MONSTER */
-    case 160 + 19: spell_RF6_S_MONSTERS(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;    /* RF6_S_MONSTER */
-    case 160 + 20: spell_RF6_S_ANT(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_S_ANT */
-    case 160 + 21: spell_RF6_S_SPIDER(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_S_SPIDER */
-    case 160 + 22: spell_RF6_S_HOUND(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_HOUND */
-    case 160 + 23: spell_RF6_S_HYDRA(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_HYDRA */
-    case 160 + 24: spell_RF6_S_ANGEL(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_ANGEL */
-    case 160 + 25: spell_RF6_S_DEMON(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_DEMON */
-    case 160 + 26: spell_RF6_S_UNDEAD(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_S_UNDEAD */
-    case 160 + 27: spell_RF6_S_DRAGON(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_S_DRAGON */
-    case 160 + 28: spell_RF6_S_HI_UNDEAD(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_HI_UNDEAD */
-    case 160 + 29: spell_RF6_S_HI_DRAGON(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_HI_DRAGON */
-    case 160 + 30: spell_RF6_S_AMBERITES(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_AMBERITES */
-    case 160 + 31: spell_RF6_S_UNIQUE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_S_UNIQUE */
+    case RF4_SPELL_START + 0:   spell_RF4_SHRIEK(m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF4_SHRIEK */
+    case RF4_SPELL_START + 1:   return -1;   /* RF4_XXX1 */
+    case RF4_SPELL_START + 2:   spell_RF4_DISPEL(m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF4_DISPEL */
+    case RF4_SPELL_START + 3:   return spell_RF4_ROCKET(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF4_ROCKET */
+    case RF4_SPELL_START + 4:   return spell_RF4_SHOOT(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_SHOOT */
+    case RF4_SPELL_START + 5:   return -1;   /* RF4_XXX2 */
+    case RF4_SPELL_START + 6:   return -1;   /* RF4_XXX3 */
+    case RF4_SPELL_START + 7:   return -1;   /* RF4_XXX4 */
+    case RF4_SPELL_START + 8:   return spell_RF4_BREATH(GF_ACID, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_ACID */
+    case RF4_SPELL_START + 9:   return spell_RF4_BREATH(GF_ELEC, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_ELEC */
+    case RF4_SPELL_START + 10:  return spell_RF4_BREATH(GF_FIRE, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_FIRE */
+    case RF4_SPELL_START + 11:  return spell_RF4_BREATH(GF_COLD, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_COLD */
+    case RF4_SPELL_START + 12:  return spell_RF4_BREATH(GF_POIS, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_POIS */
+    case RF4_SPELL_START + 13:  return spell_RF4_BREATH(GF_NETHER, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_BR_NETH */
+    case RF4_SPELL_START + 14:  return spell_RF4_BREATH(GF_LITE, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_LITE */
+    case RF4_SPELL_START + 15:  return spell_RF4_BREATH(GF_DARK, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_DARK */
+    case RF4_SPELL_START + 16:  return spell_RF4_BREATH(GF_CONFUSION, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF4_BR_CONF */
+    case RF4_SPELL_START + 17:  return spell_RF4_BREATH(GF_SOUND, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF4_BR_SOUN */
+    case RF4_SPELL_START + 18:  return spell_RF4_BREATH(GF_CHAOS, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF4_BR_CHAO */
+    case RF4_SPELL_START + 19:  return spell_RF4_BREATH(GF_DISENCHANT, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_BR_DISE */
+    case RF4_SPELL_START + 20:  return spell_RF4_BREATH(GF_NEXUS, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF4_BR_NEXU */
+    case RF4_SPELL_START + 21:  return spell_RF4_BREATH(GF_TIME, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_TIME */
+    case RF4_SPELL_START + 22:  return spell_RF4_BREATH(GF_INERTIA, y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF4_BR_INER */
+    case RF4_SPELL_START + 23:  return spell_RF4_BREATH(GF_GRAVITY, y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF4_BR_GRAV */
+    case RF4_SPELL_START + 24:  return spell_RF4_BREATH(GF_SHARDS, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_BR_SHAR */
+    case RF4_SPELL_START + 25:  return spell_RF4_BREATH(GF_PLASMA, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_BR_PLAS */
+    case RF4_SPELL_START + 26:  return spell_RF4_BREATH(GF_FORCE, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF4_BR_WALL */
+    case RF4_SPELL_START + 27:  return spell_RF4_BREATH(GF_MANA, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_MANA */
+    case RF4_SPELL_START + 28:  return spell_RF4_BA_NUKE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BA_NUKE */
+    case RF4_SPELL_START + 29:  return spell_RF4_BREATH(GF_NUKE, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_NUKE */
+    case RF4_SPELL_START + 30:  return spell_RF4_BA_CHAO(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BA_CHAO */
+    case RF4_SPELL_START + 31:  return spell_RF4_BREATH(GF_DISINTEGRATE, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_DISI */
+    case RF5_SPELL_START + 0:  return spell_RF5_BA_ACID(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_ACID */
+    case RF5_SPELL_START + 1:  return spell_RF5_BA_ELEC(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_ELEC */
+    case RF5_SPELL_START + 2:  return spell_RF5_BA_FIRE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_FIRE */
+    case RF5_SPELL_START + 3:  return spell_RF5_BA_COLD(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_COLD */
+    case RF5_SPELL_START + 4:  return spell_RF5_BA_POIS(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_POIS */
+    case RF5_SPELL_START + 5:  return spell_RF5_BA_NETH(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_NETH */
+    case RF5_SPELL_START + 6:  return spell_RF5_BA_WATE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_WATE */
+    case RF5_SPELL_START + 7:  return spell_RF5_BA_MANA(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_MANA */
+    case RF5_SPELL_START + 8:  return spell_RF5_BA_DARK(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_DARK */
+    case RF5_SPELL_START + 9:  return spell_RF5_DRAIN_MANA(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF5_DRAIN_MANA */
+    case RF5_SPELL_START + 10: return spell_RF5_MIND_BLAST(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF5_MIND_BLAST */
+    case RF5_SPELL_START + 11: return spell_RF5_BRAIN_SMASH(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BRAIN_SMASH */
+    case RF5_SPELL_START + 12: return spell_RF5_CAUSE_1(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_CAUSE_1 */
+    case RF5_SPELL_START + 13: return spell_RF5_CAUSE_2(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_CAUSE_2 */
+    case RF5_SPELL_START + 14: return spell_RF5_CAUSE_3(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_CAUSE_3 */
+    case RF5_SPELL_START + 15: return spell_RF5_CAUSE_4(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_CAUSE_4 */
+    case RF5_SPELL_START + 16: return spell_RF5_BO_ACID(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_ACID */
+    case RF5_SPELL_START + 17: return spell_RF5_BO_ELEC(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_ELEC */
+    case RF5_SPELL_START + 18: return spell_RF5_BO_FIRE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_FIRE */
+    case RF5_SPELL_START + 19: return spell_RF5_BO_COLD(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_COLD */
+    case RF5_SPELL_START + 20: return spell_RF5_BA_LITE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BA_LITE */
+    case RF5_SPELL_START + 21: return spell_RF5_BO_NETH(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_NETH */
+    case RF5_SPELL_START + 22: return spell_RF5_BO_WATE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_WATE */
+    case RF5_SPELL_START + 23: return spell_RF5_BO_MANA(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_MANA */
+    case RF5_SPELL_START + 24: return spell_RF5_BO_PLAS(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_PLAS */
+    case RF5_SPELL_START + 25: return spell_RF5_BO_ICEE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_BO_ICEE */
+    case RF5_SPELL_START + 26: return spell_RF5_MISSILE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF5_MISSILE */
+    case RF5_SPELL_START + 27: spell_RF5_SCARE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF5_SCARE */
+    case RF5_SPELL_START + 28: spell_RF5_BLIND(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF5_BLIND */
+    case RF5_SPELL_START + 29: spell_RF5_CONF(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF5_CONF */
+    case RF5_SPELL_START + 30: spell_RF5_SLOW(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF5_SLOW */
+    case RF5_SPELL_START + 31: spell_RF5_HOLD(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF5_HOLD */
+    case RF6_SPELL_START + 0:  spell_RF6_HASTE(m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_HASTE */
+    case RF6_SPELL_START + 1:  return spell_RF6_HAND_DOOM(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF6_HAND_DOOM */
+    case RF6_SPELL_START + 2:  spell_RF6_HEAL(m_idx, t_idx, MONSTER_TO_MONSTER); break;    /* RF6_HEAL */
+    case RF6_SPELL_START + 3:  spell_RF6_INVULNER(m_idx, t_idx, MONSTER_TO_MONSTER); break;    /* RF6_INVULNER */
+    case RF6_SPELL_START + 4:  spell_RF6_BLINK(m_idx, MONSTER_TO_MONSTER); break;   /* RF6_BLINK */
+    case RF6_SPELL_START + 5:  spell_RF6_TPORT(m_idx, MONSTER_TO_MONSTER); break;   /* RF6_TPORT */
+    case RF6_SPELL_START + 6:  return -1; break;    /* RF6_WORLD */
+    case RF6_SPELL_START + 7:  return spell_RF6_SPECIAL(y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF6_SPECIAL */
+    case RF6_SPELL_START + 8:  spell_RF6_TELE_TO(m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_TELE_TO */
+    case RF6_SPELL_START + 9:  spell_RF6_TELE_AWAY(m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_TELE_AWAY */
+    case RF6_SPELL_START + 10: spell_RF6_TELE_LEVEL(m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_TELE_LEVEL */
+    case RF6_SPELL_START + 11: spell_RF6_PSY_SPEAR(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_PSY_SPEAR */
+    case RF6_SPELL_START + 12: spell_RF6_DARKNESS(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;    /* RF6_DARKNESS */
+    case RF6_SPELL_START + 13: return -1; /* RF6_TRAPS */
+    case RF6_SPELL_START + 14: return -1;  /* RF6_FORGET */
+    case RF6_SPELL_START + 15: spell_RF6_RAISE_DEAD(m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_RAISE_DEAD */
+    case RF6_SPELL_START + 16: spell_RF6_S_KIN(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_S_KIN */
+    case RF6_SPELL_START + 17: spell_RF6_S_CYBER(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_CYBER */
+    case RF6_SPELL_START + 18: spell_RF6_S_MONSTER(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_S_MONSTER */
+    case RF6_SPELL_START + 19: spell_RF6_S_MONSTERS(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;    /* RF6_S_MONSTER */
+    case RF6_SPELL_START + 20: spell_RF6_S_ANT(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_S_ANT */
+    case RF6_SPELL_START + 21: spell_RF6_S_SPIDER(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_S_SPIDER */
+    case RF6_SPELL_START + 22: spell_RF6_S_HOUND(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_HOUND */
+    case RF6_SPELL_START + 23: spell_RF6_S_HYDRA(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_HYDRA */
+    case RF6_SPELL_START + 24: spell_RF6_S_ANGEL(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_ANGEL */
+    case RF6_SPELL_START + 25: spell_RF6_S_DEMON(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_DEMON */
+    case RF6_SPELL_START + 26: spell_RF6_S_UNDEAD(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_S_UNDEAD */
+    case RF6_SPELL_START + 27: spell_RF6_S_DRAGON(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_S_DRAGON */
+    case RF6_SPELL_START + 28: spell_RF6_S_HI_UNDEAD(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_HI_UNDEAD */
+    case RF6_SPELL_START + 29: spell_RF6_S_HI_DRAGON(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_HI_DRAGON */
+    case RF6_SPELL_START + 30: spell_RF6_S_AMBERITES(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_S_AMBERITES */
+    case RF6_SPELL_START + 31: spell_RF6_S_UNIQUE(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_S_UNIQUE */
     }
     return 0;
-}
\ No newline at end of file
+}
+
+/*!
+* @brief ¥â¥ó¥¹¥¿¡¼¤Î»È¤¦¼öʸ¤Î°ÒÎϤòÊÖ¤¹ /
+* @param m_idx ¼öʸ¤ò¾§¤¨¤ë¥â¥ó¥¹¥¿¡¼ID
+* @param TYPE  DAM_MAX¤ÇºÇÂçÃͤòÊÖ¤·¡¢DAM_MIN¤ÇºÇ¾®ÃͤòÊÖ¤¹¡£DAM_ROLL¤Ï¥À¥¤¥¹¤ò¿¶¤Ã¤ÆÃͤò·èÄꤹ¤ë¡£
+* @return ¹¶·â¼öʸ¤Î¥À¥á¡¼¥¸¤òÊÖ¤¹¡£¹¶·â¼öʸ°Ê³°¤Ï-1¤òÊÖ¤¹¡£
+*/
+int monspell_damage(int SPELL_NUM, int m_idx, int TYPE)
+{
+    monster_type    *m_ptr = &m_list[m_idx];
+    monster_race    *r_ptr = &r_info[m_ptr->r_idx];
+    int hp, dam = 0, dice_num = 0, dice_side = 0, mult = 1, div = 1;
+    int rlev = monster_level_idx(m_idx);
+
+    if (TYPE == DAM_MAX)
+    {
+        hp = m_ptr->max_maxhp;
+    }
+    else if (TYPE == DAM_ROLL)
+    {
+        hp = m_ptr->hp;
+    }
+
+    switch (SPELL_NUM)
+    {
+    case RF4_SPELL_START + 0:   return -1;   /* RF4_SHRIEK */
+    case RF4_SPELL_START + 1:   return -1;   /* RF4_XXX1 */
+    case RF4_SPELL_START + 2:   return -1;   /* RF4_DISPEL */
+
+        /* RF4_ROCKET */
+    case RF4_SPELL_START + 3:
+        dam = (hp / 4) > 800 ? 800 : (hp / 4);
+        break;
+
+        /* RF4_SHOOT */
+    case RF4_SPELL_START + 4:
+        dice_num = r_ptr->blow[0].d_dice;
+        dice_side = r_ptr->blow[0].d_side;
+        break;
+    case RF4_SPELL_START + 5:   return -1;   /* RF4_XXX2 */
+    case RF4_SPELL_START + 6:   return -1;   /* RF4_XXX3 */
+    case RF4_SPELL_START + 7:   return -1;   /* RF4_XXX4 */
+
+        /* RF4_BR_ACID */
+        /* RF4_BR_ELEC */
+        /* RF4_BR_FIRE */
+        /* RF4_BR_COLD */
+    case RF4_SPELL_START + 8:
+    case RF4_SPELL_START + 9:
+    case RF4_SPELL_START + 10:
+    case RF4_SPELL_START + 11:
+        dam = ((hp / 3) > 1600 ? 1600 : (hp / 3));
+        break;
+
+        /* RF4_BR_POIS */
+    case RF4_SPELL_START + 12:
+        dam = ((hp / 3) > 800 ? 800 : (hp / 3));
+        break;
+
+        /* RF4_BR_NETH */
+    case RF4_SPELL_START + 13:
+        dam = ((hp / 6) > 550 ? 550 : (hp / 6));
+        break;
+
+        /* RF4_BR_LITE */
+        /* RF4_BR_DARK */
+    case RF4_SPELL_START + 14:
+    case RF4_SPELL_START + 15:
+        dam = ((hp / 6) > 400 ? 400 : (hp / 6));
+        break;
+
+        /* RF4_BR_CONF */
+        /* RF4_BR_SOUN */
+    case RF4_SPELL_START + 16:
+    case RF4_SPELL_START + 17:
+        dam = ((hp / 6) > 450 ? 450 : (hp / 6));
+        break;
+
+        /* RF4_BR_CHAO */
+    case RF4_SPELL_START + 18:
+        dam = ((hp / 6) > 600 ? 600 : (hp / 6));
+        break;
+
+        /* RF4_BR_DISE */
+    case RF4_SPELL_START + 19:
+        dam = ((hp / 6) > 500 ? 500 : (hp / 6));
+        break;
+
+        /* RF4_BR_NEXU */
+    case RF4_SPELL_START + 20:
+        dam = ((hp / 3) > 250 ? 250 : (hp / 3));
+        break;
+
+        /* RF4_BR_TIME */
+    case RF4_SPELL_START + 21:
+        dam = ((hp / 3) > 150 ? 150 : (hp / 3));
+        break;
+
+        /* RF4_BR_INER */
+        /* RF4_BR_GRAV */
+    case RF4_SPELL_START + 22:
+    case RF4_SPELL_START + 23:
+        dam = ((hp / 6) > 200 ? 200 : (hp / 6));
+        break;
+
+        /* RF4_BR_SHAR */
+    case RF4_SPELL_START + 24:
+        dam = ((hp / 6) > 500 ? 500 : (hp / 6));
+        break;
+
+        /* RF4_BR_PLAS */
+    case RF4_SPELL_START + 25:
+        dam = ((hp / 6) > 150 ? 150 : (hp / 6));
+        break;
+
+        /* RF4_BR_WALL */
+    case RF4_SPELL_START + 26:
+        dam = ((hp / 6) > 200 ? 200 : (hp / 6));
+        break;
+
+        /* RF4_BR_MANA */
+    case RF4_SPELL_START + 27:
+        dam = ((hp / 3) > 250 ? 250 : (hp / 3));
+        break;
+
+        /* RF4_BA_NUKE */
+    case RF4_SPELL_START + 28:
+        mult = monster_is_powerful(m_idx) ? 2 : 1;
+        dam = rlev * (mult / div);
+        dice_num = 10;
+        dice_side = 6;
+        break;
+
+        /* RF4_BR_NUKE */
+    case RF4_SPELL_START + 29:
+        dam = ((hp / 3) > 800 ? 800 : (hp / 3));
+        break;
+
+        /* RF4_BA_CHAO */
+    case RF4_SPELL_START + 30:
+        dam = (monster_is_powerful(m_idx) ? (rlev * 3) : (rlev * 2));
+        dice_num = 10;
+        dice_side = 10;
+        break;
+
+        /* RF4_BR_DISI */
+    case RF4_SPELL_START + 31:
+        dam = ((hp / 6) > 150 ? 150 : (hp / 6));
+        break;
+
+        /* RF5_BA_ACID */
+    case RF5_SPELL_START + 0:
+        if (monster_is_powerful(m_idx))
+        {
+            dam = (rlev * 4) + 50;
+            dice_num = 10;
+            dice_side = 10;
+        }
+        else
+        {
+            dam = 15;
+            dice_num = 1;
+            dice_side = rlev * 3;
+        }
+        break;
+
+        /* RF5_BA_ELEC */
+    case RF5_SPELL_START + 1:
+        if (monster_is_powerful(m_idx))
+        {
+            dam = (rlev * 4) + 50;
+            dice_num = 10;
+            dice_side = 10;
+        }
+        else
+        {
+            dam = 8;
+            dice_num = 1;
+            dice_side = rlev * 3 / 2;
+        }
+        break;
+
+        /* RF5_BA_FIRE */
+    case RF5_SPELL_START + 2:
+        if (monster_is_powerful(m_idx))
+        {
+            dam = (rlev * 4) + 50;
+            dice_num = 10;
+            dice_side = 10;
+        }
+        else
+        {
+            dam = 10;
+            dice_num = 1;
+            dice_side = rlev * 7 / 2;
+        }
+        break;
+
+        /* RF5_BA_COLD */
+    case RF5_SPELL_START + 3:
+        if (monster_is_powerful(m_idx))
+        {
+            dam = (rlev * 4) + 50;
+            dice_num = 10;
+            dice_side = 10;
+        }
+        else
+        {
+            dam = 10;
+            dice_num = 1;
+            dice_side = rlev * 3 / 2;
+        }
+        break;
+
+        /* RF5_BA_POIS */
+    case RF5_SPELL_START + 4:
+        mult = monster_is_powerful(m_idx) ? 2 : 1;
+        dice_num = 12;
+        dice_side = 2;
+        break;
+
+        /* RF5_BA_NETH */
+    case RF5_SPELL_START + 5:
+        dam = 50 + (rlev * (monster_is_powerful(m_idx) ? 2 : 1));
+        dice_num = 10;
+        dice_side = 10;
+        break;
+
+        /* RF5_BA_WATE */
+    case RF5_SPELL_START + 6:
+        dam = 50;
+        dice_num = 1;
+        dice_side = (monster_is_powerful(m_idx) ? (rlev * 3) : (rlev * 2));
+        break;
+
+        /* RF5_BA_MANA */
+        /* RF5_BA_DARK */
+    case RF5_SPELL_START + 7:
+    case RF5_SPELL_START + 8:
+        dam = (rlev * 4) + 50;
+        dice_num = 10;
+        dice_side = 10;
+        break;
+
+        /* RF5_DRAIN_MANA */
+    case RF5_SPELL_START + 9:
+        dam = 1;
+        div = 2;
+        dice_num = 1;
+        dice_side = rlev;
+        break;
+
+        /* RF5_MIND_BLAST */
+    case RF5_SPELL_START + 10:
+        dice_num = 7;
+        dice_side = 7;
+        break;
+
+        /* RF5_BRAIN_SMASH */
+    case RF5_SPELL_START + 11:
+        dice_num = 12;
+        dice_side = 12;
+        break;
+
+        /* RF5_CAUSE_1 */
+    case RF5_SPELL_START + 12:
+        dice_num = 3;
+        dice_side = 8;
+        break;
+
+        /* RF5_CAUSE_2 */
+    case RF5_SPELL_START + 13:
+        dice_num = 8;
+        dice_side = 8;
+        break;
+
+        /* RF5_CAUSE_3 */
+    case RF5_SPELL_START + 14:
+        dice_num = 10;
+        dice_side = 15;
+        break;
+
+        /* RF5_CAUSE_4 */
+    case RF5_SPELL_START + 15:
+        dice_num = 15;
+        dice_side = 15;
+        break;
+
+        /* RF5_BO_ACID */
+    case RF5_SPELL_START + 16:
+        mult = monster_is_powerful(m_idx) ? 2 : 1;
+        dam = rlev / 3 * (mult / div);
+        dice_num = 7;
+        dice_side = 8;
+        break;
+
+        /* RF5_BO_ELEC */
+    case RF5_SPELL_START + 17:
+        mult = monster_is_powerful(m_idx) ? 2 : 1;
+        dam = rlev / 3 * (mult / div);
+        dice_num = 4;
+        dice_side = 8;
+        break;
+
+        /* RF5_BO_FIRE */
+    case RF5_SPELL_START + 18:
+        mult = monster_is_powerful(m_idx) ? 2 : 1;
+        dam = rlev / 3 * (mult / div);
+        dice_num = 9;
+        dice_side = 8;
+        break;
+
+        /* RF5_BO_COLD */
+    case RF5_SPELL_START + 19:
+        mult = monster_is_powerful(m_idx) ? 2 : 1;
+        dam = rlev / 3 * (mult / div);
+        dice_num = 6;
+        dice_side = 8;
+        break;
+
+        /* RF5_BA_LITE */
+    case RF5_SPELL_START + 20:
+        dam = (rlev * 4) + 50;
+        dice_num = 10;
+        dice_side = 10;
+        break;
+
+        /* RF5_BO_NETH */
+    case RF5_SPELL_START + 21:
+        dam = 30 + (rlev * 4) / (monster_is_powerful(m_idx) ? 2 : 3);
+        dice_num = 5;
+        dice_side = 5;
+        break;
+
+        /* RF5_BO_WATE */
+    case RF5_SPELL_START + 22:
+        dam = (rlev * 3 / (monster_is_powerful(m_idx) ? 2 : 3));
+        dice_num = 10;
+        dice_side = 10;
+        break;
+
+        /* RF5_BO_MANA */
+    case RF5_SPELL_START + 23:
+        dam = 50;
+        dice_num = 1;
+        dice_side = rlev * 7 / 2;
+        break;
+
+        /* RF5_BO_PLAS */
+    case RF5_SPELL_START + 24:
+        dam = 10 + (rlev * 3 / (monster_is_powerful(m_idx) ? 2 : 3));
+        dice_num = 8;
+        dice_side = 7;
+        break;
+
+        /* RF5_BO_ICEE */
+    case RF5_SPELL_START + 25:
+        dam = (rlev * 3 / (monster_is_powerful(m_idx) ? 2 : 3));
+        dice_num = 6;
+        dice_side = 6;
+        break;
+
+        /* RF5_MISSILE */
+    case RF5_SPELL_START + 26:
+        dam = (rlev / 3);
+        dice_num = 2;
+        dice_side = 6;
+        break;
+
+    case RF5_SPELL_START + 27: return -1;   /* RF5_SCARE */
+    case RF5_SPELL_START + 28: return -1;   /* RF5_BLIND */
+    case RF5_SPELL_START + 29: return -1;   /* RF5_CONF */
+    case RF5_SPELL_START + 30: return -1;   /* RF5_SLOW */
+    case RF5_SPELL_START + 31: return -1;   /* RF5_HOLD */
+    case RF6_SPELL_START + 0:  return -1;   /* RF6_HASTE */
+
+        /* RF6_HAND_DOOM */
+    case RF6_SPELL_START + 1:
+        mult = p_ptr->chp;
+        div = 100;
+        dam = 40 * (mult / div);
+        dice_num = 1;
+        dice_side = 20;
+        break;
+
+    case RF6_SPELL_START + 2:  return -1;   /* RF6_HEAL */
+    case RF6_SPELL_START + 3:  return -1;   /* RF6_INVULNER */
+    case RF6_SPELL_START + 4:  return -1;   /* RF6_BLINK */
+    case RF6_SPELL_START + 5:  return -1;   /* RF6_TPORT */
+    case RF6_SPELL_START + 6:  return -1;   /* RF6_WORLD */
+    case RF6_SPELL_START + 7:  return -1;   /* RF6_SPECIAL */
+    case RF6_SPELL_START + 8:  return -1;   /* RF6_TELE_TO */
+    case RF6_SPELL_START + 9:  return -1;   /* RF6_TELE_AWAY */
+    case RF6_SPELL_START + 10: return -1;   /* RF6_TELE_LEVEL */
+
+        /* RF6_PSY_SPEAR */
+    case RF6_SPELL_START + 11:
+        dam = monster_is_powerful(m_idx) ? 150 : 100;
+        dice_num = 1;
+        dice_side = monster_is_powerful(m_idx) ? (rlev * 2) : (rlev * 3 / 2);
+        break;
+
+    case RF6_SPELL_START + 12: return -1;   /* RF6_DARKNESS */
+    case RF6_SPELL_START + 13: return -1;   /* RF6_TRAPS */
+    case RF6_SPELL_START + 14: return -1;   /* RF6_FORGET */
+    case RF6_SPELL_START + 15: return -1;   /* RF6_RAISE_DEAD */
+    case RF6_SPELL_START + 16: return -1;   /* RF6_S_KIN */
+    case RF6_SPELL_START + 17: return -1;   /* RF6_S_CYBER */
+    case RF6_SPELL_START + 18: return -1;   /* RF6_S_MONSTER */
+    case RF6_SPELL_START + 19: return -1;   /* RF6_S_MONSTER */
+    case RF6_SPELL_START + 20: return -1;   /* RF6_S_ANT */
+    case RF6_SPELL_START + 21: return -1;   /* RF6_S_SPIDER */
+    case RF6_SPELL_START + 22: return -1;   /* RF6_S_HOUND */
+    case RF6_SPELL_START + 23: return -1;   /* RF6_S_HYDRA */
+    case RF6_SPELL_START + 24: return -1;   /* RF6_S_ANGEL */
+    case RF6_SPELL_START + 25: return -1;   /* RF6_S_DEMON */
+    case RF6_SPELL_START + 26: return -1;   /* RF6_S_UNDEAD */
+    case RF6_SPELL_START + 27: return -1;   /* RF6_S_DRAGON */
+    case RF6_SPELL_START + 28: return -1;   /* RF6_S_HI_UNDEAD */
+    case RF6_SPELL_START + 29: return -1;   /* RF6_S_HI_DRAGON */
+    case RF6_SPELL_START + 30: return -1;   /* RF6_S_AMBERITES */
+    case RF6_SPELL_START + 31: return -1;   /* RF6_S_UNIQUE */
+    }
+
+    switch (TYPE)
+    {
+    case DAM_MAX: dam += mult / div * maxroll(dice_num, dice_side); break;
+    case DAM_MIN: dam += mult / div * dice_num * 1; break;
+    case DAM_ROLL: dam += mult / div * damroll(dice_num, dice_side); break;
+    }
+
+    return dam;
+}

diff --git a/src/object2.c b/src/object2.c
index fd70402..54c8472 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -6898,18 +6898,15 @@ object_type *choose_warning_item(void)
  * @param m_ptr ËâË¡¤ò¹Ô»È¤¹¤ë¥â¥ó¥¹¥¿¡¼¤Î¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
  * @param typ ¸ú²Ì°À­¤ÎID
  * @param dam ´ðËÜ¥À¥á¡¼¥¸
- * @param limit ¥À¥á¡¼¥¸¤Î¸Â³¦ÃÍ
  * @param max »»½Ð¤·¤¿ºÇÂç¥À¥á¡¼¥¸¤òÊÖ¤¹¥Ý¥¤¥ó¥¿
  * @return ¤Ê¤·
  */
-static void spell_damcalc(monster_type *m_ptr, int typ, int dam, int limit, int *max)
+static void spell_damcalc(monster_type *m_ptr, int typ, int dam, int *max)
 {
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
        int          rlev = r_ptr->level;
        bool         ignore_wraith_form = FALSE;
 
-       if (limit) dam = (dam > limit) ? limit : dam;
-
        /* Vulnerability, resistance and immunity */
        switch (typ)
        {
@@ -7141,6 +7138,23 @@ static void spell_damcalc(monster_type *m_ptr, int typ, int dam, int limit, int
 }
 
 /*!
+* @brief ·Ù¹ð´ð½à¤òÄê¤á¤ë¤¿¤á¤ËËâË¡¤Î¸ú²Ì°À­¤Ë´ð¤Å¤¤¤ÆºÇÂçËâË¡¥À¥á¡¼¥¸¤ò·×»»¤¹¤ë¡£ /
+* Calculate spell damages
+* @param spell_num RF4¤Ê¤éRF4_SPELL_START¤Î¤è¤¦¤Ë32¶èÀÚ¤ê¤Î¥Ù¡¼¥¹¤È¤Ê¤ë¿ôÃÍ
+* @param spell_flag RF4_SHRIEK¤Ê¤É¤Î¥¹¥Ú¥ë¥Õ¥é¥°
+* @param typ ¸ú²Ì°À­¤ÎID
+* @param m_idx ËâË¡¤ò¹Ô»È¤¹¤ë¥â¥ó¥¹¥¿¡¼¤ÎID
+* @param max »»½Ð¤·¤¿ºÇÂç¥À¥á¡¼¥¸¤òÊÖ¤¹¥Ý¥¤¥ó¥¿
+* @return ¤Ê¤·
+*/
+void spell_damcalc_by_spellnum(int spell_num, int spell_flag, int typ, int m_idx, int *max)
+{
+    monster_type *m_ptr = &m_list[m_idx];
+    int dam = monspell_damage(monspell_num(spell_num, spell_flag), m_idx, DAM_MAX);
+    spell_damcalc(m_ptr, typ, dam, max);
+}
+
+/*!
  * @brief ·Ù¹ð´ð½à¤òÄê¤á¤ë¤¿¤á¤Ë¥â¥ó¥¹¥¿¡¼¤ÎÂÇ·âºÇÂç¥À¥á¡¼¥¸¤ò»»½Ð¤¹¤ë /
  * Calculate blow damages
  * @param m_ptr ÂÇ·â¤ò¹Ô»È¤¹¤ë¥â¥ó¥¹¥¿¡¼¤Î¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
@@ -7172,25 +7186,25 @@ static int blow_damcalc(monster_type *m_ptr, monster_blow *blow_ptr)
                        break;
 
                case RBE_ACID:
-                       spell_damcalc(m_ptr, GF_ACID, dam, 0, &dummy_max);
+                       spell_damcalc(m_ptr, GF_ACID, dam, &dummy_max);
                        dam = dummy_max;
                        check_wraith_form = FALSE;
                        break;
 
                case RBE_ELEC:
-                       spell_damcalc(m_ptr, GF_ELEC, dam, 0, &dummy_max);
+                       spell_damcalc(m_ptr, GF_ELEC, dam, &dummy_max);
                        dam = dummy_max;
                        check_wraith_form = FALSE;
                        break;
 
                case RBE_FIRE:
-                       spell_damcalc(m_ptr, GF_FIRE, dam, 0, &dummy_max);
+                       spell_damcalc(m_ptr, GF_FIRE, dam, &dummy_max);
                        dam = dummy_max;
                        check_wraith_form = FALSE;
                        break;
 
                case RBE_COLD:
-                       spell_damcalc(m_ptr, GF_COLD, dam, 0, &dummy_max);
+                       spell_damcalc(m_ptr, GF_COLD, dam, &dummy_max);
                        dam = dummy_max;
                        check_wraith_form = FALSE;
                        break;
@@ -7210,7 +7224,7 @@ static int blow_damcalc(monster_type *m_ptr, monster_blow *blow_ptr)
        else
        {
                dam = (dam + 1) / 2;
-               spell_damcalc(m_ptr, mbe_info[blow_ptr->effect].explode_type, dam, 0, &dummy_max);
+               spell_damcalc(m_ptr, mbe_info[blow_ptr->effect].explode_type, dam, &dummy_max);
                dam = dummy_max;
        }
 
@@ -7257,49 +7271,43 @@ bool process_warning(int xx, int yy)
 
                        /* Monster spells (only powerful ones)*/
                        if (projectable(my, mx, yy, xx))
-                       {
-                               int breath_dam_div3 = m_ptr->hp / 3;
-                               int breath_dam_div6 = m_ptr->hp / 6;
+            {
                                u32b f4 = r_ptr->flags4;
                                u32b f5 = r_ptr->flags5;
                                u32b f6 = r_ptr->flags6;
 
                                if (!(d_info[dungeon_type].flags1 & DF1_NO_MAGIC))
                                {
-                                       int rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
-                                       int storm_dam = rlev * 4 + 150;
-                                       bool powerful = (bool)(r_ptr->flags2 & RF2_POWERFUL);
-
-                                       if (f4 & RF4_BA_CHAO) spell_damcalc(m_ptr, GF_CHAOS, rlev * (powerful ? 3 : 2) + 100, 0, &dam_max0);
-                                       if (f5 & RF5_BA_MANA) spell_damcalc(m_ptr, GF_MANA, storm_dam, 0, &dam_max0);
-                                       if (f5 & RF5_BA_DARK) spell_damcalc(m_ptr, GF_DARK, storm_dam, 0, &dam_max0);
-                                       if (f5 & RF5_BA_LITE) spell_damcalc(m_ptr, GF_LITE, storm_dam, 0, &dam_max0);
-                                       if (f6 & RF6_HAND_DOOM) spell_damcalc(m_ptr, GF_HAND_DOOM, p_ptr->chp * 6 / 10, 0, &dam_max0);
-                                       if (f6 & RF6_PSY_SPEAR) spell_damcalc(m_ptr, GF_PSY_SPEAR, powerful ? (rlev * 2 + 150) : (rlev * 3 / 2 + 100), 0, &dam_max0);
+                    if (f4 & RF4_BA_CHAO) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BA_CHAO, GF_CHAOS, c_ptr->m_idx,  &dam_max0);
+                    if (f5 & RF5_BA_MANA) spell_damcalc_by_spellnum(RF5_SPELL_START, RF5_BA_MANA, GF_MANA, c_ptr->m_idx, &dam_max0);
+                    if (f5 & RF5_BA_DARK) spell_damcalc_by_spellnum(RF5_SPELL_START, RF5_BA_DARK, GF_DARK, c_ptr->m_idx, &dam_max0);
+                    if (f5 & RF5_BA_LITE) spell_damcalc_by_spellnum(RF5_SPELL_START, RF5_BA_LITE, GF_LITE, c_ptr->m_idx, &dam_max0);
+                    if (f6 & RF6_HAND_DOOM) spell_damcalc_by_spellnum(RF6_SPELL_START, RF6_HAND_DOOM, GF_HAND_DOOM, c_ptr->m_idx, &dam_max0);
+                    if (f6 & RF6_PSY_SPEAR) spell_damcalc_by_spellnum(RF6_SPELL_START, RF6_PSY_SPEAR, GF_PSY_SPEAR, c_ptr->m_idx, &dam_max0);
                                }
-                               if (f4 & RF4_ROCKET) spell_damcalc(m_ptr, GF_ROCKET, m_ptr->hp / 4, 800, &dam_max0);
-                               if (f4 & RF4_BR_ACID) spell_damcalc(m_ptr, GF_ACID, breath_dam_div3, 1600, &dam_max0);
-                               if (f4 & RF4_BR_ELEC) spell_damcalc(m_ptr, GF_ELEC, breath_dam_div3, 1600, &dam_max0);
-                               if (f4 & RF4_BR_FIRE) spell_damcalc(m_ptr, GF_FIRE, breath_dam_div3, 1600, &dam_max0);
-                               if (f4 & RF4_BR_COLD) spell_damcalc(m_ptr, GF_COLD, breath_dam_div3, 1600, &dam_max0);
-                               if (f4 & RF4_BR_POIS) spell_damcalc(m_ptr, GF_POIS, breath_dam_div3, 800, &dam_max0);
-                               if (f4 & RF4_BR_NETH) spell_damcalc(m_ptr, GF_NETHER, breath_dam_div6, 550, &dam_max0);
-                               if (f4 & RF4_BR_LITE) spell_damcalc(m_ptr, GF_LITE, breath_dam_div6, 400, &dam_max0);
-                               if (f4 & RF4_BR_DARK) spell_damcalc(m_ptr, GF_DARK, breath_dam_div6, 400, &dam_max0);
-                               if (f4 & RF4_BR_CONF) spell_damcalc(m_ptr, GF_CONFUSION, breath_dam_div6, 450, &dam_max0);
-                               if (f4 & RF4_BR_SOUN) spell_damcalc(m_ptr, GF_SOUND, breath_dam_div6, 450, &dam_max0);
-                               if (f4 & RF4_BR_CHAO) spell_damcalc(m_ptr, GF_CHAOS, breath_dam_div6, 600, &dam_max0);
-                               if (f4 & RF4_BR_DISE) spell_damcalc(m_ptr, GF_DISENCHANT, breath_dam_div6, 500, &dam_max0);
-                               if (f4 & RF4_BR_NEXU) spell_damcalc(m_ptr, GF_NEXUS, breath_dam_div3, 250, &dam_max0);
-                               if (f4 & RF4_BR_TIME) spell_damcalc(m_ptr, GF_TIME, breath_dam_div3, 150, &dam_max0);
-                               if (f4 & RF4_BR_INER) spell_damcalc(m_ptr, GF_INERTIA, breath_dam_div6, 200, &dam_max0);
-                               if (f4 & RF4_BR_GRAV) spell_damcalc(m_ptr, GF_GRAVITY, breath_dam_div3, 200, &dam_max0);
-                               if (f4 & RF4_BR_SHAR) spell_damcalc(m_ptr, GF_SHARDS, breath_dam_div6, 500, &dam_max0);
-                               if (f4 & RF4_BR_PLAS) spell_damcalc(m_ptr, GF_PLASMA, breath_dam_div6, 150, &dam_max0);
-                               if (f4 & RF4_BR_WALL) spell_damcalc(m_ptr, GF_FORCE, breath_dam_div6, 200, &dam_max0);
-                               if (f4 & RF4_BR_MANA) spell_damcalc(m_ptr, GF_MANA, breath_dam_div3, 250, &dam_max0);
-                               if (f4 & RF4_BR_NUKE) spell_damcalc(m_ptr, GF_NUKE, breath_dam_div3, 800, &dam_max0);
-                               if (f4 & RF4_BR_DISI) spell_damcalc(m_ptr, GF_DISINTEGRATE, breath_dam_div6, 150, &dam_max0);
+                if (f4 & RF4_ROCKET) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_ROCKET, GF_ROCKET, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_ACID) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_ACID, GF_ACID, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_ELEC) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_ELEC, GF_ELEC, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_FIRE) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_FIRE, GF_FIRE, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_COLD) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_COLD, GF_COLD, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_POIS) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_POIS, GF_POIS, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_NETH) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_NETH, GF_NETHER, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_LITE) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_LITE, GF_LITE, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_DARK) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_DARK, GF_DARK, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_CONF) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_CONF, GF_CONFUSION, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_SOUN) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_SOUN, GF_SOUND, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_CHAO) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_CHAO, GF_CHAOS, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_DISE) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_DISE, GF_DISENCHANT, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_NEXU) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_NEXU, GF_NEXUS, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_TIME) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_TIME, GF_TIME, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_INER) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_INER, GF_INERTIA, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_GRAV) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_GRAV, GF_GRAVITY, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_SHAR) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_SHAR, GF_SHARDS, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_PLAS) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_PLAS, GF_PLASMA, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_WALL) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_WALL, GF_FORCE, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_MANA) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_MANA, GF_MANA, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_NUKE) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_NUKE, GF_NUKE, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_DISI) spell_damcalc_by_spellnum(RF4_SPELL_START, RF4_BR_DISI, GF_DISINTEGRATE, c_ptr->m_idx, &dam_max0);
                        }
 
                        /* Monster melee attacks */
@@ -7336,20 +7344,14 @@ bool process_warning(int xx, int yy)
                {
                        object_type *o_ptr = choose_warning_item();
 
-                       if (o_ptr) object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
-#ifdef JP
-                       else strcpy(o_name, "ÂÎ"); /* Warning ability without item */
-                       msg_format("%s¤¬±Ô¤¯¿Ì¤¨¤¿¡ª", o_name);
-#else
-                       else strcpy(o_name, "body"); /* Warning ability without item */
-                       msg_format("Your %s pulsates sharply!", o_name);
-#endif
+                       if (o_ptr)
+                object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+            else 
+                strcpy(o_name, _("ÂÎ", "body")); /* Warning ability without item */
+            msg_format(_("%s¤¬±Ô¤¯¿Ì¤¨¤¿¡ª", "Your %s pulsates sharply!"), o_name);
+
                        disturb(0, 1);
-#ifdef JP
-                       return get_check("ËÜÅö¤Ë¤³¤Î¤Þ¤Þ¿Ê¤à¤«¡©");
-#else
-                       return get_check("Really want to go ahead? ");
-#endif
+            return get_check(_("ËÜÅö¤Ë¤³¤Î¤Þ¤Þ¿Ê¤à¤«¡©", "Really want to go ahead? "));
                }
        }
        else old_damage = old_damage / 2;
@@ -7360,20 +7362,13 @@ bool process_warning(int xx, int yy)
        {
                object_type *o_ptr = choose_warning_item();
 
-               if (o_ptr) object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
-#ifdef JP
-               else strcpy(o_name, "ÂÎ"); /* Warning ability without item */
-               msg_format("%s¤¬¿Ì¤¨¤¿¡ª", o_name);
-#else
-               else strcpy(o_name, "body"); /* Warning ability without item */
-               msg_format("Your %s pulsates!", o_name);
-#endif
+               if (o_ptr) 
+            object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+        else
+            strcpy(o_name, _("ÂÎ", "body")); /* Warning ability without item */
+        msg_format(_("%s¤¬±Ô¤¯¿Ì¤¨¤¿¡ª", "Your %s pulsates sharply!"), o_name);
                disturb(0, 1);
-#ifdef JP
-               return get_check("ËÜÅö¤Ë¤³¤Î¤Þ¤Þ¿Ê¤à¤«¡©");
-#else
-               return get_check("Really want to go ahead? ");
-#endif
+        return get_check(_("ËÜÅö¤Ë¤³¤Î¤Þ¤Þ¿Ê¤à¤«¡©", "Really want to go ahead? "));
        }
 
        return TRUE;