From 09ff04dbfc0e7afbb1e7adf77e0294ad5e91df57 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 16:38:52 -0500 Subject: [PATCH] =?UTF-8?q?wMenuData3=20=E2=86=92=20w2DMenuData?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/learn.asm | 2 +- wram.asm | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/engine/learn.asm b/engine/learn.asm index 2f1038d7f..01367c836 100755 --- a/engine/learn.asm +++ b/engine/learn.asm @@ -145,7 +145,7 @@ ForgetMove: ; 65d3 ld a, SCREEN_WIDTH * 2 ld [Buffer1], a predef ListMoves - ; wMenuData3 + ; w2DMenuData ld a, $4 ld [w2DMenuCursorInitY], a ld a, $6 diff --git a/wram.asm b/wram.asm index 9d167ab28..c507c2495 100644 --- a/wram.asm +++ b/wram.asm @@ -1419,8 +1419,6 @@ wMenuDataBank:: db wMenuHeaderEnd:: wMenuData:: -; MenuData - wMenuDataFlags:: db ; cf91 UNION ; cf92 @@ -1452,7 +1450,7 @@ wMenuData_ScrollingMenuFunction3:: ds 3 ; cf9e ENDU ; cfa1 wMenuDataEnd:: -wMenuData3:: +w2DMenuData:: w2DMenuCursorInitY:: db ; cfa1 w2DMenuCursorInitX:: db ; cfa2 w2DMenuNumRows:: db ; cfa3 @@ -1470,7 +1468,7 @@ w2DMenuFlags1:: ; cfa5 w2DMenuFlags2:: db ; cfa6 w2DMenuCursorOffsets:: db ; cfa7 wMenuJoypadFilter:: db ; cfa8 -wMenuData3End:: +w2DMenuDataEnd:: wMenuCursorY:: db ; cfa9 wMenuCursorX:: db ; cfaa