summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorThar0 <17233964+Thar0@users.noreply.github.com>2021-08-04 06:18:09 +0100
committerThar0 <17233964+Thar0@users.noreply.github.com>2021-08-04 06:18:09 +0100
commit61b579a9ed2bbb59c98003c219c94717b4d5ffd0 (patch)
tree02e9f7a636a601bf6520bcecc199322bdb7ddf4e /src/code
parent7743e5a2c4b6d01c847dea8929c707e65e5e18b3 (diff)
En_Death new build system edition
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_skelanime.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index 16428023a..9e7d54f9e 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -618,12 +618,12 @@ void SkelAnime_AnimateFrame(AnimationHeader* animationSeg, s32 currentFrame, s32
}
}
-s16 SkelAnime_GetTotalFrames(AnimationHeaderCommon* animationSeg) {
+s16 SkelAnime_GetTotalFrames(void* animationSeg) {
AnimationHeaderCommon* animation = Lib_SegmentedToVirtual(animationSeg);
return animation->frameCount;
}
-s16 SkelAnime_GetFrameCount(AnimationHeaderCommon* animationSeg) {
+s16 SkelAnime_GetFrameCount(void* animationSeg) {
AnimationHeaderCommon* animation = Lib_SegmentedToVirtual(animationSeg);
return (u16)animation->frameCount - 1;
@@ -851,7 +851,7 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, void** skeleton, Vec3s* limbDra
// Function is unused.
#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_80134FFC.s")
-s16 func_801353D4(AnimationHeaderCommon* animationSeg) {
+s16 func_801353D4(void* animationSeg) {
AnimationHeaderCommon* animation = Lib_SegmentedToVirtual(animationSeg);
return animation->unk02;
@@ -861,7 +861,7 @@ s16 func_801353D4(AnimationHeaderCommon* animationSeg) {
* Appears to be unused anywhere in the game. Appears to be a clone of
* SkelAnime_GetTotalFrames
*/
-s16 SkelAnime_GetTotalFrames2(AnimationHeaderCommon* animationSeg) {
+s16 SkelAnime_GetTotalFrames2(void* animationSeg) {
AnimationHeaderCommon* animation = Lib_SegmentedToVirtual(animationSeg);
return animation->frameCount;
@@ -871,7 +871,7 @@ s16 SkelAnime_GetTotalFrames2(AnimationHeaderCommon* animationSeg) {
* Appears to be unused anywhere in the game. Appears to be a clone of
* SkelAnime_GetFrameCount
*/
-s16 SkelAnime_GetFrameCount2(AnimationHeaderCommon* animationSeg) {
+s16 SkelAnime_GetFrameCount2(void* animationSeg) {
AnimationHeaderCommon* animation = Lib_SegmentedToVirtual(animationSeg);
return animation->frameCount - 1;