diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /misc/mobile_menu.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'misc/mobile_menu.asm')
| -rwxr-xr-x | misc/mobile_menu.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/misc/mobile_menu.asm b/misc/mobile_menu.asm index d9fd3dd34..84e592fcc 100755 --- a/misc/mobile_menu.asm +++ b/misc/mobile_menu.asm @@ -280,7 +280,7 @@ Function4a149: ; 4a149 (12:6149) call ClearBox hlcoord 1, 14 call PlaceString - callba Function104148 + callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call SetPalettes call StaticMenuJoypad ld hl, wMenuCursorY @@ -403,7 +403,7 @@ Function4a28a: ; 4a28a (12:628a) hlcoord 14, 1 ld de, String_4a34b call PlaceString - callba Function104148 + callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call Function4a118 call ScrollingMenuJoypad push af @@ -432,7 +432,7 @@ Function4a28a: ; 4a28a (12:628a) ld b, 3 ld c, 4 call TextBox - callba Function104148 + callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ld hl, DeletePassword_YesNo_MenuDataHeader call LoadMenuDataHeader call VerticalMenu @@ -455,7 +455,7 @@ Function4a28a: ; 4a28a (12:628a) call ExitMenu .quit call Call_ExitMenu - callba Function104148 + callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap xor a ret ; 4a346 (12:6346) @@ -836,16 +836,16 @@ Function4a680: ; 4a680 (12:6680) ld [hli], a ld [hli], a xor a -rept 3 ld [hli], a -endr + ld [hli], a + ld [hli], a ret Function4a6ab: ; 4a6ab (12:66ab) ld a, $2 call MenuClickSound call ClearBGPalettes - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout callba Function11c1ab pop bc |