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

Rock Smash: Do not soft reset after catching a Pokémon #633

Merged
merged 1 commit into from
Jan 20, 2025
Merged

Rock Smash: Do not soft reset after catching a Pokémon #633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions modules/modes/rock_smash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ def on_battle_started(self, encounter: EncounterInfo | None) -> BattleAction | N
return handle_encounter(encounter)

def on_battle_ended(self, outcome: "BattleOutcome") -> None:
if outcome is BattleOutcome.Caught and not context.config.battle.save_after_catching:
context.message = (
"A Pokémon has been caught. Switching to manual mode so we don't lose it when soft-resetting."
)
context.set_manual_mode()

if not outcome == BattleOutcome.Lost:
assert_player_has_poke_balls()

Expand Down
Loading