From 890144f1536767044cc2972d510975a3a961a02e Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sun, 15 Nov 2020 13:05:49 -0300 Subject: [PATCH] Defined Isle of Armor moves Straight up copied from the battle_engine branch. --- include/constants/moves.h | 125 +++++++++++++++++++++++++------------- 1 file changed, 82 insertions(+), 43 deletions(-) diff --git a/include/constants/moves.h b/include/constants/moves.h index e3438f5f2..711aa3023 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -359,7 +359,7 @@ #define MOVES_COUNT_GEN3 355 -// Gen4 moves. +// Gen 4 moves. #define MOVE_ROOST 355 #define MOVE_GRAVITY 356 #define MOVE_MIRACLE_EYE 357 @@ -476,7 +476,7 @@ #define MOVES_COUNT_GEN4 468 -// Gen5 moves. +// Gen 5 moves. #define MOVE_HONE_CLAWS 468 #define MOVE_WIDE_GUARD 469 #define MOVE_GUARD_SPLIT 470 @@ -572,7 +572,7 @@ #define MOVES_COUNT_GEN5 560 -// Gen6 moves. +// Gen 6 moves. #define MOVE_FLYING_PRESS 560 #define MOVE_MAT_BLOCK 561 #define MOVE_BELCH 562 @@ -631,6 +631,7 @@ #define MOVE_THOUSAND_WAVES 615 #define MOVE_LANDS_WRATH 616 #define MOVE_LIGHT_OF_RUIN 617 +// ORAS Moves #define MOVE_ORIGIN_PULSE 618 #define MOVE_PRECIPICE_BLADES 619 #define MOVE_DRAGON_ASCENT 620 @@ -638,7 +639,7 @@ #define MOVES_COUNT_GEN6 622 -// Gen7 moves. +// Gen 7 moves. #define MOVE_SHORE_UP 622 #define MOVE_FIRST_IMPRESSION 623 #define MOVE_BANEFUL_BUNKER 624 @@ -690,52 +691,90 @@ #define MOVE_ZING_ZAP 670 #define MOVE_NATURES_MADNESS 671 #define MOVE_MULTI_ATTACK 672 +// USUM Moves #define MOVE_MIND_BLOWN 673 #define MOVE_PLASMA_FISTS 674 #define MOVE_PHOTON_GEYSER 675 -#define MOVE_DOUBLE_IRON_BASH 676 +// LGPE Moves +#define MOVE_ZIPPY_ZAP 676 +#define MOVE_SPLISHY_SPLASH 677 +#define MOVE_FLOATY_FALL 678 +#define MOVE_PIKA_PAPOW 679 +#define MOVE_BOUNCY_BUBBLE 680 +#define MOVE_BUZZY_BUZZ 681 +#define MOVE_SIZZLY_SLIDE 682 +#define MOVE_GLITZY_GLOW 683 +#define MOVE_BADDY_BAD 684 +#define MOVE_SAPPY_SEED 685 +#define MOVE_FREEZY_FROST 686 +#define MOVE_SPARKLY_SWIRL 687 +#define MOVE_VEEVEE_VOLLEY 688 +#define MOVE_DOUBLE_IRON_BASH 689 -#define MOVES_COUNT_GEN7 677 +#define MOVES_COUNT_GEN7 690 // Gen 8 moves. -#define MOVE_DYNAMAX_CANNON (MOVES_COUNT_GEN7 + 0) -#define MOVE_SNIPE_SHOT (MOVES_COUNT_GEN7 + 1) -#define MOVE_JAW_LOCK (MOVES_COUNT_GEN7 + 2) -#define MOVE_STUFF_CHEEKS (MOVES_COUNT_GEN7 + 3) -#define MOVE_NO_RETREAT (MOVES_COUNT_GEN7 + 4) -#define MOVE_TAR_SHOT (MOVES_COUNT_GEN7 + 5) -#define MOVE_MAGIC_POWDER (MOVES_COUNT_GEN7 + 6) -#define MOVE_DRAGON_DARTS (MOVES_COUNT_GEN7 + 7) -#define MOVE_TEATIME (MOVES_COUNT_GEN7 + 8) -#define MOVE_OCTOLOCK (MOVES_COUNT_GEN7 + 9) -#define MOVE_BOLT_BEAK (MOVES_COUNT_GEN7 + 10) -#define MOVE_FISHIOUS_REND (MOVES_COUNT_GEN7 + 11) -#define MOVE_COURT_CHANGE (MOVES_COUNT_GEN7 + 12) -#define MOVE_CLANGOROUS_SOUL (MOVES_COUNT_GEN7 + 13) -#define MOVE_BODY_PRESS (MOVES_COUNT_GEN7 + 14) -#define MOVE_DECORATE (MOVES_COUNT_GEN7 + 15) -#define MOVE_DRUM_BEATING (MOVES_COUNT_GEN7 + 16) -#define MOVE_SNAP_TRAP (MOVES_COUNT_GEN7 + 17) -#define MOVE_PYRO_BALL (MOVES_COUNT_GEN7 + 18) -#define MOVE_BEHEMOTH_BLADE (MOVES_COUNT_GEN7 + 19) -#define MOVE_BEHEMOTH_BASH (MOVES_COUNT_GEN7 + 20) -#define MOVE_AURA_WHEEL (MOVES_COUNT_GEN7 + 21) -#define MOVE_BREAKING_SWIPE (MOVES_COUNT_GEN7 + 22) -#define MOVE_BRANCH_POKE (MOVES_COUNT_GEN7 + 23) -#define MOVE_OVERDRIVE (MOVES_COUNT_GEN7 + 24) -#define MOVE_APPLE_ACID (MOVES_COUNT_GEN7 + 25) -#define MOVE_GRAV_APPLE (MOVES_COUNT_GEN7 + 26) -#define MOVE_SPIRIT_BREAK (MOVES_COUNT_GEN7 + 27) -#define MOVE_STRANGE_STEAM (MOVES_COUNT_GEN7 + 28) -#define MOVE_LIFE_DEW (MOVES_COUNT_GEN7 + 29) -#define MOVE_OBSTRUCT (MOVES_COUNT_GEN7 + 30) -#define MOVE_FALSE_SURRENDER (MOVES_COUNT_GEN7 + 31) -#define MOVE_METEOR_ASSAULT (MOVES_COUNT_GEN7 + 32) -#define MOVE_ETERNABEAM (MOVES_COUNT_GEN7 + 33) -#define MOVE_STEEL_BEAM (MOVES_COUNT_GEN7 + 34) +#define MOVE_DYNAMAX_CANNON 690 +#define MOVE_SNIPE_SHOT 691 +#define MOVE_JAW_LOCK 692 +#define MOVE_STUFF_CHEEKS 693 +#define MOVE_NO_RETREAT 694 +#define MOVE_TAR_SHOT 695 +#define MOVE_MAGIC_POWDER 696 +#define MOVE_DRAGON_DARTS 697 +#define MOVE_TEATIME 698 +#define MOVE_OCTOLOCK 699 +#define MOVE_BOLT_BEAK 700 +#define MOVE_FISHIOUS_REND 701 +#define MOVE_COURT_CHANGE 702 +#define MOVE_CLANGOROUS_SOUL 703 +#define MOVE_BODY_PRESS 704 +#define MOVE_DECORATE 705 +#define MOVE_DRUM_BEATING 706 +#define MOVE_SNAP_TRAP 707 +#define MOVE_PYRO_BALL 708 +#define MOVE_BEHEMOTH_BLADE 709 +#define MOVE_BEHEMOTH_BASH 710 +#define MOVE_AURA_WHEEL 711 +#define MOVE_BREAKING_SWIPE 712 +#define MOVE_BRANCH_POKE 713 +#define MOVE_OVERDRIVE 714 +#define MOVE_APPLE_ACID 715 +#define MOVE_GRAV_APPLE 716 +#define MOVE_SPIRIT_BREAK 717 +#define MOVE_STRANGE_STEAM 718 +#define MOVE_LIFE_DEW 719 +#define MOVE_OBSTRUCT 720 +#define MOVE_FALSE_SURRENDER 721 +#define MOVE_METEOR_ASSAULT 722 +#define MOVE_ETERNABEAM 723 +#define MOVE_STEEL_BEAM 724 +// Isle of Armor Moves +#define MOVE_EXPANDING_FORCE 725 +#define MOVE_STEEL_ROLLER 726 +#define MOVE_SCALE_SHOT 727 +#define MOVE_METEOR_BEAM 728 +#define MOVE_SHELL_SIDE_ARM 729 +#define MOVE_MISTY_EXPLOSION 730 +#define MOVE_GRASSY_GLIDE 731 +#define MOVE_RISING_VOLTAGE 732 +#define MOVE_TERRAIN_PULSE 733 +#define MOVE_SKITTER_SMACK 734 +#define MOVE_BURNING_JEALOUSY 735 +#define MOVE_LASH_OUT 736 +#define MOVE_POLTERGEIST 737 +#define MOVE_CORROSIVE_GAS 738 +#define MOVE_COACHING 739 +#define MOVE_FLIP_TURN 740 +#define MOVE_TRIPLE_AXEL 741 +#define MOVE_DUAL_WINGBEAT 742 +#define MOVE_SCORCHING_SANDS 743 +#define MOVE_JUNGLE_HEALING 744 +#define MOVE_WICKED_BLOW 745 +#define MOVE_SURGING_STRIKES 746 -#define MOVES_COUNT_GEN8 (MOVES_COUNT_GEN7 + 35) +#define MOVES_COUNT_GEN8 747 -#define MOVES_COUNT MOVES_COUNT_GEN8 +#define MOVES_COUNT MOVES_COUNT_GEN8 #endif // GUARD_CONSTANTS_MOVES_H