sub_02014B34, MessageUtil_ExpandedStrbuf, MessageUtil_MoveName and MessageUtil_SpeciesName

This commit is contained in:
Eduardo Quezada 2025-03-15 00:27:37 -03:00
parent 30b901cbd5
commit 83f42dde1f
24 changed files with 41 additions and 41 deletions

View File

@ -9,7 +9,7 @@ void sub_02014A84(Sentence *param0);
void sub_02014A9C(Sentence *param0, u32 param1);
void sub_02014AB4(Sentence *param0);
void sub_02014AC4(Sentence *param0, int param1);
Strbuf *sub_02014B34(const Sentence *param0, u32 param1);
Strbuf *sub_02014B34(const Sentence *sentence, u32 heapID);
Strbuf *sub_02014BA0(const Sentence *param0, u32 param1);
BOOL sub_02014BBC(const Sentence *param0);
BOOL sub_02014BD0(const Sentence *param0);

View File

@ -1734,9 +1734,9 @@ u8 ov16_0223F9FC(BattleSystem *battleSystem, int param1, int param2, int param3,
Strbuf *v2;
if (param3 == 100) {
v2 = sub_02014B34(&battleSystem->trainers[param2].winMsg, 5);
v2 = sub_02014B34(&battleSystem->trainers[param2].winMsg, HEAP_ID_BATTLE);
} else {
v2 = sub_02014B34(&battleSystem->trainers[param2].loseMsg, 5);
v2 = sub_02014B34(&battleSystem->trainers[param2].loseMsg, HEAP_ID_BATTLE);
}
Window_FillTilemap(v0, 0xff);

View File

@ -2769,7 +2769,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const MoveDispla
}
if ((v0->unk_28[i].unk_00.pixels == NULL) || ((param2->move[i] != v0->unk_00.move[i]) && (param2->move[i] != 0))) {
v6 = MessageUtil_MoveName(param2->move[i], 5);
v6 = MessageUtil_MoveName(param2->move[i], HEAP_ID_BATTLE);
ov16_0226AEA0(param0, v6, FONT_SUBSCREEN, &v0->unk_28[i], TEXT_COLOR(7, 8, 9));
Strbuf_Free(v6);
}

View File

@ -157,7 +157,7 @@ static void ov5_021DD664(UnkStruct_ov5_021DD648 *param0, u16 param1, u16 param2,
sub_02014CF8(&v0, 0, param3);
sub_02014CF8(&v0, 1, param4);
v1 = sub_02014B34(&v0, 32);
v1 = sub_02014B34(&v0, HEAP_ID_FIELD_TASK);
Strbuf_Copy(param0->unk_00, v1);
Strbuf_Free(v1);

View File

@ -755,7 +755,7 @@ void ov5_021E6DE8(Pokemon *param0, u16 param1, UnkStruct_02026310 *param2, u32 p
Pokemon_SetValue(param0, MON_DATA_MET_LEVEL, &v0);
Pokemon_SetValue(param0, MON_DATA_FORM, &param4);
v3 = MessageUtil_SpeciesName(SPECIES_EGG, 4);
v3 = MessageUtil_SpeciesName(SPECIES_EGG, HEAP_ID_FIELD);
Pokemon_SetValue(param0, MON_DATA_NICKNAME_STRBUF, v3);
Strbuf_Free(v3);

View File

@ -1450,7 +1450,7 @@ void ov17_02240A80(UnkStruct_ov17_0223F7E4 *param0, u16 param1[])
v0->unk_130[v1] = 0;
}
v2 = MessageUtil_MoveName(param1[v1], 21);
v2 = MessageUtil_MoveName(param1[v1], HEAP_ID_21);
ov17_02240BF4(param0, v2, FONT_SUBSCREEN, &v0->unk_00[v1], TEXT_COLOR(1, 7, 8));
Strbuf_Free(v2);

View File

@ -776,7 +776,7 @@ static Strbuf *ov56_02256E5C(UnkStruct_02027F8C *param0, u32 param1, StringTempl
Strbuf_Free(v1);
}
v0 = MessageUtil_ExpandedStrbuf(param2, param3, 208, 89);
v0 = MessageUtil_ExpandedStrbuf(param2, param3, 208, HEAP_ID_89);
}
return v0;
@ -807,7 +807,7 @@ static void ov56_02256EE8(UnkStruct_ov56_02256468 *param0, u32 param1, Sentence
v0->unk_00[*v2].unk_14 = *param2;
v0->unk_00[*v2].unk_0C = param1;
v0->unk_00[*v2].unk_10 = TrainerInfo_Gender(param3);
v0->unk_00[*v2].unk_04 = sub_02014B34(param2, 89);
v0->unk_00[*v2].unk_04 = sub_02014B34(param2, HEAP_ID_89);
v0->unk_00[*v2].unk_08 = ov56_02256E5C(v1, param1, param0->unk_18, param0->unk_1C, param0->unk_10);
(*v2)++;

View File

@ -1473,7 +1473,7 @@ static BOOL ov59_021D2418(Window *param0, int param1, u32 param2, UnkStruct_0209
TrainerInfo_NameStrbuf(param3->unk_3C8[v0][0], param3->unk_2C[v0]);
StringTemplate_SetNumber(param3->unk_24, 0, v3, 5, 2, 1);
v2 = MessageUtil_ExpandedStrbuf(param3->unk_24, param3->unk_28, 1, 51);
v2 = MessageUtil_ExpandedStrbuf(param3->unk_24, param3->unk_28, 1, HEAP_ID_51);
if (v1 == v0) {
Text_AddPrinterWithParamsAndColor(&param0[0], FONT_SYSTEM, param3->unk_2C[v0], 5, 1 + v0 * 18, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 3, 0), NULL);

View File

@ -516,7 +516,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
v8 = sub_02030C28(v11, &v15, 102);
if (v8 == NULL) {
v8 = sub_02014B34(&v15, 102);
v8 = sub_02014B34(&v15, HEAP_ID_102);
}
Window_FillTilemap(v10, 0x00);

View File

@ -505,7 +505,7 @@ static void ov88_0223B748(Window *param0, StringTemplate *param1, MessageLoader
int v0;
for (v0 = 0; v0 < Party_GetCurrentCount(param3); v0++) {
Strbuf *v1 = MessageUtil_ExpandedStrbuf(param1, param2, 1 + param4 + v0, 26);
Strbuf *v1 = MessageUtil_ExpandedStrbuf(param1, param2, 1 + param4 + v0, HEAP_ID_26);
ov88_0223EC78(&param0[v0], v1, 8, TEXT_SPEED_INSTANT, 1, 0);
Strbuf_Free(v1);

View File

@ -129,7 +129,7 @@ int ov88_0223ECBC(Window *param0, int param1, int param2, MessageLoader *param3,
Strbuf *v0;
int v1;
v0 = MessageUtil_ExpandedStrbuf(param4, param3, param1, 26);
v0 = MessageUtil_ExpandedStrbuf(param4, param3, param1, HEAP_ID_26);
if (param2 == 1) {
Window_DrawMessageBoxWithScrollCursor(param0, 0, (512 - (9 + (18 + 12))), 10);

View File

@ -525,7 +525,7 @@ void ov94_0223D910(MessageLoader *param0, MessageLoader *param1, StringTemplate
StringTemplate_SetNumber(param2, 3, level, 3, 0, 1);
v2 = MessageUtil_ExpandedStrbuf(param2, param0, 102, 62);
v2 = MessageUtil_ExpandedStrbuf(param2, param0, 102, HEAP_ID_62);
v0 = MessageLoader_GetNewStrbuf(param1, species);
Item_LoadName(v5, v8, 62);

View File

@ -299,8 +299,8 @@ static void ov94_0223DFDC(UnkStruct_ov94_0223FD4C *param0)
StringTemplate_SetCityName(param0->unk_B8C, 9, v2->unk_11E, v2->unk_11F);
}
param0->unk_BB4[0] = MessageUtil_ExpandedStrbuf(param0->unk_B8C, param0->unk_B90, 79, 62);
param0->unk_BB4[1] = MessageUtil_ExpandedStrbuf(param0->unk_B8C, param0->unk_B90, 80, 62);
param0->unk_BB4[0] = MessageUtil_ExpandedStrbuf(param0->unk_B8C, param0->unk_B90, 79, HEAP_ID_62);
param0->unk_BB4[1] = MessageUtil_ExpandedStrbuf(param0->unk_B8C, param0->unk_B90, 80, HEAP_ID_62);
}
static void ov94_0223E074(UnkStruct_ov94_0223FD4C *param0)

View File

@ -973,7 +973,7 @@ static void ov94_022423FC(MessageLoader *param0, StringTemplate *param1, Window
v0 = MessageLoader_GetNewStrbuf(param0, 100);
StringTemplate_SetNumber(param1, 3, level, 3, 0, 1);
v1 = MessageUtil_ExpandedStrbuf(param1, param0, 102, 62);
v1 = MessageUtil_ExpandedStrbuf(param1, param0, 102, HEAP_ID_62);
if (gender != GENDER_NONE + 1) {
MessageLoader_GetStrbuf(param0, Unk_ov94_02245FD8[gender], v3);

View File

@ -528,7 +528,7 @@ static void ov97_0222B4FC(UnkStruct_0222AE60 *param0, int param1, int param2)
static void ov97_0222B53C(Window *param0, MessageLoader *param1, StringTemplate *param2, TextColor param3, u32 param4, int param5)
{
int v0, v1;
Strbuf *v2 = MessageUtil_ExpandedStrbuf(param2, param1, param4, 81);
Strbuf *v2 = MessageUtil_ExpandedStrbuf(param2, param1, param4, HEAP_ID_81);
v0 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, Font_GetAttribute(FONT_SYSTEM, FONTATTR_LETTER_SPACING));
v1 = Window_GetWidth(param0) * 8 - (v0 + 32);
@ -579,7 +579,7 @@ static BOOL ov97_0222B5C0(void *param0, int param1, UnkStruct_ov97_02237808 *par
continue;
}
v3 = MessageUtil_ExpandedStrbuf(v4, v5, Unk_ov97_0223DF40[v0], 81);
v3 = MessageUtil_ExpandedStrbuf(v4, v5, Unk_ov97_0223DF40[v0], HEAP_ID_81);
Text_AddPrinterWithParamsAndColor(param2->unk_10, FONT_SYSTEM, v3, 32, v0 * 16, TEXT_SPEED_NO_TRANSFER, v7, NULL);
Strbuf_Free(v3);
}

View File

@ -847,7 +847,7 @@ static void ov97_0222DE78(OverlayManager *param0, Window *param1, u32 param2)
if (v1->unk_14) {
v0 = v1->unk_14;
} else {
v0 = MessageUtil_ExpandedStrbuf(v1->unk_0C, v1->unk_10, param2, 86);
v0 = MessageUtil_ExpandedStrbuf(v1->unk_0C, v1->unk_10, param2, HEAP_ID_86);
}
v1->unk_6C = Text_AddPrinterWithParamsAndColor(param1, FONT_MESSAGE, v0, 0, 0, v1->unk_68, TEXT_COLOR(1, 2, 15), NULL);
@ -1032,7 +1032,7 @@ static int ov97_0222E228(OverlayManager *param0, Window *param1, int param2, int
if (param1 && param2) {
v1 = MessageLoader_Init(1, 26, 421, HEAP_ID_86);
v0 = StringTemplate_Default(HEAP_ID_86);
v2->unk_14 = MessageUtil_ExpandedStrbuf(v0, v1, param2, 86);
v2->unk_14 = MessageUtil_ExpandedStrbuf(v0, v1, param2, HEAP_ID_86);
v2->unk_68 = 1;
ov97_0222DE78(param0, param1, param2);

View File

@ -324,7 +324,7 @@ static void ov97_022305EC(Window *param0, int param1)
Window_FillTilemap(param0, Font_GetAttribute(FONT_MESSAGE, FONTATTR_BG_COLOR));
v0 = MessageUtil_ExpandedStrbuf(v2, v1, param1, 87);
v0 = MessageUtil_ExpandedStrbuf(v2, v1, param1, HEAP_ID_87);
Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Window_CopyToVRAM(param0);
@ -492,7 +492,7 @@ static BOOL ov97_02230A34(UnkStruct_ov97_02230868 *param0, Window *param1, u32 p
if (param0->unk_2C14[param0->unk_2C20]->unk_348 == 255) {
Strbuf *v0;
v0 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, 51, 87);
v0 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, 51, HEAP_ID_87);
Text_AddPrinterWithParamsAndColor(param1, FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, param2, NULL);
Strbuf_Free(v0);
return 0;
@ -649,7 +649,7 @@ static int ov97_02230E04(UnkStruct_ov97_02230868 *param0, Window *param1, int pa
v2->unk_24(param0, param1, 66048);
if (v2->unk_20) {
v0 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, v2->unk_20, 87);
v0 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, v2->unk_20, HEAP_ID_87);
Text_AddPrinterWithParamsAndColor(param1, v2->unk_14, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, v2->unk_18, NULL);
Strbuf_Free(v0);
@ -1368,7 +1368,7 @@ static int ov97_02231CA0(UnkStruct_ov97_02230868 *param0, Window *param1)
if (v5) {
StringTemplate_SetPlayerName(v7, 0, v5);
v6 = MessageUtil_ExpandedStrbuf(v7, v8, 53, 87);
v6 = MessageUtil_ExpandedStrbuf(v7, v8, 53, HEAP_ID_87);
if (TrainerInfo_Gender(v5) == 0) {
Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, v6, 0, v2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(5, 6, 0), NULL);
@ -1379,7 +1379,7 @@ static int ov97_02231CA0(UnkStruct_ov97_02230868 *param0, Window *param1)
Strbuf_Free(v6);
StringTemplate_SetNumber(v7, 0, TrainerInfo_ID(v5) & 0xFFFF, 5, 2, 1);
v6 = MessageUtil_ExpandedStrbuf(v7, v8, 54, 87);
v6 = MessageUtil_ExpandedStrbuf(v7, v8, 54, HEAP_ID_87);
Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, v6, 80, v2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 15, 0), NULL);
Strbuf_Free(v6);
@ -1409,7 +1409,7 @@ static void ov97_02231E78(UnkStruct_ov97_02230868 *param0, Window *param1, int p
Window_FillTilemap(param1, 0);
StringTemplate_SetNumber(param0->unk_2A60, 0, param0->unk_2C54, 1, 1, 1);
v0 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, 56, 87);
v0 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, 56, HEAP_ID_87);
Text_AddPrinterWithParamsAndColor(param1, FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Window_CopyToVRAM(param1);

View File

@ -221,7 +221,7 @@ static void ov104_022320FC(Strbuf *param0, u16 param1, u16 param2, u16 param3, u
sub_02014CF8(&v0, 0, param3);
sub_02014CF8(&v0, 1, param4);
v1 = sub_02014B34(&v0, 32);
v1 = sub_02014B34(&v0, HEAP_ID_FIELD_TASK);
Strbuf_Copy(param0, v1);
Strbuf_Free(v1);
}

View File

@ -1467,7 +1467,7 @@ static BOOL ov109_021D537C(Window *param0, int param1, TextColor param2, UnkStru
TrainerInfo_NameStrbuf(param3->unk_3D8[v0][0], param3->unk_3C[v0]);
StringTemplate_SetNumber(param3->unk_34, 0, v3, 5, 2, 1);
v2 = MessageUtil_ExpandedStrbuf(param3->unk_34, param3->unk_38, 1, 95);
v2 = MessageUtil_ExpandedStrbuf(param3->unk_34, param3->unk_38, 1, HEAP_ID_95);
if (v1 == v0) {
Text_AddPrinterWithParamsAndColor(&param0[0], FONT_SYSTEM, param3->unk_3C[v0], 5, 1 + v0 * 18, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 3, 0), NULL);

View File

@ -924,7 +924,7 @@ static u32 BoxPokemon_GetDataInternal(BoxPokemon *boxMon, enum PokemonDataParam
// fall-through
case MON_DATA_NICKNAME_STRBUF:
if (boxMon->invalidData) {
Strbuf *strbuf = MessageUtil_SpeciesName(SPECIES_BAD_EGG, 0);
Strbuf *strbuf = MessageUtil_SpeciesName(SPECIES_BAD_EGG, HEAP_ID_SYSTEM);
Strbuf_Copy(dest, strbuf);
Strbuf_Free(strbuf);

View File

@ -7547,7 +7547,7 @@ static BOOL ScrCmd_2AA(ScriptContext *ctx)
StringTemplate_SetCustomMessageWord(v6, 2, v4);
StringTemplate_SetCustomMessageWord(v6, 3, v5);
v8 = MessageUtil_ExpandedStrbuf(v6, v7, 1, 32);
v8 = MessageUtil_ExpandedStrbuf(v6, v7, 1, HEAP_ID_FIELD_TASK);
v9 = MessageLoader_GetNewStrbuf(v7, 0);
*v1 = (Strbuf_Compare(v8, v9) == 0);

View File

@ -85,25 +85,25 @@ void sub_02014AC4(Sentence *param0, int param1)
}
}
Strbuf *sub_02014B34(const Sentence *param0, u32 param1)
Strbuf *sub_02014B34(const Sentence *sentence, u32 heapID)
{
Strbuf *v0;
StringTemplate *v1;
MessageLoader *v2;
int v3;
v1 = StringTemplate_Default(param1);
v1 = StringTemplate_Default(heapID);
for (v3 = 0; v3 < 2; v3++) {
if (param0->words[v3] != 0xffff) {
StringTemplate_SetCustomMessageWord(v1, v3, param0->words[v3]);
if (sentence->words[v3] != 0xffff) {
StringTemplate_SetCustomMessageWord(v1, v3, sentence->words[v3]);
} else {
break;
}
}
v2 = MessageLoader_Init(1, 26, Unk_020E5498[param0->type], param1);
v0 = MessageUtil_ExpandedStrbuf(v1, v2, param0->id, param1);
v2 = MessageLoader_Init(1, 26, Unk_020E5498[sentence->type], heapID);
v0 = MessageUtil_ExpandedStrbuf(v1, v2, sentence->id, heapID);
MessageLoader_Free(v2);
StringTemplate_Free(v1);

View File

@ -298,7 +298,7 @@ static void sub_02053028(FieldSystem *fieldSystem, UnkStruct_0205300C *param1, i
v1 = StringTemplate_Default(HEAP_ID_FIELD);
StringTemplate_SetPlayerName(v1, 0, SaveData_GetTrainerInfo(fieldSystem->saveData));
param1->unk_2C = MessageUtil_ExpandedStrbuf(v1, v0, 16, 4);
param1->unk_2C = MessageUtil_ExpandedStrbuf(v1, v0, 16, HEAP_ID_FIELD);
StringTemplate_Free(v1);
} else {
param1->unk_2C = MessageLoader_GetNewStrbuf(v0, 18);

View File

@ -1406,8 +1406,8 @@ static void sub_0208737C(UnkStruct_02087A10 *param0, OverlayManager *param1)
param0->unk_14 = 1;
}
param0->unk_178 = MessageUtil_ExpandedStrbuf(param0->unk_168, param0->unk_16C, Unk_020F2850[param0->unk_00], 18);
param0->unk_17C = MessageUtil_ExpandedStrbuf(param0->unk_168, param0->unk_16C, 8, 18);
param0->unk_178 = MessageUtil_ExpandedStrbuf(param0->unk_168, param0->unk_16C, Unk_020F2850[param0->unk_00], HEAP_ID_18);
param0->unk_17C = MessageUtil_ExpandedStrbuf(param0->unk_168, param0->unk_16C, 8, HEAP_ID_18);
param0->unk_184 = MessageLoader_GetNewStrbuf(param0->unk_16C, 7);
param0->unk_158 = CharCode_Length(param0->unk_118);
param0->unk_1C.unk_00 = 0;
@ -1473,7 +1473,7 @@ static void sub_02087544(UnkStruct_02087A10 *param0, OverlayManager *param1)
StringTemplate_SetStrbuf(param0->unk_168, 0, v0, 0, 0, 0);
}
param0->unk_180 = MessageUtil_ExpandedStrbuf(param0->unk_168, param0->unk_174, v1->unk_44, 18);
param0->unk_180 = MessageUtil_ExpandedStrbuf(param0->unk_168, param0->unk_174, v1->unk_44, HEAP_ID_18);
param0->unk_14 = 1;
Strbuf_Free(v0);