diff options
| -rw-r--r-- | engine/battle/core.asm | 12 | ||||
| -rw-r--r-- | engine/gfx/hp_bar.asm | 2 | ||||
| -rw-r--r-- | engine/items/item_effects.asm | 16 | ||||
| -rw-r--r-- | engine/link/cable_club.asm | 8 | ||||
| -rw-r--r-- | engine/menus/party_menu.asm | 8 | ||||
| -rw-r--r-- | engine/menus/save.asm | 8 | ||||
| -rw-r--r-- | engine/pokemon/learn_move.asm | 12 | ||||
| -rw-r--r-- | engine/pokemon/status_screen.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 2 | ||||
| -rw-r--r-- | home/window.asm | 4 | ||||
| -rw-r--r-- | hram.asm | 2 |
11 files changed, 38 insertions, 38 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 417516ae..433c62df 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2472,13 +2472,13 @@ MoveSelectionMenu: .writemoves 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 ret .regularmenu @@ -2598,10 +2598,10 @@ SelectMenuItem: call AddNTimes ld [hl], "▷" .select - ld hl, hFlagsFFF6 + ld hl, hUILayoutFlags set 1, [hl] call HandleMenuInput - ld hl, hFlagsFFF6 + ld hl, hUILayoutFlags res 1, [hl] bit BIT_D_UP, a jp nz, SelectMenuItem_CursorUp diff --git a/engine/gfx/hp_bar.asm b/engine/gfx/hp_bar.asm index b7bd97f2..e4de0b95 100644 --- a/engine/gfx/hp_bar.asm +++ b/engine/gfx/hp_bar.asm @@ -213,7 +213,7 @@ UpdateHPBar_PrintHPNumber: ld a, [wHPBarOldHP + 1] ld [wHPBarTempHP], a push hl - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] bit 0, a jr z, .asm_fb15 ld de, $9 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index d4164332..804a316d 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1051,15 +1051,15 @@ ItemUseMedicine: call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled ld a, SFX_HEAL_HP call PlaySoundWaitForCurrent - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] set 0, a - ldh [hFlagsFFF6], a + ldh [hUILayoutFlags], a ld a, $02 ld [wHPBarType], a predef UpdateHPBar2 ; animate HP bar decrease of pokemon that used Softboiled - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] res 0, a - ldh [hFlagsFFF6], a + ldh [hUILayoutFlags], a pop af ld b, a ; store heal amount (1/5 of max HP) ld hl, wHPBarOldHP + 1 @@ -1201,15 +1201,15 @@ ItemUseMedicine: jr z, .playStatusAilmentCuringSound ld a, SFX_HEAL_HP call PlaySoundWaitForCurrent - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] set 0, a - ldh [hFlagsFFF6], a + ldh [hUILayoutFlags], a ld a, $02 ld [wHPBarType], a predef UpdateHPBar2 ; animate the HP bar lengthening - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] res 0, a - ldh [hFlagsFFF6], a + ldh [hUILayoutFlags], a ld a, REVIVE_MSG ld [wPartyMenuTypeOrMessageID], a ld a, [wcf91] diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index 71afde1e..b6389fe3 100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm @@ -338,10 +338,10 @@ TradeCenter_SelectMon: ld a, 1 ld [wTopMenuItemX], a .enemyMonMenu_HandleInput - ld hl, hFlagsFFF6 + ld hl, hUILayoutFlags set 1, [hl] call HandleMenuInput - ld hl, hFlagsFFF6 + ld hl, hUILayoutFlags res 1, [hl] and a jp z, .getNewInput @@ -403,10 +403,10 @@ TradeCenter_SelectMon: lb bc, 6, 1 call ClearScreenArea .playerMonMenu_HandleInput - ld hl, hFlagsFFF6 + ld hl, hUILayoutFlags set 1, [hl] call HandleMenuInput - ld hl, hFlagsFFF6 + ld hl, hUILayoutFlags res 1, [hl] and a ; was anything pressed? jr nz, .playerMonMenu_SomethingPressed diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm index 6648ab54..ddb92f75 100644 --- a/engine/menus/party_menu.asm +++ b/engine/menus/party_menu.asm @@ -69,14 +69,14 @@ RedrawPartyMenu_:: pop hl push hl ld bc, SCREEN_WIDTH + 1 ; down 1 row and right 1 column - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] set 0, a - ldh [hFlagsFFF6], a + ldh [hUILayoutFlags], a add hl, bc predef DrawHP2 ; draw HP bar and prints current / max HP - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] res 0, a - ldh [hFlagsFFF6], a + ldh [hUILayoutFlags], a call SetPartyMenuHPBarColor ; color the HP bar (on SGB) pop hl jr .printLevel diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 194fb810..dc2e27c2 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -351,10 +351,10 @@ ChangeBox:: call z, EmptyAllSRAMBoxes ; if so, empty all boxes in SRAM call DisplayChangeBoxMenu call UpdateSprites - ld hl, hFlagsFFF6 + ld hl, hUILayoutFlags set 1, [hl] call HandleMenuInput - ld hl, hFlagsFFF6 + ld hl, hUILayoutFlags res 1, [hl] bit 1, a ; pressed b ret nz @@ -445,12 +445,12 @@ DisplayChangeBoxMenu: ld b, 12 ld c, 7 call TextBoxBorder - ld hl, hFlagsFFF6 + ld hl, hUILayoutFlags set 2, [hl] ld de, BoxNames hlcoord 13, 1 call PlaceString - ld hl, hFlagsFFF6 + ld hl, hUILayoutFlags res 2, [hl] ld a, [wCurrentBoxNum] and $7f 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 diff --git a/home/text.asm b/home/text.asm index ad0c4fd8..244c6fdb 100644 --- a/home/text.asm +++ b/home/text.asm @@ -62,7 +62,7 @@ PlaceNextChar:: cp "<NEXT>" jr nz, .NotNext ld bc, 2 * SCREEN_WIDTH - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] bit 2, a jr z, .ok ld bc, SCREEN_WIDTH diff --git a/home/window.asm b/home/window.asm index f86e39c6..0182bdd3 100644 --- a/home/window.asm +++ b/home/window.asm @@ -136,7 +136,7 @@ PlaceMenuCursor:: and a ; was the previous menu id 0? jr z, .checkForArrow1 push af - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] bit 1, a ; is the menu double spaced? jr z, .doubleSpaced1 ld bc, 20 @@ -162,7 +162,7 @@ PlaceMenuCursor:: and a jr z, .checkForArrow2 push af - ldh a, [hFlagsFFF6] + ldh a, [hUILayoutFlags] bit 1, a ; is the menu double spaced? jr z, .doubleSpaced2 ld bc, 20 @@ -391,7 +391,7 @@ hClearLetterPrintingDelayFlags:: db ; bit 0: draw HP fraction to the right of bar instead of below (for party menu) ; bit 1: menu is double spaced -hFlagsFFF6:: db +hUILayoutFlags:: db hFieldMoveMonMenuTopMenuItemX:: db |