diff options
Diffstat (limited to 'arm9/asm/MSL_printf.s')
| -rw-r--r-- | arm9/asm/MSL_printf.s | 58 |
1 files changed, 24 insertions, 34 deletions
diff --git a/arm9/asm/MSL_printf.s b/arm9/asm/MSL_printf.s index 38bf72e5..b33b3841 100644 --- a/arm9/asm/MSL_printf.s +++ b/arm9/asm/MSL_printf.s @@ -8,86 +8,76 @@ .extern memchr
.extern fwide
.extern fabs
-
- .rodata
-
- .global UNK_0210430C
-UNK_0210430C: ; 0x0210430C
- .byte 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00
- .byte 0x04, 0x00, 0x06, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x00, 0x04, 0x00
- .byte 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00
- .byte 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x04, 0x00
- .byte 0x42, 0x01, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00
- .byte 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00
- .byte 0x58, 0x04, 0x58, 0x04, 0x58, 0x04, 0x58, 0x04, 0x58, 0x04, 0x58, 0x04, 0x58, 0x04, 0x58, 0x04
- .byte 0x58, 0x04, 0x58, 0x04, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00
- .byte 0xD0, 0x00, 0x51, 0x06, 0x51, 0x06, 0x51, 0x06, 0x51, 0x06, 0x51, 0x06, 0x51, 0x06, 0x51, 0x02
- .byte 0x51, 0x02, 0x51, 0x02, 0x51, 0x02, 0x51, 0x02, 0x51, 0x02, 0x51, 0x02, 0x51, 0x02, 0x51, 0x02
- .byte 0x51, 0x02, 0x51, 0x02, 0x51, 0x02, 0x51, 0x02, 0x51, 0x02, 0x51, 0x02, 0x51, 0x02, 0x51, 0x02
- .byte 0x51, 0x02, 0x51, 0x02, 0x51, 0x02, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00
- .byte 0xD0, 0x00, 0x71, 0x04, 0x71, 0x04, 0x71, 0x04, 0x71, 0x04, 0x71, 0x04, 0x71, 0x04, 0x71, 0x00
- .byte 0x71, 0x00, 0x71, 0x00, 0x71, 0x00, 0x71, 0x00, 0x71, 0x00, 0x71, 0x00, 0x71, 0x00, 0x71, 0x00
- .byte 0x71, 0x00, 0x71, 0x00, 0x71, 0x00, 0x71, 0x00, 0x71, 0x00, 0x71, 0x00, 0x71, 0x00, 0x71, 0x00
- .byte 0x71, 0x00, 0x71, 0x00, 0x71, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0xD0, 0x00, 0x04, 0x00
- .size UNK_0210430C,.-UNK_0210430C
+ .extern __msl_digit
.data
.global UNK_02106DA0
UNK_02106DA0: ; 0x02106DA0
.byte 0x30, 0x78, 0x30, 0x70, 0x30, 0x00, 0x00, 0x00
+ .size UNK_02106DA0,.-UNK_02106DA0
.global UNK_02106DA8
UNK_02106DA8: ; 0x02106DA8
.asciz "-INF"
+ .size UNK_02106DA8,.-UNK_02106DA8
.balign 4, 0
.global UNK_02106DB0
UNK_02106DB0: ; 0x02106DB0
.asciz "-inf"
+ .size UNK_02106DB0,.-UNK_02106DB0
.balign 4, 0
.global UNK_02106DB8
UNK_02106DB8: ; 0x02106DB8
.asciz "INF"
+ .size UNK_02106DB8,.-UNK_02106DB8
.balign 4, 0
.global UNK_02106DBC
UNK_02106DBC: ; 0x02106DBC
.asciz "inf"
+ .size UNK_02106DBC,.-UNK_02106DBC
.balign 4, 0
.global UNK_02106DC0
UNK_02106DC0: ; 0x02106DC0
.asciz "-NAN"
+ .size UNK_02106DC0,.-UNK_02106DC0
.balign 4, 0
.global UNK_02106DC8
UNK_02106DC8: ; 0x02106DC8
.asciz "-nan"
+ .size UNK_02106DC8,.-UNK_02106DC8
.balign 4, 0
.global UNK_02106DD0
UNK_02106DD0: ; 0x02106DD0
.asciz "NAN"
+ .size UNK_02106DD0,.-UNK_02106DD0
.balign 4, 0
.global UNK_02106DD4
UNK_02106DD4: ; 0x02106DD4
.asciz "nan"
+ .size UNK_02106DD4,.-UNK_02106DD4
.balign 4, 0
.global UNK_02106DD8
UNK_02106DD8: ; 0x02106DD8
.byte 0x00, 0x00, 0x00, 0x00
+ .size UNK_02106DD8,.-UNK_02106DD8
.global UNK_02106DDC
UNK_02106DDC: ; 0x02106DDC
.byte 0x00, 0x00, 0x00, 0x00
+ .size UNK_02106DDC,.-UNK_02106DDC
.text
- arm_func_start parse_format_printf
-parse_format_printf: ; 0x020DF600
+ local_arm_func_start parse_format
+parse_format: ; 0x020DF600
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x10
ldrsb r3, [r0, #0x1]
@@ -181,7 +171,7 @@ _020DF73C: ldrsb r3, [r12, #0x1]!
b _020DF794
_020DF744:
- ldr r4, _020DFB88 ; =UNK_0210430C
+ ldr r4, _020DFB88 ; =__msl_digit
mov r5, #0x0
mov r0, #0xa
b _020DF768
@@ -238,7 +228,7 @@ _020DF7C4: strltb r0, [sp, #0x2]
b _020DF858
_020DF808:
- ldr r2, _020DFB88 ; =UNK_0210430C
+ ldr r2, _020DFB88 ; =__msl_digit
mov r4, #0x0
mov r0, #0xa
b _020DF82C
@@ -494,9 +484,9 @@ _020DFB70: add sp, sp, #0x10
ldmia sp!, {r4-r8,pc}
.balign 4
-_020DFB88: .word UNK_0210430C
+_020DFB88: .word __msl_digit
_020DFB8C: .word 0x000001FD
- arm_func_end parse_format_printf
+ arm_func_end parse_format
arm_func_start long2str
long2str: ; 0x020DFB90
@@ -1368,7 +1358,7 @@ _020E07BC: mov r1, #0x0
b _020E07D4
_020E07C4:
- ldr r1, _020E0DF8 ; =UNK_0210430C
+ ldr r1, _020E0DF8 ; =__msl_digit
mov r2, r6, lsl #0x1
ldrh r1, [r1, r2]
and r1, r1, #0x200
@@ -1416,7 +1406,7 @@ _020E0868: mov r1, #0x0
b _020E0880
_020E0870:
- ldr r1, _020E0DF8 ; =UNK_0210430C
+ ldr r1, _020E0DF8 ; =__msl_digit
mov r2, r6, lsl #0x1
ldrh r1, [r1, r2]
and r1, r1, #0x200
@@ -1463,7 +1453,7 @@ _020E0910: mov r1, #0x0
b _020E0928
_020E0918:
- ldr r1, _020E0DF8 ; =UNK_0210430C
+ ldr r1, _020E0DF8 ; =__msl_digit
mov r2, r6, lsl #0x1
ldrh r1, [r1, r2]
and r1, r1, #0x200
@@ -1511,7 +1501,7 @@ _020E09BC: mov r1, #0x0
b _020E09D4
_020E09C4:
- ldr r1, _020E0DF8 ; =UNK_0210430C
+ ldr r1, _020E0DF8 ; =__msl_digit
mov r2, r6, lsl #0x1
ldrh r1, [r1, r2]
and r1, r1, #0x200
@@ -1812,7 +1802,7 @@ _020E0DE0: bx lr
.balign 4
_020E0DF4: .word 0x000001FD
-_020E0DF8: .word UNK_0210430C
+_020E0DF8: .word __msl_digit
_020E0DFC: .word UNK_02106DA8
_020E0E00: .word UNK_02106DB0
_020E0E04: .word UNK_02106DB8
@@ -1877,7 +1867,7 @@ _020E0ED4: ldr r0, [sp, #0xc]
add r1, sp, #0x25c
add r2, sp, #0x1c
- bl parse_format_printf
+ bl parse_format
ldrb r1, [sp, #0x21]
mov r11, r0
cmp r1, #0x61
|