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

String_SetEmpty -> String_Clear

Browse Source
This commit is contained in:
Eduardo Quezada 2025-12-29 23:15:09 -03:00
parent 8c6965040d
commit 21555b4a83
19 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arm9/asm/unk_020653EC.s
View File

@ -1538,7 +1538,7 @@ sub_02065FF8: ; 0x02065FF8
ldr r0, [r0, #0x8]
cmp r0, #0x0
beq _0206600E
bl String_SetEmpty
bl String_Clear
_0206600E:
pop {r3, pc}
@ -2076,7 +2076,7 @@ _02066426:
mov r0, #0x45
lsl r0, r0, #0x2
ldr r0, [r5, r0]
bl String_SetEmpty
bl String_Clear
mov r0, #0x1
str r0, [sp, #0x0]
mov r0, #0x2

2
arm9/asm/unk_02080C38.s
View File

@ -1787,7 +1787,7 @@ _020819A2:
add r0, r6, #0x0
add r0, #0xe8
ldr r0, [r0, #0x0]
bl String_SetEmpty
bl String_Clear
add r1, r6, #0x0
add r1, #0xe8
ldr r1, [r1, #0x0]

2
arm9/asm/unk_020834D0.s
View File

@ -547,7 +547,7 @@ sub_02083888: ; 0x02083888
add r4, #0xe8
lsl r7, r0, #0x2
ldr r0, [r4, r7]
bl String_SetEmpty
bl String_Clear
ldr r0, [r4, r7]
add r1, r5, #0x4
bl CopyU16ArrayToString

2
arm9/global.inc
View File

@ -1390,7 +1390,7 @@
.extern StringGetWidth_SingleLine_HandleClearToControlCode
.extern String_New
.extern String_Free
.extern String_SetEmpty
.extern String_Clear
.extern String_Copy
.extern String_Clone
.extern String_FormatInt

2
arm9/overlays/14/asm/overlay_14.s
View File

@ -9284,7 +9284,7 @@ _021DBF8C:
ldr r1, [r4, #0x14]
bl String_Copy
ldr r0, [r4, #0x14]
bl String_SetEmpty
bl String_Clear
_021DBF9A:
ldrh r1, [r4, #6]
cmp r1, #0

4
arm9/overlays/55/asm/overlay_55.s
View File

@ -2678,7 +2678,7 @@ ov55_021D8A28: ; 0x021D8A28
add r4, r6, #0
_021D8A46:
ldr r0, [r5, #0x38]
bl String_SetEmpty
bl String_Clear
add r0, r7, #0
add r1, r4, #0
bl sub_0202842C
@ -5094,7 +5094,7 @@ ov55_021D9E40: ; 0x021D9E40
b _021D9EBE
_021D9EB8:
ldr r0, [r0, #0x18]
bl String_SetEmpty
bl String_Clear
_021D9EBE:
add r0, r6, #0
add sp, #4

4
arm9/overlays/59/src/ov59_Intro.c
View File

@ -2349,7 +2349,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) {
case -2:
case 2:
String_SetEmpty(data->playerStruct->name);
String_Clear(data->playerStruct->name);
data->nextControllerCounter = 63;
data->controllerCounter = 81;
break;
@ -2504,7 +2504,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) {
case -2:
case 2:
String_SetEmpty(data->rivalStruct->name);
String_Clear(data->rivalStruct->name);
data->controllerCounter = 88;
break;
}

4
arm9/overlays/60/asm/overlay_60.s
View File

@ -1018,7 +1018,7 @@ ov60_021D7D18: ; 0x021D7D18
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r5, #0
bl String_SetEmpty
bl String_Clear
ldr r1, _021D7DF0 ; =gGameVersion
ldr r0, [r6, #0x20]
ldrb r1, [r1]
@ -1042,7 +1042,7 @@ ov60_021D7D18: ; 0x021D7D18
add r7, #0x3c
_021D7D7E:
add r0, r5, #0
bl String_SetEmpty
bl String_Clear
ldr r0, [r6, #0x20]
add r1, r4, #3
add r2, r5, #0

2
arm9/overlays/61/asm/overlay_61.s
View File

@ -1588,7 +1588,7 @@ _021D8164:
str r0, [sp, #0x18]
_021D8196:
add r0, r5, #0
bl String_SetEmpty
bl String_Clear
ldr r0, [r4, #0x20]
add r1, r6, #0
add r2, r5, #0

8
arm9/overlays/65/asm/overlay_65.s
View File

@ -2165,7 +2165,7 @@ _021D85B4:
add r1, r1, r5
bl ov65_021D847C
ldr r0, [r4, #0x34]
bl String_SetEmpty
bl String_Clear
ldr r0, [r4, #0x20]
add r0, r0, r5
ldrb r2, [r0, #0x1f]
@ -2339,7 +2339,7 @@ ov65_021D8718: ; 0x021D8718
sub sp, #8
add r4, r0, #0
ldr r0, [r4, #0x34]
bl String_SetEmpty
bl String_Clear
ldrb r1, [r4, #0x1a]
ldr r2, [r4, #0x20]
ldr r0, [r4, #0x28]
@ -2376,7 +2376,7 @@ ov65_021D8764: ; 0x021D8764
sub sp, #8
add r4, r0, #0
ldr r0, [r4, #0x34]
bl String_SetEmpty
bl String_Clear
ldrb r1, [r4, #0x1a]
ldr r2, [r4, #0x20]
ldr r0, [r4, #0x28]
@ -3844,7 +3844,7 @@ ov65_021D92C4: ; 0x021D92C4
mov r1, #0xff
bl FillWindowPixelBuffer
ldr r0, [r4, #0x20]
bl String_SetEmpty
bl String_Clear
mov r0, #1
str r0, [sp]
mov r3, #2

4
arm9/overlays/66/asm/overlay_66.s
View File

@ -1299,7 +1299,7 @@ _021D7EF8:
add r0, r6, #0
add r0, #0x88
ldr r0, [r0]
bl String_SetEmpty
bl String_Clear
ldr r2, [r4, #0x18]
ldr r3, [r4, #0x1c]
add r0, r6, #0
@ -1717,7 +1717,7 @@ ov66_021D820C: ; 0x021D820C
ldr r6, [r5, #0x34]
add r7, r2, #0
str r3, [sp, #0x10]
bl String_SetEmpty
bl String_Clear
add r0, r4, #0
mov r1, #0
bl FillWindowPixelBuffer

2
arm9/overlays/70/asm/overlay_70.s
View File

@ -1219,7 +1219,7 @@ _021D7E5E:
mov r0, #0x19
lsl r0, r0, #4
ldr r0, [r5, r0]
bl String_SetEmpty
bl String_Clear
_021D7E68:
mov r1, #0
str r1, [sp]

2
arm9/overlays/74/asm/overlay_74.s
View File

@ -1443,7 +1443,7 @@ ov74_021D8008: ; 0x021D8008
add r1, sp, #0x10
bl sub_0202A864
ldr r0, [r4, #0x30]
bl String_SetEmpty
bl String_Clear
mov r1, #0
str r1, [sp]
mov r0, #1

2
arm9/src/easy_chat.c
View File

@ -116,7 +116,7 @@ void GetECWordIntoStringByIndex(u32 ecWord, String *dest) {
category = sNarcMsgBanks[category];
ReadMsgData_NewNarc_ExistingString(NARC_MSGDATA_MSG, category, msgNo, HEAP_ID_DEFAULT, dest);
} else {
String_SetEmpty(dest);
String_Clear(dest);
}
}

6
arm9/src/message_format.c
View File

@ -443,7 +443,7 @@ void BufferGenderSymbol(MessageFormat *messageFormat, u32 idx, u32 gender) {
ReadMsgDataIntoString(msgData, narc_0199_00069, messageFormat->buffer); // ♀
break;
default:
String_SetEmpty(messageFormat->buffer);
String_Clear(messageFormat->buffer);
break;
}
SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL);
@ -604,7 +604,7 @@ void MessageFormat_UpperFirstChar(MessageFormat *messageFormat, u32 idx) {
void StringExpandPlaceholders(MessageFormat *messageFormat, struct String *dest, struct String *src) {
const u16 *cstr = String_c_str(src);
String_SetEmpty(dest);
String_Clear(dest);
while (*cstr != EOS) {
if (*cstr == EXT_CTRL_CODE_BEGIN) {
if (MsgArray_ControlCodeIsStrVar(cstr)) {
@ -627,7 +627,7 @@ void StringExpandPlaceholders(MessageFormat *messageFormat, struct String *dest,
void MessageFormat_ResetBuffers(MessageFormat *messageFormat) {
for (int i = 0; i < messageFormat->count; i++) {
String_SetEmpty(messageFormat->fields[i].msg);
String_Clear(messageFormat->fields[i].msg);
}
}

4
arm9/src/msgdata.c
View File

@ -93,7 +93,7 @@ static void ReadMsgData_ExistingTable_ExistingString(struct MsgDataTable *table,
}
} else {
GF_ASSERT(FALSE);
String_SetEmpty(dest);
String_Clear(dest);
}
}
@ -152,7 +152,7 @@ static void ReadMsgData_ExistingNarc_ExistingString(NARC *narc, u32 group, u32 n
}
} else {
GF_ASSERT(FALSE);
String_SetEmpty(dest);
String_Clear(dest);
}
}

6
arm9/src/string_gf.c
View File

@ -27,7 +27,7 @@ void String_Free(String *string) {
Heap_Free(string);
}
void String_SetEmpty(String *string) {
void String_Clear(String *string) {
String_Assert(string);
string->size = 0;
string->data[0] = EOS;
@ -82,7 +82,7 @@ void String_FormatInt(String *string, int num, u32 ndigits, enum PrintingMode pr
if (string->maxsize > ndigits + isNegative) {
charbase = (whichCharset == 0) ? sCharset_JP : sCharset_EN;
String_SetEmpty(string);
String_Clear(string);
if (isNegative) {
num *= -1;
u16 hyphen = (u16)((whichCharset == 0) ? 0x00F1 : 0x01BE);
@ -180,7 +180,7 @@ void StringGetLineN(String *dest, const String *src, u32 n) {
}
}
}
String_SetEmpty(dest);
String_Clear(dest);
for (; i < src->size; i++) {
u16 c = src->data[i];
if (c == CHAR_LF) {

2
arm9/src/trainer_data.c
View File

@ -129,7 +129,7 @@ void GetTrainerMessageByIdPair(u32 trainer_idx, u32 msg_id, struct String *str,
}
NARC_Delete(trTblNarc);
if (rdbuf[0] == trTblSize) {
String_SetEmpty(str);
String_Clear(str);
}
}

2
include/string_gf.h
View File

@ -17,7 +17,7 @@ typedef struct String {
String *String_New(u32 count, enum HeapID heapID);
BOOL String_Compare(String *, String *);
void CopyU16ArrayToStringN(String *, u16 *, u32); // copy
void String_SetEmpty(String *); // set empty
void String_Clear(String *); // set empty
String *String_Clone(String *, enum HeapID heapID);
void String_Free(String *string);
void String_Copy(String *dest, String *src);