ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2361 from AsparagusEduardo/RHH/pr/moveTypeConfig

Browse Source 
Separate config for updated move types
This commit is contained in:
ghoulslash 2022-09-26 09:08:41 -04:00 committed by GitHub
commit e41c2efc39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/constants/battle_config.h
View File

@ -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.

8
src/data/battle_moves.h
View File

@ -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,
@ -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,
@ -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,
@ -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,