give better names to print string on window functions

This commit is contained in:
DizzyEggg
2024-07-26 16:23:02 +02:00
parent 78244fc4c9
commit ec272b5964
63 changed files with 460 additions and 524 deletions

View File

@@ -2299,7 +2299,7 @@ _08010BD0:
movs r0, 0xC
movs r1, 0x2
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
add sp, 0x64
@@ -2397,7 +2397,7 @@ _08010C86:
movs r1, 0
adds r2, r5, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
movs r0, 0x1
@@ -2407,13 +2407,13 @@ _08010C86:
movs r0, 0xA
movs r1, 0
movs r3, 0x1
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r2, _08010D78
str r4, [sp]
movs r0, 0xA
movs r1, 0xC
movs r3, 0x1
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0x1
bl sub_80073E0
add r0, sp, 0x4

View File

@@ -649,7 +649,7 @@ _08011406:
movs r1, 0x2
add r2, sp, 0x4
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
ldr r0, _08011480
@@ -846,7 +846,7 @@ _0801152A:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r6, 0
cmp r6, r9
bge _08011678
@@ -875,7 +875,7 @@ _080115DC:
adds r1, r4, 0
ldr r2, _0801163C
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
b _08011672
.align 2, 0
_08011610: .4byte gUnknown_203B0E4
@@ -913,7 +913,7 @@ _08011640:
adds r1, r4, 0
ldr r2, _08011698
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_08011672:
adds r6, 0x1
cmp r6, r9

View File

@@ -1132,7 +1132,7 @@ _08014B1E:
movs r0, 0x4
movs r1, 0x2
movs r3, 0x3
bl xxx_call_draw_string
bl PrintStringOnWindow
movs r0, 0x3
bl sub_80073E0
_08014B6A:
@@ -1667,8 +1667,8 @@ _08014FE8:
bx r1
thumb_func_end sub_8014FA8
thumb_func_start xxx_format_and_draw
xxx_format_and_draw:
thumb_func_start PrintFormatStringOnWindow
PrintFormatStringOnWindow:
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1691,7 +1691,7 @@ xxx_format_and_draw:
adds r1, r6, 0
add r2, sp, 0x4
mov r3, r8
bl xxx_call_draw_string
bl PrintStringOnWindow
add sp, 0x1F8
pop {r3}
mov r8, r3
@@ -1700,7 +1700,7 @@ xxx_format_and_draw:
bx r0
.align 2, 0
_08015030: .4byte 0x000001f7
thumb_func_end xxx_format_and_draw
thumb_func_end PrintFormatStringOnWindow
thumb_func_start sub_8015034
sub_8015034:
@@ -1819,7 +1819,7 @@ _080150AC:
movs r0, 0x4
movs r1, 0x4
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
movs r0, 0
bl sub_80073E0
ldr r0, [r5]
@@ -3136,7 +3136,7 @@ _08015B34:
mov r2, r10
_08015B6A:
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
b _08015B9E
.align 2, 0
_08015B74: .4byte gUnknown_80DB4F4
@@ -3351,7 +3351,7 @@ _08015D28:
movs r1, 0x2
_08015D32:
movs r3, 0x1
bl xxx_call_draw_string
bl PrintStringOnWindow
b _08015D50
.align 2, 0
_08015D3C: .4byte gUnknown_80DB638
@@ -3362,7 +3362,7 @@ _08015D40:
movs r0, 0x30
movs r1, 0x4
movs r3, 0x1
bl xxx_call_draw_string
bl PrintStringOnWindow
_08015D50:
ldr r5, _08015D68
ldr r0, [r5]
@@ -3445,7 +3445,7 @@ _08015DEE:
movs r1, 0x16
add r2, sp, 0x4
movs r3, 0x1
bl xxx_call_draw_string
bl PrintStringOnWindow
_08015DFE:
movs r0, 0x1
bl sub_80073E0

View File

@@ -39,7 +39,7 @@ sub_801F280:
str r0, [sp]
movs r0, 0xC
movs r1, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r7, 0
ldr r0, [r4]
movs r1, 0x36
@@ -131,7 +131,7 @@ _0801F372:
adds r0, r4, 0
adds r1, r6, 0
ldr r2, _0801F3F4
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_0801F386:
adds r7, 0x1
mov r1, r8
@@ -168,7 +168,7 @@ _0801F394:
str r0, [sp]
movs r0, 0x8
movs r1, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r0, [r4]
ldr r0, [r0, 0x54]
bl sub_80073E0

View File

@@ -712,7 +712,7 @@ _08023DE0:
movs r0, 0xA
movs r1, 0
add r2, sp, 0x8
bl xxx_call_draw_string
bl PrintStringOnWindow
b _08023E3C
_08023E00:
ldr r2, _08023EBC
@@ -723,7 +723,7 @@ _08023E02:
str r0, [sp]
movs r0, 0xA
movs r1, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
ldr r1, [r4]
ldr r2, _08023EC0
adds r0, r1, r2
@@ -878,7 +878,7 @@ _08023F02:
str r0, [sp]
movs r0, 0x8
add r2, sp, 0x8
bl xxx_call_draw_string
bl PrintStringOnWindow
adds r7, 0x1
mov r1, r8
ldr r0, [r4]

View File

@@ -310,7 +310,7 @@ sub_803B284:
str r0, [sp]
movs r0, 0xA
movs r1, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
ldr r1, [r6]
adds r0, r1, 0
adds r0, 0x9E
@@ -362,7 +362,7 @@ _0803B2DC:
movs r0, 0
str r0, [sp]
movs r0, 0x8
bl xxx_call_draw_string
bl PrintStringOnWindow
adds r5, 0x1
ldr r0, [r6]
movs r3, 0x1A

View File

@@ -2043,7 +2043,7 @@ _080533F0:
str r0, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
adds r6, 0xE
_08053402:
adds r4, 0x1
@@ -2169,7 +2169,7 @@ _080534EA:
str r0, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
_080534FA:
movs r0, 0
bl sub_80073E0
@@ -2291,7 +2291,7 @@ _080535E4:
str r0, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
_080535F4:
movs r0, 0
bl sub_80073E0

View File

@@ -7,116 +7,6 @@
thumb_func_start sub_806195C
sub_806195C:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x14
adds r5, r0, 0
mov r9, r1
str r2, [sp, 0x10]
adds r7, r3, 0
subs r5, 0x1
adds r0, r7, 0
bl sub_80073B8
ldr r0, _080619B4
ldr r2, [r0]
movs r0, 0
str r0, [sp]
movs r0, 0x10
movs r1, 0
adds r3, r7, 0
bl xxx_call_draw_string
movs r0, 0x14
mov r8, r0
movs r1, 0xB
mov r0, r9
adds r0, 0x8
_08061994:
strb r1, [r0]
subs r0, 0x1
cmp r0, r9
bge _08061994
bl GetLeaderInfo
ldrb r1, [r0, 0x9]
add r0, sp, 0x4
bl GetAvailTacticsforLvl
movs r6, 0x1
negs r6, r6
movs r1, 0
mov r10, r1
b _080619FC
.align 2, 0
_080619B4: .4byte gUnknown_80FE954
_080619B8:
ldr r0, _080619DC
adds r1, r4, 0
bl CopyTacticsNameToBuffer
ldr r0, [sp, 0x10]
adds r0, 0x94
ldrb r0, [r0]
cmp r0, r4
bne _080619E4
mov r0, r10
str r0, [sp]
movs r0, 0x10
mov r1, r8
ldr r2, _080619E0
adds r3, r7, 0
bl xxx_format_and_draw
b _080619F4
.align 2, 0
_080619DC: .4byte gAvailablePokemonNames
_080619E0: .4byte gUnknown_8106BEC
_080619E4:
mov r1, r10
str r1, [sp]
movs r0, 0x10
mov r1, r8
ldr r2, _08061A34
adds r3, r7, 0
bl xxx_format_and_draw
_080619F4:
adds r6, 0x1
movs r0, 0xC
add r8, r0
adds r5, 0x1
_080619FC:
cmp r6, 0x9
bgt _08061A1E
cmp r5, 0
blt _080619F4
cmp r5, 0xB
bgt _080619F4
mov r0, sp
adds r0, r5
adds r0, 0x4
ldrb r4, [r0]
cmp r6, 0x8
bhi _08061A1A
mov r1, r9
adds r0, r1, r6
strb r4, [r0]
_08061A1A:
cmp r4, 0xB
bne _080619B8
_08061A1E:
adds r0, r7, 0
bl sub_80073E0
add sp, 0x14
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08061A34: .4byte gUnknown_8106BF4
thumb_func_end sub_806195C
thumb_func_start sub_8061A38
sub_8061A38:
@@ -1678,7 +1568,7 @@ _08062650:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
mov r0, r10
bl GetIQSkillDescription
adds r2, r0, 0
@@ -1687,7 +1577,7 @@ _08062650:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
mov r0, r10
@@ -1808,7 +1698,7 @@ _0806276C:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
mov r0, r10
bl GetTacticsDescription
adds r2, r0, 0
@@ -1817,7 +1707,7 @@ _0806276C:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
mov r0, r10
@@ -1961,7 +1851,7 @@ sub_806285C:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
mov r0, r10
bl sub_808E51C
adds r2, r0, 0
@@ -1970,7 +1860,7 @@ sub_806285C:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
add r4, sp, 0x4
@@ -2080,7 +1970,7 @@ _080629CA:
movs r0, 0x4
movs r1, 0x3
movs r3, 0x1
bl xxx_call_draw_string
bl PrintStringOnWindow
movs r0, 0x1
bl sub_80073E0
ldr r0, _08062A40
@@ -2289,7 +2179,7 @@ sub_8062B74:
movs r0, 0xC
movs r1, 0
movs r3, 0x2
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r1, 0x10
mov r8, r1
mov r0, r9
@@ -2322,7 +2212,7 @@ _08062BDE:
movs r0, 0xC
mov r1, r8
movs r3, 0x2
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
b _08062C8A
.align 2, 0
_08062BF0: .4byte gUnknown_8106C90
@@ -2394,7 +2284,7 @@ _08062C6C:
mov r1, r8
ldr r2, _08062CA4
movs r3, 0x2
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0xC
add r8, r0
_08062C80:
@@ -2440,7 +2330,7 @@ sub_8062CA8:
movs r0, 0xC
movs r1, 0
movs r3, 0x2
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r7, 0x8
movs r6, 0x12
adds r0, r5, 0
@@ -2489,7 +2379,7 @@ _08062D18:
_08062D2C:
adds r1, r6, 0
movs r3, 0x2
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
b _08062D52
.align 2, 0
_08062D38: .4byte gUnknown_8106C9C
@@ -2502,7 +2392,7 @@ _08062D3C:
adds r0, r7, 0
adds r1, r6, 0
movs r3, 0x2
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_08062D52:
movs r0, 0x2
bl sub_80073E0
@@ -3500,7 +3390,7 @@ _08063526:
movs r0, 0x4
movs r1, 0
movs r3, 0x2
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0x2
bl sub_80073E0
add sp, 0x24
@@ -3549,7 +3439,7 @@ sub_8063578:
adds r0, r4, 0
movs r1, 0
mov r3, r8
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r1, 0
mov r9, r1
ldr r0, [sp, 0x10]
@@ -3632,7 +3522,7 @@ _08063658:
adds r1, r4, 0
ldr r2, _08063694
mov r3, r8
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_08063668:
adds r7, 0x8
adds r5, 0x8
@@ -4111,13 +4001,13 @@ sub_80639E4:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r2, [r5, 0x4]
str r4, [sp]
movs r0, 0x4
movs r1, 0x10
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
ldr r0, _08063A6C
@@ -5575,7 +5465,7 @@ sub_806455C:
movs r0, 0xC
movs r1, 0
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
ldr r0, [r4, 0x14]
bl EntityExists
lsls r0, 24
@@ -5590,7 +5480,7 @@ sub_806455C:
movs r1, 0x12
add r2, sp, 0x4
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
_080645C0:
movs r0, 0
bl sub_80073E0
@@ -5739,7 +5629,7 @@ _080646C4:
movs r1, 0
mov r2, r10
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
ldr r5, _08064720
ldrb r0, [r4]
lsls r0, 2
@@ -5749,7 +5639,7 @@ _080646C4:
movs r0, 0x8
movs r1, 0x18
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
movs r0, 0
bl sub_80073E0
ldrb r0, [r4]
@@ -6118,13 +6008,13 @@ _080649E6:
movs r1, 0
adds r2, r5, 0
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
str r4, [sp]
movs r0, 0x8
movs r1, 0x12
adds r2, r5, 0
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
movs r0, 0
bl sub_80073E0
add sp, 0x4
@@ -6233,7 +6123,7 @@ _08064A58:
str r1, [sp]
movs r0, 0x10
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
ldr r0, _08064B10
adds r4, r0
ldr r4, [r4]
@@ -6243,7 +6133,7 @@ _08064A58:
movs r1, 0x18
adds r2, r4, 0
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
movs r0, 0
bl sub_80073E0
adds r0, r4, 0
@@ -7278,7 +7168,7 @@ _080652D2:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
adds r0, r4, 0
movs r1, 0
bl sub_8013800
@@ -7288,7 +7178,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
adds r0, r4, 0
movs r1, 0x1
bl sub_8013800
@@ -7298,7 +7188,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
adds r0, r4, 0
movs r1, 0x2
bl sub_8013800
@@ -7308,7 +7198,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r5, 0x4
adds r0, r4, 0
movs r1, 0x3
@@ -7319,7 +7209,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r1, _080653D8
ldr r0, [r1]
movs r1, 0xCB
@@ -7342,7 +7232,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
b _0806540E
.align 2, 0
_080653D0: .4byte gUnknown_202EE10
@@ -7365,7 +7255,7 @@ _080653F4:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_0806540E:
ldr r0, _08065444
adds r1, r5, 0
@@ -7377,7 +7267,7 @@ _0806540E:
str r0, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
add sp, 0xC8
@@ -7488,7 +7378,7 @@ sub_806544C:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
adds r0, r4, 0
movs r1, 0
bl sub_8013800
@@ -7501,7 +7391,7 @@ sub_806544C:
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
adds r0, r4, 0
movs r1, 0x1
bl sub_8013800
@@ -7513,7 +7403,7 @@ sub_806544C:
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
add sp, 0xC8
@@ -7640,28 +7530,28 @@ CreateFieldGameOptionsMenu:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r1, [sp, 0x4]
ldr r0, _080656B4
ldr r2, [r0]
str r6, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r1, [sp, 0x8]
ldr r0, _080656B8
ldr r2, [r0]
str r6, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r1, [sp, 0xC]
ldr r0, _080656BC
ldr r2, [r0]
str r6, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
add sp, 0xD4
@@ -7802,42 +7692,42 @@ CreateFieldDungeonMenu:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r1, [sp, 0x4]
ldr r0, _08065848
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r1, [sp, 0x8]
ldr r0, _0806584C
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r1, [sp, 0xC]
ldr r0, _08065850
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r1, [sp, 0x10]
ldr r0, _08065854
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r1, [sp, 0x14]
ldr r0, _08065858
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r0, _0806585C
ldrb r0, [r0]
adds r4, r7, 0
@@ -8085,14 +7975,14 @@ _08065A0A:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r1, [r6]
ldr r0, _08065A84
ldr r2, [r0]
str r4, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r0, _08065A88
ldrb r1, [r0, 0x8]
lsls r3, r1, 2
@@ -8522,7 +8412,7 @@ sub_8065CAC:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r4, 0
ldr r5, _08065DB8
_08065D7A:
@@ -8535,7 +8425,7 @@ _08065D7A:
str r0, [sp]
movs r0, 0x8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
adds r4, 0x1
cmp r4, 0x6
ble _08065D7A
@@ -8691,7 +8581,7 @@ _08065E0C:
str r7, [sp]
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r1, _08065F38
ldr r2, [sp, 0xC8]
lsls r0, r2, 5
@@ -8702,7 +8592,7 @@ _08065E0C:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
_08065EF4:
@@ -9063,7 +8953,7 @@ sub_80661AC:
movs r0, 0xC
movs r1, 0
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
b _080661F6
.align 2, 0
_080661DC: .4byte gUnknown_202F2F8
@@ -9076,7 +8966,7 @@ _080661E4:
movs r0, 0x14
movs r1, 0
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
_080661F6:
movs r1, 0x9F
lsls r1, 3
@@ -9114,7 +9004,7 @@ _08066208:
mov r1, r8
add r2, sp, 0x4
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_08066244:
subs r7, 0x1
adds r5, 0x2
@@ -9135,7 +9025,7 @@ _08066260:
movs r0, 0x8
mov r1, r8
movs r3, 0
bl xxx_call_draw_string
bl PrintStringOnWindow
_08066270:
movs r0, 0
bl sub_80073E0
@@ -9212,7 +9102,7 @@ _080662C4:
movs r1, 0x14
add r2, sp, 0x4
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
movs r0, 0x45
@@ -9314,7 +9204,7 @@ _080663A0:
adds r1, r6, 0
add r2, sp, 0x4
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0
bl sub_80073E0
movs r0, 0xD

View File

@@ -2125,7 +2125,7 @@ sub_8067F00:
movs r0, 0xC
movs r1, 0
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r1, 0
mov r10, r1
b _08067FF6
@@ -2188,7 +2188,7 @@ _08067FA4:
movs r0, 0x7
mov r1, r8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
b _08067FE6
.align 2, 0
_08067FCC: .4byte gUnknown_202DE58
@@ -2200,7 +2200,7 @@ _08067FD8:
movs r0, 0x7
mov r1, r8
movs r3, 0
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_08067FE6:
movs r2, 0x1
add r10, r2
@@ -2232,7 +2232,7 @@ _08068000:
movs r0, 0x8
movs r1, 0x2
movs r3, 0x1
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
b _0806804C
.align 2, 0
_08068028: .4byte gUnknown_8106E48
@@ -2249,7 +2249,7 @@ _08068034:
movs r0, 0x8
movs r1, 0x2
movs r3, 0x1
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_0806804C:
movs r0, 0x1
bl sub_80073E0

View File

@@ -146,7 +146,7 @@ _0808F8A0:
str r5, [sp]
movs r1, 0
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r4, _0808F99C
mov r1, r10
ldr r0, [r1, 0x2C]
@@ -159,7 +159,7 @@ _0808F8A0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r2, 0xA
add r9, r2
ldr r0, _0808F9A4
@@ -168,7 +168,7 @@ _0808F8A0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r3, 0xA
add r9, r3
mov r0, r10
@@ -191,7 +191,7 @@ _0808F8A0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_0808F914:
movs r3, 0xC
add r9, r3
@@ -206,7 +206,7 @@ _0808F914:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r2, 0xA
add r9, r2
ldr r0, _0808F9B0
@@ -215,7 +215,7 @@ _0808F914:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r0, _0808F9B4
ldr r2, [r0]
mov r0, r10
@@ -236,7 +236,7 @@ _0808F964:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
mov r1, r10
adds r1, 0x3B
ldrb r3, [r1]
@@ -254,7 +254,7 @@ _0808F964:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
b _0808F9D8
.align 2, 0
_0808F998: .4byte gUnknown_8107754
@@ -278,7 +278,7 @@ _0808F9C0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_0808F9D8:
movs r3, 0xA
add r9, r3
@@ -289,7 +289,7 @@ _0808F9D8:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r0, _0808FA4C
ldr r2, [r0]
ldr r4, _0808FA50
@@ -311,7 +311,7 @@ _0808FA0E:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
mov r1, r10
adds r1, 0x3C
ldrb r3, [r1]
@@ -329,7 +329,7 @@ _0808FA0E:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
b _0808FA74
.align 2, 0
_0808FA44: .4byte gUnknown_810DE38
@@ -349,7 +349,7 @@ _0808FA5C:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_0808FA74:
movs r0, 0xA
add r9, r0
@@ -381,7 +381,7 @@ _0808FAA6:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r1, 0xC
add r9, r1
ldr r1, _0808FB30
@@ -416,7 +416,7 @@ _0808FAE0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r2, 0xA
add r9, r2
mov r0, r10
@@ -451,13 +451,13 @@ _0808FB44:
str r4, [sp]
movs r1, 0
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r2, _0808FBEC
str r4, [sp]
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
mov r3, r10
ldrb r0, [r3, 0x16]
bl GetFormattedTypeString
@@ -466,7 +466,7 @@ _0808FB44:
movs r0, 0x38
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
mov r1, r10
ldrb r0, [r1, 0x17]
cmp r0, 0
@@ -477,7 +477,7 @@ _0808FB44:
movs r0, 0x60
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_0808FB94:
movs r2, 0xC
add r9, r2
@@ -486,7 +486,7 @@ _0808FB94:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r3, 0xC
add r9, r3
mov r1, r10
@@ -529,7 +529,7 @@ _0808FBF4:
movs r1, 0
str r1, [sp]
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
mov r0, r10
adds r0, 0x56
movs r1, 0
@@ -577,7 +577,7 @@ _0808FC38:
movs r0, 0xC
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
mov r0, r8
cmp r0, 0
ble _0808FC78
@@ -622,7 +622,7 @@ _0808FCB0:
movs r1, 0
str r1, [sp]
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
add r4, sp, 0x14
mov r0, r10
movs r2, 0x3E
@@ -706,7 +706,7 @@ _0808FD64:
movs r0, 0xC
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_0808FD74:
movs r2, 0x1
add r8, r2
@@ -733,7 +733,7 @@ _0808FD98:
movs r0, 0xC
movs r1, 0x20
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
b _0808FED6
.align 2, 0
_0808FDA4: .4byte gUnknown_810778C
@@ -747,7 +747,7 @@ _0808FDB0:
str r5, [sp]
movs r1, 0
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
ldr r6, _0808FEF0
mov r2, r10
movs r3, 0
@@ -765,7 +765,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0xA
add r9, r0
mov r1, r10
@@ -786,7 +786,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r3, 0xA
add r9, r3
ldr r0, _0808FF04
@@ -795,7 +795,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r0, 0xD
add r9, r0
ldr r0, _0808FF08
@@ -804,7 +804,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r1, 0xA
add r9, r1
mov r1, r10
@@ -817,7 +817,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r2, 0xD
add r9, r2
mov r3, r10
@@ -834,7 +834,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r2, 0xD
add r9, r2
ldr r4, _0808FF14
@@ -854,7 +854,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
movs r2, 0xD
add r9, r2
ldr r1, _0808FF1C
@@ -869,7 +869,7 @@ _0808FECC:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl xxx_format_and_draw
bl PrintFormatStringOnWindow
_0808FED6:
ldr r0, [sp, 0x50]
bl sub_80073E0

View File

@@ -2485,8 +2485,8 @@ sub_8008F8C:
_08008FB8: .4byte gUnknown_2027370
thumb_func_end sub_8008F8C
thumb_func_start xxx_call_draw_string
xxx_call_draw_string:
thumb_func_start PrintStringOnWindow
PrintStringOnWindow:
push {r4-r6,lr}
sub sp, 0x10
adds r4, r0, 0
@@ -2510,7 +2510,7 @@ xxx_call_draw_string:
bx r0
.align 2, 0
_08008FE8: .4byte gUnknown_2027370
thumb_func_end xxx_call_draw_string
thumb_func_end PrintStringOnWindow
thumb_func_start nullsub_170
nullsub_170:

View File

@@ -18,7 +18,7 @@ extern void sub_80151C0(u32, u8 *);
extern u32 sub_80154F0(void);
extern void sub_80155F0(void);
extern void xxx_draw_string_80144C4(void);
extern void xxx_format_and_draw(u32, u32, const u8 *, u32, u32);
extern void PrintFormatStringOnWindow(u32, u32, const u8 *, u32 windowId, u32);
extern void xxx_format_string(const u8 *, u8 *, u8 *, u32);
#endif // GUARD_CODE_80130A8_H

View File

@@ -50,6 +50,6 @@ extern void sub_80089AC(const UnkTextStruct2 *, UnkTextStruct2_sub *);
extern void sub_8008C54(u32);
extern s32 sub_8008ED0(const u8 *);
extern void sub_8009388(void);
extern void xxx_call_draw_string(s32 x, u32 y, const u8 *str, u32 , u32);
extern void PrintStringOnWindow(s32 x, u32 y, const u8 *str, u32 windowId, u32);
#endif // GUARD_TEXT2_H
#endif // GUARD_TEXT2_H

View File

@@ -97,7 +97,7 @@ static void DisplayAdventureLog(void)
r4 = sAdventureLog->s0.input.unk1E * 8;
r6 = r4;
r6 += 10;
xxx_call_draw_string(r6, 0, sAdventureLogText, sAdventureLog->s0.unk34, 0);
PrintStringOnWindow(r6, 0, sAdventureLogText, sAdventureLog->s0.unk34, 0);
r4 += 4;
r6 = r4 + (sAdventureLog->unk9C.f2 * 8);
@@ -111,39 +111,39 @@ static void DisplayAdventureLog(void)
case 12:
v1 = sub_80978B8();
gFormatData_202DE30 = (s16)v1;
xxx_format_and_draw(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
case 7:
v2 = sub_8097880();
gFormatData_202DE30 = (s16)v2;
xxx_format_and_draw(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
case 11:
v3 = sub_8097838();
gFormatData_202DE30 = (s16)v3;
xxx_format_and_draw(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
case 8:
v4 = sub_80977B8();
gFormatData_202DE30 = v4;
xxx_format_and_draw(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
case 9:
v5 = sub_80977F8();
gFormatData_202DE30 = v5;
xxx_format_and_draw(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
case 10:
v6 = sub_8097870();
gFormatData_202DE30 = (s16)v6;
// fallthrough
default:
xxx_format_and_draw(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
}
}
else
xxx_call_draw_string(8, sub_8013800(&sAdventureLog->s0.input, i), sPlaceholder, sAdventureLog->s0.unk34, 0);
PrintStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), sPlaceholder, sAdventureLog->s0.unk34, 0);
}
sub_80073E0(sAdventureLog->s0.unk34);

View File

@@ -84,8 +84,8 @@ static void sub_801B480(void)
sub_80073B8(sUnknown_203B230->unk24);
preload = sUnknown_203B230->unk10[sUnknown_203B230->unk8];
strcpy(gAvailablePokemonNames, preload->pokeName);
xxx_format_and_draw(16, 0, sFmtPkmn0, sUnknown_203B230->unk24, 0); // {ARG_POKEMON_0}
xxx_format_and_draw(4, 16, sUnknown_203B230->unk10[sUnknown_203B230->unk8]->unk4, sUnknown_203B230->unk24, 0);
PrintFormatStringOnWindow(16, 0, sFmtPkmn0, sUnknown_203B230->unk24, 0); // {ARG_POKEMON_0}
PrintFormatStringOnWindow(4, 16, sUnknown_203B230->unk10[sUnknown_203B230->unk8]->unk4, sUnknown_203B230->unk24, 0);
sub_80073E0(sUnknown_203B230->unk24);
break;
case 2:

View File

@@ -224,14 +224,14 @@ void sub_801CCD8(void)
sub_8008C54(sUnknown_203B244->unk4E8);
sub_80073B8(sUnknown_203B244->unk4E8);
xxx_call_draw_string(10, 0, sStorage, sUnknown_203B244->unk4E8, 0);
PrintStringOnWindow(10, 0, sStorage, sUnknown_203B244->unk4E8, 0);
sub_8012BC4(sUnknown_203B244->unk550.f2 * 8 + 4, 0, sUnknown_203B244->input.unk1E + 1, 2, 7, sUnknown_203B244->unk4E8);
for(index = 0; index < sUnknown_203B244->input.unk1A; index++) {
itemID = sUnknown_203B244->itemIDs[(sUnknown_203B244->input.unk1E * sUnknown_203B244->input.unk1C) + index];
BufferItemName(buffer, itemID, NULL);
y = sub_8013800(&sUnknown_203B244->input, index);
xxx_call_draw_string(8, y, buffer, sUnknown_203B244->unk4E8, 0);
PrintStringOnWindow(8, y, buffer, sUnknown_203B244->unk4E8, 0);
y2 = sub_8013800(&sUnknown_203B244->input, index);
sub_8012BC4((sUnknown_203B244->unk4EC->unkC * 8) - 2, y2, gTeamInventoryRef->teamStorage[itemID], 3, 5, sUnknown_203B244->unk4E8);

View File

@@ -586,7 +586,7 @@ static void sub_801D894(void)
x_coord = (128 - location_length) / 2; // Centers the location name
sub_8008C54(1);
sub_80073B8(1);
xxx_call_draw_string(x_coord, 4, buffer, 1, 0);
PrintStringOnWindow(x_coord, 4, buffer, 1, 0);
sub_80073E0(1);
sub_8008C54(2);
sub_80073B8(2);
@@ -596,9 +596,9 @@ static void sub_801D894(void)
r5 = sFmtPointsCyan; // %s {COLOR_1 CYAN}%d{END_COLOR_TEXT_1} Pts.
rank = GetRescueTeamRank();
sprintfStatic(buffer, r5, GetTeamRankString(rank), GetTeamRankPts());
xxx_call_draw_string(32, 4, buffer, 2, 0);
PrintStringOnWindow(32, 4, buffer, 2, 0);
sprintfStatic(buffer, sFmtMoneyCyan, gTeamInventoryRef->teamMoney);
xxx_call_draw_string(32, 18, buffer, 2, 0);
PrintStringOnWindow(32, 18, buffer, 2, 0);
sub_80073E0(2);
}

View File

@@ -112,7 +112,7 @@ static void sub_801DBD4(void)
sub_8008C54(sUnknown_203B258->s0.unk34);
sub_80073B8(sUnknown_203B258->s0.unk34);
xxx_call_draw_string(10, 0, sField, sUnknown_203B258->s0.unk34, 0); // Field
PrintStringOnWindow(10, 0, sField, sUnknown_203B258->s0.unk34, 0); // Field
x = (sUnknown_203B258->unk9C.f2 * 8) - 2;
n = sUnknown_203B258->s0.input.unk1E + 1;
@@ -127,10 +127,10 @@ static void sub_801DBD4(void)
temp2 = &gUnknown_81188F0[temp->unk4];
y = sub_8013800(&sUnknown_203B258->s0.input, counter);
xxx_call_draw_string(8, y, temp2->text1, sUnknown_203B258->s0.unk34, 0);
PrintStringOnWindow(8, y, temp2->text1, sUnknown_203B258->s0.unk34, 0);
y = sub_8013800(&sUnknown_203B258->s0.input, counter);
xxx_call_draw_string(62, y, temp->text, sUnknown_203B258->s0.unk34, 0);
PrintStringOnWindow(62, y, temp->text, sUnknown_203B258->s0.unk34, 0);
}
sub_80073E0(sUnknown_203B258->s0.unk34);

View File

@@ -146,12 +146,12 @@ void sub_801F700(void)
sub_8008C54(gUnknown_203B274->s348.s0.unk34);
sub_80073B8(gUnknown_203B274->s348.s0.unk34);
sprintfStatic(buffer1,gUnknown_80DC2DC,gUnknown_203B274->s348.s0.input.unk1E + 1,gUnknown_203B274->s348.s0.input.unk20); // Moves Page: %d/%d
xxx_call_draw_string(0x10,0,buffer1,gUnknown_203B274->s348.s0.unk34,0);
PrintStringOnWindow(0x10,0,buffer1,gUnknown_203B274->s348.s0.unk34,0);
for(index = 0; index < gUnknown_203B274->s348.s0.input.unk1A; index++)
{
sub_8092C84(buffer2,gUnknown_203B274->unk4->unk0[gUnknown_203B274->s348.s0.input.unk1E * gUnknown_203B274->s348.s0.input.unk1C + index]);
y = sub_8013800(&gUnknown_203B274->s348.s0.input, index);
xxx_call_draw_string(8,y,buffer2,gUnknown_203B274->s348.s0.unk34,0);
PrintStringOnWindow(8,y,buffer2,gUnknown_203B274->s348.s0.unk34,0);
}
sub_80073E0(gUnknown_203B274->s348.s0.unk34);
}

View File

@@ -150,8 +150,8 @@ void sub_801F9A4(void)
sub_80073B8(gUnknown_203B278->unk5C);
name = &(gUnknown_203B278->unk14[gUnknown_203B278->unkC]->pokeName);
strcpy(gAvailablePokemonNames, *name);
xxx_format_and_draw(0x10,0,gUnknown_80DC310,gUnknown_203B278->unk5C,0); // $m0
xxx_format_and_draw(4,0x10,gUnknown_203B278->unk14[gUnknown_203B278->unkC]->unk4,gUnknown_203B278->unk5C,0);
PrintFormatStringOnWindow(0x10,0,gUnknown_80DC310,gUnknown_203B278->unk5C,0); // $m0
PrintFormatStringOnWindow(4,0x10,gUnknown_203B278->unk14[gUnknown_203B278->unkC]->unk4,gUnknown_203B278->unk5C,0);
sub_80073E0(gUnknown_203B278->unk5C);
break;
case 2:

View File

@@ -157,7 +157,7 @@ static void sub_80234BC(void)
sub_8008C54(gUnknown_3001B5C->s35C.s0.unk34);
sub_80073B8(gUnknown_3001B5C->s35C.s0.unk34);
xxx_call_draw_string(10, 0, sPokemon, gUnknown_3001B5C->s35C.s0.unk34, 0);
PrintStringOnWindow(10, 0, sPokemon, gUnknown_3001B5C->s35C.s0.unk34, 0);
sub_8012BC4((gUnknown_3001B5C->s35C.unk9C.f2 * 8) + 4, 0, gUnknown_3001B5C->s35C.s0.input.unk1E + 1, 2, 7, gUnknown_3001B5C->s35C.s0.unk34);
@@ -187,7 +187,7 @@ static void sub_80234BC(void)
sub_808D930(buffer1,species);
sprintfStatic(buffer2, sFmtColoredString, color, buffer1);
xxx_call_draw_string(36, y, buffer2, gUnknown_3001B5C->s35C.s0.unk34, 0);
PrintStringOnWindow(36, y, buffer2, gUnknown_3001B5C->s35C.s0.unk34, 0);
}
sub_80073E0(gUnknown_3001B5C->s35C.s0.unk34);

View File

@@ -118,7 +118,7 @@ void DrawSOSPasswordScreen(void)
mail = &gUnknown_203B480[gUnknown_203B334->mailIndex];
sub_80073B8(gUnknown_203B334->unk10);
xxx_call_draw_string(0x14,0,gUnknown_80E1FDC,gUnknown_203B334->unk10,0); // Password
PrintStringOnWindow(0x14,0,gUnknown_80E1FDC,gUnknown_203B334->unk10,0); // Password
sub_803D2C0(buffer, mail);
for(index = 0; index < PASSWORD_BUFFER_SIZE; index++)
{

View File

@@ -33,6 +33,7 @@
#include "music.h"
#include "items.h"
#include "play_time.h"
#include "pokemon_3.h"
#include "text2.h"
#include "text1.h"
#include "code_806CD90.h"
@@ -41,6 +42,7 @@
#include "dungeon_capabilities.h"
#include "constants/dungeon.h"
#include "constants/status.h"
#include "constants/tactic.h"
#include "constants/iq_skill.h"
#include "constants/dungeon_action.h"
#include "structs/struct_sub80095e4.h"
@@ -117,7 +119,7 @@ bool8 sub_8061A38(ActionContainer *a0, bool8 a1);
void sub_8063A70(ActionContainer *a0, bool8 a1);
void sub_8063CF0(ActionContainer *a0, bool8 a1);
void sub_8067768(UNUSED ActionContainer *a0);
void sub_80615E8(ActionContainer *a0);
void ShowTacticsMenu(ActionContainer *a0);
void sub_804A728(Position *pos, s32 a1, u8 a2, u8 a3);
extern bool8 sub_8071A8C(Entity *pokemon);
extern void sub_80643AC(Entity *pokemon);
@@ -3011,7 +3013,7 @@ void ShowFieldMenu(u8 a0_, bool8 a1)
sub_8044C10(1);
}
else if (GetLeaderActionId() == 0x1A) {
sub_80615E8(GetLeaderActionContainer());
ShowTacticsMenu(GetLeaderActionContainer());
sub_8044C10(1);
}
else if (GetLeaderActionId() == 0x30) {
@@ -3249,6 +3251,7 @@ extern const u8 *const gUnknown_80F9190;
extern const u8 *const gUnknown_80F91C8;
extern const u8 *const gUnknown_80F91E0;
extern const u8 *const gUnknown_80F91A8;
extern const u8 *const gUnknown_80FE954;
const u8 *sub_805317C(void);
void GetWeatherName(u8 *dst, u8 weatherId);
@@ -3296,19 +3299,19 @@ void DrawFieldMenu(u8 a0)
}
y = sub_8013800(&gUnknown_202EE10, 0);
xxx_call_draw_string(8, y, gFieldMenuMovesPtr, 0, 0);
PrintStringOnWindow(8, y, gFieldMenuMovesPtr, 0, 0);
y = sub_8013800(&gUnknown_202EE10, 1);
xxx_call_draw_string(8, y, gFieldMenuItemsPtr, 0, 0);
PrintStringOnWindow(8, y, gFieldMenuItemsPtr, 0, 0);
y = sub_8013800(&gUnknown_202EE10, 2);
xxx_call_draw_string(8, y, gFieldMenuTeamPtr, 0, 0);
PrintStringOnWindow(8, y, gFieldMenuTeamPtr, 0, 0);
y = sub_8013800(&gUnknown_202EE10, 3);
xxx_call_draw_string(8, y, gFieldMenuOthersPtr, 0, 0);
PrintStringOnWindow(8, y, gFieldMenuOthersPtr, 0, 0);
y = sub_8013800(&gUnknown_202EE10, 4);
xxx_call_draw_string(8, y, gFieldMenuGroundPtr, 0, 0);
PrintStringOnWindow(8, y, gFieldMenuGroundPtr, 0, 0);
sub_80073E0(0);
if (a0) {
@@ -3318,25 +3321,25 @@ void DrawFieldMenu(u8 a0)
x = (136 - sub_8008ED0(dungeonName)) / 2;
sub_80073B8(1);
xxx_call_draw_string(x, 2, dungeonName, 1, 0);
PrintStringOnWindow(x, 2, dungeonName, 1, 0);
sub_80073E0(1);
sub_80073B8(2);
DeconstructPlayTime(gPlayTimeRef, &hours, &minutes, &seconds);
gFormatData_202DE30[0] = RoundUpFixedPoint(leaderInfo->belly);
gFormatData_202DE30[1] = RoundUpFixedPoint(leaderInfo->maxBelly);
xxx_format_and_draw(0x73, 0, gUnknown_80F9174, 2, 0);
PrintFormatStringOnWindow(0x73, 0, gUnknown_80F9174, 2, 0);
gFormatData_202DE30[0] = gTeamInventoryRef->teamMoney;
xxx_format_and_draw(0x73, 12, gUnknown_80F9190, 2, 0);
PrintFormatStringOnWindow(0x73, 12, gUnknown_80F9190, 2, 0);
GetWeatherName(gAvailablePokemonNames, GetApparentWeather(NULL));
xxx_format_and_draw(0x73, 24, gUnknown_80F91A8, 2, 0);
PrintFormatStringOnWindow(0x73, 24, gUnknown_80F91A8, 2, 0);
gFormatData_202DE30[0] = hours;
gFormatData_202DE30[1] = minutes;
gFormatData_202DE30[2] = seconds;
xxx_format_and_draw(0x73, 36, gUnknown_80F91C8, 2, 0);
PrintFormatStringOnWindow(0x73, 36, gUnknown_80F91C8, 2, 0);
for (yLoop = 0, i = 0; i < MAX_TEAM_MEMBERS; i++) {
Entity *teamMon = gDungeon->teamPokemon[i];
if (EntityExists(teamMon)) {
@@ -3344,7 +3347,7 @@ void DrawFieldMenu(u8 a0)
SetMessageArgument(gAvailablePokemonNames, teamMon, 0);
gFormatData_202DE30[0] = monInfo->HP;
gFormatData_202DE30[1] = monInfo->maxHPStat;
xxx_format_and_draw(4, yLoop, gUnknown_80F91E0, 2, 0);
PrintFormatStringOnWindow(4, yLoop, gUnknown_80F91E0, 2, 0);
yLoop += 12;
if (yLoop >= 12 * MAX_TEAM_MEMBERS)
break;
@@ -3441,7 +3444,7 @@ void sub_805FC30(UnkTextStruct3 *a0, s32 a1)
r4 = (sub_8044F3C(i) != 0) ? 7 : 2;
sprintfStatic(text, gUnknown_8106B50, r4, sub_8044EC8(i));
y = sub_8013800(&gUnknown_202EE10, i);
xxx_call_draw_string(8, y, text, 1, 0);
PrintStringOnWindow(8, y, text, 1, 0);
}
sub_80073E0(1);
}
@@ -3823,7 +3826,7 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
switch (gUnknown_202F248[a0])
{
case 0:
xxx_format_and_draw(x, 0, gTeamToolboxAPtr, 0, 0);
PrintFormatStringOnWindow(x, 0, gTeamToolboxAPtr, 0, 0);
for (i = 0; i < 10; i++) {
Item *items;
DUMMY_TEAM_ITEMS_ASM_MATCH(i);
@@ -3833,7 +3836,7 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
gUnknown_202EE10.unk1A++;
sub_8090E14(txtBuff, &gTeamInventoryRef->teamItems[i], &gUnknown_8106B60);
y = sub_8013800(&gUnknown_202EE10, i);
xxx_format_and_draw(8, y, txtBuff, 0, 0);
PrintFormatStringOnWindow(8, y, txtBuff, 0, 0);
}
else {
break;
@@ -3841,7 +3844,7 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
}
break;
case 1:
xxx_format_and_draw(x, 0, gTeamToolboxBPtr, 0, 0);
PrintFormatStringOnWindow(x, 0, gTeamToolboxBPtr, 0, 0);
for (i = 0; i < 10; i++) {
Item *items;
DUMMY_TEAM_ITEMS_ASM_MATCH(i);
@@ -3851,7 +3854,7 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
gUnknown_202EE10.unk1A++;
sub_8090E14(txtBuff, &gTeamInventoryRef->teamItems[i + 10], &gUnknown_8106B60);
y = sub_8013800(&gUnknown_202EE10, i);
xxx_format_and_draw(8, y, txtBuff, 0, 0);
PrintFormatStringOnWindow(8, y, txtBuff, 0, 0);
}
else {
break;
@@ -3861,12 +3864,12 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
case 2: {
Tile *tile = GetTile(a1->pos.x, a1->pos.y);
Item *item = GetItemData(tile->object);
xxx_format_and_draw(x, 0, gFieldItemMenuGroundTextPtr, 0, 0);
PrintFormatStringOnWindow(x, 0, gFieldItemMenuGroundTextPtr, 0, 0);
if (item->flags & ITEM_FLAG_EXISTS) {
gUnknown_202EE10.unk1A++;
sub_8090E14(txtBuff, item, &gUnknown_8106B60);
y = sub_8013800(&gUnknown_202EE10, 0);
xxx_format_and_draw(8, y, txtBuff, 0, 0);
PrintFormatStringOnWindow(8, y, txtBuff, 0, 0);
}
if (a3) {
gUnknown_202EE10.unk8.x = gUnknown_202EE10.unk8.y = 0;
@@ -3876,12 +3879,12 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
case 3: {
Item *item = &a1->info->heldItem;
SetMessageArgument_2(gAvailablePokemonNames, a1Info, 0);
xxx_format_and_draw(x, 0, gUnknown_80FE940, 0, 0);
PrintFormatStringOnWindow(x, 0, gUnknown_80FE940, 0, 0);
if (item->flags & ITEM_FLAG_EXISTS) {
gUnknown_202EE10.unk1A++;
sub_8090E14(txtBuff, item, &gUnknown_8106B60);
y = sub_8013800(&gUnknown_202EE10, 0);
xxx_format_and_draw(8, y, txtBuff, 0, 0);
PrintFormatStringOnWindow(8, y, txtBuff, 0, 0);
}
}
break;
@@ -3890,12 +3893,12 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
if (EntityExists(chosenTeamMember)) {
Item *item = &chosenTeamMember->info->heldItem;
SetMessageArgument_2(gAvailablePokemonNames, chosenTeamMember->info, 0);
xxx_format_and_draw(x, 0, gUnknown_80FE940, 0, 0);
PrintFormatStringOnWindow(x, 0, gUnknown_80FE940, 0, 0);
if (item->flags & ITEM_FLAG_EXISTS) {
gUnknown_202EE10.unk1A++;
sub_8090E14(txtBuff, item, &gUnknown_8106B60);
y = sub_8013800(&gUnknown_202EE10, 0);
xxx_format_and_draw(8, y, txtBuff, 0, 0);
PrintFormatStringOnWindow(8, y, txtBuff, 0, 0);
}
}
}
@@ -3908,7 +3911,7 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
sub_80073E0(0);
if (a2) {
sub_80073B8(1);
xxx_format_and_draw(4, 2, gWhichTextPtr1, 1, 0);
PrintFormatStringOnWindow(4, 2, gWhichTextPtr1, 1, 0);
sub_80073E0(1);
}
}
@@ -4401,6 +4404,8 @@ extern const u8 gUnknown_8106BCC[];
extern const u8 gUnknown_8106BD0[];
extern const u8 gUnknown_8106BD4[];
extern const u8 gUnknown_8106BE0[];
extern const u8 gUnknown_8106BEC[];
extern const u8 gUnknown_8106BF4[];
extern void sub_8070968(u8 *buffer, EntityInfo *entityInfo, s32 colorNum);
@@ -4470,7 +4475,7 @@ void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, UnkTextStruct3 *a1, bo
sub_80137B0(&gUnknown_202EE10, 0);
sub_80073B8(0);
if (r10) {
xxx_format_and_draw(0xC, 0, gUnknown_8106BB0, 0, 0);
PrintFormatStringOnWindow(0xC, 0, gUnknown_8106BB0, 0, 0);
}
// Print hp/max hp
@@ -4518,10 +4523,10 @@ void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, UnkTextStruct3 *a1, bo
gFormatData_202DE30[1] = monInfo->maxHPStat;
y = sub_8013800(&gUnknown_202EE10, i);
if (monInfo->isTeamLeader) {
xxx_format_and_draw(9, y, gUnknown_8106BD4, 0, 0);
PrintFormatStringOnWindow(9, y, gUnknown_8106BD4, 0, 0);
}
else {
xxx_format_and_draw(9, y, gUnknown_8106BE0, 0, 0);
PrintFormatStringOnWindow(9, y, gUnknown_8106BE0, 0, 0);
}
}
}
@@ -4593,7 +4598,7 @@ void sub_80615B4(ActionContainer *a0, struct UnkFieldTeamMenuStruct *a1)
a0->unk4[0].actionUseIndex = a1->unk4[a1->unk0];
}
void sub_806195C(s32 a0, void *a1, EntityInfo *a3, s32 a4);
void PrintMonTactics(s32 a0, u8 *tacticIds, EntityInfo *mon, s32 windowId);
void sub_80623B0(void);
void sub_8062D68(void);
void sub_8062230(void);
@@ -4618,23 +4623,23 @@ static inline void SetTxtStruct(UnkTextStruct3 *sp)
sp->a0[3].unk4 = 3;
}
void sub_80615E8(ActionContainer *a0)
void ShowTacticsMenu(ActionContainer *a0)
{
UnkTextStruct3 sp;
EntityInfo *monInfo;
u8 var_3C[9];
s32 var_30;
s32 var_2C;
u8 tacticIds[NUM_TACTICS];
s32 scrollFirstId;
s32 menuIndex;
Entity *teamMon;
SetTxtStruct(&sp);
teamMon = gDungeon->teamPokemon[a0->unk4[0].actionUseIndex];
monInfo = teamMon->info;
var_2C = 0;
var_30 = 0;
menuIndex = 0;
scrollFirstId = 0;
while (1) {
s32 i;
bool32 addCursor = 1;
bool32 addCursor = TRUE;
bool32 loopBreak = FALSE;
gUnknown_202F270.f0 = 1;
@@ -4642,9 +4647,9 @@ void sub_80615E8(ActionContainer *a0)
gUnknown_202F270.f2 = 10;
gUnknown_202F270.f3 = 0;
sub_803ECB4(&sp, 1);
sub_806195C(var_30, var_3C, monInfo, 0);
PrintMonTactics(scrollFirstId, tacticIds, monInfo, 0);
for (i = 0; i < 8; i++) {
if (var_3C[i] == 11)
if (tacticIds[i] == TACTIC_UNUSED)
break;
}
gUnknown_202EE10.unk1A = i;
@@ -4659,29 +4664,29 @@ void sub_80615E8(ActionContainer *a0)
gUnknown_202EE10.unk0 = 0;
sub_801317C(&gUnknown_202EE10.unk28);
sub_80137B0(&gUnknown_202EE10, 0);
gUnknown_202EE10.menuIndex = var_2C;
gUnknown_202EE10.menuIndex = menuIndex;
while (1) {
s32 i;
AddMenuCursorSprite(&gUnknown_202EE10);
if (var_3C[8] != 11) {
if (tacticIds[8] != TACTIC_UNUSED) {
sub_80623B0();
}
if (var_30 != 0) {
if (scrollFirstId != 0) {
sub_8062230();
}
sub_803E46C(0x3D);
if (gRealInputs.repeated & DPAD_DOWN) {
sub_8083CE0(1);
if (gUnknown_202EE10.menuIndex == 7) {
if (var_3C[8] != 11) {
if (tacticIds[8] != TACTIC_UNUSED) {
for (i = 0; i < 6; i++) {
gUnknown_203B080(0);
sub_803E46C(0x3D);
}
var_30++;
scrollFirstId++;
}
var_2C = 7;
menuIndex = 7;
break;
}
sub_80136E0(&gUnknown_202EE10, 0);
@@ -4689,31 +4694,31 @@ void sub_80615E8(ActionContainer *a0)
if (gRealInputs.repeated & DPAD_UP) {
sub_8083CE0(1);
if (gUnknown_202EE10.menuIndex == 0) {
if (var_30 != 0) {
if (scrollFirstId != 0) {
for (i = 0; i < 6; i++) {
gUnknown_203B084(0);
sub_803E46C(0x3D);
}
var_30--;
scrollFirstId--;
}
var_2C = 0;
menuIndex = 0;
break;
}
sub_8013744(&gUnknown_202EE10, 0);
}
if (gRealInputs.pressed & START_BUTTON) {
s32 var = var_3C[gUnknown_202EE10.menuIndex];
var_2C = gUnknown_202EE10.menuIndex;
u32 tacticId = tacticIds[gUnknown_202EE10.menuIndex];
menuIndex = gUnknown_202EE10.menuIndex;
sub_8083D44();
sub_8062748(var);
sub_8062748(tacticId);
loopBreak = FALSE;
break;
}
if ((gRealInputs.pressed & A_BUTTON) || gUnknown_202EE10.unk28.a_button) {
bool32 changed;
u8 var = var_3C[gUnknown_202EE10.menuIndex];
var_2C = gUnknown_202EE10.menuIndex;
u32 tacticId = tacticIds[gUnknown_202EE10.menuIndex];
menuIndex = gUnknown_202EE10.menuIndex;
sub_8062D68();
sub_8083D08();
gUnknown_202EE6C = 0;
@@ -4752,7 +4757,7 @@ void sub_80615E8(ActionContainer *a0)
sub_8083D08();
if (gUnknown_202EE10.menuIndex == 0) {
PlaySoundEffect(0x133);
monInfo->tactic = var;
monInfo->tactic = tacticId;
monInfo->aiTarget.aiObjective = 6;
monInfo->aiTarget.aiTarget = NULL;
monInfo->aiTarget.unkC = 0;
@@ -4762,7 +4767,7 @@ void sub_80615E8(ActionContainer *a0)
}
}
else {
sub_8062748(var);
sub_8062748(tacticId);
addCursor = FALSE;
}
}
@@ -4786,4 +4791,45 @@ void sub_80615E8(ActionContainer *a0)
sub_803EAF0(0, NULL);
}
extern void GetAvailTacticsforLvl(u8 *tacticsBuffer, s32 pokeLevel);
void PrintMonTactics(s32 firstId, u8 *tacticIds, EntityInfo *mon, s32 windowId)
{
u8 tacticsBuffer[NUM_TACTICS];
u32 tactic;
s32 y, i, j;
firstId--;
sub_80073B8(windowId);
PrintStringOnWindow(0x10, 0, gUnknown_80FE954, windowId, 0);
y = 0x14;
for (j = 0; j < 9; j++) {
tacticIds[j] = TACTIC_UNUSED;
}
GetAvailTacticsforLvl(tacticsBuffer, GetLeaderInfo()->level);
for (i = -1; i < 10; i++, y += 12, firstId++) {
if (firstId < 0)
continue;
if (firstId >= NUM_TACTICS)
continue;
tactic = tacticsBuffer[firstId];
if (i >= 0 && i < 9) {
tacticIds[i] = tactic;
}
if (tactic == TACTIC_UNUSED)
break;
CopyTacticsNameToBuffer(gAvailablePokemonNames, tactic);
if (mon->tactic == tactic) {
PrintFormatStringOnWindow(0x10, y, gUnknown_8106BEC, windowId, 0);
}
else {
PrintFormatStringOnWindow(0x10, y, gUnknown_8106BF4, windowId, 0);
}
}
sub_80073E0(windowId);
}
//

View File

@@ -196,7 +196,7 @@ void sub_802FA50(void)
sub_8008C54(gUnknown_203B314->sBC.s0.unk34);
sub_80073B8(gUnknown_203B314->sBC.s0.unk34);
xxx_call_draw_string(10,0,gUnknown_80E0744,gUnknown_203B314->sBC.s0.unk34,0);
PrintStringOnWindow(10,0,gUnknown_80E0744,gUnknown_203B314->sBC.s0.unk34,0);
sub_8012BC4(gUnknown_203B314->sBC.unk9C.f2 * 8 + 4,0,gUnknown_203B314->sBC.s0.input.unk1E + 1,2,7,gUnknown_203B314->sBC.s0.unk34);
if (gUnknown_203B314->unkB8 != 0) {
for(counter = 0; counter < gUnknown_203B314->sBC.s0.input.unk1A; counter++)
@@ -205,12 +205,12 @@ void sub_802FA50(void)
index = gUnknown_203B314->sBC.s0.input.unk1E * gUnknown_203B314->sBC.s0.input.unk1C + counter;
sVar1 = gUnknown_203B314->unk0[index];
if (gUnknown_203B314->unk5C[index] != 0) {
xxx_call_draw_string(10,y,gUnknown_80E0750,gUnknown_203B314->sBC.s0.unk34,0);
PrintStringOnWindow(10,y,gUnknown_80E0750,gUnknown_203B314->sBC.s0.unk34,0);
}
else if (gUnknown_203B314->unk8A[index] != 0) {
xxx_call_draw_string(10,y,gUnknown_80E0754,gUnknown_203B314->sBC.s0.unk34,0);
PrintStringOnWindow(10,y,gUnknown_80E0754,gUnknown_203B314->sBC.s0.unk34,0);
}
xxx_call_draw_string(0x18,y,sub_80974A0(sVar1),gUnknown_203B314->sBC.s0.unk34,0);
PrintStringOnWindow(0x18,y,sub_80974A0(sVar1),gUnknown_203B314->sBC.s0.unk34,0);
}
}
else {
@@ -218,7 +218,7 @@ void sub_802FA50(void)
{
y2 = sub_8013800(&gUnknown_203B314->sBC.s0.input,counter);
text = sub_80974A0(gUnknown_203B314->unk0[gUnknown_203B314->sBC.s0.input.unk1E * gUnknown_203B314->sBC.s0.input.unk1C + counter]);
xxx_call_draw_string(8,y2,text,gUnknown_203B314->sBC.s0.unk34,0);
PrintStringOnWindow(8,y2,text,gUnknown_203B314->sBC.s0.unk34,0);
}
}
sub_80073E0(gUnknown_203B314->sBC.s0.unk34);

View File

@@ -87,9 +87,9 @@ void sub_8094558(u32 param_1,u8 *param_2,unkDungeonGlobal_unk1CE98_sub *param_3)
Item *item;
sub_80073B8(param_1);
xxx_format_and_draw(0x10,0,param_2,param_1,0);
PrintFormatStringOnWindow(0x10,0,param_2,param_1,0);
PrintYellowDungeonNametoBuffer(gAvailablePokemonNames, &param_3->dungeonLocation);
xxx_format_and_draw(4,0x10,*gUnknown_8113850,param_1,0); // #+Place: $m0
PrintFormatStringOnWindow(4,0x10,*gUnknown_8113850,param_1,0); // #+Place: $m0
y = 0x1A;
sub_80922B4(gAvailablePokemonNames, param_3->buffer1, POKEMON_NAME_LENGTH);
sub_80922B4(gAvailablePokemonNames + 0x50, param_3->buffer2, POKEMON_NAME_LENGTH);
@@ -103,59 +103,59 @@ void sub_8094558(u32 param_1,u8 *param_2,unkDungeonGlobal_unk1CE98_sub *param_3)
}
x = (0xb0 - sub_8008ED0(buffer)) / 2;
xxx_format_and_draw(x,y,buffer,param_1,0);
PrintFormatStringOnWindow(x,y,buffer,param_1,0);
y += 0xA;
sub_80944BC(param_3->moveID, buffer);
x = (0xb0 - sub_8008ED0(buffer)) / 2;
xxx_format_and_draw(x,y,buffer,param_1,0);
PrintFormatStringOnWindow(x,y,buffer,param_1,0);
y += 0x10;
gFormatData_202DE30[0] = param_3->exp;
gFormatData_202DE30[1] = param_3->level;
if (gFormatData_202DE30[1] >= 100) {
xxx_format_and_draw(4,y,*gUnknown_81138C0,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_81138C0,param_1,0);
}
else {
xxx_format_and_draw(4,y,*gUnknown_8113898,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_8113898,param_1,0);
}
y += 0xA;
gFormatData_202DE30[0] = param_3->maxHPStat;
xxx_format_and_draw(4,y,*gUnknown_81138D0,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_81138D0,param_1,0);
y += 0xA;
gFormatData_202DE30[0] = param_3->atk;
gFormatData_202DE30[1] = param_3->def;
if (param_3->attBoost) {
gFormatData_202DE30[0] = gFormatData_202DE30[0] + param_3->attBoost;
xxx_format_and_draw(4,y,*gUnknown_8113950,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_8113950,param_1,0);
}
else {
xxx_format_and_draw(4,y,*gUnknown_81138E4,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_81138E4,param_1,0);
}
if (param_3->defBoost) {
gFormatData_202DE30[1] = gFormatData_202DE30[1] + param_3->defBoost;
xxx_format_and_draw(4,y,*gUnknown_8113974,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_8113974,param_1,0);
}
else {
xxx_format_and_draw(4,y,*gUnknown_8113900,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_8113900,param_1,0);
}
y += 0xA;
gFormatData_202DE30[0] = param_3->spAtk;
gFormatData_202DE30[1] = param_3->spDef;
if (param_3->spAttBoost) {
gFormatData_202DE30[0] = gFormatData_202DE30[0] + param_3->spAttBoost;
xxx_format_and_draw(4,y,*gUnknown_8113990,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_8113990,param_1,0);
}
else {
xxx_format_and_draw(4,y,*gUnknown_8113918,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_8113918,param_1,0);
}
if (param_3->spDefBoost) {
gFormatData_202DE30[1] = gFormatData_202DE30[1] + param_3->spDefBoost;
xxx_format_and_draw(4,y,*gUnknown_81139B4,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_81139B4,param_1,0);
}
else {
xxx_format_and_draw(4,y,*gUnknown_8113934,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_8113934,param_1,0);
}
y += 0x10;
item = &(param_3->heldItem);
@@ -165,6 +165,6 @@ void sub_8094558(u32 param_1,u8 *param_2,unkDungeonGlobal_unk1CE98_sub *param_3)
else {
strcpy(gUnknown_202DE58,*gUnknown_81139B8);
}
xxx_format_and_draw(4,y,*gUnknown_81139CC,param_1,0);
PrintFormatStringOnWindow(4,y,*gUnknown_81139CC,param_1,0);
sub_80073E0(param_1);
}

View File

@@ -73,7 +73,7 @@ bool8 DrawCredits(s32 creditsCategoryIndex, s32 param_2)
break;
}
xxx_call_draw_string(x, y, srcText, 0, 0);
PrintStringOnWindow(x, y, srcText, 0, 0);
cred++;
}

View File

@@ -141,7 +141,7 @@ static void sub_803A690(void)
{
sub_8008C54(sUnknown_203B3F0->unk9C.unk14);
sub_80073B8(sUnknown_203B3F0->unk9C.unk14);
xxx_call_draw_string(4, 0, sNumberPrompt, sUnknown_203B3F0->unk9C.unk14, 0);
PrintStringOnWindow(4, 0, sNumberPrompt, sUnknown_203B3F0->unk9C.unk14, 0);
sub_8013C68(&sUnknown_203B3F0->unk9C);
sub_80073E0(sUnknown_203B3F0->unk9C.unk14);
sub_801CCD8();

View File

@@ -144,7 +144,7 @@ static void sub_803AE58(void)
{
sub_8008C54(sUnknown_203B3F8->unk60.unk14);
sub_80073B8(sUnknown_203B3F8->unk60.unk14);
xxx_call_draw_string(4, 0, sNumberPrompt, sUnknown_203B3F8->unk60.unk14, 0);
PrintStringOnWindow(4, 0, sNumberPrompt, sUnknown_203B3F8->unk60.unk14, 0);
sub_8013C68(&sUnknown_203B3F8->unk60);
sub_80073E0(sUnknown_203B3F8->unk60.unk14);
sub_8023DA4();

View File

@@ -392,9 +392,9 @@ static void sub_8016B48(u8 action)
sub_80073B8(sFelicityBankWork->unk64.unk14);
if (action != FELICITY_BANK_ACTION_WITHDRAW)
xxx_call_draw_string(12, 0, gCommonDepositPrompt[0], sFelicityBankWork->unk64.unk14, 0);
PrintStringOnWindow(12, 0, gCommonDepositPrompt[0], sFelicityBankWork->unk64.unk14, 0);
else
xxx_call_draw_string(12, 0, gCommonWithdrawPrompt[0], sFelicityBankWork->unk64.unk14, 0);
PrintStringOnWindow(12, 0, gCommonWithdrawPrompt[0], sFelicityBankWork->unk64.unk14, 0);
sub_8013C68(&sFelicityBankWork->unk64);
sub_80073E0(sFelicityBankWork->unk64.unk14);
@@ -404,9 +404,9 @@ static void CreateFelicityMoneySavingsHeader(u32 param_1)
{
sub_8008C54(param_1);
sub_80073B8(param_1);
xxx_call_draw_string(16, 4, sDisplayMoney, param_1, 0);
PrintStringOnWindow(16, 4, sDisplayMoney, param_1, 0);
sub_8012BC4(96, 4, gTeamInventoryRef->teamMoney, 5, 5, param_1);
xxx_call_draw_string(112, 4, sDisplaySavings, param_1, 0);
PrintStringOnWindow(112, 4, sDisplaySavings, param_1, 0);
sub_8012BC4(200, 4, gTeamInventoryRef->teamSavings, 7, 5, param_1);
sub_80073E0(param_1);
}
@@ -415,7 +415,7 @@ void DrawTeamMoneyBox(u32 param_1)
{
sub_8008C54(param_1);
sub_80073B8(param_1);
xxx_call_draw_string(6, 0, sMoney, param_1, 0);
PrintStringOnWindow(6, 0, sMoney, param_1, 0);
sub_8012BC4(42, 12, gTeamInventoryRef->teamMoney, 5, 5, param_1);
sub_80073E0(param_1);
}

View File

@@ -703,7 +703,7 @@ void sub_8027D40(u32 r0, BulkItem *heldItem)
a3.unk8 = 1;
slot.flags = ITEM_FLAG_EXISTS;
sub_8090E14(gUnknown_202DE58, &slot, &a3);
xxx_format_and_draw(4, 3, sItemBuffered, r0, 0);
PrintFormatStringOnWindow(4, 3, sItemBuffered, r0, 0);
sub_80073E0(r0);
}

View File

@@ -645,7 +645,7 @@ void sub_8025E68(u32 r0, BulkItem *heldItem)
a3.unk8 = 1;
item.flags = ITEM_FLAG_EXISTS;
sub_8090E14(gUnknown_202DE58, &item, &a3);
xxx_format_and_draw(4, 3, sItemBuffered, r0, 0);
PrintFormatStringOnWindow(4, 3, sItemBuffered, r0, 0);
sub_80073E0(r0);
}

View File

@@ -106,11 +106,11 @@ static void DrawHintSelectionMenu(void)
sub_8008C54(sUnknown_203B264->unk34);
sub_80073B8(sUnknown_203B264->unk34);
xxx_call_draw_string(16, 0, sHints, sUnknown_203B264->unk34, 0);
PrintStringOnWindow(16, 0, sHints, sUnknown_203B264->unk34, 0);
for (hintIndex = 0; hintIndex < NUM_HINTS; hintIndex++) {
y = sub_8013800(&sUnknown_203B264->input, hintIndex);
xxx_call_draw_string(10, y, gCommonHints[hintIndex].heading, sUnknown_203B264->unk34, 0);
PrintStringOnWindow(10, y, gCommonHints[hintIndex].heading, sUnknown_203B264->unk34, 0);
}
sub_80073E0(sUnknown_203B264->unk34);

View File

@@ -83,7 +83,7 @@ static void sub_801E76C(void)
static void DisplayChosenHint(void)
{
sub_80073B8(sUnknown_203B268->unk34);
xxx_call_draw_string((sUnknown_203B268->input.unk1E * 8) + 16, 0, gCommonHints[sUnknown_203B268->input.unk1E].heading, sUnknown_203B268->unk34, 0);
xxx_call_draw_string(10, 20, gCommonHints[sUnknown_203B268->input.unk1E].body, sUnknown_203B268->unk34, 0);
PrintStringOnWindow((sUnknown_203B268->input.unk1E * 8) + 16, 0, gCommonHints[sUnknown_203B268->input.unk1E].heading, sUnknown_203B268->unk34, 0);
PrintStringOnWindow(10, 20, gCommonHints[sUnknown_203B268->input.unk1E].body, sUnknown_203B268->unk34, 0);
sub_80073E0(sUnknown_203B268->unk34);
}

View File

@@ -88,8 +88,8 @@ static void sub_801C6E4(void)
sub_80073B8(sIQSkillInfoMenu->unk24);
skillName = GetIQSkillName(sIQSkillInfoMenu->chosenIQSkill);
strcpy(gUnknown_202DE58, skillName);
xxx_format_and_draw(16, 0, sFmtMoveItem0, 0, 0); // {ARG_MOVE_ITEM_0}
xxx_call_draw_string(8, 16, GetIQSkillDescription(sIQSkillInfoMenu->chosenIQSkill), sIQSkillInfoMenu->unk24, 0);
PrintFormatStringOnWindow(16, 0, sFmtMoveItem0, 0, 0); // {ARG_MOVE_ITEM_0}
PrintStringOnWindow(8, 16, GetIQSkillDescription(sIQSkillInfoMenu->chosenIQSkill), sIQSkillInfoMenu->unk24, 0);
sub_80073E0(sIQSkillInfoMenu->unk24);
sIQSkillInfoMenu->unkC = sub_8097DF0(GetIQSkillDescription(sIQSkillInfoMenu->chosenIQSkill), sIQSkillInfoMenu->unk10);
sIQSkillInfoMenu->unk20 = 0;
@@ -99,8 +99,8 @@ static void sub_801C6E4(void)
sub_80073B8(sIQSkillInfoMenu->unk24);
preload = sIQSkillInfoMenu->unk10[sIQSkillInfoMenu->unk8];
strcpy(gAvailablePokemonNames, preload->pokeName);
xxx_format_and_draw(16, 0, sFmtPkmn0, sIQSkillInfoMenu->unk24, 0); // {ARG_POKEMON_0}
xxx_format_and_draw(4, 16, sIQSkillInfoMenu->unk10[sIQSkillInfoMenu->unk8]->unk4, sIQSkillInfoMenu->unk24, 0);
PrintFormatStringOnWindow(16, 0, sFmtPkmn0, sIQSkillInfoMenu->unk24, 0); // {ARG_POKEMON_0}
PrintFormatStringOnWindow(4, 16, sIQSkillInfoMenu->unk10[sIQSkillInfoMenu->unk8]->unk4, sIQSkillInfoMenu->unk24, 0);
sub_80073E0(sIQSkillInfoMenu->unk24);
break;
case 2:

View File

@@ -132,7 +132,7 @@ void BuildIQSkillList(void)
x = sIQSkillListMenu->s24.s0.input.unk1E * 8;
x2 = x;
x2 += 10;
xxx_call_draw_string(x2, 0, sIQSkills, sIQSkillListMenu->s24.s0.unk34, 0);
PrintStringOnWindow(x2, 0, sIQSkills, sIQSkillListMenu->s24.s0.unk34, 0);
x += 4;
x2 = x + sIQSkillListMenu->s24.unk9C.f2 * 8;
@@ -149,7 +149,7 @@ void BuildIQSkillList(void)
else
strcpy(gUnknown_202DEA8 - 80, sUnknown_80DBE18);
xxx_format_and_draw(12, y, sFmt01, sIQSkillListMenu->s24.s0.unk34, 0);
PrintFormatStringOnWindow(12, y, sFmt01, sIQSkillListMenu->s24.s0.unk34, 0);
}
sub_80073E0(sIQSkillListMenu->s24.s0.unk34);

View File

@@ -672,9 +672,9 @@ u32 sub_80913E0(Item* slot, u32 a2, struct subStruct_203B240 ** a3)
BufferItemName(gUnknown_202DE58, (u8)(slot->quantity + 125), NULL);
}
sub_80073B8(a2);
xxx_format_and_draw(16, 0, buffer88, a2, 0);
PrintFormatStringOnWindow(16, 0, buffer88, a2, 0);
xxx_format_and_draw(8, 24, GetItemDescription(slot->id), a2, 0);
PrintFormatStringOnWindow(8, 24, GetItemDescription(slot->id), a2, 0);
if (GetItemCategory(slot->id) == CATEGORY_TMS_HMS) {
Move *buffer8 = (Move*) (buffer88 + 80); // field in struct
u16 move = GetItemMoveID(slot->id);
@@ -684,13 +684,13 @@ u32 sub_80913E0(Item* slot, u32 a2, struct subStruct_203B240 ** a3)
InitPokemonMove(buffer8, move);
sub_80078A4(a2, 4, 82, 200, COLOR_WHITE_2);
xxx_format_and_draw(4, 84, gPtrTypeText, a2, 0);
PrintFormatStringOnWindow(4, 84, gPtrTypeText, a2, 0);
moves_data = GetMoveType(buffer8);
typestring = GetUnformattedTypeString(moves_data);
xxx_format_and_draw(64, 84, typestring, a2, 0);
PrintFormatStringOnWindow(64, 84, typestring, a2, 0);
result = GetMoveBasePP(buffer8);
gFormatData_202DE30 = result;
xxx_format_and_draw(128, 84, gPtrPPD0Text, a2, 0);
PrintFormatStringOnWindow(128, 84, gPtrPPD0Text, a2, 0);
}
sub_80073E0(a2);

View File

@@ -361,7 +361,7 @@ static void sub_8017598(void)
{
sub_8008C54(gKangaskhanStorageWork->unkA8.unk14);
sub_80073B8(gKangaskhanStorageWork->unkA8.unk14);
xxx_call_draw_string(4, 0, sNumber, gKangaskhanStorageWork->unkA8.unk14, 0);
PrintStringOnWindow(4, 0, sNumber, gKangaskhanStorageWork->unkA8.unk14, 0);
sub_8013C68(&gKangaskhanStorageWork->unkA8);
sub_80073E0(gKangaskhanStorageWork->unkA8.unk14);
sub_801CCD8();

View File

@@ -215,7 +215,7 @@ static void sub_8018280(void)
{
sub_8008C54(sUnknown_203B20C->unkC0.unk14);
sub_80073B8(sUnknown_203B20C->unkC0.unk14);
xxx_call_draw_string(4, 0, sNumber, sUnknown_203B20C->unkC0.unk14, 0);
PrintStringOnWindow(4, 0, sNumber, sUnknown_203B20C->unkC0.unk14, 0);
sub_8013C68(&sUnknown_203B20C->unkC0);
sub_80073E0(sUnknown_203B20C->unkC0.unk14);
sub_801CCD8();

View File

@@ -130,7 +130,7 @@ void sub_801A0D8(void)
sub_8008C54(gUnknown_203B214->s0.unk34);
sub_80073B8(gUnknown_203B214->s0.unk34);
xxx_call_draw_string((gUnknown_203B214->s0.input.unk1E * 8) + 10, 0, sGoods, gUnknown_203B214->s0.unk34, 0);
PrintStringOnWindow((gUnknown_203B214->s0.input.unk1E * 8) + 10, 0, sGoods, gUnknown_203B214->s0.unk34, 0);
for (index = 0; index < gUnknown_203B214->s0.input.unk1A; index++) {
temp_calc = (gUnknown_203B214->s0.input.unk1E * gUnknown_203B214->s0.input.unk1C) + index;
@@ -147,12 +147,12 @@ void sub_801A0D8(void)
if (buyPrice <= gTeamInventoryRef->teamMoney) {
y = sub_8013800(&gUnknown_203B214->s0.input, index);
xxx_call_draw_string(8, y, auStack204, gUnknown_203B214->s0.unk34, 0);
PrintStringOnWindow(8, y, auStack204, gUnknown_203B214->s0.unk34, 0);
}
else {
sprintfStatic(auStack112, sFmtRed, auStack204);
y = sub_8013800(&gUnknown_203B214->s0.input, index);
xxx_call_draw_string(8, y, auStack112, gUnknown_203B214->s0.unk34, 0);
PrintStringOnWindow(8, y, auStack112, gUnknown_203B214->s0.unk34, 0);
}
}

View File

@@ -131,7 +131,7 @@ void sub_801A4A4(void)
sub_8008C54(gUnknown_203B21C->s0.unk34);
sub_80073B8(gUnknown_203B21C->s0.unk34);
xxx_call_draw_string(gUnknown_203B21C->s0.input.unk1E * 8 + 10, 0, sGoods, gUnknown_203B21C->s0.unk34, 0);
PrintStringOnWindow(gUnknown_203B21C->s0.input.unk1E * 8 + 10, 0, sGoods, gUnknown_203B21C->s0.unk34, 0);
for (index = 0; index < gUnknown_203B21C->s0.input.unk1A; index++) {
temp_calc = (gUnknown_203B21C->s0.input.unk1E * gUnknown_203B21C->s0.input.unk1C) + index;
@@ -148,12 +148,12 @@ void sub_801A4A4(void)
if (buyPrice <= gTeamInventoryRef->teamMoney) {
y = sub_8013800(&gUnknown_203B21C->s0.input, index);
xxx_call_draw_string(8, y, buffer1, gUnknown_203B21C->s0.unk34, 0);
PrintStringOnWindow(8, y, buffer1, gUnknown_203B21C->s0.unk34, 0);
}
else {
sprintfStatic(buffer2, sFmtRed, buffer1);
y = sub_8013800(&gUnknown_203B21C->s0.input, index);
xxx_call_draw_string(8, y, buffer2, gUnknown_203B21C->s0.unk34, 0);
PrintStringOnWindow(8, y, buffer2, gUnknown_203B21C->s0.unk34, 0);
}
}

View File

@@ -197,9 +197,9 @@ void sub_801A9E0(void)
x = gUnknown_203B224->input.unk1E * 8 + 10;
if (gUnknown_203B224->input.unk1E == 0)
xxx_call_draw_string(x, 0, sTeamToolboxA, gUnknown_203B224->unk88, 0);
PrintStringOnWindow(x, 0, sTeamToolboxA, gUnknown_203B224->unk88, 0);
else
xxx_call_draw_string(x, 0, sTeamToolboxB, gUnknown_203B224->unk88, 0);
PrintStringOnWindow(x, 0, sTeamToolboxB, gUnknown_203B224->unk88, 0);
for (r7 = 0; r7 < gUnknown_203B224->input.unk1A; r7++) {
teamItemIndex = (gUnknown_203B224->input.unk1E * gUnknown_203B224->input.unk1C) + r7;
@@ -208,7 +208,7 @@ void sub_801A9E0(void)
switch (gUnknown_203B224->unk0) {
case 0: {
sub_8090E14(buf1, &item, 0);
xxx_call_draw_string(8, sub_8013800(&gUnknown_203B224->input, r7), buf1, gUnknown_203B224->unk88, 0);
PrintStringOnWindow(8, sub_8013800(&gUnknown_203B224->input, r7), buf1, gUnknown_203B224->unk88, 0);
break;
}
case 1:
@@ -221,7 +221,7 @@ void sub_801A9E0(void)
item.flags = 1;
sub_8090E14(buf1, &item, &thing);
xxx_call_draw_string(8, sub_8013800(&gUnknown_203B224->input, r7), buf1, gUnknown_203B224->unk88, 0);
PrintStringOnWindow(8, sub_8013800(&gUnknown_203B224->input, r7), buf1, gUnknown_203B224->unk88, 0);
break;
}
case 3: {
@@ -234,10 +234,10 @@ void sub_801A9E0(void)
sub_8090E14(buf1, &item, &thing);
if (gUnknown_203B224->unk4[teamItemIndex] != 0 || sub_801ADA0(teamItemIndex))
xxx_call_draw_string(8,sub_8013800(&gUnknown_203B224->input,r7), buf1, gUnknown_203B224->unk88, 0);
PrintStringOnWindow(8,sub_8013800(&gUnknown_203B224->input,r7), buf1, gUnknown_203B224->unk88, 0);
else {
strncpy(gUnknown_202DE58, buf1, 80);
xxx_format_and_draw(8, sub_8013800(&gUnknown_203B224->input, r7), sFmtMoveItem0, gUnknown_203B224->unk88, 0);
PrintFormatStringOnWindow(8, sub_8013800(&gUnknown_203B224->input, r7), sFmtMoveItem0, gUnknown_203B224->unk88, 0);
}
break;
}
@@ -255,15 +255,15 @@ void sub_801A9E0(void)
if (GetStackSellPrice(&item) + gTeamInventoryRef->teamMoney > MAX_TEAM_MONEY) {
sprintfStatic(buf2, sFmtRed, buf1);
xxx_call_draw_string(8, sub_8013800(&gUnknown_203B224->input, r7), buf2, gUnknown_203B224->unk88, 0);
PrintStringOnWindow(8, sub_8013800(&gUnknown_203B224->input, r7), buf2, gUnknown_203B224->unk88, 0);
}
else
xxx_call_draw_string(8, sub_8013800(&gUnknown_203B224->input, r7), buf1, gUnknown_203B224->unk88, 0);
PrintStringOnWindow(8, sub_8013800(&gUnknown_203B224->input, r7), buf1, gUnknown_203B224->unk88, 0);
}
else {
sub_8090E14(buf1, &item, 0);
strncpy(gUnknown_202DE58, buf1, 80);
xxx_format_and_draw(8, sub_8013800(&gUnknown_203B224->input, r7), sFmtMoveItem0, gUnknown_203B224->unk88, 0);
PrintFormatStringOnWindow(8, sub_8013800(&gUnknown_203B224->input, r7), sFmtMoveItem0, gUnknown_203B224->unk88, 0);
}
break;
}
@@ -278,10 +278,10 @@ void sub_801A9E0(void)
sub_8090E14(buf1, &item, &thing);
if (IsGummiItem(item.id))
xxx_call_draw_string(8, sub_8013800(&gUnknown_203B224->input, r7), buf1, gUnknown_203B224->unk88, 0);
PrintStringOnWindow(8, sub_8013800(&gUnknown_203B224->input, r7), buf1, gUnknown_203B224->unk88, 0);
else {
strncpy(gUnknown_202DE58, buf1, 80);
xxx_format_and_draw(8, sub_8013800(&gUnknown_203B224->input, r7), sFmtMoveItem0, gUnknown_203B224->unk88, 0);
PrintFormatStringOnWindow(8, sub_8013800(&gUnknown_203B224->input, r7), sFmtMoveItem0, gUnknown_203B224->unk88, 0);
}
break;
}
@@ -298,9 +298,9 @@ void sub_801AD34(u32 param_1)
{
sub_8008C54(param_1);
sub_80073B8(param_1);
xxx_call_draw_string(6, 0, sItems, param_1, 0);
PrintStringOnWindow(6, 0, sItems, param_1, 0);
sub_8012BC4(18, 13, GetNumberOfFilledInventorySlots(), 2, 7, param_1);
xxx_call_draw_string(22, 13, sSlash, param_1, 0);
PrintStringOnWindow(22, 13, sSlash, param_1, 0);
sub_8012BC4(43, 13, INVENTORY_SIZE, 2, 7, param_1);
sub_80073E0(param_1);
}

View File

@@ -268,12 +268,12 @@ void DrawLoadScreenText(void)
iVar2 = sub_8011FA8();
sub_8008C54(0);
sub_80073B8(0);
xxx_call_draw_string(8,0, gTeamHeadingText,0,0); // Team:
xxx_call_draw_string(8,12,gNameHeadingText,0,0); // Name:
xxx_call_draw_string(8,24,gLocationHeadingText,0,0); // Location:
xxx_call_draw_string(8,36,gPlayTimeHeadingText,0,0); // Play time:
xxx_call_draw_string(8,48,gAdventuresHeadingText,0,0); // Adventures:
xxx_call_draw_string(8,60,gHelperHeadingText,0,0); // Helper:
PrintStringOnWindow(8,0, gTeamHeadingText,0,0); // Team:
PrintStringOnWindow(8,12,gNameHeadingText,0,0); // Name:
PrintStringOnWindow(8,24,gLocationHeadingText,0,0); // Location:
PrintStringOnWindow(8,36,gPlayTimeHeadingText,0,0); // Play time:
PrintStringOnWindow(8,48,gAdventuresHeadingText,0,0); // Adventures:
PrintStringOnWindow(8,60,gHelperHeadingText,0,0); // Helper:
// Draw Team Name
if (sub_80023E4(0)) {
@@ -286,7 +286,7 @@ void DrawLoadScreenText(void)
}
sprintfStatic(gLoadScreen->formattedTeamName,gUnknown_80E7804,r2);
xxx_call_draw_string(64,0,gLoadScreen->formattedTeamName,0,0);
PrintStringOnWindow(64,0,gLoadScreen->formattedTeamName,0,0);
// Draw Player Name
playerInfo = GetPlayerPokemonStruct();
@@ -295,7 +295,7 @@ void DrawLoadScreenText(void)
else
sub_80922B4(playerName, playerInfo->name, POKEMON_NAME_LENGTH);
sprintfStatic(gLoadScreen->formattedPlayerName,gUnknown_80E7804,playerName);
xxx_call_draw_string(64,12,gLoadScreen->formattedPlayerName,0,0);
PrintStringOnWindow(64,12,gLoadScreen->formattedPlayerName,0,0);
// Draw Location Info
if ((CountMailType(WONDER_MAIL_TYPE_SOS) != 0) || (CountMailType(WONDER_MAIL_TYPE_OKD) != 0)) {
@@ -331,17 +331,17 @@ void DrawLoadScreenText(void)
break;
}
}
xxx_call_draw_string(64,24,gLoadScreen->formattedLocation,0,0);
PrintStringOnWindow(64,24,gLoadScreen->formattedLocation,0,0);
// Draw Play Time
DeconstructPlayTime(gPlayTimeRef,&hours,&minutes,&seconds);
sprintfStatic(gLoadScreen->formattedPlayTime,gPlayTimePlaceholder,hours,minutes,seconds);
xxx_call_draw_string(64,36,gLoadScreen->formattedPlayTime,0,0);
PrintStringOnWindow(64,36,gLoadScreen->formattedPlayTime,0,0);
// Draw Adventures Info
numAdventures = GetNumAdventures();
sprintfStatic(gLoadScreen->formattedAdventures,gNumAdventurePlaceholder,numAdventures); // %d
xxx_call_draw_string(64,48,gLoadScreen->formattedAdventures,0,0);
PrintStringOnWindow(64,48,gLoadScreen->formattedAdventures,0,0);
// Draw Helper Info
if (iVar2 == 0xf1207){
@@ -359,7 +359,7 @@ void DrawLoadScreenText(void)
print_helper_placeholder:
sprintfStatic(gLoadScreen->formattedHelperInfo,gNoHelperText); // -----
}
xxx_call_draw_string(64,60,gLoadScreen->formattedHelperInfo,0,0);
PrintStringOnWindow(64,60,gLoadScreen->formattedHelperInfo,0,0);
sub_80397B4(); // Draw event icons??
sub_80073E0(0);

View File

@@ -533,9 +533,9 @@ void CreateMailAcceptedStatusBox(u32 r0)
{
sub_8008C54(r0);
sub_80073B8(r0);
xxx_call_draw_string(3, 0, gMailAccepted, r0, 0);
PrintStringOnWindow(3, 0, gMailAccepted, r0, 0);
sub_8012BC4(0x12, 0xD, GetNumAcceptedJobs(), 2, 7, r0);
xxx_call_draw_string(0x16, 0xD, gUnknown_80E0324, r0, 0); // "/"
PrintStringOnWindow(0x16, 0xD, gUnknown_80E0324, r0, 0); // "/"
sub_8012BC4(0x23, 0xD, MAX_ACCEPTED_JOBS, 2, 7, r0);
sub_80073E0(r0);
}

View File

@@ -122,7 +122,7 @@ static void MakuhitaDojo_DrawCourseList(void)
sub_8008C54(sMakuhitaDojoWork2->s30.s0.unk34);
sub_80073B8(sMakuhitaDojoWork2->s30.s0.unk34);
xxx_call_draw_string(10, 0, sCourses, sMakuhitaDojoWork2->s30.s0.unk34, 0);
PrintStringOnWindow(10, 0, sCourses, sMakuhitaDojoWork2->s30.s0.unk34, 0);
sub_8012BC4((sMakuhitaDojoWork2->s30.unk9C.f2 * 8) + 4, 0, sMakuhitaDojoWork2->s30.s0.input.unk1E + 1, 2, 7, sMakuhitaDojoWork2->s30.s0.unk34);
for (i = 0; i < sMakuhitaDojoWork2->s30.s0.input.unk1A; i++) {
@@ -134,11 +134,11 @@ static void MakuhitaDojo_DrawCourseList(void)
y = sub_8013800(&sMakuhitaDojoWork2->s30.s0.input, i);
color = COLOR_WHITE_2; // COLOR_WHITE again?
if ((bool8)IsMazeCompleted(mazeIndex)) {
xxx_call_draw_string(8, y, sStarBullet, sMakuhitaDojoWork2->s30.s0.unk34, 0);
PrintStringOnWindow(8, y, sStarBullet, sMakuhitaDojoWork2->s30.s0.unk34, 0);
color = COLOR_GREEN;
}
sprintfStatic(buffer, sFmtColor, color, GetDungeonName1(dungeonIndex));
xxx_call_draw_string(16, y, buffer, sMakuhitaDojoWork2->s30.s0.unk34, 0);
PrintStringOnWindow(16, y, buffer, sMakuhitaDojoWork2->s30.s0.unk34, 0);
}
sub_80073E0(sMakuhitaDojoWork2->s30.s0.unk34);
}

View File

@@ -449,7 +449,7 @@ void sub_8012EBC(MenuStruct *param_1)
ptr_text2 = &textStack[index];
sub_8006518(textStack);
x = sub_8008ED0(param_1->unk0);
xxx_format_and_draw(((ptr_text2->unk14->f2 * 8 - x) / 2) + 8, 0, param_1->unk0, param_1->index, 0);
PrintFormatStringOnWindow(((ptr_text2->unk14->f2 * 8 - x) / 2) + 8, 0, param_1->unk0, param_1->index, 0);
}
colorArray = param_1->menuTextColorArray;
@@ -474,7 +474,7 @@ void sub_8012EBC(MenuStruct *param_1)
sprintfStatic(buffer,gUnknown_80D4828, color, textPtr);
y = sub_8013800(&param_1->input, counter);
xxx_format_and_draw(8, y, buffer, param_1->index, 0);
PrintFormatStringOnWindow(8, y, buffer, param_1->index, 0);
menuItemsPtr++;
counter++;
} while (menuItemsPtr->text != NULL);

View File

@@ -1419,7 +1419,7 @@ s32 unk_PrintMoveDescription(s32 x, Move *move, s32 a3, struct subStruct_203B240
sub_80073B8(a3);
sub_80928C0(gAvailablePokemonNames, move, 0);
xxx_format_and_draw(8 * x + 16, 0, gUnknown_8109930, a3, 0);
PrintFormatStringOnWindow(8 * x + 16, 0, gUnknown_8109930, a3, 0);
y = 19;
moveDescription = sMovesData[move->id].description;
@@ -1428,7 +1428,7 @@ s32 unk_PrintMoveDescription(s32 x, Move *move, s32 a3, struct subStruct_203B240
++moveDescription;
}
xxx_format_and_draw(4, y, moveDescription, a3, 0);
PrintFormatStringOnWindow(4, y, moveDescription, a3, 0);
unk_MovePrintData(move, a3);
sub_80073E0(a3);
strcpy(buffer, sMovesData[move->id].description);
@@ -1443,11 +1443,11 @@ static void unk_MovePrintData(Move *move, s32 y)
sub_80078A4(y, 4, 72, 200, COLOR_WHITE_2);
sub_8092D54(gAvailablePokemonNames, move);
xxx_format_and_draw(4, 74, gUnknown_810CF00, y, 0);
xxx_format_and_draw(4, 86, gPtrTypeText, y, 0);
PrintFormatStringOnWindow(4, 74, gUnknown_810CF00, y, 0);
PrintFormatStringOnWindow(4, 86, gPtrTypeText, y, 0);
type = GetMoveType(move);
text = GetUnformattedTypeString(type);
xxx_format_and_draw(64, 86, text, y, 0);
PrintFormatStringOnWindow(64, 86, text, y, 0);
power = GetMoveBasePower(move);
gFormatData_202DE30 = power;
}

View File

@@ -103,10 +103,10 @@ static void CreateOptionsMenu(void)
sub_8008C54(sUnknown_203B260->unk44);
sub_80073B8(sUnknown_203B260->unk44);
xxx_call_draw_string(16, 0, sGameOptions,sUnknown_203B260->unk44, 0);
PrintStringOnWindow(16, 0, sGameOptions,sUnknown_203B260->unk44, 0);
y = sub_8013800(&sUnknown_203B260->input, 0);
xxx_call_draw_string(8, y, sUnknown_80DC064, sUnknown_203B260->unk44, 0);
PrintStringOnWindow(8, y, sUnknown_80DC064, sUnknown_203B260->unk44, 0);
switch (sUnknown_203B260->optionsMenu->windowColor) {
case WINDOW_COLOR_BLUE:

View File

@@ -783,7 +783,7 @@ void sub_8026DAC(u32 r0, BulkItem *item)
temp.unk8 = 1;
slot.flags = ITEM_FLAG_EXISTS;
sub_8090E14(gUnknown_202DE58, &slot, &temp);
xxx_format_and_draw(4, 3, sPartyMenuItemPlaceholder, r0, 0);
PrintFormatStringOnWindow(4, 3, sPartyMenuItemPlaceholder, r0, 0);
sub_80073E0(r0);
}
@@ -799,7 +799,7 @@ void sub_8026E08(u32 r0)
sub_808D930(buffer, sUnknown_203B2B8->pokeStruct->speciesNum);
sprintfStatic(buffer1, sUnknown_80DD6E0, gAvailablePokemonNames);
x = sub_8008ED0(buffer1);
xxx_call_draw_string(((sUnknown_80DD370.unkC << 3) - x) / 2, 3, buffer1, r0, 0);
PrintStringOnWindow(((sUnknown_80DD370.unkC << 3) - x) / 2, 3, buffer1, r0, 0);
sub_80073E0(r0);
}

View File

@@ -437,9 +437,9 @@ void CreatePelipperAcceptedStatusBox(u32 r0)
{
sub_8008C54(r0);
sub_80073B8(r0);
xxx_call_draw_string(3, 0, gPelipperBoard_Accepted, r0, 0);
PrintStringOnWindow(3, 0, gPelipperBoard_Accepted, r0, 0);
sub_8012BC4(0x12, 0xD, GetNumAcceptedJobs(), 2, 7, r0);
xxx_call_draw_string(0x16, 0xD, gPelipperStatusSlash, r0, 0); // "/"
PrintStringOnWindow(0x16, 0xD, gPelipperStatusSlash, r0, 0); // "/"
sub_8012BC4(0x23, 0xD, MAX_ACCEPTED_JOBS, 2, 7, r0);
sub_80073E0(r0);
}

View File

@@ -127,13 +127,13 @@ static void RedrawPartnerSelectionMenu(void)
sub_8008C54(gUnknown_203B404->s18.s0.unk34);
sub_80073B8(gUnknown_203B404->s18.s0.unk34);
xxx_call_draw_string(12, 0, gPartnerSelectionHeaderText, gUnknown_203B404->s18.s0.unk34, 0);
PrintStringOnWindow(12, 0, gPartnerSelectionHeaderText, gUnknown_203B404->s18.s0.unk34, 0);
monCounter = 0;
while (monCounter < gUnknown_203B404->s18.s0.input.unk1A) {
yCoord = sub_8013800(&gUnknown_203B404->s18.s0.input, monCounter);
monName = GetMonSpecies(gUnknown_203B404->PartnerArray[monCounter]);
xxx_call_draw_string(8, yCoord, monName, gUnknown_203B404->s18.s0.unk34, 0);
PrintStringOnWindow(8, yCoord, monName, gUnknown_203B404->s18.s0.unk34, 0);
monCounter++;
}
sub_80073E0(gUnknown_203B404->s18.s0.unk34);
@@ -190,7 +190,7 @@ static void RedrawPartnerSelectionMenu(void)
"\tstr r4, [sp]\n"
"\tmovs r0, 0xC\n"
"\tmovs r1, 0\n"
"\tbl xxx_call_draw_string\n"
"\tbl PrintStringOnWindow\n"
"\tmovs r5, 0\n"
"\tb _0803CF98\n"
"\t.align 2, 0\n"
@@ -216,7 +216,7 @@ static void RedrawPartnerSelectionMenu(void)
"\tstr r0, [sp]\n"
"\tmovs r0, 0x8\n"
"\tadds r1, r4, 0\n"
"\tbl xxx_call_draw_string\n"
"\tbl PrintStringOnWindow\n"
"\tadds r5, 0x1\n"
"_0803CF98:\n"
"\tldr r0, [r6]\n"

View File

@@ -26,7 +26,7 @@ extern u8 gAvailablePokemonNames[]; // 202DF98
void sub_803B6B0(s32 x, s32 y, u8 index, u32 a3)
{
xxx_call_draw_string(x, y, sUnknown_80E8B94[index], a3, 0);
PrintStringOnWindow(x, y, sUnknown_80E8B94[index], a3, 0);
}
void CreateRescueTitle(unkStruct_802C39C *param_1)
@@ -41,46 +41,46 @@ void CreateRescueTitle(unkStruct_802C39C *param_1)
switch (param_1->mailTitleType) {
case 3:
xxx_call_draw_string(21, param_1->y, param_1->unk4C, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, param_1->unk4C, param_1->unk0[0], 0);
break;
case 0:
xxx_call_draw_string(21, param_1->y, gMankeyMission, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, gMankeyMission, param_1->unk0[0], 0);
break;
case 1:
xxx_call_draw_string(21, param_1->y, gSmeargleMission, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, gSmeargleMission, param_1->unk0[0], 0);
break;
case 2:
xxx_call_draw_string(21, param_1->y, gMedichamMission, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, gMedichamMission, param_1->unk0[0], 0);
break;
case 7:
PrintYellowDungeonNametoBuffer(buf_1, &param_1->unk8->dungeon);
xxx_call_draw_string(21, param_1->y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
case 12:
BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8830, gUnknown_202DE58);
xxx_call_draw_string(21, param_1->y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
case 11:
BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8848, gUnknown_202DE58);
xxx_call_draw_string(21, param_1->y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
case 4:
xxx_call_draw_string(21, param_1->y, gUnknown_80E885C, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, gUnknown_80E885C, param_1->unk0[0], 0);
break;
case 5:
xxx_call_draw_string(21, param_1->y, gUnknown_80E9F8C[param_1->unk0[1]].headline, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, gUnknown_80E9F8C[param_1->unk0[1]].headline, param_1->unk0[0], 0);
break;
case 6:
xxx_call_draw_string(21, param_1->y, gUnknown_80E886C, param_1->unk0[0],0);
PrintStringOnWindow(21, param_1->y, gUnknown_80E886C, param_1->unk0[0],0);
break;
case 10: {
u8 bVar2 = param_1->unk8->seed + param_1->unk8->dungeon.id;
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gAvailablePokemonNames, monName);
sprintfStatic(buf_1, gUnknown_80EAE5C[bVar2 % 4], gAvailablePokemonNames);
xxx_call_draw_string(21, param_1->y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
}
case 9: {
@@ -88,7 +88,7 @@ void CreateRescueTitle(unkStruct_802C39C *param_1)
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gAvailablePokemonNames, monName);
sprintfStatic(buf_1, gUnknown_80E910C[bVar2 % 10], gAvailablePokemonNames);
xxx_call_draw_string(21, param_1->y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
}
default: {
@@ -96,17 +96,17 @@ void CreateRescueTitle(unkStruct_802C39C *param_1)
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gAvailablePokemonNames, monName);
sprintfStatic(buf_1, gUnknown_80E8C98[bVar2 % 15], gAvailablePokemonNames);
xxx_call_draw_string(21, param_1->y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
}
}
if (param_1->mailTitleType == 7) {
if (param_1->playerName == NULL)
xxx_call_draw_string(178 - sub_8016028(), param_1->y, GetMonSpecies(param_1->clientSpecies), param_1->unk0[0], 0);
PrintStringOnWindow(178 - sub_8016028(), param_1->y, GetMonSpecies(param_1->clientSpecies), param_1->unk0[0], 0);
else {
sub_80922B4(buf_2, param_1->playerName, POKEMON_NAME_LENGTH);
xxx_call_draw_string(178 - sub_8016028(), param_1->y, buf_2, param_1->unk0[0], 0);
PrintStringOnWindow(178 - sub_8016028(), param_1->y, buf_2, param_1->unk0[0], 0);
}
}
else {
@@ -117,7 +117,7 @@ void CreateRescueTitle(unkStruct_802C39C *param_1)
else
PrintDungeonLocationtoBuffer(buf_1, &param_1->unk8->dungeon);
xxx_call_draw_string(29, param_1->y + 12, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(29, param_1->y + 12, buf_1, param_1->unk0[0], 0);
}
if (param_1->mailTitleType == 7)
@@ -125,7 +125,7 @@ void CreateRescueTitle(unkStruct_802C39C *param_1)
else
uVar1 = sub_803C1D0(&param_1->unk8->dungeon, param_1->mail->missionType);
xxx_call_draw_string(180, param_1->y, sub_803C1F0(uVar1), param_1->unk0[0], 0);
PrintStringOnWindow(180, param_1->y, sub_803C1F0(uVar1), param_1->unk0[0], 0);
}
void CreateRescueDescription(unkStruct_802C39C *param_1)
@@ -145,50 +145,50 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
y = 0;
xxx_call_draw_string(10, y, gUnknown_80E888C, param_1->unk0[0], 0);
xxx_call_draw_string(108, y, sUnknown_80E8BCC[param_1->mailStatus], param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gUnknown_80E888C, param_1->unk0[0], 0);
PrintStringOnWindow(108, y, sUnknown_80E8BCC[param_1->mailStatus], param_1->unk0[0], 0);
y += 16;
switch (param_1->mailDescriptionType) {
case 3:
xxx_call_draw_string(10, y, param_1->unk50, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, param_1->unk50, param_1->unk0[0], 0);
break;
case 0:
xxx_call_draw_string(10, y, gMankeyMissionDescription, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gMankeyMissionDescription, param_1->unk0[0], 0);
break;
case 1:
xxx_call_draw_string(10, y, gSmeargleMissionDescription, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gSmeargleMissionDescription, param_1->unk0[0], 0);
break;
case 2:
xxx_call_draw_string(10, y, gMedichamMissionDescription, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gMedichamMissionDescription, param_1->unk0[0], 0);
break;
case 4:
BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8968, gUnknown_202DE58);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
break;
case 5:
BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E89B0, gUnknown_202DE58);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
break;
case 6:
xxx_call_draw_string(10, y, gUnknown_80E9920[param_1->unk0[1]].text, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gUnknown_80E9920[param_1->unk0[1]].text, param_1->unk0[0], 0);
break;
case 7:
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gAvailablePokemonNames, monName);
sprintfStatic(buf_1, gUnknown_80E9F8C[param_1->unk0[1]].text, gAvailablePokemonNames, gAvailablePokemonNames);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
break;
case 9:
xxx_call_draw_string(10, y, gUnknown_80E89FC, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gUnknown_80E89FC, param_1->unk0[0], 0);
break;
case 10:
xxx_call_draw_string(10, y, gUnknown_80E8A40, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gUnknown_80E8A40, param_1->unk0[0], 0);
break;
case 11:
xxx_call_draw_string(10, y, gUnknown_80E8A7C, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gUnknown_80E8A7C, param_1->unk0[0], 0);
break;
case 15:
case 16: {
@@ -196,11 +196,11 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
u8 bVar3 = param_1->unk8->seed + param_1->unk8->dungeon.floor;
BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80EB3F8[bVar2 % 22], gUnknown_202DE58);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y += 12;
sprintfStatic(buf_1, gUnknown_80EB72C[bVar3 % 22], gUnknown_202DE58);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y -= 12;
break;
}
@@ -210,11 +210,11 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gAvailablePokemonNames, monName);
sprintfStatic(buf_1, gUnknown_80EAEB8[bVar2 % 20], gAvailablePokemonNames);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y += 12;
sprintfStatic(buf_1, gUnknown_80EB198[bVar3 % 4], gAvailablePokemonNames);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y -= 12;
break;
}
@@ -224,11 +224,11 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gAvailablePokemonNames, monName);
sprintfStatic(buf_1, gUnknown_80EB220[bVar2 % 6], gAvailablePokemonNames);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y += 12;
sprintfStatic(buf_1, gUnknown_80EB2F0[bVar3 % 6], gAvailablePokemonNames);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y -= 12;
break;
}
@@ -238,11 +238,11 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gAvailablePokemonNames, monName);
sprintfStatic(buf_1, gUnknown_80E91D4[bVar2 % 45], gAvailablePokemonNames);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y += 12;
sprintfStatic(buf_1, gUnknown_80E9820[bVar3 % 10], gAvailablePokemonNames);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y -= 12;
break;
}
@@ -252,68 +252,68 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
monName = GetMonSpecies(param_1->clientSpecies);
strcpy(gAvailablePokemonNames, monName);
sprintfStatic(buf_1, gUnknown_80E8DE4[bVar2 % 13], gAvailablePokemonNames);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y += 12;
sprintfStatic(buf_1, gUnknown_80E8FB0[bVar3 % 13], gAvailablePokemonNames);
xxx_call_draw_string(10, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y -= 12;
break;
}
}
y += 28;
xxx_call_draw_string(10, y, gUnknown_80E8AC8, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gUnknown_80E8AC8, param_1->unk0[0], 0);
if (param_1->playerName == NULL)
xxx_call_draw_string(68, y, GetMonSpecies(param_1->clientSpecies), param_1->unk0[0], 0);
PrintStringOnWindow(68, y, GetMonSpecies(param_1->clientSpecies), param_1->unk0[0], 0);
else {
sub_80922B4(buf_3, param_1->playerName, POKEMON_NAME_LENGTH);
sub_808D930(buf_4, param_1->clientSpecies);
sprintfStatic(buf_2, gUnknown_80E8AD0, buf_3, buf_4);
xxx_call_draw_string(68, y, buf_2, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, buf_2, param_1->unk0[0], 0);
}
y += 12;
xxx_call_draw_string(10, y, gUnknown_80E8AE0, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gUnknown_80E8AE0, param_1->unk0[0], 0);
switch (param_1->mailMissionType) {
case MISSION_TYPE_FRIEND_RESCUE:
xxx_call_draw_string(68, y, gUnknown_80E8AEC, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, gUnknown_80E8AEC, param_1->unk0[0], 0);
break;
case MISSION_TYPE_DELIVER_ITEM:
BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8AFC, gUnknown_202DE58);
xxx_call_draw_string(68, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case MISSION_TYPE_FIND_ITEM:
BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8B10, gUnknown_202DE58);
xxx_call_draw_string(68, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case MISSION_TYPE_RESCUE_CLIENT:
xxx_call_draw_string(68, y, gUnknown_80E8B20, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, gUnknown_80E8B20, param_1->unk0[0], 0);
break;
case MISSION_TYPE_ESCORT_CLIENT:
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gAvailablePokemonNames, monName);
sprintfStatic(buf_1, gUnknown_80E8B2C, gAvailablePokemonNames);
xxx_call_draw_string(68, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case MISSION_TYPE_RESCUE_TARGET:
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gAvailablePokemonNames, monName);
sprintfStatic(buf_1, gUnknown_80E8B40, gAvailablePokemonNames);
xxx_call_draw_string(68, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case MISSION_TYPE_SPECIAL_MISSION:
default:
xxx_call_draw_string(68, y, gSpecialMissionText, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, gSpecialMissionText, param_1->unk0[0], 0);
break;
}
y += 12;
xxx_call_draw_string(10, y, gPlaceText, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gPlaceText, param_1->unk0[0], 0);
if (param_1->mailMissionType == MISSION_TYPE_FIND_ITEM) {
PrintDungeonLocationtoBuffer(buf_5, &param_1->unk8->dungeon);
@@ -322,7 +322,7 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
else
PrintDungeonLocationtoBuffer(buf_1, &param_1->unk8->dungeon);
xxx_call_draw_string(68, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
if (param_1->mailMissionType == MISSION_TYPE_FRIEND_RESCUE)
uVar3 = sub_803C1D0(&param_1->unk8->dungeon, 0);
@@ -330,39 +330,39 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
uVar3 = sub_803C1D0(&param_1->unk8->dungeon, param_1->mail->missionType);
y += 12;
xxx_call_draw_string(10, y, gDifficultyText, param_1->unk0[0], 0);
xxx_call_draw_string(68, y, sub_803C1F0(uVar3), param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gDifficultyText, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, sub_803C1F0(uVar3), param_1->unk0[0], 0);
y += 12;
xxx_call_draw_string(10, y, gRewardText, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gRewardText, param_1->unk0[0], 0);
switch (param_1->rewardType) {
case MONEY:
sprintfStatic(buf_1, gMissionRewardText[param_1->rewardType], param_1->unk30);
xxx_call_draw_string(68, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case MONEY_EXTRA:
sprintfStatic(buf_1, gMissionRewardText[param_1->rewardType], param_1->unk30);
xxx_call_draw_string(68, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case ITEM: // Item
case ITEM_EXTRA: // Item + ?
BufferItemName(gUnknown_202DE58, param_1->rewardItem, NULL);
sprintfStatic(buf_1, gMissionRewardText[param_1->rewardType], gUnknown_202DE58);
xxx_call_draw_string(68, y, buf_1, param_1->unk0[0], 0);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case 4: // Friend Area
xxx_call_draw_string(68, y, gMissionRewardText[param_1->rewardType], param_1->unk0[0], 0);
PrintStringOnWindow(68, y, gMissionRewardText[param_1->rewardType], param_1->unk0[0], 0);
break;
default:
xxx_call_draw_string(68, y, gMissionRewardText[param_1->rewardType], param_1->unk0[0], 0);
PrintStringOnWindow(68, y, gMissionRewardText[param_1->rewardType], param_1->unk0[0], 0);
break;
}
// Draw the Password
y += 12;
if ((2 < (u8)(param_1->mailDescriptionType - 9)) && param_1->mailDescriptionType != 3 && param_1->mail->mailType == 5) {
xxx_call_draw_string(10, y, gUnknown_80E8B7C, param_1->unk0[0], 0);
PrintStringOnWindow(10, y, gUnknown_80E8B7C, param_1->unk0[0], 0);
sub_803D414(local_34, param_1->mail);
for (counter = 0; counter < 24; counter++) {

View File

@@ -135,7 +135,7 @@ static void CreatePKMNNewsMenu(void)
sub_8008C54(sUnknown_203B2CC->s38.unk34);
sub_80073B8(sUnknown_203B2CC->s38.unk34);
xxx_call_draw_string(10, 0, sNewsList, sUnknown_203B2CC->s38.unk34, 0);
PrintStringOnWindow(10, 0, sNewsList, sUnknown_203B2CC->s38.unk34, 0);
sub_8012BC4((sUnknown_80DFBE8.f2 * 8) + 4, 0, sUnknown_203B2CC->s38.input.unk1E + 1, 2, 7, sUnknown_203B2CC->s38.unk34);
@@ -145,7 +145,7 @@ static void CreatePKMNNewsMenu(void)
mailIndex = sUnknown_203B2CC->receivedNewsletters[new_index];
sub_803B6B0(10, y, 6, sUnknown_203B2CC->s38.unk34);
sub_802BC7C();
xxx_format_and_draw(21, y, GetPokemonMailHeadline(mailIndex), sUnknown_203B2CC->s38.unk34, 0);
PrintFormatStringOnWindow(21, y, GetPokemonMailHeadline(mailIndex), sUnknown_203B2CC->s38.unk34, 0);
}
sub_80073E0(sUnknown_203B2CC->s38.unk34);

View File

@@ -86,8 +86,8 @@ static void sub_802BB28(void)
case 1:
sub_8008C54(sUnknown_203B2D4->unk24);
sub_80073B8(sUnknown_203B2D4->unk24);
xxx_format_and_draw(10, 0, GetPokemonMailHeadline(sUnknown_203B2D4->currMailIndex), sUnknown_203B2D4->unk24, 0);
xxx_format_and_draw(6, 20, sUnknown_203B2D4->unk10[sUnknown_203B2D4->unk8], sUnknown_203B2D4->unk24, 0);
PrintFormatStringOnWindow(10, 0, GetPokemonMailHeadline(sUnknown_203B2D4->currMailIndex), sUnknown_203B2D4->unk24, 0);
PrintFormatStringOnWindow(6, 20, sUnknown_203B2D4->unk10[sUnknown_203B2D4->unk8], sUnknown_203B2D4->unk24, 0);
sub_80073E0(sUnknown_203B2D4->unk24);
sUnknown_203B2D4->unk8++;
break;

View File

@@ -184,7 +184,7 @@ void CreateMailMenu(void)
sub_8008C54(sUnknown_203B2D8->unk38);
sub_80073B8(sUnknown_203B2D8->unk38);
xxx_call_draw_string((sUnknown_203B2D8->input.unk1E * 8) + 10, 0, sMailbox, sUnknown_203B2D8->unk38, 0);
PrintStringOnWindow((sUnknown_203B2D8->input.unk1E * 8) + 10, 0, sMailbox, sUnknown_203B2D8->unk38, 0);
for (i = 0; i < sUnknown_203B2D8->input.unk1A; i++) {
mail = GetMailboxSlotInfo(sUnknown_203B2D8->unk0[(sUnknown_203B2D8->input.unk1E * sUnknown_203B2D8->input.unk1C) + i]);
@@ -196,7 +196,7 @@ void CreateMailMenu(void)
sub_803B6B0(10, y, 6, sUnknown_203B2D8->unk38);
PrintPokeNameToBuffer(gAvailablePokemonNames, GetPlayerPokemonStruct());
sprintfStatic(buffer, GetPokemonMailHeadline(mail->unk4.dungeon.floor), gAvailablePokemonNames);
xxx_call_draw_string(21, y, buffer, sUnknown_203B2D8->unk38, 0);
PrintStringOnWindow(21, y, buffer, sUnknown_203B2D8->unk38, 0);
}
else {
sub_803B35C(mail, &local);

View File

@@ -110,7 +110,7 @@ static void DisplayMissionObjectives(void)
sub_80073B8(sUnknown_203B330->unk10);
// Objectives
xxx_call_draw_string(10, 0, sObjectives, sUnknown_203B330->unk10, 0);
PrintStringOnWindow(10, 0, sObjectives, sUnknown_203B330->unk10, 0);
switch (sUnknown_203B330->unkC) {
case 1:
@@ -119,14 +119,14 @@ static void DisplayMissionObjectives(void)
sub_803B6B0(10, 16, 3, sUnknown_203B330->unk10);
// %dF
sprintfStatic(buffer,sFmt1,mail->unk4.dungeon.floor);
xxx_call_draw_string(21,16,buffer,sUnknown_203B330->unk10,0);
PrintStringOnWindow(21,16,buffer,sUnknown_203B330->unk10,0);
// Rescue #C6%s#R
sprintfStatic(buffer,sFmtRescue,GetMonSpecies(mail->clientSpecies));
xxx_call_draw_string(40, 16, buffer, sUnknown_203B330->unk10, 0);
PrintStringOnWindow(40, 16, buffer, sUnknown_203B330->unk10, 0);
break;
case 2:
if (CountJobsinDungeon(sUnknown_203B330->dungeonIndex) == 0)
xxx_call_draw_string(10, 16, sJustGo, sUnknown_203B330->unk10, 0);
PrintStringOnWindow(10, 16, sJustGo, sUnknown_203B330->unk10, 0);
else {
yCoord = 16;
@@ -142,27 +142,27 @@ static void DisplayMissionObjectives(void)
if (jobInfo->missionType != WONDER_MAIL_MISSION_TYPE_FIND_ITEM) {
sprintfStatic(buffer1, sFmt1, jobInfo->unk4.dungeon.floor);
xxx_call_draw_string(21, yCoord, buffer1, sUnknown_203B330->unk10, 0);
PrintStringOnWindow(21, yCoord, buffer1, sUnknown_203B330->unk10, 0);
}
switch (jobInfo->missionType) {
case WONDER_MAIL_MISSION_TYPE_DELIVER_ITEM:
BufferItemName(gUnknown_202DE58, jobInfo->targetItem, NULL);
sprintfStatic(buffer1, sFmtBring, gUnknown_202DE58);
xxx_call_draw_string(40, yCoord, buffer1, sUnknown_203B330->unk10, 0);
PrintStringOnWindow(40, yCoord, buffer1, sUnknown_203B330->unk10, 0);
break;
case WONDER_MAIL_MISSION_TYPE_FIND_ITEM:
BufferItemName(gUnknown_202DE58, jobInfo->targetItem, NULL);
sprintfStatic(buffer1, sFmtFind, gUnknown_202DE58);
xxx_call_draw_string(40, yCoord, buffer1, sUnknown_203B330->unk10, 0);
PrintStringOnWindow(40, yCoord, buffer1, sUnknown_203B330->unk10, 0);
break;
case WONDER_MAIL_MISSION_TYPE_ESCORT_CLIENT:
sprintfStatic(buffer1, sFmtEscort, GetMonSpecies(jobInfo->targetSpecies));
xxx_call_draw_string(40, yCoord, buffer1, sUnknown_203B330->unk10, 0);
PrintStringOnWindow(40, yCoord, buffer1, sUnknown_203B330->unk10, 0);
break;
default:
sprintfStatic(buffer1, sFmtRescue, GetMonSpecies(jobInfo->targetSpecies));
xxx_call_draw_string(40, yCoord, buffer1, sUnknown_203B330->unk10, 0);
PrintStringOnWindow(40, yCoord, buffer1, sUnknown_203B330->unk10, 0);
break;
}
@@ -175,11 +175,11 @@ static void DisplayMissionObjectives(void)
case 0:
default:
if (sub_80992E0(&auStack44, &missionIndex) != 0)
xxx_call_draw_string(10, 16, GetCurrentMissionText(missionIndex), sUnknown_203B330->unk10, 0);
PrintStringOnWindow(10, 16, GetCurrentMissionText(missionIndex), sUnknown_203B330->unk10, 0);
else if (sub_8099360(&local_test) != 0)
xxx_call_draw_string(10, 16, sub_80975DC(sub_80A2688(local_test)), sUnknown_203B330->unk10, 0);
PrintStringOnWindow(10, 16, sub_80975DC(sub_80A2688(local_test)), sUnknown_203B330->unk10, 0);
else
xxx_call_draw_string(10, 16, sRedQuestionMarks, sUnknown_203B330->unk10, 0);
PrintStringOnWindow(10, 16, sRedQuestionMarks, sUnknown_203B330->unk10, 0);
break;
}

View File

@@ -668,7 +668,7 @@ void sub_8036F30(void)
uVar1 = sTradeItemsMenu->unk14.unk14;
sub_8008C54(uVar1);
sub_80073B8(uVar1);
xxx_call_draw_string(2, 0, sHowMany, uVar1, 0);
PrintStringOnWindow(2, 0, sHowMany, uVar1, 0);
sub_8013C68(&sTradeItemsMenu->unk14);
sub_80073E0(uVar1);
}

View File

@@ -133,7 +133,7 @@ void sub_8021494(void)
sub_8008C54(sWigglytuffShop1Work->s40.s0.unk34);
sub_80073B8(sWigglytuffShop1Work->s40.s0.unk34);
xxx_call_draw_string(10, 0, sFriendAreas, sWigglytuffShop1Work->s40.s0.unk34, 0);
PrintStringOnWindow(10, 0, sFriendAreas, sWigglytuffShop1Work->s40.s0.unk34, 0);
sub_8012BC4((sWigglytuffShop1Work->s40.unk9C.f2 * 8) + 4, 0, sWigglytuffShop1Work->s40.s0.input.unk1E + 1, 1, 7, sWigglytuffShop1Work->s40.s0.unk34);
@@ -144,22 +144,22 @@ void sub_8021494(void)
sub_8092578(buffer1, friendAreaIndex, TRUE);
if (GetFriendAreaPrice(friendAreaIndex) <= gTeamInventoryRef->teamMoney)
xxx_call_draw_string(8,sub_8013800(&sWigglytuffShop1Work->s40.s0.input, i), buffer1, sWigglytuffShop1Work->s40.s0.unk34, 0);
PrintStringOnWindow(8,sub_8013800(&sWigglytuffShop1Work->s40.s0.input, i), buffer1, sWigglytuffShop1Work->s40.s0.unk34, 0);
else {
sprintfStatic(buffer2, sFmtRedString, buffer1);
xxx_call_draw_string(8, sub_8013800(&sWigglytuffShop1Work->s40.s0.input, i), buffer2, sWigglytuffShop1Work->s40.s0.unk34, 0);
PrintStringOnWindow(8, sub_8013800(&sWigglytuffShop1Work->s40.s0.input, i), buffer2, sWigglytuffShop1Work->s40.s0.unk34, 0);
}
}
else if (sWigglytuffShop1Work->mode == 0) {
if (gFriendAreas[friendAreaIndex] == TRUE)
xxx_call_draw_string(8, sub_8013800(&sWigglytuffShop1Work->s40.s0.input, i), GetFriendAreaName(friendAreaIndex), sWigglytuffShop1Work->s40.s0.unk34, 0);
PrintStringOnWindow(8, sub_8013800(&sWigglytuffShop1Work->s40.s0.input, i), GetFriendAreaName(friendAreaIndex), sWigglytuffShop1Work->s40.s0.unk34, 0);
else {
sprintfStatic(buffer2, sFmtGreenString, GetFriendAreaName(friendAreaIndex));
xxx_call_draw_string(8, sub_8013800(&sWigglytuffShop1Work->s40.s0.input, i), buffer2, sWigglytuffShop1Work->s40.s0.unk34, 0);
PrintStringOnWindow(8, sub_8013800(&sWigglytuffShop1Work->s40.s0.input, i), buffer2, sWigglytuffShop1Work->s40.s0.unk34, 0);
}
}
else
xxx_call_draw_string(8, sub_8013800(&sWigglytuffShop1Work->s40.s0.input, i), GetFriendAreaName(friendAreaIndex), sWigglytuffShop1Work->s40.s0.unk34, 0);
PrintStringOnWindow(8, sub_8013800(&sWigglytuffShop1Work->s40.s0.input, i), GetFriendAreaName(friendAreaIndex), sWigglytuffShop1Work->s40.s0.unk34, 0);
}
sub_80073E0(sWigglytuffShop1Work->s40.s0.unk34);

View File

@@ -87,15 +87,15 @@ static void PopulateWigglytuffShopFriendAreaInfoScreen(void)
sub_80073B8(sWigglytuffShop2Work->unk74);
sub_8092578(buffer1, sWigglytuffShop2Work->friendArea, FALSE);
xxx_call_draw_string(20, 0, buffer1, sWigglytuffShop2Work->unk74, 0);
PrintStringOnWindow(20, 0, buffer1, sWigglytuffShop2Work->unk74, 0);
string = GetFriendAreaDescription(sWigglytuffShop2Work->friendArea);
xxx_call_draw_string(10, 20, string, sWigglytuffShop2Work->unk74, 0);
PrintStringOnWindow(10, 20, string, sWigglytuffShop2Work->unk74, 0);
if (sWigglytuffShop2Work->unkD != 0)
xxx_call_draw_string(32, 60, sUnknown_80DC4F0, sWigglytuffShop2Work->unk74, 0);
PrintStringOnWindow(32, 60, sUnknown_80DC4F0, sWigglytuffShop2Work->unk74, 0);
else
xxx_call_draw_string(32, 60, sInhabitants, sWigglytuffShop2Work->unk74, 0);
PrintStringOnWindow(32, 60, sInhabitants, sWigglytuffShop2Work->unk74, 0);
sub_800792C(sWigglytuffShop2Work->unk74, 4, 64, 20, 4);
@@ -115,14 +115,14 @@ static void PopulateWigglytuffShopFriendAreaInfoScreen(void)
switch (sWigglytuffShop2Work->pokemonStatus[i]) {
case POKEMON_UNKNOWN:
xxx_call_draw_string(x, y, gCommonTripleQuestionMark[0], sWigglytuffShop2Work->unk74, 0);
PrintStringOnWindow(x, y, gCommonTripleQuestionMark[0], sWigglytuffShop2Work->unk74, 0);
break;
case POKEMON_SEEN:
xxx_call_draw_string(x, y, buffer2, sWigglytuffShop2Work->unk74, 0);
PrintStringOnWindow(x, y, buffer2, sWigglytuffShop2Work->unk74, 0);
break;
case POKEMON_RECRUITED:
sprintfStatic(buffer1, sFmtCyanString, buffer2);
xxx_call_draw_string(x, y, buffer1, sWigglytuffShop2Work->unk74, 0);
PrintStringOnWindow(x, y, buffer1, sWigglytuffShop2Work->unk74, 0);
break;
}
}

View File

@@ -194,7 +194,7 @@ void sub_803092C(void)
r4 = gUnknown_203B320->s28.s0.input.unk1E * 8;
r5 = r4;
r5 += 10;
xxx_call_draw_string(r5,0,gUnknown_80E086C[gUnknown_203B320->wonderMailType],gUnknown_203B320->s28.s0.unk34,0);
PrintStringOnWindow(r5,0,gUnknown_80E086C[gUnknown_203B320->wonderMailType],gUnknown_203B320->s28.s0.unk34,0);
r4 += 4;
r5 = r4 + gUnknown_203B320->s28.unk9C.f2 * 8;
sub_8012BC4(r5,0,gUnknown_203B320->s28.s0.input.unk1E + 1,1,7,gUnknown_203B320->s28.s0.unk34);

View File

@@ -150,8 +150,8 @@ void sub_8030E48(void)
}
CreateRescueDescription(&stack);
uVar2 = mail->unk10.unk10_u16 % 10000;
xxx_call_draw_string(10,0x68,gUnknown_80E0934,gUnknown_203B324->unk10,0); // ID:
PrintStringOnWindow(10,0x68,gUnknown_80E0934,gUnknown_203B324->unk10,0); // ID:
sprintfStatic(buffer,gUnknown_80E0938,uVar2); // %-4d
xxx_call_draw_string(0x44,0x68,buffer,gUnknown_203B324->unk10,0);
PrintStringOnWindow(0x44,0x68,buffer,gUnknown_203B324->unk10,0);
sub_80073E0(gUnknown_203B324->unk10);
}

View File

@@ -181,7 +181,7 @@ void DrawPelipperBoardJobMenu(void)
iVar4 = gUnknown_203B2E0->input.unk1E * 8;
x = iVar4;
x += 10;
xxx_call_draw_string(x, 0, sBulletinBoard, gUnknown_203B2E0->unk3C, 0);
PrintStringOnWindow(x, 0, sBulletinBoard, gUnknown_203B2E0->unk3C, 0);
iVar4 += 4;
x = iVar4 + (gUnknown_203B2E0->unkA4.f2 * 8);

View File

@@ -179,7 +179,7 @@ void DrawJobListMenu(void)
r4 = gUnknown_203B2E8->input.unk1E * 8;
x = r4;
x += 10;
xxx_call_draw_string(x, 0, sJobList, gUnknown_203B2E8->unk3C, 0);
PrintStringOnWindow(x, 0, sJobList, gUnknown_203B2E8->unk3C, 0);
r4 += 4;
x = r4 + (gUnknown_203B2E8->unkA4.f2 * 8);

View File

@@ -160,7 +160,7 @@ void sub_802CFD0(void)
sub_80073B8(sUnknown_203B2F4->unk34);
r5 = r4 = (sUnknown_203B2F4->input.unk1E * 8) + 10;
xxx_call_draw_string(r5, 0, sRescueEvent, sUnknown_203B2F4->unk34, 0);
PrintStringOnWindow(r5, 0, sRescueEvent, sUnknown_203B2F4->unk34, 0);
r4 -= 6;
r5 = r4 + (sUnknown_203B2F4->unk9C.f2 * 8);