diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-26 23:55:36 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-26 23:55:36 +0200 |
| commit | 52be8eeaf15da7b281d48c51b1f4d06740a86c76 (patch) | |
| tree | ac1c7d0a092f4d16c9ebef0b2538ef46b80c44d5 /src/battle_gfx_sfx_util.c | |
| parent | dc273cc19d842e8831548a1342af857aae2886c9 (diff) | |
| parent | 2778e9ad3dc249eb4cce84be3ac1dfcc7ab850d5 (diff) | |
Merge branch 'master' into battle_tower
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) { |