diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-02-13 19:48:34 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-02-13 19:48:34 -0500 |
| commit | 95353fdefa95440eba012509722f2058739d45fe (patch) | |
| tree | 224e69bcaafc7427f407bc9678e7bf2e8784cb51 /engine/pokemon | |
| parent | Remove .gitmodules (diff) | |
| download | pokeyellow-95353fdefa95440eba012509722f2058739d45fe.tar.gz pokeyellow-95353fdefa95440eba012509722f2058739d45fe.tar.xz pokeyellow-95353fdefa95440eba012509722f2058739d45fe.zip | |
Identify hUILayoutFlags
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/learn_move.asm | 12 | ||||
| -rw-r--r-- | engine/pokemon/status_screen.asm | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm index 8e852fd4..4deb3f0b 100644 --- a/engine/pokemon/learn_move.asm +++ b/engine/pokemon/learn_move.asm @@ -126,13 +126,13 @@ TryingToLearn: call TextBoxBorder hlcoord 6, 8 ld de, wMovesString - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] set 2, a - ldh [hFlagsFFF6], a + ldh [hUILayoutFlags], a call PlaceString - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] res 2, a - ldh [hFlagsFFF6], a + ldh [hUILayoutFlags], a ld hl, wTopMenuItemY ld a, 8 ld [hli], a ; wTopMenuItemY @@ -146,10 +146,10 @@ TryingToLearn: ld a, A_BUTTON | B_BUTTON ld [hli], a ; wMenuWatchedKeys ld [hl], 0 ; wLastMenuItem - ld hl, hFlagsFFF6 + ld hl, hUILayoutFlags set 1, [hl] call HandleMenuInput - ld hl, hFlagsFFF6 + 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 33fef9e4..ac03514a 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, [hFlagsFFF6] + ldh a, [hUILayoutFlags] bit 0, a jr z, .printFractionBelowBar ld bc, $9 ; right of bar |