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/pokemon/learn_move.asm | 12 ++++++------ engine/pokemon/status_screen.asm | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'engine/pokemon') diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm index d365acd4..ff704003 100644 --- a/engine/pokemon/learn_move.asm +++ b/engine/pokemon/learn_move.asm @@ -125,13 +125,13 @@ TryingToLearn: call TextBoxBorder hlcoord 6, 8 ld de, wMovesString - ldh a, [hFlagsFFFA] + ldh a, [hUILayoutFlags] set 2, a - ldh [hFlagsFFFA], a + ldh [hUILayoutFlags], a call PlaceString - ldh a, [hFlagsFFFA] + ldh a, [hUILayoutFlags] res 2, a - ldh [hFlagsFFFA], a + ldh [hUILayoutFlags], a ld hl, wTopMenuItemY ld a, 8 ld [hli], a ; wTopMenuItemY @@ -145,10 +145,10 @@ TryingToLearn: ld a, A_BUTTON | B_BUTTON ld [hli], a ; wMenuWatchedKeys ld [hl], 0 ; wLastMenuItem - ld hl, hFlagsFFFA + ld hl, hUILayoutFlags set 1, [hl] call HandleMenuInput - ld hl, hFlagsFFFA + ld hl, hUILayoutFlags res 1, [hl] push af call LoadScreenTilesFromBuffer1 diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm index f1f3aa26..0adfc217 100644 --- a/engine/pokemon/status_screen.asm +++ b/engine/pokemon/status_screen.asm @@ -40,7 +40,7 @@ DrawHP_: push hl call DrawHPBar pop hl - ldh a, [hFlagsFFFA] + ldh a, [hUILayoutFlags] bit 0, a jr z, .printFractionBelowBar ld bc, $9 ; right of bar -- cgit v1.3.1-sl0p