Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct move flags/data (#8858)

Browse Source
This commit is contained in:
amiosi 2026-02-23 11:23:32 -05:00 committed by GitHub
parent a3d041b8af
commit e369ea4464
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/data/moves_info.h
View File

@ -439,7 +439,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
[MOVE_RAZOR_WIND] = [MOVE_RAZOR_WIND] =
{ {
.name = COMPOUND_STRING("Razor Wind"), .name = COMPOUND_STRING("Razor Wind"),
#if B_UPDATED_MOVE_DATA == GEN_3 #if B_UPDATED_MOVE_DATA == GEN_3 || B_UPDATED_MOVE_DATA == GEN_1
.description = COMPOUND_STRING( .description = COMPOUND_STRING(
"A 2-turn move that strikes\n" "A 2-turn move that strikes\n"
"the foe on the 2nd turn."), "the foe on the 2nd turn."),
@ -454,10 +454,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.accuracy = B_UPDATED_MOVE_DATA >= GEN_3 ? 100 : 75, .accuracy = B_UPDATED_MOVE_DATA >= GEN_3 ? 100 : 75,
#if B_UPDATED_MOVE_DATA >= GEN_4 #if B_UPDATED_MOVE_DATA >= GEN_4
.criticalHitStage = 1, .criticalHitStage = 1,
#elif B_UPDATED_MOVE_DATA == GEN_3 #elif B_UPDATED_MOVE_DATA == GEN_2
.criticalHitStage = 0,
#else
.criticalHitStage = 2, .criticalHitStage = 2,
#else
.criticalHitStage = 0,
#endif #endif
.pp = 10, .pp = 10,
.target = MOVE_TARGET_BOTH, .target = MOVE_TARGET_BOTH,
@ -489,6 +489,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.priority = 0, .priority = 0,
.category = DAMAGE_CATEGORY_STATUS, .category = DAMAGE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RESET_STATS }, .zMove = { .effect = Z_EFFECT_RESET_STATS },
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
.danceMove = TRUE, .danceMove = TRUE,
.snatchAffected = TRUE, .snatchAffected = TRUE,
.contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
@ -3251,6 +3253,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.priority = 0, .priority = 0,
.category = DAMAGE_CATEGORY_STATUS, .category = DAMAGE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_ATK_UP_2 }, .zMove = { .effect = Z_EFFECT_ATK_UP_2 },
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
.mimicBanned = TRUE, .mimicBanned = TRUE,
.metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4,
.copycatBanned = TRUE, .copycatBanned = TRUE,
@ -4616,7 +4620,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.priority = 0, .priority = 0,
.category = DAMAGE_CATEGORY_STATUS, .category = DAMAGE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .zMove = { .effect = Z_EFFECT_DEF_UP_1 },
.ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS < GEN_3), .ignoresProtect = B_UPDATED_MOVE_FLAGS < GEN_3,
.magicCoatAffected = TRUE, .magicCoatAffected = TRUE,
.contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
@ -4793,7 +4797,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.priority = 0, .priority = 0,
.category = DAMAGE_CATEGORY_STATUS, .category = DAMAGE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RECOVER_HP }, .zMove = { .effect = Z_EFFECT_RECOVER_HP },
.ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_3, .ignoresProtect = TRUE,
.ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_5,
.mirrorMoveBanned = TRUE, .mirrorMoveBanned = TRUE,
.contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
@ -4958,6 +4962,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.category = DAMAGE_CATEGORY_STATUS, .category = DAMAGE_CATEGORY_STATUS,
.argument = { .protectMethod = PROTECT_NORMAL }, .argument = { .protectMethod = PROTECT_NORMAL },
.zMove = { .effect = Z_EFFECT_RESET_STATS }, .zMove = { .effect = Z_EFFECT_RESET_STATS },
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
.metronomeBanned = TRUE, .metronomeBanned = TRUE,
.copycatBanned = TRUE, .copycatBanned = TRUE,
.assistBanned = TRUE, .assistBanned = TRUE,
@ -7204,6 +7210,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.target = MOVE_TARGET_DEPENDS, .target = MOVE_TARGET_DEPENDS,
.priority = 0, .priority = 0,
.category = DAMAGE_CATEGORY_STATUS, .category = DAMAGE_CATEGORY_STATUS,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
.metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_5, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_5,
.copycatBanned = TRUE, .copycatBanned = TRUE,
.sleepTalkBanned = TRUE, .sleepTalkBanned = TRUE,
@ -7772,6 +7780,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.priority = 4, .priority = 4,
.category = DAMAGE_CATEGORY_STATUS, .category = DAMAGE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .zMove = { .effect = Z_EFFECT_SPD_UP_2 },
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
.ignoresSubstitute = TRUE, .ignoresSubstitute = TRUE,
.forcePressure = TRUE, .forcePressure = TRUE,
.metronomeBanned = TRUE, .metronomeBanned = TRUE,