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

Jump to bottom

Config for trying to catch a Trainer's Pokémon #3684

Merged
merged 2 commits into from
Dec 10, 2023
Merged

Config for trying to catch a Trainer's Pokémon #3684

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b94309c
Config for trying to catch a Trainer's Pokémon
Bassoonian Dec 10, 2023
2ae4cbe
Prevent removal instead of adding it back
Bassoonian Dec 10, 2023
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
1 change: 1 addition & 0 deletions include/config/battle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@
#define B_USE_FROSTBITE FALSE // In PLA, Frostbite replaces Freeze. Enabling this flag does the same here. Moves can still be cherry-picked to either Freeze or Frostbite. Freeze-Dry, Secret Power & Tri Attack depend on this config.
#define B_OVERWORLD_SNOW GEN_LATEST // In Gen9+, overworld Snow will summon snow instead of hail.
#define B_TOXIC_REVERSAL GEN_LATEST // In Gen5+, bad poison will change to regular poison at the end of battles.
#define B_TRY_CATCH_TRAINER_BALL GEN_LATEST // In Gen4+, trying to catch a Trainer's Pokémon does not consume the Poké Ball.

// Animation Settings
#define B_NEW_SWORD_PARTICLE TRUE // If set to TRUE, it updates Swords Dance's particle.
Expand Down
2 changes: 2 additions & 0 deletions src/battle_script_commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14758,6 +14758,8 @@ static void Cmd_handleballthrow(void)

if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{
if (B_TRY_CATCH_TRAINER_BALL >= GEN_4)
AddBagItem(gLastUsedItem, 1);
Bassoonian marked this conversation as resolved.
Show resolved Hide resolved
BtlController_EmitBallThrowAnim(gBattlerAttacker, BUFFER_A, BALL_TRAINER_BLOCK);
MarkBattlerForControllerExec(gBattlerAttacker);
gBattlescriptCurrInstr = BattleScript_TrainerBallBlock;
Expand Down
Loading