Skip to content

Commit

Permalink
Add Mystery Dungeon Moves
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinvanrijn authored and ElGHT committed Jan 7, 2025
1 parent 9db19ce commit 73b4748
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 1 deletion.
6 changes: 5 additions & 1 deletion include/constants/moves.h
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,11 @@

#define MOVES_COUNT_GEN9 848

#define MOVES_COUNT MOVES_COUNT_GEN9
// Mystery Dungeon Moves
#define MOVE_WIDE_SLASH 848
#define MOVE_VACUUM_CUT 849

#define MOVES_COUNT (MOVES_COUNT_GEN9 + 2)

// Z Moves
#define MOVE_BREAKNECK_BLITZ (MOVES_COUNT + 0)
Expand Down
45 changes: 45 additions & 0 deletions src/data/moves_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_AirCutter,
},
[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_AirCutter,
},

// Z-Moves
[MOVE_BREAKNECK_BLITZ] =
{
Expand Down
14 changes: 14 additions & 0 deletions test/battle/move_effect/vacuum_cut.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#include "global.h"
#include "test/battle.h"

SINGLE_BATTLE_TEST("Vacuum-Cut attacks through Wonder Guard")
{
GIVEN {
PLAYER(SPECIES_SHEDINJA) { Ability(ABILITY_WONDER_GUARD); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(opponent, MOVE_VACUUM_CUT); }
} SCENE {
MESSAGE("Shedinja fainted!");
}
}
14 changes: 14 additions & 0 deletions test/battle/move_effect/wide_slash.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#include "global.h"
#include "test/battle.h"

SINGLE_BATTLE_TEST("Wide Slash attacks through Wonder Guard")
{
GIVEN {
PLAYER(SPECIES_SHEDINJA) { Ability(ABILITY_WONDER_GUARD); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(opponent, MOVE_WIDE_SLASH); }
} SCENE {
MESSAGE("Shedinja fainted!");
}
}

0 comments on commit 73b4748

Please sign in to comment.