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

Renamed healBlockBanned to healingMove (#3981)

Browse Source 
* Renamed healBlockBanned to healingMove

* Fix fix
This commit is contained in:
Eduardo Quezada D'Ottone 2024-01-12 14:41:45 -03:00 committed by GitHub
parent 33f34e91e9
commit e5b58b04b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pokemon.h
View File

@ -497,7 +497,7 @@ struct BattleMove
u32 forcePressure:1;
u32 cantUseTwice:1;
u32 gravityBanned:1;
u32 healBlockBanned:1;
u32 healingMove:1;
u32 meFirstBanned:1;
u32 mimicBanned:1;
u32 metronomeBanned:1;

2
src/battle_ai_util.c
View File

@ -1832,7 +1832,7 @@ bool32 HasSleepMoveWithLowAccuracy(u32 battlerAtk, u32 battlerDef)
bool32 IsHealingMove(u32 move)
{
return gBattleMoves[move].healBlockBanned;
return gBattleMoves[move].healingMove;
}
bool32 HasHealingEffect(u32 battlerId)

2
src/battle_util.c
View File

@ -1263,7 +1263,7 @@ bool32 IsHealBlockPreventingMove(u32 battler, u32 move)
if (!(gStatuses3[battler] & STATUS3_HEAL_BLOCK))
return FALSE;
return gBattleMoves[move].healBlockBanned;
return gBattleMoves[move].healingMove;
}
static bool32 IsBelchPreventingMove(u32 battler, u32 move)

72
src/data/battle_moves.h
View File

@ -1202,7 +1202,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_SPECIAL,
.ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_MEGA_DRAIN] =
@ -1220,7 +1220,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_SPECIAL,
.ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_LEECH_SEED] =
@ -1770,7 +1770,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = TRUE,
},
@ -2285,7 +2285,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.healBlockBanned = TRUE,
.healingMove = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
.snatchAffected = TRUE,
@ -2343,7 +2343,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.category = BATTLE_CATEGORY_SPECIAL,
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_POISON_GAS] =
@ -2398,7 +2398,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.category = BATTLE_CATEGORY_PHYSICAL,
.makesContact = TRUE,
.ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_LOVELY_KISS] =
@ -2661,7 +2661,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.snatchAffected = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
.healBlockBanned = TRUE,
.healingMove = TRUE,
},
[MOVE_ROCK_SLIDE] =
@ -3501,7 +3501,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_SPECIAL,
.ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_ENDURE] =
@ -3602,7 +3602,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
@ -4034,7 +4034,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
@ -4051,7 +4051,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
@ -4072,7 +4072,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
@ -4439,7 +4439,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
@ -4726,7 +4726,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_SPDEF_UP_1 },
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
@ -5216,7 +5216,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
@ -6102,7 +6102,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
@ -6198,7 +6198,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.target = MOVE_TARGET_USER,
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
@ -6977,7 +6977,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.category = BATTLE_CATEGORY_PHYSICAL,
.makesContact = TRUE,
.punchingMove = TRUE,
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_VACUUM_WAVE] =
@ -7755,7 +7755,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
@ -7831,7 +7831,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
.healBlockBanned = TRUE,
.healingMove = TRUE,
.danceMove = TRUE,
},
@ -8560,7 +8560,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.magicCoatAffected = TRUE,
.mirrorMoveBanned = TRUE,
.healBlockBanned = TRUE,
.healingMove = TRUE,
.pulseMove = TRUE,
},
@ -8987,7 +8987,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_PHYSICAL,
.makesContact = TRUE,
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_SACRED_SWORD] =
@ -9646,7 +9646,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.target = MOVE_TARGET_FOES_AND_ALLY,
.priority = 0,
.category = BATTLE_CATEGORY_SPECIAL,
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_FORESTS_CURSE] =
@ -9754,7 +9754,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.category = BATTLE_CATEGORY_SPECIAL,
.argument = 75, // restores 75% HP instead of 50% HP
.makesContact = TRUE,
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_CRAFTY_SHIELD] =
@ -10345,7 +10345,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_SPECIAL,
.argument = 75, // restores 75% HP instead of 50% HP
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_THOUSAND_ARROWS] =
@ -10493,7 +10493,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.priority = 0,
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.healBlockBanned = TRUE,
.healingMove = TRUE,
.snatchAffected = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
@ -10613,7 +10613,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.zMove = { .effect = Z_EFFECT_RESET_STATS },
.argument = MOVE_EFFECT_FLORAL_HEALING,
.mirrorMoveBanned = TRUE,
.healBlockBanned = TRUE,
.healingMove = TRUE,
.magicCoatAffected = TRUE,
},
@ -10642,7 +10642,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_DEF_UP_1 },
.magicCoatAffected = TRUE,
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_SOLAR_BLADE] =
@ -10909,7 +10909,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.category = BATTLE_CATEGORY_STATUS,
.zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 },
.mirrorMoveBanned = TRUE,
.healBlockBanned = TRUE,
.healingMove = TRUE,
.magicCoatAffected = TRUE,
},
@ -11433,7 +11433,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.category = BATTLE_CATEGORY_SPECIAL,
.mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8,
.metronomeBanned = TRUE,
.healBlockBanned = B_HEAL_BLOCKING >= GEN_6,
.healingMove = B_HEAL_BLOCKING >= GEN_6,
},
[MOVE_BUZZY_BUZZ] =
@ -12103,7 +12103,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.ignoresProtect = TRUE,
.ignoresSubstitute = TRUE,
.mirrorMoveBanned = TRUE,
.healBlockBanned = TRUE,
.healingMove = TRUE,
.metronomeBanned = TRUE,
},
@ -12477,7 +12477,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.ignoresProtect = TRUE,
.ignoresSubstitute = TRUE,
.mirrorMoveBanned = TRUE,
.healBlockBanned = TRUE,
.healingMove = TRUE,
.metronomeBanned = TRUE,
},
@ -13082,7 +13082,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.snatchAffected = TRUE,
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
.healBlockBanned = TRUE,
.healingMove = TRUE,
},
[MOVE_TAKE_HEART] =
@ -13299,7 +13299,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.ignoresProtect = TRUE,
.mirrorMoveBanned = TRUE,
.metronomeBanned = TRUE,
.healBlockBanned = TRUE,
.healingMove = TRUE,
.sketchBanned = (B_SKETCH_BANS >= GEN_9),
},
@ -13718,7 +13718,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.category = BATTLE_CATEGORY_PHYSICAL,
.makesContact = TRUE,
.slicingMove = TRUE,
.healBlockBanned = TRUE,
.healingMove = TRUE,
},
[MOVE_DOUBLE_SHOCK] =
@ -13969,7 +13969,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
.category = BATTLE_CATEGORY_SPECIAL,
.thawsUser = TRUE,
.metronomeBanned = TRUE,
.healBlockBanned = B_EXTRAPOLATED_MOVE_FLAGS,
.healingMove = B_EXTRAPOLATED_MOVE_FLAGS,
.additionalEffects = ADDITIONAL_EFFECTS({
.moveEffect = MOVE_EFFECT_BURN,
.chance = 20,

3
test/battle/move_effect/clanging_scales.c
View File

@ -3,12 +3,11 @@
ASSUMPTIONS
{
ASSUME(MoveHasMoveEffect(MOVE_CLANGING_SCALES, MOVE_EFFECT_DEF_MINUS_1) == TRUE);
ASSUME(MoveHasMoveEffectSelf(MOVE_CLANGING_SCALES, MOVE_EFFECT_DEF_MINUS_1) == TRUE);
}
DOUBLE_BATTLE_TEST("Clanging Scales lowers defense by one stage if it hits both targets")
{
KNOWN_FAILING; // Will be fixed by PR #3577 (move refactor)
GIVEN {
PLAYER(SPECIES_WOBBUFFET)
PLAYER(SPECIES_WOBBUFFET);