dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parametrized to Parameterized

Browse Source
This commit is contained in:
garak
2019-05-30 17:05:30 -04:00
parent 337c817721
commit e73ce5317d
50 changed files with 130 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_interface.s
+1 -1
View File
@@ -5559,7 +5559,7 @@ AddTextPrinterAndCreateWindowOnHealthbox: @ 804A648
movs r1, 0 movs r1, 0
adds r2, r6, 0 adds r2, r6, 0
mov r3, r8 mov r3, r8
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
mov r0, r10 mov r0, r10
str r4, [r0] str r4, [r0]
adds r0, r5, 0 adds r0, r5, 0
asm/battle_records.s
+6 -6
View File
@@ -1092,7 +1092,7 @@ _080CDA72:
movs r1, 0x2 movs r1, 0x2
movs r2, 0xC movs r2, 0xC
movs r3, 0x18 movs r3, 0x18
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x14 add sp, 0x14
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -1138,7 +1138,7 @@ sub_80CDAD0: @ 80CDAD0
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
mov r3, r8 mov r3, r8
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
movs r6, 0 movs r6, 0
_080CDB0E: _080CDB0E:
movs r4, 0x54 movs r4, 0x54
@@ -1161,7 +1161,7 @@ _080CDB1C:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
mov r3, r8 mov r3, r8
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
@@ -1230,7 +1230,7 @@ _080CDBA6:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
mov r3, r8 mov r3, r8
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
@@ -1291,7 +1291,7 @@ sub_80CDBE4: @ 80CDBE4
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0x4 movs r3, 0x4
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldr r5, _080CDCA8 @ =gSaveBlock2Ptr ldr r5, _080CDCA8 @ =gSaveBlock2Ptr
ldr r0, [r5] ldr r0, [r5]
ldr r1, _080CDCAC @ =0x00000a98 ldr r1, _080CDCAC @ =0x00000a98
@@ -1309,7 +1309,7 @@ sub_80CDBE4: @ 80CDBE4
movs r1, 0x2 movs r1, 0x2
movs r2, 0x54 movs r2, 0x54
movs r3, 0x30 movs r3, 0x30
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
adds r7, r5, 0 adds r7, r5, 0
movs r5, 0xF4 movs r5, 0xF4
lsls r5, 22 lsls r5, 22
asm/berry_crush_2.s
+5 -5
View File
@@ -229,7 +229,7 @@ _0814BCA2:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
adds r2, r4, 0 adds r2, r4, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
b _0814BD12 b _0814BD12
.align 2, 0 .align 2, 0
_0814BCE8: .4byte gStringVar4 _0814BCE8: .4byte gStringVar4
@@ -250,7 +250,7 @@ _0814BCF0:
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
_0814BD12: _0814BD12:
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
@@ -2868,7 +2868,7 @@ _0814D106:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
@@ -3232,7 +3232,7 @@ _0814D3C0:
str r1, [sp, 0xC] str r1, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
b _0814D40C b _0814D40C
.align 2, 0 .align 2, 0
_0814D3EC: .4byte gUnknown_846E328 _0814D3EC: .4byte gUnknown_846E328
@@ -3249,7 +3249,7 @@ _0814D3F0:
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
_0814D40C: _0814D40C:
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
asm/berry_crush_3.s
+2 -2
View File
@@ -2723,7 +2723,7 @@ _0814EBC6:
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 _0814EC4C b _0814EC4C
.align 2, 0 .align 2, 0
_0814EC10: .4byte 0x000001bb _0814EC10: .4byte 0x000001bb
@@ -2752,7 +2752,7 @@ _0814EC18:
str r4, [sp, 0x10] str r4, [sp, 0x10]
movs r1, 0x2 movs r1, 0x2
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
_0814EC4C: _0814EC4C:
ldr r1, _0814EC7C @ =0x000001bb ldr r1, _0814EC7C @ =0x000001bb
adds r0, r6, r1 adds r0, r6, r1
asm/berry_pouch.s
+4 -4
View File
@@ -1072,7 +1072,7 @@ _0813D5EA:
movs r1, 0xA0 movs r1, 0xA0
movs r2, 0x8 movs r2, 0x8
movs r3, 0x78 movs r3, 0x78
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
add sp, 0x10 add sp, 0x10
@@ -1102,7 +1102,7 @@ sub_813D614: @ 813D614
movs r1, 0xD4 movs r1, 0xD4
movs r2, 0x78 movs r2, 0x78
movs r3, 0x98 movs r3, 0x98
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
add sp, 0x10 add sp, 0x10
@@ -1132,7 +1132,7 @@ sub_813D64C: @ 813D64C
movs r1, 0x98 movs r1, 0x98
movs r2, 0x48 movs r2, 0x48
movs r3, 0x68 movs r3, 0x68
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
add sp, 0x10 add sp, 0x10
@@ -3465,7 +3465,7 @@ sub_813E9A0: @ 813E9A0
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
asm/buy_menu_helpers.s
+1 -1
View File
@@ -114,7 +114,7 @@ sub_813F6F4: @ 813F6F4
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
asm/clear_save_data_screen.s
+2 -2
View File
@@ -134,7 +134,7 @@ _080F5660:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
movs r0, 0x1 movs r0, 0x1
movs r1, 0x2 movs r1, 0x2
bl CopyWindowToVram bl CopyWindowToVram
@@ -241,7 +241,7 @@ _080F5744:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
movs r0, 0x1 movs r0, 0x1
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
asm/credits.s
+3 -3
View File
@@ -422,7 +422,7 @@ _080F3D0A:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x8 movs r2, 0x8
movs r3, 0x29 movs r3, 0x29
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldr r1, [r7] ldr r1, [r7]
movs r0, 0x5 movs r0, 0x5
b _080F413C b _080F413C
@@ -649,7 +649,7 @@ _080F3EB4:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x2 movs r2, 0x2
movs r3, 0x6 movs r3, 0x6
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldr r1, [r7] ldr r1, [r7]
movs r0, 0x8 movs r0, 0x8
b _080F3FB8 b _080F3FB8
@@ -696,7 +696,7 @@ _080F3F24:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x8 movs r2, 0x8
movs r3, 0x6 movs r3, 0x6
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldr r1, [r7] ldr r1, [r7]
movs r0, 0x9 movs r0, 0x9
b _080F3FB8 b _080F3FB8
asm/dodrio_berry_picking.s
+1 -1
View File
@@ -10669,7 +10669,7 @@ _08155AA6:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
b _08155B08 b _08155B08
.align 2, 0 .align 2, 0
_08155ACC: .4byte gUnknown_8419F54 _08155ACC: .4byte gUnknown_8419F54
asm/field_map_obj.s
+3 -3
View File
@@ -1373,8 +1373,8 @@ SpawnSpecialFieldObject: @ 805E7F4
_0805E82C: .4byte gSaveBlock1Ptr _0805E82C: .4byte gSaveBlock1Ptr
thumb_func_end SpawnSpecialFieldObject thumb_func_end SpawnSpecialFieldObject
thumb_func_start SpawnSpecialFieldObjectParametrized thumb_func_start SpawnSpecialFieldObjectParameterized
SpawnSpecialFieldObjectParametrized: @ 805E830 SpawnSpecialFieldObjectParameterized: @ 805E830
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
@@ -1425,7 +1425,7 @@ SpawnSpecialFieldObjectParametrized: @ 805E830
bx r1 bx r1
.align 2, 0 .align 2, 0
_0805E894: .4byte 0xfff90000 _0805E894: .4byte 0xfff90000
thumb_func_end SpawnSpecialFieldObjectParametrized thumb_func_end SpawnSpecialFieldObjectParameterized
thumb_func_start show_sprite thumb_func_start show_sprite
show_sprite: @ 805E898 show_sprite: @ 805E898
asm/field_player_avatar.s
+3 -3
View File
@@ -4676,7 +4676,7 @@ sub_805D66C: @ 805D66C
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
@@ -4851,7 +4851,7 @@ sub_805D7C0: @ 805D7C0
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
movs r0, 0xD movs r0, 0xD
strh r0, [r6, 0x8] strh r0, [r6, 0x8]
movs r0, 0x1 movs r0, 0x1
@@ -4904,7 +4904,7 @@ sub_805D838: @ 805D838
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
ldrh r0, [r6, 0x8] ldrh r0, [r6, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r6, 0x8] strh r0, [r6, 0x8]
asm/field_screen_effect.s
+1 -1
View File
@@ -785,7 +785,7 @@ _0807F3E0:
movs r1, 0x2 movs r1, 0x2
mov r2, r10 mov r2, r10
mov r3, r9 mov r3, r9
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldr r2, _0807F42C @ =gTextFlags ldr r2, _0807F42C @ =gTextFlags
ldrb r1, [r2] ldrb r1, [r2]
movs r0, 0x2 movs r0, 0x2
asm/field_specials.s
+1 -1
View File
@@ -601,7 +601,7 @@ SpawnScriptFieldObject: @ 80CAA34
movs r0, 0x12 movs r0, 0x12
movs r1, 0x8 movs r1, 0x8
movs r2, 0x7F movs r2, 0x7F
bl SpawnSpecialFieldObjectParametrized bl SpawnSpecialFieldObjectParameterized
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _080CAA84 @ =gMapObjects ldr r2, _080CAA84 @ =gMapObjects
asm/hall_of_fame.s
+4 -4
View File
@@ -521,7 +521,7 @@ _080F21B2:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
@@ -1277,7 +1277,7 @@ _080F27AC:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
@@ -2358,7 +2358,7 @@ sub_80F30A4: @ 80F30A4
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
@@ -2764,7 +2764,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2 movs r1, 0x2
movs r2, 0x4 movs r2, 0x4
movs r3, 0x3 movs r3, 0x3
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldr r0, _080F35FC @ =gSaveBlock2Ptr ldr r0, _080F35FC @ =gSaveBlock2Ptr
mov r10, r0 mov r10, r0
ldr r1, [r0] ldr r1, [r0]
asm/item_menu.s
+3 -3
View File
@@ -1383,7 +1383,7 @@ sub_8108888: @ 8108888
movs r1, 0xA0 movs r1, 0xA0
movs r2, 0x8 movs r2, 0x8
movs r3, 0x68 movs r3, 0x68
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0x8] strb r0, [r1, 0x8]
add sp, 0x10 add sp, 0x10
@@ -1439,7 +1439,7 @@ sub_8108908: @ 8108908
movs r1, 0x98 movs r1, 0x98
movs r2, 0x48 movs r2, 0x48
movs r3, 0x68 movs r3, 0x68
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0x8] strb r0, [r1, 0x8]
add sp, 0x10 add sp, 0x10
@@ -1469,7 +1469,7 @@ sub_8108940: @ 8108940
movs r1, 0xD4 movs r1, 0xD4
movs r2, 0x78 movs r2, 0x78
movs r3, 0x98 movs r3, 0x98
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0x8] strb r0, [r1, 0x8]
add sp, 0x10 add sp, 0x10
asm/item_pc.s
+3 -3
View File
@@ -941,7 +941,7 @@ sub_810DB5C: @ 810DB5C
movs r1, 0x80 movs r1, 0x80
movs r2, 0x8 movs r2, 0x8
movs r3, 0x68 movs r3, 0x68
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0x8] strb r0, [r1, 0x8]
add sp, 0x10 add sp, 0x10
@@ -972,7 +972,7 @@ sub_810DB98: @ 810DB98
movs r1, 0xD4 movs r1, 0xD4
movs r2, 0x78 movs r2, 0x78
movs r3, 0x98 movs r3, 0x98
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0x8] strb r0, [r1, 0x8]
add sp, 0x10 add sp, 0x10
@@ -2782,7 +2782,7 @@ sub_810EA34: @ 810EA34
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
asm/learn_move.s
+1 -1
View File
@@ -1936,7 +1936,7 @@ _080E563E:
movs r1, 0x3 movs r1, 0x3
adds r2, r7, 0 adds r2, r7, 0
adds r3, r6, 0 adds r3, r6, 0
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x14 add sp, 0x14
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
asm/link_rfu_3.s
+1 -1
View File
@@ -12766,7 +12766,7 @@ sub_811C0E0: @ 811C0E0
movs r1, 0x3 movs r1, 0x3
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
asm/list_menu.s
+2 -2
View File
@@ -782,7 +782,7 @@ ListMenuPrint: @ 8107428
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
@@ -820,7 +820,7 @@ _08107494:
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
_081074D2: _081074D2:
add sp, 0x18 add sp, 0x18
pop {r4-r7} pop {r4-r7}
asm/mailbox_pc.s
+2 -2
View File
@@ -154,7 +154,7 @@ _0810EC62:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x8 movs r2, 0x8
adds r3, r5, 0 adds r3, r5, 0
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
_0810EC82: _0810EC82:
add sp, 0x34 add sp, 0x34
pop {r4,r5} pop {r4,r5}
@@ -303,7 +303,7 @@ sub_810ED80: @ 810ED80
movs r1, 0xC2 movs r1, 0xC2
movs r2, 0xC movs r2, 0xC
movs r3, 0x94 movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
strb r0, [r4, 0xA] strb r0, [r4, 0xA]
add sp, 0x10 add sp, 0x10
pop {r4} pop {r4}
asm/map_preview_screen.s
+1 -1
View File
@@ -345,7 +345,7 @@ sub_80F8318: @ 80F8318
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0x2 movs r3, 0x2
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
mov r0, r8 mov r0, r8
add sp, 0x14 add sp, 0x14
pop {r3,r4} pop {r3,r4}
asm/menu.s
+1 -1
View File
@@ -1132,7 +1132,7 @@ _0810F6CE:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x4 movs r2, 0x4
movs r3, 0x1 movs r3, 0x1
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
cmp r7, 0 cmp r7, 0
beq _0810F6F6 beq _0810F6F6
ldrb r0, [r6] ldrb r0, [r6]
asm/menu_helpers.s
+1 -1
View File
@@ -57,7 +57,7 @@ _080BF4B8:
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 AddTextPrinterParameterized3
ldr r1, _080BF50C @ =gUnknown_20399CC ldr r1, _080BF50C @ =gUnknown_20399CC
ldr r0, [sp, 0x34] ldr r0, [sp, 0x34]
str r0, [r1] str r0, [r1]
asm/menu_indicators.s
+3 -3
View File
@@ -294,8 +294,8 @@ _08133B38: .4byte 0x0000ffff
_08133B3C: .4byte gSprites _08133B3C: .4byte gSprites
thumb_func_end AddScrollIndicatorArrowPair thumb_func_end AddScrollIndicatorArrowPair
thumb_func_start AddScrollIndicatorArrowPairParametrized thumb_func_start AddScrollIndicatorArrowPairParameterized
AddScrollIndicatorArrowPairParametrized: @ 8133B40 AddScrollIndicatorArrowPairParameterized: @ 8133B40
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
subs r0, 0x2 subs r0, 0x2
@@ -345,7 +345,7 @@ _08133B76:
bx r1 bx r1
.align 2, 0 .align 2, 0
_08133BA0: .4byte gUnknown_203B130 _08133BA0: .4byte gUnknown_203B130
thumb_func_end AddScrollIndicatorArrowPairParametrized thumb_func_end AddScrollIndicatorArrowPairParameterized
thumb_func_start sub_8133BA4 thumb_func_start sub_8133BA4
sub_8133BA4: @ 8133BA4 sub_8133BA4: @ 8133BA4
asm/naming_screen.s
+1 -1
View File
@@ -980,7 +980,7 @@ _0809E156:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
adds r2, r4, 0 adds r2, r4, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
asm/new_menu_helpers.s
+8 -8
View File
@@ -725,8 +725,8 @@ sub_80F6CBC: @ 80F6CBC
bx r1 bx r1
thumb_func_end sub_80F6CBC thumb_func_end sub_80F6CBC
thumb_func_start AddTextPrinterParametrized thumb_func_start AddTextPrinterParameterized3
AddTextPrinterParametrized: @ 80F6CD0 AddTextPrinterParameterized3: @ 80F6CD0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -796,7 +796,7 @@ AddTextPrinterParametrized: @ 80F6CD0
bx r1 bx r1
.align 2, 0 .align 2, 0
_080F6D58: .4byte gTextFlags _080F6D58: .4byte gTextFlags
thumb_func_end AddTextPrinterParametrized thumb_func_end AddTextPrinterParameterized3
thumb_func_start sub_80F6D5C thumb_func_start sub_80F6D5C
sub_80F6D5C: @ 80F6D5C sub_80F6D5C: @ 80F6D5C
@@ -832,7 +832,7 @@ sub_80F6D5C: @ 80F6D5C
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x4 movs r1, 0x4
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
b _080F6DFC b _080F6DFC
.align 2, 0 .align 2, 0
_080F6DA8: .4byte gTextFlags _080F6DA8: .4byte gTextFlags
@@ -853,7 +853,7 @@ _080F6DB0:
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x5 movs r1, 0x5
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
b _080F6DFC b _080F6DFC
.align 2, 0 .align 2, 0
_080F6DD8: .4byte gStringVar4 _080F6DD8: .4byte gStringVar4
@@ -871,7 +871,7 @@ _080F6DDC:
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
_080F6DFC: _080F6DFC:
add sp, 0x10 add sp, 0x10
pop {r4,r5} pop {r4,r5}
@@ -910,7 +910,7 @@ sub_80F6E08: @ 80F6E08
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
add sp, 0x10 add sp, 0x10
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -948,7 +948,7 @@ sub_80F6E54: @ 80F6E54
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
add sp, 0x10 add sp, 0x10
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
asm/party_menu.s
+5 -5
View File
@@ -5084,7 +5084,7 @@ _0812110E:
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
@@ -6831,7 +6831,7 @@ _08121F3C:
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x2 movs r1, 0x2
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
@@ -6903,7 +6903,7 @@ sub_8121FC0: @ 8121FC0
movs r0, 0x6 movs r0, 0x6
movs r1, 0x2 movs r1, 0x2
adds r2, r4, 0 adds r2, r4, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
add sp, 0x10 add sp, 0x10
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -7005,7 +7005,7 @@ sub_8122084: @ 8122084
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x4 movs r1, 0x4
adds r2, r5, 0 adds r2, r5, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
add sp, 0x10 add sp, 0x10
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -7121,7 +7121,7 @@ _0812217A:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x3 movs r2, 0x3
movs r3, 0x6 movs r3, 0x6
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldrb r0, [r4, 0xE] ldrb r0, [r4, 0xE]
bl PutWindowTilemap bl PutWindowTilemap
movs r0, 0x2 movs r0, 0x2
asm/pokedex_screen.s
+1 -1
View File
@@ -4266,7 +4266,7 @@ _08104852:
adds r0, r7, 0 adds r0, r7, 0
adds r1, r5, 0 adds r1, r5, 0
adds r2, r6, 0 adds r2, r6, 0
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x18 add sp, 0x18
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
asm/pokemon_storage_system.s
+5 -5
View File
@@ -807,7 +807,7 @@ _0808BF3C:
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x1 movs r1, 0x1
movs r3, 0x2 movs r3, 0x2
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldr r0, [sp, 0x50] ldr r0, [sp, 0x50]
mov r10, r4 mov r10, r4
cmp r0, 0x6 cmp r0, 0x6
@@ -960,7 +960,7 @@ sub_808BFE0: @ 808BFE0
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]
@@ -1442,7 +1442,7 @@ _0808C3E0:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0xFF movs r3, 0xFF
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
@@ -1549,7 +1549,7 @@ _0808C4CE:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
b _0808C69C b _0808C69C
.align 2, 0 .align 2, 0
_0808C504: .4byte gMain _0808C504: .4byte gMain
@@ -1725,7 +1725,7 @@ _0808C66E:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
strh r4, [r5, 0x8] strh r4, [r5, 0x8]
b _0808C69C b _0808C69C
.align 2, 0 .align 2, 0
asm/pokemon_summary_screen.s
+6 -6
View File
@@ -5928,7 +5928,7 @@ _081376E6:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0xD4 add sp, 0xD4
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -6052,7 +6052,7 @@ _081377F6:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
b _0813792C b _0813792C
.align 2, 0 .align 2, 0
_08137820: .4byte gUnknown_8419782 _08137820: .4byte gUnknown_8419782
@@ -6176,7 +6176,7 @@ _08137906:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
_0813792C: _0813792C:
add sp, 0xD4 add sp, 0xD4
pop {r4-r6} pop {r4-r6}
@@ -6341,7 +6341,7 @@ _08137A46:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
add sp, 0x14 add sp, 0x14
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -6486,7 +6486,7 @@ _08137B1C:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x7 movs r2, 0x7
movs r3, 0x2A movs r3, 0x2A
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
_08137B9E: _08137B9E:
add sp, 0x14 add sp, 0x14
pop {r3} pop {r3}
@@ -9875,7 +9875,7 @@ _081396A8:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x7 movs r2, 0x7
movs r3, 0x2A movs r3, 0x2A
bl AddTextPrinterParametrized2 bl AddTextPrinterParameterized2
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
asm/script_menu.s
+3 -3
View File
@@ -578,7 +578,7 @@ _0809CD82:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
b _0809CDE0 b _0809CDE0
.align 2, 0 .align 2, 0
_0809CDAC: .4byte gUnknown_83E0738 _0809CDAC: .4byte gUnknown_83E0738
@@ -603,7 +603,7 @@ _0809CDB0:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
_0809CDE0: _0809CDE0:
add sp, 0x10 add sp, 0x10
pop {r4} pop {r4}
@@ -1178,7 +1178,7 @@ sub_809D254: @ 809D254
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0 movs r3, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
add sp, 0x10 add sp, 0x10
pop {r0} pop {r0}
bx r0 bx r0
asm/shop.s
+2 -2
View File
@@ -1510,7 +1510,7 @@ _0809B6C4:
movs r2, 0x8 movs r2, 0x8
movs r3, 0x58 movs r3, 0x58
_0809B6E2: _0809B6E2:
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
lsls r0, 3 lsls r0, 3
ldrb r2, [r4, 0x17] ldrb r2, [r4, 0x17]
movs r1, 0x7 movs r1, 0x7
@@ -1542,7 +1542,7 @@ sub_809B6FC: @ 809B6FC
movs r1, 0x98 movs r1, 0x98
movs r2, 0x48 movs r2, 0x48
movs r3, 0x68 movs r3, 0x68
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
lsls r0, 3 lsls r0, 3
ldrb r2, [r4, 0x17] ldrb r2, [r4, 0x17]
movs r1, 0x7 movs r1, 0x7
asm/start_menu.s
+1 -1
View File
@@ -1908,7 +1908,7 @@ _0806FC14:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0xFF movs r3, 0xFF
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
movs r0, 0 movs r0, 0
movs r1, 0x8 movs r1, 0x8
movs r2, 0xF movs r2, 0xF
asm/teachy_tv.s
+1 -1
View File
@@ -789,7 +789,7 @@ sub_815B1DC: @ 815B1DC
movs r0, 0 movs r0, 0
movs r1, 0x4 movs r1, 0x4
adds r2, r4, 0 adds r2, r4, 0
bl AddTextPrinterParametrized bl AddTextPrinterParameterized3
add sp, 0x10 add sp, 0x10
pop {r4} pop {r4}
pop {r0} pop {r0}
asm/trade.s
+2 -2
View File
@@ -4847,7 +4847,7 @@ _0804ECEC:
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
@@ -14989,7 +14989,7 @@ sub_8054508: @ 8054508
movs r1, 0x2 movs r1, 0x2
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
asm/trainer_see.s
+1 -1
View File
@@ -1024,7 +1024,7 @@ sub_808226C: @ 808226C
movs r0, 0x12 movs r0, 0x12
movs r1, 0x7 movs r1, 0x7
movs r2, 0x7F movs r2, 0x7F
bl SpawnSpecialFieldObjectParametrized bl SpawnSpecialFieldObjectParameterized
ldr r2, _080822C8 @ =gMapObjects ldr r2, _080822C8 @ =gMapObjects
lsls r1, r0, 3 lsls r1, r0, 3
adds r1, r0 adds r1, r0
include/field_map_obj.h
+1 -1
View File
@@ -48,7 +48,7 @@ void SpawnFieldObjectsInView(s16, s16);
u8 sprite_new(u8, u8, s16, s16, u8, u8); u8 sprite_new(u8, u8, s16, s16, u8, u8);
u8 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8); u8 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8);
u8 show_sprite(u8, u8, 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 *); u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
void sub_8093038(s16, s16, s16 *, s16 *); void sub_8093038(s16, s16, s16 *, s16 *);
void CameraObjectReset1(void); void CameraObjectReset1(void);
include/menu.h
+1 -1
View File
@@ -34,7 +34,7 @@ u64 sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns
s8 Menu_ProcessInputNoWrapClearOnChoose(void); s8 Menu_ProcessInputNoWrapClearOnChoose(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_810F4D8(u8 windowId, bool32 someBool); void sub_810F4D8(u8 windowId, bool32 someBool);
void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
include/menu_indicators.h
+1 -1
View File
@@ -24,7 +24,7 @@ struct ScrollIndicatorArrowPairTemplate
}; };
// Exported ROM declarations // 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); u8 AddScrollIndicatorArrowPair(const struct ScrollIndicatorArrowPairTemplate * template, u16 * a1);
void RemoveScrollIndicatorArrowPair(u8); void RemoveScrollIndicatorArrowPair(u8);
include/new_menu_helpers.h
+1 -1
View File
@@ -9,7 +9,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 AddTextPrinterParameterized3(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 DisplayItemMessageOnField(u8 taskId, u8 bgId, 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);
src/bag.c
+1 -1
View File
@@ -228,7 +228,7 @@ 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) 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); AddTextPrinterParameterized2(windowId, fontId, x, y, letterSpacing, lineSpacing, &gUnknown_84530B8[colorIdx], speed, str);
} }
void sub_810B958(const u8 * str) void sub_810B958(const u8 * str)
src/daycare.c
+1 -1
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.fgColor = 0;
sEggHatchData->textColor.bgColor = 5; sEggHatchData->textColor.bgColor = 5;
sEggHatchData->textColor.shadowColor = 6; sEggHatchData->textColor.shadowColor = 6;
AddTextPrinterParametrized2(windowId, 3, x, y, 1, 1, &sEggHatchData->textColor, speed, string); AddTextPrinterParameterized2(windowId, 3, x, y, 1, 1, &sEggHatchData->textColor, speed, string);
} }
src/egg_hatch.c
+1 -1
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.fgColor = 0;
sEggHatchData->textColor.bgColor = 5; sEggHatchData->textColor.bgColor = 5;
sEggHatchData->textColor.shadowColor = 6; sEggHatchData->textColor.shadowColor = 6;
AddTextPrinterParametrized2(windowId, 3, x, y, 1, 1, &sEggHatchData->textColor, speed, string); AddTextPrinterParameterized2(windowId, 3, x, y, 1, 1, &sEggHatchData->textColor, speed, string);
} }
src/fame_checker.c
+11 -11
View File
@@ -639,7 +639,7 @@ static bool8 TryExitPickMode(u8 taskId)
static void MessageBoxPrintEmptyText(void) static void MessageBoxPrintEmptyText(void)
{ {
AddTextPrinterParametrized(2, 2, gFameCheckerText_ClearTextbox, 0, NULL, 2, 1, 3); AddTextPrinterParameterized3(2, 2, gFameCheckerText_ClearTextbox, 0, NULL, 2, 1, 3);
} }
static void Task_EnterPickMode(u8 taskId) static void Task_EnterPickMode(u8 taskId)
@@ -779,7 +779,7 @@ static void GetPickModeText(void)
if (HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE) if (HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE)
offset = NUM_FAMECHECKER_PERSONS; offset = NUM_FAMECHECKER_PERSONS;
StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[who] + offset]); StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[who] + offset]);
AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3); AddTextPrinterParameterized3(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
} }
} }
@@ -790,7 +790,7 @@ static void PrintSelectedNameInBrightGreen(u8 taskId)
u16 cursorPos = FameCheckerGetCursorY(); u16 cursorPos = FameCheckerGetCursorY();
FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20); FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20);
StringExpandPlaceholders(gStringVar4, sFameCheckerFlavorTextPointers[sFameCheckerData->unlockedPersons[cursorPos] * 6 + data[1]]); StringExpandPlaceholders(gStringVar4, sFameCheckerFlavorTextPointers[sFameCheckerData->unlockedPersons[cursorPos] * 6 + data[1]]);
AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3); AddTextPrinterParameterized3(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
} }
@@ -900,7 +900,7 @@ static void PrintUIHelp(u8 state)
} }
width = GetStringWidth(0, src, 0); width = GetStringWidth(0, src, 0);
FillWindowPixelRect(FCWINDOWID_UIHELP, 0x00, 0, 0, 0xc0, 0x10); FillWindowPixelRect(FCWINDOWID_UIHELP, 0x00, 0, 0, 0xc0, 0x10);
AddTextPrinterParametrized2(FCWINDOWID_UIHELP, 0, 188 - width, 0, 0, 2, &sTextColor_White, -1, src); AddTextPrinterParameterized2(FCWINDOWID_UIHELP, 0, 188 - width, 0, 0, 2, &sTextColor_White, -1, src);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_UIHELP); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_UIHELP);
} }
@@ -1213,10 +1213,10 @@ static void UpdateIconDescriptionBox(u8 whichText)
gIconDescriptionBoxIsOpen = 1; gIconDescriptionBoxIsOpen = 1;
FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 0x58, 0x20); FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 0x58, 0x20);
width = (0x54 - GetStringWidth(0, sFlavorTextOriginLocationTexts[idx], 0)) / 2; width = (0x54 - GetStringWidth(0, sFlavorTextOriginLocationTexts[idx], 0)) / 2;
AddTextPrinterParametrized2(FCWINDOWID_ICONDESC, 0, width, 0, 0, 2, &sTextColor_DkGrey, -1, sFlavorTextOriginLocationTexts[idx]); AddTextPrinterParameterized2(FCWINDOWID_ICONDESC, 0, width, 0, 0, 2, &sTextColor_DkGrey, -1, sFlavorTextOriginLocationTexts[idx]);
StringExpandPlaceholders(gStringVar1, sFlavorTextOriginObjectNameTexts[idx]); StringExpandPlaceholders(gStringVar1, sFlavorTextOriginObjectNameTexts[idx]);
width = (0x54 - GetStringWidth(0, gStringVar1, 0)) / 2; width = (0x54 - GetStringWidth(0, gStringVar1, 0)) / 2;
AddTextPrinterParametrized2(FCWINDOWID_ICONDESC, 0, width, 10, 0, 2, &sTextColor_DkGrey, -1, gStringVar1); AddTextPrinterParameterized2(FCWINDOWID_ICONDESC, 0, width, 10, 0, 2, &sTextColor_DkGrey, -1, gStringVar1);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC);
} }
@@ -1330,7 +1330,7 @@ static void Task_SwitchToPickMode(u8 taskId)
static void PrintCancelDescription(void) static void PrintCancelDescription(void)
{ {
FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20); FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20);
AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gFameCheckerText_FameCheckerWillBeClosed, 0, NULL, 2, 1, 3); AddTextPrinterParameterized3(FCWINDOWID_MSGBOX, 2, gFameCheckerText_FameCheckerWillBeClosed, 0, NULL, 2, 1, 3);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
} }
@@ -1341,14 +1341,14 @@ static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit)
u16 who; u16 who;
get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &listY, &cursorY); get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &listY, &cursorY);
who = listY + cursorY; who = listY + cursorY;
AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * cursorY + 4, 0, 0, &sTextColor_Green, 0, sListMenuItems[itemIndex].unk_00); AddTextPrinterParameterized2(FCWINDOWID_LIST, 2, 8, 14 * cursorY + 4, 0, 0, &sTextColor_Green, 0, sListMenuItems[itemIndex].unk_00);
if (!onInit) if (!onInit)
{ {
if (listY < sFameCheckerData->listMenuTopIdx2) if (listY < sFameCheckerData->listMenuTopIdx2)
sFameCheckerData->listMenuDrawnSelIdx++; sFameCheckerData->listMenuDrawnSelIdx++;
else if (listY > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1) else if (listY > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1)
sFameCheckerData->listMenuDrawnSelIdx--; sFameCheckerData->listMenuDrawnSelIdx--;
AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].unk_00); AddTextPrinterParameterized2(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].unk_00);
} }
sFameCheckerData->listMenuCurIdx = itemIndex; sFameCheckerData->listMenuCurIdx = itemIndex;
@@ -1547,7 +1547,7 @@ static void PlaceListMenuCursor(bool8 isActive)
{ {
u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->listMenuTaskId); u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->listMenuTaskId);
if (isActive == TRUE) if (isActive == TRUE)
AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_DkGrey, 0, gFameCheckerText_ListMenuCursor); AddTextPrinterParameterized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_DkGrey, 0, gFameCheckerText_ListMenuCursor);
else else
AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_White, 0, gFameCheckerText_ListMenuCursor); AddTextPrinterParameterized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_White, 0, gFameCheckerText_ListMenuCursor);
} }
src/menu2.c
+1 -1
View File
@@ -444,7 +444,7 @@ void box_print(u8 windowId, u8 fontId, u8 x, u8 y, const struct TextColor * colo
AddTextPrinter(&printer, speed, NULL); 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 AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str)
{ {
struct TextPrinterTemplate printer; struct TextPrinterTemplate printer;
src/mystery_gift_menu.c
+7 -7
View File
@@ -538,14 +538,14 @@ void PrintMysteryGiftOrEReaderTopMenu(bool8 mg_or_ereader, bool32 usePickOkCance
if (!mg_or_ereader) if (!mg_or_ereader)
{ {
src = usePickOkCancel == TRUE ? gText_PickOKExit : gText_PickOKCancel; src = usePickOkCancel == TRUE ? gText_PickOKExit : gText_PickOKCancel;
AddTextPrinterParametrized2(0, 2, 2, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gText_MysteryGift); AddTextPrinterParameterized2(0, 2, 2, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gText_MysteryGift);
width = 222 - GetStringWidth(0, src, 0); width = 222 - GetStringWidth(0, src, 0);
AddTextPrinterParametrized2(0, 0, width, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, src); AddTextPrinterParameterized2(0, 0, width, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, src);
} }
else else
{ {
AddTextPrinterParametrized2(0, 2, 2, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gJPText_MysteryGift); AddTextPrinterParameterized2(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); AddTextPrinterParameterized2(0, 0, 0x78, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gJPText_DecideStop);
} }
CopyWindowToVram(0, 2); CopyWindowToVram(0, 2);
PutWindowTilemap(0); PutWindowTilemap(0);
@@ -596,7 +596,7 @@ void AddTextPrinterToWindow1(const u8 *str)
{ {
StringExpandPlaceholders(gStringVar4, str); StringExpandPlaceholders(gStringVar4, str);
FillWindowPixelBuffer(1, 0x11); FillWindowPixelBuffer(1, 0x11);
AddTextPrinterParametrized2(1, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4); AddTextPrinterParameterized2(1, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
DrawTextBorderOuter(1, 0x001, 0xF); DrawTextBorderOuter(1, 0x001, 0xF);
PutWindowTilemap(1); PutWindowTilemap(1);
CopyWindowToVram(1, 3); 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); *windowId = AddWindow(&sWindowTemplate_PromptYesOrNo_Width20);
} }
FillWindowPixelBuffer(*windowId, 0x11); FillWindowPixelBuffer(*windowId, 0x11);
AddTextPrinterParametrized2(*windowId, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4); AddTextPrinterParameterized2(*windowId, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
DrawTextBorderOuter(*windowId, 0x001, 0x0F); DrawTextBorderOuter(*windowId, 0x001, 0x0F);
CopyWindowToVram(*windowId, 2); CopyWindowToVram(*windowId, 2);
PutWindowTilemap(*windowId); PutWindowTilemap(*windowId);
@@ -798,7 +798,7 @@ s32 HandleMysteryGiftListMenu(u8 * textState, u16 * windowId, bool32 cannotToss,
} }
*windowId = AddWindow(&sMysteryGiftMenuWindowTemplate); *windowId = AddWindow(&sMysteryGiftMenuWindowTemplate);
FillWindowPixelBuffer(*windowId, 0x11); FillWindowPixelBuffer(*windowId, 0x11);
AddTextPrinterParametrized2(*windowId, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4); AddTextPrinterParameterized2(*windowId, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
DrawTextBorderOuter(*windowId, 0x001, 0x0F); DrawTextBorderOuter(*windowId, 0x001, 0x0F);
CopyWindowToVram(*windowId, 2); CopyWindowToVram(*windowId, 2);
PutWindowTilemap(*windowId); PutWindowTilemap(*windowId);
src/oak_speech.c
+6 -6
View File
@@ -576,7 +576,7 @@ static void CreateHelpDocsPage1(void)
sOakSpeechResources->unk_0014[0] = AddWindow(sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012]); sOakSpeechResources->unk_0014[0] = AddWindow(sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012]);
PutWindowTilemap(sOakSpeechResources->unk_0014[0]); PutWindowTilemap(sOakSpeechResources->unk_0014[0]);
FillWindowPixelBuffer(sOakSpeechResources->unk_0014[0], 0x00); FillWindowPixelBuffer(sOakSpeechResources->unk_0014[0], 0x00);
AddTextPrinterParametrized2(sOakSpeechResources->unk_0014[0], 2, 2, 0, 1, 1, &sTextColor_HelpSystem, 0, gNewGame_HelpDocs1); AddTextPrinterParameterized2(sOakSpeechResources->unk_0014[0], 2, 2, 0, 1, 1, &sTextColor_HelpSystem, 0, gNewGame_HelpDocs1);
CopyWindowToVram(sOakSpeechResources->unk_0014[0], 3); CopyWindowToVram(sOakSpeechResources->unk_0014[0], 3);
FillBgTilemapBufferRect_Palette0(1, 0x3000, 1, 3, 5, 16); FillBgTilemapBufferRect_Palette0(1, 0x3000, 1, 3, 5, 16);
CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(1);
@@ -598,7 +598,7 @@ static void Task_OakSpeech4(u8 taskId)
sOakSpeechResources->unk_0014[i] = AddWindow(&sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012][i]); sOakSpeechResources->unk_0014[i] = AddWindow(&sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012][i]);
PutWindowTilemap(sOakSpeechResources->unk_0014[i]); PutWindowTilemap(sOakSpeechResources->unk_0014[i]);
FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00); FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00);
AddTextPrinterParametrized2(sOakSpeechResources->unk_0014[i], 2, 6, 0, 1, 1, &sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]); AddTextPrinterParameterized2(sOakSpeechResources->unk_0014[i], 2, 6, 0, 1, 1, &sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]);
CopyWindowToVram(sOakSpeechResources->unk_0014[i], 3); CopyWindowToVram(sOakSpeechResources->unk_0014[i], 3);
} }
@@ -730,7 +730,7 @@ static void Task_OakSpeech6(u8 taskId)
sOakSpeechResources->unk_0012 = 0; sOakSpeechResources->unk_0012 = 0;
gMain.state = 0; gMain.state = 0;
data[15] = 16; data[15] = 16;
AddTextPrinterParametrized2(data[14], 2, 3, 5, 1, 0, &sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[0]); AddTextPrinterParameterized2(data[14], 2, 3, 5, 1, 0, &sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[0]);
data[5] = CreateTextCursorSpriteForOakSpeech(0, 0xe2, 0x91, 0, 0); data[5] = CreateTextCursorSpriteForOakSpeech(0, 0xe2, 0x91, 0, 0);
gSprites[data[5]].oam.objMode = ST_OAM_OBJ_BLEND; gSprites[data[5]].oam.objMode = ST_OAM_OBJ_BLEND;
gSprites[data[5]].oam.priority = 0; gSprites[data[5]].oam.priority = 0;
@@ -790,7 +790,7 @@ static void Task_OakSpeech7(u8 taskId)
if (data[15] <= 0) if (data[15] <= 0)
{ {
FillWindowPixelBuffer(data[14], 0x00); FillWindowPixelBuffer(data[14], 0x00);
AddTextPrinterParametrized2(data[14], 2, 3, 5, 1, 0, &sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[sOakSpeechResources->unk_0012]); AddTextPrinterParameterized2(data[14], 2, 3, 5, 1, 0, &sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[sOakSpeechResources->unk_0012]);
if (sOakSpeechResources->unk_0012 == 0) if (sOakSpeechResources->unk_0012 == 0)
{ {
sub_810F71C(); sub_810F71C();
@@ -889,11 +889,11 @@ static void Task_OakSpeech9(u8 taskId)
if (str != gStringVar4) \ if (str != gStringVar4) \
{ \ { \
StringExpandPlaceholders(gStringVar4, str); \ StringExpandPlaceholders(gStringVar4, str); \
AddTextPrinterParametrized(0, 4, gStringVar4, speed, NULL, 2, 1, 3); \ AddTextPrinterParameterized3(0, 4, gStringVar4, speed, NULL, 2, 1, 3); \
} \ } \
else \ else \
{ \ { \
AddTextPrinterParametrized(0, 4, str, speed, NULL, 2, 1, 3); \ AddTextPrinterParameterized3(0, 4, str, speed, NULL, 2, 1, 3); \
} \ } \
CopyWindowToVram(0, 3); \ CopyWindowToVram(0, 3); \
}) })
src/quest_log.c
+3 -3
View File
@@ -922,7 +922,7 @@ void sub_8111070(u8 a0)
StringAppend(gStringVar4, gStringVar1); StringAppend(gStringVar4, gStringVar1);
} }
AddTextPrinterParametrized2(gUnknown_203ADFE[0], 2, 2, 2, 1, 2, &gUnknown_8456634, 0, gStringVar4); AddTextPrinterParameterized2(gUnknown_203ADFE[0], 2, 2, 2, 1, 2, &gUnknown_8456634, 0, gStringVar4);
PutWindowTilemap(gUnknown_203ADFE[0]); PutWindowTilemap(gUnknown_203ADFE[0]);
PutWindowTilemap(gUnknown_203ADFE[1]); PutWindowTilemap(gUnknown_203ADFE[1]);
CopyWindowToVram(gUnknown_203ADFE[0], 2); CopyWindowToVram(gUnknown_203ADFE[0], 2);
@@ -1417,7 +1417,7 @@ void sub_8111D10(void)
PutWindowTilemap(gUnknown_203ADFE[2]); PutWindowTilemap(gUnknown_203ADFE[2]);
sub_8111D90(gUnknown_203ADFE[2]); sub_8111D90(gUnknown_203ADFE[2]);
AddTextPrinterParametrized2(gUnknown_203ADFE[2], 2, 2, gUnknown_8456698[count], 1, 0, &gUnknown_8456634, 0, gStringVar4); AddTextPrinterParameterized2(gUnknown_203ADFE[2], 2, 2, gUnknown_8456698[count], 1, 0, &gUnknown_8456634, 0, gStringVar4);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
} }
@@ -2468,7 +2468,7 @@ const struct TextColor gUnknown_8456930 = {
void sub_8112FE4(const u8 * a0) void sub_8112FE4(const u8 * a0)
{ {
AddTextPrinterParametrized2(gUnknown_203B020, 0x02, 2, 5, 1, 1, &gUnknown_8456930, -1, a0); AddTextPrinterParameterized2(gUnknown_203B020, 0x02, 2, 5, 1, 1, &gUnknown_8456930, -1, a0);
} }
void sub_8113018(const u8 * a0, u8 a1) void sub_8113018(const u8 * a0, u8 a1)
src/tm_case.c
+3 -3
View File
@@ -619,13 +619,13 @@ static void PrintListMenuCursorAt_WithColorIdx(u8 a0, u8 a1)
static void CreateTMCaseScrollIndicatorArrowPair_Main(void) 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) static void CreateTMCaseScrollIndicatorArrowPair_SellQuantitySelect(void)
{ {
sTMCaseDynamicResources->currItem = 1; 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) 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) 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); AddTextPrinterParameterized2(windowId, fontId, x, y, letterSpacing, lineSpacing, &sTextColors[colorIdx], speed, str);
} }
static void TMCase_SetWindowBorder1(u8 windowId) static void TMCase_SetWindowBorder1(u8 windowId)
src/wireless_communication_status_screen.c
+1 -1
View File
@@ -359,7 +359,7 @@ void sub_814F65C(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx)
break; break;
// default: UB // default: UB
} }
AddTextPrinterParametrized2(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, &textColor, -1, str); AddTextPrinterParameterized2(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, &textColor, -1, str);
} }
u32 sub_814F714(struct UnkStruct_x20 * unk20, u32 * arg1) u32 sub_814F714(struct UnkStruct_x20 * unk20, u32 * arg1)