From 205fd1ac81c2d1dcec010c478979bd6159edc72d Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 13 Feb 2021 19:48:21 -0500 Subject: Identify hUILayoutFlags and hPikachuSpriteVRAMOffset --- engine/pikachu/pikachu_emotions.asm | 4 ++-- engine/pikachu/pikachu_movement.asm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/pikachu') 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 -- cgit v1.3.1-sl0p