From e320e6f7fff0ef650dbe8469b335afa3a8d5af79 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 17 Oct 2020 02:44:09 -0300 Subject: [PATCH] Quick Ball config. --- include/constants/item_config.h | 1 + src/battle_script_commands.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/constants/item_config.h b/include/constants/item_config.h index 4da6630eb8..04eb7a5470 100644 --- a/include/constants/item_config.h +++ b/include/constants/item_config.h @@ -27,5 +27,6 @@ #define P_TIMER_BALL_MODIFIER GEN_7 // In Gen5+, Timer Ball's effectiveness increases by x0.3 per turn instead of x0.1 #define P_DIVE_BALL_MODIFIER GEN_3 // In Gen4+, Dive Ball's effectiveness increases by when Surfing or Fishing. #define P_DUSK_BALL_MODIFIER GEN_7 // In Gen7+, Net Ball's catch multiplier is x3 instead of x3.5. +#define P_QUICK_BALL_MODIFIER GEN_7 // In Gen5+, Quick Ball's catch multiplier is x5 instead of x4. #endif // GUARD_CONSTANTS_ITEM_CONFIG_H diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a508a520bd..0e087266b7 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -9911,7 +9911,11 @@ static void Cmd_handleballthrow(void) break; case ITEM_QUICK_BALL: if (gBattleResults.battleTurnCounter == 0) - ballMultiplier = 40; + #if P_QUICK_BALL_MODIFIER >= GEN_5 + ballMultiplier = 50; + #else + ballMultiplier = 40; + #endif break; case ITEM_DUSK_BALL: RtcCalcLocalTime();