diff --git a/P3D/Battle/BattleSystemV2/BattleScreen.vb b/P3D/Battle/BattleSystemV2/BattleScreen.vb index 5f68424f6..b10085531 100644 --- a/P3D/Battle/BattleSystemV2/BattleScreen.vb +++ b/P3D/Battle/BattleSystemV2/BattleScreen.vb @@ -1391,17 +1391,18 @@ nextIndex: End If p.ResetTemp() Next - If ItemReturnScript <> "" Then + If ItemReturnScript <> "@Text.Show(" Then ItemReturnScript &= ")" + + Dim s As String = + "version=2" & Environment.NewLine & + ItemReturnScript & Environment.NewLine & + ":end" + + CType(SavedOverworld.OverworldScreen, OverworldScreen).ActionScript.StartScript(s, 2, False) + End If - Dim s As String = - "version=2" & Environment.NewLine & - ItemReturnScript & Environment.NewLine & - ":end" - - CType(SavedOverworld.OverworldScreen, OverworldScreen).ActionScript.StartScript(s, 2, False) - If hasLevelUp = False Then Core.SetScreen(New TransitionScreen(Me, SavedOverworld.OverworldScreen, New Color(255, 255, 255), False, AddressOf ChangeSavedScreen)) Else @@ -1492,17 +1493,18 @@ nextIndex: End If p.ResetTemp() Next - If ItemReturnScript <> "" Then + If ItemReturnScript <> "@Text.Show(" Then ItemReturnScript &= ")" + + Dim s As String = + "version=2" & Environment.NewLine & + ItemReturnScript & Environment.NewLine & + ":end" + + CType(SavedOverworld.OverworldScreen, OverworldScreen).ActionScript.StartScript(s, 2, False) + End If - Dim s As String = - "version=2" & Environment.NewLine & - ItemReturnScript & Environment.NewLine & - ":end" - - CType(SavedOverworld.OverworldScreen, OverworldScreen).ActionScript.StartScript(s, 2, False) - FieldEffects.OwnRageFistPower = 0 FieldEffects.OppRageFistPower = 0