mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-22 22:44:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct field offsets in header files (#2730)

Browse Source
This commit is contained in:
Philip Dubé
2026-04-12 10:26:20 +00:00
committed by GitHub
parent b56b5fc2c8
commit 63df17a235
12 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
+3 -3
View File
@@ -23,8 +23,8 @@ typedef struct BgDyYoseizoEffect {
/* 0x30 */ f32 scale;
/* 0x34 */ s16 timer; // lifetime
/* 0x36 */ s16 type; // 0 is general radiance, else is directed towards Player
/* 0x36 */ f32 pitch;
/* 0x36 */ f32 yaw;
/* 0x38 */ f32 pitch;
/* 0x3C */ f32 yaw;
/* 0x40 */ f32 roll;
} BgDyYoseizoEffect; // size = 0x44
@@ -49,7 +49,7 @@ typedef struct BgDyYoseizo {
/* 0x02FA */ s16 unusedTimer;
/* 0x02FC */ s16 animationChanged;
/* 0x02FE */ s16 finishedSpinGrow;
/* 0x02FE */ s16 itemSpawned;
/* 0x0300 */ s16 itemSpawned;
/* 0x0302 */ s16 healingTimer;
/* 0x0304 */ s16 warpEffectSpawned;
/* 0x0306 */ s16 refillTimer;
src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h
+1 -1
View File
@@ -73,7 +73,7 @@ typedef struct BossDodongo {
/* 0x020C */ f32 unk_20C;
/* 0x0210 */ f32 colorFilterR;
/* 0x0214 */ f32 colorFilterG;
/* 0x0214 */ f32 colorFilterB;
/* 0x0218 */ f32 colorFilterB;
/* 0x021C */ f32 colorFilterMin;
/* 0x0220 */ f32 colorFilterMax;
/* 0x0224 */ f32 unk_224;
src/overlays/actors/ovl_En_Am/z_en_am.h
+1 -1
View File
@@ -24,7 +24,7 @@ typedef struct EnAm {
/* 0x0264 */ s16 unk_264;
/* 0x0266 */ u8 textureBlend; // 0 = statue textures; 255 = enemy textures
/* 0x0267 */ u8 damageReaction;
/* 0x0267 */ Vec3f shakeOrigin; // center point to shake around when waking up
/* 0x0268 */ Vec3f shakeOrigin; // center point to shake around when waking up
/* 0x0274 */ ColliderCylinder hurtCollider;
/* 0x02C0 */ ColliderCylinder blockCollider;
/* 0x030C */ ColliderQuad hitCollider;
src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h
+1 -1
View File
@@ -30,7 +30,7 @@ typedef struct EnAttackNiw {
/* 0x027C */ f32 unk_27C;
/* 0x0280 */ f32 unk_280;
/* 0x0284 */ f32 unk_284;
/* 0x0284 */ f32 unk_288;
/* 0x0288 */ f32 unk_288;
/* 0x028C */ s16 unk_28C;
/* 0x028E */ s16 unk_28E;
/* 0x0290 */ char unk_290[0x2];
src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
+1 -1
View File
@@ -14,7 +14,7 @@ typedef struct EnExItem {
/* 0x014C */ EnExItemActionFunc actionFunc;
/* 0x0150 */ s16 getItemObjectId;
/* 0x0152 */ s16 type;
/* 0x0152 */ s16 unusedParam;
/* 0x0154 */ s16 unusedParam;
/* 0x0156 */ s16 giDrawId;
/* 0x0158 */ s16 stopRotate;
/* 0x015A */ s16 timer;
src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
+2 -2
View File
@@ -16,8 +16,8 @@ typedef struct EnMThunder {
/* 0x019C */ LightInfo lightInfo;
/* 0x01AC */ f32 spinAttackTimer;
/* 0x01B0 */ f32 spinAttackAlpha;
/* 0x01B0 */ f32 spinTrailTexScroll;
/* 0x01B0 */ f32 spinChargePercent;
/* 0x01B4 */ f32 spinTrailTexScroll;
/* 0x01B8 */ f32 spinChargePercent;
/* 0x01BC */ f32 dimmingIntensity;
/* 0x01C0 */ EnMThunderActionFunc actionFunc;
/* 0x01C4 */ u16 followPlayerTimer;
src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h
+1 -1
View File
@@ -34,7 +34,7 @@ typedef struct EnPoField {
/* 0x019C */ Vec3s jointTable[10];
/* 0x01D8 */ Vec3s morphTable[10];
/* 0x0214 */ Color_RGBA8 lightColor;
/* 0x0214 */ Color_RGBA8 soulColor;
/* 0x0218 */ Color_RGBA8 soulColor;
/* 0x021C */ f32 scaleModifier;
/* 0x0220 */ f32 flameScale;
/* 0x0224 */ Vec3f flamePosition;
src/overlays/actors/ovl_En_Poh/z_en_poh.h
+1 -1
View File
@@ -25,7 +25,7 @@ typedef struct EnPohInfo {
/* 0x0000 */ Color_RGB8 primColor;
/* 0x0003 */ Color_RGB8 lightColor;
/* 0x0006 */ u8 unk_6; // limb index
/* 0x0006 */ u8 unk_7; // limb index
/* 0x0007 */ u8 unk_7; // limb index
/* 0x0008 */ s8 unk_8; // rate of some kind
/* 0x000C */ AnimationHeader* idleAnim;
/* 0x0010 */ AnimationHeader* idleAnim2;
src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h
+1 -1
View File
@@ -16,7 +16,7 @@ typedef struct EnWonderTalk {
/* 0x0154 */ s16 switchFlag;
/* 0x0156 */ s16 unk_156;
/* 0x0158 */ s16 unk_158;
/* 0x0160 */ s16 unk_15A;
/* 0x015A */ s16 unk_15A;
/* 0x015C */ f32 unk_15C;
/* 0x0160 */ f32 height;
/* 0x0164 */ u8 unk_164;
src/overlays/actors/ovl_En_fHG/z_en_fhg.h
+1 -1
View File
@@ -35,7 +35,7 @@ typedef struct EnfHG {
/* 0x018C */ Vec3f inPaintingPos;
/* 0x0198 */ f32 inPaintingVelX;
/* 0x019C */ f32 inPaintingVelZ;
/* 0x0198 */ f32 damageSpeedMod;
/* 0x01A0 */ f32 damageSpeedMod;
/* 0x01A4 */ f32 approachRate;
/* 0x01A8 */ f32 subCamVelFactor;
/* 0x01AC */ f32 subCamPanZ;
src/overlays/actors/ovl_player_actor/z_player.c
+1 -1
View File
@@ -145,7 +145,7 @@ typedef struct struct_80854190 {
typedef struct struct_80854578 {
/* 0x00 */ LinkAnimationHeader* anim;
/* 0x04 */ f32 unk_04;
/* 0x04 */ f32 unk_08;
/* 0x08 */ f32 unk_08;
} struct_80854578; // size = 0x0C
typedef struct struct_80854B18 {
src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
+1 -1
View File
@@ -6,7 +6,7 @@
typedef struct EffectSsStone1InitParams {
/* 0x00 */ Vec3f pos;
/* 0x00 */ s32 unk_C;
/* 0x0C */ s32 unk_C;
} EffectSsStone1InitParams; // size = 0x
#endif