mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4 from krimtonz/skelanimefix

Browse source 
SkelAnime Fix
This commit is contained in:
Roman971 2020-03-18 21:06:26 +01:00 committed by GitHub
commit 3dabadc7b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/z64.h
View file

@ -1024,8 +1024,10 @@ typedef struct
/* 0x34 */ s32 unk_34; /* 0x34 */ s32 unk_34;
/* 0x38 */ s32 unk_38; /* 0x38 */ s32 unk_38;
/* 0x3C */ u16 unk_3C; /* 0x3C */ u16 unk_3C;
/* 0x3E */ u16 unk_3E; /* Probably Padding */ /* 0x3E */ u16 unk_3E;
} SkelAnime; // size = 0x40 /* 0x40 */ u16 unk_40;
/* 0x42 */ u16 unk_42;
} SkelAnime; // size = 0x44
typedef struct typedef struct
{ {

1
src/overlays/actors/ovl_Demo_Go/z_demo_go.h
View file

@ -8,7 +8,6 @@ typedef struct
{ {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
/* 0x018C */ char unk_18C[0x4];
/* 0x0190 */ s16 unk_190; /* 0x0190 */ s16 unk_190;
/* 0x0192 */ s16 unk_192; /* 0x0192 */ s16 unk_192;
/* 0x0194 */ s32 action; /* 0x0194 */ s32 action;

1
src/overlays/actors/ovl_En_Bird/z_en_bird.c
View file

@ -11,7 +11,6 @@ typedef struct
{ {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
/* 0x018C */ char unk_18C[0x4];
/* 0x0190 */ ActorFunc updateFunc; /* 0x0190 */ ActorFunc updateFunc;
/* 0x0194 */ u32 unk_194; /* 0x0194 */ u32 unk_194;
/* 0x0198 */ s32 unk_198; /* 0x0198 */ s32 unk_198;

1
src/overlays/actors/ovl_En_Ms/z_en_ms.c
View file

@ -11,7 +11,6 @@ typedef struct
{ {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
/* 0x018C */ char unk_18C[0x4];
/* 0x0190 */ UNK_PTR unkSkelAnimeStruct; /* 0x0190 */ UNK_PTR unkSkelAnimeStruct;
/* 0x0194 */ char unk_194[0x32]; /* 0x0194 */ char unk_194[0x32];
/* 0x01C6 */ s16 unk_1C6; /* 0x01C6 */ s16 unk_1C6;

1
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
View file

@ -14,7 +14,6 @@ typedef struct
{ {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
/* 0x018C */ char unk_18C[0x4];
/* 0x0190 */ ActorFunc actionFunc; /* 0x0190 */ ActorFunc actionFunc;
/* 0x0194 */ s16 timer; /* 0x0194 */ s16 timer;
/* 0x0196 */ s16 switchFlag; /* 0x0196 */ s16 switchFlag;