mirror of https://github.com/pret/pokeemerald.git
Duplicate pokemon fix (what I get for developing at night)
parent
93c9beef02
commit
24069898e2
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue