diff options
Diffstat (limited to 'asm/emerald.s')
| -rw-r--r-- | asm/emerald.s | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index c072daf54..466df7a35 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -243536,7 +243536,7 @@ map_loading_lcd_reset: @ 8086878 movs r0, 0x46 adds r1, r4, 0 bl lcd_io_set - ldr r0, =0x082ec7c4 + ldr r0, =gUnknown_82EC7C4 ldrh r1, [r0, 0x2] ldrh r2, [r0, 0x4] orrs r1, r2 @@ -331380,7 +331380,7 @@ _080B0368: lsls r1, 7 movs r0, 0 bl lcd_io_clear_bits - ldr r0, =0x082ec7cc + ldr r0, =gUnknown_82EC7CC ldrh r1, [r0] movs r0, 0x50 bl lcd_io_set_bits @@ -854813,7 +854813,7 @@ _081BA524: b _081BA662 _081BA52E: adds r0, r3, 0 - bl sub_81BA668 + bl DecompressGlyphFont6 adds r0, r6, 0 bl CopyGlyphToWindow ldr r0, =0x03002f90 @@ -854968,8 +854968,8 @@ _081BA662: bx r1 thumb_func_end Font6Func - thumb_func_start sub_81BA668 -sub_81BA668: @ 81BA668 + thumb_func_start DecompressGlyphFont6 +DecompressGlyphFont6: @ 81BA668 push {r4,r5,lr} lsls r0, 16 lsrs r2, r0, 19 @@ -854978,30 +854978,30 @@ sub_81BA668: @ 81BA668 lsls r1, 11 ands r1, r0 lsrs r1, 11 - ldr r0, =0x08616128 + ldr r0, =gFont6BrailleGlyphs adds r1, r0 adds r5, r2, r1 ldr r4, =0x03002f90 adds r0, r5, 0 adds r1, r4, 0 - bl font_render_sub + bl DecompressGlyphTile adds r0, r5, 0 adds r0, 0x10 adds r1, r4, 0 adds r1, 0x20 - bl font_render_sub + bl DecompressGlyphTile movs r1, 0x80 lsls r1, 1 adds r0, r5, r1 adds r1, r4, 0 adds r1, 0x40 - bl font_render_sub + bl DecompressGlyphTile movs r1, 0x88 lsls r1, 1 adds r0, r5, r1 adds r1, r4, 0 adds r1, 0x60 - bl font_render_sub + bl DecompressGlyphTile adds r0, r4, 0 adds r0, 0x80 movs r1, 0x10 @@ -855013,7 +855013,7 @@ sub_81BA668: @ 81BA668 bx r0 .align 2, 0 .pool - thumb_func_end sub_81BA668 + thumb_func_end DecompressGlyphFont6 thumb_func_start GetGlyphWidthFont6 GetGlyphWidthFont6: @ 81BA6CC |