mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 04:24:43 +00:00
Code Issues Projects Releases Wiki Activity

Document some of EnHy (Hylian NPCs), mostly its data (#936)

Browse Source 
* Document some of EnHy, mostly its data

* Run formatter

* Improve `sModelInfos` formatting (or at least, try to)

* Use decimal in `CollisionCheckInfoInit2`

* Remove `#define`s for params

* Run formatter

* infos -> info

* Use enums in array indices comments

* Fix `objBankIndexSkel*` doc

* Forgot one `skelInfoIndex` -> `skelInfoIndex1`

* Use `ENHY_ANIM_` enum in `func_80034EC0`
This commit is contained in:
Dragorn421 2021-11-05 21:46:06 +01:00 committed by GitHub
parent cb43f256f3
commit aa7ff4e795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 535 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

824
src/overlays/actors/ovl_En_Hy/z_en_hy.c
View File

File diff suppressed because it is too large Load Diff

55
src/overlays/actors/ovl_En_Hy/z_en_hy.h
View File

@ -4,6 +4,31 @@
#include "ultra64.h" #include "ultra64.h"
#include "global.h" #include "global.h"
typedef enum {
/* 0 */ ENHY_TYPE_AOB,
/* 1 */ ENHY_TYPE_COB,
/* 2 */ ENHY_TYPE_AHG_2,
/* 3 */ ENHY_TYPE_BOJ_3,
/* 4 */ ENHY_TYPE_AHG_4,
/* 5 */ ENHY_TYPE_BOJ_5,
/* 6 */ ENHY_TYPE_BBA,
/* 7 */ ENHY_TYPE_BJI_7,
/* 8 */ ENHY_TYPE_CNE_8,
/* 9 */ ENHY_TYPE_BOJ_9,
/* 10 */ ENHY_TYPE_BOJ_10,
/* 11 */ ENHY_TYPE_CNE_11,
/* 12 */ ENHY_TYPE_BOJ_12,
/* 13 */ ENHY_TYPE_AHG_13,
/* 14 */ ENHY_TYPE_BOJ_14,
/* 15 */ ENHY_TYPE_BJI_15,
/* 16 */ ENHY_TYPE_BOJ_16,
/* 17 */ ENHY_TYPE_AHG_17,
/* 18 */ ENHY_TYPE_BOB_18,
/* 19 */ ENHY_TYPE_BJI_19,
/* 20 */ ENHY_TYPE_AHG_20,
/* 21 */ ENHY_TYPE_MAX
} EnHyType;
struct EnHy; struct EnHy;
typedef void (*EnHyActionFunc)(struct EnHy*, GlobalContext*); typedef void (*EnHyActionFunc)(struct EnHy*, GlobalContext*);
@ -12,25 +37,25 @@ typedef struct EnHy {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ EnHyActionFunc actionFunc; /* 0x0190 */ EnHyActionFunc actionFunc;
/* 0x0194 */ char unk_194; /* 0x0194 */ char unk_194; // unused
/* 0x0195 */ u8 unk_195; /* 0x0195 */ u8 pathReverse;
/* 0x0196 */ s8 unk_196; /* 0x0196 */ s8 objBankIndexHead;
/* 0x0197 */ s8 unk_197; /* 0x0197 */ s8 objBankIndexSkel2; // 7 < limb < 15 (upper part?) (always same as objBankIndexSkel1)
/* 0x0198 */ s8 unk_198; /* 0x0198 */ s8 objBankIndexSkel1; // sets the object used when drawing the skeleton for limb <= 7 (lower part?)
/* 0x0199 */ s8 unk_199; /* 0x0199 */ s8 objBankIndexOsAnime;
/* 0x019C */ ColliderCylinder collider; /* 0x019C */ ColliderCylinder collider;
/* 0x01E8 */ struct_80034A14_arg1 unk_1E8; /* 0x01E8 */ struct_80034A14_arg1 unk_1E8;
/* 0x0210 */ Path* path; /* 0x0210 */ Path* path;
/* 0x0214 */ s8 unk_214; /* 0x0214 */ s8 waypoint;
/* 0x0215 */ s8 unk_215; /* 0x0215 */ s8 unk_215;
/* 0x0216 */ char unk_216[2]; /* 0x0216 */ char unk_216[2]; // unused
/* 0x0218 */ s16 unk_218; /* 0x0218 */ s16 curEyeIndex;
/* 0x021A */ s16 unk_21A; /* 0x021A */ s16 nextEyeIndexTimer;
/* 0x021C */ s16 unk_21C[16]; /* 0x021C */ s16 unk_21C[16]; // bodyWiggleY ?
/* 0x023C */ s16 unk_23C[16]; /* 0x023C */ s16 unk_23C[16]; // bodyWiggleZ ?
/* 0x025C */ f32 unk_25C; /* 0x025C */ f32 unkRange;
/* 0x0260 */ s32 unk_260; /* 0x0260 */ s32 unkGetItemId;
/* 0x0264 */ Vec3f unk_264; /* 0x0264 */ Vec3f modelOffset;
/* 0x0270 */ Vec3s jointTable[16]; /* 0x0270 */ Vec3s jointTable[16];
/* 0x02D0 */ Vec3s morphTable[16]; /* 0x02D0 */ Vec3s morphTable[16];
/* 0x0330 */ u16 unk_330; /* 0x0330 */ u16 unk_330;

3
undefined_syms.txt
View File

@ -147,9 +147,6 @@ D_06010298 = 0x06010298;
D_06010514 = 0x06010514; D_06010514 = 0x06010514;
D_060114E8 = 0x060114E8; D_060114E8 = 0x060114E8;
// z_en_hy
D_06005BC8 = 0x06005BC8;
// z_en_zf // z_en_zf
D_06006690 = 0x06006690; D_06006690 = 0x06006690;
D_06008138 = 0x06008138; D_06008138 = 0x06008138;