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

Clean up data headers

Browse Source
This commit is contained in:
DizzyEggg
2019-04-04 23:53:06 +02:00
committed by huderlem
parent c36476af85
commit b0223f691f
68 changed files with 173 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trainer_pokemon_sprites.c
+3 -14
View File
@@ -6,21 +6,10 @@
#include "palette.h"
#include "decompress.h"
#include "trainer_pokemon_sprites.h"
#include "data2.h"
#include "data.h"
#include "pokemon.h"
#include "constants/trainers.h"
extern const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES];
extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const union AffineAnimCmd *const gUnknown_082FF618[];
extern const union AffineAnimCmd *const gUnknown_082FF694[];
extern const union AnimCmd *const gPlayerMonSpriteAnimsTable[];
extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[NUM_SPECIES];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
// Static type declarations
struct PicData
@@ -149,7 +138,7 @@ static void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 pale
static void AssignSpriteAnimsTable(bool8 isTrainer)
{
if (!isTrainer)
sCreatingSpriteTemplate.anims = gPlayerMonSpriteAnimsTable;
sCreatingSpriteTemplate.anims = gUnknown_082FF70C;
else
sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0];
}
@@ -270,7 +259,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
images[j].size = 0x800;
}
sCreatingSpriteTemplate.tileTag = 0xFFFF;
sCreatingSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species];
sCreatingSpriteTemplate.anims = gMonFrontAnimsPtrTable[species];
sCreatingSpriteTemplate.images = images;
if (flags2 == 0x01)
{