diff options
Diffstat (limited to 'misc/mobile_5b.asm')
| -rwxr-xr-x | misc/mobile_5b.asm | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm index 19d192aeb..558807f66 100755 --- a/misc/mobile_5b.asm +++ b/misc/mobile_5b.asm @@ -184,7 +184,7 @@ Function16c130: ; 16c130 ld bc, 8 ld a, $5 call FarCopyWRAM - callba Function96a4 + callba ApplyPals ret ; 16c145 @@ -362,7 +362,7 @@ endr ld a, e cp $8 jr nz, .asm_16c969 - callba Function96a4 + callba ApplyPals call SetPalettes ld a, [rSVBK] push af @@ -392,7 +392,7 @@ Function16ca11: ; 16ca11 ld a, [wd003] and a jr nz, .asm_16ca1d - callba Function96a4 + callba ApplyPals .asm_16ca1d ld a, [rSVBK] @@ -465,7 +465,7 @@ endr ld a, e cp $8 jr nz, .asm_16ca28 - callba Function96a4 + callba ApplyPals call SetPalettes ld a, [rSVBK] push af @@ -718,7 +718,7 @@ Function16cbd1: ; 16cbd1 ld bc, $0002 ld a, $5 call FarCopyWRAM - callba Function96a4 + callba ApplyPals ld a, $1 ld [hCGBPalUpdate], a ret @@ -908,22 +908,21 @@ INCBIN "gfx/unknown/16d5cd.tilemap" Tilemap_16d5f5: INCBIN "gfx/unknown/16d5f5.tilemap" -Function16d61d: ; 16d61d +_LinkTextbox: ; 16d61d ld h, d ld l, e push bc push hl - call Function16d640 + call .draw_border pop hl pop bc + ld de, AttrMap - TileMap add hl, de -rept 2 inc b -endr -rept 2 + inc b + inc c inc c -endr ld a, $7 .loop push bc @@ -941,43 +940,44 @@ endr ret ; 16d640 -Function16d640: ; 16d640 +.draw_border: ; 16d640 push hl ld a, $30 ld [hli], a inc a - call Function16d66d + call .fill_row inc a ld [hl], a pop hl ld de, SCREEN_WIDTH add hl, de -.loop +.loop3 push hl ld a, $33 ld [hli], a ld a, " " - call Function16d66d + call .fill_row ld [hl], $34 pop hl ld de, SCREEN_WIDTH add hl, de dec b - jr nz, .loop + jr nz, .loop3 + ld a, $35 ld [hli], a ld a, $36 - call Function16d66d + call .fill_row ld [hl], $37 ret ; 16d66d -Function16d66d: ; 16d66d +.fill_row: ; 16d66d ld d, c -.loop +.loop4 ld [hli], a dec d - jr nz, .loop + jr nz, .loop4 ret ; 16d673 @@ -1029,7 +1029,7 @@ Function16d6ae: ; 16d6ae ; 16d6ca LinkTextbox: ; 16d6ca - call Function16d61d + call _LinkTextbox ret ; 16d6ce @@ -1038,7 +1038,7 @@ Function16d6ce: ; 16d6ce call Function16d6e1 callba Function87d call Call_ExitMenu - call Function3200 + call WaitBGMap2 ret ; 16d6e1 @@ -1051,7 +1051,7 @@ Function16d6e1: ; 16d6e1 ld de, .Waiting call PlaceString call WaitBGMap - call Function3200 + call WaitBGMap2 ld c, $32 jp DelayFrames ; 16d701 @@ -1100,7 +1100,7 @@ Function16d734: ; 16d734 call Function16d759 call Function16d76a jr nc, .asm_16d758 - callba Function24270 + callba _2DMenuInterpretJoypad jr c, .asm_16d758 ld a, [wcfa5] bit 7, a @@ -1141,14 +1141,14 @@ Function16d76a: ; 16d76a ; 16d77a Function16d77a: ; 16d77a - ld hl, wcfac + ld hl, wCursorCurrentTile ld a, [hli] ld h, [hl] ld l, a ld a, [hl] cp $1f jr nz, .asm_16d792 - ld a, [wcfab] + ld a, [wCursorOffCharacter] ld [hl], a push hl push bc @@ -1168,7 +1168,7 @@ Function16d77a: ; 16d77a swap a and $f ld c, a - ld a, [MenuSelection2] + ld a, [wMenuCursorY] ld b, a xor a dec b @@ -1184,7 +1184,7 @@ Function16d77a: ; 16d77a ld a, [wcfa7] and $f ld c, a - ld a, [wcfaa] + ld a, [wMenuCursorX] ld b, a xor a dec b @@ -1200,7 +1200,7 @@ Function16d77a: ; 16d77a ld a, [hl] cp $1f jr z, .asm_16d7de - ld [wcfab], a + ld [wCursorOffCharacter], a ld [hl], $1f push hl push bc @@ -1212,9 +1212,9 @@ Function16d77a: ; 16d77a .asm_16d7de ld a, l - ld [wcfac], a + ld [wCursorCurrentTile], a ld a, h - ld [wcfad], a + ld [wCursorCurrentTile + 1], a ret ; 16d7e7 @@ -1222,7 +1222,7 @@ Function16d7e7: ; 16d7e7 ld a, [wcfa5] bit 6, a jr z, .asm_16d7f4 - callba Function8cf62 + callba PlaySpriteAnimationsAndDelayFrame .asm_16d7f4 call JoyTextDelay |