atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'RHH/master' into RHH/upcoming

Browse source
This commit is contained in:
Eduardo Quezada 2023-12-11 17:42:11 -03:00
commit 95bdc9a135
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/battle_main.c
View file

@ -4669,6 +4669,9 @@ s8 GetMovePriority(u32 battler, u16 move)
s8 priority; s8 priority;
u16 ability = GetBattlerAbility(battler); u16 ability = GetBattlerAbility(battler);
if (gBattleStruct->zmove.toBeUsed[battler] && gBattleMoves[move].power != 0)
move = gBattleStruct->zmove.toBeUsed[battler];
priority = gBattleMoves[move].priority; priority = gBattleMoves[move].priority;
// Max Guard check // Max Guard check

6
src/data/battle_moves.h
View file

@ -6574,7 +6574,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
[MOVE_METAL_BURST] = [MOVE_METAL_BURST] =
{ {
.effect = EFFECT_METAL_BURST, .effect = EFFECT_METAL_BURST,
.power = 0, .power = 1,
.type = TYPE_STEEL, .type = TYPE_STEEL,
.accuracy = 100, .accuracy = 100,
.pp = 10, .pp = 10,
@ -6701,7 +6701,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
[MOVE_TRUMP_CARD] = [MOVE_TRUMP_CARD] =
{ {
.effect = EFFECT_TRUMP_CARD, .effect = EFFECT_TRUMP_CARD,
.power = 0, .power = 1,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 0, .accuracy = 0,
.pp = 5, .pp = 5,
@ -14216,7 +14216,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] =
[MOVE_COMEUPPANCE] = [MOVE_COMEUPPANCE] =
{ {
.effect = EFFECT_METAL_BURST, .effect = EFFECT_METAL_BURST,
.power = 0, .power = 1,
.type = TYPE_DARK, .type = TYPE_DARK,
.accuracy = 100, .accuracy = 100,
.pp = 10, .pp = 10,