The Indigo Disk Moves (rh-hideout#3704)

* Draft Indigo Disk move data * Add basic defines (flags, targets and priority missing) * Update move flags * Temper Flare is Stomping Tantrum * Forgot to push, please squash :D * Fix failing tests
Fervstheone · Dec 28, 2023 · 872ddf3 · 872ddf3
1 parent 28f1777
commit 872ddf3
Show file tree

Hide file tree

Showing 10 changed files with 414 additions and 41 deletions.
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
@@ -860,21 +860,21 @@ gBattleAnims_Moves::
 	.4byte Move_MATCHA_GOTCHA
 	.4byte Move_SYRUP_BOMB
 	.4byte Move_IVY_CUDGEL
-	.4byte Move_833
-	.4byte Move_834
-	.4byte Move_835
-	.4byte Move_836
-	.4byte Move_837
-	.4byte Move_838
-	.4byte Move_839
-	.4byte Move_840
-	.4byte Move_841
-	.4byte Move_842
-	.4byte Move_843
-	.4byte Move_844
-	.4byte Move_845
-	.4byte Move_846
-	.4byte Move_847
+	.4byte Move_ELECTRO_SHOT
+	.4byte Move_TERA_STARSTORM
+	.4byte Move_FICKLE_BEAM
+	.4byte Move_BURNING_BULWARK
+	.4byte Move_THUNDERCLAP
+	.4byte Move_MIGHTY_CLEAVE
+	.4byte Move_TACHYON_CUTTER
+	.4byte Move_HARD_PRESS
+	.4byte Move_DRAGON_CHEER
+	.4byte Move_ALLURING_VOICE
+	.4byte Move_TEMPER_FLARE
+	.4byte Move_SUPERCELL_SLAM
+	.4byte Move_PSYCHIC_NOISE
+	.4byte Move_UPPER_HAND
+	.4byte Move_MALIGNANT_CHAIN
 @@@@ Z MOVES
 	.4byte Move_BREAKNECK_BLITZ
 	.4byte Move_ALL_OUT_PUMMELING
@@ -16977,6 +16977,21 @@ Move_HYDRO_STEAM::
 Move_BLOOD_MOON::
 Move_MATCHA_GOTCHA::
 Move_IVY_CUDGEL::
+Move_ELECTRO_SHOT::
+Move_TERA_STARSTORM::
+Move_FICKLE_BEAM::
+Move_BURNING_BULWARK::
+Move_THUNDERCLAP::
+Move_MIGHTY_CLEAVE::
+Move_TACHYON_CUTTER::
+Move_HARD_PRESS::
+Move_DRAGON_CHEER::
+Move_ALLURING_VOICE::
+Move_TEMPER_FLARE::
+Move_SUPERCELL_SLAM::
+Move_PSYCHIC_NOISE::
+Move_UPPER_HAND::
+Move_MALIGNANT_CHAIN::
 	end @to do
 
 @@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@

diff --git a/include/config/battle.h b/include/config/battle.h
@@ -113,6 +113,7 @@
 #define B_QUICK_GUARD               GEN_LATEST // In Gen5 only, Wide Guard has a chance to fail if used consecutively.
 #define B_IMPRISON                  GEN_LATEST // In Gen5+, Imprison doesn't fail if opposing pokemon don't have any moves the user knows.
 #define B_ALLY_SWITCH_FAIL_CHANCE   GEN_LATEST // In Gen9, using Ally Switch consecutively decreases the chance of success for each consecutive use.
+#define B_SKETCH_BANS               GEN_LATEST // In Gen9+, Sketch is unable to copy more moves than in previous generations.
 
 // Ability settings
 #define B_EXPANDED_ABILITY_NAMES    TRUE       // If TRUE, ability names are increased from 12 characters to 16 characters.

diff --git a/include/constants/moves.h b/include/constants/moves.h
@@ -886,25 +886,27 @@
 #define MOVE_MAGICAL_TORQUE 826
 #define MOVE_PSYBLADE 827
 #define MOVE_HYDRO_STEAM 828
+// The Teal Mask Moves
 #define MOVE_BLOOD_MOON 829
 #define MOVE_MATCHA_GOTCHA 830
 #define MOVE_SYRUP_BOMB 831
 #define MOVE_IVY_CUDGEL 832
-#define MOVE_833 833
-#define MOVE_834 834
-#define MOVE_835 835
-#define MOVE_836 836
-#define MOVE_837 837
-#define MOVE_838 838
-#define MOVE_839 839
-#define MOVE_840 840
-#define MOVE_841 841
-#define MOVE_842 842
-#define MOVE_843 843
-#define MOVE_844 844
-#define MOVE_845 845
-#define MOVE_846 846
-#define MOVE_847 847
+// The Indigo Disk Moves
+#define MOVE_ELECTRO_SHOT 833
+#define MOVE_TERA_STARSTORM 834
+#define MOVE_FICKLE_BEAM 835
+#define MOVE_BURNING_BULWARK 836
+#define MOVE_THUNDERCLAP 837
+#define MOVE_MIGHTY_CLEAVE 838
+#define MOVE_TACHYON_CUTTER 839
+#define MOVE_HARD_PRESS 840
+#define MOVE_DRAGON_CHEER 841
+#define MOVE_ALLURING_VOICE 842
+#define MOVE_TEMPER_FLARE 843
+#define MOVE_SUPERCELL_SLAM 844
+#define MOVE_PSYCHIC_NOISE 845
+#define MOVE_UPPER_HAND 846
+#define MOVE_MALIGNANT_CHAIN 847
 
 #define MOVES_COUNT_GEN9 848
 

diff --git a/include/pokemon.h b/include/pokemon.h
@@ -504,6 +504,7 @@ struct BattleMove
     u32 encoreBanned:1;
     u32 parentalBondBanned:1;
     u32 skyBattleBanned:1;
+    u32 sketchBanned:1;
 
     u16 argument;
 };

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
@@ -12693,10 +12693,8 @@ static void Cmd_copymovepermanently(void)
     gChosenMove = MOVE_UNAVAILABLE;
 
     if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED)
-        && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE
-        && gLastPrintedMoves[gBattlerTarget] != MOVE_NONE
         && gLastPrintedMoves[gBattlerTarget] != MOVE_UNAVAILABLE
-        && gLastPrintedMoves[gBattlerTarget] != MOVE_SKETCH)
+        && !gBattleMoves[gLastPrintedMoves[gBattlerTarget]].sketchBanned)
     {
         s32 i;