From 4aeeb713939af8701dd4ac1c69b156cd02bcbbc9 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Fri, 24 Sep 2021 08:57:10 -0400 Subject: [PATCH 1/2] dream ball checks comatose --- src/battle_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 7580d0ef0e..2169342298 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -9958,7 +9958,7 @@ static void Cmd_handleballthrow(void) break; case ITEM_DREAM_BALL: #if I_DREAM_BALL_MODIFIER >= GEN_8 - if (gBattleMons[gBattlerTarget].status1 & STATUS1_SLEEP) + if (gBattleMons[gBattlerTarget].status1 & STATUS1_SLEEP || GetBattlerAbility(gBattlerTarget) == ABILITY_COMATOSE)) ballMultiplier = 40; #else ballMultiplier = 10; From 9ab29e993c6b3d29c404b25ffef07ae303f3313f Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Fri, 24 Sep 2021 08:58:51 -0400 Subject: [PATCH 2/2] add battle engine define check --- src/battle_script_commands.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 2169342298..f9f7c4fb91 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -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