Index: status.lua
===================================================================
--- status.lua	(revision 4306)
+++ status.lua	(working copy)
@@ -560,11 +560,36 @@
 EFFECT_PERPETUANCE				= 469
 EFFECT_IMMANENCE				= 470
 EFFECT_MIGAWARI					= 471
+<<<<<<< .mine
+EFFECT_TERNARY_FLOURISH			= 472 -- DNC 93
+EFFECT_MUDDLE					= 473 -- MOB EFFECT
+EFFECT_PROWESS					= 474 -- GROUNDS OF VALOR
+EFFECT_VOIDWATCHER				= 475 -- VOIDWATCH
+EFFECT_ENSPHERE					= 476 -- ATMACITE
+EFFECT_SACROSANCTITY			= 477 -- WHM 95
+EFFECT_PALISADE					= 478 -- PLD 95
+EFFECT_SCARLET_DELIRIUM			= 479 -- DRK 95
+EFFECT_SCARLET_DELIRIUM_1		= 480 -- DRK 95
+NONE							= 481 -- NONE
+EFFECT_DECOY_SHOT				= 482 -- RNG 95
+EFFECT_HAGAKURE					= 483 -- SAM 95								
+EFFECT_ISSEKIGAN                = 484 -- NIN 95
+EFFECT_UNBRIDLED_LEARNING       = 485 -- BLU 95
+EFFECT_COUNTER_BOOST            = 486 -- 
+EFFECT_ENDRAIN	                = 487 -- FENRIR 96
+EFFECT_ENASPIR	                = 488 -- FENRIR 96
+EFFECT_AFTERGLOW                = 489 -- WS AFTEREFFECT
+EFFECT_BRAZEN_STRENGTH          = 490 -- 
+EFFECT_AVATAR                   = 491 -- POLUtil says this should be Inner Strength
+EFFECT_NINJUTSU_ELE_DEBUFF      = 510
+EFFECT_DYNAMIS                  = 800
+EFFECT_HEALING                  = 512
+EFFECT_LEAVEGAME                = 513
 EFFECT_ISSEKIGAN                = 484
 EFFECT_NINJUTSU_ELE_DEBUFF      = 793
 EFFECT_HEALING                  = 794
 EFFECT_LEAVEGAME                = 795
-EFFECT_HASTE_SAMBA_HASTE = 796
+EFFECT_HASTE_SAMBA_HASTE		= 796
 EFFECT_TELEPORT					= 797
 EFFECT_CHAINBOUND				= 798
 EFFECT_SKILLCHAIN               = 799