diff options
| author | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
| commit | a02a98ee7ada1a658e28698484058be2796dc0df (patch) | |
| tree | 945986054565bd8b5212fc755415096050d1d3a8 /engine/pikachu/pikachu_emotions.asm | |
| parent | Use long option flags for rgbgfx, same as tools/gfx (diff) | |
| parent | Use `const_skip` (diff) | |
| download | pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.gz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.xz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/pikachu/pikachu_emotions.asm')
| -rw-r--r-- | engine/pikachu/pikachu_emotions.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm index 71020138..de6230a6 100644 --- a/engine/pikachu/pikachu_emotions.asm +++ b/engine/pikachu/pikachu_emotions.asm @@ -2,18 +2,18 @@ IsPlayerTalkingToPikachu:: ld a, [wd436] and a ret z - ldh a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndex] cp $f ret nz call InitializePikachuTextID xor a - ldh [hSpriteIndexOrTextID], a + ldh [hSpriteIndex], a ld [wd436], a ret InitializePikachuTextID:: ld a, TEXT_PIKACHU_ANIM ; display - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a xor a ld [wPlayerMovingDirection], a ld a, $1 @@ -166,8 +166,8 @@ StarterPikachuEmotionCommand_subcmd: StarterPikachuEmotionCommand_nop2: IF DEF(_DEBUG) push hl - ld hl, wd732 - bit 1, [hl] + ld hl, wStatusFlags6 + bit BIT_DEBUG_MODE, [hl] pop hl ret z push de @@ -213,8 +213,8 @@ REPT 5 ENDR IF DEF(_DEBUG) push hl - ld hl, wd732 - bit 1, [hl] + ld hl, wStatusFlags6 + bit BIT_DEBUG_MODE, [hl] pop hl ret z push de |