diff options
| author | garak <garakmon@gmail.com> | 2018-10-21 15:12:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 15:12:18 -0400 |
| commit | 7a9c7e5f068a2ec88ce6fe24a5c72f4b4ae7f48b (patch) | |
| tree | b8e391c9e856a2546075d44cba353c4b100a52ef /src/battle_interface.c | |
| parent | 2bb286ab4e3a967ce129d82cdad0ede4d744fa73 (diff) | |
| parent | 804d0a4b6a12907974ffd8cb20f6ed6c527b663b (diff) | |
Merge branch 'master' into sprite-tags
Diffstat (limited to 'src/battle_interface.c')
| -rw-r--r-- | src/battle_interface.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index 691e760a8..d89d6164d 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -3,6 +3,7 @@ #include "pokemon.h" #include "battle_controllers.h" #include "battle_interface.h" +#include "graphics.h" #include "sprite.h" #include "window.h" #include "string_util.h" @@ -20,6 +21,7 @@ #include "international_string_util.h" #include "safari_zone.h" #include "battle_anim.h" +#include "constants/battle_anim.h" #include "constants/rgb.h" #include "data2.h" @@ -163,13 +165,6 @@ extern const u8 gText_DynColor2[]; extern const u8 gText_DynColor2Male[]; extern const u8 gText_DynColor1Female[]; -// graphics -extern const u8 gBattleInterface_BallStatusBarGfx[]; -extern const u8 gBattleInterface_BallDisplayGfx[]; -extern const u16 gBattleInterface_BallStatusBarPal[]; -extern const u16 gBattleInterface_BallDisplayPal[]; -extern const u8 gHealthboxElementsGfxTable[][32]; - // this file's functions static const u8 *GetHealthboxElementGfxPtr(u8 elementId); @@ -1889,9 +1884,9 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite) if (sprite->pos2.x == 0) { - pan = PAN_SIDE_OPPONENT; + pan = SOUND_PAN_TARGET; if (var1 != 0) - pan = PAN_SIDE_PLAYER; + pan = SOUND_PAN_ATTACKER; if (sprite->data[7] != 0) PlaySE2WithPanning(SE_TB_KARA, pan); |