From 599e6e8d16571235f2054aa38f39e66181da3796 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 1 Mar 2016 22:31:21 -0500 Subject: Battle animation annotations --- engine/scrolling_menu.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/scrolling_menu.asm') diff --git a/engine/scrolling_menu.asm b/engine/scrolling_menu.asm index b09453239..001beb71b 100755 --- a/engine/scrolling_menu.asm +++ b/engine/scrolling_menu.asm @@ -210,17 +210,17 @@ ScrollingMenu_GetCursorPosition: ; 246fc ret ; 24706 -Function24706: ; 24706 (9:4706) +ScrollingMenu_ClearLeftColumn: ; 24706 (9:4706) call MenuBoxCoord2Tile ld de, SCREEN_WIDTH add hl, de ld de, 2 * SCREEN_WIDTH ld a, [wMenuData2_ScrollingMenuHeight] -.asm_24713 +.loop ld [hl], " " add hl, de dec a - jr nz, .asm_24713 + jr nz, .loop ret InitScrollingMenuCursor: ; 2471a -- cgit v1.2.3 From 6be4cd4da98093bf1b9362c946e693c89e4713ad Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 10 Apr 2016 15:01:49 -0400 Subject: Local labels starting with lowercase letters are no longer decorated with a trailing colon --- engine/scrolling_menu.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'engine/scrolling_menu.asm') diff --git a/engine/scrolling_menu.asm b/engine/scrolling_menu.asm index 001beb71b..08a718df1 100755 --- a/engine/scrolling_menu.asm +++ b/engine/scrolling_menu.asm @@ -22,7 +22,7 @@ _ScrollingMenu:: ; 245cb jr .loop ; 245d6 -.exit: ; 245d6 +.exit ; 245d6 call MenuClickSound ld [wMenuJoypad], a ld a, 0 @@ -30,7 +30,7 @@ _ScrollingMenu:: ; 245cb ret ; 245e1 -.zero: ; 245e1 +.zero ; 245e1 call ScrollingMenu_InitDisplay ld a, 1 ld [hBGMapMode], a @@ -84,13 +84,13 @@ ScrollingMenuJoyAction: ; 24609 jr .loop ; 24640 -.unreferenced: ; unreferenced +.unreferenced ; unreferenced ld a, -1 and a ret ; 24644 -.a_button: ; 24644 +.a_button ; 24644 call PlaceHollowCursor ld a, [wMenuCursorY] dec a @@ -111,13 +111,13 @@ ScrollingMenuJoyAction: ; 24609 ret ; 2466f -.b_button: ; 2466f +.b_button ; 2466f ld a, B_BUTTON scf ret ; 24673 -.select: ; 24673 +.select ; 24673 ld a, [wMenuData2Flags] bit 7, a jp z, xor_a_dec_a @@ -135,7 +135,7 @@ ScrollingMenuJoyAction: ; 24609 ret ; 24695 -.start: ; 24695 +.start ; 24695 ld a, [wMenuData2Flags] bit 6, a jp z, xor_a_dec_a @@ -144,7 +144,7 @@ ScrollingMenuJoyAction: ; 24609 ret ; 246a1 -.d_left: ; 246a1 +.d_left ; 246a1 ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a_dec_a @@ -156,7 +156,7 @@ ScrollingMenuJoyAction: ; 24609 ret ; 246b5 -.d_right: ; 246b5 +.d_right ; 246b5 ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a_dec_a @@ -168,7 +168,7 @@ ScrollingMenuJoyAction: ; 24609 ret ; 246c9 -.d_up: ; 246c9 +.d_up ; 246c9 ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a @@ -183,7 +183,7 @@ ScrollingMenuJoyAction: ; 24609 jp xor_a_dec_a ; 246df -.d_down: ; 246df +.d_down ; 246df ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a -- cgit v1.2.3