From 42c7a5fea22d5f35118eaa513809f7a4352e9ff2 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Fri, 2 Apr 2021 10:28:08 -0600 Subject: [PATCH] fix z move move IDs --- include/constants/moves.h | 70 +++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/include/constants/moves.h b/include/constants/moves.h index 262da8423..392c8a30d 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -785,42 +785,42 @@ #define MOVES_COUNT_GEN8 755 // Z Moves -#define MOVE_BREAKNECK_BLITZ 756 -#define MOVE_ALL_OUT_PUMMELING 757 -#define MOVE_SUPERSONIC_SKYSTRIKE 758 -#define MOVE_ACID_DOWNPOUR 759 -#define MOVE_TECTONIC_RAGE 760 -#define MOVE_CONTINENTAL_CRUSH 761 -#define MOVE_SAVAGE_SPIN_OUT 762 -#define MOVE_NEVER_ENDING_NIGHTMARE 763 -#define MOVE_CORKSCREW_CRASH 764 -#define MOVE_INFERNO_OVERDRIVE 765 -#define MOVE_HYDRO_VORTEX 766 -#define MOVE_BLOOM_DOOM 767 -#define MOVE_GIGAVOLT_HAVOC 768 -#define MOVE_SHATTERED_PSYCHE 769 -#define MOVE_SUBZERO_SLAMMER 770 -#define MOVE_DEVASTATING_DRAKE 771 -#define MOVE_BLACK_HOLE_ECLIPSE 772 -#define MOVE_TWINKLE_TACKLE 773 +#define MOVE_BREAKNECK_BLITZ (MOVES_COUNT_GEN8 + 0) +#define MOVE_ALL_OUT_PUMMELING (MOVES_COUNT_GEN8 + 1) +#define MOVE_SUPERSONIC_SKYSTRIKE (MOVES_COUNT_GEN8 + 2) +#define MOVE_ACID_DOWNPOUR (MOVES_COUNT_GEN8 + 3) +#define MOVE_TECTONIC_RAGE (MOVES_COUNT_GEN8 + 4) +#define MOVE_CONTINENTAL_CRUSH (MOVES_COUNT_GEN8 + 5) +#define MOVE_SAVAGE_SPIN_OUT (MOVES_COUNT_GEN8 + 6) +#define MOVE_NEVER_ENDING_NIGHTMARE (MOVES_COUNT_GEN8 + 7) +#define MOVE_CORKSCREW_CRASH (MOVES_COUNT_GEN8 + 8) +#define MOVE_INFERNO_OVERDRIVE (MOVES_COUNT_GEN8 + 9) +#define MOVE_HYDRO_VORTEX (MOVES_COUNT_GEN8 + 10) +#define MOVE_BLOOM_DOOM (MOVES_COUNT_GEN8 + 11) +#define MOVE_GIGAVOLT_HAVOC (MOVES_COUNT_GEN8 + 12) +#define MOVE_SHATTERED_PSYCHE (MOVES_COUNT_GEN8 + 13) +#define MOVE_SUBZERO_SLAMMER (MOVES_COUNT_GEN8 + 14) +#define MOVE_DEVASTATING_DRAKE (MOVES_COUNT_GEN8 + 15) +#define MOVE_BLACK_HOLE_ECLIPSE (MOVES_COUNT_GEN8 + 16) +#define MOVE_TWINKLE_TACKLE (MOVES_COUNT_GEN8 + 17) //signature z moves -#define MOVE_CATASTROPIKA 774 -#define MOVE_10000000_VOLT_THUNDERBOLT 775 -#define MOVE_STOKED_SPARKSURFER 776 -#define MOVE_EXTREME_EVOBOOST 777 -#define MOVE_PULVERIZING_PANCAKE 778 -#define MOVE_GENESIS_SUPERNOVA 779 -#define MOVE_SINISTER_ARROW_RAID 780 -#define MOVE_MALICIOUS_MOONSAULT 781 -#define MOVE_OCEANIC_OPERETTA 782 -#define MOVE_SPLINTERED_STORMSHARDS 783 -#define MOVE_LETS_SNUGGLE_FOREVER 784 -#define MOVE_CLANGOROUS_SOULBLAZE 785 -#define MOVE_GUARDIAN_OF_ALOLA 786 -#define MOVE_SEARING_SUNRAZE_SMASH 787 -#define MOVE_MENACING_MOONRAZE_MAELSTROM 788 -#define MOVE_LIGHT_THAT_BURNS_THE_SKY 789 -#define MOVE_SOUL_STEALING_7_STAR_STRIKE 790 +#define MOVE_CATASTROPIKA (MOVES_COUNT_GEN8 + 18) +#define MOVE_10000000_VOLT_THUNDERBOLT (MOVES_COUNT_GEN8 + 19) +#define MOVE_STOKED_SPARKSURFER (MOVES_COUNT_GEN8 + 20) +#define MOVE_EXTREME_EVOBOOST (MOVES_COUNT_GEN8 + 21) +#define MOVE_PULVERIZING_PANCAKE (MOVES_COUNT_GEN8 + 22) +#define MOVE_GENESIS_SUPERNOVA (MOVES_COUNT_GEN8 + 23) +#define MOVE_SINISTER_ARROW_RAID (MOVES_COUNT_GEN8 + 24) +#define MOVE_MALICIOUS_MOONSAULT (MOVES_COUNT_GEN8 + 25) +#define MOVE_OCEANIC_OPERETTA (MOVES_COUNT_GEN8 + 26) +#define MOVE_SPLINTERED_STORMSHARDS (MOVES_COUNT_GEN8 + 27) +#define MOVE_LETS_SNUGGLE_FOREVER (MOVES_COUNT_GEN8 + 28) +#define MOVE_CLANGOROUS_SOULBLAZE (MOVES_COUNT_GEN8 + 29) +#define MOVE_GUARDIAN_OF_ALOLA (MOVES_COUNT_GEN8 + 30) +#define MOVE_SEARING_SUNRAZE_SMASH (MOVES_COUNT_GEN8 + 31) +#define MOVE_MENACING_MOONRAZE_MAELSTROM (MOVES_COUNT_GEN8 + 32) +#define MOVE_LIGHT_THAT_BURNS_THE_SKY (MOVES_COUNT_GEN8 + 33) +#define MOVE_SOUL_STEALING_7_STAR_STRIKE (MOVES_COUNT_GEN8 + 34) #define FIRST_Z_MOVE MOVE_BREAKNECK_BLITZ #define LAST_Z_MOVE MOVE_SOUL_STEALING_7_STAR_STRIKE