diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-11-22 12:14:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 12:14:58 -0600 |
| commit | fd8720b75c56ef3f641e6c5abf6c446929c824b9 (patch) | |
| tree | 7b65558bd366be680c577e6a0aea7787db24dd3f /src/pokemon_mid.c | |
| parent | 938a88551f6ddefb7f696b738696c8ce2d8e0e36 (diff) | |
Label all entities in Boss Fight Cutscenes (#78)
* label all entities in cutscenes
* remove commented func.. wasn't matching anyway
* Skarmony -> Skarmory
Diffstat (limited to 'src/pokemon_mid.c')
| -rw-r--r-- | src/pokemon_mid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokemon_mid.c b/src/pokemon_mid.c index 9bd00d5..1721e1d 100644 --- a/src/pokemon_mid.c +++ b/src/pokemon_mid.c @@ -270,12 +270,12 @@ char * GetMonSpecies(s16 index) return gMonsterParameters[index].species; } -void sub_808D9AC(u8 *buffer, struct PokemonStruct *pokemon, s32 colorNum) +void PrintColoredPokeNameToBuffer(u8 *buffer, struct PokemonStruct *pokemon, s32 colorNum) { u8 nameBuffer [20]; sub_80922B4(nameBuffer, pokemon->name, POKEMON_NAME_LENGTH); - if (colorNum == 0) { + if (colorNum == COLOR_WHITE) { colorNum = COLOR_CYAN; } ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%c%s{END_COLOR_TEXT_2} @@ -286,7 +286,7 @@ void sub_808D9DC(u8 *buffer, u8 *param_2, s32 colorNum) u8 nameBuffer [20]; sub_80922B4(nameBuffer, param_2 + 0x58, POKEMON_NAME_LENGTH); - if (colorNum == 0) { + if (colorNum == COLOR_WHITE) { colorNum = COLOR_YELLOW; } ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%c%s{END_COLOR_TEXT_2} @@ -300,7 +300,7 @@ void sub_808DA0C(u8 *buffer, u8 *param_2) ExpandPlaceholdersBuffer(buffer,gUnknown_8107638,nameBuffer); // %s } -void sub_808DA34(u8 *buffer, struct PokemonStruct *pokemon) +void PrintPokeNameToBuffer(u8 *buffer, struct PokemonStruct *pokemon) { sub_80922B4(buffer, pokemon->name, POKEMON_NAME_LENGTH); } |