pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix some MenuData2 labels

Browse Source 
Gave them better names, moved the flags out of the union, and documented
the w2DMenuFlags1.
This commit is contained in:
mid-kid
2017-12-30 12:23:20 +01:00
parent f27f79488a
commit 066cc91b13
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
engine/menu.asm
View File

@@ -110,14 +110,14 @@ Mobile_GetMenuSelection: ; 24098
ret
; 240cd
GetMenuNumberOfColumns: ; 240cd
ld a, [wMenuData2Items]
Get2DMenuNumberOfColumns: ; 240cd
ld a, [wMenuData2_2DMenuDimensions]
and $f
ret
; 240d3
GetMenuNumberOfRows: ; 240d3
ld a, [wMenuData2Items]
Get2DMenuNumberOfRows: ; 240d3
ld a, [wMenuData2_2DMenuDimensions]
swap a
and $f
ret
@@ -130,19 +130,19 @@ Place2DMenuItemStrings: ; 240db
ld d, [hl]
call GetMenuTextStartCoord
call Coord2Tile
call GetMenuNumberOfRows
call Get2DMenuNumberOfRows
ld b, a
.row
push bc
push hl
call GetMenuNumberOfColumns
call Get2DMenuNumberOfColumns
ld c, a
.col
push bc
ld a, [wMenuData2_2DMenuItemStringsBank]
call Place2DMenuItemName
inc de
ld a, [wMenuData2Spacing]
ld a, [wMenuData2_2DMenuSpacing]
ld c, a
ld b, 0
add hl, bc
@@ -174,9 +174,9 @@ Init2DMenuCursorPosition: ; 2411a (9:411a)
dec c
ld a, c
ld [w2DMenuCursorInitX], a
call GetMenuNumberOfRows
call Get2DMenuNumberOfRows
ld [w2DMenuNumRows], a
call GetMenuNumberOfColumns
call Get2DMenuNumberOfColumns
ld [w2DMenuNumCols], a
call .InitFlags_a
call .InitFlags_b
@@ -238,7 +238,7 @@ Init2DMenuCursorPosition: ; 2411a (9:411a)
; 2418a
.InitFlags_b: ; 2418a
ld a, [wMenuData2Spacing]
ld a, [wMenuData2_2DMenuSpacing]
or $20
ld [w2DMenuCursorOffsets], a
ret