Skip to content

Commit

Permalink
Updated Sport Ball's modifier.
Browse files Browse the repository at this point in the history
  • Loading branch information
AsparagusEduardo committed Sep 4, 2022
1 parent ce3dec4 commit 89550ed
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions include/constants/battle_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@
#define B_LURE_BALL_MODIFIER GEN_7 // In Gen7+, Lure Ball's catch multiplier is x5 instead of x3.
#define B_HEAVY_BALL_MODIFIER GEN_7 // In Gen7+, Heavy Ball's ranges change. See Cmd_handleballthrow.
#define B_DREAM_BALL_MODIFIER GEN_8 // In Gen8, Dream Ball's catch multiplier is x4 when the target is asleep or has the ability Comatose.
#define B_SPORT_BALL_MODIFIER GEN_8 // In Gen8, Sport Ball's catch multiplier was reduced from x1.5 to x1.
#define B_SERENE_GRACE_BOOST GEN_7 // In Gen5+, Serene Grace boosts the added flinch chance of King's Rock and Razor Fang.

// Flag settings
Expand Down
4 changes: 3 additions & 1 deletion src/battle_script_commands.c
Original file line number Diff line number Diff line change
Expand Up @@ -13722,9 +13722,11 @@ static void Cmd_handleballthrow(void)
case ITEM_ULTRA_BALL:
ballMultiplier = 20;
break;
#if B_SPORT_BALL_MODIFIER <= GEN_7
case ITEM_SPORT_BALL:
#endif
case ITEM_GREAT_BALL:
case ITEM_SAFARI_BALL:
case ITEM_SPORT_BALL:
ballMultiplier = 15;
break;
case ITEM_NET_BALL:
Expand Down

0 comments on commit 89550ed

Please sign in to comment.