diff options
Diffstat (limited to 'src/pokemon_3.c')
| -rw-r--r-- | src/pokemon_3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 09cbd2a3e..9e69a3850 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -1186,18 +1186,18 @@ const u16 *pokemon_get_pal(struct Pokemon *mon) //Extracts the lower 16 bits of a 32-bit number #define LOHALF(n) ((n) & 0xFFFF) -void *species_and_otid_get_pal(u16 species, u32 otId , u32 personality) +const u16 *species_and_otid_get_pal(u16 species, u32 otId, u32 personality) { u32 shinyValue; if (species > SPECIES_EGG) - return (void *) gMonPaletteTable[0].data; + return gMonPaletteTable[0].data; shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality); if (shinyValue < 8) - return (void *) gMonShinyPaletteTable[species].data; + return gMonShinyPaletteTable[species].data; else - return (void *) gMonPaletteTable[species].data; + return gMonPaletteTable[species].data; } const struct SpritePalette *sub_8040990(struct Pokemon *mon) @@ -1232,7 +1232,7 @@ bool8 IsHMMove2(u16 move) bool8 sub_8040A3C(u16 species) { - return gBaseStats[species].bodyColor >> 7; // XXX: should this be a bitfield instead? + return gBaseStats[species].unk19_7; } s8 sub_8040A54(struct Pokemon *mon, u8 a2) |