ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1681 from ghoulslash/dream_ball

Browse Source 
Dream ball checks comatose
This commit is contained in:
Eduardo Quezada D'Ottone 2021-09-25 11:53:17 -03:00 committed by GitHub
commit 48492997f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_script_commands.c
View File

@ -9958,8 +9958,12 @@ static void Cmd_handleballthrow(void)
break;
case ITEM_DREAM_BALL:
#if I_DREAM_BALL_MODIFIER >= GEN_8
#ifdef BATTLE_ENGINE
if (gBattleMons[gBattlerTarget].status1 & STATUS1_SLEEP || GetBattlerAbility(gBattlerTarget) == ABILITY_COMATOSE))
#else
if (gBattleMons[gBattlerTarget].status1 & STATUS1_SLEEP)
ballMultiplier = 40;
#endif
#else
ballMultiplier = 10;
#endif