diff options
Diffstat (limited to 'src/dark.c')
| -rw-r--r-- | src/dark.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/dark.c b/src/dark.c index ecd466da8..80ce61800 100644 --- a/src/dark.c +++ b/src/dark.c @@ -389,14 +389,14 @@ void sub_8113A90(struct Sprite *sprite) static void sub_8113B90(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroySpriteAndMatrix(sprite); } void sub_8113BAC(u8 taskId) { struct ScanlineEffectParams scanlineParams; - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; u16 i; u8 pos; int var0; @@ -420,10 +420,10 @@ void sub_8113BAC(u8 taskId) task->data[3] = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker); if (task->data[3] == 1) { - sub_80A6B30(&unknownStruct); + sub_80A6B30(&animBg); task->data[10] = gBattle_BG1_Y; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1); - FillPalette(0, unknownStruct.unk8 << 4, 32); + FillPalette(0, animBg.paletteId * 16, 32); scanlineParams.dmaDest = ®_BG1VOFS; var0 = WINOUT_WIN01_BG1; if (!IsContest()) @@ -524,7 +524,7 @@ static void sub_8113D60(u8 taskId) void sub_8113E78(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; struct ScanlineEffectParams scanlineParams; u8 x; u16 i; @@ -561,14 +561,14 @@ void sub_8113E78(u8 taskId) case 1: if (task->data[3] == 1) { - sub_80A6B30(&unknownStruct); + sub_80A6B30(&animBg); task->data[10] = gBattle_BG1_Y; - FillPalette(0, unknownStruct.unk8 << 4, 32); + FillPalette(0, animBg.paletteId * 16, 32); } else { task->data[10] = gBattle_BG2_Y; - FillPalette(0, 144, 32); + FillPalette(0, 9 * 16, 32); } sub_8114374(3); @@ -809,7 +809,7 @@ void sub_81144F8(u8 taskId) u8 spriteId; u8 newSpriteId; u16 paletteNum; - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; int var0 = 0; gBattle_WIN0H = var0; @@ -852,10 +852,10 @@ void sub_81144F8(u8 taskId) spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); newSpriteId = sub_80A89C8(gBattleAnimAttacker, spriteId, species); - sub_80A6B30(&unknownStruct); - sub_80A6D48(unknownStruct.bgId, gUnknown_08C1D210); - sub_80A6CC0(unknownStruct.bgId, gUnknown_08C1D0AC, unknownStruct.tilesOffset); - LoadCompressedPalette(gUnknown_08C1D1E8, unknownStruct.unk8 << 4, 32); + sub_80A6B30(&animBg); + AnimLoadCompressedBgTilemap(animBg.bgId, gMetalShineTilemap); + AnimLoadCompressedBgGfx(animBg.bgId, gMetalShineGfx, animBg.tilesOffset); + LoadCompressedPalette(gMetalShinePalette, animBg.paletteId * 16, 32); gBattle_BG1_X = -gSprites[spriteId].pos1.x + 96; gBattle_BG1_Y = -gSprites[spriteId].pos1.y + 32; @@ -876,7 +876,7 @@ void sub_81144F8(u8 taskId) static void sub_8114748(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; u16 paletteNum; u8 spriteId; u8 taskIdCopy = taskId; @@ -896,8 +896,8 @@ static void sub_8114748(u8 taskId) SetGreyscaleOrOriginalPalette(paletteNum, 1); DestroySprite(&gSprites[gTasks[taskIdCopy].data[0]]); - sub_80A6B30(&unknownStruct); - sub_80A6C68(unknownStruct.bgId); + sub_80A6B30(&animBg); + sub_80A6C68(animBg.bgId); if (gTasks[taskIdCopy].data[6] == 1) gSprites[gBattlerSpriteIds[BATTLE_PARTNER(gBattleAnimAttacker)]].oam.priority++; } |