diff options
Diffstat (limited to 'asm/emerald.s')
| -rw-r--r-- | asm/emerald.s | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index 3ba90a5ae..c072daf54 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -702215,13 +702215,13 @@ sub_816BFE0: @ 816BFE0 bne _0816C030 movs r0, 0x1 movs r1, 0 - bl sub_8006460 + bl GetMenuCursorDimensionByFont adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0x1 movs r1, 0x1 - bl sub_8006460 + bl GetMenuCursorDimensionByFont lsls r0, 24 lsrs r0, 24 str r4, [sp] @@ -787999,7 +787999,7 @@ sub_81983EC: @ 81983EC movs r1, 0x1 str r2, [sp, 0xC] str r3, [sp, 0x10] - bl sub_8006460 + bl GetMenuCursorDimensionByFont lsls r0, 24 lsrs r0, 24 str r0, [sp] @@ -788039,13 +788039,13 @@ RedrawMenuCursor: @ 8198448 ldr r5, =0x0203cd90 ldrb r0, [r5, 0x6] movs r1, 0 - bl sub_8006460 + bl GetMenuCursorDimensionByFont adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldrb r0, [r5, 0x6] movs r1, 0x1 - bl sub_8006460 + bl GetMenuCursorDimensionByFont lsls r0, 24 lsrs r0, 24 ldrb r1, [r5, 0x5] @@ -789592,7 +789592,7 @@ sub_8198FD4: @ 8198FD4 movs r1, 0x1 str r2, [sp, 0x18] str r3, [sp, 0x1C] - bl sub_8006460 + bl GetMenuCursorDimensionByFont lsls r0, 24 lsrs r0, 24 adds r1, r4, 0 @@ -789640,7 +789640,7 @@ sub_8199060: @ 8199060 ldr r5, =0x0203cd90 ldrb r0, [r5, 0x6] movs r1, 0 - bl sub_8006460 + bl GetMenuCursorDimensionByFont mov r9, r0 mov r1, r9 lsls r1, 24 @@ -789648,7 +789648,7 @@ sub_8199060: @ 8199060 mov r9, r1 ldrb r0, [r5, 0x6] movs r1, 0x1 - bl sub_8006460 + bl GetMenuCursorDimensionByFont adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -825934,13 +825934,13 @@ sub_81AB75C: @ 81AB75C bne _081AB798 movs r0, 0x1 movs r1, 0 - bl sub_8006460 + bl GetMenuCursorDimensionByFont adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0x1 movs r1, 0x1 - bl sub_8006460 + bl GetMenuCursorDimensionByFont lsls r0, 24 lsrs r0, 24 str r4, [sp] @@ -832269,7 +832269,7 @@ sub_81AEC78: @ 81AEC78 lsls r0, 26 lsrs r0, 26 movs r1, 0 - bl sub_8006460 + bl GetMenuCursorDimensionByFont adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -832277,7 +832277,7 @@ sub_81AEC78: @ 81AEC78 lsls r0, 26 lsrs r0, 26 movs r1, 0x1 - bl sub_8006460 + bl GetMenuCursorDimensionByFont lsls r0, 24 lsrs r0, 24 ldrb r6, [r7, 0x10] @@ -841084,7 +841084,7 @@ _081B3226: _081B3250: movs r0, 0x1 movs r1, 0 - bl sub_8006460 + bl GetMenuCursorDimensionByFont lsls r0, 24 lsrs r0, 24 mov r9, r0 @@ -855015,11 +855015,11 @@ sub_81BA668: @ 81BA668 .pool thumb_func_end sub_81BA668 - thumb_func_start get_font_width_6 -get_font_width_6: @ 81BA6CC + thumb_func_start GetGlyphWidthFont6 +GetGlyphWidthFont6: @ 81BA6CC movs r0, 0x10 bx lr - thumb_func_end get_font_width_6 + thumb_func_end GetGlyphWidthFont6 thumb_func_start sub_81BA6D0 sub_81BA6D0: @ 81BA6D0 @@ -876243,13 +876243,13 @@ sub_81C5AB8: @ 81C5AB8 bne _081C5AF4 movs r0, 0x1 movs r1, 0 - bl sub_8006460 + bl GetMenuCursorDimensionByFont adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0x1 movs r1, 0x1 - bl sub_8006460 + bl GetMenuCursorDimensionByFont lsls r0, 24 lsrs r0, 24 str r4, [sp] |