diff options
| author | YamaArashi <shadow962@live.com> | 2017-01-14 11:53:20 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-01-14 14:20:49 -0800 |
| commit | 12681346688870e71b1a33dae7e52f9e1302080f (patch) | |
| tree | 4b489a31e653ca27d43bd5f8c3c6d00c25394134 /asm/berry_tag_screen.s | |
| parent | 2f76de380c28a7c0f2163e1f45e1ff007258f877 (diff) | |
decompile string_util
Diffstat (limited to 'asm/berry_tag_screen.s')
| -rw-r--r-- | asm/berry_tag_screen.s | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s index 0314caa7c..2b1a2e7d6 100644 --- a/asm/berry_tag_screen.s +++ b/asm/berry_tag_screen.s @@ -343,7 +343,7 @@ _08177F1C: b _08177FD6 .pool _08177F3C: - ldr r0, =gUnknown_03005D90 + ldr r0, =gSaveBlock2Ptr ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 @@ -562,20 +562,20 @@ sub_8178110: @ 8178110 ldrb r0, [r0] bl GetBerryInfo adds r6, r0, 0 - ldr r0, =gUnknown_02021CC4 + ldr r0, =gStringVar1 ldr r1, [r5] adds r1, r4 ldrh r1, [r1] movs r2, 0x2 movs r3, 0x2 - bl ConvertIntToDecimalString - ldr r0, =gUnknown_02021DC4 + bl ConvertIntToDecimalStringN + ldr r0, =gStringVar2 adds r1, r6, 0 - bl CopyString - ldr r4, =gUnknown_02021FC4 + bl StringCopy + ldr r4, =gStringVar4 ldr r1, =gUnknown_085E9263 adds r0, r4, 0 - bl ExpandStringRefs + bl StringExpandPlaceholders movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -641,20 +641,20 @@ _081781C8: movs r1, 0x64 bl __udivsi3 adds r5, r0, 0 - ldr r0, =gUnknown_02021CC4 + ldr r0, =gStringVar1 adds r1, r5, 0 movs r2, 0 movs r3, 0x2 - bl ConvertIntToDecimalString - ldr r0, =gUnknown_02021DC4 + bl ConvertIntToDecimalStringN + ldr r0, =gStringVar2 adds r1, r4, 0 movs r2, 0 movs r3, 0x2 - bl ConvertIntToDecimalString - ldr r4, =gUnknown_02021FC4 + bl ConvertIntToDecimalStringN + ldr r4, =gStringVar4 ldr r1, =gUnknown_085E9233 adds r0, r4, 0 - bl ExpandStringRefs + bl StringExpandPlaceholders str r7, [sp] str r6, [sp, 0x4] str r6, [sp, 0x8] |