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

Some battle anim review changes

Browse Source
This commit is contained in:
GriffinR
2020-02-19 13:13:28 -05:00
committed by huderlem
parent 1ba12dc050
commit 0d651c7c9e
14 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rock.c
+4 -4
View File
@@ -827,11 +827,11 @@ static void sub_811149C(struct Sprite *sprite)
void AnimTask_GetSeismicTossDamageLevel(u8 taskId)
{
if (gAnimMoveDmg < 33)
gBattleAnimArgs[7] = 0;
gBattleAnimArgs[ARG_RET_ID] = 0;
if ((u32)gAnimMoveDmg - 33 < 33)
gBattleAnimArgs[7] = 1;
gBattleAnimArgs[ARG_RET_ID] = 1;
if (gAnimMoveDmg > 65)
gBattleAnimArgs[7] = 2;
gBattleAnimArgs[ARG_RET_ID] = 2;
DestroyAnimVisualTask(taskId);
}
@@ -869,7 +869,7 @@ void sub_8111590(u8 taskId)
gTasks[taskId].data[1] &= 0xFF;
gBattle_BG3_Y = gTasks[taskId].data[2] + Cos(4, gTasks[taskId].data[1]);
if (gBattleAnimArgs[7] == 0xFFF)
if (gBattleAnimArgs[ARG_RET_ID] == 0xFFF)
{
gBattle_BG3_Y = 0;
sub_80A6DAC(TRUE);