FreezeEnemyTrainerSprite

1 files changed, 23 insertions, 1 deletions

diff --git a/main.asm b/main.asm
index 15d9168d..8309a373 100755
--- a/main.asm
+++ b/main.asm
@@ -894,7 +894,29 @@ SurfingPikachu3Graphics:  INCBIN "gfx/surfing_pikachu_3.t1.2bpp"
 
 	dr $ea3ea,$eaa02
 FreezeEnemyTrainerSprite: ; eaa02 (3a:6a02)
-	dr $eaa02,$eaa24
+	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
 
 SECTION "bank3C",ROMX,BANK[$3C]