Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-27 15:00:36 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

TT_000 UpdateAnim refactor

Browse Source
This commit is contained in:
Luciano Ciccariello 2023-07-07 22:49:29 +01:00
parent f37b1c3663
commit 009e63100e
2 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/symbols.us.tt_000.txt
View File

@ -1 +1,2 @@
DestroyEntity = 0x80173E0C;
UpdateAnim = 0x80173C64;

68
src/servant/tt_000/10E8.c
View File

@ -434,52 +434,46 @@ void func_80173C2C(Entity* entity) {
DestroyEntity(entity);
}
s32 func_80173C64(Entity* self, u8* hitboxFrames, AnimationFrame** frames) {
u32 UpdateAnim(Entity* self, s8* frameProps, AnimationFrame** frames) {
AnimationFrame* animFrame;
s8 new_var;
u16 new_var2;
s32 ret;
ret = 0;
if (self->animFrameDuration == -1) {
ret = -1;
} else if (self->animFrameDuration == 0) {
self->animFrameDuration = self->unk4C[self->animFrameIdx].duration;
} else {
self->animFrameDuration--;
if (self->animFrameDuration == 0) {
self->animFrameIdx++;
animFrame = &self->unk4C[self->animFrameIdx];
if (animFrame->duration == 0) {
self->animFrameIdx = animFrame->unk2;
self->animFrameDuration =
self->unk4C[self->animFrameIdx].duration;
} else {
;
if (animFrame->duration == 0xFFFF) {
new_var2 = animFrame->duration;
new_var2 += self->animFrameIdx;
self->animFrameIdx += animFrame->duration;
ret = -1;
self->animFrameDuration = -1;
} else if (animFrame->duration == 0xFFFE) {
self->unk4C = frames[animFrame->unk2];
self->animFrameIdx = 0;
ret = -2;
self->animFrameDuration = self->unk4C->duration;
} else {
self->animFrameDuration = animFrame->duration;
}
}
} else if (--self->animFrameDuration == 0) {
self->animFrameIdx++;
animFrame = &self->unk4C[self->animFrameIdx];
// Effectively a switch statement, but breaks if I actually use one.
if (animFrame->duration == 0) {
self->animFrameIdx = animFrame->unk2;
self->animFrameDuration = self->unk4C[self->animFrameIdx].duration;
ret = 0;
} else if (animFrame->duration == 0xFFFF) {
self->animFrameIdx--;
self->animFrameDuration = -1;
ret = -1;
} else if (animFrame->duration == 0xFFFE) {
self->unk4C = frames[animFrame->unk2];
self->animFrameIdx = 0;
ret = -2;
self->animFrameDuration = self->unk4C->duration;
} else {
self->animFrameDuration = animFrame->duration;
}
}
if (hitboxFrames != 0) {
new_var2 = self->unk4C[self->animFrameIdx].unk2 >> 9;
hitboxFrames = &hitboxFrames[new_var2 << 2];
self->hitboxOffX = (s8)*hitboxFrames++;
new_var = *(hitboxFrames++);
self->hitboxOffY = new_var;
self->hitboxWidth = *hitboxFrames++;
self->hitboxHeight = *hitboxFrames++;
if (frameProps != NULL) {
// This is ugly - theoretically the type for frameProps should be
// FrameProperty* but anything besides this where we assign this big
// expression fails.
frameProps =
&frameProps[(self->unk4C[self->animFrameIdx].unk2 >> 9) << 2];
self->hitboxOffX = *frameProps++;
self->hitboxOffY = *frameProps++;
self->hitboxWidth = *frameProps++;
self->hitboxHeight = *frameProps++;
}
self->animCurFrame = self->unk4C[self->animFrameIdx].unk2 & 0x1FF;
return ret;