FreezeEnemyTrainerSprite -> SetEnemyTrainerToStayAndFaceAnyDirection

pret · Oct 7, 2024 · 678d014 · 678d014
1 parent 1aa3fb2
commit 678d014
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm
@@ -266,10 +266,10 @@ RLEList_PewterGymGuy:
 	db NPC_MOVEMENT_RIGHT, 3
 	db -1 ; end
 
-FreezeEnemyTrainerSprite::
+SetEnemyTrainerToStayAndFaceAnyDirection::
 	ld a, [wCurMap]
 	cp POKEMON_TOWER_7F
-	ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them
+	ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't set them
 	ld hl, RivalIDs
 	ld a, [wEngagedTrainerClass]
 	ld b, a
@@ -278,7 +278,7 @@ FreezeEnemyTrainerSprite::
 	cp -1
 	jr z, .notRival
 	cp b
-	ret z ; the rival leaves after battling, so don't freeze him
+	ret z ; the rival leaves after battling, so don't set him
 	jr .loop
 .notRival
 	ld a, [wSpriteIndex]

diff --git a/home/map_objects.asm b/home/map_objects.asm
@@ -219,9 +219,9 @@ SetSpriteMovementBytesToFE::
 SetSpriteMovementBytesToFF::
 	push hl
 	call GetSpriteMovementByte1Pointer
-	ld [hl], $FF
+	ld [hl], STAY
 	call GetSpriteMovementByte2Pointer
-	ld [hl], $FF ; prevent person from walking?
+	ld [hl], NONE
 	pop hl
 	ret
 

diff --git a/home/trainers.asm b/home/trainers.asm
@@ -358,7 +358,7 @@ PrintEndBattleText::
 	pop af
 	ldh [hLoadedROMBank], a
 	ld [MBC1RomBank], a
-	farcall FreezeEnemyTrainerSprite
+	farcall SetEnemyTrainerToStayAndFaceAnyDirection
 	jp WaitForSoundToFinish
 
 GetSavedEndBattleTextPointer::