summaryrefslogtreecommitdiff
path: root/asm/berry_blender.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2017-01-14 11:53:20 -0800
committerYamaArashi <shadow962@live.com>2017-01-14 14:20:49 -0800
commit12681346688870e71b1a33dae7e52f9e1302080f (patch)
tree4b489a31e653ca27d43bd5f8c3c6d00c25394134 /asm/berry_blender.s
parent2f76de380c28a7c0f2163e1f45e1ff007258f877 (diff)
decompile string_util
Diffstat (limited to 'asm/berry_blender.s')
-rw-r--r--asm/berry_blender.s140
1 files changed, 70 insertions, 70 deletions
diff --git a/asm/berry_blender.s b/asm/berry_blender.s
index 3dcd0e3cb..abbb7a597 100644
--- a/asm/berry_blender.s
+++ b/asm/berry_blender.s
@@ -771,7 +771,7 @@ sub_807FE14: @ 807FE14
strh r5, [r6]
adds r0, r6, 0x2
adds r1, r4, 0
- bl CopyString
+ bl StringCopy
ldrb r0, [r4, 0x15]
strb r0, [r6, 0x9]
ldrb r0, [r4, 0x16]
@@ -821,10 +821,10 @@ _0807FE7C:
movs r1, 0x2
strb r1, [r0]
ldr r4, =gUnknown_020229F0
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
adds r0, r4, 0
- bl CopyString
+ bl StringCopy
movs r0, 0xD0
lsls r0, 2
bl FlagGet
@@ -835,7 +835,7 @@ _0807FE7C:
adds r0, 0x1C
ldr r1, =gUnknown_083397D0
ldr r1, [r1, 0xC]
- bl CopyString
+ bl StringCopy
b _0807FED4
.pool
_0807FEC8:
@@ -843,7 +843,7 @@ _0807FEC8:
adds r0, 0x1C
ldr r1, =gUnknown_083397D0
ldr r1, [r1]
- bl CopyString
+ bl StringCopy
_0807FED4:
ldr r1, =gUnknown_020229E8
movs r0, 0x2
@@ -860,19 +860,19 @@ _0807FEE8:
movs r1, 0x3
strb r1, [r0]
ldr r6, =gUnknown_020229F0
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
adds r0, r6, 0
- bl CopyString
+ bl StringCopy
adds r0, r6, 0
adds r0, 0x1C
ldr r4, =gUnknown_083397D0
ldr r1, [r4, 0x10]
- bl CopyString
+ bl StringCopy
adds r0, r6, 0
adds r0, 0x38
ldr r1, [r4, 0x8]
- bl CopyString
+ bl StringCopy
adds r0, r6, 0
subs r0, 0x8
strh r5, [r0, 0x1A]
@@ -890,23 +890,23 @@ _0807FF3C:
movs r1, 0x4
strb r1, [r0]
ldr r5, =gUnknown_020229F0
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
adds r0, r5, 0
- bl CopyString
+ bl StringCopy
adds r0, r5, 0
adds r0, 0x1C
ldr r4, =gUnknown_083397D0
ldr r1, [r4, 0x14]
- bl CopyString
+ bl StringCopy
adds r0, r5, 0
adds r0, 0x38
ldr r1, [r4, 0x4]
- bl CopyString
+ bl StringCopy
adds r0, r5, 0
adds r0, 0x54
ldr r1, [r4, 0x8]
- bl CopyString
+ bl StringCopy
adds r0, r5, 0
subs r0, 0x8
movs r1, 0x2
@@ -1938,7 +1938,7 @@ _080807E4:
ldr r0, =gUnknown_020229F0
adds r1, r0
add r0, sp, 0x8
- bl CopyString
+ bl StringCopy
movs r0, 0x1
add r1, sp, 0x8
movs r2, 0x38
@@ -3652,7 +3652,7 @@ _0808175A:
ldrb r0, [r1]
cmp r0, 0
bne _0808182C
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x2
@@ -3883,7 +3883,7 @@ help_system_is_not_first_time: @ 8081964
bne _080819A2
adds r0, r4, 0x2
adds r1, r5, 0x2
- bl CompareString
+ bl StringCompare
cmp r0, 0
bne _080819B0
ldr r0, [r4, 0x8]
@@ -5544,7 +5544,7 @@ _080826EC:
adds r0, 0x63
movs r1, 0x3
strb r1, [r0]
- ldr r4, =gUnknown_02021FC4
+ ldr r4, =gStringVar4
ldr r0, [r6]
adds r0, 0x6E
ldrh r0, [r0]
@@ -5554,7 +5554,7 @@ _080826EC:
ldr r0, =gUnknown_020229F0
adds r1, r0
adds r0, r4, 0
- bl CopyString
+ bl StringCopy
ldr r1, =gUnknown_083398DD
b _08082740
.pool
@@ -5564,7 +5564,7 @@ _0808271C:
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
- ldr r4, =gUnknown_02021FC4
+ ldr r4, =gStringVar4
ldr r0, [r6]
adds r0, 0x6E
ldrh r0, [r0]
@@ -5574,18 +5574,18 @@ _0808271C:
ldr r0, =gUnknown_020229F0
adds r1, r0
adds r0, r4, 0
- bl CopyString
+ bl StringCopy
ldr r1, =gUnknown_083398B0
_08082740:
adds r0, r4, 0
- bl AppendString
+ bl StringAppend
b _080828DC
.pool
_08082754:
ldr r4, [r6]
ldr r0, =0x000011b8
adds r4, r0
- ldr r5, =gUnknown_02021FC4
+ ldr r5, =gStringVar4
bl sav2_get_text_speed
adds r2, r0, 0
lsls r2, 24
@@ -5855,9 +5855,9 @@ _080829AA:
ldr r1, =0x000011b8
adds r0, r1
strh r2, [r0]
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08339896
- bl CopyString
+ bl StringCopy
b _08082A92
.pool
_080829D4:
@@ -5871,16 +5871,16 @@ _080829D4:
ldr r1, =0x000011b8
adds r0, r1
strh r2, [r0]
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08339858
- bl CopyString
+ bl StringCopy
b _08082A92
.pool
_08082A00:
ldr r4, [r6]
ldr r2, =0x000011b8
adds r4, r2
- ldr r5, =gUnknown_02021FC4
+ ldr r5, =gStringVar4
bl sav2_get_text_speed
adds r2, r0, 0
lsls r2, 24
@@ -7155,7 +7155,7 @@ sub_80833F8: @ 80833F8
@ void UpdateBerryBlenderRecord()
UpdateBerryBlenderRecord: @ 8083418
push {lr}
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r2, [r0]
ldr r0, =gUnknown_020322A4
ldr r1, [r0]
@@ -7326,15 +7326,15 @@ _08083564:
mov r1, r8
movs r2, 0
movs r3, 0x1
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r0, [r7]
adds r0, 0x9F
ldr r1, =gUnknown_08339941
- bl AppendString
+ bl StringAppend
ldr r0, [r7]
adds r0, 0x9F
ldr r1, =gUnknown_085E8D5E
- bl AppendString
+ bl StringAppend
ldr r0, [r7]
adds r0, 0x9F
lsls r4, r5, 3
@@ -7342,7 +7342,7 @@ _08083564:
lsls r4, 2
ldr r3, =gUnknown_020229F0
adds r1, r4, r3
- bl AppendString
+ bl StringAppend
ldr r1, [r7]
adds r1, 0x9F
mov r0, r9
@@ -7365,17 +7365,17 @@ _08083564:
lsls r1, 1
adds r5, r1
adds r1, r5, 0
- bl CopyString
+ bl StringCopy
ldr r0, [r7]
adds r0, 0x9F
ldr r2, =gUnknown_020229E8
adds r4, r2
ldrb r1, [r4, 0x1A]
- bl StopMusicWhileStringIsPrinted
+ bl ConvertInternationalString
ldr r0, [r7]
adds r0, 0x9F
ldr r1, =gUnknown_08339914
- bl AppendString
+ bl StringAppend
ldr r1, [r7]
adds r1, 0x9F
movs r3, 0xFF
@@ -7422,11 +7422,11 @@ _0808361A:
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r0, [r6]
adds r0, 0x9F
ldr r1, =gUnknown_08339941
- bl AppendString
+ bl StringAppend
ldr r0, [r6]
adds r0, 0x4E
ldrh r0, [r0]
@@ -7438,15 +7438,15 @@ _0808361A:
ldr r0, [sp, 0x48]
movs r2, 0x2
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r0, [r6]
adds r0, 0x9F
ldr r1, [sp, 0x48]
- bl AppendString
+ bl StringAppend
ldr r0, [r6]
adds r0, 0x9F
ldr r1, =gUnknown_0833993C
- bl AppendString
+ bl StringAppend
ldr r1, [r6]
adds r1, 0x9F
movs r0, 0x1
@@ -7496,19 +7496,19 @@ _0808361A:
adds r0, r5, 0
movs r2, 0x2
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r0, [r6]
adds r0, 0x9F
ldr r1, =gUnknown_08339921
- bl AppendString
+ bl StringAppend
adds r1, r4, 0
movs r2, 0x2
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r0, [r6]
adds r0, 0x9F
ldr r1, =gUnknown_08339928
- bl AppendString
+ bl StringAppend
ldr r1, [r6]
adds r1, 0x9F
movs r0, 0x1
@@ -7681,13 +7681,13 @@ sub_80838AC: @ 80838AC
adds r0, r1
ldr r1, [r0]
adds r0, r6, 0
- bl CopyString
+ bl StringCopy
ldr r1, =gUnknown_0833979D
adds r0, r6, 0
- bl AppendString
+ bl StringAppend
ldr r1, =gUnknown_08339943
adds r0, r6, 0
- bl AppendString
+ bl StringAppend
adds r0, r5, 0
bl sub_8136EA4
adds r4, r0, 0
@@ -7700,32 +7700,32 @@ sub_80838AC: @ 80838AC
lsrs r5, 24
ldr r1, =gUnknown_0833994F
adds r0, r6, 0
- bl AppendString
+ bl StringAppend
mov r0, sp
adds r1, r4, 0
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r0, r6, 0
mov r1, sp
- bl AppendString
+ bl StringAppend
ldr r1, =gUnknown_0833995D
adds r0, r6, 0
- bl AppendString
+ bl StringAppend
mov r0, sp
adds r1, r5, 0
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r0, r6, 0
mov r1, sp
- bl AppendString
+ bl StringAppend
ldr r1, =gUnknown_08339970
adds r0, r6, 0
- bl AppendString
+ bl StringAppend
ldr r1, =gUnknown_0833979B
adds r0, r6, 0
- bl AppendString
+ bl StringAppend
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -8158,15 +8158,15 @@ _08083C84:
mov r1, r8
movs r2, 0
movs r3, 0x1
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r0, [r7]
adds r0, 0x9F
ldr r1, =gUnknown_08339941
- bl AppendString
+ bl StringAppend
ldr r0, [r7]
adds r0, 0x9F
ldr r1, =gUnknown_085E8D5E
- bl AppendString
+ bl StringAppend
ldr r0, [r7]
adds r0, 0x9F
lsls r1, r5, 3
@@ -8174,7 +8174,7 @@ _08083C84:
lsls r1, 2
ldr r2, =gUnknown_020229F0
adds r1, r2
- bl AppendString
+ bl StringAppend
ldr r1, [r7]
adds r1, 0x9F
ldr r0, [sp, 0x8]
@@ -8201,7 +8201,7 @@ _08083C84:
ldrh r1, [r1]
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r1, [r7]
adds r1, 0x9F
mov r3, r10
@@ -8222,7 +8222,7 @@ _08083C84:
ldrh r1, [r1]
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r1, [r7]
adds r1, 0x9F
mov r3, r10
@@ -8243,7 +8243,7 @@ _08083C84:
ldrh r1, [r1]
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r1, [r7]
adds r1, 0x9F
mov r3, r10
@@ -8379,7 +8379,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24
movs r7, 0xA4
lsls r7, 22
_08083E8A:
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
lsls r1, r6, 1
ldr r2, =0x000009bc
@@ -8393,10 +8393,10 @@ _08083E8A:
add r0, sp, 0xC
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r5, r0, 0
ldr r1, =gUnknown_08339941
- bl AppendString
+ bl StringAppend
adds r5, r0, 0
adds r0, r4, 0
movs r1, 0x64
@@ -8405,10 +8405,10 @@ _08083E8A:
adds r0, r5, 0
movs r2, 0x2
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r5, r0, 0
ldr r1, =gUnknown_0833993C
- bl AppendString
+ bl StringAppend
movs r0, 0x1
add r1, sp, 0xC
movs r2, 0x8C
@@ -8545,7 +8545,7 @@ sub_8083F94: @ 8083F94
ldr r5, =gUnknown_020229F0
adds r1, r5
adds r0, r7, 0
- bl CopyString
+ bl StringCopy
adds r0, r6, 0
bl sub_81370B4
strb r0, [r7, 0xB]
@@ -8599,7 +8599,7 @@ _08084058:
ldr r5, =gUnknown_020229F0
adds r1, r5
adds r0, r7, 0
- bl CopyString
+ bl StringCopy
adds r0, r6, 0
bl sub_81370B4
strb r0, [r7, 0xB]