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

Jump to bottom

Unified multi-strike move flags #3126

Merged
merged 2 commits into from
Jul 18, 2023
Merged

Unified multi-strike move flags #3126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3788001
Unified twoStrikes and threeStrikes flags into strikeCount
AsparagusEduardo Jul 14, 2023
0a0bc77
Decreased strikeCount max from 255 to 15.
AsparagusEduardo Jul 17, 2023
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: 1 addition & 2 deletions include/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,7 @@ struct BattleMove
u32 ignoreTypeIfFlyingAndUngrounded:1;
u32 thawsUser:1;
u32 ignoresSubstitute:1;
u32 twoStrikes:1; // May apply its effect on each hit.
u32 threeStrikes:1; // May apply its effect on each hit.
u32 strikeCount:4; // Max 15 hits. Defaults to 1 if not set. May apply its effect on each hit.
u32 meFirstBanned:1;
u32 gravityBanned:1;
u32 mimicBanned:1;
Expand Down
6 changes: 3 additions & 3 deletions src/battle_ai_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,9 +850,9 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef, u8 *typeEffectiveness,
}

// Handle other multi-strike moves
if (gBattleMoves[move].twoStrikes)
dmg *= 2;
else if (gBattleMoves[move].threeStrikes || (move == MOVE_WATER_SHURIKEN && gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH))
if (gBattleMoves[move].strikeCount > 1)
dmg *= gBattleMoves[move].strikeCount;
else if (move == MOVE_WATER_SHURIKEN && gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH)
dmg *= 3;

if (dmg == 0)
Expand Down
3 changes: 1 addition & 2 deletions src/battle_script_commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16031,8 +16031,7 @@ bool8 IsMoveAffectedByParentalBond(u16 move, u8 battlerId)
{
if (move != MOVE_NONE && move != MOVE_STRUGGLE
&& gBattleMoves[move].split != SPLIT_STATUS
&& !gBattleMoves[move].twoStrikes
&& !gBattleMoves[move].threeStrikes)
&& !gBattleMoves[move].strikeCount > 2)
{
u32 i;
for (i = 0; i < ARRAY_COUNT(sParentalBondBannedEffects); i++)
Expand Down
16 changes: 6 additions & 10 deletions src/battle_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3737,21 +3737,17 @@ u8 AtkCanceller_UnableToUseMove(void)

PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
}
else if (gBattleMoves[gCurrentMove].twoStrikes)
else if (gBattleMoves[gCurrentMove].strikeCount > 1)
{
gMultiHitCounter = 2;
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
if (gCurrentMove == MOVE_DRAGON_DARTS)
{
// TODO
}
gMultiHitCounter = gBattleMoves[gCurrentMove].strikeCount;
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 3, 0)
}
else if (gBattleMoves[gCurrentMove].effect == EFFECT_TRIPLE_KICK || gBattleMoves[gCurrentMove].threeStrikes)
else if (gBattleMoves[gCurrentMove].effect == EFFECT_TRIPLE_KICK)
{
gMultiHitCounter = 3;
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
}
#if B_BEAT_UP >= GEN_5
#if B_BEAT_UP >= GEN_5
else if (gBattleMoves[gCurrentMove].effect == EFFECT_BEAT_UP)
{
struct Pokemon* party = GetBattlerParty(gBattlerAttacker);
Expand All @@ -3769,7 +3765,7 @@ u8 AtkCanceller_UnableToUseMove(void)
gBattleStruct->beatUpSlot = 0;
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
}
#endif
#endif
gBattleStruct->atkCancellerTracker++;
break;
case CANCELLER_END:
Expand Down
24 changes: 12 additions & 12 deletions src/data/battle_moves.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.split = SPLIT_PHYSICAL,
.zMoveEffect = Z_EFFECT_NONE,
.makesContact = TRUE,
.twoStrikes = TRUE,
.strikeCount = 2,
},

[MOVE_MEGA_KICK] =
Expand Down Expand Up @@ -716,7 +716,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.zMoveEffect = Z_EFFECT_NONE,
.sheerForceBoost = TRUE,
.ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2
.twoStrikes = TRUE,
.strikeCount = 2,
},

[MOVE_PIN_MISSILE] =
Expand Down Expand Up @@ -2680,7 +2680,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.priority = 0,
.split = SPLIT_PHYSICAL,
.zMoveEffect = Z_EFFECT_NONE,
.twoStrikes = TRUE,
.strikeCount = 2,
},

[MOVE_REST] =
Expand Down Expand Up @@ -7767,7 +7767,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.split = SPLIT_PHYSICAL,
.zMoveEffect = Z_EFFECT_NONE,
.makesContact = TRUE,
.twoStrikes = TRUE,
.strikeCount = 2,
},

[MOVE_ROAR_OF_TIME] =
Expand Down Expand Up @@ -8930,7 +8930,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.split = SPLIT_PHYSICAL,
.zMoveEffect = Z_EFFECT_NONE,
.makesContact = TRUE,
.twoStrikes = TRUE,
.strikeCount = 2,
},

[MOVE_HEART_STAMP] =
Expand Down Expand Up @@ -9158,7 +9158,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.split = SPLIT_PHYSICAL,
.zMoveEffect = Z_EFFECT_NONE,
.makesContact = TRUE,
.twoStrikes = TRUE,
.strikeCount = 2,
},

[MOVE_SEARING_SHOT] =
Expand Down Expand Up @@ -11540,7 +11540,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.makesContact = TRUE,
.punchingMove = TRUE,
.sheerForceBoost = TRUE,
.twoStrikes = TRUE,
.strikeCount = 2,
.minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_8,
.metronomeBanned = TRUE,
},
Expand Down Expand Up @@ -11668,7 +11668,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.priority = 0,
.split = SPLIT_PHYSICAL,
.zMoveEffect = Z_EFFECT_NONE,
.twoStrikes = TRUE,
.strikeCount = 2,
},

[MOVE_TEATIME] =
Expand Down Expand Up @@ -12372,7 +12372,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.split = SPLIT_PHYSICAL,
.zMoveEffect = Z_EFFECT_NONE,
.makesContact = TRUE,
.twoStrikes = TRUE,
.strikeCount = 2,
},

[MOVE_SCORCHING_SANDS] =
Expand Down Expand Up @@ -12441,7 +12441,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.zMoveEffect = Z_EFFECT_NONE,
.makesContact = TRUE,
.punchingMove = TRUE,
.threeStrikes = TRUE,
.strikeCount = 3,
.metronomeBanned = TRUE,
},

Expand Down Expand Up @@ -13241,7 +13241,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.split = SPLIT_PHYSICAL,
.zMoveEffect = Z_EFFECT_NONE,
.makesContact = TRUE,
.threeStrikes = TRUE,
.strikeCount = 3,
},

[MOVE_MORTAL_SPIN] =
Expand Down Expand Up @@ -13566,7 +13566,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.priority = 0,
.split = SPLIT_SPECIAL,
.zMoveEffect = Z_EFFECT_NONE,
.twoStrikes = TRUE,
.strikeCount = 2,
.metronomeBanned = TRUE,
},

Expand Down
4 changes: 2 additions & 2 deletions test/move_flag_three_strikes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SINGLE_BATTLE_TEST("Three-strike flag turns a move into a 3-hit move")
s16 thirdHit;

GIVEN {
ASSUME(gBattleMoves[MOVE_TRIPLE_DIVE].threeStrikes);
ASSUME(gBattleMoves[MOVE_TRIPLE_DIVE].strikeCount == 3);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
Expand All @@ -34,7 +34,7 @@ SINGLE_BATTLE_TEST("Surging Strikes hits 3 times with each hit being a critical
s16 thirdHit;

GIVEN {
ASSUME(gBattleMoves[MOVE_SURGING_STRIKES].threeStrikes);
ASSUME(gBattleMoves[MOVE_SURGING_STRIKES].strikeCount == 3);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
Expand Down
Loading