From 7f4e936e87e61affc5658cedb2da714a9e4cf105 Mon Sep 17 00:00:00 2001 From: Evan Date: Fri, 1 Jan 2021 08:49:29 -0700 Subject: [PATCH] fix z move ordering --- include/constants/moves.h | 70 +++++++++++++++++++-------------------- src/data/battle_moves.h | 1 + 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/include/constants/moves.h b/include/constants/moves.h index 8b0b091f9..b566021ea 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 747 -#define MOVE_ALL_OUT_PUMMELING 748 -#define MOVE_SUPERSONIC_SKYSTRIKE 749 -#define MOVE_ACID_DOWNPOUR 750 -#define MOVE_TECTONIC_RAGE 751 -#define MOVE_CONTINENTAL_CRUSH 752 -#define MOVE_SAVAGE_SPIN_OUT 753 -#define MOVE_NEVER_ENDING_NIGHTMARE 754 -#define MOVE_CORKSCREW_CRASH 755 -#define MOVE_INFERNO_OVERDRIVE 756 -#define MOVE_HYDRO_VORTEX 757 -#define MOVE_BLOOM_DOOM 758 -#define MOVE_GIGAVOLT_HAVOC 759 -#define MOVE_SHATTERED_PSYCHE 760 -#define MOVE_SUBZERO_SLAMMER 761 -#define MOVE_DEVASTATING_DRAKE 762 -#define MOVE_BLACK_HOLE_ECLIPSE 763 -#define MOVE_TWINKLE_TACKLE 764 +#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 //signature z moves -#define MOVE_CATASTROPIKA 765 -#define MOVE_10000000_VOLT_THUNDERBOLT 766 -#define MOVE_STOKED_SPARKSURFER 767 -#define MOVE_EXTREME_EVOBOOST 768 -#define MOVE_PULVERIZING_PANCAKE 769 -#define MOVE_GENESIS_SUPERNOVA 770 -#define MOVE_SINISTER_ARROW_RAID 771 -#define MOVE_MALICIOUS_MOONSAULT 772 -#define MOVE_OCEANIC_OPERETTA 773 -#define MOVE_SPLINTERED_STORMSHARDS 774 -#define MOVE_LETS_SNUGGLE_FOREVER 775 -#define MOVE_CLANGOROUS_SOULBLAZE 776 -#define MOVE_GUARDIAN_OF_ALOLA 777 -#define MOVE_SEARING_SUNRAZE_SMASH 778 -#define MOVE_MENACING_MOONRAZE_MAELSTROM 779 -#define MOVE_LIGHT_THAT_BURNS_THE_SKY 780 -#define MOVE_SOUL_STEALING_7_STAR_STRIKE 781 +#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 FIRST_Z_MOVE MOVE_BREAKNECK_BLITZ #define LAST_Z_MOVE MOVE_SOUL_STEALING_7_STAR_STRIKE diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 8ec92bfce..74390c2c4 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -13360,4 +13360,5 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .zMovePower = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = 0 + }, };