diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-22 16:12:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-22 16:12:27 -0600 |
| commit | ebbe826133661d3faabc17f9167fa565b405514a (patch) | |
| tree | 52687e79258567b4d88c184b6692e035d0ff3e14 /src/field_effect.c | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
| parent | c805bab48324f946845e1f81002035e4bdb07e62 (diff) | |
Merge pull request #437 from DizzyEggg/storage
Pokemon Storage System
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 1442c611a..e1850d001 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -733,8 +733,8 @@ bool8 FieldEffectActiveListContains(u8 id) u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer) { struct SpriteTemplate spriteTemplate; - LoadCompressedObjectPaletteOverrideBuffer(&gTrainerFrontPicPaletteTable[trainerSpriteID], buffer); - LoadCompressedObjectPicOverrideBuffer(&gTrainerFrontPicTable[trainerSpriteID], buffer); + LoadCompressedSpritePaletteOverrideBuffer(&gTrainerFrontPicPaletteTable[trainerSpriteID], buffer); + LoadCompressedSpriteSheetOverrideBuffer(&gTrainerFrontPicTable[trainerSpriteID], buffer); spriteTemplate.tileTag = gTrainerFrontPicTable[trainerSpriteID].tag; spriteTemplate.paletteTag = gTrainerFrontPicPaletteTable[trainerSpriteID].tag; spriteTemplate.oam = &gNewGameBirchOamAttributes; |