ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Create Macros and refactor

Browse Source
This commit is contained in:
PokeCodec 2020-08-20 10:49:53 -04:00 committed by PokeCodec
parent aa841047a3
commit 608da287c1
3 changed files with 52 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/battle_anim_effects_3.c
View File

@ -5003,11 +5003,11 @@ void AnimTask_GetReturnPowerLevel(u8 taskId)
void AnimTask_SnatchOpposingMonMove(u8 taskId) void AnimTask_SnatchOpposingMonMove(u8 taskId)
{ {
u8 spriteId, spriteId2; u8 spriteId, spriteId2;
int personality; u32 personality;
int otId; u32 otId;
u16 species; u16 species;
u8 subpriority; u8 subpriority;
u8 isBackPic; bool8 isBackPic;
s16 x; s16 x;
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
@ -5035,37 +5035,34 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
otId = gContestResources->moveAnim->otId; otId = gContestResources->moveAnim->otId;
species = gContestResources->moveAnim->species; species = gContestResources->moveAnim->species;
subpriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker); subpriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker);
isBackPic = 0; isBackPic = FALSE;
x = -32; x = -32;
} }
else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
{
personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_PERSONALITY);
otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_OT_ID);
if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies == SPECIES_NONE)
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
else
species = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies;
subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority + 1;
isBackPic = FALSE;
x = 272;
}
else else
{ {
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_PERSONALITY);
{ otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_OT_ID);
personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_PERSONALITY); if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies == SPECIES_NONE)
otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_OT_ID); species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies == SPECIES_NONE)
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
else
species = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies;
subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority + 1;
isBackPic = 0;
x = 272;
}
else else
{ species = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies;
personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_PERSONALITY);
otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_OT_ID);
if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies == SPECIES_NONE)
species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
else
species = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies;
subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority - 1; subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority - 1;
isBackPic = 1; isBackPic = TRUE;
x = -32; x = -32;
}
} }
spriteId2 = sub_80A8394(species, isBackPic, 0, x, GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y), subpriority, personality, otId, gBattleAnimAttacker, 0); spriteId2 = sub_80A8394(species, isBackPic, 0, x, GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y), subpriority, personality, otId, gBattleAnimAttacker, 0);
@ -5092,7 +5089,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
if (x < GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X)) if (x < GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X))
{ {
gTasks[taskId].data[14]++; gTasks[taskId].data[14]++;
gBattleAnimArgs[7] = 0xFFFF; gBattleAnimArgs[7] = -1;
} }
} }
else else
@ -5100,7 +5097,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
if (x > GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X)) if (x > GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X))
{ {
gTasks[taskId].data[14]++; gTasks[taskId].data[14]++;
gBattleAnimArgs[7] = 0xFFFF; gBattleAnimArgs[7] = -1;
} }
} }
} }
@ -5138,7 +5135,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
gSprites[spriteId].pos2.x = 0; gSprites[spriteId].pos2.x = 0;
} }
gTasks[taskId].data[1] = (u8)gTasks[taskId].data[1]; gTasks[taskId].data[1] &= 0xFF;
if (gSprites[spriteId].pos2.x == 0) if (gSprites[spriteId].pos2.x == 0)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
break; break;

56
src/battle_anim_flying.c
View File

@ -563,14 +563,23 @@ struct FeatherDanceData
u16 unkE_1:15; u16 unkE_1:15;
}; };
#define ANIM_SWITCH(sprite) \
{ \
(sprite)->hFlip ^= 1; \
(sprite)->animNum = (sprite)->hFlip; \
(sprite)->animBeginning = TRUE; \
(sprite)->animEnded = FALSE; \
}
static void AnimFallingFeather(struct Sprite *sprite) static void AnimFallingFeather(struct Sprite *sprite)
{ {
u8 battler, matrixNum, sinIndex; u8 battler, sinIndex;
u32 matrixNum;
s16 sinVal; s16 sinVal;
struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data; struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data;
battler = (gBattleAnimArgs[7] & 0x100) ? gBattleAnimAttacker : gBattleAnimTarget; battler = (gBattleAnimArgs[7] & 0x100) ? gBattleAnimAttacker : gBattleAnimTarget;
if (GetBattlerSide(battler) == B_SIDE_PLAYER) if (GetBattlerSide(battler) == B_SIDE_PLAYER)
gBattleAnimArgs[0] = -gBattleAnimArgs[0]; gBattleAnimArgs[0] = -gBattleAnimArgs[0];
@ -583,12 +592,12 @@ static void AnimFallingFeather(struct Sprite *sprite)
data->unkE_1 = (u16)(sinVal + gBattleAnimArgs[6]); data->unkE_1 = (u16)(sinVal + gBattleAnimArgs[6]);
data->unk0_0c = 1; data->unk0_0c = 1;
data->unk2 = (u16)(gBattleAnimArgs[2] & 0xFF); data->unk2 = (u16)(gBattleAnimArgs[2] & 0xFF);
data->unkA = (u16)((gBattleAnimArgs[2] >> 8) & 0xFF) ; data->unkA = (u16)gBattleAnimArgs[2] >> 8;
data->unk4 = gBattleAnimArgs[3]; data->unk4 = gBattleAnimArgs[3];
data->unk6 = (u16)gBattleAnimArgs[4]; data->unk6 = (u16)gBattleAnimArgs[4];
*(u16*)(data->unkC) = (u16)gBattleAnimArgs[5]; *(u16 *)(data->unkC) = (u16)gBattleAnimArgs[5];
if (data->unk2 >= 64 && data->unk2 <= 191) if (data->unk2 >= 64 && data->unk2 < 192)
{ {
if (!IsContest()) if (!IsContest())
sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1; sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1;
@ -599,11 +608,7 @@ static void AnimFallingFeather(struct Sprite *sprite)
if (!(data->unk4 & 0x8000)) if (!(data->unk4 & 0x8000))
{ {
sprite->hFlip ^= 1; ANIM_SWITCH(sprite);
sprite->animNum = sprite->hFlip;
sprite->animBeginning = 1;
sprite->animEnded = 0;
} }
} }
else else
@ -613,15 +618,11 @@ static void AnimFallingFeather(struct Sprite *sprite)
if (data->unk4 & 0x8000) if (data->unk4 & 0x8000)
{ {
sprite->hFlip ^= 1; ANIM_SWITCH(sprite);
sprite->animNum = sprite->hFlip;
sprite->animBeginning = 1;
sprite->animEnded = 0;
} }
} }
data->unk0_1 = data->unk2/64; data->unk0_1 = data->unk2 / 64;
sprite->pos2.x = (gSineTable[data->unk2] * (s32)data->unkC[0]) >> 8; sprite->pos2.x = (gSineTable[data->unk2] * (s32)data->unkC[0]) >> 8;
matrixNum = sprite->oam.matrixNum; matrixNum = sprite->oam.matrixNum;
@ -637,7 +638,8 @@ static void AnimFallingFeather(struct Sprite *sprite)
static void sub_810E520(struct Sprite *sprite) static void sub_810E520(struct Sprite *sprite)
{ {
u8 matrixNum, sinIndex; u8 sinIndex;
u32 matrixNum;
s16 sinVal = 0; s16 sinVal = 0;
struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data; struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data;
if (data->unk0_0a) if (data->unk0_0a)
@ -667,10 +669,7 @@ static void sub_810E520(struct Sprite *sprite)
} }
else if (data->unk0_0d) else if (data->unk0_0d)
{ {
sprite->hFlip ^= 1; ANIM_SWITCH(sprite);
sprite->animNum = sprite->hFlip;
sprite->animBeginning = TRUE;
sprite->animEnded = FALSE;
if (data->unk0_0c) if (data->unk0_0c)
{ {
if (!IsContest()) if (!IsContest())
@ -718,10 +717,7 @@ static void sub_810E520(struct Sprite *sprite)
} }
else if (data->unk0_0d) else if (data->unk0_0d)
{ {
sprite->hFlip ^= 1; ANIM_SWITCH(sprite);
sprite->animNum = sprite->hFlip;
sprite->animBeginning = TRUE;
sprite->animEnded = FALSE;
if (data->unk0_0c) if (data->unk0_0c)
{ {
if (!IsContest()) if (!IsContest())
@ -769,10 +765,7 @@ static void sub_810E520(struct Sprite *sprite)
} }
else if (data->unk0_0d) else if (data->unk0_0d)
{ {
sprite->hFlip ^= 1; ANIM_SWITCH(sprite);
sprite->animNum = sprite->hFlip;
sprite->animBeginning = TRUE;
sprite->animEnded = FALSE;
if (data->unk0_0c) if (data->unk0_0c)
{ {
if (!IsContest()) if (!IsContest())
@ -819,10 +812,7 @@ static void sub_810E520(struct Sprite *sprite)
} }
else if (data->unk0_0d) else if (data->unk0_0d)
{ {
sprite->hFlip ^= 1; ANIM_SWITCH(sprite);
sprite->animNum = sprite->hFlip;
sprite->animBeginning = TRUE;
sprite->animEnded = FALSE;
if (data->unk0_0c) if (data->unk0_0c)
{ {
if (!IsContest()) if (!IsContest())

2
src/match_call.c
View File

@ -1774,7 +1774,7 @@ static int GetNumOwnedBadges(void)
static bool32 sub_8196D74(int matchCallId) static bool32 sub_8196D74(int matchCallId)
{ {
int dayCount; int dayCount;
int otId; u32 otId;
u16 easyChatWord; u16 easyChatWord;
int numRematchTrainersFought; int numRematchTrainersFought;
int var0, var1, var2; int var0, var1, var2;