diff options
Diffstat (limited to 'engine/mon_menu.asm')
| -rwxr-xr-x | engine/mon_menu.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engine/mon_menu.asm b/engine/mon_menu.asm index d7e8446d0..f398910ac 100755 --- a/engine/mon_menu.asm +++ b/engine/mon_menu.asm @@ -48,7 +48,7 @@ MonSubmenu: ; 24d19 ld a, 1 ld [hBGMapMode], a call MonMenuLoop - ld [MenuSelection], a + ld [wMenuSelection], a call ExitMenu ret @@ -63,7 +63,7 @@ MonSubmenu: ; 24d19 .GetTopCoord: ; 24d47 ; TopCoord = 1 + BottomCoord - 2 * (NumSubmenuItems + 1) - ld a, [Buffer1] + ld a, [wBuffer1] inc a add a ld b, a @@ -79,7 +79,7 @@ MonMenuLoop: ; 24d59 .loop ld a, MENU_UNUSED_3 | MENU_BACKUP_TILES_2 ; flags ld [wMenuData2Flags], a - ld a, [Buffer1] ; items + ld a, [wBuffer1] ; items ld [wMenuData2Items], a call InitVerticalMenuCursor ld hl, w2DMenuFlags1 @@ -103,7 +103,7 @@ MonMenuLoop: ; 24d59 dec a ld c, a ld b, 0 - ld hl, Buffer2 + ld hl, wBuffer2 add hl, bc ld a, [hl] ret @@ -113,7 +113,7 @@ PopulateMonMenu: ; 24d91 call MenuBoxCoord2Tile ld bc, $2a ; 42 add hl, bc - ld de, Buffer2 + ld de, wBuffer2 .loop ld a, [de] inc de @@ -157,7 +157,7 @@ GetMonMenuString: ; 24db0 GetMonSubmenuItems: ; 24dd4 call ResetMonSubmenu - ld a, [CurPartySpecies] + ld a, [wCurPartySpecies] cp EGG jr z, .egg ld a, [wLinkMode] @@ -211,7 +211,7 @@ GetMonSubmenuItems: ; 24dd4 call AddMonMenuItem .skip2 - ld a, [Buffer1] + ld a, [wBuffer1] cp NUM_MONMENU_ITEMS jr z, .ok2 ld a, MONMENU_CANCEL @@ -255,18 +255,18 @@ IsFieldMove: ; 24e52 ResetMonSubmenu: ; 24e68 xor a - ld [Buffer1], a - ld hl, Buffer2 + ld [wBuffer1], a + ld hl, wBuffer2 ld bc, NUM_MONMENU_ITEMS + 1 call ByteFill ret ; 24e76 TerminateMonSubmenu: ; 24e76 - ld a, [Buffer1] + ld a, [wBuffer1] ld e, a ld d, $0 - ld hl, Buffer2 + ld hl, wBuffer2 add hl, de ld [hl], -1 ret @@ -276,12 +276,12 @@ AddMonMenuItem: ; 24e83 push hl push de push af - ld a, [Buffer1] + ld a, [wBuffer1] ld e, a inc a - ld [Buffer1], a + ld [wBuffer1], a ld d, $0 - ld hl, Buffer2 + ld hl, wBuffer2 add hl, de pop af ld [hl], a |