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

En_Tite OK (#555)

Browse source 
* EnTite_Update matching

* Fixes to update

* made good progress, func_80B1A2A0 is in a good place to be matching soon

* Merge stuff

* func_80B19E94 done, func_80B18CC4 done

* EnTite_Destroy and EnTite_Init done

* Commenting out sDamageTable and EnTite_Init until all the data matches

* Some more small functions done

* more progress

* func_80B19918 done

* func_80B18E7C done

* func_80B19524 done

* more progress

* EnTite_Draw equiv but nonmatching, file otherwise done

* Found some unstaged changed on old laptop

* Draw matching: File fully matching!

* Documentation

* finished documentation

* deleted data files

* update spec

* fixed waterY -> yDistToWater rename after merge

* ran format.sh

* fixing accidental renames in camera

* Fixed some obvious number/comment formatting issues

* Removed unecessary prototypes

* merge

* running format.sh

* suggestions

* more pr comment changes

* format to push

* one more change

* more renames (see pr comments)

* merge

* renames

* format.sh

* fix renames

* function comment formatting

* merge + format

* endless merge fixes

* merge fixes until  die

* yet again a merge fix

* pr suggestions
This commit is contained in:
AdamKiddle 2020-12-31 20:00:30 +00:00 • committed by GitHub
parent 5a2bd7a035
commit 600bad1f20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
147 changed files with 1431 additions and 3642 deletions
Download patch file Download diff file Expand all files Collapse all files

968
src/overlays/actors/ovl_En_Tite/z_en_tite.c
View file

File diff suppressed because it is too large Load diff

26
src/overlays/actors/ovl_En_Tite/z_en_tite.h Normal file → Executable file
View file

@ -6,9 +6,33 @@
struct EnTite;
typedef void (*EnTiteActionFunc)(struct EnTite*, GlobalContext*);
typedef enum {
/* -2 */ TEKTITE_BLUE = -2,
/* -1 */ TEKTITE_RED
} EnTiteType;
typedef struct EnTite {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x22C];
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s jointTable[25];
/* 0x0226 */ Vec3s morphTable[25];
/* 0x02BC */ u8 action;
/* 0x02BD */ u8 flipState;
/* 0x02C0 */ EnTiteActionFunc actionFunc;
/* 0x02C4 */ struct_80032E24 unk_2C4; // Data for EnPart which is spawned at death
/* 0x02DC */ s32 unk_2DC; // flags related to bgCheck drawn effects
/* 0x02E0 */ s16 actionVar1; // Usage depends on current action function
/* 0x02E2 */ u8 actionVar2; // Usage depends on current action function
/* 0x02E3 */ u8 spawnIceTimer;
/* 0x02E4 */ u8 damageEffect;
/* 0x02E8 */ ColliderJntSph collider;
/* 0x0308 */ ColliderJntSphItem colliderItem;
/* 0x0348 */ Vec3f frontLeftFootPos;
/* 0x0354 */ Vec3f frontRightFootPos;
/* 0x0360 */ Vec3f backRightFootPos;
/* 0x036C */ Vec3f backLeftFootPos;
} EnTite; // size = 0x0378
extern const ActorInit En_Tite_InitVars;