dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Rename battle anim type files, remove unneeded ARG_RET_IDs

Browse Source
This commit is contained in:
GriffinR
2020-02-23 13:18:54 -05:00
committed by huderlem
parent dc3c2b72f2
commit 51cd0ac081
25 changed files with 115 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bug.c → src/battle_anim_bug.c
View File
src/dark.c → src/battle_anim_dark.c
View File
src/dragon.c → src/battle_anim_dragon.c
View File
src/battle_anim_effects_1.c
+6 -6
View File
@@ -2761,7 +2761,7 @@ static void AnimConstrictBinding_Step1(struct Sprite* sprite)
{
u8 spriteId;
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
{
sprite->affineAnimPaused = 0;
spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
@@ -2835,7 +2835,7 @@ static void AnimTask_DuplicateAndShrinkToPos_Step1(u8 taskId)
static void AnimTask_DuplicateAndShrinkToPos_Step2(u8 taskId)
{
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
{
if (gTasks[taskId].data[0] == 0)
{
@@ -3655,7 +3655,7 @@ void AnimTask_CycleMagicalLeafPal(u8 taskId)
break;
}
if (gBattleAnimArgs[ARG_RET_ID] == -1)
if (gBattleAnimArgs[7] == -1)
DestroyAnimVisualTask(taskId);
}
@@ -4355,7 +4355,7 @@ static void AnimLockOnTarget_Step4(struct Sprite* sprite)
static void AnimLockOnTarget_Step5(struct Sprite* sprite)
{
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
{
sprite->data[1] = 0;
sprite->data[0] = 0;
@@ -4847,7 +4847,7 @@ static void AnimConversion(struct Sprite* sprite)
sprite->data[0]++;
}
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
DestroyAnimSprite(sprite);
}
@@ -4855,7 +4855,7 @@ void AnimTask_ConversionAlphaBlend(u8 taskId)
{
if (gTasks[taskId].data[2] == 1)
{
gBattleAnimArgs[ARG_RET_ID] = 0xFFFF;
gBattleAnimArgs[7] = 0xFFFF;
gTasks[taskId].data[2]++;
}
else if (gTasks[taskId].data[2] == 2)
src/battle_anim_effects_2.c
+2 -2
View File
@@ -2761,7 +2761,7 @@ static void AnimSoftBoiledEgg_Step3_Callback2(struct Sprite *sprite)
static void AnimSoftBoiledEgg_Step4(struct Sprite *sprite)
{
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
{
sprite->invisible = TRUE;
if (sprite->data[7] == 0)
@@ -3444,7 +3444,7 @@ static void AnimOrbitFast_Step(struct Sprite *sprite)
break;
}
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
DestroyAnimSprite(sprite);
}
src/battle_anim_effects_3.c
+5 -5
View File
@@ -1392,7 +1392,7 @@ static void SetPsychicBackground_Step(u8 taskId)
gTasks[taskId].data[5] = 0;
}
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
DestroyTask(taskId);
}
@@ -1423,7 +1423,7 @@ static void FadeScreenToWhite_Step(u8 taskId)
gTasks[taskId].data[5] = 0;
}
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
DestroyTask(taskId);
}
@@ -5092,7 +5092,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
if (x < GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X))
{
gTasks[taskId].data[14]++;
gBattleAnimArgs[ARG_RET_ID] = 0xFFFF;
gBattleAnimArgs[7] = 0xFFFF;
}
}
else
@@ -5100,7 +5100,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
if (x > GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X))
{
gTasks[taskId].data[14]++;
gBattleAnimArgs[ARG_RET_ID] = 0xFFFF;
gBattleAnimArgs[7] = 0xFFFF;
}
}
}
@@ -5150,7 +5150,7 @@ static void sub_815FE80(struct Sprite *sprite)
switch (sprite->data[7])
{
case 0:
if (gBattleAnimArgs[ARG_RET_ID] == -1)
if (gBattleAnimArgs[7] == -1)
{
PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(63));
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16;
src/electric.c → src/battle_anim_electric.c
+2 -2
View File
@@ -629,7 +629,7 @@ static void AnimSparkElectricityFlashing(struct Sprite *sprite)
u8 battler;
sprite->data[0] = gBattleAnimArgs[3];
if (gBattleAnimArgs[ARG_RET_ID] & 0x8000)
if (gBattleAnimArgs[7] & 0x8000)
battler = gBattleAnimTarget;
else
battler = gBattleAnimAttacker;
@@ -640,7 +640,7 @@ static void AnimSparkElectricityFlashing(struct Sprite *sprite)
sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2) + gBattleAnimArgs[0];
sprite->pos1.y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[1];
sprite->data[4] = gBattleAnimArgs[ARG_RET_ID] & 0x7FFF;
sprite->data[4] = gBattleAnimArgs[7] & 0x7FFF;
sprite->data[5] = gBattleAnimArgs[2];
sprite->data[6] = gBattleAnimArgs[5];
sprite->data[7] = gBattleAnimArgs[4];
src/fight.c → src/battle_anim_fight.c
+2 -2
View File
@@ -428,7 +428,7 @@ static void unc_080B08A0(struct Sprite *sprite)
static void AnimSlideHandOrFootToTarget(struct Sprite *sprite)
{
if (gBattleAnimArgs[ARG_RET_ID] == 1 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
if (gBattleAnimArgs[7] == 1 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
gBattleAnimArgs[3] = -gBattleAnimArgs[3];
@@ -1033,7 +1033,7 @@ void AnimTask_MoveSkyUppercutBg(u8 taskId)
task->data[9] &= 0xFF;
task->data[10] &= 0xFF;
if (gBattleAnimArgs[ARG_RET_ID] == -1)
if (gBattleAnimArgs[7] == -1)
{
gBattle_BG3_X = 0;
gBattle_BG3_Y = 0;
src/fire.c → src/battle_anim_fire.c
View File
src/flying.c → src/battle_anim_flying.c
+1 -1
View File
@@ -574,7 +574,7 @@ static void AnimFallingFeather(struct Sprite *sprite)
struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data;
if (gBattleAnimArgs[ARG_RET_ID] & 0x100)
if (gBattleAnimArgs[7] & 0x100)
battler = gBattleAnimAttacker;
else
battler = gBattleAnimTarget;
src/ghost.c → src/battle_anim_ghost.c
View File
src/ground.c → src/battle_anim_ground.c
+1 -1
View File
@@ -758,7 +758,7 @@ static void sub_81156D0(u8 taskId)
{
struct Task *task = &gTasks[taskId];
if (gBattleAnimArgs[ARG_RET_ID] == task->data[3])
if (gBattleAnimArgs[7] == task->data[3])
{
gBattle_BG3_X = 0;
gBattle_BG3_Y = 0;
src/ice.c → src/battle_anim_ice.c
+2 -2
View File
@@ -789,7 +789,7 @@ static void AnimMoveParticleBeyondTarget(struct Sprite *sprite)
sprite->data[1] = sprite->pos1.x;
sprite->data[3] = sprite->pos1.y;
if (!gBattleAnimArgs[ARG_RET_ID])
if (!gBattleAnimArgs[7])
{
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
@@ -1204,7 +1204,7 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite)
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
if (gBattleAnimArgs[ARG_RET_ID])
if (gBattleAnimArgs[7])
{
sprite->data[1] = sprite->pos1.x + gBattleAnimArgs[1];
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[3];
src/normal.c → src/battle_anim_normal.c
View File
src/poison.c → src/battle_anim_poison.c
View File
src/psychic.c → src/battle_anim_psychic.c
View File
src/rock.c → src/battle_anim_rock.c
+1 -1
View File
@@ -866,7 +866,7 @@ void AnimTask_SeismicTossBgAccelerateDownAtEnd(u8 taskId)
gTasks[taskId].data[1] &= 0xFF;
gBattle_BG3_Y = gTasks[taskId].data[2] + Cos(4, gTasks[taskId].data[1]);
if (gBattleAnimArgs[ARG_RET_ID] == 0xFFF)
if (gBattleAnimArgs[7] == 0xFFF)
{
gBattle_BG3_Y = 0;
sub_80A6DAC(TRUE);
src/smokescreen.c → src/battle_anim_smokescreen.c
+24 -24
View File
@@ -41,17 +41,17 @@ const u8 gUnknown_0831C604[] =
[NATURE_QUIRKY] = 0,
};
static const struct CompressedSpriteSheet gSmokescreenImpactSpriteSheet =
static const struct CompressedSpriteSheet sSmokescreenImpactSpriteSheet =
{
.data = gSmokescreenImpactTiles, .size = 0x180, .tag = 55019
};
static const struct CompressedSpritePalette gSmokescreenlImpactSpritePalette =
static const struct CompressedSpritePalette sSmokescreenImpactSpritePalette =
{
.data = gSmokescreenImpactPalette, .tag = 55019
};
static const struct OamData gUnknown_0831C630 =
static const struct OamData sOamData_SmokescreenImpact =
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -68,7 +68,7 @@ static const struct OamData gUnknown_0831C630 =
.affineParam = 0
};
static const union AnimCmd gUnknown_0831C638[] =
static const union AnimCmd sAnim_SmokescreenImpact_0[] =
{
ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(4, 4),
@@ -76,7 +76,7 @@ static const union AnimCmd gUnknown_0831C638[] =
ANIMCMD_END
};
static const union AnimCmd gUnknown_0831C648[] =
static const union AnimCmd sAnim_SmokescreenImpact_1[] =
{
ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
ANIMCMD_FRAME(4, 4, .hFlip = TRUE),
@@ -84,7 +84,7 @@ static const union AnimCmd gUnknown_0831C648[] =
ANIMCMD_END
};
static const union AnimCmd gUnknown_0831C658[] =
static const union AnimCmd sAnim_SmokescreenImpact_2[] =
{
ANIMCMD_FRAME(0, 4, .vFlip = TRUE),
ANIMCMD_FRAME(4, 4, .vFlip = TRUE),
@@ -92,7 +92,7 @@ static const union AnimCmd gUnknown_0831C658[] =
ANIMCMD_END
};
static const union AnimCmd gUnknown_0831C668[] =
static const union AnimCmd sAnim_SmokescreenImpact_3[] =
{
ANIMCMD_FRAME(0, 4, .hFlip = TRUE, .vFlip = TRUE),
ANIMCMD_FRAME(4, 4, .hFlip = TRUE, .vFlip = TRUE),
@@ -100,20 +100,20 @@ static const union AnimCmd gUnknown_0831C668[] =
ANIMCMD_END
};
static const union AnimCmd *const gUnknown_0831C678[] =
static const union AnimCmd *const sAnims_SmokescreenImpact[] =
{
gUnknown_0831C638,
gUnknown_0831C648,
gUnknown_0831C658,
gUnknown_0831C668,
sAnim_SmokescreenImpact_0,
sAnim_SmokescreenImpact_1,
sAnim_SmokescreenImpact_2,
sAnim_SmokescreenImpact_3,
};
static const struct SpriteTemplate gSmokescreenImpactSpriteTemplate =
static const struct SpriteTemplate sSmokescreenImpactSpriteTemplate =
{
.tileTag = 55019,
.paletteTag = 55019,
.oam = &gUnknown_0831C630,
.anims = gUnknown_0831C678,
.oam = &sOamData_SmokescreenImpact,
.anims = sAnims_SmokescreenImpact,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCB_DestroySprite
@@ -158,34 +158,34 @@ u8 SmokescreenImpact(s16 x, s16 y, u8 a3)
u8 spriteId1, spriteId2, spriteId3, spriteId4;
struct Sprite *mainSprite;
if (GetSpriteTileStartByTag(gSmokescreenImpactSpriteSheet.tag) == 0xFFFF)
if (GetSpriteTileStartByTag(sSmokescreenImpactSpriteSheet.tag) == 0xFFFF)
{
LoadCompressedSpriteSheetUsingHeap(&gSmokescreenImpactSpriteSheet);
LoadCompressedSpritePaletteUsingHeap(&gSmokescreenlImpactSpritePalette);
LoadCompressedSpriteSheetUsingHeap(&sSmokescreenImpactSpriteSheet);
LoadCompressedSpritePaletteUsingHeap(&sSmokescreenImpactSpritePalette);
}
mainSpriteId = CreateInvisibleSpriteWithCallback(SmokescreenImpact_Callback);
mainSprite = &gSprites[mainSpriteId];
mainSprite->data[1] = a3;
spriteId1 = CreateSprite(&gSmokescreenImpactSpriteTemplate, x - 16, y - 16, 2);
spriteId1 = CreateSprite(&sSmokescreenImpactSpriteTemplate, x - 16, y - 16, 2);
gSprites[spriteId1].data[0] = mainSpriteId;
mainSprite->data[0]++;
AnimateSprite(&gSprites[spriteId1]);
spriteId2 = CreateSprite(&gSmokescreenImpactSpriteTemplate, x, y - 16, 2);
spriteId2 = CreateSprite(&sSmokescreenImpactSpriteTemplate, x, y - 16, 2);
gSprites[spriteId2].data[0] = mainSpriteId;
mainSprite->data[0]++;
StartSpriteAnim(&gSprites[spriteId2], 1);
AnimateSprite(&gSprites[spriteId2]);
spriteId3 = CreateSprite(&gSmokescreenImpactSpriteTemplate, x - 16, y, 2);
spriteId3 = CreateSprite(&sSmokescreenImpactSpriteTemplate, x - 16, y, 2);
gSprites[spriteId3].data[0] = mainSpriteId;
mainSprite->data[0]++;
StartSpriteAnim(&gSprites[spriteId3], 2);
AnimateSprite(&gSprites[spriteId3]);
spriteId4 = CreateSprite(&gSmokescreenImpactSpriteTemplate, x, y, 2);
spriteId4 = CreateSprite(&sSmokescreenImpactSpriteTemplate, x, y, 2);
gSprites[spriteId4].data[0] = mainSpriteId;
mainSprite->data[0]++;
StartSpriteAnim(&gSprites[spriteId4], 3);
@@ -198,8 +198,8 @@ static void SmokescreenImpact_Callback(struct Sprite *sprite)
{
if (!sprite->data[0])
{
FreeSpriteTilesByTag(gSmokescreenImpactSpriteSheet.tag);
FreeSpritePaletteByTag(gSmokescreenlImpactSpritePalette.tag);
FreeSpriteTilesByTag(sSmokescreenImpactSpriteSheet.tag);
FreeSpritePaletteByTag(sSmokescreenImpactSpritePalette.tag);
if (!sprite->data[1])
DestroySprite(sprite);
else
src/battle_anim_utility_funcs.c
+2 -2
View File
@@ -729,7 +729,7 @@ static void AnimTask_UpdateSlidingBg(u8 taskId)
gTasks[taskId].data[10] &= 0xFF;
gTasks[taskId].data[11] &= 0xFF;
if (gBattleAnimArgs[ARG_RET_ID] == gTasks[taskId].data[3])
if (gBattleAnimArgs[7] == gTasks[taskId].data[3])
{
gBattle_BG3_X = 0;
gBattle_BG3_Y = 0;
@@ -1058,7 +1058,7 @@ void AnimTask_SetAttackerInvisibleWaitForSignal(u8 taskId)
static void AnimTask_WaitAndRestoreVisibility(u8 taskId)
{
if (gBattleAnimArgs[ARG_RET_ID] == 0x1000)
if (gBattleAnimArgs[7] == 0x1000)
{
gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].invisible = (u8)gTasks[taskId].data[0] & 1;
DestroyTask(taskId);
src/water.c → src/battle_anim_water.c
+5 -5
View File
@@ -607,7 +607,7 @@ static void AnimAuroraBeamRings(struct Sprite *sprite)
static void AnimAuroraBeamRings_Step(struct Sprite *sprite)
{
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
{
StartSpriteAnim(sprite, 1);
sprite->affineAnimPaused = FALSE;
@@ -731,8 +731,8 @@ static void AnimToTargetInSinWave(struct Sprite *sprite)
InitAnimLinearTranslation(sprite);
sprite->data[5] = 0xD200 / sprite->data[0];
sprite->data[7] = gBattleAnimArgs[3];
retArg = gBattleAnimArgs[ARG_RET_ID];
if (gBattleAnimArgs[ARG_RET_ID] > 127)
retArg = gBattleAnimArgs[7];
if (gBattleAnimArgs[7] > 127)
{
sprite->data[6] = (retArg - 127) * 256;
sprite->data[7] = -sprite->data[7];
@@ -764,13 +764,13 @@ static void AnimToTargetInSinWave_Step(struct Sprite *sprite)
void AnimTask_StartSinAnimTimer(u8 taskId)
{
gTasks[taskId].data[0] = gBattleAnimArgs[0];
gBattleAnimArgs[ARG_RET_ID] = 0;
gBattleAnimArgs[7] = 0;
gTasks[taskId].func = AnimTask_RunSinAnimTimer;
}
static void AnimTask_RunSinAnimTimer(u8 taskId)
{
gBattleAnimArgs[ARG_RET_ID] = (gBattleAnimArgs[ARG_RET_ID] + 3) & 0xFF;
gBattleAnimArgs[7] = (gBattleAnimArgs[7] + 3) & 0xFF;
if (--gTasks[taskId].data[0] == 0)
DestroyAnimVisualTask(taskId);
}