diff --git a/P3D/Player/Player.vb b/P3D/Player/Player.vb
index e02784e57..e475ef3c5 100644
--- a/P3D/Player/Player.vb
+++ b/P3D/Player/Player.vb
@@ -1894,6 +1894,10 @@
                         For i = 0 To Core.Player.Pokemons.Count - 1
                             If Core.Player.Pokemons(i).HP <= 0 Then
                                 Core.Player.Pokemons(i).Status = Pokemon.StatusProblems.Fainted
+                                Screen.TextBox.Show(Core.Player.Pokemons(i).GetDisplayName & " Fainted.")
+                            End If
+                            If Core.Player.CountFightablePokemon = 0 Then
+                                Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New BlackOutScreen(Core.CurrentScreen), Color.Black, False))
                             End If
                         Next
                     ElseIf CInt(GameModeManager.GetGameRuleValue("OverworldPoison", "0")) = 2 Then
@@ -1901,7 +1905,7 @@
                             If Core.Player.Pokemons(i).HP <= 1 Then
                                 Core.Player.Pokemons(i).Status = Pokemon.StatusProblems.None
                                 Core.Player.Pokemons(i).HP = 1
-                                Screen.TextBox.Show(Core.Player.Pokemons(i).GetDisplayName & "was cured of Poison")
+                                Screen.TextBox.Show(Core.Player.Pokemons(i).GetDisplayName & " was cured of Poison.")
                             End If
                         Next
                     End If