Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-07-18 16:53:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed sprintf() duplicate function

Browse Source
This commit is contained in:
AnonymousRandomPerson 2022-03-09 22:47:58 -05:00
parent 458001dbbd
commit 83d097624b
29 changed files with 139 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/code_800D090.s
View File

@ -8704,7 +8704,7 @@ _08011406:
ldr r1, _0801147C
ldr r2, [r6]
add r0, sp, 0x4
bl ExpandPlaceholdersBuffer
bl sprintf_2
movs r0, 0
str r0, [sp]
movs r0, 0xC

16
asm/code_8012A18.s
View File

@ -510,7 +510,7 @@ _08012F62:
_08012F64:
mov r0, r8
ldr r1, _08012FBC
bl ExpandPlaceholdersBuffer
bl sprintf_2
adds r0, r5, 0
adds r0, 0x14
mov r1, r9
@ -4504,7 +4504,7 @@ _08014E60:
adds r5, 0x1
ldr r2, [r0]
mov r0, sp
bl ExpandPlaceholdersBuffer
bl sprintf_2
_08014E78:
mov r4, sp
b _08014F0E
@ -4525,7 +4525,7 @@ _08014E84:
subs r2, 0x30
adds r5, 0x1
mov r0, sp
bl ExpandPlaceholdersBuffer
bl sprintf_2
mov r0, sp
ldrb r1, [r0]
cmp r1, 0
@ -4558,7 +4558,7 @@ _08014EC4:
subs r2, 0x30
adds r5, 0x1
mov r0, sp
bl ExpandPlaceholdersBuffer
bl sprintf_2
mov r0, sp
ldrb r1, [r0]
cmp r1, 0
@ -6139,7 +6139,7 @@ _08015B04:
add r0, sp, 0x4
ldr r1, _08015B30
adds r2, r5, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
mov r1, r8
ldr r0, [r1]
ldrb r0, [r0, 0x19]
@ -6169,7 +6169,7 @@ _08015B34:
mov r0, r10
ldr r1, _08015B78
adds r2, r5, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
mov r3, r8
ldr r0, [r3]
ldrb r0, [r0, 0x19]
@ -6477,7 +6477,7 @@ _08015DD0:
adds r0, 0xF8
ldr r2, [r0]
add r0, sp, 0x4
bl ExpandPlaceholdersBuffer
bl sprintf_2
b _08015DEE
.align 2, 0
_08015DDC: .4byte gUnknown_80DB65C
@ -6487,7 +6487,7 @@ _08015DE0:
adds r0, 0xF8
ldr r2, [r0]
add r0, sp, 0x4
bl ExpandPlaceholdersBuffer
bl sprintf_2
_08015DEE:
movs r0, 0
str r0, [sp]

14
asm/code_801EE10.s
View File

@ -1160,7 +1160,7 @@ sub_801F700:
movs r7, 0
ldrsh r3, [r0, r7]
adds r0, r5, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, [r6]
adds r0, r4
ldr r3, [r0]
@ -4920,7 +4920,7 @@ _08021574:
mov r0, r10
ldr r1, _08021598
add r2, sp, 0x8
bl ExpandPlaceholdersBuffer
bl sprintf_2
mov r3, r8
ldr r0, [r3]
adds r0, 0x40
@ -4968,7 +4968,7 @@ _080215D8:
adds r2, r0, 0
mov r0, r10
ldr r1, _08021608
bl ExpandPlaceholdersBuffer
bl sprintf_2
mov r2, r8
ldr r0, [r2]
adds r0, 0x40
@ -5519,7 +5519,7 @@ _08021A16:
add r0, sp, 0x4
ldr r1, _08021A58
adds r2, r7, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
mov r1, r8
ldr r0, [r1]
ldr r3, [r0, 0x74]
@ -9021,7 +9021,7 @@ _08023628:
ldr r1, _080236A0
adds r2, r7, 0
adds r3, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r6, _0802368C
ldr r0, [r6]
movs r1, 0xE4
@ -10170,7 +10170,7 @@ _08023F02:
ldr r1, _08023F80
adds r2, r6, 0
mov r3, r9
bl ExpandPlaceholdersBuffer
bl sprintf_2
mov r1, r8
ldr r0, [r1]
movs r2, 0xD6
@ -10874,7 +10874,7 @@ sub_80243E8:
ldr r1, _08024454
mov r0, sp
adds r2, r5, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
adds r0, r4, 0
add sp, 0x3C
pop {r4,r5}

36
asm/code_803B050.s
View File

@ -3,7 +3,7 @@
.syntax unified
.text
.text
thumb_func_start sub_803B050
sub_803B050:
@ -1059,7 +1059,7 @@ _0803B818:
add r0, sp, 0x4
adds r2, r6, 0
_0803B84C:
bl ExpandPlaceholdersBuffer
bl sprintf_2
_0803B850:
ldr r1, [r7, 0x48]
ldr r3, [r7]
@ -1096,7 +1096,7 @@ _0803B86C:
ldr r1, [r0]
add r0, sp, 0x4
adds r2, r6, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r1, [r7, 0x48]
ldr r3, [r7]
movs r0, 0
@ -1160,7 +1160,7 @@ _0803B916:
ldr r1, _0803B938
add r0, sp, 0x4
adds r2, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
b _0803B944
.align 2, 0
_0803B938: .4byte gUnknown_80E8884
@ -1299,7 +1299,7 @@ _0803BA4C:
ldr r1, _0803BA68
add r0, sp, 0x4
adds r2, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
b _0803BACC
.align 2, 0
_0803BA64: .4byte gUnknown_202DE58
@ -1313,7 +1313,7 @@ _0803BA6C:
ldr r1, _0803BA88
add r0, sp, 0x4
adds r2, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
b _0803BACC
.align 2, 0
_0803BA84: .4byte gUnknown_202DE58
@ -1347,7 +1347,7 @@ _0803BAA0:
add r0, sp, 0x4
adds r2, r4, 0
adds r3, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
_0803BACC:
ldr r3, [r7]
movs r0, 0
@ -1408,7 +1408,7 @@ _0803BB10:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@ -1454,7 +1454,7 @@ _0803BB74:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r3, [r7]
movs r4, 0
str r4, [sp]
@ -1472,7 +1472,7 @@ _0803BB74:
ldr r1, [r5]
add r0, sp, 0x4
mov r2, r8
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r3, [r7]
str r4, [sp]
b _0803BD32
@ -1508,7 +1508,7 @@ _0803BBF0:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@ -1554,7 +1554,7 @@ _0803BC58:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@ -1600,7 +1600,7 @@ _0803BCC0:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@ -1621,7 +1621,7 @@ _0803BD1A:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r3, [r7]
str r6, [sp]
_0803BD32:
@ -1677,7 +1677,7 @@ _0803BD88:
adds r0, r5, 0
adds r2, r6, 0
adds r3, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r3, [r7]
mov r1, r8
str r1, [sp]
@ -1783,7 +1783,7 @@ _0803BE80:
_0803BE94:
add r0, sp, 0x4
adds r2, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r3, [r7]
movs r0, 0
str r0, [sp]
@ -1823,7 +1823,7 @@ _0803BEC8:
ldr r1, _0803BF00
add r0, sp, 0x4
adds r2, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
b _0803BF0C
.align 2, 0
_0803BEF8: .4byte gSpecialMissionText
@ -1940,7 +1940,7 @@ _0803BFD0:
add r0, sp, 0x4
adds r2, r4, 0
_0803BFEE:
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r3, [r7]
movs r0, 0
str r0, [sp]

4
asm/code_803D110.s
View File

@ -1388,7 +1388,7 @@ _0803DB54:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
b _0803DBCA
.align 2, 0
_0803DB84: .4byte gUnknown_80F60F8
@ -1411,7 +1411,7 @@ _0803DBBC:
adds r3, 0x30
add r0, sp, 0x4
adds r2, r6, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
_0803DBCA:
add r0, sp, 0x4
bl CalcStringWidth

4
asm/code_80521D0.s
View File

@ -785,7 +785,7 @@ _080529D4:
ldr r0, _080529E4
ldr r1, _080529E8
ldr r2, _080529EC
bl ExpandPlaceholdersBuffer
bl sprintf_2
b _08052A28
.align 2, 0
_080529E4: .4byte gUnknown_202E5D8
@ -795,7 +795,7 @@ _080529F0:
ldr r0, _080529FC
ldr r1, _08052A00
ldr r2, _08052A04
bl ExpandPlaceholdersBuffer
bl sprintf_2
b _08052A28
.align 2, 0
_080529FC: .4byte gUnknown_202E5D8

8
asm/code_805D8C8.s
View File

@ -4462,7 +4462,7 @@ _0805FCEC:
adds r0, r5, 0
ldr r1, _0805FD38
adds r2, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, _0805FD30
adds r1, r6, 0
bl sub_8013800
@ -17054,7 +17054,7 @@ _08066208:
ldrb r2, [r0]
add r0, sp, 0x4
ldr r1, _08066258
bl ExpandPlaceholdersBuffer
bl sprintf_2
movs r0, 0
ldrsh r1, [r5, r0]
ldr r0, _0806625C
@ -17150,7 +17150,7 @@ _080662C4:
adds r0, r4
ldrb r2, [r0]
add r0, sp, 0x4
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, _0806634C
lsls r1, r4, 1
adds r1, r5, r1
@ -17252,7 +17252,7 @@ _080663A0:
adds r0, r4
ldrb r2, [r0]
add r0, sp, 0x4
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, _08066428
lsls r1, r4, 1
adds r1, r5, r1

2
asm/code_807034C.s
View File

@ -858,7 +858,7 @@ sub_8070968:
ldr r0, _0807098C
ldr r3, [r0]
adds r0, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
b _080709BA
.align 2, 0
_08070988: .4byte gUnknown_8106FA4

2
asm/code_8090208.s
View File

@ -676,7 +676,7 @@ _080907DA:
bne _0809080C
ldr r1, _08090808
adds r0, r7, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
movs r0, 0
b _0809080E
.align 2, 0

10
asm/code_8098BDC.s
View File

@ -3,7 +3,7 @@
.syntax unified
.text
.text
thumb_func_start sub_8098FCC
sub_8098FCC:
@ -4305,7 +4305,7 @@ _0809B0E4:
lsls r2, 4
ldr r3, _0809B13C
adds r2, r3
bl ExpandPlaceholdersBuffer
bl sprintf_2
_0809B0F6:
adds r0, r4, 0
bl sub_809AE3C
@ -4602,7 +4602,7 @@ _0809B318:
lsls r2, 4
ldr r3, _0809B3D8
adds r2, r3
bl ExpandPlaceholdersBuffer
bl sprintf_2
_0809B32A:
ldr r0, _0809B3DC
mov r8, r0
@ -4614,7 +4614,7 @@ _0809B32A:
ldr r1, _0809B3E0
adds r0, r4, 0
adds r2, r7, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
adds r7, r4, 0
_0809B344:
adds r0, r6, 0
@ -7670,7 +7670,7 @@ sub_809CBBC:
adds r0, r3
ldr r3, [r0]
mov r0, sp
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, _0809CC14
ldr r0, [r0]
movs r1, 0x98

2
asm/friend_rescue.s
View File

@ -1542,7 +1542,7 @@ _080335C0:
adds r0, r4
ldr r1, _080335F0
add r2, sp, 0x14
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, [r5]
adds r0, r4
b _0803388E

2
asm/kecleon_items_1.s
View File

@ -241,7 +241,7 @@ _0801AB90:
ldr r1, _0801AC08
adds r0, r5, 0
add r2, sp, 0x4
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r4, _0801AC0C
ldr r0, [r4]
adds r0, 0x54

2
asm/makuhita_dojo.s
View File

@ -829,7 +829,7 @@ _08030608:
add r0, sp, 0x8
ldr r1, _08030664
adds r2, r5, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
mov r5, r8
ldr r0, [r5]
ldr r3, [r0, 0x64]

2
asm/wonder_mail_2.s
View File

@ -139,7 +139,7 @@ _0802BFE8:
adds r1, r0, 0
mov r0, r8
mov r2, r9
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x38]
movs r0, 0

2
asm/wonder_mail_4.s
View File

@ -865,7 +865,7 @@ _08030EE8:
ldr r1, _08030F54
adds r0, r6, 0
adds r2, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, [r5]
ldr r3, [r0, 0x10]
mov r0, r8

12
asm/wonder_mail_5.s
View File

@ -56,7 +56,7 @@ _08031B2C:
ldr r1, _08031B8C
ldrb r2, [r5, 0x5]
add r0, sp, 0x4
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
str r6, [sp]
@ -71,7 +71,7 @@ _08031B2C:
adds r2, r0, 0
add r0, sp, 0x4
adds r1, r4, 0
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
str r6, [sp]
@ -136,7 +136,7 @@ _08031BC2:
ldrb r2, [r4, 0x5]
ldr r0, [sp, 0xD8]
ldr r1, _08031C2C
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r0, r8
@ -167,7 +167,7 @@ _08031C30:
adds r0, r5, 0
ldr r1, _08031C54
mov r2, r9
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r1, r8
@ -194,7 +194,7 @@ _08031C70:
adds r0, r5, 0
ldr r1, _08031C98
_08031C7E:
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r2, r8
@ -214,7 +214,7 @@ _08031C9C:
adds r2, r0, 0
adds r0, r5, 0
ldr r1, _08031CD0
bl ExpandPlaceholdersBuffer
bl sprintf_2
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r2, r8

6
include/code_800D090.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef GUARD_CODE_800D090_H
#define GUARD_CODE_800D090_H
void sprintf_2(char *buffer, const char *text, ...);
#endif

3
src/code_800D090.c
View File

@ -4,7 +4,6 @@
#include "config.h"
#include "global.h"
extern void SoundBiasReset(void);
extern void SoundBiasSet(void);
@ -70,7 +69,7 @@ void sub_800D098(void)
while(REG_KEYINPUT != KEYS_MASK){} // All buttons
}
void ExpandPlaceholdersBuffer(u8 *buffer, const char *text, ...)
void sprintf_2(char *buffer, const char *text, ...)
{
va_list vArgv;
va_start(vArgv, text);

16
src/code_801D760.c
View File

@ -8,6 +8,7 @@
#include "input.h"
#include "text.h"
#include "rescue_team_info.h"
#include "code_800D090.h"
struct unkStruct_203B258
{
@ -64,15 +65,14 @@ extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
void LoadTeamRankBadge(u32, u32, u32);
extern void ExpandPlaceholdersBuffer(u8 *, u32 *, ...);
extern void SetBGPaletteBufferColorArray(s32 index, u8 *colorArray);
extern void sub_8007E20(u32, u32, u32, u32, u32, u8 *, u32);
extern struct FileArchive gTitleMenuFileArchive;
extern const char gTeamRankBadgeFileName;
extern u32 gUnknown_80DBF3C;
extern u32 gUnknown_80DBF4C;
extern char *gUnknown_80DBF3C;
extern char *gUnknown_80DBF4C;
struct TeamBadgeData
{
@ -305,8 +305,8 @@ void sub_801D894(void)
// Stored on stack
u32 *preload_string;
u32 *r5; // R5
u8 buffer [96]; // sp +4
char *r5; // R5
char buffer [96]; // sp +4
if (gUnknown_203B250->currFriendAreaLocation == NONE) {
location = sub_8098FB4();
@ -327,11 +327,11 @@ void sub_801D894(void)
LoadTeamRankBadge(2, 8, 6);
// Have to load before TeamRank funcs
r5 = &gUnknown_80DBF3C; // %s {COLOR_1 CYAN}%d{END_COLOR_TEXT_1} Pts.
r5 = (char*) &gUnknown_80DBF3C; // %s {COLOR_1 CYAN}%d{END_COLOR_TEXT_1} Pts.
rank = GetRescueTeamRank();
ExpandPlaceholdersBuffer(buffer, r5, GetTeamRankString(rank), GetTeamRankPts());
sprintf_2(buffer, r5, GetTeamRankString(rank), GetTeamRankPts());
xxx_call_draw_string(32, 4, buffer, 2, 0);
ExpandPlaceholdersBuffer(buffer, &gUnknown_80DBF4C, gTeamInventory_203B460->teamMoney);
sprintf_2(buffer, (char*) &gUnknown_80DBF4C, gTeamInventory_203B460->teamMoney);
xxx_call_draw_string(32, 18, buffer, 2, 0);
sub_80073E0(2);
}

10
src/code_8090208.c
View File

@ -1,13 +1,11 @@
#include "global.h"
#include "dungeon.h"
#include "code_800D090.h"
extern const char gUnknown_8108F10[];
extern const char gUnknown_8108F18[];
extern const char gUnknown_8108F2C[];
void ExpandPlaceholdersBuffer(u8 *buffer, const char *text, ...);
struct unkDungeonStruct
{
u8 index;
@ -16,17 +14,17 @@ struct unkDungeonStruct
void sub_8090208(u8 *buffer, struct unkDungeonStruct *dungeonLocation)
{
ExpandPlaceholdersBuffer(buffer, gUnknown_8108F10, gDungeonNames[dungeonLocation->index].name1); // {COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2} (normal floor print (no B)
sprintf_2(buffer, gUnknown_8108F10, gDungeonNames[dungeonLocation->index].name1); // {COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2} (normal floor print (no B)
}
void PrintDungeonLocationtoBuffer(u8 *buffer, struct unkDungeonStruct *dungeonLocation)
{
if(gDungeons[dungeonLocation->index].stairDirection != 0){
ExpandPlaceholdersBuffer(buffer, gUnknown_8108F18, gDungeonNames[dungeonLocation->index].name1, dungeonLocation->floor); //_F
sprintf_2(buffer, gUnknown_8108F18, gDungeonNames[dungeonLocation->index].name1, dungeonLocation->floor); //_F
}
else
{
ExpandPlaceholdersBuffer(buffer, gUnknown_8108F2C, gDungeonNames[dungeonLocation->index].name1, dungeonLocation->floor); // B _F
sprintf_2(buffer, gUnknown_8108F2C, gDungeonNames[dungeonLocation->index].name1, dungeonLocation->floor); // B _F
}
}

6
src/friend_area.c
View File

@ -2,6 +2,7 @@
#include "constants/friend_area.h"
#include "friend_area.h"
#include "pokemon.h"
#include "code_800D090.h"
bool8 gBoughtFriendAreas[NUM_FRIEND_AREAS];
EWRAM_DATA bool8 *gFriendAreas;
@ -14,7 +15,6 @@ extern const char *gFriendAreaNames[];
extern const char gUnknown_81098A4;
extern const char gUnknown_81098AC;
extern void ExpandPlaceholdersBuffer(u8 *buffer, const char *r2, ...);
extern void sub_8090FEC(u32, u8 *r1, u32);
const struct FriendAreaSettings gFriendAreaSettings[NUM_FRIEND_AREAS] =
@ -599,7 +599,7 @@ u32 GetFriendAreaPrice(u8 index)
void sub_8092558(u8 *buffer, u8 index)
{
// colors the friend area name green and prints to buffer?
ExpandPlaceholdersBuffer(buffer, &gUnknown_81098A4, gFriendAreaNames[index]);
sprintf_2(buffer, &gUnknown_81098A4, gFriendAreaNames[index]);
}
void sub_8092578(u8 *buffer, u8 index, u8 r2)
@ -609,7 +609,7 @@ void sub_8092578(u8 *buffer, u8 index, u8 r2)
if(r2)
{
sub_8090FEC(gFriendAreaSettings[index].price, priceBuffer, 1);
ExpandPlaceholdersBuffer(buffer, &gUnknown_81098AC, gFriendAreaNames[index], 96, priceBuffer);
sprintf_2(buffer, &gUnknown_81098AC, gFriendAreaNames[index], 96, priceBuffer);
}
else
{

4
src/friend_list_menu.c
View File

@ -4,6 +4,7 @@
#include "text.h"
#include "team_inventory.h"
#include "constants/move.h"
#include "code_800D090.h"
struct unkStruct_203B2B8
{
@ -52,7 +53,6 @@ extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_80922B4(u8 *, const u8 *, u32);
extern void ExpandPlaceholdersBuffer(u8 *buffer, const u8 *text, ...);
extern void sub_808D930(u8 *, s16);
extern s32 sub_8008ED0(u8 *);
extern void xxx_call_draw_string(s32 x, s32 y, u8 *, u32, u32);
@ -333,7 +333,7 @@ void sub_8026E08(u32 r0)
sub_80073B8(r0);
sub_80922B4(gAvailablePokemonNames, gUnknown_203B2B8->unk18->name, POKEMON_NAME_LENGTH);
sub_808D930(buffer, gUnknown_203B2B8->unk18->speciesNum);
ExpandPlaceholdersBuffer(buffer1, gUnknown_80DD6E0, gAvailablePokemonNames);
sprintf_2(buffer1, gUnknown_80DD6E0, gAvailablePokemonNames);
x = sub_8008ED0(buffer1);
xxx_call_draw_string(((gUnknown_80DD370.unk0c << 3) - x) / 2, 3, buffer1, r0, 0);
sub_80073E0(r0);

20
src/items.c
View File

@ -8,6 +8,7 @@
#include "random.h"
#include "subStruct_203B240.h"
#include "team_inventory.h"
#include "code_800D090.h"
#include <stddef.h>
@ -37,7 +38,6 @@ EWRAM_DATA struct Item *gItemParametersData;
extern u8 GetItemType(u8);
extern u32 GetItemUnkThrow(u8, u32);
extern void ExpandPlaceholdersBuffer(u8 *, const u8 *, ...);
extern s32 sub_8090FEC(s32 a1, u8* a2, u8 a3);
extern void sub_80073B8(u32);
extern u32 sub_8097DF0(char *, struct subStruct_203B240 **);
@ -326,35 +326,35 @@ void sub_8090E14(u8* ext_buffer, struct ItemSlot* slot, struct unkStruct_8090F58
if (GetItemType(slot->itemIndex) == ITEM_TYPE_THROWABLE) {
// I feel like these labels might actually be there...
if (unk8) {
ExpandPlaceholdersBuffer(buffer, gUnknown_8109770, gItemParametersData[slot->itemIndex].namePointer, slot->numItems);
sprintf_2(buffer, gUnknown_8109770, gItemParametersData[slot->itemIndex].namePointer, slot->numItems);
}
else {
ExpandPlaceholdersBuffer(buffer, gUnknown_8109778, gItemParametersData[slot->itemIndex].namePointer);
sprintf_2(buffer, gUnknown_8109778, gItemParametersData[slot->itemIndex].namePointer);
}
}
else if (GetItemType(slot->itemIndex) == ITEM_TYPE_ROCK) {
if (unk8) {
ExpandPlaceholdersBuffer(buffer, gUnknown_8109770, gItemParametersData[slot->itemIndex].namePointer, slot->numItems);
sprintf_2(buffer, gUnknown_8109770, gItemParametersData[slot->itemIndex].namePointer, slot->numItems);
}
else {
ExpandPlaceholdersBuffer(buffer, gUnknown_8109778, gItemParametersData[slot->itemIndex].namePointer);
sprintf_2(buffer, gUnknown_8109778, gItemParametersData[slot->itemIndex].namePointer);
}
}
else if (slot->itemIndex == ITEM_ID_POKE) {
ExpandPlaceholdersBuffer(buffer, gUnknown_810977C, GetMoneyValue(slot));
sprintf_2(buffer, gUnknown_810977C, GetMoneyValue(slot));
}
else {
strncpy(buffer, gItemParametersData[slot->itemIndex].namePointer, 80);
}
if (slot->itemFlags & ITEM_FLAG_STICKY) {
ExpandPlaceholdersBuffer(ext_buffer, gUnknown_8109784, buffer);
sprintf_2(ext_buffer, gUnknown_8109784, buffer);
strncpy(buffer, ext_buffer, 80);
}
if (a3) {
if (a3->unk4 && (slot->itemFlags & ITEM_FLAG_SET)) {
ExpandPlaceholdersBuffer(ext_buffer, gUnknown_810978C, buffer);
sprintf_2(ext_buffer, gUnknown_810978C, buffer);
strncpy(buffer, ext_buffer, 80);
}
if ((*(u32*)a3 == 1) || (*(u32*)a3 == 3)) {
@ -408,11 +408,11 @@ void sub_8090F58(void* a1, u8 *a2, struct ItemSlot *slot, struct unkStruct_8090F
if (a4->unk6) {
sub_8090FEC(value, buffer, 1);
ExpandPlaceholdersBuffer(a1, gUnknown_8109794, a2, a4->unk6, buffer);
sprintf_2(a1, gUnknown_8109794, a2, a4->unk6, buffer);
}
else {
sub_8090FEC(value, buffer, 0);
ExpandPlaceholdersBuffer(a1, gUnknown_81097A4, a2, buffer);
sprintf_2(a1, gUnknown_81097A4, a2, buffer);
}
}

14
src/kecleon_items_1.c
View File

@ -6,6 +6,7 @@
#include "item.h"
#include "kecleon_items.h"
#include "team_inventory.h"
#include "code_800D090.h"
extern struct unkStruct_203B210 *gUnknown_203B210;
extern u8 gUnknown_80DB8E4[];
@ -31,7 +32,6 @@ extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern s32 sub_8013800(void *, u32);
extern void ExpandPlaceholdersBuffer(u8 *, u8 *, ...);
extern void xxx_call_draw_string(s32 x, s32, u8 *, u32, u32);
extern void sub_801AE84(void);
extern void sub_8012D08(void *, u32);
@ -475,7 +475,7 @@ void sub_801A0D8(void)
// Needed for the shifts..
u32 index_shift;
u32 numItems_shift;
sub_8008C54(gUnknown_203B214->unk34);
sub_80073B8(gUnknown_203B214->unk34);
xxx_call_draw_string(gUnknown_203B214->unk1E * 8 + 10,0,gUnknown_80DB8E4,
@ -505,7 +505,7 @@ void sub_801A0D8(void)
xxx_call_draw_string(8,y,auStack204,gUnknown_203B214->unk34,0);
}
else {
ExpandPlaceholdersBuffer(auStack112,gUnknown_80DB8EC,auStack204);
sprintf_2(auStack112,gUnknown_80DB8EC,auStack204);
y = sub_8013800(gUnknown_203B214,iVar4);
xxx_call_draw_string(8,y,auStack112,gUnknown_203B214->unk34,0);
}
@ -701,7 +701,7 @@ void sub_801A4A4(void)
// Needed for the shifts..
u32 index_shift;
u32 numItems_shift;
sub_8008C54(gUnknown_203B21C->unk34);
sub_80073B8(gUnknown_203B21C->unk34);
xxx_call_draw_string(gUnknown_203B21C->unk1E * 8 + 10,0,gUnknown_80DB92C,
@ -731,7 +731,7 @@ void sub_801A4A4(void)
xxx_call_draw_string(8,y,auStack204,gUnknown_203B21C->unk34,0);
}
else {
ExpandPlaceholdersBuffer(auStack112,gUnknown_80DB934,auStack204);
sprintf_2(auStack112,gUnknown_80DB934,auStack204);
y = sub_8013800(gUnknown_203B21C,iVar4);
xxx_call_draw_string(8,y,auStack112,gUnknown_203B21C->unk34,0);
}
@ -741,7 +741,7 @@ void sub_801A4A4(void)
u32 sub_801A5D8(u32 param_1,int param_2,struct UnkTextStruct2_sub *param_3,u32 param_4)
{
if (GetNumberOfFilledInventorySlots() == 0) {
return 0;
}
@ -781,7 +781,7 @@ u32 sub_801A6E8(u8 param_1)
{
s32 iVar5;
struct ItemSlot local_10;
if (param_1 == '\0') {
sub_8013660(&gUnknown_203B224->unk54);
return 0;

34
src/load_screen.c
View File

@ -8,6 +8,7 @@
#include "text.h"
#include "pokemon.h"
#include "save.h"
#include "code_800D090.h"
extern const struct FileArchive gTitleMenuFileArchive;
@ -59,7 +60,6 @@ extern void sub_80920D8(u8 *);
extern struct PokemonStruct *GetPlayerPokemonStruct(void);
extern u8 sub_80023E4(u32);
extern u8 *sub_8098FB4();
extern void ExpandPlaceholdersBuffer(u8 *buffer, const u8 *text, ...);
extern u8 *GetDungeonLocationInfo(void);
extern u32 GetNumAdventures(void);
extern void xxx_call_draw_string(u32 x, u32 y, const u8 *, u32, u32);
@ -179,7 +179,7 @@ ALIGNED(4) const char load_screen_fill[] = "pksdir0";
void CreateLoadScreen(u32 currMenu)
{
int iVar8;
if (gLoadScreen == NULL) {
gLoadScreen = MemoryAlloc(sizeof(struct LoadScreen),8);
MemoryFill8((u8 *)gLoadScreen,0,sizeof(struct LoadScreen));
@ -230,7 +230,7 @@ u32 UpdateLoadScreenMenu(void)
{
u32 nextMenu;
u32 menuAction;
nextMenu = MENU_NO_SCREEN_CHANGE;
menuAction = 4;
sub_8012FD8(&gLoadScreen->unk54);
@ -311,7 +311,7 @@ void DrawLoadScreenText(void)
r2 = DrawLoadScreenTextSub(teamNameBuffer);
}
ExpandPlaceholdersBuffer(gLoadScreen->formattedTeamName,gUnknown_80E7804,r2);
sprintf_2(gLoadScreen->formattedTeamName,gUnknown_80E7804,r2);
xxx_call_draw_string(64,0,gLoadScreen->formattedTeamName,0,0);
// Draw Player Name
@ -320,7 +320,7 @@ void DrawLoadScreenText(void)
sub_80922B4(playerName, gNoNamePlaceholder, POKEMON_NAME_LENGTH);
else
sub_80922B4(playerName, playerInfo->name, POKEMON_NAME_LENGTH);
ExpandPlaceholdersBuffer(gLoadScreen->formattedPlayerName,gUnknown_80E7804,playerName);
sprintf_2(gLoadScreen->formattedPlayerName,gUnknown_80E7804,playerName);
xxx_call_draw_string(64,12,gLoadScreen->formattedPlayerName,0,0);
// Draw Location Info
@ -328,7 +328,7 @@ void DrawLoadScreenText(void)
if (iVar2 == 0xf1207)
PrintDungeonLocationtoBuffer(gLoadScreen->formattedLocation,GetDungeonLocationInfo());
else
ExpandPlaceholdersBuffer(gLoadScreen->formattedLocation,gQuicksaveDataDeletedText); // Quicksave data deleted
sprintf_2(gLoadScreen->formattedLocation,gQuicksaveDataDeletedText); // Quicksave data deleted
}
else {
switch(sub_8011C1C())
@ -337,12 +337,12 @@ void DrawLoadScreenText(void)
switch(sub_8001658(0,24))
{
default:
ExpandPlaceholdersBuffer(auStack356,gUnknown_80E7804,sub_8098FB4());
sprintf_2(auStack356,gUnknown_80E7804,sub_8098FB4());
xxx_format_string(auStack356,gLoadScreen->formattedLocation,gLoadScreen->formattedPlayTime,0);
break;
case 0x7:
case 0xB:
ExpandPlaceholdersBuffer(gLoadScreen->formattedLocation,gQuicksaveDataDeletedText); // Quicksave data deleted
sprintf_2(gLoadScreen->formattedLocation,gQuicksaveDataDeletedText); // Quicksave data deleted
break;
}
break;
@ -350,10 +350,10 @@ void DrawLoadScreenText(void)
if (iVar2 == 0xf1207)
PrintDungeonLocationtoBuffer(gLoadScreen->formattedLocation,GetDungeonLocationInfo());
else
ExpandPlaceholdersBuffer(gLoadScreen->formattedLocation,gQuicksaveDataDeletedText); // Quicksave data deleted
sprintf_2(gLoadScreen->formattedLocation,gQuicksaveDataDeletedText); // Quicksave data deleted
break;
default:
ExpandPlaceholdersBuffer(gLoadScreen->formattedLocation,gLocationUnknownText); // Location unknown
sprintf_2(gLoadScreen->formattedLocation,gLocationUnknownText); // Location unknown
break;
}
}
@ -361,12 +361,12 @@ void DrawLoadScreenText(void)
// Draw Play Time
DeconstructPlayTime(gPlayTimeRef,&hours,&minutes,&seconds);
ExpandPlaceholdersBuffer(gLoadScreen->formattedPlayTime,gPlayTimePlaceholder,hours,minutes,seconds);
sprintf_2(gLoadScreen->formattedPlayTime,gPlayTimePlaceholder,hours,minutes,seconds);
xxx_call_draw_string(64,36,gLoadScreen->formattedPlayTime,0,0);
// Draw Adventures Info
// Draw Adventures Info
numAdventures = GetNumAdventures();
ExpandPlaceholdersBuffer(gLoadScreen->formattedAdventures,gNumAdventurePlaceholder,numAdventures); // %d
sprintf_2(gLoadScreen->formattedAdventures,gNumAdventurePlaceholder,numAdventures); // %d
xxx_call_draw_string(64,48,gLoadScreen->formattedAdventures,0,0);
// Draw Helper Info
@ -376,14 +376,14 @@ void DrawLoadScreenText(void)
if(temp2->speciesIndex != SPECIES_NONE) {
sub_808D930(speciesHelper,temp2->speciesIndex);
sub_80922B4(nameHelper,temp2->helperName,POKEMON_NAME_LENGTH);
ExpandPlaceholdersBuffer(gLoadScreen->formattedHelperInfo,gHelperInfoPlaceholder,nameHelper,speciesHelper); // %s (%s)
sprintf_2(gLoadScreen->formattedHelperInfo,gHelperInfoPlaceholder,nameHelper,speciesHelper); // %s (%s)
}
else
goto print_helper_placeholder;
}
else {
print_helper_placeholder:
ExpandPlaceholdersBuffer(gLoadScreen->formattedHelperInfo,gNoHelperText); // -----
sprintf_2(gLoadScreen->formattedHelperInfo,gNoHelperText); // -----
}
xxx_call_draw_string(64,60,gLoadScreen->formattedHelperInfo,0,0);
@ -399,7 +399,7 @@ void sub_80397B4(void)
int iVar3;
int iVar4;
s32 other_arg;
clmkFile = OpenFileAndGetFileDataPtr(gClmkpatFileName,&gTitleMenuFileArchive); // clmkpat
for(iVar3 = 0; iVar3 < 64; iVar3++)
@ -426,7 +426,7 @@ bool8 IsQuickSave(void)
{
int iVar1;
bool8 isQuicksave;
iVar1 = sub_8011FA8();
isQuicksave = FALSE;
if (sub_8095324(1) != 0 || sub_8095324(7) != 0)

16
src/moves.c
View File

@ -3,6 +3,7 @@
#include "file_system.h"
#include "moves.h"
#include "code_800D090.h"
struct MoveDataFile
{
@ -37,7 +38,6 @@ extern u8 gUnknown_810992C[];
extern void sub_8093F10(struct PokemonMove *, struct PokemonMove *);
extern void sub_80928C0(u8 *, struct PokemonMove *, struct unkStruct_80928C0 *);
extern void ExpandPlaceholdersBuffer(u8 *, u8 *, ...);
void LoadWazaParameters(void)
{
@ -76,7 +76,7 @@ void sub_80928C0(u8 *buffer, struct PokemonMove *move, struct unkStruct_80928C0
}
if (move->powerBoost != 0)
ExpandPlaceholdersBuffer(localBuffer,gUnknown_81098DC,move->powerBoost); // %+d
sprintf_2(localBuffer,gUnknown_81098DC,move->powerBoost); // %+d
else
localBuffer[0] = '\0';
@ -88,14 +88,14 @@ void sub_80928C0(u8 *buffer, struct PokemonMove *move, struct unkStruct_80928C0
}
switch(param_3->unk0) {
case 0:
ExpandPlaceholdersBuffer
sprintf_2
(buffer,gUnknown_81098E0,uVar2,
gMovesData[move->moveID].namePointer,localBuffer);
break;
case 1:
maxPP = GetMoveMaxPP(move);
ExpandPlaceholdersBuffer
sprintf_2
(buffer,gUnknown_81098EC,uVar2,move->moveFlags & MOVE_FLAG_SET ? gUnknown_8109908 : gUnknown_810990C,
gMovesData[move->moveID].namePointer,localBuffer,param_3->unk4,
move->PP,maxPP);
@ -103,7 +103,7 @@ void sub_80928C0(u8 *buffer, struct PokemonMove *move, struct unkStruct_80928C0
case 2:
maxPP = GetMoveMaxPP(move);
ExpandPlaceholdersBuffer
sprintf_2
(buffer,gUnknown_8109910,uVar2,move->moveFlags & MOVE_FLAG_SET ? gUnknown_8109908 : gUnknown_810990C,
gMovesData[move->moveID].namePointer,localBuffer,param_3->unk4,
move->PP,maxPP);
@ -111,7 +111,7 @@ void sub_80928C0(u8 *buffer, struct PokemonMove *move, struct unkStruct_80928C0
case 3:
maxPP = GetMoveMaxPP(move);
ExpandPlaceholdersBuffer
sprintf_2
(buffer,gUnknown_81098EC,uVar2,move->moveFlags & MOVE_FLAG_ENABLED ? gUnknown_8109928 : gUnknown_810990C,
gMovesData[move->moveID].namePointer,localBuffer,param_3->unk4,
move->PP,maxPP);
@ -119,7 +119,7 @@ void sub_80928C0(u8 *buffer, struct PokemonMove *move, struct unkStruct_80928C0
case 4:
maxPP = GetMoveMaxPP(move);
ExpandPlaceholdersBuffer
sprintf_2
(buffer,gUnknown_8109910,uVar2, move->moveFlags & MOVE_FLAG_ENABLED ? gUnknown_8109928 : gUnknown_810990C,
gMovesData[move->moveID].namePointer,localBuffer,param_3->unk4,
move->PP,maxPP);
@ -331,5 +331,5 @@ bool8 IsBlockedBySoundproof(struct PokemonMove *move)
void sub_8092D54(u8 *buffer, struct PokemonMove *move)
{
ExpandPlaceholdersBuffer(buffer, gUnknown_810992C, gRangeNames[GetMoveRangeType(move)]);
sprintf_2(buffer, gUnknown_810992C, gRangeNames[GetMoveRangeType(move)]);
}

16
src/pokemon_mid.c
View File

@ -6,6 +6,7 @@
#include "subStruct_203B240.h"
#include "constants/colors.h"
#include "constants/move_id.h"
#include "code_800D090.h"
extern struct gPokemon *gMonsterParameters;
extern const char gUnknown_8107600[];
@ -27,7 +28,6 @@ extern u16 gLevelCurrentPokeId;
extern struct LevelData gLevelCurrentData[];
extern void ExpandPlaceholdersBuffer(u8 *buffer, const char *r2, ...);
extern s16 GetBaseSpecies(s16);
extern void sub_80922B4(u8 *, u8 *, s32);
extern int sprintf(char *, const char *, ...);
@ -239,13 +239,13 @@ void CopySpeciesNametoBuffer(u8 * buffer, s16 index)
void CopyYellowSpeciesNametoBuffer(u8 *buffer, s16 index)
{
s32 new_index = index;
ExpandPlaceholdersBuffer(buffer, gUnknown_8107600, gMonsterParameters[new_index].species); // {COLOR_2 YELLOW}%s{END_COLOR_TEXT_2}
sprintf_2(buffer, gUnknown_8107600, gMonsterParameters[new_index].species); // {COLOR_2 YELLOW}%s{END_COLOR_TEXT_2}
}
void CopyCyanSpeciesNametoBuffer(u8 *buffer, s16 index)
{
s32 new_index = index;
ExpandPlaceholdersBuffer(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // {COLOR_2 CYAN}%s{END_COLOR_TEXT_2}
sprintf_2(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // {COLOR_2 CYAN}%s{END_COLOR_TEXT_2}
}
void sub_808D930(u8 *buffer, s16 index)
@ -258,10 +258,10 @@ void sub_808D930(u8 *buffer, s16 index)
preload = gUnknown_8107630; // %s%c
unownString = GetMonSpecies(SPECIES_UNOWN);
unownIndex = GetUnownIndex(index);
ExpandPlaceholdersBuffer(buffer,preload,unownString,gUnownLetters[unownIndex]); // ABCDEFGHIJKLMNOPQRSTUVWXYZ!?
sprintf_2(buffer,preload,unownString,gUnownLetters[unownIndex]); // ABCDEFGHIJKLMNOPQRSTUVWXYZ!?
}
else {
ExpandPlaceholdersBuffer(buffer,gUnknown_8107638, gMonsterParameters[index].species); // %s
sprintf_2(buffer,gUnknown_8107638, gMonsterParameters[index].species); // %s
}
}
@ -278,7 +278,7 @@ void PrintColoredPokeNameToBuffer(u8 *buffer, struct PokemonStruct *pokemon, s32
if (colorNum == COLOR_WHITE) {
colorNum = COLOR_CYAN;
}
ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // {COLOR_2}%c%s{END_COLOR_TEXT_2}
sprintf_2(buffer,gUnknown_810763C,colorNum,nameBuffer); // {COLOR_2}%c%s{END_COLOR_TEXT_2}
}
void sub_808D9DC(u8 *buffer, u8 *param_2, s32 colorNum)
@ -289,7 +289,7 @@ void sub_808D9DC(u8 *buffer, u8 *param_2, s32 colorNum)
if (colorNum == COLOR_WHITE) {
colorNum = COLOR_YELLOW;
}
ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // {COLOR_2}%c%s{END_COLOR_TEXT_2}
sprintf_2(buffer,gUnknown_810763C,colorNum,nameBuffer); // {COLOR_2}%c%s{END_COLOR_TEXT_2}
}
void sub_808DA0C(u8 *buffer, u8 *param_2)
@ -297,7 +297,7 @@ void sub_808DA0C(u8 *buffer, u8 *param_2)
u8 nameBuffer [20];
sub_80922B4(nameBuffer, param_2 + 0x58, POKEMON_NAME_LENGTH);
ExpandPlaceholdersBuffer(buffer,gUnknown_8107638,nameBuffer); // %s
sprintf_2(buffer,gUnknown_8107638,nameBuffer); // %s
}
void PrintPokeNameToBuffer(u8 *buffer, struct PokemonStruct *pokemon)

6
src/thank_you_wonder_mail.c
View File

@ -10,6 +10,7 @@
#include "input.h"
#include "text.h"
#include "team_inventory.h"
#include "code_800D090.h"
extern struct WonderMailStruct_203B2C4 *gUnknown_203B2C4;
@ -217,7 +218,6 @@ extern void sub_802F2C0();
extern u32 sub_80144A4(s32 *r0);
extern void SetThankYouMailMenuState(u32);
extern struct PokemonStruct *GetPlayerPokemonStruct(void);
extern void ExpandPlaceholdersBuffer(u8 *buffer, const char *text, ...);
extern void SetMenuItems(void *menu, struct UnkTextStruct2 *, u32, const struct UnkTextStruct2 *, const struct MenuItem *entries, u32, u32, u32);
extern void sub_80922B4(u8 *, u8 *, u32);
extern void sub_802F204(struct unkStruct_802F204 *, u32);
@ -1286,7 +1286,7 @@ void UpdateThankYouMailText(void)
case 5:
pokeStruct = GetPlayerPokemonStruct();
sub_80922B4(auStack180,pokeStruct->name, POKEMON_NAME_LENGTH);
ExpandPlaceholdersBuffer(gUnknown_203B2C4->formattedString,gUnknown_80DF250,auStack180);
sprintf_2(gUnknown_203B2C4->formattedString,gUnknown_80DF250,auStack180);
sub_80141B4(gUnknown_203B2C4->formattedString,0,&gUnknown_203B2C4->faceFile,0x10d);
break;
case 0xe:
@ -1445,7 +1445,7 @@ void UpdateThankYouMailText(void)
case THANK_YOU_MAIL_COMMS_CLEANUP:
pokeStruct2 = GetPlayerPokemonStruct();
sub_80922B4(auStack100, pokeStruct2->name, POKEMON_NAME_LENGTH);
ExpandPlaceholdersBuffer(gUnknown_203B2C4->formattedString,gUnknown_80DF63C,auStack100);
sprintf_2(gUnknown_203B2C4->formattedString,gUnknown_80DF63C,auStack100);
sub_80141B4(gUnknown_203B2C4->formattedString,0,&gUnknown_203B2C4->faceFile,0x10d);
break;
case CONFIRM_ITEM_TO_SEND:

4
src/wonder_mail_2.c
View File

@ -10,6 +10,7 @@
#include "sub_8095228.h"
#include "gUnknown_203B46C.h"
#include "wonder_mail.h"
#include "code_800D090.h"
struct unkStruct_203B2C8
{
@ -139,7 +140,6 @@ extern void sub_802B5B8(void);
extern void sub_802B5FC(void);
extern void sub_802B624(void);
void ExpandPlaceholdersBuffer(u8 *buffer, const char *text, ...);
extern void sub_802F204(struct unkStruct_802F204 *, u32);
extern void sub_803C37C(u8 *, u32, u8 *);
extern u32 sub_803C200(u8 *, u32);
@ -374,7 +374,7 @@ void sub_802B3E0(void)
strcpy(teamNameBuffer,gRescueTeamNamePlaceholder);
}
// Print and expand placeholders?
ExpandPlaceholdersBuffer(gUnknown_203B2C8->teamName,gUnknown_80DF9F8,teamNameBuffer);
sprintf_2(gUnknown_203B2C8->teamName,gUnknown_80DF9F8,teamNameBuffer);
// Display to screen with Pelipper face
sub_80141B4(gUnknown_203B2C8->teamName, 0, &gUnknown_203B2C8->faceFile, 0x10d);
break;