diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:55:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 16:55:19 -0700 |
| commit | 5fb9b9052276243d54ecfc27d0514e9c35825e8c (patch) | |
| tree | 7546411871d12a05f370b529341ebfd656334af1 /include/pokemon.h | |
| parent | f74d4742f597a423b7a8685d72c06597c8c78db7 (diff) | |
| parent | 37b891cbd49780d63fe2295add70bf003c59de48 (diff) | |
Merge pull request #437 from huderlem/name_labels
Name labels
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 5d76a8a05..67f56eb53 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -393,7 +393,7 @@ struct BaseStats /*0x17*/ u8 ability2; /*0x18*/ u8 safariZoneFleeRate; /*0x19*/ u8 bodyColor:7; - u8 unk19_7:1; + u8 noFlip:1; }; struct BattleMove @@ -591,9 +591,9 @@ u8 sub_8040574(struct Pokemon *party); void ClearBattleMonForms(void); void sub_80408BC(); void current_map_music_set__default_for_battle(u16); -const u8 *pokemon_get_pal(struct Pokemon *mon); -const u8 *species_and_otid_get_pal(u16, u32, u32); -const struct CompressedSpritePalette *sub_80409C8(u16, u32, u32); +const u8 *GetMonSpritePal(struct Pokemon *mon); +const u8 *GetMonSpritePalFromOtIdPersonality(u16, u32, u32); +const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u16, u32, u32); bool8 IsOtherTrainer(u32, u8 *); void sub_8040B8C(void); void SetWildMonHeldItem(void); |