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/battle_gfx_sfx_util.c | |
| parent | 2a3ba78831f2dca1ff0d3fe3f03844a993597b28 (diff) | |
| parent | 8e7202ec3d289305190aedc66d02435571747a76 (diff) | |
Merge pull request #371 from Diegoisawesome/align_lz
Fix LZ compressed data alignment
Diffstat (limited to 'src/battle_gfx_sfx_util.c')
| -rw-r--r-- | src/battle_gfx_sfx_util.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 05958395d..6f9d2db80 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -7,6 +7,7 @@ #include "battle_interface.h" #include "main.h" #include "malloc.h" +#include "graphics.h" #include "random.h" #include "util.h" #include "pokemon.h" @@ -41,20 +42,6 @@ extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow; extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow; extern const u8 gEnemyMonElevation[]; -// graphics -extern const u32 gUnknown_08C093F0[]; -extern const u32 gSubstituteDollTilemap[]; -extern const u32 gSubstituteDollGfx[]; -extern const u16 gSubstituteDollPal[]; -extern const u8 gHealthboxSinglesPlayerGfx[]; -extern const u8 gHealthboxSinglesOpponentGfx[]; -extern const u8 gHealthboxDoublesPlayerGfx[]; -extern const u8 gHealthboxDoublesOpponentGfx[]; -extern const u8 gHealthboxSafariGfx[]; -extern const u8 gBlankGfxCompressed[]; -extern const u16 gBattleInterface_BallStatusBarPal[]; -extern const u16 gBattleInterface_BallDisplayPal[]; - extern u8 sub_80688F8(u8, u8 battlerId); extern u8 pokemon_order_func(u8); // party menu extern void sub_81B8C68(void); @@ -874,7 +861,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform u32 personalityValue; u32 otId; u8 position; - const u8 *lzPaletteData; + const u32 *lzPaletteData; if (notTransform) { |