diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-11-11 15:48:17 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-11 15:48:17 -0600 |
| commit | 558bf2f7d0c9be70ec0da4b9ef28c105c5d11622 (patch) | |
| tree | 232d44774e91c44ac08b366aa5186593ebe00d62 /include/pokemon.h | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
| parent | 32c7d4f252acf8cc9dc42d50da046c4b3f0beb16 (diff) | |
Merge pull request #104 from DizzyEggg/decompile_battle_7
Decompile battle 7
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 0c7d6ac40..69b9e71d5 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -612,8 +612,8 @@ u32 CanMonLearnTMHM(struct Pokemon *, u8); u32 CanSpeciesLearnTMHM(u16 species, u8 tm); u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves); void ClearBattleMonForms(void); -const u8 *pokemon_get_pal(struct Pokemon *mon); -const u8 *species_and_otid_get_pal(u16, u32, u32); +const u8 *GetMonFrontSpritePal(struct Pokemon *mon); +const u8 *GetFrontSpritePalFromSpeciesAndPersonality(u16, u32, u32); const struct CompressedSpritePalette *sub_80409C8(u16, u32, u32); bool8 IsOtherTrainer(u32, u8 *); void SetWildMonHeldItem(void); |