--- a/Actor.cpp	Fri Oct 25 23:14:53 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 23:52:16 2013 -0700
@@ -4279,13 +4279,13 @@
 
   switch(a2)
   {
-  case 77:
+  case SPELL_BODY_POWER_CURE:
     {
       if ( this->sCurrentHP >= (signed int)this->pMonsterInfo.uHP )
         return 0;
       return 1;
     }
-  case 80:
+  case SPELL_LIGHT_DISPEL_MAGIC:
     {
       v6 = pParty->pPartyBuffs.data();
       while ( (signed __int64)v6->uExpireTime <= 0 )
@@ -4294,6 +4294,7 @@
         if ( v6 > &pParty->pPartyBuffs[PARTY_BUFF_WIZARD_EYE] )
         {
           v7 = pParty->pPlayers.data();//[0].pPlayerBuffs;
+LABEL_50:
           v8 = 0;
           v9 = v7->pPlayerBuffs.data();
           while ( v9->uExpireTime <= 0i64 )
@@ -4304,12 +4305,8 @@
             {
               ++v7;
               if ( v7 <= &pParty->pPlayers[3] )
-              {
-                v8 = 0;
-                v9 = v7->pPlayerBuffs.data();
-              }
-              else
-                return 0;
+                goto LABEL_50;
+              return 0;
             }
           }
           return 1;
@@ -4317,7 +4314,7 @@
       }
       return 1;
     }
-  case 85:
+  case SPELL_LIGHT_DAY_OF_PROTECTION:
     {
       if ( SHIDWORD(this->pActorBuffs[ACTOR_BUFF_DAY_OF_PROTECTION].uExpireTime) < 0 )
         return 1;
@@ -4327,7 +4324,7 @@
       v4 = LODWORD(this->pActorBuffs[ACTOR_BUFF_DAY_OF_PROTECTION].uExpireTime) == 0;
       break;
     }
-  case 86:
+  case SPELL_LIGHT_HOUR_OF_POWER:
     {
       if ( SHIDWORD(this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime) < 0 )
         return 1;
@@ -4337,7 +4334,7 @@
       v4 = LODWORD(this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime) == 0;
       break;
     }
-  case 95:
+  case SPELL_DARK_PAIN_REFLECTION:
     {
       if ( SHIDWORD(this->pActorBuffs[ACTOR_BUFF_PAIN_REFLECTION].uExpireTime) < 0 )
         return 1;
@@ -4347,7 +4344,7 @@
       v4 = LODWORD(this->pActorBuffs[ACTOR_BUFF_PAIN_REFLECTION].uExpireTime) == 0;
       break;
     }
-  case 73:
+  case SPELL_BODY_HAMMERHANDS:
     {
       if ( SHIDWORD(this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uExpireTime) < 0 )
         return 1;
@@ -4357,7 +4354,7 @@
       v4 = LODWORD(this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uExpireTime) == 0;
       break;
     }
-  case 5:
+  case SPELL_FIRE_HASTE:
     {
       if ( SHIDWORD(this->pActorBuffs[ACTOR_BUFF_HASTE].uExpireTime) < 0 )
         return 1;
@@ -4367,7 +4364,7 @@
       v4 = LODWORD(this->pActorBuffs[ACTOR_BUFF_HASTE].uExpireTime) == 0;
       break;
     }
-  case 17:
+  case SPELL_AIR_SHIELD:
     {
       if ( SHIDWORD(this->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime) < 0 )
         return 1;
@@ -4377,7 +4374,7 @@
       v4 = LODWORD(this->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime) == 0;
       break;
     }
-  case 38:
+  case SPELL_EARTH_STONESKIN:
     {
       if ( SHIDWORD(this->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime) < 0 )
         return 1;
@@ -4386,7 +4383,7 @@
       v3 = 0;
       v4 = LODWORD(this->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime) == 0;
     }
-  case 46:
+  case SPELL_SPIRIT_BLESS:
     {
       if ( SHIDWORD(this->pActorBuffs[ACTOR_BUFF_BLESS].uExpireTime) < 0 )
         return 1;
@@ -4396,7 +4393,7 @@
       v4 = LODWORD(this->pActorBuffs[ACTOR_BUFF_BLESS].uExpireTime) == 0;
       break;
     }
-  case 47:
+  case SPELL_SPIRIT_FATE:
     {
       if ( SHIDWORD(this->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime) < 0 )
         return 1;
@@ -4406,7 +4403,7 @@
       v4 = LODWORD(this->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime) == 0;
       break;
     }
-  case 51:
+  case SPELL_SPIRIT_HEROISM:
     {
       if ( SHIDWORD(this->pActorBuffs[ACTOR_BUFF_HEROISM].uExpireTime) < 0 )
         return 1;