Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-04-26 02:14:22 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

moveend: Handle MOVE_UNAVAILABLE in MOVEEND_THIRD_MOVE_BLOCK (#8215)
Some checks are pending
CI / build (push) Waiting to run
Details
CI / allcontributors (push) Waiting to run
Details

Browse Source
This commit is contained in:
Martin Griffin 2025-11-11 21:01:16 +00:00 committed by GitHub
parent 44453888df
commit 2373f0283b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_script_commands.c
View File

@ -6910,6 +6910,12 @@ static void Cmd_moveend(void)
gBattleScripting.moveendState++;
break;
case MOVEEND_THIRD_MOVE_BLOCK:
if (gChosenMove == MOVE_UNAVAILABLE)
{
gBattleScripting.moveendState++;
break;
}
// Special case for Steel Roller since it has to check the chosen move
if (GetMoveEffect(gChosenMove) == EFFECT_STEEL_ROLLER && IsBattlerTurnDamaged(gBattlerTarget))
{