Duplicate pokemon fix (what I get for developing at night)

voloved 2023-07-28 00:52:43 -04:00
parent 93c9beef02
commit 24069898e2
1 changed files with 5 additions and 3 deletions

@ -839,19 +839,21 @@ index b7f0f693f..d1881fcf0 100644
BattleScript_SuccessBallThrowEnd:: BattleScript_SuccessBallThrowEnd::
setbyte gBattleOutcome, B_OUTCOME_CAUGHT setbyte gBattleOutcome, B_OUTCOME_CAUGHT
finishturn finishturn
+BattleScript_SuccessBallThrowEndThief:: +BattleScript_SuccessBallThrowThief::
+ printstring STRINGID_GOTCHAPKMNCAUGHTNOBGM + printstring STRINGID_GOTCHAPKMNCAUGHTNOBGM
+ trysetcaughtmondexflags BattleScript_SuccessBallThrowEndThiefGive + trysetcaughtmondexflags BattleScript_SuccessBallThrowEndThiefGive
+ printstring STRINGID_PKMNDATAADDEDTODEX + printstring STRINGID_PKMNDATAADDEDTODEX
+ waitstate + waitstate
+BattleScript_SuccessBallThrowEndThiefGive:: +BattleScript_SuccessBallThrowEndThiefGive::
+ setbyte gBattleCommunication, 4 + setbyte gBattleCommunication, 4
+ trygivecaughtmonnick BattleScript_SuccessBallThrowEndThiefEnd + trygivecaughtmonnick BattleScript_GiveCaughtMonEndThief
+ givecaughtmon + givecaughtmon
+ printfromtable gCaughtMonStringIds + printfromtable gCaughtMonStringIds
+ waitmessage B_WAIT_TIME_LONG + waitmessage B_WAIT_TIME_LONG
+BattleScript_SuccessBallThrowEndThiefEnd:: + goto BattleScript_SuccessBallThrowEndThief
+BattleScript_GiveCaughtMonEndThief::
+ givecaughtmon + givecaughtmon
+BattleScript_SuccessBallThrowEndThief::
+ cleareffectsonfaint BS_TARGET + cleareffectsonfaint BS_TARGET
+ goto BattleScript_HandleFaintedMon + goto BattleScript_HandleFaintedMon