ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

battle_anim_effects_3 (5)

Browse Source
This commit is contained in:
Sewef 2019-11-24 18:00:51 +01:00
parent 1dfe34dee3
commit 07b79c3fc3
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle_anim.h
View File

@ -185,7 +185,7 @@ bool8 IsBattlerSpritePresent(u8 battlerId);
void sub_80A6C68(u32 arg0); void sub_80A6C68(u32 arg0);
u8 GetAnimBattlerSpriteId(u8 wantedBattler); u8 GetAnimBattlerSpriteId(u8 wantedBattler);
bool8 IsDoubleBattle(void); bool8 IsDoubleBattle(void);
u8 GetPaletteOffset(void); u8 GetBattleBgPaletteNum(void);
u8 GetBattlerSpriteBGPriorityRank(u8 battlerId); u8 GetBattlerSpriteBGPriorityRank(u8 battlerId);
void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*)); void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*));
void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite); void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);

2
include/constants/battle_anim.h
View File

@ -237,7 +237,7 @@
#define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227) #define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227)
#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228) #define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228)
#define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229) #define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229)
#define ANIM_TAG_TRI_ATTACK_TRIANGLE (ANIM_SPRITES_START + 230) #define ANIM_TAG_TRI_ATTACK_TRIANGLE (ANIM_SPRITES_START + 230)
#define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231) #define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231)
#define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232) #define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232)
#define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233) #define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233)

4
src/battle_anim.c
View File

@ -2808,12 +2808,12 @@ static void LoadMoveBg(u16 bgId)
void *dmaDest; void *dmaDest;
LZDecompressWram(tilemap, gDecompressionBuffer); LZDecompressWram(tilemap, gDecompressionBuffer);
sub_80A4720(GetPaletteOffset(), (void*)(gDecompressionBuffer), 0x100, 0); sub_80A4720(GetBattleBgPaletteNum(), (void*)(gDecompressionBuffer), 0x100, 0);
dmaSrc = gDecompressionBuffer; dmaSrc = gDecompressionBuffer;
dmaDest = (void *)(BG_SCREEN_ADDR(26)); dmaDest = (void *)(BG_SCREEN_ADDR(26));
DmaCopy32(3, dmaSrc, dmaDest, 0x800); DmaCopy32(3, dmaSrc, dmaDest, 0x800);
LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_SCREEN_ADDR(4))); LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_SCREEN_ADDR(4)));
LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, GetPaletteOffset() * 16, 32); LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, GetBattleBgPaletteNum() * 16, 32);
} }
else else
{ {

4
src/battle_anim_effects_3.c
View File

@ -1379,7 +1379,7 @@ static void SetPsychicBackground_Step(u8 taskId)
{ {
int i; int i;
u16 lastColor; u16 lastColor;
u8 paletteIndex = GetPaletteOffset(); u8 paletteIndex = GetBattleBgPaletteNum();
if (++gTasks[taskId].data[5] == 4) if (++gTasks[taskId].data[5] == 4)
{ {
@ -1405,7 +1405,7 @@ static void FadeScreenToWhite_Step(u8 taskId)
{ {
int i; int i;
u16 lastColor; u16 lastColor;
u8 paletteIndex = GetPaletteOffset(); u8 paletteIndex = GetBattleBgPaletteNum();
if (++gTasks[taskId].data[5] == 4) if (++gTasks[taskId].data[5] == 4)
{ {

4
src/battle_anim_mons.c
View File

@ -966,7 +966,7 @@ void sub_80A6D60(struct BattleAnimBgData *unk, const void *src, u32 arg2)
CopyBgTilemapBufferToVram(unk->bgId); CopyBgTilemapBufferToVram(unk->bgId);
} }
u8 GetPaletteOffset(void) u8 GetBattleBgPaletteNum(void)
{ {
if (IsContest()) if (IsContest())
return 1; return 1;
@ -1353,7 +1353,7 @@ u32 sub_80A75AC(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner,
if (!IsContest()) if (!IsContest())
selectedPalettes = 0xe; selectedPalettes = 0xe;
else else
selectedPalettes = 1 << GetPaletteOffset(); selectedPalettes = 1 << GetBattleBgPaletteNum();
} }
if (attacker) if (attacker)
{ {