Multiple changes

- BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START
- Defines for battle windows
- MAIL_NONE
- MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS
- Usage of BattlePutTextOnWindow with masks
- PlayCry1 -> PlayCry_Normal
- BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL
- FillPalette(0 -> FillPalette(RGB_BLACK
This commit is contained in:
Eduardo Quezada
2022-07-27 18:10:52 -04:00
parent a81c1539e5
commit f5e9cc595b
55 changed files with 613 additions and 423 deletions
+4 -4
View File
@@ -412,7 +412,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
GetBattleAnimBg1Data(&animBg);
task->data[10] = gBattle_BG1_Y;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1);
FillPalette(0, animBg.paletteId * 16, 32);
FillPalette(RGB_BLACK, animBg.paletteId * 16, 32);
scanlineParams.dmaDest = &REG_BG1VOFS;
var0 = WINOUT_WIN01_BG1;
if (!IsContest())
@@ -422,7 +422,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
{
task->data[10] = gBattle_BG2_Y;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG2);
FillPalette(0, 144, 32);
FillPalette(RGB_BLACK, 144, 32);
scanlineParams.dmaDest = &REG_BG2VOFS;
var0 = WINOUT_WIN01_BG2;
if (!IsContest())
@@ -542,12 +542,12 @@ void AnimTask_MoveTargetMementoShadow(u8 taskId)
{
GetBattleAnimBg1Data(&animBg);
task->data[10] = gBattle_BG1_Y;
FillPalette(0, animBg.paletteId * 16, 32);
FillPalette(RGB_BLACK, animBg.paletteId * 16, 32);
}
else
{
task->data[10] = gBattle_BG2_Y;
FillPalette(0, 9 * 16, 32);
FillPalette(RGB_BLACK, 9 * 16, 32);
}
sub_80B856C(3);
++task->data[0];