diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-02-13 19:48:21 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-02-13 19:48:21 -0500 |
| commit | 205fd1ac81c2d1dcec010c478979bd6159edc72d (patch) | |
| tree | 00b70faa84c87265b6ee4e68f0df1fc4946afca2 /engine/pikachu | |
| parent | Proper translation comments in debug_menu.asm (diff) | |
| download | pokeyellow-205fd1ac81c2d1dcec010c478979bd6159edc72d.tar.gz pokeyellow-205fd1ac81c2d1dcec010c478979bd6159edc72d.tar.xz pokeyellow-205fd1ac81c2d1dcec010c478979bd6159edc72d.zip | |
Identify hUILayoutFlags and hPikachuSpriteVRAMOffset
Diffstat (limited to 'engine/pikachu')
| -rw-r--r-- | engine/pikachu/pikachu_emotions.asm | 4 | ||||
| -rw-r--r-- | engine/pikachu/pikachu_movement.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm index f4963f17..6647c4cc 100644 --- a/engine/pikachu/pikachu_emotions.asm +++ b/engine/pikachu/pikachu_emotions.asm @@ -414,7 +414,7 @@ INCLUDE "data/pikachu/pikachu_emotions.asm" PikachuWalksToNurseJoy: ld a, $40 - ldh [hFFFC], a + ldh [hPikachuSpriteVRAMOffset], a call LoadPikachuSpriteIntoVRAM call .GetMovementData and a @@ -422,7 +422,7 @@ PikachuWalksToNurseJoy: call ApplyPikachuMovementData .skip xor a - ldh [hFFFC], a + ldh [hPikachuSpriteVRAMOffset], a ret .GetMovementData: diff --git a/engine/pikachu/pikachu_movement.asm b/engine/pikachu/pikachu_movement.asm index 91c16999..6a0877c8 100644 --- a/engine/pikachu/pikachu_movement.asm +++ b/engine/pikachu/pikachu_movement.asm @@ -958,7 +958,7 @@ LoadPikachuSpriteIntoVRAM: call CopyVideoDataAlternate ld de, PikachuSprite + $c * $10 ld hl, vNPCSprites2 + $c * $10 - ldh a, [hFFFC] + ldh a, [hPikachuSpriteVRAMOffset] and a jr z, .load ld de, PikachuSprite + $c * $10 |