ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix spelling of 'Parametrized' to 'Parameterized'

Browse Source
This commit is contained in:
Diegoisawesome 2018-01-24 01:03:20 -06:00
parent 0c47cd6fc3
commit 10037ac0e1
35 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/berry_tag_screen.s
View File

@ -486,7 +486,7 @@ sub_817804C: @ 817804C
str r6, [sp, 0xC] str r6, [sp, 0xC]
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x1 movs r1, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x14 add sp, 0x14
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}

2
asm/credits.s
View File

@ -149,7 +149,7 @@ _081755E4:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
adds r3, r5, 0 adds r3, r5, 0
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x18 add sp, 0x18
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}

6
asm/field_player_avatar.s
View File

@ -4538,7 +4538,7 @@ fish9: @ 808CC64
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
@ -4695,7 +4695,7 @@ fishB: @ 808CD94
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
movs r0, 0xD movs r0, 0xD
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
movs r0, 0x1 movs r0, 0x1
@ -4743,7 +4743,7 @@ fishC: @ 808CE04
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
ldrh r0, [r5, 0x8] ldrh r0, [r5, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r5, 0x8] strh r0, [r5, 0x8]

8
asm/field_specials.s
View File

@ -5639,7 +5639,7 @@ _0813AAAA:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B312C ldr r1, =gUnknown_085B312C
lsls r0, r5, 1 lsls r0, r5, 1
adds r1, r0, r1 adds r1, r0, r1
@ -5665,7 +5665,7 @@ _0813AAE8:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B3142 ldr r1, =gUnknown_085B3142
lsls r0, r5, 1 lsls r0, r5, 1
adds r1, r0, r1 adds r1, r0, r1
@ -5712,7 +5712,7 @@ _0813AB5C:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B314E ldr r1, =gUnknown_085B314E
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
@ -5736,7 +5736,7 @@ _0813AB94:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B315C ldr r1, =gUnknown_085B315C
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1

2
asm/item_menu.s
View File

@ -6043,7 +6043,7 @@ bag_menu_print: @ 81AE0BC
str r4, [sp, 0xC] str r4, [sp, 0xC]
str r2, [sp, 0x10] str r2, [sp, 0x10]
mov r2, r9 mov r2, r9
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x14 add sp, 0x14
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3

30
asm/link.s
View File

@ -28911,7 +28911,7 @@ _08018720:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x4 movs r2, 0x4
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
movs r0, 0 movs r0, 0
adds r1, r7, 0 adds r1, r7, 0
movs r2, 0xDE movs r2, 0xDE
@ -28927,7 +28927,7 @@ _08018720:
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
bl CopyWindowToVram bl CopyWindowToVram
@ -29099,7 +29099,7 @@ sub_8018884: @ 8018884
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0xF movs r2, 0xF
@ -29452,7 +29452,7 @@ _08018B4A:
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x1 movs r1, 0x1
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
movs r2, 0xF movs r2, 0xF
@ -29598,7 +29598,7 @@ _08018C8C:
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x1 movs r1, 0x1
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
movs r2, 0xF movs r2, 0xF
@ -33150,7 +33150,7 @@ _0801A93A:
adds r0, r7, 0 adds r0, r7, 0
adds r1, r6, 0 adds r1, r6, 0
adds r2, r5, 0 adds r2, r5, 0
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x18 add sp, 0x18
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@ -33471,7 +33471,7 @@ sub_801AB68: @ 801AB68
movs r1, 0x1 movs r1, 0x1
adds r2, r6, 0 adds r2, r6, 0
ldr r3, [sp, 0x14] ldr r3, [sp, 0x14]
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x18 add sp, 0x18
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
@ -48548,7 +48548,7 @@ _08022616:
str r4, [sp, 0x10] str r4, [sp, 0x10]
movs r1, 0x2 movs r1, 0x2
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
b _0802269C b _0802269C
.pool .pool
_08022668: _08022668:
@ -48575,7 +48575,7 @@ _08022668:
str r4, [sp, 0x10] str r4, [sp, 0x10]
movs r1, 0x2 movs r1, 0x2
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
_0802269C: _0802269C:
ldr r1, =0x000001bb ldr r1, =0x000001bb
adds r0, r6, r1 adds r0, r6, r1
@ -49451,7 +49451,7 @@ _08022D42:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
adds r2, r4, 0 adds r2, r4, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
b _08022DB2 b _08022DB2
.pool .pool
_08022D90: _08022D90:
@ -49470,7 +49470,7 @@ _08022D90:
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
_08022DB2: _08022DB2:
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
@ -52034,7 +52034,7 @@ _080241A6:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
@ -52393,7 +52393,7 @@ _08024460:
str r1, [sp, 0xC] str r1, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
b _080244AC b _080244AC
.pool .pool
_08024490: _08024490:
@ -52409,7 +52409,7 @@ _08024490:
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
_080244AC: _080244AC:
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
@ -64123,7 +64123,7 @@ _0802A3AE:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
b _0802A410 b _0802A410
.pool .pool
_0802A3D8: _0802A3D8:

4
asm/list_menu.s
View File

@ -773,7 +773,7 @@ ListMenuPrint: @ 81AE9B4
str r6, [sp, 0x10] str r6, [sp, 0x10]
adds r2, r7, 0 adds r2, r7, 0
mov r3, r12 mov r3, r12
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldrb r1, [r5, 0x3] ldrb r1, [r5, 0x3]
movs r0, 0x7F movs r0, 0x7F
ands r0, r1 ands r0, r1
@ -810,7 +810,7 @@ _081AEA20:
str r6, [sp, 0x10] str r6, [sp, 0x10]
adds r2, r7, 0 adds r2, r7, 0
mov r3, r12 mov r3, r12
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
_081AEA5E: _081AEA5E:
add sp, 0x18 add sp, 0x18
pop {r4-r7} pop {r4-r7}

12
asm/menu.s
View File

@ -35,7 +35,7 @@ AddTextPrinterWithCallbackForMessage: @ 8197A9C
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
add sp, 0x10 add sp, 0x10
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@ -992,7 +992,7 @@ _0819829E:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x4 movs r2, 0x4
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
mov r2, r9 mov r2, r9
cmp r2, 0 cmp r2, 0
beq _081982C8 beq _081982C8
@ -4736,9 +4736,9 @@ box_print: @ 8199E64
bx r0 bx r0
thumb_func_end box_print thumb_func_end box_print
thumb_func_start AddTextPrinterParametrized2 thumb_func_start AddTextPrinterParameterized2
@ void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, u8 speed, u8 *str) @ void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, u8 speed, u8 *str)
AddTextPrinterParametrized2: @ 8199EEC AddTextPrinterParameterized2: @ 8199EEC
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
@ -4806,7 +4806,7 @@ AddTextPrinterParametrized2: @ 8199EEC
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end AddTextPrinterParametrized2 thumb_func_end AddTextPrinterParameterized2
thumb_func_start sub_8199F74 thumb_func_start sub_8199F74
sub_8199F74: @ 8199F74 sub_8199F74: @ 8199F74

2
asm/menu_helpers.s
View File

@ -156,7 +156,7 @@ _08121EC0:
adds r1, r7, 0 adds r1, r7, 0
adds r2, r4, 0 adds r2, r4, 0
adds r3, r5, 0 adds r3, r5, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
ldr r1, =gUnknown_0300117C ldr r1, =gUnknown_0300117C
ldr r0, [sp, 0x34] ldr r0, [sp, 0x34]
str r0, [r1] str r0, [r1]

2
asm/mystery_event_menu.s
View File

@ -655,7 +655,7 @@ sub_8178EC4: @ 8178EC4
movs r1, 0x1 movs r1, 0x1
adds r2, r6, 0 adds r2, r6, 0
ldr r3, [sp, 0x18] ldr r3, [sp, 0x18]
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x1C add sp, 0x1C
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3

14
asm/new_menu_helpers.s
View File

@ -95,9 +95,9 @@ sub_8197224: @ 8197224
bx r1 bx r1
thumb_func_end sub_8197224 thumb_func_end sub_8197224
thumb_func_start AddTextPrinterParametrized thumb_func_start AddTextPrinterParameterized
@ u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor) @ u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor)
AddTextPrinterParametrized: @ 8197238 AddTextPrinterParameterized: @ 8197238
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@ -166,7 +166,7 @@ AddTextPrinterParametrized: @ 8197238
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end AddTextPrinterParametrized thumb_func_end AddTextPrinterParameterized
thumb_func_start AddTextPrinterForMessage thumb_func_start AddTextPrinterForMessage
@ void AddTextPrinterForMessage(u8 allowSkippingDelayWithButtonPress) @ void AddTextPrinterForMessage(u8 allowSkippingDelayWithButtonPress)
@ -198,7 +198,7 @@ AddTextPrinterForMessage: @ 81972C4
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
add sp, 0x10 add sp, 0x10
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@ -236,7 +236,7 @@ AddTextPrinterForMessage_2: @ 8197310
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
add sp, 0x10 add sp, 0x10
pop {r4} pop {r4}
pop {r0} pop {r0}
@ -273,7 +273,7 @@ AddTextPrinterWithCustomSpeedForMessage: @ 819735C
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
add sp, 0x10 add sp, 0x10
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}

6
asm/party_menu.s
View File

@ -4268,7 +4268,7 @@ _081B243E:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
adds r0, r4, 0 adds r0, r4, 0
bl PutWindowTilemap bl PutWindowTilemap
adds r0, r4, 0 adds r0, r4, 0
@ -5946,7 +5946,7 @@ _081B328C:
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x1 movs r1, 0x1
mov r2, r9 mov r2, r9
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@ -6007,7 +6007,7 @@ sub_81B3300: @ 81B3300
movs r0, 0x6 movs r0, 0x6
movs r1, 0x1 movs r1, 0x1
adds r2, r4, 0 adds r2, r4, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
add sp, 0x10 add sp, 0x10
pop {r4} pop {r4}
pop {r0} pop {r0}

2
asm/player_pc.s
View File

@ -2150,7 +2150,7 @@ _0816C030:
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
adds r3, r6, 0 adds r3, r6, 0
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
_0816C050: _0816C050:
add sp, 0x14 add sp, 0x14
pop {r4-r6} pop {r4-r6}

8
asm/pokedex.s
View File

@ -3035,7 +3035,7 @@ sub_80BCE2C: @ 80BCE2C
str r4, [sp, 0xC] str r4, [sp, 0xC]
str r2, [sp, 0x10] str r2, [sp, 0x10]
mov r2, r8 mov r2, r8
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x18 add sp, 0x18
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
@ -6163,7 +6163,7 @@ sub_80BE8DC: @ 80BE8DC
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
adds r2, r5, 0 adds r2, r5, 0
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x18 add sp, 0x18
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@ -9974,7 +9974,7 @@ sub_80C0A88: @ 80C0A88
str r4, [sp, 0xC] str r4, [sp, 0xC]
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x1 movs r1, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x18 add sp, 0x18
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@ -11022,7 +11022,7 @@ sub_80C1270: @ 80C1270
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
adds r2, r5, 0 adds r2, r5, 0
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x18 add sp, 0x18
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}

6
asm/pokemon_storage_system.s
View File

@ -233,7 +233,7 @@ _080C72AC:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0xFF movs r3, 0xFF
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
@ -339,7 +339,7 @@ _080C7392:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
b _080C756A b _080C756A
.pool .pool
_080C73D0: _080C73D0:
@ -509,7 +509,7 @@ _080C7532:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
strh r4, [r5, 0x8] strh r4, [r5, 0x8]
b _080C756A b _080C756A
.pool .pool

4
asm/pokemon_summary_screen.s
View File

@ -5362,7 +5362,7 @@ sub_81C6C3C: @ 81C6C3C
str r4, [sp, 0xC] str r4, [sp, 0xC]
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x1 movs r1, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x14 add sp, 0x14
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
@ -5408,7 +5408,7 @@ sub_81C6C94: @ 81C6C94
str r4, [sp, 0xC] str r4, [sp, 0xC]
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x7 movs r1, 0x7
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x14 add sp, 0x14
pop {r3} pop {r3}
mov r8, r3 mov r8, r3

4
asm/pokenav.s
View File

@ -21900,7 +21900,7 @@ _081D1D8C:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x8 movs r2, 0x8
adds r3, r5, 0 adds r3, r5, 0
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
_081D1DAC: _081D1DAC:
add sp, 0x34 add sp, 0x34
pop {r4,r5} pop {r4,r5}
@ -23765,7 +23765,7 @@ sub_81D2BF4: @ 81D2BF4
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r1, 0x1 movs r1, 0x1
adds r2, r4, 0 adds r2, r4, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
add sp, 0x10 add sp, 0x10
pop {r4} pop {r4}
pop {r0} pop {r0}

6
asm/script_menu.s
View File

@ -877,7 +877,7 @@ ScriptMenu_DisplayPCStartupPrompt: @ 80E2514
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
add sp, 0x10 add sp, 0x10
pop {r0} pop {r0}
bx r0 bx r0
@ -1606,7 +1606,7 @@ _080E2B12:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
b _080E2B70 b _080E2B70
.pool .pool
_080E2B40: _080E2B40:
@ -1630,7 +1630,7 @@ _080E2B40:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
_080E2B70: _080E2B70:
add sp, 0x10 add sp, 0x10
pop {r4} pop {r4}

4
asm/shop.s
View File

@ -839,7 +839,7 @@ _080E0176:
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x7 movs r1, 0x7
adds r3, r7, 0 adds r3, r7, 0
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
_080E01AC: _080E01AC:
add sp, 0x14 add sp, 0x14
pop {r4-r7} pop {r4-r7}
@ -1201,7 +1201,7 @@ BuyMenuPrint: @ 80E04A4
str r6, [sp, 0xC] str r6, [sp, 0xC]
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x1 movs r1, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x14 add sp, 0x14
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}

2
asm/start_menu.s
View File

@ -1695,7 +1695,7 @@ _080A05AC:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r3, 0xFF movs r3, 0xFF
bl AddTextPrinterParametrized bl AddTextPrinterParameterized
movs r0, 0 movs r0, 0
movs r1, 0x8 movs r1, 0x8
movs r2, 0xE movs r2, 0xE

4
asm/trade.s
View File

@ -4609,7 +4609,7 @@ _080798BC:
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
adds r0, r5, 0 adds r0, r5, 0
bl PutWindowTilemap bl PutWindowTilemap
adds r0, r5, 0 adds r0, r5, 0
@ -14296,7 +14296,7 @@ sub_807F1A8: @ 807F1A8
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram

4
asm/trainer_card.s
View File

@ -8258,7 +8258,7 @@ _080C6E08:
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x1 movs r1, 0x1
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldr r0, [sp, 0x4C] ldr r0, [sp, 0x4C]
mov r10, r4 mov r10, r4
cmp r0, 0x6 cmp r0, 0x6
@ -8410,7 +8410,7 @@ sub_80C6EAC: @ 80C6EAC
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
lsrs r5, 1 lsrs r5, 1
adds r0, r7, 0 adds r0, r7, 0
ldr r1, [sp, 0x24] ldr r1, [sp, 0x24]

2
include/menu.h
View File

@ -35,7 +35,7 @@ void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirs
s8 ProcessMenuInputNoWrap_(void); s8 ProcessMenuInputNoWrap_(void);
void do_scheduled_bg_tilemap_copies_to_vram(void); void do_scheduled_bg_tilemap_copies_to_vram(void);
void clear_scheduled_bg_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 AddTextPrinterParameterized2(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_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds); void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds);
void sub_8197DF8(u8 windowId, bool8 copyToVram); void sub_8197DF8(u8 windowId, bool8 copyToVram);

2
include/new_menu_helpers.h
View File

@ -10,7 +10,7 @@ void sub_81973A4(void);
void sub_81973C4(u8, u8); void sub_81973C4(u8, u8);
void sub_819746C(u8 windowId, bool8 copyToVram); void sub_819746C(u8 windowId, bool8 copyToVram);
void sub_81973FC(u8, u8); 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 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
void sub_8197434(u8 a0, u8 a1); void sub_8197434(u8 a0, u8 a1);
void SetStandardWindowBorderStyle(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1);

2
src/battle_interface.c
View File

@ -2575,7 +2575,7 @@ static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y,
color.bgColor = 1; color.bgColor = 1;
color.shadowColor = 3; color.shadowColor = 3;
AddTextPrinterParametrized2(winId, 0, x, y, 0, 0, &color, -1, str); AddTextPrinterParameterized2(winId, 0, x, y, 0, 0, &color, -1, str);
*windowId = winId; *windowId = winId;
return (u8*)(GetWindowAttribute(winId, WINDOW_TILE_DATA)); return (u8*)(GetWindowAttribute(winId, WINDOW_TILE_DATA));

2
src/berry_blender.c
View File

@ -3602,7 +3602,7 @@ static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s3
FillWindowPixelBuffer(windowId, txtColor.fgColor | (txtColor.fgColor << 4)); FillWindowPixelBuffer(windowId, txtColor.fgColor | (txtColor.fgColor << 4));
} }
AddTextPrinterParametrized2(windowId, 1, x, y, letterSpacing, 1, &txtColor, speed, string); AddTextPrinterParameterized2(windowId, 1, x, y, letterSpacing, 1, &txtColor, speed, string);
} }
static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed) static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed)

2
src/decoration.c
View File

@ -500,7 +500,7 @@ void sub_8126B80(u8 taskId)
void sub_8126C08(void) void sub_8126C08(void)
{ {
FillWindowPixelBuffer(0, 0x11); FillWindowPixelBuffer(0, 0x11);
AddTextPrinterParametrized(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3); AddTextPrinterParameterized(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3);
} }
void SecretBasePC_Decorate(u8 taskId) void SecretBasePC_Decorate(u8 taskId)

4
src/diploma.c
View File

@ -17,7 +17,7 @@ extern int decompress_and_copy_tile_data_to_vram(u8 bg_id, void *src, int size,
extern bool8 free_temp_tile_data_buffers_if_possible(void); extern bool8 free_temp_tile_data_buffers_if_possible(void);
extern void sub_80861E8(void); // rom4 extern void sub_80861E8(void); // rom4
extern bool16 sub_80C0944(void); extern bool16 sub_80C0944(void);
extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, u8 *str); extern void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, u8 *str);
extern u16 gUnknown_0860F074[]; extern u16 gUnknown_0860F074[];
@ -215,5 +215,5 @@ static void PrintDiplomaText(u8 *text, u8 var1, u8 var2)
.shadowColor = 3, .shadowColor = 3,
}; };
AddTextPrinterParametrized2(0, 1, var1, var2, 0, 0, &color, -1, text); AddTextPrinterParameterized2(0, 1, var1, var2, 0, 0, &color, -1, text);
} }

2
src/egg_hatch.c
View File

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

8
src/hall_of_fame.c
View File

@ -82,7 +82,7 @@ extern const u8 gContestConfetti_Gfx[];
extern const u8 gContestConfetti_Pal[]; extern const u8 gContestConfetti_Pal[];
extern void sub_81973C4(u8, u8); extern void sub_81973C4(u8, u8);
extern u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor); extern u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
extern void sub_8175620(void); extern void sub_8175620(void);
extern u8 TrySavingData(u8); extern u8 TrySavingData(u8);
extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16); extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16);
@ -540,7 +540,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
*lastSavedTeam = *sHofMonPtr; *lastSavedTeam = *sHofMonPtr;
sub_81973C4(0, 0); sub_81973C4(0, 0);
AddTextPrinterParametrized(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3); AddTextPrinterParameterized(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, 3); CopyWindowToVram(0, 3);
gTasks[taskId].func = Task_Hof_TrySaveData; gTasks[taskId].func = Task_Hof_TrySaveData;
} }
@ -747,7 +747,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
HallOfFame_PrintPlayerInfo(1, 2); HallOfFame_PrintPlayerInfo(1, 2);
sub_81973C4(0, 0); sub_81973C4(0, 0);
AddTextPrinterParametrized(0, 1, gText_LeagueChamp, 0, NULL, 2, 1, 3); AddTextPrinterParameterized(0, 1, gText_LeagueChamp, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, 3); CopyWindowToVram(0, 3);
gTasks[taskId].func = Task_Hof_ExitOnKeyPressed; gTasks[taskId].func = Task_Hof_ExitOnKeyPressed;
} }
@ -1116,7 +1116,7 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
{ {
sub_8198180(gText_UnkCtrlF800Exit, 8, 1); sub_8198180(gText_UnkCtrlF800Exit, 8, 1);
sub_81973C4(0, 0); sub_81973C4(0, 0);
AddTextPrinterParametrized(0, 1, gText_HOFCorrupted, 0, NULL, 2, 1, 3); AddTextPrinterParameterized(0, 1, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, 3); CopyWindowToVram(0, 3);
gTasks[taskId].func = Task_HofPC_ExitOnButtonPress; gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;
} }

2
src/naming_screen.c
View File

@ -532,7 +532,7 @@ static void DisplaySentToPCMessage(void)
StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]); StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]);
sub_81973C4(0, 0); sub_81973C4(0, 0);
gTextFlags.flag_0 = TRUE; gTextFlags.flag_0 = TRUE;
AddTextPrinterParametrized(0, 1, gStringVar4, GetPlayerTextSpeed(), 0, 2, 1, 3); AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), 0, 2, 1, 3);
CopyWindowToVram(0, 3); CopyWindowToVram(0, 3);
} }

2
src/pokeblock.c
View File

@ -583,7 +583,7 @@ static void HandleInitWindows(void)
static void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x) static void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x)
{ {
AddTextPrinterParametrized2(windowId, 1, x, 1, 0, 0, &sTextColorInPokeblockMenu, 0, string); AddTextPrinterParameterized2(windowId, 1, x, 1, 0, 0, &sTextColorInPokeblockMenu, 0, string);
} }
static void PutPokeblockInfoText(void) static void PutPokeblockInfoText(void)

2
src/pokeblock_feed.c
View File

@ -792,7 +792,7 @@ static void Task_HandleMonAtePokeblock(u8 taskId)
StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2); StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2);
gTextFlags.flag_0 = 1; gTextFlags.flag_0 = 1;
AddTextPrinterParametrized(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3); AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3);
gTasks[taskId].func = Task_WaitForAtePokeblockText; gTasks[taskId].func = Task_WaitForAtePokeblockText;
} }

4
src/pokemon_summary_screen.c
View File

@ -162,7 +162,7 @@ extern struct BattleMove gBattleMoves[];
extern u32 ChangeBgX(u8 bg, u32 value, u8 op); extern u32 ChangeBgX(u8 bg, u32 value, u8 op);
extern void sub_8199C30(u8 a, u8 b, u8 c, u8 d, u8 e, u8 f); extern void sub_8199C30(u8 a, u8 b, u8 c, u8 d, u8 e, u8 f);
extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor* colors, s8 speed, u8 *str); extern void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor* colors, s8 speed, u8 *str);
extern s32 GetStringCenterAlignXOffset(u8 fontId, u8 *str, s32 totalWidth); extern s32 GetStringCenterAlignXOffset(u8 fontId, u8 *str, s32 totalWidth);
extern s32 GetStringRightAlignXOffset(u8 fontId, u8 *str, s32 totalWidth); extern s32 GetStringRightAlignXOffset(u8 fontId, u8 *str, s32 totalWidth);
extern bool8 sub_81A6BF4(); extern bool8 sub_81A6BF4();
@ -2557,7 +2557,7 @@ void sub_81C2554()
void sub_81C25A4(u8 a, u8 *b, u8 c, u8 d, u8 e, u8 f) void sub_81C25A4(u8 a, u8 *b, u8 c, u8 d, u8 e, u8 f)
{ {
AddTextPrinterParametrized2(a, 1, c, d, 0, e, &gUnknown_0861CD2C[f], 0, b); AddTextPrinterParameterized2(a, 1, c, d, 0, e, &gUnknown_0861CD2C[f], 0, b);
} }
void sub_81C25E8() void sub_81C25E8()

2
src/save_failed_screen.c
View File

@ -173,7 +173,7 @@ static void SaveFailedScreenTextPrint(u8 *text, u8 var1, u8 var2)
color.fgColor = 0; color.fgColor = 0;
color.bgColor = 15; color.bgColor = 15;
color.shadowColor = 3; color.shadowColor = 3;
AddTextPrinterParametrized2(gSaveFailedWindowIds[TEXT_WIN_ID], 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text); AddTextPrinterParameterized2(gSaveFailedWindowIds[TEXT_WIN_ID], 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text);
} }
void DoSaveFailedScreen(u8 saveType) void DoSaveFailedScreen(u8 saveType)