From a432de845cf81ff5aaae3f0b0fd2bac9b2feb2da Mon Sep 17 00:00:00 2001 From: Cheng Hann Gan Date: Thu, 18 Nov 2021 12:21:00 -0500 Subject: Expanded charmap usage (#76) * Added item icons/Hiragana to charmap * Use color formatting charmap macros * Removed redundant text formatting macros --- src/pokemon_mid.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/pokemon_mid.c') diff --git a/src/pokemon_mid.c b/src/pokemon_mid.c index 38eb0d4..9bd00d5 100644 --- a/src/pokemon_mid.c +++ b/src/pokemon_mid.c @@ -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); // #c6%s#r + ExpandPlaceholdersBuffer(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); // #c5%s#r + ExpandPlaceholdersBuffer(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // {COLOR_2 CYAN}%s{END_COLOR_TEXT_2} } void sub_808D930(u8 *buffer, s16 index) @@ -278,7 +278,7 @@ void sub_808D9AC(u8 *buffer, struct PokemonStruct *pokemon, s32 colorNum) if (colorNum == 0) { colorNum = COLOR_CYAN; } - ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%c%s#r + ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%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 == 0) { colorNum = COLOR_YELLOW; } - ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%c%s#r + ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%c%s{END_COLOR_TEXT_2} } void sub_808DA0C(u8 *buffer, u8 *param_2) -- cgit v1.2.3