ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 15:13:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

add font labels

Browse Source
This commit is contained in:
YamaArashi 2015-10-08 00:21:20 -07:00
parent 3d692070f7
commit f7aa4ad144
4 changed files with 197 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
asm/data2.s
View File

@ -123,4 +123,87 @@ gMenuCursorDimensions: @ 82EA608
.byte 8, 8 .byte 8, 8
.byte 0, 0 .byte 0, 0
.incbin "base_emerald.gba", 0x2ea61C gFont9JapaneseGlyphs: @ 82EA61C
.incbin "base_emerald.gba", 0x2ea61c, 0x2000
@ Unreferenced data. This also comes before the gpu_bg.s data in Ruby and seems
@ to be unreferenced there too.
.incbin "base_emerald.gba", 0x2ec61c, 0x18
@ TODO: gpu_obj.s data
include_range 0x2ec634, 0x2ec7c4
gUnknown_82EC7C4: @ 82EC7C4
.2byte 0x0100
.2byte 0x0200
.2byte 0x0400
.2byte 0x0800
gUnknown_82EC7CC: @ 82EC7CC
.2byte 0x0001
.2byte 0x0002
.2byte 0x0004
.2byte 0x0008
include_range 0x2ec7d4, 0x616128
gFont6BrailleGlyphs: @ 8616128
.incbin "base_emerald.gba", 0x616128, 0x1000
include_range 0x617128, 0x62bae4
gFont8LatinGlyphs: @ 862BAE4
.incbin "base_emerald.gba", 0x62bae4, 0x8000
gFont8LatinGlyphWidths: @ 8633AE4
.incbin "base_emerald.gba", 0x633ae4, 0x200
gFont0LatinGlyphs: @ 8633CE4
.incbin "base_emerald.gba", 0x633ce4, 0x8000
gFont0LatinGlyphWidths: @ 863BCE4
.incbin "base_emerald.gba", 0x63bce4, 0x200
gFont7LatinGlyphs: @ 863BEE4
.incbin "base_emerald.gba", 0x63bee4, 0x8000
gFont7LatinGlyphWidths: @ 8643EE4
.incbin "base_emerald.gba", 0x643ee4, 0x200
gFont2LatinGlyphs: @ 86440E4
.incbin "base_emerald.gba", 0x6440e4, 0x8000
gFont2LatinGlyphWidths: @ 864C0E4
.incbin "base_emerald.gba", 0x64c0e4, 0x200
gFont1LatinGlyphs: @ 864C2E4
.incbin "base_emerald.gba", 0x64c2e4, 0x8000
gFont1LatinGlyphWidths: @ 86542E4
.incbin "base_emerald.gba", 0x6542e4, 0x200
gFont0JapaneseGlyphs: @ 86544E4
.incbin "base_emerald.gba", 0x6544e4, 0x4000
gFont1JapaneseGlyphs: @ 86584E4
.incbin "base_emerald.gba", 0x6584e4, 0x4000
gUnusedFullwidthJapaneseFontGlyphs: @ 865C4E4
.incbin "base_emerald.gba", 0x65c4e4, 0x8000
gUnusedFullwidthJapaneseFontGlyphWidths: @ 86644E4
.incbin "base_emerald.gba", 0x6644e4, 0x200
gUnusedFullwidthJapaneseFont2Glyphs: @ 86646E4
.incbin "base_emerald.gba", 0x6646e4, 0x8000
gUnusedFullwidthJapaneseFont2GlyphWidths: @ 866C6E4
.incbin "base_emerald.gba", 0x66c6e4, 0x200
gFont2JapaneseGlyphs: @ 866C8E4
.incbin "base_emerald.gba", 0x66c8e4, 0x8000
gFont2JapaneseGlyphWidths: @ 86748E4
.incbin "base_emerald.gba", 0x6748e4, 0x200
.incbin "base_emerald.gba", 0x674ae4

22
asm/emerald.s
View File

@ -243536,7 +243536,7 @@ map_loading_lcd_reset: @ 8086878
movs r0, 0x46 movs r0, 0x46
adds r1, r4, 0 adds r1, r4, 0
bl lcd_io_set bl lcd_io_set
ldr r0, =0x082ec7c4 ldr r0, =gUnknown_82EC7C4
ldrh r1, [r0, 0x2] ldrh r1, [r0, 0x2]
ldrh r2, [r0, 0x4] ldrh r2, [r0, 0x4]
orrs r1, r2 orrs r1, r2
@ -331380,7 +331380,7 @@ _080B0368:
lsls r1, 7 lsls r1, 7
movs r0, 0 movs r0, 0
bl lcd_io_clear_bits bl lcd_io_clear_bits
ldr r0, =0x082ec7cc ldr r0, =gUnknown_82EC7CC
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x50 movs r0, 0x50
bl lcd_io_set_bits bl lcd_io_set_bits
@ -854813,7 +854813,7 @@ _081BA524:
b _081BA662 b _081BA662
_081BA52E: _081BA52E:
adds r0, r3, 0 adds r0, r3, 0
bl sub_81BA668 bl DecompressGlyphFont6
adds r0, r6, 0 adds r0, r6, 0
bl CopyGlyphToWindow bl CopyGlyphToWindow
ldr r0, =0x03002f90 ldr r0, =0x03002f90
@ -854968,8 +854968,8 @@ _081BA662:
bx r1 bx r1
thumb_func_end Font6Func thumb_func_end Font6Func
thumb_func_start sub_81BA668 thumb_func_start DecompressGlyphFont6
sub_81BA668: @ 81BA668 DecompressGlyphFont6: @ 81BA668
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 16 lsls r0, 16
lsrs r2, r0, 19 lsrs r2, r0, 19
@ -854978,30 +854978,30 @@ sub_81BA668: @ 81BA668
lsls r1, 11 lsls r1, 11
ands r1, r0 ands r1, r0
lsrs r1, 11 lsrs r1, 11
ldr r0, =0x08616128 ldr r0, =gFont6BrailleGlyphs
adds r1, r0 adds r1, r0
adds r5, r2, r1 adds r5, r2, r1
ldr r4, =0x03002f90 ldr r4, =0x03002f90
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x10 adds r0, 0x10
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x20 adds r1, 0x20
bl font_render_sub bl DecompressGlyphTile
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
adds r0, r5, r1 adds r0, r5, r1
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
movs r1, 0x88 movs r1, 0x88
lsls r1, 1 lsls r1, 1
adds r0, r5, r1 adds r0, r5, r1
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x60 adds r1, 0x60
bl font_render_sub bl DecompressGlyphTile
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x80 adds r0, 0x80
movs r1, 0x10 movs r1, 0x10
@ -855013,7 +855013,7 @@ sub_81BA668: @ 81BA668
bx r0 bx r0
.align 2, 0 .align 2, 0
.pool .pool
thumb_func_end sub_81BA668 thumb_func_end DecompressGlyphFont6
thumb_func_start GetGlyphWidthFont6 thumb_func_start GetGlyphWidthFont6
GetGlyphWidthFont6: @ 81BA6CC GetGlyphWidthFont6: @ 81BA6CC

6
asm/macros.s
View File

@ -1,3 +1,7 @@
.macro include_range start, end
.incbin "base_emerald.gba", \start, \end - \start
.endm
.macro arm_func_start name .macro arm_func_start name
.align 2, 0 .align 2, 0
.global \name .global \name
@ -58,4 +62,4 @@
.byte \text_color << 4 @ low nybble seems unused .byte \text_color << 4 @ low nybble seems unused
.byte (\shadow_color << 4) | \bg_color .byte (\shadow_color << 4) | \bg_color
.2byte 0 @ padding .2byte 0 @ padding
.endm .endm

194
asm/text_renderer.s
View File

@ -846,9 +846,9 @@ restore_remo_colors: @ 8004C00
bx r0 bx r0
thumb_func_end restore_remo_colors thumb_func_end restore_remo_colors
thumb_func_start font_render_sub thumb_func_start DecompressGlyphTile
@ void font_render_sub(u16 *src, u32 *dest) @ void DecompressGlyphTile(u16 *src, u32 *dest)
font_render_sub: @ 8004C10 DecompressGlyphTile: @ 8004C10
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@ -1010,7 +1010,7 @@ font_render_sub: @ 8004C10
bx r0 bx r0
.align 2, 0 .align 2, 0
.pool .pool
thumb_func_end font_render_sub thumb_func_end DecompressGlyphTile
thumb_func_start sub_8004D58 thumb_func_start sub_8004D58
sub_8004D58: @ 8004D58 sub_8004D58: @ 8004D58
@ -2965,35 +2965,35 @@ _08005BCC:
adds r0, 0x21 adds r0, 0x21
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r3, 0 adds r0, r3, 0
bl Text_DecompressGlyphFont0 bl DecompressGlyphFont0
b _08005C10 b _08005C10
_08005BDA: _08005BDA:
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x21 adds r0, 0x21
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r3, 0 adds r0, r3, 0
bl Text_DecompressGlyphFont1 bl DecompressGlyphFont1
b _08005C10 b _08005C10
_08005BE8: _08005BE8:
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x21 adds r0, 0x21
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r3, 0 adds r0, r3, 0
bl Text_DecompressGlyphFont2 bl DecompressGlyphFont2
b _08005C10 b _08005C10
_08005BF6: _08005BF6:
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x21 adds r0, 0x21
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r3, 0 adds r0, r3, 0
bl Text_DecompressGlyphFont7 bl DecompressGlyphFont7
b _08005C10 b _08005C10
_08005C04: _08005C04:
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x21 adds r0, 0x21
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r3, 0 adds r0, r3, 0
bl Text_DecompressGlyphFont8 bl DecompressGlyphFont8
_08005C10: _08005C10:
adds r0, r6, 0 adds r0, r6, 0
bl CopyGlyphToWindow bl CopyGlyphToWindow
@ -3821,12 +3821,12 @@ _0800627E:
cmp r0, 0x9 cmp r0, 0x9
bne _08006290 bne _08006290
mov r0, r8 mov r0, r8
bl Text_DecompressGlyphFont9 bl DecompressGlyphFont9
b _08006298 b _08006298
_08006290: _08006290:
mov r0, r8 mov r0, r8
movs r1, 0x1 movs r1, 0x1
bl Text_DecompressGlyphFont1 bl DecompressGlyphFont1
_08006298: _08006298:
ldr r4, =0x03002f90 ldr r4, =0x03002f90
ldr r5, =0x04000008 ldr r5, =0x04000008
@ -4086,8 +4086,8 @@ GetMenuCursorDimensionByFont: @ 8006460
.pool .pool
thumb_func_end GetMenuCursorDimensionByFont thumb_func_end GetMenuCursorDimensionByFont
thumb_func_start Text_DecompressGlyphFont0 thumb_func_start DecompressGlyphFont0
Text_DecompressGlyphFont0: @ 8006478 DecompressGlyphFont0: @ 8006478
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
@ -4098,19 +4098,19 @@ Text_DecompressGlyphFont0: @ 8006478
movs r0, 0xF movs r0, 0xF
ands r0, r3 ands r0, r3
lsls r0, 4 lsls r0, 4
ldr r1, =0x086544e4 ldr r1, =gFont0JapaneseGlyphs
adds r0, r1 adds r0, r1
adds r5, r2, r0 adds r5, r2, r0
ldr r4, =0x03002f90 ldr r4, =0x03002f90
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
adds r0, r5, r1 adds r0, r5, r1
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x80 adds r1, 0x80
movs r0, 0x8 movs r0, 0x8
@ -4123,10 +4123,10 @@ Text_DecompressGlyphFont0: @ 8006478
.pool .pool
_080064C4: _080064C4:
lsls r1, r3, 6 lsls r1, r3, 6
ldr r0, =0x08633ce4 ldr r0, =gFont0LatinGlyphs
adds r5, r1, r0 adds r5, r1, r0
ldr r4, =0x03002f90 ldr r4, =0x03002f90
ldr r0, =0x0863bce4 ldr r0, =gFont0LatinGlyphWidths
adds r0, r3, r0 adds r0, r3, r0
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
@ -4136,34 +4136,34 @@ _080064C4:
bhi _08006500 bhi _08006500
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x20 adds r0, 0x20
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
b _0800652C b _0800652C
.align 2, 0 .align 2, 0
.pool .pool
_08006500: _08006500:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x10 adds r0, 0x10
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x20 adds r1, 0x20
bl font_render_sub bl DecompressGlyphTile
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x20 adds r0, 0x20
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x30 adds r0, 0x30
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x60 adds r1, 0x60
bl font_render_sub bl DecompressGlyphTile
_0800652C: _0800652C:
ldr r0, =0x03002f90 ldr r0, =0x03002f90
adds r0, 0x81 adds r0, 0x81
@ -4175,7 +4175,7 @@ _08006534:
bx r0 bx r0
.align 2, 0 .align 2, 0
.pool .pool
thumb_func_end Text_DecompressGlyphFont0 thumb_func_end DecompressGlyphFont0
thumb_func_start GetGlyphWidthFont0 thumb_func_start GetGlyphWidthFont0
GetGlyphWidthFont0: @ 8006540 GetGlyphWidthFont0: @ 8006540
@ -4184,7 +4184,7 @@ GetGlyphWidthFont0: @ 8006540
lsrs r2, r0, 16 lsrs r2, r0, 16
cmp r1, 0x1 cmp r1, 0x1
beq _08006558 beq _08006558
ldr r0, =0x0863bce4 ldr r0, =gFont0LatinGlyphWidths
adds r0, r2, r0 adds r0, r2, r0
ldrb r0, [r0] ldrb r0, [r0]
b _0800655A b _0800655A
@ -4197,8 +4197,8 @@ _0800655A:
bx r1 bx r1
thumb_func_end GetGlyphWidthFont0 thumb_func_end GetGlyphWidthFont0
thumb_func_start Text_DecompressGlyphFont7 thumb_func_start DecompressGlyphFont7
Text_DecompressGlyphFont7: @ 8006560 DecompressGlyphFont7: @ 8006560
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
@ -4210,19 +4210,19 @@ Text_DecompressGlyphFont7: @ 8006560
adds r0, r3, 0 adds r0, r3, 0
ands r0, r5 ands r0, r5
lsls r0, 4 lsls r0, 4
ldr r1, =0x086584e4 ldr r1, =gFont1JapaneseGlyphs
adds r0, r1 adds r0, r1
adds r6, r2, r0 adds r6, r2, r0
ldr r4, =0x03002f90 ldr r4, =0x03002f90
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
adds r0, r6, r1 adds r0, r6, r1
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x80 adds r1, 0x80
movs r0, 0x8 movs r0, 0x8
@ -4234,10 +4234,10 @@ Text_DecompressGlyphFont7: @ 8006560
.pool .pool
_080065AC: _080065AC:
lsls r1, r3, 6 lsls r1, r3, 6
ldr r0, =0x0863bee4 ldr r0, =gFont7LatinGlyphs
adds r6, r1, r0 adds r6, r1, r0
ldr r4, =0x03002f90 ldr r4, =0x03002f90
ldr r0, =0x08643ee4 ldr r0, =gFont7LatinGlyphWidths
adds r0, r3, r0 adds r0, r3, r0
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
@ -4247,34 +4247,34 @@ _080065AC:
bhi _080065E8 bhi _080065E8
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x20 adds r0, 0x20
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
b _08006614 b _08006614
.align 2, 0 .align 2, 0
.pool .pool
_080065E8: _080065E8:
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x10 adds r0, 0x10
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x20 adds r1, 0x20
bl font_render_sub bl DecompressGlyphTile
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x20 adds r0, 0x20
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x30 adds r0, 0x30
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x60 adds r1, 0x60
bl font_render_sub bl DecompressGlyphTile
_08006614: _08006614:
ldr r0, =0x03002f90 ldr r0, =0x03002f90
adds r0, 0x81 adds r0, 0x81
@ -4286,7 +4286,7 @@ _0800661C:
bx r0 bx r0
.align 2, 0 .align 2, 0
.pool .pool
thumb_func_end Text_DecompressGlyphFont7 thumb_func_end DecompressGlyphFont7
thumb_func_start GetGlyphWidthFont7 thumb_func_start GetGlyphWidthFont7
GetGlyphWidthFont7: @ 8006628 GetGlyphWidthFont7: @ 8006628
@ -4295,7 +4295,7 @@ GetGlyphWidthFont7: @ 8006628
lsrs r2, r0, 16 lsrs r2, r0, 16
cmp r1, 0x1 cmp r1, 0x1
beq _08006640 beq _08006640
ldr r0, =0x08643ee4 ldr r0, =gFont7LatinGlyphWidths
adds r0, r2, r0 adds r0, r2, r0
ldrb r0, [r0] ldrb r0, [r0]
b _08006642 b _08006642
@ -4308,9 +4308,9 @@ _08006642:
bx r1 bx r1
thumb_func_end GetGlyphWidthFont7 thumb_func_end GetGlyphWidthFont7
thumb_func_start Text_DecompressGlyphFont8 thumb_func_start DecompressGlyphFont8
@ void Text_DecompressGlyphFont8(u16 glyphIndex, bool japanese) @ void DecompressGlyphFont8(u16 glyphIndex, bool japanese)
Text_DecompressGlyphFont8: @ 8006648 DecompressGlyphFont8: @ 8006648
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
@ -4321,19 +4321,19 @@ Text_DecompressGlyphFont8: @ 8006648
movs r0, 0xF movs r0, 0xF
ands r0, r3 ands r0, r3
lsls r0, 4 lsls r0, 4
ldr r1, =0x086544e4 ldr r1, =gFont0JapaneseGlyphs
adds r0, r1 adds r0, r1
adds r5, r2, r0 adds r5, r2, r0
ldr r4, =0x03002f90 ldr r4, =0x03002f90
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
adds r0, r5, r1 adds r0, r5, r1
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x80 adds r1, 0x80
movs r0, 0x8 movs r0, 0x8
@ -4346,10 +4346,10 @@ Text_DecompressGlyphFont8: @ 8006648
.pool .pool
_08006694: _08006694:
lsls r1, r3, 6 lsls r1, r3, 6
ldr r0, =0x0862bae4 ldr r0, =gFont8LatinGlyphs
adds r5, r1, r0 adds r5, r1, r0
ldr r4, =0x03002f90 ldr r4, =0x03002f90
ldr r0, =0x08633ae4 ldr r0, =gFont8LatinGlyphWidths
adds r0, r3, r0 adds r0, r3, r0
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
@ -4359,34 +4359,34 @@ _08006694:
bhi _080066D0 bhi _080066D0
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x20 adds r0, 0x20
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
b _080066FC b _080066FC
.align 2, 0 .align 2, 0
.pool .pool
_080066D0: _080066D0:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x10 adds r0, 0x10
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x20 adds r1, 0x20
bl font_render_sub bl DecompressGlyphTile
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x20 adds r0, 0x20
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x30 adds r0, 0x30
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x60 adds r1, 0x60
bl font_render_sub bl DecompressGlyphTile
_080066FC: _080066FC:
ldr r0, =0x03002f90 ldr r0, =0x03002f90
adds r0, 0x81 adds r0, 0x81
@ -4398,7 +4398,7 @@ _08006704:
bx r0 bx r0
.align 2, 0 .align 2, 0
.pool .pool
thumb_func_end Text_DecompressGlyphFont8 thumb_func_end DecompressGlyphFont8
thumb_func_start GetGlyphWidthFont8 thumb_func_start GetGlyphWidthFont8
GetGlyphWidthFont8: @ 8006710 GetGlyphWidthFont8: @ 8006710
@ -4407,7 +4407,7 @@ GetGlyphWidthFont8: @ 8006710
lsrs r2, r0, 16 lsrs r2, r0, 16
cmp r1, 0x1 cmp r1, 0x1
beq _08006728 beq _08006728
ldr r0, =0x08633ae4 ldr r0, =gFont8LatinGlyphWidths
adds r0, r2, r0 adds r0, r2, r0
ldrb r0, [r0] ldrb r0, [r0]
b _0800672A b _0800672A
@ -4420,8 +4420,8 @@ _0800672A:
bx r1 bx r1
thumb_func_end GetGlyphWidthFont8 thumb_func_end GetGlyphWidthFont8
thumb_func_start Text_DecompressGlyphFont2 thumb_func_start DecompressGlyphFont2
Text_DecompressGlyphFont2: @ 8006730 DecompressGlyphFont2: @ 8006730
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r6, r0, 16 lsrs r6, r0, 16
@ -4432,31 +4432,31 @@ Text_DecompressGlyphFont2: @ 8006730
movs r0, 0x7 movs r0, 0x7
ands r0, r6 ands r0, r6
lsls r0, 5 lsls r0, 5
ldr r1, =0x0866c8e4 ldr r1, =gFont2JapaneseGlyphs
adds r0, r1 adds r0, r1
adds r4, r2, r0 adds r4, r2, r0
ldr r5, =0x03002f90 ldr r5, =0x03002f90
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x10 adds r0, 0x10
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x20 adds r1, 0x20
bl font_render_sub bl DecompressGlyphTile
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
adds r0, r4, r1 adds r0, r4, r1
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
movs r1, 0x88 movs r1, 0x88
lsls r1, 1 lsls r1, 1
adds r0, r4, r1 adds r0, r4, r1
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x60 adds r1, 0x60
bl font_render_sub bl DecompressGlyphTile
ldr r0, =0x086748e4 ldr r0, =gFont2JapaneseGlyphWidths
adds r0, r6, r0 adds r0, r6, r0
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r5, 0 adds r0, r5, 0
@ -4471,10 +4471,10 @@ Text_DecompressGlyphFont2: @ 8006730
.pool .pool
_080067A0: _080067A0:
lsls r1, r6, 6 lsls r1, r6, 6
ldr r0, =0x086440e4 ldr r0, =gFont2LatinGlyphs
adds r4, r1, r0 adds r4, r1, r0
ldr r5, =0x03002f90 ldr r5, =0x03002f90
ldr r0, =0x0864c0e4 ldr r0, =gFont2LatinGlyphWidths
adds r0, r6, r0 adds r0, r6, r0
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r5, 0 adds r0, r5, 0
@ -4484,34 +4484,34 @@ _080067A0:
bhi _080067DC bhi _080067DC
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x20 adds r0, 0x20
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
b _08006808 b _08006808
.align 2, 0 .align 2, 0
.pool .pool
_080067DC: _080067DC:
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x10 adds r0, 0x10
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x20 adds r1, 0x20
bl font_render_sub bl DecompressGlyphTile
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x20 adds r0, 0x20
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x30 adds r0, 0x30
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x60 adds r1, 0x60
bl font_render_sub bl DecompressGlyphTile
_08006808: _08006808:
ldr r0, =0x03002f90 ldr r0, =0x03002f90
adds r0, 0x81 adds r0, 0x81
@ -4523,7 +4523,7 @@ _08006810:
bx r0 bx r0
.align 2, 0 .align 2, 0
.pool .pool
thumb_func_end Text_DecompressGlyphFont2 thumb_func_end DecompressGlyphFont2
thumb_func_start GetGlyphWidthFont2 thumb_func_start GetGlyphWidthFont2
GetGlyphWidthFont2: @ 800681C GetGlyphWidthFont2: @ 800681C
@ -4532,12 +4532,12 @@ GetGlyphWidthFont2: @ 800681C
lsrs r2, r0, 16 lsrs r2, r0, 16
cmp r1, 0x1 cmp r1, 0x1
beq _08006830 beq _08006830
ldr r0, =0x0864c0e4 ldr r0, =gFont2LatinGlyphWidths
b _08006832 b _08006832
.align 2, 0 .align 2, 0
.pool .pool
_08006830: _08006830:
ldr r0, =0x086748e4 ldr r0, =gFont2JapaneseGlyphWidths
_08006832: _08006832:
adds r0, r2, r0 adds r0, r2, r0
ldrb r0, [r0] ldrb r0, [r0]
@ -4547,9 +4547,9 @@ _08006832:
.pool .pool
thumb_func_end GetGlyphWidthFont2 thumb_func_end GetGlyphWidthFont2
thumb_func_start Text_DecompressGlyphFont1 thumb_func_start DecompressGlyphFont1
@ void Text_DecompressGlyphFont1(int a1, int japanese) @ void DecompressGlyphFont1(int a1, int japanese)
Text_DecompressGlyphFont1: @ 8006840 DecompressGlyphFont1: @ 8006840
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
@ -4561,19 +4561,19 @@ Text_DecompressGlyphFont1: @ 8006840
adds r0, r3, 0 adds r0, r3, 0
ands r0, r5 ands r0, r5
lsls r0, 4 lsls r0, 4
ldr r1, =0x086584e4 ldr r1, =gFont1JapaneseGlyphs
adds r0, r1 adds r0, r1
adds r6, r2, r0 adds r6, r2, r0
ldr r4, =0x03002f90 ldr r4, =0x03002f90
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
adds r0, r6, r1 adds r0, r6, r1
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x80 adds r1, 0x80
movs r0, 0x8 movs r0, 0x8
@ -4585,10 +4585,10 @@ Text_DecompressGlyphFont1: @ 8006840
.pool .pool
_0800688C: _0800688C:
lsls r1, r3, 6 lsls r1, r3, 6
ldr r0, =0x0864c2e4 ldr r0, =gFont1LatinGlyphs
adds r6, r1, r0 adds r6, r1, r0
ldr r4, =0x03002f90 ldr r4, =0x03002f90
ldr r0, =0x086542e4 ldr r0, =gFont1LatinGlyphWidths
adds r0, r3, r0 adds r0, r3, r0
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
@ -4598,34 +4598,34 @@ _0800688C:
bhi _080068C8 bhi _080068C8
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x20 adds r0, 0x20
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
b _080068F4 b _080068F4
.align 2, 0 .align 2, 0
.pool .pool
_080068C8: _080068C8:
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
bl font_render_sub bl DecompressGlyphTile
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x10 adds r0, 0x10
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x20 adds r1, 0x20
bl font_render_sub bl DecompressGlyphTile
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x20 adds r0, 0x20
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
bl font_render_sub bl DecompressGlyphTile
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x30 adds r0, 0x30
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x60 adds r1, 0x60
bl font_render_sub bl DecompressGlyphTile
_080068F4: _080068F4:
ldr r0, =0x03002f90 ldr r0, =0x03002f90
adds r0, 0x81 adds r0, 0x81
@ -4637,7 +4637,7 @@ _080068FC:
bx r0 bx r0
.align 2, 0 .align 2, 0
.pool .pool
thumb_func_end Text_DecompressGlyphFont1 thumb_func_end DecompressGlyphFont1
thumb_func_start GetGlyphWidthFont1 thumb_func_start GetGlyphWidthFont1
GetGlyphWidthFont1: @ 8006908 GetGlyphWidthFont1: @ 8006908
@ -4646,7 +4646,7 @@ GetGlyphWidthFont1: @ 8006908
lsrs r2, r0, 16 lsrs r2, r0, 16
cmp r1, 0x1 cmp r1, 0x1
beq _08006920 beq _08006920
ldr r0, =0x086542e4 ldr r0, =gFont1LatinGlyphWidths
adds r0, r2, r0 adds r0, r2, r0
ldrb r0, [r0] ldrb r0, [r0]
b _08006922 b _08006922
@ -4659,8 +4659,8 @@ _08006922:
bx r1 bx r1
thumb_func_end GetGlyphWidthFont1 thumb_func_end GetGlyphWidthFont1
thumb_func_start Text_DecompressGlyphFont9 thumb_func_start DecompressGlyphFont9
Text_DecompressGlyphFont9: @ 8006928 DecompressGlyphFont9: @ 8006928
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 20 lsrs r4, r0, 20
@ -4675,14 +4675,14 @@ Text_DecompressGlyphFont9: @ 8006928
ldr r5, =0x03002f90 ldr r5, =0x03002f90
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl font_render_sub bl DecompressGlyphTile
movs r0, 0x80 movs r0, 0x80
lsls r0, 1 lsls r0, 1
adds r4, r0 adds r4, r0
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x40 adds r1, 0x40
adds r0, r4, 0 adds r0, r4, 0
bl font_render_sub bl DecompressGlyphTile
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x80 adds r1, 0x80
movs r0, 0x8 movs r0, 0x8
@ -4695,4 +4695,4 @@ Text_DecompressGlyphFont9: @ 8006928
bx r0 bx r0
.align 2, 0 .align 2, 0
.pool .pool
thumb_func_end Text_DecompressGlyphFont9 thumb_func_end DecompressGlyphFont9