From a79c094df38da08a04844e2dd890e2b6a903a152 Mon Sep 17 00:00:00 2001
From: The Immortal <the_immortal123@live.com>
Date: Sun, 2 Feb 2020 23:18:52 +0400
Subject: [PATCH] Update No Retreat mechanics

---
 data/moves.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/data/moves.js b/data/moves.js
index 18d81615ac..f8d9f7283b 100644
--- a/data/moves.js
+++ b/data/moves.js
@@ -13054,12 +13054,11 @@ let BattleMovedex = {
 		pp: 5,
 		priority: 0,
 		flags: {snatch: 1},
-		volatileStatus: 'noretreat',
-		onTryMove(pokemon, target, move) {
-			if (!pokemon.volatiles['noretreat']) return;
-			this.add('-fail', pokemon, 'move: No Retreat');
-			this.attrLastMove('[still]');
-			return null;
+		onTryHit(pokemon) {
+			if (pokemon.volatiles['noretreat']) return false;
+			if (!pokemon.volatiles['trapped']) {
+				pokemon.addVolatile('noretreat');
+			}
 		},
 		effect: {
 			onStart(pokemon) {