Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-04-26 00:11:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

StringCat_HandleTrainerName -> String_ConcatTrainerName

Browse Source
This commit is contained in:
Eduardo Quezada 2025-12-30 11:06:00 -03:00
parent 6c6e097a25
commit 9cd075df7c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arm9/global.inc
View File

@ -1406,7 +1406,7 @@
.extern String_Concat
.extern String_AppendChar
.extern StrUpperFirstChar
.extern StringCat_HandleTrainerName
.extern String_ConcatTrainerName
.extern sub_020220C4
.extern sub_0202212C
.extern sub_02022144

2
arm9/src/message_format.c
View File

@ -610,7 +610,7 @@ void StringExpandPlaceholders(MessageFormat *messageFormat, struct String *dest,
if (MsgArray_ControlCodeIsStrVar(cstr)) {
u32 idx = MsgArray_ControlCodeGetField(cstr, 0);
GF_ASSERT(idx < messageFormat->count);
StringCat_HandleTrainerName(dest, messageFormat->fields[idx].msg);
String_ConcatTrainerName(dest, messageFormat->fields[idx].msg);
cstr = MsgArray_SkipControlCode(cstr);
} else {
const u16 *before = cstr;

2
arm9/src/string_gf.c
View File

@ -278,7 +278,7 @@ BOOL String_IsTrainerName(String *string) {
return string->size != 0 && string->data[0] == 0xF100;
}
void StringCat_HandleTrainerName(String *dest, String *src) {
void String_ConcatTrainerName(String *dest, String *src) {
if (String_IsTrainerName(src)) {
u16 *dest_p = &dest->data[dest->size];
u16 *src_p = &src->data[1];

2
include/string_gf.h
View File

@ -33,6 +33,6 @@ void String_AppendChar(String *string, u16 val);
void String_Concat(String *dest, String *src);
void StrUpperFirstChar(String *string);
BOOL String_IsTrainerName(String *string);
void StringCat_HandleTrainerName(String *dest, String *src);
void String_ConcatTrainerName(String *dest, String *src);
#endif // POKEDIAMOND_STRING16_H