nerge with master, fix conflicts

1 files changed, 0 insertions, 81 deletions

diff --git a/include/abilities.h b/include/abilities.h
deleted file mode 100644
index 4c47025f8..000000000
--- a/include/abilities.h
+++ /dev/null
@@ -1,81 +0,0 @@
-enum
-{
-    ABILITY_NONE,
-    ABILITY_STENCH,
-    ABILITY_DRIZZLE,
-    ABILITY_SPEED_BOOST,
-    ABILITY_BATTLE_ARMOR,
-    ABILITY_STURDY,
-    ABILITY_DAMP,
-    ABILITY_LIMBER,
-    ABILITY_SAND_VEIL,
-    ABILITY_STATIC,
-    ABILITY_VOLT_ABSORB,
-    ABILITY_WATER_ABSORB,
-    ABILITY_OBLIVIOUS,
-    ABILITY_CLOUD_NINE,
-    ABILITY_COMPOUND_EYES,
-    ABILITY_INSOMNIA,
-    ABILITY_COLOR_CHANGE,
-    ABILITY_IMMUNITY,
-    ABILITY_FLASH_FIRE,
-    ABILITY_SHIELD_DUST,
-    ABILITY_OWN_TEMPO,
-    ABILITY_SUCTION_CUPS,
-    ABILITY_INTIMIDATE,
-    ABILITY_SHADOW_TAG,
-    ABILITY_ROUGH_SKIN,
-    ABILITY_WONDER_GUARD,
-    ABILITY_LEVITATE,
-    ABILITY_EFFECT_SPORE,
-    ABILITY_SYNCHRONIZE,
-    ABILITY_CLEAR_BODY,
-    ABILITY_NATURAL_CURE,
-    ABILITY_LIGHTNING_ROD,
-    ABILITY_SERENE_GRACE,
-    ABILITY_SWIFT_SWIM,
-    ABILITY_CHLOROPHYLL,
-    ABILITY_ILLUMINATE,
-    ABILITY_TRACE,
-    ABILITY_HUGE_POWER,
-    ABILITY_POISON_POINT,
-    ABILITY_INNER_FOCUS,
-    ABILITY_MAGMA_ARMOR,
-    ABILITY_WATER_VEIL,
-    ABILITY_MAGNET_PULL,
-    ABILITY_SOUNDPROOF,
-    ABILITY_RAIN_DISH,
-    ABILITY_SAND_STREAM,
-    ABILITY_PRESSURE,
-    ABILITY_THICK_FAT,
-    ABILITY_EARLY_BIRD,
-    ABILITY_FLAME_BODY,
-    ABILITY_RUN_AWAY,
-    ABILITY_KEEN_EYE,
-    ABILITY_HYPER_CUTTER,
-    ABILITY_PICKUP,
-    ABILITY_TRUANT,
-    ABILITY_HUSTLE,
-    ABILITY_CUTE_CHARM,
-    ABILITY_PLUS,
-    ABILITY_MINUS,
-    ABILITY_FORECAST,
-    ABILITY_STICKY_HOLD,
-    ABILITY_SHED_SKIN,
-    ABILITY_GUTS,
-    ABILITY_MARVEL_SCALE,
-    ABILITY_LIQUID_OOZE,
-    ABILITY_OVERGROW,
-    ABILITY_BLAZE,
-    ABILITY_TORRENT,
-    ABILITY_SWARM,
-    ABILITY_ROCK_HEAD,
-    ABILITY_DROUGHT,
-    ABILITY_ARENA_TRAP,
-    ABILITY_VITAL_SPIRIT,
-    ABILITY_WHITE_SMOKE,
-    ABILITY_PURE_POWER,
-    ABILITY_SHELL_ARMOR,
-    ABILITY_CACOPHONY,
-    ABILITY_AIR_LOCK
-};
\ No newline at end of file