diff options
| author | dannye <33dannye@gmail.com> | 2024-09-29 10:50:46 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-09-29 10:50:46 -0500 |
| commit | 716f8608c13fbee20b8fb71118e0691344098591 (patch) | |
| tree | a69f3805e6e8e372a8fe9c064aa77d76efbed3a3 /engine/pikachu/pikachu_emotions.asm | |
| parent | Identify more bit flags (#119) (diff) | |
| download | pokeyellow-716f8608c13fbee20b8fb71118e0691344098591.tar.gz pokeyellow-716f8608c13fbee20b8fb71118e0691344098591.tar.xz pokeyellow-716f8608c13fbee20b8fb71118e0691344098591.zip | |
Rename off-by-one wram labels
Diffstat (limited to 'engine/pikachu/pikachu_emotions.asm')
| -rw-r--r-- | engine/pikachu/pikachu_emotions.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm index de6230a6..a29fd781 100644 --- a/engine/pikachu/pikachu_emotions.asm +++ b/engine/pikachu/pikachu_emotions.asm @@ -1,5 +1,5 @@ IsPlayerTalkingToPikachu:: - ld a, [wd436] + ld a, [wd435] and a ret z ldh a, [hSpriteIndex] @@ -8,7 +8,7 @@ IsPlayerTalkingToPikachu:: call InitializePikachuTextID xor a ldh [hSpriteIndex], a - ld [wd436], a + ld [wd435], a ret InitializePikachuTextID:: @@ -343,7 +343,7 @@ MapSpecificPikachuExpression: ldpikaemotion a, PikachuEmotion22 jr c, .play_emotion .notInLavenderTower - ld a, [wd49c] + ld a, [wd49b] and a jr z, .mood_based_emotion dec a |