diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-21 12:24:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 12:24:24 -0500 |
| commit | 804d0a4b6a12907974ffd8cb20f6ed6c527b663b (patch) | |
| tree | e9a7231867cc05a415f347beb354339f1cb909aa /src/pokemon.c | |
| parent | 2a3ba78831f2dca1ff0d3fe3f03844a993597b28 (diff) | |
| parent | 8e7202ec3d289305190aedc66d02435571747a76 (diff) | |
Merge pull request #371 from Diegoisawesome/align_lz
Fix LZ compressed data alignment
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 7227d28cb..a7a91a630 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6700,7 +6700,7 @@ static void sub_806E6CC(u8 taskId) DestroyTask(taskId); } -const u8 *GetMonFrontSpritePal(struct Pokemon *mon) +const u32 *GetMonFrontSpritePal(struct Pokemon *mon) { u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0); u32 otId = GetMonData(mon, MON_DATA_OT_ID, 0); @@ -6714,7 +6714,7 @@ const u8 *GetMonFrontSpritePal(struct Pokemon *mon) // Extracts the lower 16 bits of a 32-bit number #define LOHALF(n) ((n) & 0xFFFF) -const u8 *GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality) +const u32 *GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality) { u32 shinyValue; |