summaryrefslogtreecommitdiff
path: root/include/pokemon.h
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-10-21 12:24:24 -0500
committerGitHub <noreply@github.com>2018-10-21 12:24:24 -0500
commit804d0a4b6a12907974ffd8cb20f6ed6c527b663b (patch)
treee9a7231867cc05a415f347beb354339f1cb909aa /include/pokemon.h
parent2a3ba78831f2dca1ff0d3fe3f03844a993597b28 (diff)
parent8e7202ec3d289305190aedc66d02435571747a76 (diff)
Merge pull request #371 from Diegoisawesome/align_lz
Fix LZ compressed data alignment
Diffstat (limited to 'include/pokemon.h')
-rw-r--r--include/pokemon.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index 8259e7d34..0155f7430 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -595,8 +595,8 @@ u16 GetBattleBGM(void);
void PlayBattleBGM(void);
void PlayMapChosenOrBattleBGM(u16 songId);
void sub_806E694(u16 songId);
-const u8 *GetMonFrontSpritePal(struct Pokemon *mon);
-const u8 *GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality);
+const u32 *GetMonFrontSpritePal(struct Pokemon *mon);
+const u32 *GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality);
const struct CompressedSpritePalette *GetMonSpritePalStruct(struct Pokemon *mon);
const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u16 species, u32 otId , u32 personality);
bool32 IsHMMove2(u16 move);