shithub: pokered

Download patch

ref: 95353fdefa95440eba012509722f2058739d45fe
parent: 83f7d224c8c784deccc0b9ea49c833899efe0197
author: Rangi <[email protected]>
date: Sat Feb 13 14:48:34 EST 2021

Identify hUILayoutFlags

--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2472,13 +2472,13 @@
 
 .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 @@
 	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
--- a/engine/gfx/hp_bar.asm
+++ b/engine/gfx/hp_bar.asm
@@ -213,7 +213,7 @@
 	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
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1051,15 +1051,15 @@
 	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 @@
 	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]
--- a/engine/link/cable_club.asm
+++ b/engine/link/cable_club.asm
@@ -338,10 +338,10 @@
 	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 @@
 	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
--- a/engine/menus/party_menu.asm
+++ b/engine/menus/party_menu.asm
@@ -69,14 +69,14 @@
 	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
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -351,10 +351,10 @@
 	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 @@
 	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
--- a/engine/pokemon/learn_move.asm
+++ b/engine/pokemon/learn_move.asm
@@ -126,13 +126,13 @@
 	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 @@
 	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
--- a/engine/pokemon/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
@@ -40,7 +40,7 @@
 	push hl
 	call DrawHPBar
 	pop hl
-	ldh a, [hFlagsFFF6]
+	ldh a, [hUILayoutFlags]
 	bit 0, a
 	jr z, .printFractionBelowBar
 	ld bc, $9 ; right of bar
--- a/home/text.asm
+++ b/home/text.asm
@@ -62,7 +62,7 @@
 	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
--- a/home/window.asm
+++ b/home/window.asm
@@ -136,7 +136,7 @@
 	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 @@
 	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
--- a/hram.asm
+++ b/hram.asm
@@ -391,7 +391,7 @@
 
 ; 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