diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-17 17:18:52 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-17 17:18:52 -0400 |
| commit | f53d65c536096213b6826765f81a0f436c88fe72 (patch) | |
| tree | 6ab57a1b6ff362ee8bb61909996d843af4e4835e /home/menu.asm | |
| parent | da7849d800d37156360845fa17e361d2521dce29 (diff) | |
Battle intro animation function
Diffstat (limited to 'home/menu.asm')
| -rw-r--r-- | home/menu.asm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/home/menu.asm b/home/menu.asm index bc7751a0b..e82511895 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -131,9 +131,9 @@ YesNoBox:: ; 1dcf PlaceYesNoBox:: ; 1dd2 jr _YesNoBox -Function1dd4:: ; 1dd4 +PlaceGenericTwoOptionBox:: ; 1dd4 call LoadMenuDataHeader - jr Function1dfe + jr InterpretTwoOptionMenu _YesNoBox:: ; 1dd9 ; Return nc (yes) or c (no). @@ -141,13 +141,15 @@ _YesNoBox:: ; 1dd9 ld hl, YesNoMenuDataHeader call CopyMenuDataHeader pop bc +; This seems to be an overflow prevention, but +; it was coded wrong. ld a, b - cp $e - jr nz, .asm_1de9 - ld a, $e + cp SCREEN_WIDTH - 6 + jr nz, .okay ; should this be "jr nc"? + ld a, SCREEN_WIDTH - 6 ld b, a -.asm_1de9 +.okay ld a, b ld [wcf83], a add $5 @@ -158,7 +160,7 @@ _YesNoBox:: ; 1dd9 ld [wcf84], a call Function1c00 -Function1dfe:: ; 1dfe +InterpretTwoOptionMenu:: ; 1dfe call InterpretMenu2 push af ld c, $f |