diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-03-01 22:31:21 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-03-01 22:31:21 -0500 |
| commit | 599e6e8d16571235f2054aa38f39e66181da3796 (patch) | |
| tree | 9d3670e3329a17f076ea95fc721fd7501354a984 /home/menu.asm | |
| parent | e044b8ec08fee4a5d4f9cd942551ff94f2577b76 (diff) | |
Battle animation annotations
Diffstat (limited to 'home/menu.asm')
| -rw-r--r-- | home/menu.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/home/menu.asm b/home/menu.asm index 3e04af8cf..a8c2bb0b7 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -232,7 +232,7 @@ DoNthMenu:: ; 1e5d call MenuFunc_1e7f call MenuWriteText call Function1eff - call Function1f23 + call GetStaticMenuJoypad call GetMenuJoypad call MenuClickSound ret @@ -360,20 +360,20 @@ Function1eff:: ; 1eff ; 1f1a -Function1f1a:: ; 1f1a +GetScrollingMenuJoypad:: ; 1f1a call ScrollingMenuJoypad ld hl, wMenuJoypadFilter and [hl] - jr Function1f2a + jr ContinueGettingMenuJoypad ; 1f23 -Function1f23:: ; 1f23 +GetStaticMenuJoypad:: ; 1f23 xor a ld [wMenuJoypad], a call StaticMenuJoypad ; 1f2a -Function1f2a:: ; 1f2a +ContinueGettingMenuJoypad: bit A_BUTTON_F, a jr nz, .a_button bit B_BUTTON_F, a |