summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-04-15 10:55:16 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-04-15 10:55:16 -0400
commit102cdb8ee920be96b787948f38063daa3217a980 (patch)
tree9d2d30c021561e766c61e871763207f11e365d7e
parentbd597c33aa6cd9904707e66611748292a3f31475 (diff)
fallthrough
-rw-r--r--Turn-to-face-enemy-trainers-when-seen-by-them.md9
1 files changed, 4 insertions, 5 deletions
diff --git a/Turn-to-face-enemy-trainers-when-seen-by-them.md b/Turn-to-face-enemy-trainers-when-seen-by-them.md
index 212dbcf..ae5fa08 100644
--- a/Turn-to-face-enemy-trainers-when-seen-by-them.md
+++ b/Turn-to-face-enemy-trainers-when-seen-by-them.md
@@ -12,7 +12,9 @@ FaceEnemyTrainer::
jr z, .facingUp
cp SPRITE_FACING_LEFT
jr z, .facingLeft
- jr .facingRight
+; facing right
+ ld a, PLAYER_DIR_LEFT
+ jr .done
.facingDown
ld a, PLAYER_DIR_UP
jr .done
@@ -21,9 +23,6 @@ FaceEnemyTrainer::
jr .done
.facingLeft
ld a, PLAYER_DIR_RIGHT
- jr .done
-.facingRight
- ld a, PLAYER_DIR_LEFT
.done
ld [wPlayerMovingDirection], a ; update player facing
ret
@@ -52,4 +51,4 @@ Then scroll down a little to find `DisplayEnemyTrainerTextAndStartBattle::` and
ld [wJoyIgnore], a
ld a, [wSpriteIndex]
```
-This calls the new routine we wrote before, and continues on with the original code as if nothing ever happened. And it's as simple as that! Now when a trainer spots you and walks up to challenge you, you will turn to look at them before they start talking to you and start the battle, just like they do in every other Pokémon game that isn't Gen 1 or its remakes. \ No newline at end of file
+This calls the new routine we wrote before, and continues on with the original code as if nothing ever happened. And it's as simple as that! Now when a trainer spots you and walks up to challenge you, you will turn to look at them before they start talking to you and start the battle, just like they do in every other Pokémon game that isn't Gen 1 or its remakes.