Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate config for updated move types #2361

Merged
merged 1 commit into from
Sep 26, 2022
Merged

Separate config for updated move types #2361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/constants/battle_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
#define B_FAINT_SWITCH_IN GEN_LATEST // In Gen4+, sending out a new Pokémon after the previous one fainted happens at the end of the turn. Before, it would happen after each action.

// Move data settings
#define B_UPDATED_MOVE_DATA GEN_LATEST // Updates move data in gBattleMoves, including Power, Accuracy, PP, stat changes, targets, chances of secondary effects, etc.
#define B_UPDATED_MOVE_DATA GEN_LATEST // Updates move data in gBattleMoves, including Power, Accuracy, PP, stat changes, targets and chances of secondary effects.
#define B_UPDATED_MOVE_TYPES GEN_LATEST // Updates move types.
#define B_PHYSICAL_SPECIAL_SPLIT GEN_LATEST // In Gen3, the move's type determines if it will do physical or special damage. The split icon in the summary will reflect this.
#define B_RECOIL_IF_MISS_DMG GEN_LATEST // In Gen5+, Jump Kick and High Jump Kick will always do half of the user's max HP when missing.
#define B_KLUTZ_FLING_INTERACTION GEN_LATEST // In Gen5+, Pokémon with the Klutz ability can't use Fling.
Expand Down
8 changes: 4 additions & 4 deletions src/data/battle_moves.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3122,7 +3122,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =

[MOVE_CURSE] =
{
#if B_UPDATED_MOVE_DATA >= GEN_5
#if B_UPDATED_MOVE_TYPES >= GEN_5
.type = TYPE_GHOST,
#else
.type = TYPE_MYSTERY,
Expand Down Expand Up @@ -3342,7 +3342,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =

[MOVE_SWEET_KISS] =
{
#if B_UPDATED_MOVE_DATA >= GEN_6
#if B_UPDATED_MOVE_TYPES >= GEN_6
.type = TYPE_FAIRY,
#else
.type = TYPE_NORMAL,
Expand Down Expand Up @@ -3687,7 +3687,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =

[MOVE_CHARM] =
{
#if B_UPDATED_MOVE_DATA >= GEN_6
#if B_UPDATED_MOVE_TYPES >= GEN_6
.type = TYPE_FAIRY,
#else
.type = TYPE_NORMAL,
Expand Down Expand Up @@ -4233,7 +4233,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =

[MOVE_MOONLIGHT] =
{
#if B_UPDATED_MOVE_DATA >= GEN_6
#if B_UPDATED_MOVE_TYPES >= GEN_6
.type = TYPE_FAIRY,
#else
.type = TYPE_NORMAL,
Expand Down