diff options
| -rw-r--r-- | engine/link/link_trade.asm | 6 | ||||
| -rw-r--r-- | engine/menus/menu.asm | 12 | ||||
| -rw-r--r-- | engine/menus/scrolling_menu.asm | 4 | ||||
| -rw-r--r-- | home/movement.asm | 4 | ||||
| -rw-r--r-- | wram.asm | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm index 1c3b18aae..95be2817a 100644 --- a/engine/link/link_trade.asm +++ b/engine/link/link_trade.asm @@ -250,7 +250,7 @@ LinkTradeMenu: ret .UpdateCursor: - ld hl, wCursorCurTile + ld hl, wCursorCurrentTile ld a, [hli] ld h, [hl] ld l, a @@ -320,9 +320,9 @@ LinkTradeMenu: pop hl .cursor_already_there ld a, l - ld [wCursorCurTile], a + ld [wCursorCurrentTile], a ld a, h - ld [wCursorCurTile + 1], a + ld [wCursorCurrentTile + 1], a ret .TryAnims: diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index 7cd52de7f..79ef648f7 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -208,8 +208,8 @@ Init2DMenuCursorPosition: ld [wMenuCursorY], a xor a ld [wCursorOffCharacter], a - ld [wCursorCurTile], a - ld [wCursorCurTile + 1], a + ld [wCursorCurrentTile], a + ld [wCursorCurrentTile + 1], a ret .InitFlags_a: @@ -493,7 +493,7 @@ _2DMenuInterpretJoypad: ret Move2DMenuCursor: - ld hl, wCursorCurTile + ld hl, wCursorCurrentTile ld a, [hli] ld h, [hl] ld l, a @@ -549,9 +549,9 @@ Place2DMenuCursor: .cursor_on ld a, l - ld [wCursorCurTile], a + ld [wCursorCurrentTile], a ld a, h - ld [wCursorCurTile + 1], a + ld [wCursorCurrentTile + 1], a ret _PushWindow:: @@ -797,7 +797,7 @@ _InitVerticalMenuCursor:: ; wMenuCursorX ld a, 1 ld [hli], a -; wCursorOffCharacter, wCursorCurTile +; wCursorOffCharacter, wCursorCurrentTile xor a ld [hli], a ld [hli], a diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index 3e3b2858b..e47d656bc 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -322,8 +322,8 @@ ScrollingMenu_InitFlags: ld a, 1 ld [wMenuCursorX], a xor a - ld [wCursorCurTile], a - ld [wCursorCurTile + 1], a + ld [wCursorCurrentTile], a + ld [wCursorCurrentTile + 1], a ld [wCursorOffCharacter], a ret diff --git a/home/movement.asm b/home/movement.asm index fd93d94cd..4700f48cf 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -176,7 +176,7 @@ GetMenuJoypad:: ret PlaceHollowCursor:: - ld hl, wCursorCurTile + ld hl, wCursorCurrentTile ld a, [hli] ld h, [hl] ld l, a @@ -184,7 +184,7 @@ PlaceHollowCursor:: ret HideCursor:: - ld hl, wCursorCurTile + ld hl, wCursorCurrentTile ld a, [hli] ld h, [hl] ld l, a @@ -1494,7 +1494,7 @@ w2DMenuDataEnd:: wMenuCursorY:: db ; cfa9 wMenuCursorX:: db ; cfaa wCursorOffCharacter:: db ; cfab -wCursorCurTile:: dw ; cfac +wCursorCurrentTile:: dw ; cfac ds 3 |