Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-17 06:16:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Format to Formatted

Browse Source
This commit is contained in:
DizzyEggg
2024-10-31 14:19:27 +01:00
parent cc7c519d0f
commit 48752a461f
24 changed files with 183 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
asm/code_800F990.s
View File

@@ -2299,7 +2299,7 @@ _08010BD0:
movs r0, 0xC
movs r1, 0x2
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
movs r0, 0x1
@@ -2407,13 +2407,13 @@ _08010C86:
movs r0, 0xA
movs r1, 0
movs r3, 0x1
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r2, _08010D78
str r4, [sp]
movs r0, 0xA
movs r1, 0xC
movs r3, 0x1
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0x1
bl sub_80073E0
add r0, sp, 0x4

8
asm/code_8010F28.s
View File

@@ -649,7 +649,7 @@ _08011406:
movs r1, 0x2
add r2, sp, 0x4
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
ldr r0, _08011480
@@ -846,7 +846,7 @@ _0801152A:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r6, 0
cmp r6, r9
bge _08011678
@@ -875,7 +875,7 @@ _080115DC:
adds r1, r4, 0
ldr r2, _0801163C
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_08011672:
adds r6, 0x1
cmp r6, r9

6
asm/code_801EE10.s
View File

@@ -39,7 +39,7 @@ sub_801F280:
str r0, [sp]
movs r0, 0xC
movs r1, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_0801F386:
adds r7, 0x1
mov r1, r8
@@ -168,7 +168,7 @@ _0801F394:
str r0, [sp]
movs r0, 0x8
movs r1, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r0, [r4]
ldr r0, [r0, 0x54]
bl sub_80073E0

94
asm/code_805D8C8.s
View File

@@ -1568,7 +1568,7 @@ _08062650:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
mov r0, r10
bl GetIQSkillDescription
adds r2, r0, 0
@@ -1577,7 +1577,7 @@ _08062650:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
mov r0, r10
@@ -1698,7 +1698,7 @@ _0806276C:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
mov r0, r10
bl GetTacticsDescription
adds r2, r0, 0
@@ -1707,7 +1707,7 @@ _0806276C:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
mov r0, r10
@@ -1851,7 +1851,7 @@ sub_806285C:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
mov r0, r10
bl sub_808E51C
adds r2, r0, 0
@@ -1860,7 +1860,7 @@ sub_806285C:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
add r4, sp, 0x4
@@ -2179,7 +2179,7 @@ sub_8062B74:
movs r0, 0xC
movs r1, 0
movs r3, 0x2
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r1, 0x10
mov r8, r1
mov r0, r9
@@ -2212,7 +2212,7 @@ _08062BDE:
movs r0, 0xC
mov r1, r8
movs r3, 0x2
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
b _08062C8A
.align 2, 0
_08062BF0: .4byte gUnknown_8106C90
@@ -2284,7 +2284,7 @@ _08062C6C:
mov r1, r8
ldr r2, _08062CA4
movs r3, 0x2
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0xC
add r8, r0
_08062C80:
@@ -2330,7 +2330,7 @@ sub_8062CA8:
movs r0, 0xC
movs r1, 0
movs r3, 0x2
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r7, 0x8
movs r6, 0x12
adds r0, r5, 0
@@ -2379,7 +2379,7 @@ _08062D18:
_08062D2C:
adds r1, r6, 0
movs r3, 0x2
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
b _08062D52
.align 2, 0
_08062D38: .4byte gUnknown_8106C9C
@@ -2392,7 +2392,7 @@ _08062D3C:
adds r0, r7, 0
adds r1, r6, 0
movs r3, 0x2
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_08062D52:
movs r0, 0x2
bl sub_80073E0
@@ -3390,7 +3390,7 @@ _08063526:
movs r0, 0x4
movs r1, 0
movs r3, 0x2
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0x2
bl sub_80073E0
add sp, 0x24
@@ -3439,7 +3439,7 @@ sub_8063578:
adds r0, r4, 0
movs r1, 0
mov r3, r8
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r1, 0
mov r9, r1
ldr r0, [sp, 0x10]
@@ -3522,7 +3522,7 @@ _08063658:
adds r1, r4, 0
ldr r2, _08063694
mov r3, r8
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_08063668:
adds r7, 0x8
adds r5, 0x8
@@ -4001,13 +4001,13 @@ sub_80639E4:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r2, [r5, 0x4]
str r4, [sp]
movs r0, 0x4
movs r1, 0x10
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
ldr r0, _08063A6C
@@ -7168,7 +7168,7 @@ _080652D2:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
adds r0, r4, 0
movs r1, 0
bl sub_8013800
@@ -7178,7 +7178,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
adds r0, r4, 0
movs r1, 0x1
bl sub_8013800
@@ -7188,7 +7188,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
adds r0, r4, 0
movs r1, 0x2
bl sub_8013800
@@ -7198,7 +7198,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r5, 0x4
adds r0, r4, 0
movs r1, 0x3
@@ -7209,7 +7209,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r1, _080653D8
ldr r0, [r1]
movs r1, 0xCB
@@ -7232,7 +7232,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
b _0806540E
.align 2, 0
_080653D0: .4byte gUnknown_202EE10
@@ -7255,7 +7255,7 @@ _080653F4:
str r7, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_0806540E:
ldr r0, _08065444
adds r1, r5, 0
@@ -7267,7 +7267,7 @@ _0806540E:
str r0, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
add sp, 0xC8
@@ -7378,7 +7378,7 @@ sub_806544C:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
adds r0, r4, 0
movs r1, 0
bl sub_8013800
@@ -7391,7 +7391,7 @@ sub_806544C:
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
adds r0, r4, 0
movs r1, 0x1
bl sub_8013800
@@ -7403,7 +7403,7 @@ sub_806544C:
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
add sp, 0xC8
@@ -7530,28 +7530,28 @@ CreateFieldGameOptionsMenu:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r1, [sp, 0x4]
ldr r0, _080656B4
ldr r2, [r0]
str r6, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r1, [sp, 0x8]
ldr r0, _080656B8
ldr r2, [r0]
str r6, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r1, [sp, 0xC]
ldr r0, _080656BC
ldr r2, [r0]
str r6, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
add sp, 0xD4
@@ -7692,42 +7692,42 @@ CreateFieldDungeonMenu:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r1, [sp, 0x4]
ldr r0, _08065848
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r1, [sp, 0x8]
ldr r0, _0806584C
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r1, [sp, 0xC]
ldr r0, _08065850
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r1, [sp, 0x10]
ldr r0, _08065854
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r1, [sp, 0x14]
ldr r0, _08065858
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r0, _0806585C
ldrb r0, [r0]
adds r4, r7, 0
@@ -7975,14 +7975,14 @@ _08065A0A:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r1, [r6]
ldr r0, _08065A84
ldr r2, [r0]
str r4, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r0, _08065A88
ldrb r1, [r0, 0x8]
lsls r3, r1, 2
@@ -8412,7 +8412,7 @@ sub_8065CAC:
movs r0, 0x10
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r4, 0
ldr r5, _08065DB8
_08065D7A:
@@ -8425,7 +8425,7 @@ _08065D7A:
str r0, [sp]
movs r0, 0x8
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
adds r4, 0x1
cmp r4, 0x6
ble _08065D7A
@@ -8581,7 +8581,7 @@ _08065E0C:
str r7, [sp]
movs r1, 0
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r1, _08065F38
ldr r2, [sp, 0xC8]
lsls r0, r2, 5
@@ -8592,7 +8592,7 @@ _08065E0C:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
_08065EF4:
@@ -9004,7 +9004,7 @@ _08066208:
mov r1, r8
add r2, sp, 0x4
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_08066244:
subs r7, 0x1
adds r5, 0x2
@@ -9102,7 +9102,7 @@ _080662C4:
movs r1, 0x14
add r2, sp, 0x4
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
movs r0, 0x45
@@ -9204,7 +9204,7 @@ _080663A0:
adds r1, r6, 0
add r2, sp, 0x4
movs r3, 0
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r0, 0
bl sub_80073E0
movs r0, 0xD

10
asm/code_8066D04.s
View File

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

72
asm/pokemon_3.s
View File

@@ -146,7 +146,7 @@ _0808F8A0:
str r5, [sp]
movs r1, 0
ldr r3, [sp, 0x50]
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_0808F914:
movs r3, 0xC
add r9, r3
@@ -206,7 +206,7 @@ _0808F914:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_0808F9D8:
movs r3, 0xA
add r9, r3
@@ -289,7 +289,7 @@ _0808F9D8:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_0808FA74:
movs r0, 0xA
add r9, r0
@@ -381,7 +381,7 @@ _0808FAA6:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
ldr r2, _0808FBEC
str r4, [sp]
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_0808FB94:
movs r2, 0xC
add r9, r2
@@ -486,7 +486,7 @@ _0808FB94:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
movs r3, 0xC
add r9, r3
mov r1, r10
@@ -499,7 +499,7 @@ _0808FB94:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl PrintFormatStringOnWindow2
bl PrintFormattedStringOnWindow2
movs r2, 0x21
add r9, r2
mov r3, r10
@@ -515,7 +515,7 @@ _0808FBD2:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
bl PrintFormatStringOnWindow2
bl PrintFormattedStringOnWindow2
b _0808FED6
.align 2, 0
_0808FBE8: .4byte gUnknown_810775C
@@ -529,7 +529,7 @@ _0808FBF4:
movs r1, 0
str r1, [sp]
ldr r3, [sp, 0x50]
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
mov r0, r8
cmp r0, 0
ble _0808FC78
@@ -622,7 +622,7 @@ _0808FCB0:
movs r1, 0
str r1, [sp]
ldr r3, [sp, 0x50]
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_0808FD74:
movs r2, 0x1
add r8, r2
@@ -733,7 +733,7 @@ _0808FD98:
movs r0, 0xC
movs r1, 0x20
ldr r3, [sp, 0x50]
bl PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
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 PrintFormatStringOnWindow
bl PrintFormattedStringOnWindow
_0808FED6:
ldr r0, [sp, 0x50]
bl sub_80073E0

4
include/string_format.h
View File

@@ -58,7 +58,7 @@ void sub_8014490(void);
s32 sub_80144A4(s32 *a0);
void DrawDialogueBoxString(void);
const u8 *FormatString(const u8 *str, u8 *dst, u8 *dstMax, u16 flags);
void PrintFormatStringOnWindow(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr);
void PrintFormatStringOnWindow2(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr, s32 lineSpacing);
void PrintFormattedStringOnWindow(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr);
void PrintFormattedStringOnWindow2(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr, s32 lineSpacing);
#endif // GUARD_STRING_FORMAT_H

12
src/adventure_log.c
View File

@@ -109,34 +109,34 @@ static void DisplayAdventureLog(void)
case 12:
v1 = sub_80978B8();
gFormatArgs[0] = (s16)v1;
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
case 7:
v2 = sub_8097880();
gFormatArgs[0] = (s16)v2;
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
case 11:
v3 = sub_8097838();
gFormatArgs[0] = (s16)v3;
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
case 8:
v4 = sub_80977B8();
gFormatArgs[0] = v4;
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
case 9:
v5 = sub_80977F8();
gFormatArgs[0] = v5;
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
case 10:
v6 = sub_8097870();
gFormatArgs[0] = (s16)v6;
// fallthrough
default:
PrintFormatStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(temp), sAdventureLog->s0.unk34, 0);
break;
}
}

4
src/code_801B3C0.c
View File

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

4
src/code_801F808.c
View File

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

42
src/code_805D8C8_1.c
View File

@@ -2236,18 +2236,18 @@ void DrawFieldMenu(u8 a0)
gFormatArgs[0] = FixedPointToInt(leaderInfo->belly);
gFormatArgs[1] = FixedPointToInt(leaderInfo->maxBelly);
PrintFormatStringOnWindow(0x73, 0, gUnknown_80F9174, 2, 0);
PrintFormattedStringOnWindow(0x73, 0, gUnknown_80F9174, 2, 0);
gFormatArgs[0] = gTeamInventoryRef->teamMoney;
PrintFormatStringOnWindow(0x73, 12, gUnknown_80F9190, 2, 0);
PrintFormattedStringOnWindow(0x73, 12, gUnknown_80F9190, 2, 0);
GetWeatherName(gFormatBuffer_Monsters[0], GetApparentWeather(NULL));
PrintFormatStringOnWindow(0x73, 24, gUnknown_80F91A8, 2, 0);
PrintFormattedStringOnWindow(0x73, 24, gUnknown_80F91A8, 2, 0);
gFormatArgs[0] = hours;
gFormatArgs[1] = minutes;
gFormatArgs[2] = seconds;
PrintFormatStringOnWindow(0x73, 36, gUnknown_80F91C8, 2, 0);
PrintFormattedStringOnWindow(0x73, 36, gUnknown_80F91C8, 2, 0);
for (yLoop = 0, i = 0; i < MAX_TEAM_MEMBERS; i++) {
Entity *teamMon = gDungeon->teamPokemon[i];
if (EntityExists(teamMon)) {
@@ -2255,7 +2255,7 @@ void DrawFieldMenu(u8 a0)
SetMessageArgument(gFormatBuffer_Monsters[0], teamMon, 0);
gFormatArgs[0] = monInfo->HP;
gFormatArgs[1] = monInfo->maxHPStat;
PrintFormatStringOnWindow(4, yLoop, gUnknown_80F91E0, 2, 0);
PrintFormattedStringOnWindow(4, yLoop, gUnknown_80F91E0, 2, 0);
yLoop += 12;
if (yLoop >= 12 * MAX_TEAM_MEMBERS)
break;
@@ -2729,13 +2729,13 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
switch (sUnknown_202F248[a0])
{
case 0:
PrintFormatStringOnWindow(x, 0, gTeamToolboxAPtr, 0, 0);
PrintFormattedStringOnWindow(x, 0, gTeamToolboxAPtr, 0, 0);
for (i = 0; i < 10; i++) {
if (ItemExists(&gTeamInventoryRef->teamItems[i])) {
gUnknown_202EE10.unk1A++;
sub_8090E14(txtBuff, &gTeamInventoryRef->teamItems[i], &gUnknown_8106B60);
y = sub_8013800(&gUnknown_202EE10, i);
PrintFormatStringOnWindow(8, y, txtBuff, 0, 0);
PrintFormattedStringOnWindow(8, y, txtBuff, 0, 0);
}
else {
break;
@@ -2743,13 +2743,13 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
}
break;
case 1:
PrintFormatStringOnWindow(x, 0, gTeamToolboxBPtr, 0, 0);
PrintFormattedStringOnWindow(x, 0, gTeamToolboxBPtr, 0, 0);
for (i = 0; i < 10; i++) {
if (ItemExists(&gTeamInventoryRef->teamItems[i + 10])) {
gUnknown_202EE10.unk1A++;
sub_8090E14(txtBuff, &gTeamInventoryRef->teamItems[i + 10], &gUnknown_8106B60);
y = sub_8013800(&gUnknown_202EE10, i);
PrintFormatStringOnWindow(8, y, txtBuff, 0, 0);
PrintFormattedStringOnWindow(8, y, txtBuff, 0, 0);
}
else {
break;
@@ -2759,12 +2759,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);
PrintFormatStringOnWindow(x, 0, gFieldItemMenuGroundTextPtr, 0, 0);
PrintFormattedStringOnWindow(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);
PrintFormatStringOnWindow(8, y, txtBuff, 0, 0);
PrintFormattedStringOnWindow(8, y, txtBuff, 0, 0);
}
if (a3) {
gUnknown_202EE10.unk8.x = gUnknown_202EE10.unk8.y = 0;
@@ -2774,12 +2774,12 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
case 3: {
Item *item = &GetEntInfo(a1)->heldItem;
SetMessageArgument_2(gFormatBuffer_Monsters[0], a1Info, 0);
PrintFormatStringOnWindow(x, 0, gUnknown_80FE940, 0, 0);
PrintFormattedStringOnWindow(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);
PrintFormatStringOnWindow(8, y, txtBuff, 0, 0);
PrintFormattedStringOnWindow(8, y, txtBuff, 0, 0);
}
}
break;
@@ -2788,12 +2788,12 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
if (EntityExists(chosenTeamMember)) {
Item *item = &GetEntInfo(chosenTeamMember)->heldItem;
SetMessageArgument_2(gFormatBuffer_Monsters[0], chosenTeamMember->axObj.info, 0);
PrintFormatStringOnWindow(x, 0, gUnknown_80FE940, 0, 0);
PrintFormattedStringOnWindow(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);
PrintFormatStringOnWindow(8, y, txtBuff, 0, 0);
PrintFormattedStringOnWindow(8, y, txtBuff, 0, 0);
}
}
}
@@ -2806,7 +2806,7 @@ void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3
sub_80073E0(0);
if (a2) {
sub_80073B8(1);
PrintFormatStringOnWindow(4, 2, gWhichTextPtr1, 1, 0);
PrintFormattedStringOnWindow(4, 2, gWhichTextPtr1, 1, 0);
sub_80073E0(1);
}
}
@@ -3365,7 +3365,7 @@ void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, UnkTextStruct3 *a1, bo
sub_80137B0(&gUnknown_202EE10, 0);
sub_80073B8(0);
if (r10) {
PrintFormatStringOnWindow(0xC, 0, gTeamFormat, 0, 0);
PrintFormattedStringOnWindow(0xC, 0, gTeamFormat, 0, 0);
}
// Print hp/max hp
@@ -3413,10 +3413,10 @@ void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, UnkTextStruct3 *a1, bo
gFormatArgs[1] = monInfo->maxHPStat;
y = sub_8013800(&gUnknown_202EE10, i);
if (monInfo->isTeamLeader) {
PrintFormatStringOnWindow(9, y, gUnknown_8106BD4, 0, 0);
PrintFormattedStringOnWindow(9, y, gUnknown_8106BD4, 0, 0);
}
else {
PrintFormatStringOnWindow(9, y, gUnknown_8106BE0, 0, 0);
PrintFormattedStringOnWindow(9, y, gUnknown_8106BE0, 0, 0);
}
}
}
@@ -3711,10 +3711,10 @@ void PrintMonTactics(s32 firstId, u8 *tacticIds, EntityInfo *mon, s32 windowId)
CopyTacticsNameToBuffer(gFormatBuffer_Monsters[0], tactic);
if (mon->tactic == tactic) {
PrintFormatStringOnWindow(0x10, y, gUnknown_8106BEC, windowId, 0);
PrintFormattedStringOnWindow(0x10, y, gUnknown_8106BEC, windowId, 0);
}
else {
PrintFormatStringOnWindow(0x10, y, gUnknown_8106BF4, windowId, 0);
PrintFormattedStringOnWindow(0x10, y, gUnknown_8106BF4, windowId, 0);
}
}

32
src/code_809447C.c
View File

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

2
src/friend_area_action_menu.c
View File

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

2
src/friend_list_menu.c
View File

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

6
src/iq_skill_info_menu.c
View File

@@ -85,7 +85,7 @@ static void sub_801C6E4(void)
sub_80073B8(sIQSkillInfoMenu->unk24);
skillName = GetIQSkillName(sIQSkillInfoMenu->chosenIQSkill);
strcpy(gFormatBuffer_Items[0], skillName);
PrintFormatStringOnWindow(16, 0, sFmtMoveItem0, 0, 0); // {MOVE_ITEM_0}
PrintFormattedStringOnWindow(16, 0, sFmtMoveItem0, 0, 0); // {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);
@@ -96,8 +96,8 @@ static void sub_801C6E4(void)
sub_80073B8(sIQSkillInfoMenu->unk24);
preload = sIQSkillInfoMenu->unk10[sIQSkillInfoMenu->unk8];
strcpy(gFormatBuffer_Monsters[0], preload->pokeName);
PrintFormatStringOnWindow(16, 0, sFmtPkmn0, sIQSkillInfoMenu->unk24, 0); // {POKEMON_0}
PrintFormatStringOnWindow(4, 16, sIQSkillInfoMenu->unk10[sIQSkillInfoMenu->unk8]->unk4, sIQSkillInfoMenu->unk24, 0);
PrintFormattedStringOnWindow(16, 0, sFmtPkmn0, sIQSkillInfoMenu->unk24, 0); // {POKEMON_0}
PrintFormattedStringOnWindow(4, 16, sIQSkillInfoMenu->unk10[sIQSkillInfoMenu->unk8]->unk4, sIQSkillInfoMenu->unk24, 0);
sub_80073E0(sIQSkillInfoMenu->unk24);
break;
case 2:

2
src/iq_skill_list_menu.c
View File

@@ -147,7 +147,7 @@ void BuildIQSkillList(void)
else
strcpy(gFormatBuffer_Items[1] - 80, sUnknown_80DBE18);
PrintFormatStringOnWindow(12, y, sFmt01, sIQSkillListMenu->s24.s0.unk34, 0);
PrintFormattedStringOnWindow(12, y, sFmt01, sIQSkillListMenu->s24.s0.unk34, 0);
}
sub_80073E0(sIQSkillListMenu->s24.s0.unk34);

10
src/items.c
View File

@@ -643,9 +643,9 @@ u32 sub_80913E0(Item* slot, u32 a2, struct subStruct_203B240 ** a3)
BufferItemName(gFormatBuffer_Items[0], (u8)(slot->quantity + 125), NULL);
}
sub_80073B8(a2);
PrintFormatStringOnWindow(16, 0, buffer88, a2, 0);
PrintFormattedStringOnWindow(16, 0, buffer88, a2, 0);
PrintFormatStringOnWindow(8, 24, GetItemDescription(slot->id), a2, 0);
PrintFormattedStringOnWindow(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);
@@ -655,13 +655,13 @@ u32 sub_80913E0(Item* slot, u32 a2, struct subStruct_203B240 ** a3)
InitPokemonMove(buffer8, move);
sub_80078A4(a2, 4, 82, 200, COLOR_WHITE_2);
PrintFormatStringOnWindow(4, 84, gPtrTypeText, a2, 0);
PrintFormattedStringOnWindow(4, 84, gPtrTypeText, a2, 0);
moves_data = GetMoveType(buffer8);
typestring = GetUnformattedTypeString(moves_data);
PrintFormatStringOnWindow(64, 84, typestring, a2, 0);
PrintFormattedStringOnWindow(64, 84, typestring, a2, 0);
result = GetMoveBasePP(buffer8);
gFormatArgs[0] = result;
PrintFormatStringOnWindow(128, 84, gPtrPPD0Text, a2, 0);
PrintFormattedStringOnWindow(128, 84, gPtrPPD0Text, a2, 0);
}
sub_80073E0(a2);

6
src/kecleon_bros4.c
View File

@@ -235,7 +235,7 @@ void sub_801A9E0(void)
PrintStringOnWindow(8,sub_8013800(&gUnknown_203B224->unk54.s0.input,r7), buf1, gUnknown_203B224->unk54.s0.unk34, 0);
else {
strncpy(gFormatBuffer_Items[0], buf1, 80);
PrintFormatStringOnWindow(8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), sFmtMoveItem0, gUnknown_203B224->unk54.s0.unk34, 0);
PrintFormattedStringOnWindow(8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), sFmtMoveItem0, gUnknown_203B224->unk54.s0.unk34, 0);
}
break;
}
@@ -261,7 +261,7 @@ void sub_801A9E0(void)
else {
sub_8090E14(buf1, &item, 0);
strncpy(gFormatBuffer_Items[0], buf1, 80);
PrintFormatStringOnWindow(8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), sFmtMoveItem0, gUnknown_203B224->unk54.s0.unk34, 0);
PrintFormattedStringOnWindow(8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), sFmtMoveItem0, gUnknown_203B224->unk54.s0.unk34, 0);
}
break;
}
@@ -279,7 +279,7 @@ void sub_801A9E0(void)
PrintStringOnWindow(8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), buf1, gUnknown_203B224->unk54.s0.unk34, 0);
else {
strncpy(gFormatBuffer_Items[0], buf1, 80);
PrintFormatStringOnWindow(8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), sFmtMoveItem0, gUnknown_203B224->unk54.s0.unk34, 0);
PrintFormattedStringOnWindow(8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), sFmtMoveItem0, gUnknown_203B224->unk54.s0.unk34, 0);
}
break;
}

4
src/menu_input.c
View File

@@ -449,7 +449,7 @@ void sub_8012EBC(MenuStruct *param_1)
ptr_text2 = &textStack[index];
RestoreUnkTextStruct_8006518(textStack);
x = sub_8008ED0(param_1->unk0);
PrintFormatStringOnWindow(((ptr_text2->unk14->f2 * 8 - x) / 2) + 8, 0, param_1->unk0, param_1->index, 0);
PrintFormattedStringOnWindow(((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);
PrintFormatStringOnWindow(8, y, buffer, param_1->index, 0);
PrintFormattedStringOnWindow(8, y, buffer, param_1->index, 0);
menuItemsPtr++;
counter++;
} while (menuItemsPtr->text != NULL);

10
src/moves.c
View File

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

2
src/party_list_menu.c
View File

@@ -778,7 +778,7 @@ void sub_8026DAC(u32 r0, BulkItem *item)
temp.unk8 = 1;
slot.flags = ITEM_FLAG_EXISTS;
sub_8090E14(gFormatBuffer_Items[0], &slot, &temp);
PrintFormatStringOnWindow(4, 3, sPartyMenuItemPlaceholder, r0, 0);
PrintFormattedStringOnWindow(4, 3, sPartyMenuItemPlaceholder, r0, 0);
sub_80073E0(r0);
}

2
src/pokemon_news1.c
View File

@@ -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();
PrintFormatStringOnWindow(21, y, GetPokemonMailHeadline(mailIndex), sUnknown_203B2CC->s38.unk34, 0);
PrintFormattedStringOnWindow(21, y, GetPokemonMailHeadline(mailIndex), sUnknown_203B2CC->s38.unk34, 0);
}
sub_80073E0(sUnknown_203B2CC->s38.unk34);

4
src/pokemon_news2.c
View File

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

20
src/string_format.c
View File

@@ -870,22 +870,22 @@ static bool8 AppendString(const u8 *str, u8 **dstPtr, u8 *dstMax, u16 flags)
#define FORMAT_STR_MAX_LEN 500
void PrintFormatStringOnWindow(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr)
void PrintFormattedStringOnWindow(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr)
{
u8 formatString[FORMAT_STR_MAX_LEN];
u8 formattedString[FORMAT_STR_MAX_LEN];
FormatString(str, formatString, formatString + FORMAT_STR_MAX_LEN, 0);
formatString[FORMAT_STR_MAX_LEN - 1] = '\0';
PrintStringOnWindow(x, y, formatString, windowId, terminatingChr);
FormatString(str, formattedString, formattedString + FORMAT_STR_MAX_LEN, 0);
formattedString[FORMAT_STR_MAX_LEN - 1] = '\0';
PrintStringOnWindow(x, y, formattedString, windowId, terminatingChr);
}
void PrintFormatStringOnWindow2(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr, s32 lineSpacing)
void PrintFormattedStringOnWindow2(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr, s32 lineSpacing)
{
u8 formatString[FORMAT_STR_MAX_LEN];
u8 formattedString[FORMAT_STR_MAX_LEN];
FormatString(str, formatString, formatString + FORMAT_STR_MAX_LEN, 0);
formatString[FORMAT_STR_MAX_LEN - 1] = '\0';
PrintStringOnWindow2(x, y, formatString, windowId, terminatingChr, lineSpacing);
FormatString(str, formattedString, formattedString + FORMAT_STR_MAX_LEN, 0);
formattedString[FORMAT_STR_MAX_LEN - 1] = '\0';
PrintStringOnWindow2(x, y, formattedString, windowId, terminatingChr, lineSpacing);
}
//