mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 23:11:20 +00:00
Code Issues Projects Releases Wiki Activity

Add names to all typedef'd structs, unions, and enums (#2028)

Browse source 
* Add names to all typedef'd structs, unions, and enums

* wtf vs code

* Use a better regex
This commit is contained in:
cadmic 2024-08-12 00:07:48 -07:00 • committed by GitHub
parent 672728455d
commit e6bc4bd8cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
426 changed files with 1417 additions and 1417 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/overlays/actors/ovl_En_Hy/z_en_hy.c
View file

@ -74,13 +74,13 @@ static void* sEyeTexturesBJI13[] = { object_bji_Tex_0005FC, object_bji_Tex_0009F
static void* sEyeTexturesBOJ2[] = { object_boj_Tex_0005FC, object_boj_Tex_0006FC, object_boj_Tex_0007FC, NULL };
static void* sEyeTexturesBOB[] = { object_bob_Tex_0007C8, object_bob_Tex_000FC8, object_bob_Tex_0017C8, NULL };
typedef struct {
typedef struct EnHyHeadInfo {
/* 0x00 */ s16 objectId;
/* 0x04 */ Gfx* headDList;
/* 0x08 */ void** eyeTextures;
} EnHyHeadInfo; // size = 0xC
typedef enum {
typedef enum EnHyHeadIndex {
/* 0 */ ENHY_HEAD_AOB,
/* 1 */ ENHY_HEAD_BOB,
/* 2 */ ENHY_HEAD_BOJ_2,
@ -118,12 +118,12 @@ static EnHyHeadInfo sHeadInfo[] = {
/* ENHY_HEAD_COB */ { OBJECT_COB, object_cob_DL_001300, NULL },
};
typedef struct {
typedef struct EnHySkeletonInfo {
/* 0x00 */ s16 objectId;
/* 0x04 */ FlexSkeletonHeader* skeleton;
} EnHySkeletonInfo; // size = 0x8
typedef enum {
typedef enum EnHySkeletonIndex {
/* 0 */ ENHY_SKEL_AOB,
/* 1 */ ENHY_SKEL_BOB,
/* 2 */ ENHY_SKEL_BOJ,
@ -145,7 +145,7 @@ static EnHySkeletonInfo sSkeletonInfo[] = {
/* ENHY_SKEL_COB */ { OBJECT_COB, &object_cob_Skel_0021F8 },
};
typedef enum {
typedef enum EnHyAnimationIndex {
/* 0 */ ENHY_ANIM_0,
/* 1 */ ENHY_ANIM_1,
/* 2 */ ENHY_ANIM_2,
@ -205,7 +205,7 @@ static AnimationInfo sAnimationInfo[] = {
/* ENHY_ANIM_26 */ { &gObjOsAnim_0BFC, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
};
typedef struct {
typedef struct EnHyModelInfo {
/* 0x00 */ u8 headInfoIndex; // EnHyHeadIndex
/* 0x01 */ u8 skelInfoIndex2; // EnHySkeletonIndex, see EnHy.objectSlotSkel2
/* 0x02 */ Color_RGBA8 envColorSeg8;
@ -259,7 +259,7 @@ static EnHyModelInfo sModelInfo[] = {
{ ENHY_HEAD_AHG_9, ENHY_SKEL_AHG, { 160, 230, 0, 0 }, ENHY_SKEL_AHG, { 0, 150, 110, 0 }, ENHY_ANIM_12 },
};
typedef struct {
typedef struct EnHyColliderInfo {
/* 0x00 */ Vec3s offset;
/* 0x06 */ s16 radius;
/* 0x08 */ s16 height;
@ -289,7 +289,7 @@ static EnHyColliderInfo sColliderInfo[] = {
/* ENHY_TYPE_AHG_20 */ { { 0, 0, 8 }, 20, 58 },
};
typedef struct {
typedef struct EnHyPlayerTrackingInfo {
/* 0x00 */ u8 presetIndex;
/* 0x04 */ f32 childYOffset;
/* 0x08 */ f32 adultYOffset;
@ -319,7 +319,7 @@ static EnHyPlayerTrackingInfo sPlayerTrackingInfo[] = {
/* ENHY_TYPE_AHG_20 */ { 0x0A, 20.0f, 0.0f },
};
typedef struct {
typedef struct EnHyInit2Info {
/* 0x00 */ f32 shadowScale;
/* 0x04 */ Vec3f modelOffset;
/* 0x10 */ f32 scale;

2
src/overlays/actors/ovl_En_Hy/z_en_hy.h
View file

@ -4,7 +4,7 @@
#include "ultra64.h"
#include "global.h"
typedef enum {
typedef enum EnHyType {
/* 0 */ ENHY_TYPE_AOB,
/* 1 */ ENHY_TYPE_COB,
/* 2 */ ENHY_TYPE_AHG_2,