summaryrefslogtreecommitdiff
path: root/engine/menus
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 19:59:41 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 19:59:41 -0400
commit35deb771130a9012ee4494b1db097761f2fe2919 (patch)
treef47b099cdb4a165dc0a5b0e85f2e24780629680f /engine/menus
parent55bb99580eeccc92106437c4ad86edb8ca89ecda (diff)
H_CONSTANTNAMES -> hConstantNames
Diffstat (limited to 'engine/menus')
-rw-r--r--engine/menus/display_text_id_init.asm2
-rwxr-xr-xengine/menus/main_menu.asm10
-rwxr-xr-xengine/menus/naming_screen.asm4
-rwxr-xr-xengine/menus/party_menu.asm12
-rwxr-xr-xengine/menus/pokedex.asm6
-rwxr-xr-xengine/menus/save.asm12
-rwxr-xr-xengine/menus/start_sub_menus.asm12
7 files changed, 29 insertions, 29 deletions
diff --git a/engine/menus/display_text_id_init.asm b/engine/menus/display_text_id_init.asm
index 5043ad22..e1f6c678 100644
--- a/engine/menus/display_text_id_init.asm
+++ b/engine/menus/display_text_id_init.asm
@@ -74,5 +74,5 @@ DisplayTextIDInit::
ld [hWY], a ; put the window on the screen
call LoadFontTilePatterns
ld a, $01
- ld [H_AUTOBGTRANSFERENABLED], a ; enable continuous WRAM to VRAM transfer each V-blank
+ ld [hAutoBGTransferEnabled], a ; enable continuous WRAM to VRAM transfer each V-blank
ret
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 8eda6744..fe82ec4a 100755
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -342,7 +342,7 @@ CableClubOptionsText:
DisplayContinueGameInfo:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 4, 7
ld b, 8
ld c, 14
@@ -360,13 +360,13 @@ DisplayContinueGameInfo:
coord hl, 13, 15
call PrintPlayTime
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld c, 30
jp DelayFrames
PrintSaveScreenText:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 4, 0
ld b, $8
ld c, $e
@@ -386,7 +386,7 @@ PrintSaveScreenText:
coord hl, 13, 8
call PrintPlayTime
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld c, 30
jp DelayFrames
@@ -463,7 +463,7 @@ DisplayOptionMenu:
ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate
ld [wTopMenuItemX], a
ld a, $01
- ld [H_AUTOBGTRANSFERENABLED], a ; enable auto background transfer
+ ld [hAutoBGTransferEnabled], a ; enable auto background transfer
call Delay3
.loop
call PlaceMenuCursor
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 6e78c5c3..efeab4c3 100755
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -337,7 +337,7 @@ ED_TileEnd:
PrintAlphabet:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, [wAlphabetCase]
and a
ld de, LowerCaseAlphabet
@@ -362,7 +362,7 @@ PrintAlphabet:
jr nz, .outerLoop
call PlaceString
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
jp Delay3
INCLUDE "data/text/alphabets.asm"
diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm
index 41b6074b..b64c1af8 100755
--- a/engine/menus/party_menu.asm
+++ b/engine/menus/party_menu.asm
@@ -19,7 +19,7 @@
; f8: leveled up
DrawPartyMenu_::
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call ClearScreen
call UpdateSprites
callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics
@@ -88,14 +88,14 @@ RedrawPartyMenu_::
pop hl
push hl
ld bc, SCREEN_WIDTH + 1 ; down 1 row and right 1 column
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
set 0, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
add hl, bc
predef DrawHP2 ; draw HP bar and prints current / max HP
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
res 0, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
call SetPartyMenuHPBarColor ; color the HP bar (on SGB)
pop hl
jr .printLevel
@@ -213,7 +213,7 @@ RedrawPartyMenu_::
pop af
ld [hl], a
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
jp GBPalNormal
.printItemUseMessage
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index 25c9ad89..0b7fb83c 100755
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -156,7 +156,7 @@ HandlePokedexSideMenu:
; sets carry flag if player presses A, unsets carry flag if player presses B
HandlePokedexListMenu:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
; draw the horizontal line separating the seen and owned amounts from the menu
coord hl, 15, 8
ld a, "─"
@@ -216,7 +216,7 @@ HandlePokedexListMenu:
ld [wDexMaxSeenMon], a
.loop
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 4, 2
lb bc, 14, 10
call ClearScreenArea
@@ -280,7 +280,7 @@ HandlePokedexListMenu:
dec d
jr nz, .printPokemonLoop
ld a, 01
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
call GBPalNormal
call HandleMenuInput
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index 33a7ba8d..5aec7bd0 100755
--- 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, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
set 1, [hl]
call HandleMenuInput
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
res 1, [hl]
bit 1, a ; pressed b
ret nz
@@ -420,7 +420,7 @@ CopyBoxToOrFromSRAM:
DisplayChangeBoxMenu:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, A_BUTTON | B_BUTTON
ld [wMenuWatchedKeys], a
ld a, 11
@@ -445,12 +445,12 @@ DisplayChangeBoxMenu:
ld b, 12
ld c, 7
call TextBoxBorder
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
set 2, [hl]
ld de, BoxNames
coord hl, 13, 1
call PlaceString
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
res 2, [hl]
ld a, [wCurrentBoxNum]
and $7f
@@ -486,7 +486,7 @@ DisplayChangeBoxMenu:
dec a
jr nz, .loop
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
ChooseABoxText:
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index d9501da7..43c767e2 100755
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -239,21 +239,21 @@ StartMenu_Pokemon::
ld bc, wPartyMon2 - wPartyMon1
call AddNTimes
ld a, [hli]
- ld [H_DIVIDEND], a
+ ld [hDividend], a
ld a, [hl]
- ld [H_DIVIDEND + 1], a
+ ld [hDividend + 1], a
ld a, 5
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, 2 ; number of bytes
call Divide
ld bc, wPartyMon1HP - wPartyMon1MaxHP
add hl, bc
ld a, [hld]
ld b, a
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
sub b
ld b, [hl]
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
sbc b
jp nc, .notHealthyEnough
ld a, [wPartyAndBillsPCSavedMenuItem]
@@ -648,7 +648,7 @@ StartMenu_SaveReset::
StartMenu_Option::
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call ClearScreen
call UpdateSprites
callab DisplayOptionMenu