diff --git a/include/constants/abilities.h b/include/constants/abilities.h
index fdb5233f02..23b9fe2b72 100644
--- a/include/constants/abilities.h
+++ b/include/constants/abilities.h
@@ -77,184 +77,221 @@
 #define ABILITY_WHITE_SMOKE 73
 #define ABILITY_PURE_POWER 74
 #define ABILITY_SHELL_ARMOR 75
-#define ABILITY_CACOPHONY 76
-#define ABILITY_AIR_LOCK 77
+#define ABILITY_AIR_LOCK 76
 
-#define ABILITIES_COUNT_GEN3 78
+#define ABILITIES_COUNT_GEN3 77
 
-// Gen4 abilities.
-#define ABILITY_TANGLED_FEET 78
-#define ABILITY_MOTOR_DRIVE 79
-#define ABILITY_RIVALRY 80
-#define ABILITY_STEADFAST 81
-#define ABILITY_SNOW_CLOAK 82
-#define ABILITY_GLUTTONY 83
-#define ABILITY_ANGER_POINT 84
-#define ABILITY_UNBURDEN 85
-#define ABILITY_HEATPROOF 86
-#define ABILITY_SIMPLE 87
-#define ABILITY_DRY_SKIN 88
-#define ABILITY_DOWNLOAD 89
-#define ABILITY_IRON_FIST 90
-#define ABILITY_POISON_HEAL 91
-#define ABILITY_ADAPTABILITY 92
-#define ABILITY_SKILL_LINK 93
-#define ABILITY_HYDRATION 94
-#define ABILITY_SOLAR_POWER 95
-#define ABILITY_QUICK_FEET 96
-#define ABILITY_NORMALIZE 97
-#define ABILITY_SNIPER 98
-#define ABILITY_MAGIC_GUARD 99
-#define ABILITY_NO_GUARD 100
-#define ABILITY_STALL 101
-#define ABILITY_TECHNICIAN 102
-#define ABILITY_LEAF_GUARD 103
-#define ABILITY_KLUTZ 104
-#define ABILITY_MOLD_BREAKER 105
-#define ABILITY_SUPER_LUCK 106
-#define ABILITY_AFTERMATH 107
-#define ABILITY_ANTICIPATION 108
-#define ABILITY_FOREWARN 109
-#define ABILITY_UNAWARE 110
-#define ABILITY_TINTED_LENS 111
-#define ABILITY_FILTER 112
-#define ABILITY_SLOW_START 113
-#define ABILITY_SCRAPPY 114
-#define ABILITY_STORM_DRAIN 115
-#define ABILITY_ICE_BODY 116
-#define ABILITY_SOLID_ROCK 117
-#define ABILITY_SNOW_WARNING 118
-#define ABILITY_HONEY_GATHER 119
-#define ABILITY_FRISK 120
-#define ABILITY_RECKLESS 121
-#define ABILITY_MULTITYPE 122
-#define ABILITY_FLOWER_GIFT 123
-#define ABILITY_BAD_DREAMS 124
+// Gen 4
+#define ABILITY_TANGLED_FEET 77
+#define ABILITY_MOTOR_DRIVE 78
+#define ABILITY_RIVALRY 79
+#define ABILITY_STEADFAST 80
+#define ABILITY_SNOW_CLOAK 81
+#define ABILITY_GLUTTONY 82
+#define ABILITY_ANGER_POINT 83
+#define ABILITY_UNBURDEN 84
+#define ABILITY_HEATPROOF 85
+#define ABILITY_SIMPLE 86
+#define ABILITY_DRY_SKIN 87
+#define ABILITY_DOWNLOAD 88
+#define ABILITY_IRON_FIST 89
+#define ABILITY_POISON_HEAL 90
+#define ABILITY_ADAPTABILITY 91
+#define ABILITY_SKILL_LINK 92
+#define ABILITY_HYDRATION 93
+#define ABILITY_SOLAR_POWER 94
+#define ABILITY_QUICK_FEET 95
+#define ABILITY_NORMALIZE 96
+#define ABILITY_SNIPER 97
+#define ABILITY_MAGIC_GUARD 98
+#define ABILITY_NO_GUARD 99
+#define ABILITY_STALL 100
+#define ABILITY_TECHNICIAN 101
+#define ABILITY_LEAF_GUARD 102
+#define ABILITY_KLUTZ 103
+#define ABILITY_MOLD_BREAKER 104
+#define ABILITY_SUPER_LUCK 105
+#define ABILITY_AFTERMATH 106
+#define ABILITY_ANTICIPATION 107
+#define ABILITY_FOREWARN 108
+#define ABILITY_UNAWARE 109
+#define ABILITY_TINTED_LENS 110
+#define ABILITY_FILTER 111
+#define ABILITY_SLOW_START 112
+#define ABILITY_SCRAPPY 113
+#define ABILITY_STORM_DRAIN 114
+#define ABILITY_ICE_BODY 115
+#define ABILITY_SOLID_ROCK 116
+#define ABILITY_SNOW_WARNING 117
+#define ABILITY_HONEY_GATHER 118
+#define ABILITY_FRISK 119
+#define ABILITY_RECKLESS 120
+#define ABILITY_MULTITYPE 121
+#define ABILITY_FLOWER_GIFT 122
+#define ABILITY_BAD_DREAMS 123
 
-#define ABILITIES_COUNT_GEN4 125
+#define ABILITIES_COUNT_GEN4 124
 
-// Gen5 abilities.
-#define ABILITY_PICKPOCKET 125
-#define ABILITY_SHEER_FORCE 126
-#define ABILITY_CONTRARY 127
-#define ABILITY_UNNERVE 128
-#define ABILITY_DEFIANT 129
-#define ABILITY_DEFEATIST 130
-#define ABILITY_CURSED_BODY 131
-#define ABILITY_HEALER 132
-#define ABILITY_FRIEND_GUARD 133
-#define ABILITY_WEAK_ARMOR 134
-#define ABILITY_HEAVY_METAL 135
-#define ABILITY_LIGHT_METAL 136
-#define ABILITY_MULTISCALE 137
-#define ABILITY_TOXIC_BOOST 138
-#define ABILITY_FLARE_BOOST 139
-#define ABILITY_HARVEST 140
-#define ABILITY_TELEPATHY 141
-#define ABILITY_MOODY 142
-#define ABILITY_OVERCOAT 143
-#define ABILITY_POISON_TOUCH 144
-#define ABILITY_REGENERATOR 145
-#define ABILITY_BIG_PECKS 146
-#define ABILITY_SAND_RUSH 147
-#define ABILITY_WONDER_SKIN 148
-#define ABILITY_ANALYTIC 149
-#define ABILITY_ILLUSION 150
-#define ABILITY_IMPOSTER 151
-#define ABILITY_INFILTRATOR 152
-#define ABILITY_MUMMY 153
-#define ABILITY_MOXIE 154
-#define ABILITY_JUSTIFIED 155
-#define ABILITY_RATTLED 156
-#define ABILITY_MAGIC_BOUNCE 157
-#define ABILITY_SAP_SIPPER 158
-#define ABILITY_PRANKSTER 159
-#define ABILITY_SAND_FORCE 160
-#define ABILITY_IRON_BARBS 161
-#define ABILITY_ZEN_MODE 162
-#define ABILITY_VICTORY_STAR 163
-#define ABILITY_TURBOBLAZE 164
-#define ABILITY_TERAVOLT 165
+// Gen 5
+#define ABILITY_PICKPOCKET 124
+#define ABILITY_SHEER_FORCE 125
+#define ABILITY_CONTRARY 126
+#define ABILITY_UNNERVE 127
+#define ABILITY_DEFIANT 128
+#define ABILITY_DEFEATIST 129
+#define ABILITY_CURSED_BODY 130
+#define ABILITY_HEALER 131
+#define ABILITY_FRIEND_GUARD 132
+#define ABILITY_WEAK_ARMOR 133
+#define ABILITY_HEAVY_METAL 134
+#define ABILITY_LIGHT_METAL 135
+#define ABILITY_MULTISCALE 136
+#define ABILITY_TOXIC_BOOST 137
+#define ABILITY_FLARE_BOOST 138
+#define ABILITY_HARVEST 139
+#define ABILITY_TELEPATHY 140
+#define ABILITY_MOODY 141
+#define ABILITY_OVERCOAT 142
+#define ABILITY_POISON_TOUCH 143
+#define ABILITY_REGENERATOR 144
+#define ABILITY_BIG_PECKS 145
+#define ABILITY_SAND_RUSH 146
+#define ABILITY_WONDER_SKIN 147
+#define ABILITY_ANALYTIC 148
+#define ABILITY_ILLUSION 149
+#define ABILITY_IMPOSTER 150
+#define ABILITY_INFILTRATOR 151
+#define ABILITY_MUMMY 152
+#define ABILITY_MOXIE 153
+#define ABILITY_JUSTIFIED 154
+#define ABILITY_RATTLED 155
+#define ABILITY_MAGIC_BOUNCE 156
+#define ABILITY_SAP_SIPPER 157
+#define ABILITY_PRANKSTER 158
+#define ABILITY_SAND_FORCE 159
+#define ABILITY_IRON_BARBS 160
+#define ABILITY_ZEN_MODE 161
+#define ABILITY_VICTORY_STAR 162
+#define ABILITY_TURBOBLAZE 163
+#define ABILITY_TERAVOLT 164
 
-#define ABILITIES_COUNT_GEN5 166
+#define ABILITIES_COUNT_GEN5 165
 
-// Gen6 abilities.
-#define ABILITY_AROMA_VEIL 166
-#define ABILITY_FLOWER_VEIL 167
-#define ABILITY_CHEEK_POUCH 168
-#define ABILITY_PROTEAN 169
-#define ABILITY_FUR_COAT 170
-#define ABILITY_MAGICIAN 171
-#define ABILITY_BULLETPROOF 172
-#define ABILITY_COMPETITIVE 173
-#define ABILITY_STRONG_JAW 174
-#define ABILITY_REFRIGERATE 175
-#define ABILITY_SWEET_VEIL 176
-#define ABILITY_STANCE_CHANGE 177
-#define ABILITY_GALE_WINGS 178
-#define ABILITY_MEGA_LAUNCHER 179
-#define ABILITY_GRASS_PELT 180
-#define ABILITY_SYMBIOSIS 181
-#define ABILITY_TOUGH_CLAWS 182
-#define ABILITY_PIXILATE 183
-#define ABILITY_GOOEY 184
-#define ABILITY_AERILATE 185
-#define ABILITY_PARENTAL_BOND 186
-#define ABILITY_DARK_AURA 187
-#define ABILITY_FAIRY_AURA 188
-#define ABILITY_AURA_BREAK 189
-#define ABILITY_PRIMORDIAL_SEA 190
-#define ABILITY_DESOLATE_LAND 191
-#define ABILITY_DELTA_STREAM 192
+// Gen 6
+#define ABILITY_AROMA_VEIL 165
+#define ABILITY_FLOWER_VEIL 166
+#define ABILITY_CHEEK_POUCH 167
+#define ABILITY_PROTEAN 168
+#define ABILITY_FUR_COAT 169
+#define ABILITY_MAGICIAN 170
+#define ABILITY_BULLETPROOF 171
+#define ABILITY_COMPETITIVE 172
+#define ABILITY_STRONG_JAW 173
+#define ABILITY_REFRIGERATE 174
+#define ABILITY_SWEET_VEIL 175
+#define ABILITY_STANCE_CHANGE 176
+#define ABILITY_GALE_WINGS 177
+#define ABILITY_MEGA_LAUNCHER 178
+#define ABILITY_GRASS_PELT 179
+#define ABILITY_SYMBIOSIS 180
+#define ABILITY_TOUGH_CLAWS 181
+#define ABILITY_PIXILATE 182
+#define ABILITY_GOOEY 183
+#define ABILITY_AERILATE 184
+#define ABILITY_PARENTAL_BOND 185
+#define ABILITY_DARK_AURA 186
+#define ABILITY_FAIRY_AURA 187
+#define ABILITY_AURA_BREAK 188
+#define ABILITY_PRIMORDIAL_SEA 189
+#define ABILITY_DESOLATE_LAND 190
+#define ABILITY_DELTA_STREAM 191
 
-#define ABILITIES_COUNT_GEN6 193
+#define ABILITIES_COUNT_GEN6 192
 
-// Gen7 abilities.
-#define ABILITY_STAMINA 193
-#define ABILITY_WIMP_OUT 194
-#define ABILITY_EMERGENCY_EXIT 195
-#define ABILITY_WATER_COMPACTION 196
-#define ABILITY_MERCILESS 197
-#define ABILITY_SHIELDS_DOWN 198
-#define ABILITY_STAKEOUT 199
-#define ABILITY_WATER_BUBBLE 200
-#define ABILITY_STEELWORKER 201
-#define ABILITY_BERSERK 202
-#define ABILITY_SLUSH_RUSH 203
-#define ABILITY_LONG_REACH 204
-#define ABILITY_LIQUID_VOICE 205
-#define ABILITY_TRIAGE 206
-#define ABILITY_GALVANIZE 207
-#define ABILITY_SURGE_SURFER 208
-#define ABILITY_SCHOOLING 209
-#define ABILITY_DISGUISE 210
-#define ABILITY_BATTLE_BOND 211
-#define ABILITY_POWER_CONSTRUCT 212
-#define ABILITY_CORROSION 213
-#define ABILITY_COMATOSE 214
-#define ABILITY_QUEENLY_MAJESTY 215
-#define ABILITY_INNARDS_OUT 216
-#define ABILITY_DANCER 217
-#define ABILITY_BATTERY 218
-#define ABILITY_FLUFFY 219
-#define ABILITY_DAZZLING 220
-#define ABILITY_SOUL_HEART 221
-#define ABILITY_TANGLING_HAIR 222
-#define ABILITY_RECEIVER 223
-#define ABILITY_POWER_OF_ALCHEMY 224
-#define ABILITY_BEAST_BOOST 225
-#define ABILITY_RKS_SYSTEM 226
-#define ABILITY_ELECTRIC_SURGE 227
-#define ABILITY_PSYCHIC_SURGE 228
-#define ABILITY_MISTY_SURGE 229
-#define ABILITY_GRASSY_SURGE 230
-#define ABILITY_FULL_METAL_BODY 231
-#define ABILITY_SHADOW_SHIELD 232
-#define ABILITY_PRISM_ARMOR 233
-#define ABILITY_NEUROFORCE 234
+// Gen 7
+#define ABILITY_STAMINA 192
+#define ABILITY_WIMP_OUT 193
+#define ABILITY_EMERGENCY_EXIT 194
+#define ABILITY_WATER_COMPACTION 195
+#define ABILITY_MERCILESS 196
+#define ABILITY_SHIELDS_DOWN 197
+#define ABILITY_STAKEOUT 198
+#define ABILITY_WATER_BUBBLE 199
+#define ABILITY_STEELWORKER 200
+#define ABILITY_BERSERK 201
+#define ABILITY_SLUSH_RUSH 202
+#define ABILITY_LONG_REACH 203
+#define ABILITY_LIQUID_VOICE 204
+#define ABILITY_TRIAGE 205
+#define ABILITY_GALVANIZE 206
+#define ABILITY_SURGE_SURFER 207
+#define ABILITY_SCHOOLING 208
+#define ABILITY_DISGUISE 209
+#define ABILITY_BATTLE_BOND 210
+#define ABILITY_POWER_CONSTRUCT 211
+#define ABILITY_CORROSION 212
+#define ABILITY_COMATOSE 213
+#define ABILITY_QUEENLY_MAJESTY 214
+#define ABILITY_INNARDS_OUT 215
+#define ABILITY_DANCER 216
+#define ABILITY_BATTERY 217
+#define ABILITY_FLUFFY 218
+#define ABILITY_DAZZLING 219
+#define ABILITY_SOUL_HEART 220
+#define ABILITY_TANGLING_HAIR 221
+#define ABILITY_RECEIVER 222
+#define ABILITY_POWER_OF_ALCHEMY 223
+#define ABILITY_BEAST_BOOST 224
+#define ABILITY_RKS_SYSTEM 225
+#define ABILITY_ELECTRIC_SURGE 226
+#define ABILITY_PSYCHIC_SURGE 227
+#define ABILITY_MISTY_SURGE 228
+#define ABILITY_GRASSY_SURGE 229
+#define ABILITY_FULL_METAL_BODY 230
+#define ABILITY_SHADOW_SHIELD 231
+#define ABILITY_PRISM_ARMOR 232
+#define ABILITY_NEUROFORCE 233
 
-#define ABILITIES_COUNT_GEN7 235
+#define ABILITIES_COUNT_GEN7 234
 
-#define ABILITIES_COUNT ABILITIES_COUNT_GEN7
+// Gen 8
+#define ABILITY_INTREPID_SWORD 234
+#define ABILITY_DAUNTLESS_SHIELD 235
+#define ABILITY_LIBERO 236
+#define ABILITY_BALL_FETCH 237
+#define ABILITY_COTTON_DOWN 238
+#define ABILITY_PROPELLER_TAIL 239
+#define ABILITY_MIRROR_ARMOR 240
+#define ABILITY_GULP_MISSILE 241
+#define ABILITY_STALWART 242
+#define ABILITY_STEAM_ENGINE 243
+#define ABILITY_PUNK_ROCK 244
+#define ABILITY_SAND_SPIT 245
+#define ABILITY_ICE_SCALES 246
+#define ABILITY_RIPEN 247
+#define ABILITY_ICE_FACE 248
+#define ABILITY_POWER_SPOT 249
+#define ABILITY_MIMICRY 250
+#define ABILITY_SCREEN_CLEANER 251
+#define ABILITY_STEELY_SPIRIT 252
+#define ABILITY_PERISH_BODY 253
+#define ABILITY_WANDERING_SPIRIT 254
+#define ABILITY_GORILLA_TACTICS 255
+#define ABILITY_NEUTRALIZING_GAS 256
+#define ABILITY_PASTEL_VEIL 257
+#define ABILITY_HUNGER_SWITCH 258
+#define ABILITY_QUICK_DRAW 259
+#define ABILITY_UNSEEN_FIST 260
+#define ABILITY_CURIOUS_MEDICINE 261
+#define ABILITY_TRANSISTOR 262
+#define ABILITY_DRAGONS_MAW 263
+#define ABILITY_CHILLING_NEIGH 264
+#define ABILITY_GRIM_NEIGH 265
+#define ABILITY_AS_ONE_ICE_RIDER 266
+#define ABILITY_AS_ONE_SHADOW_RIDER 267
+
+#define ABILITIES_COUNT_GEN8 268
+
+#define ABILITIES_COUNT ABILITIES_COUNT_GEN8
 
 #endif  // GUARD_CONSTANTS_ABILITIES_H