summaryrefslogtreecommitdiff
path: root/src/battle/battle_anim.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/battle_anim.c')
-rw-r--r--src/battle/battle_anim.c113
1 files changed, 58 insertions, 55 deletions
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index 2714768ab..a91e166c4 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -14,6 +14,7 @@
#include "task.h"
#include "ewram.h"
#include "graphics.h"
+#include "constants/battle_anim.h"
// sprites start at 10000 and thus must be subtracted of 10000 to account for the true index.
#define GET_TRUE_SPRITE_INDEX(i) (i - 10000)
@@ -1287,7 +1288,7 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] =
};
extern u16 gBattlePartyID[4];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u8 gBankAttacker;
extern u8 gBankTarget;
EWRAM_DATA const u8 *sBattleAnimScriptPtr = NULL;
@@ -1319,7 +1320,7 @@ extern struct MusicPlayerInfo gMPlay_BGM;
extern struct MusicPlayerInfo gMPlay_SE1;
extern struct MusicPlayerInfo gMPlay_SE2;
-extern const u16 gUnknown_081C7160[];
+extern const u16 gSingingMoves[];
extern const u8 *const gBattleAnims_Moves[];
static void RunAnimScriptCommand(void);
@@ -1513,10 +1514,11 @@ void LaunchBattleAnimation(const u8 *const moveAnims[], u16 move, u8 isMoveAnim)
if (isMoveAnim)
{
- for (i = 0; gUnknown_081C7160[i] != 0xFFFF; i++)
+ for (i = 0; gSingingMoves[i] != 0xFFFF; i++)
{
- if (move == gUnknown_081C7160[i])
+ if (move == gSingingMoves[i])
{
+ // Lower the volume for the short song that gets played.
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128);
break;
}
@@ -1599,28 +1601,28 @@ static void RunAnimScriptCommand(void)
static void ScriptCmd_loadspritegfx(void)
{
- u16 index;
+ u16 tag;
sBattleAnimScriptPtr++;
- index = T1_READ_16(sBattleAnimScriptPtr);
- LoadCompressedObjectPic(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)]);
- LoadCompressedObjectPalette(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(index)]);
+ tag = T1_READ_16(sBattleAnimScriptPtr);
+ LoadCompressedObjectPic(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(tag)]);
+ LoadCompressedObjectPalette(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(tag)]);
sBattleAnimScriptPtr += 2;
- AddSpriteIndex(GET_TRUE_SPRITE_INDEX(index));
+ AddSpriteIndex(GET_TRUE_SPRITE_INDEX(tag));
gAnimFramesToWait = 1;
gAnimScriptCallback = WaitAnimFrameCount;
}
static void ScriptCmd_unloadspritegfx(void)
{
- u16 index;
+ u16 tag;
sBattleAnimScriptPtr++;
- index = T1_READ_16(sBattleAnimScriptPtr);
- FreeSpriteTilesByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag);
- FreeSpritePaletteByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag);
+ tag = T1_READ_16(sBattleAnimScriptPtr);
+ FreeSpriteTilesByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(tag)].tag);
+ FreeSpritePaletteByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(tag)].tag);
sBattleAnimScriptPtr += 2;
- ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(index));
+ ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(tag));
}
static void ScriptCmd_createsprite(void)
@@ -1802,7 +1804,7 @@ static void ScriptCmd_monbg(void)
u8 bank;
u8 identity;
bool8 toBG_2;
- u16 r4;
+ u16 spriteId;
u8 taskId;
sBattleAnimScriptPtr++;
@@ -1826,12 +1828,12 @@ static void ScriptCmd_monbg(void)
else
toBG_2 = 1;
- sub_8076034(bank, toBG_2);
- r4 = gObjectBankIDs[bank];
+ MoveBattlerSpriteToBG(bank, toBG_2);
+ spriteId = gBankSpriteIds[bank];
taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10);
- gTasks[taskId].data[0] = r4;
- gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x;
- gTasks[taskId].data[2] = gSprites[r4].pos1.y + gSprites[r4].pos2.y;
+ gTasks[taskId].data[0] = spriteId;
+ gTasks[taskId].data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
+ gTasks[taskId].data[2] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y;
if (toBG_2 == 0)
{
gTasks[taskId].data[3] = gBattle_BG1_X;
@@ -1847,8 +1849,9 @@ static void ScriptCmd_monbg(void)
gMonAnimTaskIdArray[0] = taskId;
}
+
bank ^= 2;
- if (animBank > 1 && IsAnimBankSpriteVisible(bank))
+ if (animBank >= ANIM_BANK_ATK_PARTNER && IsAnimBankSpriteVisible(bank))
{
identity = GetBankIdentity(bank);
identity += 0xFF;
@@ -1856,12 +1859,12 @@ static void ScriptCmd_monbg(void)
toBG_2 = 0;
else
toBG_2 = 1;
- sub_8076034(bank, toBG_2);
- r4 = gObjectBankIDs[bank];
+ MoveBattlerSpriteToBG(bank, toBG_2);
+ spriteId = gBankSpriteIds[bank];
taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10);
- gTasks[taskId].data[0] = r4;
- gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x;
- gTasks[taskId].data[2] = gSprites[r4].pos1.y + gSprites[r4].pos2.y;
+ gTasks[taskId].data[0] = spriteId;
+ gTasks[taskId].data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
+ gTasks[taskId].data[2] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y;
if (toBG_2 == 0)
{
gTasks[taskId].data[3] = gBattle_BG1_X;
@@ -1894,17 +1897,17 @@ bool8 IsAnimBankSpriteVisible(u8 bank)
return FALSE;
if (IsContest())
return TRUE; // this line wont ever be reached.
- if (!(EWRAM_17800[bank].unk0 & 1) || !gSprites[gObjectBankIDs[bank]].invisible)
+ if (!(EWRAM_17800[bank].unk0 & 1) || !gSprites[gBankSpriteIds[bank]].invisible)
return TRUE;
return FALSE;
}
-void sub_8076034(u8 a, u8 b)
+void MoveBattlerSpriteToBG(u8 bank, u8 toBG_2)
{
u8 spriteId;
- if (b == 0)
+ if (toBG_2 == 0)
{
volatile u8 pointlessZero;
struct UnknownStruct2 s;
@@ -1920,23 +1923,23 @@ void sub_8076034(u8 a, u8 b)
REG_BG1CNT_BITFIELD.screenSize = 1;
REG_BG1CNT_BITFIELD.areaOverflowMode = 0;
- spriteId = gObjectBankIDs[a];
+ spriteId = gBankSpriteIds[bank];
gBattle_BG1_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32;
if (IsContest() != 0 && IsSpeciesNotUnown(EWRAM_19348) != 0)
gBattle_BG1_X--;
gBattle_BG1_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32;
- gSprites[gObjectBankIDs[a]].invisible = TRUE;
+ gSprites[gBankSpriteIds[bank]].invisible = TRUE;
REG_BG1HOFS = gBattle_BG1_X;
REG_BG1VOFS = gBattle_BG1_Y;
- LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, s.unk8 * 16, 32);
- DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + a * 16, (u16 *)PLTT + s.unk8 * 16, 32);
+ LoadPalette(gPlttBufferUnfaded + 0x100 + bank * 16, s.unk8 * 16, 32);
+ DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + bank * 16, (u16 *)PLTT + s.unk8 * 16, 32);
if (IsContest() != 0)
r2 = 0;
else
- r2 = GetBankIdentity(a);
+ r2 = GetBankIdentity(bank);
sub_80E4EF8(0, 0, r2, s.unk8, (u32)s.unk0, (((s32)s.unk4 - VRAM) / 2048), REG_BG1CNT_BITFIELD.charBaseBlock);
if (IsContest() != 0)
sub_8076380();
@@ -1954,18 +1957,18 @@ void sub_8076034(u8 a, u8 b)
REG_BG2CNT_BITFIELD.screenSize = 1;
REG_BG2CNT_BITFIELD.areaOverflowMode = 0;
- spriteId = gObjectBankIDs[a];
+ spriteId = gBankSpriteIds[bank];
gBattle_BG2_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32;
gBattle_BG2_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32;
- gSprites[gObjectBankIDs[a]].invisible = TRUE;
+ gSprites[gBankSpriteIds[bank]].invisible = TRUE;
REG_BG2HOFS = gBattle_BG2_X;
REG_BG2VOFS = gBattle_BG2_Y;
- LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, 0x90, 32);
- DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + a * 16, (void *)(PLTT + 0x120), 32);
+ LoadPalette(gPlttBufferUnfaded + 0x100 + bank * 16, 0x90, 32);
+ DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + bank * 16, (void *)(PLTT + 0x120), 32);
- sub_80E4EF8(0, 0, GetBankIdentity(a), 9, 0x6000, 0x1E, REG_BG2CNT_BITFIELD.charBaseBlock);
+ sub_80E4EF8(0, 0, GetBankIdentity(bank), 9, 0x6000, 0x1E, REG_BG2CNT_BITFIELD.charBaseBlock);
}
}
@@ -2088,9 +2091,9 @@ static void ScriptCmd_clearmonbg(void)
bank = gAnimBankTarget;
if (gMonAnimTaskIdArray[0] != 0xFF)
- gSprites[gObjectBankIDs[bank]].invisible = FALSE;
+ gSprites[gBankSpriteIds[bank]].invisible = FALSE;
if (animBankId > 1 && gMonAnimTaskIdArray[1] != 0xFF)
- gSprites[gObjectBankIDs[bank ^ 2]].invisible = FALSE;
+ gSprites[gBankSpriteIds[bank ^ 2]].invisible = FALSE;
else
animBankId = 0;
@@ -2158,8 +2161,8 @@ static void ScriptCmd_monbg_22(void)
r1 = 0;
else
r1 = 1;
- sub_8076034(bank, r1);
- gSprites[gObjectBankIDs[bank]].invisible = FALSE;
+ MoveBattlerSpriteToBG(bank, r1);
+ gSprites[gBankSpriteIds[bank]].invisible = FALSE;
}
bank ^= 2;
@@ -2171,8 +2174,8 @@ static void ScriptCmd_monbg_22(void)
r1 = 0;
else
r1 = 1;
- sub_8076034(bank, r1);
- gSprites[gObjectBankIDs[bank]].invisible = FALSE;
+ MoveBattlerSpriteToBG(bank, r1);
+ gSprites[gBankSpriteIds[bank]].invisible = FALSE;
}
sBattleAnimScriptPtr++;
}
@@ -2197,9 +2200,9 @@ static void ScriptCmd_clearmonbg_23(void)
bank = gAnimBankTarget;
if (IsAnimBankSpriteVisible(bank))
- gSprites[gObjectBankIDs[bank]].invisible = FALSE;
+ gSprites[gBankSpriteIds[bank]].invisible = FALSE;
if (animBankId > 1 && IsAnimBankSpriteVisible(bank ^ 2))
- gSprites[gObjectBankIDs[bank ^ 2]].invisible = FALSE;
+ gSprites[gBankSpriteIds[bank ^ 2]].invisible = FALSE;
else
animBankId = 0;
@@ -2236,13 +2239,13 @@ static void sub_80769A4(u8 taskId)
static void ScriptCmd_setalpha(void)
{
- u16 half1, half2;
+ u16 spriteAlpha, bgAlpha;
sBattleAnimScriptPtr++;
- half1 = *(sBattleAnimScriptPtr++);
- half2 = *(sBattleAnimScriptPtr++) << 8;
- REG_BLDCNT = 0x3F40;
- REG_BLDALPHA = half1 | half2;
+ spriteAlpha = *(sBattleAnimScriptPtr++);
+ bgAlpha = *(sBattleAnimScriptPtr++) << 8;
+ REG_BLDCNT = BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_EFFECT_BLEND;
+ REG_BLDALPHA = spriteAlpha | bgAlpha;
}
static void ScriptCmd_setbldcnt(void)
@@ -2691,13 +2694,13 @@ s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan)
static void ScriptCmd_playsewithpan(void)
{
- u16 songId;
+ u16 soundId;
s8 pan;
sBattleAnimScriptPtr++;
- songId = T1_READ_16(sBattleAnimScriptPtr);
+ soundId = T1_READ_16(sBattleAnimScriptPtr);
pan = T1_READ_8(sBattleAnimScriptPtr + 2);
- PlaySE12WithPanning(songId, BattleAnimAdjustPanning(pan));
+ PlaySE12WithPanning(soundId, BattleAnimAdjustPanning(pan));
sBattleAnimScriptPtr += 3;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 08:52:16 +0000