summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/code_800D090.s2
-rw-r--r--asm/code_8012A18.s16
-rw-r--r--asm/code_801EE10.s14
-rw-r--r--asm/code_803B050.s36
-rw-r--r--asm/code_803D110.s4
-rw-r--r--asm/code_80521D0.s4
-rw-r--r--asm/code_805D8C8.s8
-rw-r--r--asm/code_807034C.s2
-rw-r--r--asm/code_8090208.s2
-rw-r--r--asm/code_8098BDC.s10
-rw-r--r--asm/friend_rescue.s2
-rw-r--r--asm/kecleon_items_1.s2
-rw-r--r--asm/makuhita_dojo.s2
-rw-r--r--asm/wonder_mail_2.s2
-rw-r--r--asm/wonder_mail_4.s2
-rw-r--r--asm/wonder_mail_5.s12
16 files changed, 60 insertions, 60 deletions
diff --git a/asm/code_800D090.s b/asm/code_800D090.s
index dd890d8..0a9e887 100644
--- a/asm/code_800D090.s
+++ b/asm/code_800D090.s
@@ -8704,7 +8704,7 @@ _08011406:
ldr r1, _0801147C
ldr r2, [r6]
add r0, sp, 0x4
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
movs r0, 0
str r0, [sp]
movs r0, 0xC
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s
index 53f3185..3f2b6b8 100644
--- a/asm/code_8012A18.s
+++ b/asm/code_8012A18.s
@@ -510,7 +510,7 @@ _08012F62:
_08012F64:
mov r0, r8
ldr r1, _08012FBC
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
adds r0, r5, 0
adds r0, 0x14
mov r1, r9
@@ -4504,7 +4504,7 @@ _08014E60:
adds r5, 0x1
ldr r2, [r0]
mov r0, sp
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
_08014E78:
mov r4, sp
b _08014F0E
@@ -4525,7 +4525,7 @@ _08014E84:
subs r2, 0x30
adds r5, 0x1
mov r0, sp
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
mov r0, sp
ldrb r1, [r0]
cmp r1, 0
@@ -4558,7 +4558,7 @@ _08014EC4:
subs r2, 0x30
adds r5, 0x1
mov r0, sp
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
mov r0, sp
ldrb r1, [r0]
cmp r1, 0
@@ -6139,7 +6139,7 @@ _08015B04:
add r0, sp, 0x4
ldr r1, _08015B30
adds r2, r5, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
mov r1, r8
ldr r0, [r1]
ldrb r0, [r0, 0x19]
@@ -6169,7 +6169,7 @@ _08015B34:
mov r0, r10
ldr r1, _08015B78
adds r2, r5, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
mov r3, r8
ldr r0, [r3]
ldrb r0, [r0, 0x19]
@@ -6477,7 +6477,7 @@ _08015DD0:
adds r0, 0xF8
ldr r2, [r0]
add r0, sp, 0x4
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
b _08015DEE
.align 2, 0
_08015DDC: .4byte gUnknown_80DB65C
@@ -6487,7 +6487,7 @@ _08015DE0:
adds r0, 0xF8
ldr r2, [r0]
add r0, sp, 0x4
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
_08015DEE:
movs r0, 0
str r0, [sp]
diff --git a/asm/code_801EE10.s b/asm/code_801EE10.s
index 84256f9..d7ce879 100644
--- a/asm/code_801EE10.s
+++ b/asm/code_801EE10.s
@@ -1160,7 +1160,7 @@ sub_801F700:
movs r7, 0
ldrsh r3, [r0, r7]
adds r0, r5, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, [r6]
adds r0, r4
ldr r3, [r0]
@@ -4920,7 +4920,7 @@ _08021574:
mov r0, r10
ldr r1, _08021598
add r2, sp, 0x8
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
mov r3, r8
ldr r0, [r3]
adds r0, 0x40
@@ -4968,7 +4968,7 @@ _080215D8:
adds r2, r0, 0
mov r0, r10
ldr r1, _08021608
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
mov r2, r8
ldr r0, [r2]
adds r0, 0x40
@@ -5519,7 +5519,7 @@ _08021A16:
add r0, sp, 0x4
ldr r1, _08021A58
adds r2, r7, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
mov r1, r8
ldr r0, [r1]
ldr r3, [r0, 0x74]
@@ -9021,7 +9021,7 @@ _08023628:
ldr r1, _080236A0
adds r2, r7, 0
adds r3, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r6, _0802368C
ldr r0, [r6]
movs r1, 0xE4
@@ -10170,7 +10170,7 @@ _08023F02:
ldr r1, _08023F80
adds r2, r6, 0
mov r3, r9
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
mov r1, r8
ldr r0, [r1]
movs r2, 0xD6
@@ -10874,7 +10874,7 @@ sub_80243E8:
ldr r1, _08024454
mov r0, sp
adds r2, r5, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
adds r0, r4, 0
add sp, 0x3C
pop {r4,r5}
diff --git a/asm/code_803B050.s b/asm/code_803B050.s
index c13b2b6..1dcdaab 100644
--- a/asm/code_803B050.s
+++ b/asm/code_803B050.s
@@ -3,7 +3,7 @@
.syntax unified
- .text
+ .text
thumb_func_start sub_803B050
sub_803B050:
@@ -1059,7 +1059,7 @@ _0803B818:
add r0, sp, 0x4
adds r2, r6, 0
_0803B84C:
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
_0803B850:
ldr r1, [r7, 0x48]
ldr r3, [r7]
@@ -1096,7 +1096,7 @@ _0803B86C:
ldr r1, [r0]
add r0, sp, 0x4
adds r2, r6, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r1, [r7, 0x48]
ldr r3, [r7]
movs r0, 0
@@ -1160,7 +1160,7 @@ _0803B916:
ldr r1, _0803B938
add r0, sp, 0x4
adds r2, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
b _0803B944
.align 2, 0
_0803B938: .4byte gUnknown_80E8884
@@ -1299,7 +1299,7 @@ _0803BA4C:
ldr r1, _0803BA68
add r0, sp, 0x4
adds r2, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
b _0803BACC
.align 2, 0
_0803BA64: .4byte gUnknown_202DE58
@@ -1313,7 +1313,7 @@ _0803BA6C:
ldr r1, _0803BA88
add r0, sp, 0x4
adds r2, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
b _0803BACC
.align 2, 0
_0803BA84: .4byte gUnknown_202DE58
@@ -1347,7 +1347,7 @@ _0803BAA0:
add r0, sp, 0x4
adds r2, r4, 0
adds r3, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
_0803BACC:
ldr r3, [r7]
movs r0, 0
@@ -1408,7 +1408,7 @@ _0803BB10:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@@ -1454,7 +1454,7 @@ _0803BB74:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r3, [r7]
movs r4, 0
str r4, [sp]
@@ -1472,7 +1472,7 @@ _0803BB74:
ldr r1, [r5]
add r0, sp, 0x4
mov r2, r8
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r3, [r7]
str r4, [sp]
b _0803BD32
@@ -1508,7 +1508,7 @@ _0803BBF0:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@@ -1554,7 +1554,7 @@ _0803BC58:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@@ -1600,7 +1600,7 @@ _0803BCC0:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@@ -1621,7 +1621,7 @@ _0803BD1A:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r3, [r7]
str r6, [sp]
_0803BD32:
@@ -1677,7 +1677,7 @@ _0803BD88:
adds r0, r5, 0
adds r2, r6, 0
adds r3, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r3, [r7]
mov r1, r8
str r1, [sp]
@@ -1783,7 +1783,7 @@ _0803BE80:
_0803BE94:
add r0, sp, 0x4
adds r2, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r3, [r7]
movs r0, 0
str r0, [sp]
@@ -1823,7 +1823,7 @@ _0803BEC8:
ldr r1, _0803BF00
add r0, sp, 0x4
adds r2, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
b _0803BF0C
.align 2, 0
_0803BEF8: .4byte gSpecialMissionText
@@ -1940,7 +1940,7 @@ _0803BFD0:
add r0, sp, 0x4
adds r2, r4, 0
_0803BFEE:
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r3, [r7]
movs r0, 0
str r0, [sp]
diff --git a/asm/code_803D110.s b/asm/code_803D110.s
index fe3cd47..f5d2ba2 100644
--- a/asm/code_803D110.s
+++ b/asm/code_803D110.s
@@ -1388,7 +1388,7 @@ _0803DB54:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
b _0803DBCA
.align 2, 0
_0803DB84: .4byte gUnknown_80F60F8
@@ -1411,7 +1411,7 @@ _0803DBBC:
adds r3, 0x30
add r0, sp, 0x4
adds r2, r6, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
_0803DBCA:
add r0, sp, 0x4
bl CalcStringWidth
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index b542043..cd8fb28 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -785,7 +785,7 @@ _080529D4:
ldr r0, _080529E4
ldr r1, _080529E8
ldr r2, _080529EC
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
b _08052A28
.align 2, 0
_080529E4: .4byte gUnknown_202E5D8
@@ -795,7 +795,7 @@ _080529F0:
ldr r0, _080529FC
ldr r1, _08052A00
ldr r2, _08052A04
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
b _08052A28
.align 2, 0
_080529FC: .4byte gUnknown_202E5D8
diff --git a/asm/code_805D8C8.s b/asm/code_805D8C8.s
index 1d66ff2..2200fb9 100644
--- a/asm/code_805D8C8.s
+++ b/asm/code_805D8C8.s
@@ -4462,7 +4462,7 @@ _0805FCEC:
adds r0, r5, 0
ldr r1, _0805FD38
adds r2, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, _0805FD30
adds r1, r6, 0
bl sub_8013800
@@ -17054,7 +17054,7 @@ _08066208:
ldrb r2, [r0]
add r0, sp, 0x4
ldr r1, _08066258
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
movs r0, 0
ldrsh r1, [r5, r0]
ldr r0, _0806625C
@@ -17150,7 +17150,7 @@ _080662C4:
adds r0, r4
ldrb r2, [r0]
add r0, sp, 0x4
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, _0806634C
lsls r1, r4, 1
adds r1, r5, r1
@@ -17252,7 +17252,7 @@ _080663A0:
adds r0, r4
ldrb r2, [r0]
add r0, sp, 0x4
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, _08066428
lsls r1, r4, 1
adds r1, r5, r1
diff --git a/asm/code_807034C.s b/asm/code_807034C.s
index c8f4d56..83d614f 100644
--- a/asm/code_807034C.s
+++ b/asm/code_807034C.s
@@ -858,7 +858,7 @@ sub_8070968:
ldr r0, _0807098C
ldr r3, [r0]
adds r0, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
b _080709BA
.align 2, 0
_08070988: .4byte gUnknown_8106FA4
diff --git a/asm/code_8090208.s b/asm/code_8090208.s
index 81ff2ec..5b097fe 100644
--- a/asm/code_8090208.s
+++ b/asm/code_8090208.s
@@ -676,7 +676,7 @@ _080907DA:
bne _0809080C
ldr r1, _08090808
adds r0, r7, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
movs r0, 0
b _0809080E
.align 2, 0
diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s
index 32f6f5d..e354b7d 100644
--- a/asm/code_8098BDC.s
+++ b/asm/code_8098BDC.s
@@ -3,7 +3,7 @@
.syntax unified
- .text
+ .text
thumb_func_start sub_8098FCC
sub_8098FCC:
@@ -4305,7 +4305,7 @@ _0809B0E4:
lsls r2, 4
ldr r3, _0809B13C
adds r2, r3
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
_0809B0F6:
adds r0, r4, 0
bl sub_809AE3C
@@ -4602,7 +4602,7 @@ _0809B318:
lsls r2, 4
ldr r3, _0809B3D8
adds r2, r3
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
_0809B32A:
ldr r0, _0809B3DC
mov r8, r0
@@ -4614,7 +4614,7 @@ _0809B32A:
ldr r1, _0809B3E0
adds r0, r4, 0
adds r2, r7, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
adds r7, r4, 0
_0809B344:
adds r0, r6, 0
@@ -7670,7 +7670,7 @@ sub_809CBBC:
adds r0, r3
ldr r3, [r0]
mov r0, sp
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, _0809CC14
ldr r0, [r0]
movs r1, 0x98
diff --git a/asm/friend_rescue.s b/asm/friend_rescue.s
index 241bbf6..44b8b08 100644
--- a/asm/friend_rescue.s
+++ b/asm/friend_rescue.s
@@ -1542,7 +1542,7 @@ _080335C0:
adds r0, r4
ldr r1, _080335F0
add r2, sp, 0x14
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, [r5]
adds r0, r4
b _0803388E
diff --git a/asm/kecleon_items_1.s b/asm/kecleon_items_1.s
index e892e48..97b2812 100644
--- a/asm/kecleon_items_1.s
+++ b/asm/kecleon_items_1.s
@@ -241,7 +241,7 @@ _0801AB90:
ldr r1, _0801AC08
adds r0, r5, 0
add r2, sp, 0x4
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r4, _0801AC0C
ldr r0, [r4]
adds r0, 0x54
diff --git a/asm/makuhita_dojo.s b/asm/makuhita_dojo.s
index f43f21f..7d7680e 100644
--- a/asm/makuhita_dojo.s
+++ b/asm/makuhita_dojo.s
@@ -829,7 +829,7 @@ _08030608:
add r0, sp, 0x8
ldr r1, _08030664
adds r2, r5, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
mov r5, r8
ldr r0, [r5]
ldr r3, [r0, 0x64]
diff --git a/asm/wonder_mail_2.s b/asm/wonder_mail_2.s
index 383a1c6..19e314f 100644
--- a/asm/wonder_mail_2.s
+++ b/asm/wonder_mail_2.s
@@ -139,7 +139,7 @@ _0802BFE8:
adds r1, r0, 0
mov r0, r8
mov r2, r9
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x38]
movs r0, 0
diff --git a/asm/wonder_mail_4.s b/asm/wonder_mail_4.s
index 8103af1..c4c2ccd 100644
--- a/asm/wonder_mail_4.s
+++ b/asm/wonder_mail_4.s
@@ -865,7 +865,7 @@ _08030EE8:
ldr r1, _08030F54
adds r0, r6, 0
adds r2, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, [r5]
ldr r3, [r0, 0x10]
mov r0, r8
diff --git a/asm/wonder_mail_5.s b/asm/wonder_mail_5.s
index e461b13..aa081ae 100644
--- a/asm/wonder_mail_5.s
+++ b/asm/wonder_mail_5.s
@@ -56,7 +56,7 @@ _08031B2C:
ldr r1, _08031B8C
ldrb r2, [r5, 0x5]
add r0, sp, 0x4
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
str r6, [sp]
@@ -71,7 +71,7 @@ _08031B2C:
adds r2, r0, 0
add r0, sp, 0x4
adds r1, r4, 0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
str r6, [sp]
@@ -136,7 +136,7 @@ _08031BC2:
ldrb r2, [r4, 0x5]
ldr r0, [sp, 0xD8]
ldr r1, _08031C2C
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r0, r8
@@ -167,7 +167,7 @@ _08031C30:
adds r0, r5, 0
ldr r1, _08031C54
mov r2, r9
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r1, r8
@@ -194,7 +194,7 @@ _08031C70:
adds r0, r5, 0
ldr r1, _08031C98
_08031C7E:
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r2, r8
@@ -214,7 +214,7 @@ _08031C9C:
adds r2, r0, 0
adds r0, r5, 0
ldr r1, _08031CD0
- bl ExpandPlaceholdersBuffer
+ bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r2, r8
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 03:08:28 +0000