diff options
| author | mid-kid <esteve.varela@gmail.com> | 2017-12-30 12:23:20 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-01-14 11:59:27 +0100 |
| commit | 066cc91b136b7266288b832bfa212123400ed758 (patch) | |
| tree | d21ab65654adbf05ea298764d676c7a6f76d56e9 /engine | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
Fix some MenuData2 labels
Gave them better names, moved the flags out of the union, and documented
the w2DMenuFlags1.
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/menu.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/menu.asm b/engine/menu.asm index 6fbed2848..636b26dbf 100755 --- a/engine/menu.asm +++ b/engine/menu.asm @@ -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 |