Add Mystery Dungeon moves

data/battle_anim_scripts.s

@@ -28989,6 +28989,41 @@ gBattleAnimSpecial_CriticalCaptureBallThrow::
 	jumpreteq -1, BallThrowTrainerBlock
 	goto BallThrowEnd
 
+@@@@@@@@@@ MYSTERY DUNGEON MOVES @@@@@@@@@@
+gBattleAnimMove_WideSlash::
+	loadspritegfx ANIM_TAG_CUT
+	delay 0
+	monbg ANIM_DEF_PARTNER
+	setalpha 12, 8
+	delay 0
+	playsewithpan SE_M_CUT, SOUND_PAN_TARGET
+	createsprite gAirCutterSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0, 2
+	delay 5
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1
+	waitforvisualfinish
+	blendoff
+	clearmonbg ANIM_DEF_PARTNER
+	delay 0
+	end
+
+gBattleAnimMove_VacuumCut::
+	loadspritegfx ANIM_TAG_AIR_WAVE
+	delay 0
+	monbg ANIM_DEF_PARTNER
+	setalpha 12, 8
+	delay 0
+	createvisualtask AnimTask_AirCutterProjectile, 2, 32, -24, 6 * 256, 2, 128  @ 6 * 256 == Q_8_8(6)
+	delay 29
+	playsewithpan SE_M_CUT, SOUND_PAN_TARGET
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1
+	waitforvisualfinish
+	blendoff
+	clearmonbg ANIM_DEF_PARTNER
+	delay 0
+	end
+
 @@@@@@@@@@ Z MOVES @@@@@@@@@@
 gBattleAnimMove_BreakneckBlitz::
 	loadspritegfx ANIM_TAG_HOLLOW_ORB

include/battle_anim_scripts.h

@@ -1004,6 +1004,10 @@ extern const u8 gBattleAnimGeneral_TeraCharge[];
 extern const u8 gBattleAnimGeneral_TeraActivate[];
 extern const u8 gBattleAnimGeneral_SimpleHeal[];
 
+// Mystery Dungeon Moves
+extern const u8 gBattleAnimMove_WideSlash[];
+extern const u8 gBattleAnimMove_VacuumCut[];
+
 // special animations
 extern const u8 gBattleAnimSpecial_LevelUp[];
 extern const u8 gBattleAnimSpecial_SwitchOutPlayerMon[];

include/constants/items.h

@@ -948,8 +948,10 @@
 #define ITEM_TM228 (LAST_BERRY_INDEX + 228)
 #define ITEM_TM229 (LAST_BERRY_INDEX + 229)
 #define ITEM_TM230 (LAST_BERRY_INDEX + 230)
+#define ITEM_TM231 (LAST_BERRY_INDEX + 231)
+#define ITEM_TM232 (LAST_BERRY_INDEX + 232)
 
-#define LAST_TECHNICAL_MACHINE_INDEX ITEM_TM230
+#define LAST_TECHNICAL_MACHINE_INDEX ITEM_TM232
 #define NUM_TECHNICAL_MACHINES (LAST_TECHNICAL_MACHINE_INDEX - ITEM_TM01 + 1)
 
 #define ITEM_HM01 (LAST_TECHNICAL_MACHINE_INDEX + 1)

include/constants/moves.h

@@ -910,7 +910,11 @@
 
 #define MOVES_COUNT_GEN9 848
 
-#define MOVES_COUNT         MOVES_COUNT_GEN9
+// Mystery Dungeon Moves
+#define MOVE_WIDE_SLASH (MOVES_COUNT_GEN9 + 0)
+#define MOVE_VACUUM_CUT (MOVES_COUNT_GEN9 + 1)
+
+#define MOVES_COUNT         (MOVES_COUNT_GEN9 + 2)
 
 // Z Moves
 #define MOVE_BREAKNECK_BLITZ (MOVES_COUNT + 0)

include/constants/tms_hms.h

@@ -231,7 +231,9 @@
     F(ALLURING_VOICE) \
     F(PSYCHIC_NOISE) \
     F(UPPER_HAND) \
-    F(HAIL)
+    F(HAIL) \
+    F(WIDE_SLASH) \
+    F(VACUUM_CUT)
 
 #define FOREACH_HM(F) \
     F(CUT) \

src/data/items.h

@@ -13168,6 +13168,36 @@ const struct Item gItemsInfo[] =
         .secondaryId = MOVE_HAIL,
     },
 
+    [ITEM_TM_WIDE_SLASH] =
+    {
+        .name = _("TM231"),
+        .price = 3000,
+        .description = COMPOUND_STRING(
+            "Slashes with\n"
+            "claws, etc. Deals\n"
+            "typeless damage."),
+        .importance = I_REUSABLE_TMS,
+        .pocket = POCKET_TM_HM,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_TMHM,
+        .secondaryId = MOVE_WIDE_SLASH,
+    },
+
+    [ITEM_TM_VACUUM_CUT] =
+    {
+        .name = _("TM232"),
+        .price = 3000,
+        .description = COMPOUND_STRING(
+            "Attack that always\n"
+            "inflicts 35 HP\n"
+            "typeless damage."),
+        .importance = I_REUSABLE_TMS,
+        .pocket = POCKET_TM_HM,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_TMHM,
+        .secondaryId = MOVE_VACUUM_CUT,
+    },
+
     [ITEM_HM_CUT] =
     {
         .name = _("HM01"),

src/data/moves_info.h

@@ -20724,6 +20724,51 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] =
         .battleAnimScript = gBattleAnimMove_MalignantChain,
     },
 
+    // Mystery Dungeon Moves
+    [MOVE_WIDE_SLASH] =
+    {
+        .name = COMPOUND_STRING("Wide Slash"),
+        .description = COMPOUND_STRING(
+            "Slashes with claws, etc.\n"
+            "Deals typeless damage."),
+        .effect = EFFECT_HIT,
+        .power = 100,
+        .type = TYPE_MYSTERY,
+        .accuracy = 85,
+        .pp = 10,
+        .target = MOVE_TARGET_BOTH,
+        .priority = 0,
+        .category = DAMAGE_CATEGORY_PHYSICAL,
+        .makesContact = TRUE,
+        .slicingMove = TRUE,
+        .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .contestComboStarterId = 0,
+        .contestComboMoves = {0},
+        .battleAnimScript = gBattleAnimMove_WideSlash,
+    },
+    [MOVE_VACUUM_CUT] =
+    {
+        .name = COMPOUND_STRING("Vacuum-Cut"),
+        .description = COMPOUND_STRING(
+            "Attack that always inflicts\n"
+            "35 HP typeless damage."),
+        .effect = EFFECT_FIXED_DAMAGE_ARG,
+        .power = 1,
+        .type = TYPE_MYSTERY,
+        .accuracy = 100,
+        .pp = 10,
+        .target = MOVE_TARGET_BOTH,
+        .priority = 0,
+        .category = DAMAGE_CATEGORY_SPECIAL,
+        .argument = 35,
+        .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .contestComboStarterId = 0,
+        .contestComboMoves = {0},
+        .battleAnimScript = gBattleAnimMove_VacuumCut,
+    },
+
     // Z-Moves
     [MOVE_BREAKNECK_BLITZ] =
     {

src/pokemon.c

@@ -5509,6 +5509,8 @@ static const u16 sUniversalMoves[] =
     MOVE_SECRET_POWER,
     MOVE_SUBSTITUTE,
     MOVE_TERA_BLAST,
+    MOVE_WIDE_SLASH,
+    MOVE_VACUUM_CUT,
 };
 
 u8 CanLearnTeachableMove(u16 species, u16 move)
@@ -5559,6 +5561,20 @@ u8 CanLearnTeachableMove(u16 species, u16 move)
                 }
                 else
                 {
+                    switch (species)
+                    {
+                    case SPECIES_MAGIKARP:
+                    case SPECIES_DITTO:
+                    case SPECIES_SMEARGLE:
+                    case SPECIES_WURMPLE:
+                    case SPECIES_SILCOON:
+                    case SPECIES_CASCOON:
+                    case SPECIES_KRICKETOT:
+                        if(move == MOVE_WIDE_SLASH || move == MOVE_VACUUM_CUT)
+                            return TRUE;
+                        // Fallthrough
+                    }
+
                     const struct LevelUpMove *learnset = GetSpeciesLevelUpLearnset(species);
 
                     if (P_TM_LITERACY < GEN_6)

test/battle/move_effect/fixed_damage_arg.c

@@ -4,6 +4,9 @@
 ASSUMPTIONS
 {
     ASSUME(gMovesInfo[MOVE_SONIC_BOOM].effect == EFFECT_FIXED_DAMAGE_ARG);
+    ASSUME(gMovesInfo[MOVE_VACUUM_CUT].effect == EFFECT_FIXED_DAMAGE_ARG);
+    ASSUME(gMovesInfo[MOVE_VACUUM_CUT].type == TYPE_MYSTERY);
+    ASSUME(gMovesInfo[MOVE_VACUUM_CUT].target == MOVE_TARGET_BOTH);
 }
 
 SINGLE_BATTLE_TEST("Sonic Boom deals fixed damage", s16 damage)
@@ -39,3 +42,20 @@ SINGLE_BATTLE_TEST("Sonic Boom doesn't affect ghost types")
         MESSAGE("It doesn't affect the opposing Gastly…");
     }
 }
+
+DOUBLE_BATTLE_TEST("Vacuum-Cut bypasses Wonder Guard")
+{
+    GIVEN {
+        PLAYER(SPECIES_SHEDINJA) { Ability(ABILITY_WONDER_GUARD); }
+        PLAYER(SPECIES_SHEDINJA) { Ability(ABILITY_WONDER_GUARD); }
+        OPPONENT(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(opponentLeft, MOVE_VACUUM_CUT); }
+    } SCENE {
+        HP_BAR(playerLeft);
+        MESSAGE("Shedinja fainted!");
+        HP_BAR(playerRight);
+        MESSAGE("Shedinja fainted!");
+    }
+}