mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +00:00
Code Issues Projects Releases Wiki Activity

A few cleanups (#509)

Browse source 
* fix colliderinit typo

* fix initchain

* reloc

* cleanup

* remove generic
This commit is contained in:
fig02 2020-12-03 13:28:01 -05:00 • committed by GitHub
parent a9dc747709
commit 570c69490a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
View file

@ -202,7 +202,7 @@ f32 EnSsh_SetAnimation(EnSsh* this, s32 animIndex) {
};
f32 playbackSpeed[] = { 1.0f, 4.0f, 1.0f, 1.0f, 8.0f, 6.0f, 2.0f };
u8 mode[] = { 3, 3, 1, 3, 1, 1, 1 };
f32 frameCount = SkelAnime_GetFrameCount(&animation[animIndex]->genericHeader);
f32 frameCount = SkelAnime_GetFrameCount(animation[animIndex]);
s32 pad;
SkelAnime_ChangeAnim(&this->skelAnime, animation[animIndex], playbackSpeed[animIndex], 0.0f, frameCount,
@ -587,7 +587,7 @@ void EnSsh_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnSsh* this = THIS;
frameCount = SkelAnime_GetFrameCount(&D_06000304.genericHeader);
frameCount = SkelAnime_GetFrameCount(&D_06000304);
if (this->actor.params == ENSSH_FATHER) {
if (gSaveContext.inventory.gsTokens >= 100) {
Actor_Kill(&this->actor);