diff options
Diffstat (limited to 'src/battle_anim_mons.c')
-rw-r--r-- | src/battle_anim_mons.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index 7f3516670..8cc6c9a00 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -1,14 +1,9 @@ #include "global.h" +#include "gflib.h" #include "battle_anim.h" -#include "bg.h" #include "data.h" #include "decompress.h" -#include "dma3.h" -#include "gpu_regs.h" -#include "malloc.h" -#include "palette.h" #include "pokemon_icon.h" -#include "sprite.h" #include "task.h" #include "trig.h" #include "util.h" @@ -1240,7 +1235,7 @@ void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor) } } -u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7) +u32 SelectBattleAnimSpriteAndBgPalettes(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 a6, bool8 a7) { u32 selectedPalettes = 0; u32 shift; @@ -1286,19 +1281,19 @@ u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, return selectedPalettes; } -u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4) +u32 SelectBattlerSpritePalettes(bool8 playerLeft, bool8 playerRight, bool8 foeLeft, bool8 foeRight) { u32 var = 0; u32 shift; - if (a1) + if (playerLeft) { if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_PLAYER_LEFT))) { var |= 1 << (GetBattlerAtPosition(B_POSITION_PLAYER_LEFT) + 16); } } - if (a2) + if (playerRight) { if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT))) { @@ -1306,7 +1301,7 @@ u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4) var |= 1 << shift; } } - if (a3) + if (foeLeft) { if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT))) { @@ -1314,7 +1309,7 @@ u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4) var |= 1 << shift; } } - if (a4) + if (foeRight) { if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT))) { @@ -1325,13 +1320,13 @@ u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4) return var; } -u8 sub_8075D80(u8 a1) +u8 GetSpritePalIdxByBattler(u8 a1) { return a1; } // not used -static u8 GetBattlerAtPosition_(u8 position) +static u8 GetSpritePalIdxByPosition(u8 position) { return GetBattlerAtPosition(position); } |