dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle_tower

Browse Source
This commit is contained in:
DizzyEggg
2018-10-26 23:55:36 +02:00
parent dc273cc19d 2778e9ad3d
commit 52be8eeaf1
74 changed files with 8367 additions and 8379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon.c
+2 -2
View File
@@ -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;