From e94a0e2ddf171e2a6e76e648f0b5277ba743f452 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 13 Jul 2018 23:31:00 +0200 Subject: [PATCH] Add new gen constants. --- include/constants/abilities.h | 176 ++++++++++++++++++- include/constants/hold_effects.h | 29 ++++ include/constants/moves.h | 283 ++++++++++++++++++++++++++++++- 3 files changed, 486 insertions(+), 2 deletions(-) diff --git a/include/constants/abilities.h b/include/constants/abilities.h index 4ad54c86f..3f7b595e7 100644 --- a/include/constants/abilities.h +++ b/include/constants/abilities.h @@ -80,6 +80,180 @@ #define ABILITY_CACOPHONY 76 #define ABILITY_AIR_LOCK 77 -#define ABILITIES_COUNT 78 +#define ABILITIES_COUNT_GEN3 78 + +// 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 + +#define ABILITIES_COUNT_GEN4 125 + +// 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 + +#define ABILITIES_COUNT_GEN5 166 + +// 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 + +#define ABILITIES_COUNT_GEN6 193 + +// 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 ABILITIES_COUNT_GEN7 234 + +#define ABILITIES_COUNT ABILITIES_COUNT_GEN4 #endif // GUARD_CONSTANTS_ABILITIES_H diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index b653f5a92..4dc9e8048 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -69,4 +69,33 @@ #define HOLD_EFFECT_THICK_CLUB 65 #define HOLD_EFFECT_STICK 66 +// Gen4 hold effects. +#define HOLD_EFFECT_CHOICE_SCARF 67 +#define HOLD_EFFECT_CHOICE_SPECS 68 +#define HOLD_EFFECT_DAMP_ROCK 69 +#define HOLD_EFFECT_GRIP_CLAW 70 +#define HOLD_EFFECT_HEAT_ROCK 71 +#define HOLD_EFFECT_ICY_ROCK 72 +#define HOLD_EFFECT_LIGHT_CLAY 73 +#define HOLD_EFFECT_SMOOTH_ROCK 74 +#define HOLD_EFFECT_POWER_HERB 75 +#define HOLD_EFFECT_BIG_ROOT 76 +#define HOLD_EFFECT_EXPERT_BELT 77 +#define HOLD_EFFECT_LIFE_ORB 78 +#define HOLD_EFFECT_METRONOME 79 +#define HOLD_EFFECT_MUSCLE_BAND 80 +#define HOLD_EFFECT_WIDE_LENS 81 +#define HOLD_EFFECT_WIDE_GLASSES 82 +#define HOLD_EFFECT_ZOOM_LENS 83 +#define HOLD_EFFECT_LAGGING_TAIL 84 +#define HOLD_EFFECT_FOCUS_SASH 85 +#define HOLD_EFFECT_FLAME_ORB 86 +#define HOLD_EFFECT_TOXIC_ORB 87 +#define HOLD_EFFECT_STICKY_BARB 88 +#define HOLD_EFFECT_IRON_BALL 89 +#define HOLD_EFFECT_BLACK_SLUDGE 90 +#define HOLD_EFFECT_DESTINY_KNOT 91 +#define HOLD_EFFECT_SHED_SHELL 92 + + #endif // GUARD_HOLD_EFFECTS_H diff --git a/include/constants/moves.h b/include/constants/moves.h index 85c02e3da..f026614d6 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -357,6 +357,287 @@ #define MOVE_DOOM_DESIRE 353 #define MOVE_PSYCHO_BOOST 354 -#define MOVES_COUNT 355 +#define MOVES_COUNT_GEN3 355 + +// Gen4 moves. +#define MOVE_ROOST 355 +#define MOVE_GRAVITY 356 +#define MOVE_MIRACLE_EYE 357 +#define MOVE_WAKE_UP_SLAP 358 +#define MOVE_HAMMER_ARM 359 +#define MOVE_GYRO_BALL 360 +#define MOVE_HEALING_WISH 361 +#define MOVE_BRINE 362 +#define MOVE_NATURAL_GIFT 363 +#define MOVE_FEINT 364 +#define MOVE_PLUCK 365 +#define MOVE_TAILWIND 366 +#define MOVE_ACUPRESSURE 367 +#define MOVE_METAL_BURST 368 +#define MOVE_U_TURN 369 +#define MOVE_CLOSE_COMBAT 370 +#define MOVE_PAYBACK 371 +#define MOVE_ASSURANCE 372 +#define MOVE_EMBARGO 373 +#define MOVE_FLING 374 +#define MOVE_PSYCHO_SHIFT 375 +#define MOVE_TRUMP_CARD 376 +#define MOVE_HEAL_BLOCK 377 +#define MOVE_WRING_OUT 378 +#define MOVE_POWER_TRICK 379 +#define MOVE_GASTRO_ACID 380 +#define MOVE_LUCKY_CHANT 381 +#define MOVE_ME_FIRST 382 +#define MOVE_COPYCAT 383 +#define MOVE_POWER_SWAP 384 +#define MOVE_GUARD_SWAP 385 +#define MOVE_PUNISHMENT 386 +#define MOVE_LAST_RESORT 387 +#define MOVE_WORRY_SEED 388 +#define MOVE_SUCKER_PUNCH 389 +#define MOVE_TOXIC_SPIKES 390 +#define MOVE_HEART_SWAP 391 +#define MOVE_AQUA_RING 392 +#define MOVE_MAGNET_RISE 393 +#define MOVE_FLARE_BLITZ 394 +#define MOVE_FORCE_PALM 395 +#define MOVE_AURA_SPHERE 396 +#define MOVE_ROCK_POLISH 397 +#define MOVE_POISON_JAB 398 +#define MOVE_DARK_PULSE 399 +#define MOVE_NIGHT_SLASH 400 +#define MOVE_AQUA_TAIL 401 +#define MOVE_SEED_BOMB 402 +#define MOVE_AIR_SLASH 403 +#define MOVE_X_SCISSOR 404 +#define MOVE_BUG_BUZZ 405 +#define MOVE_DRAGON_PULSE 406 +#define MOVE_DRAGON_RUSH 407 +#define MOVE_POWER_GEM 408 +#define MOVE_DRAIN_PUNCH 409 +#define MOVE_VACUUM_WAVE 410 +#define MOVE_FOCUS_BLAST 411 +#define MOVE_ENERGY_BALL 412 +#define MOVE_BRAVE_BIRD 413 +#define MOVE_EARTH_POWER 414 +#define MOVE_SWITCHEROO 415 +#define MOVE_GIGA_IMPACT 416 +#define MOVE_NASTY_PLOT 417 +#define MOVE_BULLET_PUNCH 418 +#define MOVE_AVALANCHE 419 +#define MOVE_ICE_SHARD 420 +#define MOVE_SHADOW_CLAW 421 +#define MOVE_THUNDER_FANG 422 +#define MOVE_ICE_FANG 423 +#define MOVE_FIRE_FANG 424 +#define MOVE_SHADOW_SNEAK 425 +#define MOVE_MUD_BOMB 426 +#define MOVE_PSYCHO_CUT 427 +#define MOVE_ZEN_HEADBUTT 428 +#define MOVE_MIRROR_SHOT 429 +#define MOVE_FLASH_CANNON 430 +#define MOVE_ROCK_CLIMB 431 +#define MOVE_DEFOG 432 +#define MOVE_TRICK_ROOM 433 +#define MOVE_DRACO_METEOR 434 +#define MOVE_DISCHARGE 435 +#define MOVE_LAVA_PLUME 436 +#define MOVE_LEAF_STORM 437 +#define MOVE_POWER_WHIP 438 +#define MOVE_ROCK_WRECKER 439 +#define MOVE_CROSS_POISON 440 +#define MOVE_GUNK_SHOT 441 +#define MOVE_IRON_HEAD 442 +#define MOVE_MAGNET_BOMB 443 +#define MOVE_STONE_EDGE 444 +#define MOVE_CAPTIVATE 445 +#define MOVE_STEALTH_ROCK 446 +#define MOVE_GRASS_KNOT 447 +#define MOVE_CHATTER 448 +#define MOVE_JUDGMENT 449 +#define MOVE_BUG_BITE 450 +#define MOVE_CHARGE_BEAM 451 +#define MOVE_WOOD_HAMMER 452 +#define MOVE_AQUA_JET 453 +#define MOVE_ATTACK_ORDER 454 +#define MOVE_DEFEND_ORDER 455 +#define MOVE_HEAL_ORDER 456 +#define MOVE_HEAD_SMASH 457 +#define MOVE_DOUBLE_HIT 458 +#define MOVE_ROAR_OF_TIME 459 +#define MOVE_SPACIAL_REND 460 +#define MOVE_LUNAR_DANCE 461 +#define MOVE_CRUSH_GRIP 462 +#define MOVE_MAGMA_STORM 463 +#define MOVE_DARK_VOID 464 +#define MOVE_SEED_FLARE 465 +#define MOVE_OMINOUS_WIND 466 +#define MOVE_SHADOW_FORCE 467 + +#define MOVES_COUNT_GEN4 468 + +// Gen5 moves. +#define MOVE_HONE_CLAWS 468 +#define MOVE_WIDE_GUARD 469 +#define MOVE_GUARD_SPLIT 470 +#define MOVE_POWER_SPLIT 471 +#define MOVE_WONDER_ROOM 472 +#define MOVE_PSYSHOCK 473 +#define MOVE_VENOSHOCK 474 +#define MOVE_AUTOTOMIZE 475 +#define MOVE_RAGE_POWDER 476 +#define MOVE_TELEKINESIS 477 +#define MOVE_MAGIC_ROOM 478 +#define MOVE_SMACK_DOWN 479 +#define MOVE_STORM_THROW 480 +#define MOVE_FLAME_BURST 481 +#define MOVE_SLUDGE_WAVE 482 +#define MOVE_QUIVER_DANCE 483 +#define MOVE_HEAVY_SLAM 484 +#define MOVE_SYNCHRONOISE 485 +#define MOVE_ELECTRO_BALL 486 +#define MOVE_SOAK 487 +#define MOVE_FLAME_CHARGE 488 +#define MOVE_COIL 489 +#define MOVE_LOW_SWEEP 490 +#define MOVE_ACID_SPRAY 491 +#define MOVE_FOUL_PLAY 492 +#define MOVE_SIMPLE_BEAM 493 +#define MOVE_ENTRAINMENT 494 +#define MOVE_AFTER_YOU 495 +#define MOVE_ROUND 496 +#define MOVE_ECHOED_VOICE 497 +#define MOVE_CHIP_AWAY 498 +#define MOVE_CLEAR_SMOG 499 +#define MOVE_STORED_POWER 500 +#define MOVE_QUICK_GUARD 501 +#define MOVE_ALLY_SWITCH 502 +#define MOVE_SCALD 503 +#define MOVE_SHELL_SMASH 504 +#define MOVE_HEAL_PULSE 505 +#define MOVE_HEX 506 +#define MOVE_SKY_DROP 507 +#define MOVE_SHIFT_GEAR 508 +#define MOVE_CIRCLE_THROW 509 +#define MOVE_INCINERATE 510 +#define MOVE_QUASH 511 +#define MOVE_ACROBATICS 512 +#define MOVE_REFLECT_TYPE 513 +#define MOVE_RETALIATE 514 +#define MOVE_FINAL_GAMBIT 515 +#define MOVE_BESTOW 516 +#define MOVE_INFERNO 517 +#define MOVE_WATER_PLEDGE 518 +#define MOVE_FIRE_PLEDGE 519 +#define MOVE_GRASS_PLEDGE 520 +#define MOVE_VOLT_SWITCH 521 +#define MOVE_STRUGGLE_BUG 522 +#define MOVE_BULLDOZE 523 +#define MOVE_FROST_BREATH 524 +#define MOVE_DRAGON_TAIL 525 +#define MOVE_WORK_UP 526 +#define MOVE_ELECTROWEB 527 +#define MOVE_WILD_CHARGE 528 +#define MOVE_DRILL_RUN 529 +#define MOVE_DUAL_CHOP 530 +#define MOVE_HEART_STAMP 531 +#define MOVE_HORN_LEECH 532 +#define MOVE_SACRED_SWORD 533 +#define MOVE_RAZOR_SHELL 534 +#define MOVE_HEAT_CRASH 535 +#define MOVE_LEAF_TORNADO 536 +#define MOVE_STEAMROLLER 537 +#define MOVE_COTTON_GUARD 538 +#define MOVE_NIGHT_DAZE 539 +#define MOVE_PSYSTRIKE 540 +#define MOVE_TAIL_SLAP 541 +#define MOVE_HURRICANE 542 +#define MOVE_HEAD_CHARGE 543 +#define MOVE_GEAR_GRIND 544 +#define MOVE_SEARING_SHOT 545 +#define MOVE_TECHNO_BLAST 546 +#define MOVE_RELIC_SONG 547 +#define MOVE_SECRET_SWORD 548 +#define MOVE_GLACIATE 549 +#define MOVE_BOLT_STRIKE 550 +#define MOVE_BLUE_FLARE 551 +#define MOVE_FIERY_DANCE 552 +#define MOVE_FREEZE_SHOCK 553 +#define MOVE_ICE_BURN 554 +#define MOVE_SNARL 555 +#define MOVE_ICICLE_CRASH 556 +#define MOVE_V_CREATE 557 +#define MOVE_FUSION_FLARE 558 +#define MOVE_FUSION_BOLT 559 + +#define MOVES_COUNT_GEN5 560 + +// Gen6 moves. +#define MOVE_FLYING_PRESS 560 +#define MOVE_MAT_BLOCK 561 +#define MOVE_BELCH 562 +#define MOVE_ROTOTILLER 563 +#define MOVE_STICKY_WEB 564 +#define MOVE_FELL_STINGER 565 +#define MOVE_PHANTOM_FORCE 566 +#define MOVE_TRICK_OR_TREAT 567 +#define MOVE_NOBLE_ROAR 568 +#define MOVE_ION_DELUGE 569 +#define MOVE_PARABOLIC_CHARGE 570 +#define MOVE_FOREST_S_CURSE 571 +#define MOVE_PETAL_BLIZZARD 572 +#define MOVE_FREEZE_DRY 573 +#define MOVE_DISARMING_VOICE 574 +#define MOVE_PARTING_SHOT 575 +#define MOVE_TOPSY_TURVY 576 +#define MOVE_DRAINING_KISS 577 +#define MOVE_CRAFTY_SHIELD 578 +#define MOVE_FLOWER_SHIELD 579 +#define MOVE_GRASSY_TERRAIN 580 +#define MOVE_MISTY_TERRAIN 581 +#define MOVE_ELECTRIFY 582 +#define MOVE_PLAY_ROUGH 583 +#define MOVE_FAIRY_WIND 584 +#define MOVE_MOONBLAST 585 +#define MOVE_BOOMBURST 586 +#define MOVE_FAIRY_LOCK 587 +#define MOVE_KING_S_SHIELD 588 +#define MOVE_PLAY_NICE 589 +#define MOVE_CONFIDE 590 +#define MOVE_DIAMOND_STORM 591 +#define MOVE_STEAM_ERUPTION 592 +#define MOVE_HYPERSPACE_HOLE 593 +#define MOVE_WATER_SHURIKEN 594 +#define MOVE_MYSTICAL_FIRE 595 +#define MOVE_SPIKY_SHIELD 596 +#define MOVE_AROMATIC_MIST 597 +#define MOVE_EERIE_IMPULSE 598 +#define MOVE_VENOM_DRENCH 599 +#define MOVE_POWDER 600 +#define MOVE_GEOMANCY 601 +#define MOVE_MAGNETIC_FLUX 602 +#define MOVE_HAPPY_HOUR 603 +#define MOVE_ELECTRIC_TERRAIN 604 +#define MOVE_DAZZLING_GLEAM 605 +#define MOVE_CELEBRATE 606 +#define MOVE_HOLD_HANDS 607 +#define MOVE_BABY_DOLL_EYES 608 +#define MOVE_NUZZLE 609 +#define MOVE_HOLD_BACK 610 +#define MOVE_INFESTATION 611 +#define MOVE_POWER_UP_PUNCH 612 +#define MOVE_OBLIVION_WING 613 +#define MOVE_THOUSAND_ARROWS 614 +#define MOVE_THOUSAND_WAVES 615 +#define MOVE_LAND_S_WRATH 616 +#define MOVE_LIGHT_OF_RUIN 617 +#define MOVE_ORIGIN_PULSE 618 +#define MOVE_PRECIPICE_BLADES 619 +#define MOVE_DRAGON_ASCENT 620 +#define MOVE_HYPERSPACE_FURY 621 + +#define MOVES_COUNT_GEN6 622 + +#define MOVES_COUNT MOVES_COUNT_GEN4 #endif // GUARD_CONSTANTS_MOVES_H