diff options
| author | dannye <33dannye@gmail.com> | 2024-10-09 21:56:57 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-10-09 21:56:57 -0500 |
| commit | 942c5f13eadb828dbf9dd6f75dfece007b53f353 (patch) | |
| tree | 0013406b83f352bed3f9b8247e7a73d11a150828 /engine/overworld/npc_movement_2.asm | |
| parent | Rename off-by-one wram labels (diff) | |
| parent | Renamed pokemon-asm-tools to gb-asm-tools (diff) | |
| download | pokeyellow-942c5f13eadb828dbf9dd6f75dfece007b53f353.tar.gz pokeyellow-942c5f13eadb828dbf9dd6f75dfece007b53f353.tar.xz pokeyellow-942c5f13eadb828dbf9dd6f75dfece007b53f353.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/overworld/npc_movement_2.asm')
| -rw-r--r-- | engine/overworld/npc_movement_2.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/npc_movement_2.asm b/engine/overworld/npc_movement_2.asm index 2ced9da6..bca9bf52 100644 --- a/engine/overworld/npc_movement_2.asm +++ b/engine/overworld/npc_movement_2.asm @@ -1,7 +1,7 @@ -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 @@ -10,7 +10,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] |