Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-09 04:23:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #61 from garakmon/parameterized

Browse Source 
Parametrized to Parameterized
This commit is contained in:
PikalaxALT 2019-06-01 12:21:52 -04:00 committed by GitHub
commit 405a4352c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
64 changed files with 333 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/battle_interface.s
View File

@ -5559,7 +5559,7 @@ AddTextPrinterAndCreateWindowOnHealthbox: @ 804A648
movs r1, 0
adds r2, r6, 0
mov r3, r8
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
mov r0, r10
str r4, [r0]
adds r0, r5, 0

12
asm/battle_records.s
View File

@ -1092,7 +1092,7 @@ _080CDA72:
movs r1, 0x2
movs r2, 0xC
movs r3, 0x18
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x14
pop {r4-r7}
pop {r0}
@ -1138,7 +1138,7 @@ sub_80CDAD0: @ 80CDAD0
movs r1, 0x2
movs r2, 0
mov r3, r8
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
movs r6, 0
_080CDB0E:
movs r4, 0x54
@ -1161,7 +1161,7 @@ _080CDB1C:
movs r0, 0
movs r1, 0x2
mov r3, r8
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@ -1230,7 +1230,7 @@ _080CDBA6:
movs r0, 0
movs r1, 0x2
mov r3, r8
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@ -1291,7 +1291,7 @@ sub_80CDBE4: @ 80CDBE4
movs r0, 0
movs r1, 0x2
movs r3, 0x4
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r5, _080CDCA8 @ =gSaveBlock2Ptr
ldr r0, [r5]
ldr r1, _080CDCAC @ =0x00000a98
@ -1309,7 +1309,7 @@ sub_80CDBE4: @ 80CDBE4
movs r1, 0x2
movs r2, 0x54
movs r3, 0x30
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
adds r7, r5, 0
movs r5, 0xF4
lsls r5, 22

10
asm/berry_crush_2.s
View File

@ -229,7 +229,7 @@ _0814BCA2:
movs r0, 0
movs r1, 0x2
adds r2, r4, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
b _0814BD12
.align 2, 0
_0814BCE8: .4byte gStringVar4
@ -250,7 +250,7 @@ _0814BCF0:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
_0814BD12:
movs r0, 0
movs r1, 0x3
@ -2868,7 +2868,7 @@ _0814D106:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -3232,7 +3232,7 @@ _0814D3C0:
str r1, [sp, 0xC]
movs r0, 0
movs r1, 0x2
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
b _0814D40C
.align 2, 0
_0814D3EC: .4byte gUnknown_846E328
@ -3249,7 +3249,7 @@ _0814D3F0:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
_0814D40C:
movs r0, 0
movs r1, 0x3

46
asm/berry_crush_3.s
View File

@ -1212,7 +1212,7 @@ sub_814DF44: @ 814DF44
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3}
mov r8, r3
@ -1355,7 +1355,7 @@ _0814E048:
movs r1, 0x2
adds r2, r7, 0
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [sp, 0x2C]
ldrb r0, [r1]
adds r2, r7, 0
@ -1370,7 +1370,7 @@ _0814E048:
str r1, [sp, 0x8]
movs r1, 0x2
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
mov r9, r6
_0814E0C8:
ldr r6, [sp, 0x20]
@ -1509,7 +1509,7 @@ _0814E178:
ldr r1, _0814E1F8 @ =gStringVar4
str r1, [sp, 0x8]
movs r1, 0x2
bl box_print
bl AddTextPrinterParameterized3
b _0814E27E
.align 2, 0
_0814E1E4: .4byte gStringVar1
@ -1573,7 +1573,7 @@ _0814E21A:
ldr r1, _0814E2A0 @ =gStringVar4
str r1, [sp, 0x8]
movs r1, 0x2
bl box_print
bl AddTextPrinterParameterized3
mov r9, r4
mov r6, r8
adds r6, 0xA2
@ -1632,7 +1632,7 @@ _0814E2B8:
str r1, [sp, 0x8]
movs r1, 0x2
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
mov r2, r10
lsls r0, r2, 24
lsrs r0, 24
@ -1702,7 +1702,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
movs r2, 0x2
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, _0814E568 @ =gUnknown_841D088
movs r0, 0x2
adds r1, r4, 0
@ -1722,7 +1722,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r6, 0
subs r0, 0x20
lsls r0, 24
@ -1759,7 +1759,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, _0814E57C @ =gUnknown_841D078
movs r0, 0x2
adds r1, r4, 0
@ -1779,7 +1779,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r6, 0
subs r0, 0x9
lsls r0, 24
@ -1806,7 +1806,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r7, 0
adds r0, 0xE
lsls r0, 24
@ -1821,7 +1821,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
movs r2, 0x2
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, _0814E588 @ =gUnknown_841D098
movs r0, 0x2
adds r1, r4, 0
@ -1842,7 +1842,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x3
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
mov r4, r8
ldrb r2, [r4, 0x16]
ldrh r0, [r4, 0x16]
@ -1919,7 +1919,7 @@ _0814E4EA:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
b _0814E5B6
.align 2, 0
_0814E560: .4byte gUnknown_846E3DC
@ -1949,7 +1949,7 @@ _0814E59C:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
_0814E5B6:
adds r0, r7, 0
adds r0, 0xE
@ -1970,7 +1970,7 @@ _0814E5B6:
movs r1, 0x2
movs r2, 0x2
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r0, _0814E638 @ =gStringVar1
ldr r4, [sp, 0x10]
ldrh r1, [r4, 0x8]
@ -1998,7 +1998,7 @@ _0814E5B6:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x1C
pop {r3-r5}
mov r8, r3
@ -2341,7 +2341,7 @@ _0814E8B0:
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
ldr r5, _0814EA04 @ =gUnknown_841D124
movs r0, 0x2
adds r1, r5, 0
@ -2358,7 +2358,7 @@ _0814E8B0:
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0x12
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x2A
str r0, [sp, 0xC]
ldr r1, _0814EA08 @ =gStringVar4
@ -2383,7 +2383,7 @@ _0814E90E:
movs r1, 0x2
movs r2, 0x4
ldr r3, [sp, 0xC]
bl box_print
bl AddTextPrinterParameterized3
movs r3, 0
mov r0, r9
lsls r4, r0, 1
@ -2456,7 +2456,7 @@ _0814E96E:
str r1, [sp, 0x8]
movs r1, 0x3
ldr r3, [sp, 0xC]
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [sp, 0x10]
lsls r0, r1, 24
lsrs r0, 24
@ -2723,7 +2723,7 @@ _0814EBC6:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
b _0814EC4C
.align 2, 0
_0814EC10: .4byte 0x000001bb
@ -2752,7 +2752,7 @@ _0814EC18:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
_0814EC4C:
ldr r1, _0814EC7C @ =0x000001bb
adds r0, r6, r1

8
asm/berry_pouch.s
View File

@ -1072,7 +1072,7 @@ _0813D5EA:
movs r1, 0xA0
movs r2, 0x8
movs r3, 0x78
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
strb r0, [r1, 0x6]
add sp, 0x10
@ -1102,7 +1102,7 @@ sub_813D614: @ 813D614
movs r1, 0xD4
movs r2, 0x78
movs r3, 0x98
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
strb r0, [r1, 0x6]
add sp, 0x10
@ -1132,7 +1132,7 @@ sub_813D64C: @ 813D64C
movs r1, 0x98
movs r2, 0x48
movs r3, 0x68
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
strb r0, [r1, 0x6]
add sp, 0x10
@ -3465,7 +3465,7 @@ sub_813E9A0: @ 813E9A0
str r4, [sp, 0xC]
str r2, [sp, 0x10]
mov r2, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x14
pop {r3,r4}
mov r8, r3

2
asm/buy_menu_helpers.s
View File

@ -114,7 +114,7 @@ sub_813F6F4: @ 813F6F4
str r4, [sp, 0xC]
str r2, [sp, 0x10]
mov r2, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x14
pop {r3,r4}
mov r8, r3

4
asm/clear_save_data_screen.s
View File

@ -134,7 +134,7 @@ _080F5660:
movs r1, 0x2
movs r2, 0
movs r3, 0x3
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
movs r0, 0x1
movs r1, 0x2
bl CopyWindowToVram
@ -241,7 +241,7 @@ _080F5744:
movs r1, 0x2
movs r2, 0
movs r3, 0x3
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
movs r0, 0x1
movs r1, 0x3
bl CopyWindowToVram

6
asm/credits.s
View File

@ -422,7 +422,7 @@ _080F3D0A:
movs r1, 0x1
movs r2, 0x8
movs r3, 0x29
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r1, [r7]
movs r0, 0x5
b _080F413C
@ -649,7 +649,7 @@ _080F3EB4:
movs r1, 0x1
movs r2, 0x2
movs r3, 0x6
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r1, [r7]
movs r0, 0x8
b _080F3FB8
@ -696,7 +696,7 @@ _080F3F24:
movs r1, 0x2
movs r2, 0x8
movs r3, 0x6
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r1, [r7]
movs r0, 0x9
b _080F3FB8

6
asm/diploma.s
View File

@ -559,7 +559,7 @@ _080F5050:
movs r0, 0
movs r1, 0x2
movs r3, 0x4
bl box_print
bl AddTextPrinterParameterized3
ldr r1, _080F50EC @ =gUnknown_841B619
add r0, sp, 0xC
bl UnkTextUtil_StringExpandPlaceholders
@ -579,7 +579,7 @@ _080F5050:
movs r1, 0x2
adds r2, r4, 0
movs r3, 0x1E
bl box_print
bl AddTextPrinterParameterized3
str r6, [sp]
movs r0, 0
str r0, [sp, 0x4]
@ -589,7 +589,7 @@ _080F5050:
movs r1, 0x2
movs r2, 0x78
movs r3, 0x69
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
bl PutWindowTilemap
add sp, 0xAC

10
asm/dodrio_berry_picking.s
View File

@ -9014,7 +9014,7 @@ _08154C4E:
str r4, [sp, 0x8]
movs r1, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
mov r2, r10
ldr r0, [r2]
add r0, r9
@ -9319,7 +9319,7 @@ _08154EC8:
movs r1, 0
movs r2, 0x1C
adds r3, r6, 0
bl box_print
bl AddTextPrinterParameterized3
add r0, sp, 0xC
mov r1, r9
movs r2, 0x1
@ -9563,7 +9563,7 @@ _081550EA:
str r6, [sp, 0x8]
movs r1, 0
movs r2, 0x2
bl box_print
bl AddTextPrinterParameterized3
movs r7, 0
mov r0, r9
adds r0, 0x1
@ -9624,7 +9624,7 @@ _0815512E:
add r1, sp, 0xC
str r1, [sp, 0x8]
movs r1, 0
bl box_print
bl AddTextPrinterParameterized3
b _081551FA
.align 2, 0
_081551A8: .4byte gUnknown_203F440
@ -10669,7 +10669,7 @@ _08155AA6:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
b _08155B08
.align 2, 0
_08155ACC: .4byte gUnknown_8419F54

6
asm/field_map_obj.s
View File

@ -1373,8 +1373,8 @@ SpawnSpecialFieldObject: @ 805E7F4
_0805E82C: .4byte gSaveBlock1Ptr
thumb_func_end SpawnSpecialFieldObject
thumb_func_start SpawnSpecialFieldObjectParametrized
SpawnSpecialFieldObjectParametrized: @ 805E830
thumb_func_start SpawnSpecialFieldObjectParameterized
SpawnSpecialFieldObjectParameterized: @ 805E830
push {r4-r6,lr}
mov r6, r8
push {r6}
@ -1425,7 +1425,7 @@ SpawnSpecialFieldObjectParametrized: @ 805E830
bx r1
.align 2, 0
_0805E894: .4byte 0xfff90000
thumb_func_end SpawnSpecialFieldObjectParametrized
thumb_func_end SpawnSpecialFieldObjectParameterized
thumb_func_start show_sprite
show_sprite: @ 805E898

6
asm/field_player_avatar.s
View File

@ -4676,7 +4676,7 @@ sub_805D66C: @ 805D66C
movs r0, 0
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@ -4851,7 +4851,7 @@ sub_805D7C0: @ 805D7C0
movs r0, 0
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0xD
strh r0, [r6, 0x8]
movs r0, 0x1
@ -4904,7 +4904,7 @@ sub_805D838: @ 805D838
movs r0, 0
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]

2
asm/field_screen_effect.s
View File

@ -785,7 +785,7 @@ _0807F3E0:
movs r1, 0x2
mov r2, r10
mov r3, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r2, _0807F42C @ =gTextFlags
ldrb r1, [r2]
movs r0, 0x2

2
asm/field_specials.s
View File

@ -601,7 +601,7 @@ SpawnScriptFieldObject: @ 80CAA34
movs r0, 0x12
movs r1, 0x8
movs r2, 0x7F
bl SpawnSpecialFieldObjectParametrized
bl SpawnSpecialFieldObjectParameterized
lsls r0, 24
lsrs r0, 24
ldr r2, _080CAA84 @ =gMapObjects

30
asm/hall_of_fame.s
View File

@ -521,7 +521,7 @@ _080F21B2:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -1277,7 +1277,7 @@ _080F27AC:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -2358,7 +2358,7 @@ sub_80F30A4: @ 80F30A4
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -2436,7 +2436,7 @@ HallOfFame_PrintWelcomeText: @ 80F313C
movs r1, 0x2
adds r2, r4, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -2535,7 +2535,7 @@ _080F322E:
movs r1, 0x2
movs r2, 0x10
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
_080F3252:
movs r2, 0
ldrb r0, [r7, 0xA]
@ -2606,7 +2606,7 @@ _080F32C4:
movs r0, 0
movs r1, 0x2
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldrh r2, [r7, 0x8]
ldr r4, _080F3320 @ =0x000001ff
adds r0, r4, 0
@ -2676,7 +2676,7 @@ _080F3348:
movs r1, 0x2
movs r2, 0x80
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r1, _080F33D4 @ =gUnknown_84160F4
add r0, sp, 0xC
bl StringCopy
@ -2694,7 +2694,7 @@ _080F3348:
movs r1, 0x2
movs r2, 0x20
movs r3, 0x11
bl box_print
bl AddTextPrinterParameterized3
ldr r1, _080F33D8 @ =gUnknown_8416104
add r0, sp, 0xC
bl StringCopy
@ -2711,7 +2711,7 @@ _080F3348:
movs r1, 0x2
movs r2, 0x60
movs r3, 0x11
bl box_print
bl AddTextPrinterParameterized3
_080F33BA:
movs r0, 0
movs r1, 0x3
@ -2764,7 +2764,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2
movs r2, 0x4
movs r3, 0x3
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r0, _080F35FC @ =gSaveBlock2Ptr
mov r10, r0
ldr r1, [r0]
@ -2785,7 +2785,7 @@ sub_80F33DC: @ 80F33DC
movs r0, 0x1
movs r1, 0x2
movs r3, 0x3
bl box_print
bl AddTextPrinterParameterized3
mov r1, r10
ldr r0, [r1]
ldrb r4, [r0, 0xA]
@ -2801,7 +2801,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2
movs r2, 0x4
movs r3, 0x12
bl box_print
bl AddTextPrinterParameterized3
add r1, sp, 0x14
mov r8, r1
ldr r1, _080F3604 @ =0x000186a0
@ -2869,7 +2869,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2
adds r2, r6, 0
movs r3, 0x12
bl box_print
bl AddTextPrinterParameterized3
mov r1, r9
str r1, [sp]
str r7, [sp, 0x4]
@ -2879,7 +2879,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2
movs r2, 0x4
movs r3, 0x20
bl box_print
bl AddTextPrinterParameterized3
add r5, sp, 0x14
mov r0, r10
ldr r4, [r0]
@ -2957,7 +2957,7 @@ _080F3582:
movs r0, 0x1
movs r1, 0x2
movs r3, 0x20
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x1
movs r1, 0x3
bl CopyWindowToVram

6
asm/item_menu.s
View File

@ -1383,7 +1383,7 @@ sub_8108888: @ 8108888
movs r1, 0xA0
movs r2, 0x8
movs r3, 0x68
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10
@ -1439,7 +1439,7 @@ sub_8108908: @ 8108908
movs r1, 0x98
movs r2, 0x48
movs r3, 0x68
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10
@ -1469,7 +1469,7 @@ sub_8108940: @ 8108940
movs r1, 0xD4
movs r2, 0x78
movs r3, 0x98
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10

6
asm/item_pc.s
View File

@ -941,7 +941,7 @@ sub_810DB5C: @ 810DB5C
movs r1, 0x80
movs r2, 0x8
movs r3, 0x68
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10
@ -972,7 +972,7 @@ sub_810DB98: @ 810DB98
movs r1, 0xD4
movs r2, 0x78
movs r3, 0x98
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10
@ -2782,7 +2782,7 @@ sub_810EA34: @ 810EA34
str r4, [sp, 0xC]
str r2, [sp, 0x10]
mov r2, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x14
pop {r3,r4}
mov r8, r3

2
asm/learn_move.s
View File

@ -1936,7 +1936,7 @@ _080E563E:
movs r1, 0x3
adds r2, r7, 0
adds r3, r6, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x14
pop {r3-r5}
mov r8, r3

10
asm/link.s
View File

@ -3387,7 +3387,7 @@ sub_800AE1C: @ 800AE1C
movs r1, 0x3
movs r2, 0x2
movs r3, 0x5
bl box_print
bl AddTextPrinterParameterized3
str r4, [sp]
str r5, [sp, 0x4]
ldr r0, _0800AECC @ =gUnknown_841DF05
@ -3396,7 +3396,7 @@ sub_800AE1C: @ 800AE1C
movs r1, 0x3
movs r2, 0x2
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
bl PutWindowTilemap
movs r0, 0x2
@ -3444,7 +3444,7 @@ sub_800AED0: @ 800AED0
movs r1, 0x3
movs r2, 0x2
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0x2
@ -3522,7 +3522,7 @@ _0800AF7A:
movs r1, 0x3
movs r2, 0x2
movs r3, 0x14
bl box_print
bl AddTextPrinterParameterized3
b _0800AFC4
.align 2, 0
_0800AF9C: .4byte gWirelessCommType
@ -3541,7 +3541,7 @@ _0800AFA8:
movs r1, 0x3
movs r2, 0x2
movs r3, 0x14
bl box_print
bl AddTextPrinterParameterized3
_0800AFC4:
ldr r0, _0800B004 @ =gMain
movs r2, 0x87

2
asm/link_rfu.s
View File

@ -7823,7 +7823,7 @@ _08100E0A:
str r0, [sp, 0x8]
mov r0, r12
adds r2, r7, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x10
pop {r3,r4}
mov r8, r3

2
asm/link_rfu_3.s
View File

@ -12766,7 +12766,7 @@ sub_811C0E0: @ 811C0E0
movs r1, 0x3
adds r2, r6, 0
ldr r3, [sp, 0x14]
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x18
pop {r3-r5}
mov r8, r3

4
asm/list_menu.s
View File

@ -782,7 +782,7 @@ ListMenuPrint: @ 8107428
str r6, [sp, 0x10]
adds r2, r7, 0
mov r3, r12
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldrb r1, [r5, 0x3]
movs r0, 0x7F
ands r0, r1
@ -820,7 +820,7 @@ _08107494:
str r6, [sp, 0x10]
adds r2, r7, 0
mov r3, r12
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
_081074D2:
add sp, 0x18
pop {r4-r7}

6
asm/mail.s
View File

@ -811,7 +811,7 @@ _080BF260:
str r0, [sp, 0x4]
str r5, [sp, 0x8]
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
mov r1, r8
ldr r0, [r1]
adds r0, 0xF8
@ -856,7 +856,7 @@ _080BF2CE:
str r4, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r5]
adds r0, r1, 0
adds r0, 0xE9
@ -875,7 +875,7 @@ _080BF2CE:
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram

4
asm/mailbox_pc.s
View File

@ -154,7 +154,7 @@ _0810EC62:
movs r1, 0x2
movs r2, 0x8
adds r3, r5, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
_0810EC82:
add sp, 0x34
pop {r4,r5}
@ -303,7 +303,7 @@ sub_810ED80: @ 810ED80
movs r1, 0xC2
movs r2, 0xC
movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
strb r0, [r4, 0xA]
add sp, 0x10
pop {r4}

30
asm/main_menu.s
View File

@ -639,7 +639,7 @@ _0800C828:
movs r1, 0x2
movs r2, 0x2
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
ldr r0, _0800C86C @ =gUnknown_8234618
bl sub_800D0B4
movs r0, 0
@ -670,7 +670,7 @@ _0800C870:
movs r1, 0x2
movs r2, 0x2
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, _0800C8E8 @ =gUnknown_8415A6E
@ -679,7 +679,7 @@ _0800C870:
movs r1, 0x2
movs r2, 0x2
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
bl sub_800CE58
ldr r4, _0800C8EC @ =gUnknown_8234620
adds r0, r4, 0
@ -725,7 +725,7 @@ _0800C8F0:
movs r1, 0x2
movs r2, 0x2
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, _0800C9B8 @ =gUnknown_8415A6E
@ -734,7 +734,7 @@ _0800C8F0:
movs r1, 0x2
movs r2, 0x2
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x1
strh r0, [r6, 0x1C]
str r5, [sp]
@ -745,7 +745,7 @@ _0800C8F0:
movs r1, 0x2
movs r2, 0x2
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
bl sub_800CE58
ldr r4, _0800C9C0 @ =gUnknown_8234620
adds r0, r4, 0
@ -1355,7 +1355,7 @@ sub_800CDF8: @ 800CDF8
movs r1, 0x2
movs r2, 0
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x4
bl PutWindowTilemap
movs r0, 0x4
@ -1404,7 +1404,7 @@ sub_800CE70: @ 800CE70
movs r1, 0x2
movs r2, 0x2
movs r3, 0x12
bl box_print
bl AddTextPrinterParameterized3
add r1, sp, 0xC
movs r2, 0
ldr r0, _0800CED0 @ =gSaveBlock2Ptr
@ -1430,7 +1430,7 @@ _0800CE96:
movs r1, 0x2
movs r2, 0x3E
movs r3, 0x12
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x14
pop {r0}
bx r0
@ -1455,7 +1455,7 @@ sub_800CED4: @ 800CED4
movs r1, 0x2
movs r2, 0x2
movs r3, 0x22
bl box_print
bl AddTextPrinterParameterized3
ldr r4, _0800CF38 @ =gSaveBlock2Ptr
ldr r0, [r4]
ldrh r1, [r0, 0xE]
@ -1479,7 +1479,7 @@ sub_800CED4: @ 800CED4
movs r1, 0x2
movs r2, 0x3E
movs r3, 0x22
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x2C
pop {r4-r6}
pop {r0}
@ -1525,7 +1525,7 @@ _0800CF6A:
movs r1, 0x2
movs r2, 0x2
movs r3, 0x32
bl box_print
bl AddTextPrinterParameterized3
add r0, sp, 0xC
adds r1, r6, 0
movs r2, 0
@ -1541,7 +1541,7 @@ _0800CF6A:
movs r1, 0x2
movs r2, 0x3E
movs r3, 0x32
bl box_print
bl AddTextPrinterParameterized3
_0800CFAE:
add sp, 0x2C
pop {r4-r6}
@ -1586,7 +1586,7 @@ _0800CFE2:
movs r1, 0x2
movs r2, 0x2
movs r3, 0x42
bl box_print
bl AddTextPrinterParameterized3
add r0, sp, 0xC
adds r1, r6, 0
movs r2, 0x2
@ -1602,7 +1602,7 @@ _0800CFE2:
movs r1, 0x2
movs r2, 0x3E
movs r3, 0x42
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x2C
pop {r4-r6}
pop {r0}

2
asm/map_preview_screen.s
View File

@ -345,7 +345,7 @@ sub_80F8318: @ 80F8318
adds r0, r6, 0
movs r1, 0x2
movs r3, 0x2
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
mov r0, r8
add sp, 0x14
pop {r3,r4}

8
asm/menu.s
View File

@ -1041,7 +1041,7 @@ PrintTextOnRightSnappedWindow: @ 810F5E8
adds r0, r1, 0
movs r1, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
cmp r6, 0
beq _0810F63E
ldrb r0, [r4]
@ -1118,7 +1118,7 @@ _0810F684:
adds r0, r1, 0
movs r1, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
_0810F6CE:
ldrb r0, [r6]
movs r1, 0
@ -1132,7 +1132,7 @@ _0810F6CE:
movs r1, 0x1
movs r2, 0x4
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
cmp r7, 0
beq _0810F6F6
ldrb r0, [r6]
@ -1883,7 +1883,7 @@ _0810FC30:
adds r0, r7, 0
ldr r1, [sp, 0x14]
ldr r3, [sp, 0x18]
bl sub_812E62C
bl AddTextPrinterParameterized5
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24

2
asm/menu_helpers.s
View File

@ -57,7 +57,7 @@ _080BF4B8:
adds r1, r7, 0
adds r2, r4, 0
adds r3, r5, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
ldr r1, _080BF50C @ =gUnknown_20399CC
ldr r0, [sp, 0x34]
str r0, [r1]

6
asm/menu_indicators.s
View File

@ -294,8 +294,8 @@ _08133B38: .4byte 0x0000ffff
_08133B3C: .4byte gSprites
thumb_func_end AddScrollIndicatorArrowPair
thumb_func_start AddScrollIndicatorArrowPairParametrized
AddScrollIndicatorArrowPairParametrized: @ 8133B40
thumb_func_start AddScrollIndicatorArrowPairParameterized
AddScrollIndicatorArrowPairParameterized: @ 8133B40
push {r4,lr}
adds r4, r1, 0
subs r0, 0x2
@ -345,7 +345,7 @@ _08133B76:
bx r1
.align 2, 0
_08133BA0: .4byte gUnknown_203B130
thumb_func_end AddScrollIndicatorArrowPairParametrized
thumb_func_end AddScrollIndicatorArrowPairParameterized
thumb_func_start sub_8133BA4
sub_8133BA4: @ 8133BA4

8
asm/naming_screen.s
View File

@ -980,7 +980,7 @@ _0809E156:
movs r0, 0
movs r1, 0x2
adds r2, r4, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -3657,7 +3657,7 @@ _0809F5EE:
movs r1, 0x2
movs r2, 0x68
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
_0809F614:
add sp, 0x10
pop {r4,r5}
@ -4196,7 +4196,7 @@ _0809FA12:
adds r0, r6, 0
movs r1, 0x1
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@ -4317,7 +4317,7 @@ sub_809FAE4: @ 809FAE4
str r1, [sp, 0x8]
movs r1, 0
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]

16
asm/new_menu_helpers.s
View File

@ -725,8 +725,8 @@ sub_80F6CBC: @ 80F6CBC
bx r1
thumb_func_end sub_80F6CBC
thumb_func_start AddTextPrinterParametrized
AddTextPrinterParametrized: @ 80F6CD0
thumb_func_start AddTextPrinterParameterized2
AddTextPrinterParameterized2: @ 80F6CD0
push {r4-r7,lr}
mov r7, r8
push {r7}
@ -796,7 +796,7 @@ AddTextPrinterParametrized: @ 80F6CD0
bx r1
.align 2, 0
_080F6D58: .4byte gTextFlags
thumb_func_end AddTextPrinterParametrized
thumb_func_end AddTextPrinterParameterized2
thumb_func_start sub_80F6D5C
sub_80F6D5C: @ 80F6D5C
@ -832,7 +832,7 @@ sub_80F6D5C: @ 80F6D5C
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x4
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
b _080F6DFC
.align 2, 0
_080F6DA8: .4byte gTextFlags
@ -853,7 +853,7 @@ _080F6DB0:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x5
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
b _080F6DFC
.align 2, 0
_080F6DD8: .4byte gStringVar4
@ -871,7 +871,7 @@ _080F6DDC:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
_080F6DFC:
add sp, 0x10
pop {r4,r5}
@ -910,7 +910,7 @@ sub_80F6E08: @ 80F6E08
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r4}
pop {r0}
@ -948,7 +948,7 @@ sub_80F6E54: @ 80F6E54
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r4,r5}
pop {r0}

6
asm/option_menu.s
View File

@ -409,7 +409,7 @@ sub_8088680: @ 8088680
movs r1, 0
adds r2, r4, 0
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x2
bl PutWindowTilemap
movs r0, 0x2
@ -906,7 +906,7 @@ _08088A72:
movs r1, 0x2
mov r2, r8
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
b _08088ADE
.align 2, 0
_08088A94: .4byte gUnknown_83CC354
@ -940,7 +940,7 @@ _08088A9C:
movs r1, 0x2
mov r2, r8
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
_08088ADE:
movs r0, 0x1
bl PutWindowTilemap

18
asm/party_menu.s
View File

@ -5084,7 +5084,7 @@ _0812110E:
adds r0, r4, 0
movs r1, 0
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
adds r0, r4, 0
bl PutWindowTilemap
adds r0, r4, 0
@ -5141,7 +5141,7 @@ _08121194:
movs r1, 0
adds r2, r5, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
b _08121224
.align 2, 0
_081211E0: .4byte gUnknown_845A108
@ -5172,7 +5172,7 @@ _081211F0:
movs r1, 0
adds r2, r5, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
_08121224:
adds r0, r6, 0
bl PutWindowTilemap
@ -5778,7 +5778,7 @@ sub_8121704: @ 8121704
str r1, [sp, 0x8]
movs r1, 0
adds r2, r5, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r4,r5}
pop {r0}
@ -6486,7 +6486,7 @@ _08121CAA:
ldr r1, [r1]
str r1, [sp, 0x8]
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
_08121CD0:
add sp, 0xC
pop {r3}
@ -6831,7 +6831,7 @@ _08121F3C:
str r1, [sp, 0x10]
movs r1, 0x2
mov r2, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@ -6903,7 +6903,7 @@ sub_8121FC0: @ 8121FC0
movs r0, 0x6
movs r1, 0x2
adds r2, r4, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r4}
pop {r0}
@ -7005,7 +7005,7 @@ sub_8122084: @ 8122084
adds r0, r4, 0
movs r1, 0x4
adds r2, r5, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r4,r5}
pop {r0}
@ -7121,7 +7121,7 @@ _0812217A:
movs r1, 0x2
movs r2, 0x3
movs r3, 0x6
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldrb r0, [r4, 0xE]
bl PutWindowTilemap
movs r0, 0x2

2
asm/pokedex_screen.s
View File

@ -4266,7 +4266,7 @@ _08104852:
adds r0, r7, 0
adds r1, r5, 0
adds r2, r6, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x18
pop {r4-r7}
pop {r0}

12
asm/pokemon_jump_2.s
View File

@ -6116,7 +6116,7 @@ sub_814A84C: @ 814A84C
movs r1, 0
movs r2, 0
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
add r0, sp, 0xC
str r0, [sp]
str r4, [sp, 0x4]
@ -6126,7 +6126,7 @@ sub_814A84C: @ 814A84C
movs r1, 0
movs r2, 0
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x10
pop {r4}
pop {r0}
@ -6582,7 +6582,7 @@ sub_814AB98: @ 814AB98
movs r1, 0
adds r2, r4, 0
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
ldr r0, [r6]
adds r0, 0x1C
add r0, r8
@ -7950,7 +7950,7 @@ sub_814B5C4: @ 814B5C4
adds r0, r4, 0
movs r1, 0x2
movs r3, 0
bl sub_812E62C
bl AddTextPrinterParameterized5
movs r7, 0
mov r8, r4
movs r1, 0xFF
@ -7980,7 +7980,7 @@ _0814B63E:
mov r0, r8
movs r1, 0x2
movs r3, 0
bl sub_812E62C
bl AddTextPrinterParameterized5
ldr r0, [sp, 0x2C]
ldm r0!, {r1}
str r0, [sp, 0x2C]
@ -8007,7 +8007,7 @@ _0814B63E:
mov r0, r8
movs r1, 0x2
adds r2, r5, 0
bl sub_812E62C
bl AddTextPrinterParameterized5
movs r0, 0xE0
lsls r0, 20
add r9, r0

12
asm/pokemon_special_anim.s
View File

@ -1918,7 +1918,7 @@ _0811D4A2:
movs r0, 0
movs r1, 0x2
adds r2, r4, 0
bl sub_812E62C
bl AddTextPrinterParameterized5
_0811D4C2:
add sp, 0x14
pop {r3,r4}
@ -4548,7 +4548,7 @@ _0811E880:
movs r1, 0x2
movs r2, 0
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
lsls r0, r7, 1
mov r4, sp
adds r4, r0
@ -4571,7 +4571,7 @@ _0811E8BA:
movs r1, 0x2
movs r2, 0x38
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
strb r0, [r6]
movs r0, 0
@ -4604,7 +4604,7 @@ _0811E8F4:
mov r0, r8
movs r1, 0x2
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r7, 0x1
lsls r0, 16
lsrs r7, r0, 16
@ -4725,7 +4725,7 @@ _0811E9C0:
movs r1, 0x2
movs r2, 0
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
adds r4, 0x38
lsls r4, 24
lsrs r4, 24
@ -4739,7 +4739,7 @@ _0811E9C0:
movs r1, 0x2
adds r2, r4, 0
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16

12
asm/pokemon_storage_system.s
View File

@ -807,7 +807,7 @@ _0808BF3C:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x2
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r0, [sp, 0x50]
mov r10, r4
cmp r0, 0x6
@ -960,7 +960,7 @@ sub_808BFE0: @ 808BFE0
movs r1, 0x1
movs r2, 0
movs r3, 0x2
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
lsrs r5, 1
adds r0, r7, 0
ldr r1, [sp, 0x24]
@ -1442,7 +1442,7 @@ _0808C3E0:
movs r0, 0
movs r1, 0x2
movs r3, 0xFF
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -1549,7 +1549,7 @@ _0808C4CE:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
b _0808C69C
.align 2, 0
_0808C504: .4byte gMain
@ -1725,7 +1725,7 @@ _0808C66E:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
strh r4, [r5, 0x8]
b _0808C69C
.align 2, 0
@ -22054,7 +22054,7 @@ _080966BA:
movs r1, 0x2
adds r2, r4, 0
movs r3, 0x2
bl sub_812E62C
bl AddTextPrinterParameterized5
add sp, 0x14
pop {r4}
pop {r0}

76
asm/pokemon_summary_screen.s
View File

@ -4808,7 +4808,7 @@ sub_8136DA4: @ 8136DA4
movs r1, 0x2
movs r2, 0x4
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@ -4853,7 +4853,7 @@ sub_8136DF0: @ 8136DF0
adds r0, r1, 0
movs r1, 0
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@ -4904,7 +4904,7 @@ sub_8136E50: @ 8136E50
movs r1, 0x2
movs r2, 0x4
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
_08136E9A:
ldr r2, [r6]
adds r0, r2, r7
@ -4920,7 +4920,7 @@ _08136E9A:
movs r1, 0x2
movs r2, 0x28
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
ldr r0, [r6]
ldr r3, _08136F04 @ =0x00003290
adds r0, r3
@ -4941,7 +4941,7 @@ _08136E9A:
movs r1, 0x2
movs r2, 0x69
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
b _08136F28
.align 2, 0
_08136EEC: .4byte gUnknown_203B140
@ -4965,7 +4965,7 @@ _08136F0C:
movs r1, 0x2
movs r2, 0x69
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
_08136F28:
ldr r0, _08136F44 @ =gUnknown_203B140
ldr r0, [r0]
@ -5053,7 +5053,7 @@ sub_8136FB0: @ 8136FB0
movs r1, 0x2
movs r2, 0x2F
movs r3, 0x13
bl box_print
bl AddTextPrinterParameterized3
ldr r3, [r6]
movs r1, 0xC8
lsls r1, 6
@ -5077,7 +5077,7 @@ sub_8136FB0: @ 8136FB0
str r1, [sp, 0x8]
movs r1, 0x2
movs r3, 0x5
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r6]
ldr r2, _08137064 @ =0x00003003
adds r0, r1, r2
@ -5090,7 +5090,7 @@ sub_8136FB0: @ 8136FB0
movs r1, 0x2
movs r2, 0x2F
movs r3, 0x31
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r6]
ldr r2, _08137064 @ =0x00003003
adds r0, r1, r2
@ -5103,7 +5103,7 @@ sub_8136FB0: @ 8136FB0
movs r1, 0x2
movs r2, 0x2F
movs r3, 0x40
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r6]
ldr r2, _08137064 @ =0x00003003
adds r0, r1, r2
@ -5116,7 +5116,7 @@ sub_8136FB0: @ 8136FB0
movs r1, 0x2
movs r2, 0x2F
movs r3, 0x4F
bl box_print
bl AddTextPrinterParameterized3
b _081370CA
.align 2, 0
_08137060: .4byte gUnknown_203B140
@ -5167,7 +5167,7 @@ _081370A6:
movs r1, 0x2
movs r2, 0x7
movs r3, 0x2D
bl box_print
bl AddTextPrinterParameterized3
_081370CA:
add sp, 0xC
pop {r4-r7}
@ -5212,7 +5212,7 @@ sub_81370EC: @ 81370EC
str r3, [sp, 0x8]
movs r1, 0x2
movs r3, 0x4
bl box_print
bl AddTextPrinterParameterized3
mov r2, r9
ldr r3, [r2]
adds r0, r3, r4
@ -5230,7 +5230,7 @@ sub_81370EC: @ 81370EC
str r3, [sp, 0x8]
movs r1, 0x2
movs r3, 0x16
bl box_print
bl AddTextPrinterParameterized3
mov r2, r9
ldr r3, [r2]
adds r0, r3, r4
@ -5248,7 +5248,7 @@ sub_81370EC: @ 81370EC
str r3, [sp, 0x8]
movs r1, 0x2
movs r3, 0x23
bl box_print
bl AddTextPrinterParameterized3
mov r2, r9
ldr r3, [r2]
adds r0, r3, r4
@ -5266,7 +5266,7 @@ sub_81370EC: @ 81370EC
str r3, [sp, 0x8]
movs r1, 0x2
movs r3, 0x30
bl box_print
bl AddTextPrinterParameterized3
mov r2, r9
ldr r3, [r2]
adds r0, r3, r4
@ -5284,7 +5284,7 @@ sub_81370EC: @ 81370EC
str r3, [sp, 0x8]
movs r1, 0x2
movs r3, 0x3D
bl box_print
bl AddTextPrinterParameterized3
mov r2, r9
ldr r3, [r2]
adds r0, r3, r4
@ -5302,7 +5302,7 @@ sub_81370EC: @ 81370EC
str r3, [sp, 0x8]
movs r1, 0x2
movs r3, 0x4A
bl box_print
bl AddTextPrinterParameterized3
mov r2, r9
ldr r3, [r2]
adds r0, r3, r4
@ -5320,7 +5320,7 @@ sub_81370EC: @ 81370EC
str r3, [sp, 0x8]
movs r1, 0x2
movs r3, 0x57
bl box_print
bl AddTextPrinterParameterized3
mov r2, r9
ldr r3, [r2]
adds r4, r3, r4
@ -5338,7 +5338,7 @@ sub_81370EC: @ 81370EC
str r3, [sp, 0x8]
movs r1, 0x2
movs r3, 0x64
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3,r4}
mov r8, r3
@ -5406,7 +5406,7 @@ _081372B0:
movs r1, 0x2
movs r2, 0x3
movs r3, 0x75
bl box_print
bl AddTextPrinterParameterized3
_081372CE:
add sp, 0xC
pop {r4}
@ -5490,7 +5490,7 @@ _0813733E:
movs r1, 0x2
movs r2, 0x3
mov r3, r12
bl box_print
bl AddTextPrinterParameterized3
mov r1, r10
ldr r0, [r1]
ldr r2, _081373A4 @ =0x00003258
@ -5577,7 +5577,7 @@ _081373EA:
movs r1, 0x2
movs r2, 0x24
mov r3, r8
bl box_print
bl AddTextPrinterParameterized3
mov r0, r10
ldr r3, [r0]
adds r4, r3, r4
@ -5603,7 +5603,7 @@ _081373EA:
str r3, [sp, 0x8]
movs r1, 0x2
mov r3, r8
bl box_print
bl AddTextPrinterParameterized3
mov r0, r10
ldr r1, [r0]
ldr r2, _081374DC @ =0x00003258
@ -5623,7 +5623,7 @@ _081373EA:
movs r1, 0x2
movs r2, 0x3A
mov r3, r8
bl box_print
bl AddTextPrinterParameterized3
mov r0, r10
ldr r3, [r0]
ldr r1, _081374C8 @ =0x00003003
@ -5645,7 +5645,7 @@ _081373EA:
str r3, [sp, 0x8]
movs r1, 0x2
mov r3, r8
bl box_print
bl AddTextPrinterParameterized3
_081374B4:
add sp, 0x10
pop {r3-r5}
@ -5928,7 +5928,7 @@ _081376E6:
movs r1, 0x2
movs r2, 0
movs r3, 0x3
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0xD4
pop {r4-r7}
pop {r0}
@ -6052,7 +6052,7 @@ _081377F6:
movs r1, 0x2
movs r2, 0
movs r3, 0x3
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
b _0813792C
.align 2, 0
_08137820: .4byte gUnknown_8419782
@ -6176,7 +6176,7 @@ _08137906:
movs r1, 0x2
movs r2, 0
movs r3, 0x3
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
_0813792C:
add sp, 0xD4
pop {r4-r6}
@ -6341,7 +6341,7 @@ _08137A46:
movs r1, 0x2
movs r2, 0
movs r3, 0x3
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x14
pop {r4-r7}
pop {r0}
@ -6377,7 +6377,7 @@ sub_8137A90: @ 8137A90
movs r1, 0x2
movs r2, 0x1A
movs r3, 0x7
bl box_print
bl AddTextPrinterParameterized3
mov r1, r8
ldr r0, [r1]
adds r0, r6
@ -6389,7 +6389,7 @@ sub_8137A90: @ 8137A90
movs r1, 0x2
movs r2, 0x1A
movs r3, 0x14
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3}
mov r8, r3
@ -6444,7 +6444,7 @@ _08137B1C:
movs r1, 0x2
movs r2, 0x39
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r3, [r7]
adds r0, r3, r4
ldrb r0, [r0]
@ -6461,7 +6461,7 @@ _08137B1C:
movs r1, 0x2
movs r2, 0x39
movs r3, 0xF
bl box_print
bl AddTextPrinterParameterized3
ldr r2, [r7]
adds r4, r2, r4
ldrb r0, [r4]
@ -6486,7 +6486,7 @@ _08137B1C:
movs r1, 0x2
movs r2, 0x7
movs r3, 0x2A
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
_08137B9E:
add sp, 0x14
pop {r3}
@ -6569,7 +6569,7 @@ sub_8137C18: @ 8137C18
movs r1, 0x2
movs r2, 0x42
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r5]
adds r4, r1, r4
ldrb r0, [r4]
@ -6582,7 +6582,7 @@ sub_8137C18: @ 8137C18
movs r1, 0x2
movs r2, 0x2
movs r3, 0xF
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3}
mov r8, r3
@ -9875,7 +9875,7 @@ _081396A8:
movs r1, 0x2
movs r2, 0x7
movs r3, 0x2A
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]

12
asm/region_map.s
View File

@ -1600,7 +1600,7 @@ _080C0B44:
movs r1, 0x2
movs r2, 0x2
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
bl PutWindowTilemap
movs r0, 0
@ -1718,7 +1718,7 @@ sub_80C0BB0: @ 80C0BB0
movs r1, 0x2
movs r2, 0xC
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0x1
@ -3737,7 +3737,7 @@ _080C1CA8:
movs r1, 0x2
movs r2, 0x4
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
bl sub_80C3580
lsls r0, 16
lsrs r0, 16
@ -3750,7 +3750,7 @@ _080C1CA8:
movs r1, 0x2
movs r2, 0x2
movs r3, 0xE
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x2
movs r1, 0x3
bl CopyWindowToVram
@ -9815,7 +9815,7 @@ _080C4E48:
movs r1, 0
movs r2, 0
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x3
movs r1, 0x2
bl CopyWindowToVram
@ -9860,7 +9860,7 @@ _080C4EA4:
movs r1, 0
movs r2, 0
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x4
movs r1, 0x3
bl CopyWindowToVram

6
asm/script_menu.s
View File

@ -578,7 +578,7 @@ _0809CD82:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
b _0809CDE0
.align 2, 0
_0809CDAC: .4byte gUnknown_83E0738
@ -603,7 +603,7 @@ _0809CDB0:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
_0809CDE0:
add sp, 0x10
pop {r4}
@ -1178,7 +1178,7 @@ sub_809D254: @ 809D254
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r0}
bx r0

4
asm/shop.s
View File

@ -1510,7 +1510,7 @@ _0809B6C4:
movs r2, 0x8
movs r3, 0x58
_0809B6E2:
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
lsls r0, 3
ldrb r2, [r4, 0x17]
movs r1, 0x7
@ -1542,7 +1542,7 @@ sub_809B6FC: @ 809B6FC
movs r1, 0x98
movs r2, 0x48
movs r3, 0x68
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
lsls r0, 3
ldrb r2, [r4, 0x17]
movs r1, 0x7

4
asm/slot_machine.s
View File

@ -3603,7 +3603,7 @@ _081411D0:
movs r0, 0x1
movs r1, 0
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
bl CopyBgTilemapBufferToVram
movs r1, 0x83
@ -4228,7 +4228,7 @@ sub_81417E4: @ 81417E4
movs r0, 0
adds r2, r4, 0
movs r3, 0x1
bl sub_812E62C
bl AddTextPrinterParameterized5
add sp, 0x14
pop {r4}
pop {r0}

18
asm/start_menu.s
View File

@ -1908,7 +1908,7 @@ _0806FC14:
movs r0, 0
movs r1, 0x2
movs r3, 0xFF
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x8
movs r2, 0xF
@ -2043,7 +2043,7 @@ sub_806FCF4: @ 806FCF4
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x2
adds r1, r4, 0
adds r2, r6, 0
@ -2058,7 +2058,7 @@ sub_806FCF4: @ 806FCF4
movs r1, 0
movs r2, 0x2
movs r3, 0xE
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
adds r1, r4, 0
movs r2, 0x2
@ -2077,7 +2077,7 @@ sub_806FCF4: @ 806FCF4
movs r1, 0
movs r2, 0x2
movs r3, 0x1C
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x4
adds r1, r4, 0
movs r2, 0x2
@ -2091,7 +2091,7 @@ sub_806FCF4: @ 806FCF4
movs r1, 0
movs r2, 0x3C
movs r3, 0x1C
bl box_print
bl AddTextPrinterParameterized3
movs r7, 0x2A
ldr r0, _0806FE78 @ =0x00000829
bl FlagGet
@ -2108,7 +2108,7 @@ sub_806FCF4: @ 806FCF4
movs r1, 0
movs r2, 0x2
movs r3, 0x2A
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x2
@ -2121,7 +2121,7 @@ sub_806FCF4: @ 806FCF4
movs r1, 0
movs r2, 0x3C
movs r3, 0x2A
bl box_print
bl AddTextPrinterParameterized3
movs r7, 0x38
_0806FE0A:
ldrb r0, [r5]
@ -2133,7 +2133,7 @@ _0806FE0A:
movs r1, 0
movs r2, 0x2
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x2
adds r1, r4, 0
movs r2, 0x2
@ -2146,7 +2146,7 @@ _0806FE0A:
movs r1, 0
movs r2, 0x3C
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldrb r0, [r5]
movs r1, 0x2
bl CopyWindowToVram

2
asm/teachy_tv.s
View File

@ -789,7 +789,7 @@ sub_815B1DC: @ 815B1DC
movs r0, 0
movs r1, 0x4
adds r2, r4, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r4}
pop {r0}

8
asm/trade.s
View File

@ -4827,7 +4827,7 @@ _0804ECEC:
str r0, [sp, 0x8]
adds r0, r5, 0
movs r3, 0x4
bl box_print
bl AddTextPrinterParameterized3
add r6, sp, 0x28
adds r0, r6, 0
ldr r1, [sp, 0x60]
@ -4847,7 +4847,7 @@ _0804ECEC:
movs r1, 0x1
movs r2, 0
movs r3, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
adds r0, r5, 0
bl PutWindowTilemap
adds r0, r5, 0
@ -5110,7 +5110,7 @@ sub_804EFB4: @ 804EFB4
adds r0, r4, 0
movs r1, 0
movs r3, 0x4
bl box_print
bl AddTextPrinterParameterized3
adds r0, r4, 0
bl PutWindowTilemap
adds r0, r4, 0
@ -14989,7 +14989,7 @@ sub_8054508: @ 8054508
movs r1, 0x2
movs r2, 0
movs r3, 0x2
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
adds r0, r5, 0
movs r1, 0x3
bl CopyWindowToVram

70
asm/trainer_card.s
View File

@ -1856,7 +1856,7 @@ sub_8089EEC: @ 8089EEC
add r0, sp, 0xC
str r0, [sp, 0x8]
movs r0, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x4C
pop {r4,r5}
pop {r0}
@ -1908,7 +1908,7 @@ sub_8089F78: @ 8089F78
add r0, sp, 0xC
str r0, [sp, 0x8]
movs r0, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x2C
pop {r4}
pop {r0}
@ -1972,7 +1972,7 @@ sub_8089FEC: @ 8089FEC
adds r1, r6, 0
movs r2, 0x14
movs r3, 0x38
bl box_print
bl AddTextPrinterParameterized3
str r5, [sp]
str r4, [sp, 0x4]
add r0, sp, 0xC
@ -1981,7 +1981,7 @@ sub_8089FEC: @ 8089FEC
adds r1, r6, 0
adds r2, r7, 0
movs r3, 0x38
bl box_print
bl AddTextPrinterParameterized3
b _0808A0CA
.align 2, 0
_0808A068: .4byte gUnknown_8419CED
@ -2015,7 +2015,7 @@ _0808A080:
adds r1, r6, 0
movs r2, 0x10
movs r3, 0x39
bl box_print
bl AddTextPrinterParameterized3
str r5, [sp]
str r4, [sp, 0x4]
add r1, sp, 0xC
@ -2024,7 +2024,7 @@ _0808A080:
adds r1, r6, 0
adds r2, r7, 0
movs r3, 0x39
bl box_print
bl AddTextPrinterParameterized3
_0808A0CA:
add sp, 0x18
pop {r4-r7}
@ -2108,7 +2108,7 @@ _0808A112:
adds r1, r6, 0
movs r2, 0x14
movs r3, 0x48
bl box_print
bl AddTextPrinterParameterized3
str r5, [sp]
str r4, [sp, 0x4]
add r0, sp, 0xC
@ -2117,7 +2117,7 @@ _0808A112:
adds r1, r6, 0
adds r2, r7, 0
movs r3, 0x48
bl box_print
bl AddTextPrinterParameterized3
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, _0808A1B0 @ =gUnknown_8419CF7
@ -2126,7 +2126,7 @@ _0808A112:
adds r1, r6, 0
movs r2, 0x8A
movs r3, 0x48
bl box_print
bl AddTextPrinterParameterized3
b _0808A212
.align 2, 0
_0808A198: .4byte 0x00000829
@ -2161,7 +2161,7 @@ _0808A1B4:
adds r1, r6, 0
movs r2, 0x10
movs r3, 0x49
bl box_print
bl AddTextPrinterParameterized3
str r5, [sp]
str r4, [sp, 0x4]
add r1, sp, 0xC
@ -2170,7 +2170,7 @@ _0808A1B4:
adds r1, r6, 0
adds r2, r7, 0
movs r3, 0x49
bl box_print
bl AddTextPrinterParameterized3
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, _0808A228 @ =gUnknown_8419CF7
@ -2179,7 +2179,7 @@ _0808A1B4:
adds r1, r6, 0
movs r2, 0x8A
movs r3, 0x49
bl box_print
bl AddTextPrinterParameterized3
_0808A212:
add sp, 0x18
pop {r4-r7}
@ -2258,7 +2258,7 @@ _0808A264:
movs r0, 0x1
movs r2, 0x14
movs r3, 0x58
bl box_print
bl AddTextPrinterParameterized3
b _0808A2F4
.align 2, 0
_0808A2B0: .4byte gSaveBlock2Ptr
@ -2284,7 +2284,7 @@ _0808A2D8:
movs r0, 0x1
movs r2, 0x10
movs r3, 0x59
bl box_print
bl AddTextPrinterParameterized3
_0808A2F4:
add r0, sp, 0xC
adds r1, r5, 0
@ -2316,7 +2316,7 @@ _0808A2F4:
str r1, [sp, 0x8]
movs r0, 0x1
mov r1, r10
bl box_print
bl AddTextPrinterParameterized3
ldr r1, _0808A3C0 @ =gUnknown_83CD932
mov r2, r9
ldr r4, [r2]
@ -2338,7 +2338,7 @@ _0808A2F4:
str r0, [sp, 0x8]
movs r0, 0x1
mov r1, r10
bl box_print
bl AddTextPrinterParameterized3
add r0, sp, 0xC
adds r1, r7, 0
movs r2, 0x2
@ -2360,7 +2360,7 @@ _0808A2F4:
str r1, [sp, 0x8]
movs r0, 0x1
mov r1, r10
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x14
pop {r3-r5}
mov r8, r3
@ -2412,7 +2412,7 @@ sub_808A3D0: @ 808A3D0
movs r0, 0x1
movs r1, 0x2
movs r2, 0xA
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r7]
adds r1, 0x19
movs r0, 0x2
@ -2433,7 +2433,7 @@ sub_808A3D0: @ 808A3D0
str r1, [sp, 0x8]
movs r0, 0x1
movs r1, 0x2
bl box_print
bl AddTextPrinterParameterized3
ldr r0, _0808A4A4 @ =gUnknown_83CD93A
mov r8, r0
ldr r1, [r7]
@ -2448,7 +2448,7 @@ sub_808A3D0: @ 808A3D0
movs r0, 0x1
movs r1, 0x2
movs r2, 0xA
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r7]
adds r1, 0x33
movs r0, 0x2
@ -2469,7 +2469,7 @@ sub_808A3D0: @ 808A3D0
str r1, [sp, 0x8]
movs r0, 0x1
movs r1, 0x2
bl box_print
bl AddTextPrinterParameterized3
_0808A486:
add sp, 0xC
pop {r3}
@ -2553,7 +2553,7 @@ sub_808A4FC: @ 808A4FC
adds r0, 0x4D
str r0, [sp, 0x8]
movs r0, 0x1
bl box_print
bl AddTextPrinterParameterized3
b _0808A59C
.align 2, 0
_0808A538: .4byte gUnknown_20397A4
@ -2597,7 +2597,7 @@ _0808A550:
str r4, [sp, 0x8]
movs r0, 0x1
adds r1, r5, 0
bl box_print
bl AddTextPrinterParameterized3
_0808A59C:
add sp, 0xC
pop {r4-r6}
@ -2708,7 +2708,7 @@ sub_808A654: @ 808A654
movs r0, 0x1
adds r1, r5, 0
movs r3, 0x23
bl box_print
bl AddTextPrinterParameterized3
ldr r0, _0808A6C4 @ =gUnknown_83CD8E3
str r0, [sp]
str r4, [sp, 0x4]
@ -2719,7 +2719,7 @@ sub_808A654: @ 808A654
adds r1, r5, 0
movs r2, 0xA4
movs r3, 0x23
bl box_print
bl AddTextPrinterParameterized3
_0808A6A2:
add sp, 0xC
pop {r4-r6}
@ -2830,7 +2830,7 @@ sub_808A760: @ 808A760
movs r0, 0x1
adds r1, r6, 0
movs r3, 0x33
bl box_print
bl AddTextPrinterParameterized3
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, [r7]
@ -2841,7 +2841,7 @@ sub_808A760: @ 808A760
adds r1, r6, 0
movs r2, 0x82
movs r3, 0x33
bl box_print
bl AddTextPrinterParameterized3
ldr r5, _0808A804 @ =gUnknown_83CD8E3
str r5, [sp]
str r4, [sp, 0x4]
@ -2853,7 +2853,7 @@ sub_808A760: @ 808A760
adds r1, r6, 0
movs r2, 0x90
movs r3, 0x33
bl box_print
bl AddTextPrinterParameterized3
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, [r7]
@ -2864,7 +2864,7 @@ sub_808A760: @ 808A760
adds r1, r6, 0
movs r2, 0xC0
movs r3, 0x33
bl box_print
bl AddTextPrinterParameterized3
_0808A7E2:
add sp, 0xC
pop {r4-r7}
@ -2943,7 +2943,7 @@ sub_808A854: @ 808A854
movs r0, 0x1
adds r1, r5, 0
movs r3, 0x43
bl box_print
bl AddTextPrinterParameterized3
ldr r0, _0808A8C8 @ =gUnknown_83CD8E3
str r0, [sp]
str r4, [sp, 0x4]
@ -2955,7 +2955,7 @@ sub_808A854: @ 808A854
adds r1, r5, 0
movs r2, 0xBA
movs r3, 0x43
bl box_print
bl AddTextPrinterParameterized3
_0808A8A6:
add sp, 0xC
pop {r4-r6}
@ -3042,7 +3042,7 @@ sub_808A91C: @ 808A91C
movs r0, 0x1
adds r1, r5, 0
movs r3, 0x63
bl box_print
bl AddTextPrinterParameterized3
ldr r0, _0808A99C @ =gUnknown_83CD8E3
str r0, [sp]
str r4, [sp, 0x4]
@ -3054,7 +3054,7 @@ sub_808A91C: @ 808A91C
adds r1, r5, 0
movs r2, 0xBA
movs r3, 0x63
bl box_print
bl AddTextPrinterParameterized3
_0808A97A:
add sp, 0xC
pop {r4-r6}
@ -3140,7 +3140,7 @@ sub_808A9F0: @ 808A9F0
movs r0, 0x1
adds r1, r5, 0
movs r3, 0x53
bl box_print
bl AddTextPrinterParameterized3
ldr r0, _0808AA70 @ =gUnknown_83CD8E3
str r0, [sp]
str r4, [sp, 0x4]
@ -3152,7 +3152,7 @@ sub_808A9F0: @ 808A9F0
adds r1, r5, 0
movs r2, 0xBA
movs r3, 0x53
bl box_print
bl AddTextPrinterParameterized3
_0808AA4C:
add sp, 0xC
pop {r4-r6}

2
asm/trainer_see.s
View File

@ -1024,7 +1024,7 @@ sub_808226C: @ 808226C
movs r0, 0x12
movs r1, 0x7
movs r2, 0x7F
bl SpawnSpecialFieldObjectParametrized
bl SpawnSpecialFieldObjectParameterized
ldr r2, _080822C8 @ =gMapObjects
lsls r1, r0, 3
adds r1, r0

16
asm/union_room_chat.s
View File

@ -4516,7 +4516,7 @@ _0812A642:
adds r0, r5, 0
movs r1, 0x2
adds r2, r6, 0
bl sub_812E62C
bl AddTextPrinterParameterized5
b _0812A6DA
.align 2, 0
_0812A6AC: .4byte gUnknown_845AB64
@ -4539,7 +4539,7 @@ _0812A6B0:
adds r0, r5, 0
movs r1, 0x2
adds r2, r6, 0
bl sub_812E62C
bl AddTextPrinterParameterized5
_0812A6DA:
ldr r0, _0812A6F0 @ =gUnknown_203B0E4
ldr r0, [r0]
@ -4689,7 +4689,7 @@ _0812A7B4:
movs r0, 0x1
movs r1, 0x2
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x34
pop {r3-r5}
mov r8, r3
@ -4767,7 +4767,7 @@ _0812A866:
movs r0, 0x2
movs r1, 0
lsrs r2, r5, 24
bl box_print
bl AddTextPrinterParameterized3
adds r4, 0x4
adds r7, 0x1
adds r0, r6, 0
@ -4807,7 +4807,7 @@ _0812A8A8:
movs r4, 0x80
lsls r4, 19
lsrs r2, r4, 24
bl box_print
bl AddTextPrinterParameterized3
adds r0, r7, 0x1
str r0, [sp, 0x48]
adds r6, 0xC
@ -4858,7 +4858,7 @@ _0812A90C:
movs r0, 0x2
movs r1, 0
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
adds r2, r7, 0
add r0, sp, 0xC
str r0, [sp]
@ -4870,7 +4870,7 @@ _0812A90C:
movs r0, 0x2
movs r1, 0
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
_0812A960:
ldr r7, [sp, 0x48]
mov r4, r10
@ -5063,7 +5063,7 @@ sub_812AA78: @ 812AA78
movs r1, 0x2
movs r2, 0
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x10
pop {r4,r5}
pop {r0}

2
include/field_map_obj.h
View File

@ -48,7 +48,7 @@ void SpawnFieldObjectsInView(s16, s16);
u8 sprite_new(u8, u8, s16, s16, u8, u8);
u8 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8);
u8 show_sprite(u8, u8, u8);
u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
u8 SpawnSpecialFieldObjectParameterized(u8, u8, u8, s16, s16, u8);
u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
void sub_8093038(s16, s16, s16 *, s16 *);
void CameraObjectReset1(void);

4
include/menu.h
View File

@ -15,7 +15,7 @@ struct MenuAction
} func;
};
void box_print(u8, u8, u8, u8, const void *, s8, const u8 *);
void AddTextPrinterParameterized3(u8, u8, u8, u8, const void *, s8, const u8 *);
void sub_8198070(u8 windowId, bool8 copyToVram);
void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock);
void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette);
@ -34,7 +34,7 @@ u64 sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns
s8 Menu_ProcessInputNoWrapClearOnChoose(void);
void do_scheduled_bg_tilemap_copies_to_vram(void);
void clear_scheduled_bg_copies_to_vram(void);
void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
void sub_810F4D8(u8 windowId, bool32 someBool);
void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);

2
include/menu_indicators.h
View File

@ -24,7 +24,7 @@ struct ScrollIndicatorArrowPairTemplate
};
// Exported ROM declarations
u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *);
u8 AddScrollIndicatorArrowPairParameterized(u8, u8, u8, u8, s32, u16, u16, u16 *);
u8 AddScrollIndicatorArrowPair(const struct ScrollIndicatorArrowPairTemplate * template, u16 * a1);
void RemoveScrollIndicatorArrowPair(u8);

2
include/new_menu_helpers.h
View File

@ -9,7 +9,7 @@ void sub_81973A4(void);
void sub_81973C4(u8, u8);
void sub_819746C(u8 windowId, bool8 copyToVram);
void sub_81973FC(u8, u8);
u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callback);
void sub_8197434(u8 a0, u8 a1);
void SetStandardWindowBorderStyle(u8 a0, u8 a1);

4
src/bag.c
View File

@ -228,13 +228,13 @@ void sub_810B858(void)
void sub_810B8F0(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, s8 speed, u8 colorIdx)
{
AddTextPrinterParametrized2(windowId, fontId, x, y, letterSpacing, lineSpacing, &gUnknown_84530B8[colorIdx], speed, str);
AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, &gUnknown_84530B8[colorIdx], speed, str);
}
void sub_810B958(const u8 * str)
{
u32 x = 0x48 - GetStringWidth(1, str, 0);
box_print(2, 1, x / 2, 1, &gUnknown_84530B8[0], 0, str);
AddTextPrinterParameterized3(2, 1, x / 2, 1, &gUnknown_84530B8[0], 0, str);
}
void sub_810B994(void)

2
src/daycare.c
View File

@ -2205,5 +2205,5 @@ static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed)
sEggHatchData->textColor.fgColor = 0;
sEggHatchData->textColor.bgColor = 5;
sEggHatchData->textColor.shadowColor = 6;
AddTextPrinterParametrized2(windowId, 3, x, y, 1, 1, &sEggHatchData->textColor, speed, string);
AddTextPrinterParameterized4(windowId, 3, x, y, 1, 1, &sEggHatchData->textColor, speed, string);
}

2
src/egg_hatch.c
View File

@ -874,5 +874,5 @@ static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed)
sEggHatchData->textColor.fgColor = 0;
sEggHatchData->textColor.bgColor = 5;
sEggHatchData->textColor.shadowColor = 6;
AddTextPrinterParametrized2(windowId, 3, x, y, 1, 1, &sEggHatchData->textColor, speed, string);
AddTextPrinterParameterized4(windowId, 3, x, y, 1, 1, &sEggHatchData->textColor, speed, string);
}

22
src/fame_checker.c
View File

@ -639,7 +639,7 @@ static bool8 TryExitPickMode(u8 taskId)
static void MessageBoxPrintEmptyText(void)
{
AddTextPrinterParametrized(2, 2, gFameCheckerText_ClearTextbox, 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(2, 2, gFameCheckerText_ClearTextbox, 0, NULL, 2, 1, 3);
}
static void Task_EnterPickMode(u8 taskId)
@ -779,7 +779,7 @@ static void GetPickModeText(void)
if (HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE)
offset = NUM_FAMECHECKER_PERSONS;
StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[who] + offset]);
AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3);
AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
}
}
@ -790,7 +790,7 @@ static void PrintSelectedNameInBrightGreen(u8 taskId)
u16 cursorPos = FameCheckerGetCursorY();
FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20);
StringExpandPlaceholders(gStringVar4, sFameCheckerFlavorTextPointers[sFameCheckerData->unlockedPersons[cursorPos] * 6 + data[1]]);
AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3);
AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
}
@ -900,7 +900,7 @@ static void PrintUIHelp(u8 state)
}
width = GetStringWidth(0, src, 0);
FillWindowPixelRect(FCWINDOWID_UIHELP, 0x00, 0, 0, 0xc0, 0x10);
AddTextPrinterParametrized2(FCWINDOWID_UIHELP, 0, 188 - width, 0, 0, 2, &sTextColor_White, -1, src);
AddTextPrinterParameterized4(FCWINDOWID_UIHELP, 0, 188 - width, 0, 0, 2, &sTextColor_White, -1, src);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_UIHELP);
}
@ -1213,10 +1213,10 @@ static void UpdateIconDescriptionBox(u8 whichText)
gIconDescriptionBoxIsOpen = 1;
FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 0x58, 0x20);
width = (0x54 - GetStringWidth(0, sFlavorTextOriginLocationTexts[idx], 0)) / 2;
AddTextPrinterParametrized2(FCWINDOWID_ICONDESC, 0, width, 0, 0, 2, &sTextColor_DkGrey, -1, sFlavorTextOriginLocationTexts[idx]);
AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, 0, width, 0, 0, 2, &sTextColor_DkGrey, -1, sFlavorTextOriginLocationTexts[idx]);
StringExpandPlaceholders(gStringVar1, sFlavorTextOriginObjectNameTexts[idx]);
width = (0x54 - GetStringWidth(0, gStringVar1, 0)) / 2;
AddTextPrinterParametrized2(FCWINDOWID_ICONDESC, 0, width, 10, 0, 2, &sTextColor_DkGrey, -1, gStringVar1);
AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, 0, width, 10, 0, 2, &sTextColor_DkGrey, -1, gStringVar1);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC);
}
@ -1330,7 +1330,7 @@ static void Task_SwitchToPickMode(u8 taskId)
static void PrintCancelDescription(void)
{
FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20);
AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gFameCheckerText_FameCheckerWillBeClosed, 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gFameCheckerText_FameCheckerWillBeClosed, 0, NULL, 2, 1, 3);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
}
@ -1341,14 +1341,14 @@ static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit)
u16 who;
get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &listY, &cursorY);
who = listY + cursorY;
AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * cursorY + 4, 0, 0, &sTextColor_Green, 0, sListMenuItems[itemIndex].unk_00);
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 8, 14 * cursorY + 4, 0, 0, &sTextColor_Green, 0, sListMenuItems[itemIndex].unk_00);
if (!onInit)
{
if (listY < sFameCheckerData->listMenuTopIdx2)
sFameCheckerData->listMenuDrawnSelIdx++;
else if (listY > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1)
sFameCheckerData->listMenuDrawnSelIdx--;
AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].unk_00);
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].unk_00);
}
sFameCheckerData->listMenuCurIdx = itemIndex;
@ -1547,7 +1547,7 @@ static void PlaceListMenuCursor(bool8 isActive)
{
u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->listMenuTaskId);
if (isActive == TRUE)
AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_DkGrey, 0, gFameCheckerText_ListMenuCursor);
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_DkGrey, 0, gFameCheckerText_ListMenuCursor);
else
AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_White, 0, gFameCheckerText_ListMenuCursor);
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_White, 0, gFameCheckerText_ListMenuCursor);
}

8
src/menu2.c
View File

@ -424,7 +424,7 @@ static const u8 gUnknown_845FD54[][5] = {
[SPECIES_OLD_UNOWN_QMARK - 1] = {0x20, 0x23, 0x08, 0x20, 0x2d}
};
void box_print(u8 windowId, u8 fontId, u8 x, u8 y, const struct TextColor * color, s8 speed, const u8 * str)
void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 x, u8 y, const struct TextColor * color, s8 speed, const u8 * str)
{
struct TextPrinterTemplate printer;
@ -444,7 +444,7 @@ void box_print(u8 windowId, u8 fontId, u8 x, u8 y, const struct TextColor * colo
AddTextPrinter(&printer, speed, NULL);
}
void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str)
void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str)
{
struct TextPrinterTemplate printer;
@ -464,7 +464,7 @@ void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSp
AddTextPrinter(&printer, speed, NULL);
}
void sub_812E62C(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing)
void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing)
{
struct TextPrinterTemplate printer;
@ -498,7 +498,7 @@ void sub_812E6DC(u8 windowId, const u8 * src, u16 x, u16 y)
}
else
{
sub_812E62C(windowId, 2, gStringVar4, x, y, 0xFF, NULL, 0, 0);
AddTextPrinterParameterized5(windowId, 2, gStringVar4, x, y, 0xFF, NULL, 0, 0);
}
}

20
src/mevent_8145654.c
View File

@ -347,28 +347,28 @@ void sub_8145D18(u8 whichWindow)
case 0:
{
s32 x;
box_print(windowId, 3, 0, 1, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_018B);
AddTextPrinterParameterized3(windowId, 3, 0, 1, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_018B);
x = 160 - GetStringWidth(3, gUnknown_203F3C8->unk_01B4, GetFontAttribute(3, 2));
if (x < 0)
x = 0;
box_print(windowId, 3, x, 17, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01B4);
AddTextPrinterParameterized3(windowId, 3, x, 17, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01B4);
if (gUnknown_203F3C8->unk_0000.unk_04 != 0)
{
box_print(windowId, 2, 166, 17, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01DD);
AddTextPrinterParameterized3(windowId, 2, 166, 17, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01DD);
}
break;
}
case 1:
for (; sp0C < 4; sp0C++)
{
box_print(windowId, 3, 0, 16 * sp0C + 2, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal2], 0, gUnknown_203F3C8->unk_01E4[sp0C]);
AddTextPrinterParameterized3(windowId, 3, 0, 16 * sp0C + 2, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal2], 0, gUnknown_203F3C8->unk_01E4[sp0C]);
}
break;
case 2:
box_print(windowId, 3, 0, gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_0288);
AddTextPrinterParameterized3(windowId, 3, 0, gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_0288);
if (gUnknown_203F3C8->unk_0000.unk_08_0 != 2)
{
box_print(windowId, 3, 0, 16 + gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02B1);
AddTextPrinterParameterized3(windowId, 3, 0, 16 + gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02B1);
}
else
{
@ -377,11 +377,11 @@ void sub_8145D18(u8 whichWindow)
s32 spacing = GetFontAttribute(3, 2);
for (; sp0C < gUnknown_203F3C8->unk_0175; sp0C++)
{
box_print(windowId, 3, x, y, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_01);
AddTextPrinterParameterized3(windowId, 3, x, y, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_01);
if (gUnknown_203F3C8->unk_02DC[sp0C].unk_42[0] != EOS)
{
x += GetStringWidth(3, gUnknown_203F3C8->unk_02DC[sp0C].unk_01, spacing);
box_print(windowId, 2, x, y, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_42);
AddTextPrinterParameterized3(windowId, 2, x, y, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_42);
x += GetStringWidth(3, gUnknown_203F3C8->unk_02DC[sp0C].unk_42, spacing) + gUnknown_203F3C8->unk_02DC[sp0C].unk_00;
}
}
@ -757,10 +757,10 @@ void sub_8146A30(void)
x = (0xe0 - GetStringWidth(3, gUnknown_203F3CC->unk_01CE, GetFontAttribute(3, 2))) / 2;
if (x < 0)
x = 0;
box_print(gUnknown_203F3CC->unk_01C8[0], 3, x, 6, &gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal1], 0, gUnknown_203F3CC->unk_01CE);
AddTextPrinterParameterized3(gUnknown_203F3CC->unk_01C8[0], 3, x, 6, &gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal1], 0, gUnknown_203F3CC->unk_01CE);
for (; i < 10; ++i)
{
box_print(gUnknown_203F3CC->unk_01C8[1], 3, 0, 16 * i + 2, &gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal2], 0, gUnknown_203F3CC->unk_01F7[i]);
AddTextPrinterParameterized3(gUnknown_203F3CC->unk_01C8[1], 3, 0, 16 * i + 2, &gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal2], 0, gUnknown_203F3CC->unk_01F7[i]);
}
CopyWindowToVram(gUnknown_203F3CC->unk_01C8[0], 3);
CopyWindowToVram(gUnknown_203F3CC->unk_01C8[1], 3);

14
src/mystery_gift_menu.c
View File

@ -538,14 +538,14 @@ void PrintMysteryGiftOrEReaderTopMenu(bool8 mg_or_ereader, bool32 usePickOkCance
if (!mg_or_ereader)
{
src = usePickOkCancel == TRUE ? gText_PickOKExit : gText_PickOKCancel;
AddTextPrinterParametrized2(0, 2, 2, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gText_MysteryGift);
AddTextPrinterParameterized4(0, 2, 2, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gText_MysteryGift);
width = 222 - GetStringWidth(0, src, 0);
AddTextPrinterParametrized2(0, 0, width, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, src);
AddTextPrinterParameterized4(0, 0, width, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, src);
}
else
{
AddTextPrinterParametrized2(0, 2, 2, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gJPText_MysteryGift);
AddTextPrinterParametrized2(0, 0, 0x78, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gJPText_DecideStop);
AddTextPrinterParameterized4(0, 2, 2, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gJPText_MysteryGift);
AddTextPrinterParameterized4(0, 0, 0x78, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gJPText_DecideStop);
}
CopyWindowToVram(0, 2);
PutWindowTilemap(0);
@ -596,7 +596,7 @@ void AddTextPrinterToWindow1(const u8 *str)
{
StringExpandPlaceholders(gStringVar4, str);
FillWindowPixelBuffer(1, 0x11);
AddTextPrinterParametrized2(1, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
AddTextPrinterParameterized4(1, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
DrawTextBorderOuter(1, 0x001, 0xF);
PutWindowTilemap(1);
CopyWindowToVram(1, 3);
@ -737,7 +737,7 @@ s8 mevent_message_print_and_prompt_yes_no(u8 * textState, u16 * windowId, bool8
*windowId = AddWindow(&sWindowTemplate_PromptYesOrNo_Width20);
}
FillWindowPixelBuffer(*windowId, 0x11);
AddTextPrinterParametrized2(*windowId, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
AddTextPrinterParameterized4(*windowId, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
DrawTextBorderOuter(*windowId, 0x001, 0x0F);
CopyWindowToVram(*windowId, 2);
PutWindowTilemap(*windowId);
@ -798,7 +798,7 @@ s32 HandleMysteryGiftListMenu(u8 * textState, u16 * windowId, bool32 cannotToss,
}
*windowId = AddWindow(&sMysteryGiftMenuWindowTemplate);
FillWindowPixelBuffer(*windowId, 0x11);
AddTextPrinterParametrized2(*windowId, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
AddTextPrinterParameterized4(*windowId, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
DrawTextBorderOuter(*windowId, 0x001, 0x0F);
CopyWindowToVram(*windowId, 2);
PutWindowTilemap(*windowId);

16
src/oak_speech.c
View File

@ -576,7 +576,7 @@ static void CreateHelpDocsPage1(void)
sOakSpeechResources->unk_0014[0] = AddWindow(sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012]);
PutWindowTilemap(sOakSpeechResources->unk_0014[0]);
FillWindowPixelBuffer(sOakSpeechResources->unk_0014[0], 0x00);
AddTextPrinterParametrized2(sOakSpeechResources->unk_0014[0], 2, 2, 0, 1, 1, &sTextColor_HelpSystem, 0, gNewGame_HelpDocs1);
AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[0], 2, 2, 0, 1, 1, &sTextColor_HelpSystem, 0, gNewGame_HelpDocs1);
CopyWindowToVram(sOakSpeechResources->unk_0014[0], 3);
FillBgTilemapBufferRect_Palette0(1, 0x3000, 1, 3, 5, 16);
CopyBgTilemapBufferToVram(1);
@ -598,7 +598,7 @@ static void Task_OakSpeech4(u8 taskId)
sOakSpeechResources->unk_0014[i] = AddWindow(&sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012][i]);
PutWindowTilemap(sOakSpeechResources->unk_0014[i]);
FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00);
AddTextPrinterParametrized2(sOakSpeechResources->unk_0014[i], 2, 6, 0, 1, 1, &sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]);
AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[i], 2, 6, 0, 1, 1, &sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]);
CopyWindowToVram(sOakSpeechResources->unk_0014[i], 3);
}
@ -730,7 +730,7 @@ static void Task_OakSpeech6(u8 taskId)
sOakSpeechResources->unk_0012 = 0;
gMain.state = 0;
data[15] = 16;
AddTextPrinterParametrized2(data[14], 2, 3, 5, 1, 0, &sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[0]);
AddTextPrinterParameterized4(data[14], 2, 3, 5, 1, 0, &sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[0]);
data[5] = CreateTextCursorSpriteForOakSpeech(0, 0xe2, 0x91, 0, 0);
gSprites[data[5]].oam.objMode = ST_OAM_OBJ_BLEND;
gSprites[data[5]].oam.priority = 0;
@ -790,7 +790,7 @@ static void Task_OakSpeech7(u8 taskId)
if (data[15] <= 0)
{
FillWindowPixelBuffer(data[14], 0x00);
AddTextPrinterParametrized2(data[14], 2, 3, 5, 1, 0, &sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[sOakSpeechResources->unk_0012]);
AddTextPrinterParameterized4(data[14], 2, 3, 5, 1, 0, &sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[sOakSpeechResources->unk_0012]);
if (sOakSpeechResources->unk_0012 == 0)
{
sub_810F71C();
@ -889,11 +889,11 @@ static void Task_OakSpeech9(u8 taskId)
if (str != gStringVar4) \
{ \
StringExpandPlaceholders(gStringVar4, str); \
AddTextPrinterParametrized(0, 4, gStringVar4, speed, NULL, 2, 1, 3); \
AddTextPrinterParameterized2(0, 4, gStringVar4, speed, NULL, 2, 1, 3); \
} \
else \
{ \
AddTextPrinterParametrized(0, 4, str, speed, NULL, 2, 1, 3); \
AddTextPrinterParameterized2(0, 4, str, speed, NULL, 2, 1, 3); \
} \
CopyWindowToVram(0, 3); \
})
@ -1059,11 +1059,11 @@ static void Task_OakSpeech19(u8 taskId)
sOakSpeechResources->unk_001C[0] = 1;
sOakSpeechResources->unk_001C[1] = 2;
sOakSpeechResources->unk_001C[2] = 3;
box_print(gTasks[taskId].data[13], 2, 8, 1, sOakSpeechResources->unk_001C, 0, gText_Boy);
AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 1, sOakSpeechResources->unk_001C, 0, gText_Boy);
sOakSpeechResources->unk_001C[0] = 1;
sOakSpeechResources->unk_001C[1] = 2;
sOakSpeechResources->unk_001C[2] = 3;
box_print(gTasks[taskId].data[13], 2, 8, 17, sOakSpeechResources->unk_001C, 0, gText_Girl);
AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 17, sOakSpeechResources->unk_001C, 0, gText_Girl);
ProgramAndPlaceMenuCursorOnWindow(gTasks[taskId].data[13], 2, 0, 1, GetFontAttribute(2, 1) + 2, 2, 0);
CopyWindowToVram(gTasks[taskId].data[13], 3);
gTasks[taskId].func = Task_OakSpeech20;

6
src/quest_log.c
View File

@ -922,7 +922,7 @@ void sub_8111070(u8 a0)
StringAppend(gStringVar4, gStringVar1);
}
AddTextPrinterParametrized2(gUnknown_203ADFE[0], 2, 2, 2, 1, 2, &gUnknown_8456634, 0, gStringVar4);
AddTextPrinterParameterized4(gUnknown_203ADFE[0], 2, 2, 2, 1, 2, &gUnknown_8456634, 0, gStringVar4);
PutWindowTilemap(gUnknown_203ADFE[0]);
PutWindowTilemap(gUnknown_203ADFE[1]);
CopyWindowToVram(gUnknown_203ADFE[0], 2);
@ -1417,7 +1417,7 @@ void sub_8111D10(void)
PutWindowTilemap(gUnknown_203ADFE[2]);
sub_8111D90(gUnknown_203ADFE[2]);
AddTextPrinterParametrized2(gUnknown_203ADFE[2], 2, 2, gUnknown_8456698[count], 1, 0, &gUnknown_8456634, 0, gStringVar4);
AddTextPrinterParameterized4(gUnknown_203ADFE[2], 2, 2, gUnknown_8456698[count], 1, 0, &gUnknown_8456634, 0, gStringVar4);
schedule_bg_copy_tilemap_to_vram(0);
}
@ -2468,7 +2468,7 @@ const struct TextColor gUnknown_8456930 = {
void sub_8112FE4(const u8 * a0)
{
AddTextPrinterParametrized2(gUnknown_203B020, 0x02, 2, 5, 1, 1, &gUnknown_8456930, -1, a0);
AddTextPrinterParameterized4(gUnknown_203B020, 0x02, 2, 5, 1, 1, &gUnknown_8456930, -1, a0);
}
void sub_8113018(const u8 * a0, u8 a1)

8
src/tm_case.c
View File

@ -619,13 +619,13 @@ static void PrintListMenuCursorAt_WithColorIdx(u8 a0, u8 a1)
static void CreateTMCaseScrollIndicatorArrowPair_Main(void)
{
sTMCaseDynamicResources->scrollIndicatorArrowPairId = AddScrollIndicatorArrowPairParametrized(2, 0xA0, 0x08, 0x58, sTMCaseDynamicResources->numTMs - sTMCaseDynamicResources->maxTMsShown + 1, 0x6E, 0x6E, &sTMCaseStaticResources.scrollOffset);
sTMCaseDynamicResources->scrollIndicatorArrowPairId = AddScrollIndicatorArrowPairParameterized(2, 0xA0, 0x08, 0x58, sTMCaseDynamicResources->numTMs - sTMCaseDynamicResources->maxTMsShown + 1, 0x6E, 0x6E, &sTMCaseStaticResources.scrollOffset);
}
static void CreateTMCaseScrollIndicatorArrowPair_SellQuantitySelect(void)
{
sTMCaseDynamicResources->currItem = 1;
sTMCaseDynamicResources->scrollIndicatorArrowPairId = AddScrollIndicatorArrowPairParametrized(2, 0x98, 0x48, 0x68, 2, 0x6E, 0x6E, &sTMCaseDynamicResources->currItem);
sTMCaseDynamicResources->scrollIndicatorArrowPairId = AddScrollIndicatorArrowPairParameterized(2, 0x98, 0x48, 0x68, 2, 0x6E, 0x6E, &sTMCaseDynamicResources->currItem);
}
static void RemoveTMCaseScrollIndicatorArrowPair(void)
@ -1317,7 +1317,7 @@ static void InitWindowTemplatesAndPals(void)
static void AddTextPrinterParameterized_ColorByIndex(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx)
{
AddTextPrinterParametrized2(windowId, fontId, x, y, letterSpacing, lineSpacing, &sTextColors[colorIdx], speed, str);
AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, &sTextColors[colorIdx], speed, str);
}
static void TMCase_SetWindowBorder1(u8 windowId)
@ -1339,7 +1339,7 @@ static void TMCase_PrintMessageWithFollowupTask(u8 taskId, u8 windowId, const u8
static void PrintStringTMCaseOnWindow3(void)
{
u32 distance = 72 - GetStringWidth(1, gText_TMCase, 0);
box_print(3, 1, distance / 2, 1, &sTextColors[0], 0, gText_TMCase);
AddTextPrinterParameterized3(3, 1, distance / 2, 1, &sTextColors[0], 0, gText_TMCase);
}
static void DrawMoveInfoUIMarkers(void)

6
src/trainer_tower.c
View File

@ -1490,14 +1490,14 @@ void sub_815EC8C(void)
sub_815DC8C();
FillWindowPixelRect(0, 0, 0, 0, 0xd8, 0x90);
sub_815EC0C();
box_print(0, 2, 0x4a, 0, &gUnknown_847A22C, 0, gUnknown_83FE982);
AddTextPrinterParameterized3(0, 2, 0x4a, 0, &gUnknown_847A22C, 0, gUnknown_83FE982);
for (i = 0; i < 4; i++)
{
PRINT_TOWER_TIME(sub_815EDDC(&gSaveBlock1Ptr->unkArray[i].unk4));
StringExpandPlaceholders(gStringVar4, gUnknown_83FE998);
box_print(windowId, 2, 0x18, 0x24 + 0x14 * i, &gUnknown_847A22C, 0, gUnknown_83FE9C4[i]);
box_print(windowId, 2, 0x60, 0x24 + 0x14 * i, &gUnknown_847A22C, 0, gStringVar4);
AddTextPrinterParameterized3(windowId, 2, 0x18, 0x24 + 0x14 * i, &gUnknown_847A22C, 0, gUnknown_83FE9C4[i]);
AddTextPrinterParameterized3(windowId, 2, 0x60, 0x24 + 0x14 * i, &gUnknown_847A22C, 0, gStringVar4);
}
PutWindowTilemap(windowId);

2
src/wireless_communication_status_screen.c
View File

@ -359,7 +359,7 @@ void sub_814F65C(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx)
break;
// default: UB
}
AddTextPrinterParametrized2(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, &textColor, -1, str);
AddTextPrinterParameterized4(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, &textColor, -1, str);
}
u32 sub_814F714(struct UnkStruct_x20 * unk20, u32 * arg1)