diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /engine/pikachu_emotions.asm | |
| parent | b8954732a3eaa3a784a6e3eaaa68977a9ccd9816 (diff) | |
| parent | 33456b8fb28ef547a54d04d22baa2313b72fdb1d (diff) | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to 'engine/pikachu_emotions.asm')
| -rwxr-xr-x | engine/pikachu_emotions.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/pikachu_emotions.asm b/engine/pikachu_emotions.asm index b3b64970..1518b28e 100755 --- a/engine/pikachu_emotions.asm +++ b/engine/pikachu_emotions.asm @@ -281,9 +281,9 @@ MapSpecificPikachuExpression: ldpikaemotion a, PikachuEmotion28 jr c, .play_emotion ld a, [wCurMap] - cp POKEMONTOWER_1 + cp POKEMON_TOWER_1F jr c, .notInLavenderTower - cp POKEMONTOWER_7 + 1 + cp POKEMON_TOWER_7F + 1 ldpikaemotion a, PikachuEmotion22 jr c, .play_emotion .notInLavenderTower |