diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
| commit | a1951cefc09035e11077a433b28ec8c66b3b03db (patch) | |
| tree | 4de98db5a6edb6d74192028d50893da2b764421f /engine/scrolling_menu.asm | |
| parent | 79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff) | |
Prefix wram labels with w, part 2.
Diffstat (limited to 'engine/scrolling_menu.asm')
| -rwxr-xr-x | engine/scrolling_menu.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/scrolling_menu.asm b/engine/scrolling_menu.asm index 32acf2def..e12d4254d 100755 --- a/engine/scrolling_menu.asm +++ b/engine/scrolling_menu.asm @@ -44,7 +44,7 @@ _ScrollingMenu:: ; 245cb ScrollingMenu_InitDisplay: ; 245f1 xor a ld [hBGMapMode], a - ld hl, Options + ld hl, wOptions ld a, [hl] push af set NO_TEXT_SCROLL, [hl] @@ -52,7 +52,7 @@ ScrollingMenu_InitDisplay: ; 245f1 call ScrollingMenu_PlaceCursor call ScrollingMenu_CheckCallFunction3 pop af - ld [Options], a + ld [wOptions], a ret ; 24609 @@ -95,15 +95,15 @@ ScrollingMenuJoyAction: ; 24609 ld a, [wMenuCursorY] dec a call ScrollingMenu_GetListItemCoordAndFunctionArgs - ld a, [MenuSelection] - ld [CurItem], a - ld a, [MenuSelectionQuantity] + ld a, [wMenuSelection] + ld [wCurItem], a + ld a, [wMenuSelectionQuantity] ld [wItemQuantityBuffer], a call ScrollingMenu_GetCursorPosition dec a ld [wScrollingMenuCursorPosition], a - ld [CurItemQuantity], a - ld a, [MenuSelection] + ld [wCurItemQuantity], a + ld a, [wMenuSelection] cp -1 jr z, .b_button ld a, A_BUTTON @@ -124,7 +124,7 @@ ScrollingMenuJoyAction: ; 24609 ld a, [wMenuCursorY] dec a call ScrollingMenu_GetListItemCoordAndFunctionArgs - ld a, [MenuSelection] + ld a, [wMenuSelection] cp -1 jp z, xor_a_dec_a call ScrollingMenu_GetCursorPosition @@ -389,7 +389,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0 ld [wScrollingMenuCursorPosition], a ld a, c call ScrollingMenu_GetListItemCoordAndFunctionArgs - ld a, [MenuSelection] + ld a, [wMenuSelection] cp -1 jr z, .cancel push bc @@ -531,12 +531,12 @@ ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5 add hl, de ld a, [wMenuData2_ItemsPointerBank] call GetFarByte - ld [MenuSelection], a - ld [CurItem], a + ld [wMenuSelection], a + ld [wCurItem], a inc hl ld a, [wMenuData2_ItemsPointerBank] call GetFarByte - ld [MenuSelectionQuantity], a + ld [wMenuSelectionQuantity], a pop hl pop de ret |