diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
| commit | 07b800e593a3ac8dd1a9bcfb6cb2366cc5c27377 (patch) | |
| tree | c77edf7fdacf36172bd3b6af790ad86111aef1fe /src/battle/anim/startle.c | |
| parent | 4d3098e89b5aebf080547a99e68640138dc74599 (diff) | |
| parent | be66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff) | |
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'src/battle/anim/startle.c')
| -rw-r--r-- | src/battle/anim/startle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/startle.c b/src/battle/anim/startle.c index 50e78af37..95462bd9f 100644 --- a/src/battle/anim/startle.c +++ b/src/battle/anim/startle.c @@ -16,10 +16,10 @@ extern struct AffineAnimFrameCmd gUnknown_083D7A98; // opponent void sub_80D1E38(u8 taskId) { - u8 spriteId = GetAnimBankSpriteId(1); + u8 spriteId = GetAnimBattlerSpriteId(1); if (++gTasks[taskId].data[0] == 1) { - sub_80798F4(&gTasks[taskId], GetAnimBankSpriteId(1), &gUnknown_083D7A98); + sub_80798F4(&gTasks[taskId], GetAnimBattlerSpriteId(1), &gUnknown_083D7A98); gSprites[spriteId].pos2.x = 4; } else @@ -37,10 +37,10 @@ void sub_80D1E38(u8 taskId) // player void sub_80D1EC8(u8 taskId) { - u8 spriteId = GetAnimBankSpriteId(0); + u8 spriteId = GetAnimBattlerSpriteId(0); if (++gTasks[taskId].data[0] == 1) { - sub_80798F4(&gTasks[taskId], GetAnimBankSpriteId(0), &gUnknown_083D7A98); + sub_80798F4(&gTasks[taskId], GetAnimBattlerSpriteId(0), &gUnknown_083D7A98); gSprites[spriteId].pos2.x = 4; } else |