summaryrefslogtreecommitdiff
path: root/include/pokemon.h
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-06-19 13:34:32 -0500
committerMarijn van der Werf <marijn.vanderwerf@gmail.com>2017-06-20 15:13:44 +0200
commite072ddd6fbae8b303de546d0e9bd5ace2ecb20a1 (patch)
tree5652c2e7dc0cd743c6114af68bb5af5e88f9a076 /include/pokemon.h
parent1fafe80241d56c7e89aa37d0bf6d20a0f4d208f2 (diff)
move data to C and introduce CompressedSpriteSheet and CompressedSpritePalette
Diffstat (limited to 'include/pokemon.h')
-rw-r--r--include/pokemon.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index d67cd647a..47990073b 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -503,8 +503,9 @@ u8 sub_8040574(struct Pokemon *party);
void ClearBattleMonForms(void);
void sub_80408BC();
void current_map_music_set__default_for_battle(u16);
-const u16 *species_and_otid_get_pal(u16, u32, u32);
-const struct SpritePalette *sub_80409C8(u16, u32, u32);
+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);
bool8 IsOtherTrainer(u32, u8 *);
void sub_8040B8C(void);
void SetWildMonHeldItem(void);