From 24069898e20aa9b9f6a9c423436d2242fe6d9d69 Mon Sep 17 00:00:00 2001 From: voloved <36523934+voloved@users.noreply.github.com> Date: Fri, 28 Jul 2023 00:52:43 -0400 Subject: [PATCH] Duplicate pokemon fix (what I get for developing at night) --- Add-Thief-Ball.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Add-Thief-Ball.md b/Add-Thief-Ball.md index 6668eb4..7223e92 100644 --- a/Add-Thief-Ball.md +++ b/Add-Thief-Ball.md @@ -839,19 +839,21 @@ index b7f0f693f..d1881fcf0 100644 BattleScript_SuccessBallThrowEnd:: setbyte gBattleOutcome, B_OUTCOME_CAUGHT finishturn -+BattleScript_SuccessBallThrowEndThief:: ++BattleScript_SuccessBallThrowThief:: + printstring STRINGID_GOTCHAPKMNCAUGHTNOBGM + trysetcaughtmondexflags BattleScript_SuccessBallThrowEndThiefGive + printstring STRINGID_PKMNDATAADDEDTODEX + waitstate +BattleScript_SuccessBallThrowEndThiefGive:: + setbyte gBattleCommunication, 4 -+ trygivecaughtmonnick BattleScript_SuccessBallThrowEndThiefEnd ++ trygivecaughtmonnick BattleScript_GiveCaughtMonEndThief + givecaughtmon + printfromtable gCaughtMonStringIds + waitmessage B_WAIT_TIME_LONG -+BattleScript_SuccessBallThrowEndThiefEnd:: ++ goto BattleScript_SuccessBallThrowEndThief ++BattleScript_GiveCaughtMonEndThief:: + givecaughtmon ++BattleScript_SuccessBallThrowEndThief:: + cleareffectsonfaint BS_TARGET + goto BattleScript_HandleFaintedMon