diff --git a/Add-Thief-Ball.md b/Add-Thief-Ball.md
index 7b9c29a..849a689 100644
--- a/Add-Thief-Ball.md
+++ b/Add-Thief-Ball.md
@@ -775,8 +775,7 @@ index b22577455..b8605454e 100644
      {
          gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
      }
--    else if (!FlagGet(FLAG_SYS_POKEDEX_GET))
-+    else if (!FlagGet(FLAG_SYS_POKEDEX_GET) || gUsingThiefBall == THIEF_BALL_CAUGHT)
+     else if (!FlagGet(FLAG_SYS_POKEDEX_GET))
      {
          HandleSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_SET_CAUGHT, personality);
          gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -841,9 +840,14 @@ index b7f0f693f..d1881fcf0 100644
  	finishturn
 +BattleScript_SuccessBallThrowEndThief::
 +	printstring STRINGID_GOTCHAPKMNCAUGHTNOBGM
++	trysetcaughtmondexflags BattleScript_SuccessBallThrowEndThiefGive
++	printstring STRINGID_PKMNDATAADDEDTODEX
++	waitstate
++BattleScript_SuccessBallThrowEndThiefGive::
++	printfromtable gCaughtMonStringIds
++	waitmessage B_WAIT_TIME_LONG
 +	givecaughtmon
 +	cleareffectsonfaint BS_TARGET
-+       trysetcaughtmondexflags BattleScript_HandleFaintedMon
 +       goto BattleScript_HandleFaintedMon
  
  BattleScript_WallyBallThrow::