From 2bb64d11e6015e39e934e7359697c08636645994 Mon Sep 17 00:00:00 2001
From: dannye <corrnondacqb@yahoo.com>
Date: Mon, 6 Jun 2016 11:04:20 -0500
Subject: Clean up main.asm recreated deleted file that never should have been
 unused

---
 engine/overworld/npc_movement_2.asm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100755 engine/overworld/npc_movement_2.asm

(limited to 'engine/overworld')

diff --git a/engine/overworld/npc_movement_2.asm b/engine/overworld/npc_movement_2.asm
new file mode 100755
index 00000000..c5e11aa0
--- /dev/null
+++ b/engine/overworld/npc_movement_2.asm
@@ -0,0 +1,24 @@
+FreezeEnemyTrainerSprite: ; eaa02 (3a:6a02)
+	ld a, [wCurMap]
+	cp POKEMONTOWER_7
+	ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them
+	ld hl, RivalIDs
+	ld a, [wEngagedTrainerClass]
+	ld b, a
+.loop
+	ld a, [hli]
+	cp $ff
+	jr z, .notRival
+	cp b
+	ret z ; the rival leaves after battling, so don't freeze him
+	jr .loop
+.notRival
+	ld a, [wSpriteIndex]
+	ld [H_SPRITEINDEX], a
+	jp SetSpriteMovementBytesToFF
+
+RivalIDs: ; eaa20 (3a:6a20)
+	db OPP_SONY1
+	db OPP_SONY2
+	db OPP_SONY3
+	db $ff
-- 
cgit v1.3.1-sl0p