diff options
| author | Vortyne <104168801+Vortyne@users.noreply.github.com> | 2024-10-07 12:03:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-07 12:03:26 -0400 |
| commit | 678d014aef79fe62d38acfeb59cade17e6137f74 (patch) | |
| tree | 1fe09690d68c3b2f8e50544c7d3e03959bde2689 | |
| parent | `dbsprite` is the wrong macro for `WriteOAMBlock` data (#472) (diff) | |
| download | pokeyellow-678d014aef79fe62d38acfeb59cade17e6137f74.tar.gz pokeyellow-678d014aef79fe62d38acfeb59cade17e6137f74.tar.xz pokeyellow-678d014aef79fe62d38acfeb59cade17e6137f74.zip | |
`FreezeEnemyTrainerSprite` -> `SetEnemyTrainerToStayAndFaceAnyDirection`
| -rw-r--r-- | engine/overworld/auto_movement.asm | 6 | ||||
| -rw-r--r-- | home/map_objects.asm | 4 | ||||
| -rw-r--r-- | home/trainers.asm | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm index 8a45735f..0452176e 100644 --- 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 index e200238a..e0d9b6a5 100644 --- 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 index bcd15850..04752cc2 100644 --- 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:: |