Accidentally got rid of move defines, added them back

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_GEN6
 
 #endif  // GUARD_CONSTANTS_MOVES_H