diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-24 22:38:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 22:38:08 -0400 |
| commit | 91f914718a263839daef24d44eda857bfc7cca95 (patch) | |
| tree | e3aca60cfbcd77fdbb400304fc0dedbc613122b2 /home | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
| parent | 6e44095c2aadd2f07a716db6dacfc3ce2fa83658 (diff) | |
Merge pull request #530 from Rangi42/master
[RTM] Finish removing address comments, split out mart_constants.asm, and other tweaks
Diffstat (limited to 'home')
| -rw-r--r-- | home/menu_window.asm | 6 | ||||
| -rw-r--r-- | home/scrolling_menu.asm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/home/menu_window.asm b/home/menu_window.asm index c279b8c56..49536d5f0 100644 --- a/home/menu_window.asm +++ b/home/menu_window.asm @@ -41,14 +41,14 @@ RestoreTileBackup:: ld [hli], a dec de dec c - jr nz, .col ; 0x1c3b $fa + jr nz, .col pop hl ld bc, SCREEN_WIDTH add hl, bc pop bc dec b - jr nz, .row ; 0x1c44 $ef + jr nz, .row ret @@ -60,7 +60,7 @@ PopWindow:: ld [de], a inc de dec b - jr nz, .loop ; 0x1c50 $fa + jr nz, .loop ret GetMenuBoxDims:: diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index 1662f8113..cf8e02fa8 100644 --- a/home/scrolling_menu.asm +++ b/home/scrolling_menu.asm @@ -40,7 +40,7 @@ InitScrollingMenu:: pop bc jp TextBox -JoyTextDelay_ForcehJoyDown:: ; 354b joypad +JoyTextDelay_ForcehJoyDown:: call DelayFrame ld a, [hInMenu] |