Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some ball multiplier configs #3939

Merged
merged 6 commits into from
Jan 8, 2024
Merged

Fix some ball multiplier configs #3939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a5bd94
Fix some ball multiplier configs
Bassoonian Jan 7, 2024
44df39c
Updated the comment of B_LURE_BALL_MODIFIER
LOuroboros Jan 8, 2024
8ce9ae2
Specified the effects of B_LURE_BALL_MODIFIER in itsa state its effec…
LOuroboros Jan 8, 2024
909dc2f
Corrected the comments of B_DREAM_BALL_MODIFIER, B_SPORT_BALL_MODIFIE…
LOuroboros Jan 8, 2024
8484097
Turned the ternaries in the case for the Lure Ball's catch rate in Cm…
LOuroboros Jan 8, 2024
5bceff2
Merge branch 'upcoming' into pokeballrateupdates
AsparagusEduardo Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions include/config/battle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,11 @@
#define B_TIMER_BALL_MODIFIER GEN_LATEST // In Gen5+, Timer Ball's effectiveness increases by x0.3 per turn instead of x0.1
#define B_DUSK_BALL_MODIFIER GEN_LATEST // In Gen7+, Dusk Ball's catch multiplier is x3 instead of x3.5.
#define B_QUICK_BALL_MODIFIER GEN_LATEST // In Gen5+, Quick Ball's catch multiplier is x5 instead of x4.
#define B_LURE_BALL_MODIFIER GEN_LATEST // In Gen7+, Lure Ball's catch multiplier is x5 instead of x3.
#define B_LURE_BALL_MODIFIER GEN_LATEST // In Gen8+, Lure Ball's catch multiplier is x4. In Gen7, it's x5. In Gen6 and earlier, it's x3.
#define B_HEAVY_BALL_MODIFIER GEN_LATEST // In Gen7+, Heavy Ball's ranges change. See Cmd_handleballthrow.
#define B_DREAM_BALL_MODIFIER GEN_LATEST // 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_LATEST // In Gen8, Sport Ball's catch multiplier was reduced from x1.5 to x1.
#define B_DREAM_BALL_MODIFIER GEN_LATEST // 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_LATEST // In Gen8+, Sport Ball's catch multiplier was reduced from x1.5 to x1.
#define B_SAFARI_BALL_MODIFIER GEN_LATEST // In Gen8+, Safari Ball's catch multiplier was reduced from x1.5 to x1.
#define B_SERENE_GRACE_BOOST GEN_LATEST // In Gen5+, Serene Grace boosts the added flinch chance of King's Rock and Razor Fang.

// Flag settings
Expand Down
15 changes: 13 additions & 2 deletions src/battle_script_commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14839,10 +14839,14 @@ static void Cmd_handleballthrow(void)
case ITEM_SPORT_BALL:
if (B_SPORT_BALL_MODIFIER <= GEN_7)
ballMultiplier = 150;
break;
case ITEM_GREAT_BALL:
case ITEM_SAFARI_BALL:
ballMultiplier = 150;
break;
case ITEM_SAFARI_BALL:
if (B_SAFARI_BALL_MODIFIER <= GEN_7)
ballMultiplier = 150;
break;
case ITEM_NET_BALL:
if (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_WATER) || IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_BUG))
ballMultiplier = B_NET_BALL_MODIFIER >= GEN_7 ? 350 : 300;
Expand Down Expand Up @@ -14901,7 +14905,14 @@ static void Cmd_handleballthrow(void)
break;
case ITEM_LURE_BALL:
if (gIsFishingEncounter)
ballMultiplier = (B_LURE_BALL_MODIFIER >= GEN_7 ? 500 : 300);
{
if (B_LURE_BALL_MODIFIER >= GEN_8)
ballMultiplier = 400;
else if (B_LURE_BALL_MODIFIER >= GEN_7)
ballMultiplier = 500;
else
ballMultiplier = 300;
}
break;
case ITEM_MOON_BALL:
{
Expand Down
Loading