mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-06 02:48:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

[cc0 oot] Bari (#2795)

Browse Source 
* [cc0 oot] Bari

* revert using biri params

* EnVali cleanup

* bari cleanup

* bari cleanup
This commit is contained in:
Dragorn421
2026-08-31 17:37:51 +02:00
committed by GitHub
parent 761db13884
commit fe068a1396
3 changed files with 430 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Vali/z_en_vali.c
+353 -404
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Vali/z_en_vali.h
+15 -19
View File
@@ -3,6 +3,7 @@
#include "ultra64.h"
#include "actor.h"
#include "assets/objects/object_vali/object_vali.h"
struct EnVali;
@@ -10,24 +11,19 @@ struct EnVali;
typedef void (*EnValiActionFunc)(struct EnVali*, struct PlayState*);
typedef struct EnVali {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ EnValiActionFunc actionFunc;
/* 0x0194 */ u8 lightningTimer;
/* 0x0195 */ u8 slingshotReactionTimer;
/* 0x0196 */ s16 timer;
/* 0x0198 */ Vec3s jointTable[VALI_LIMB_MAX];
/* 0x0246 */ Vec3s morphTable[VALI_LIMB_MAX];
/* 0x02F4 */ f32 armScale;
/* 0x02F8 */ f32 floatHomeHeight; // Used as a centre for floating when visible (home is used for the lurk height)
/* 0x02FC */ ColliderQuad leftArmCollider;
/* 0x037C */ ColliderQuad rightArmCollider;
/* 0x03FC */ ColliderCylinder bodyCollider;
} EnVali; // size = 0x0448
typedef enum EnValiType {
/* 0 */ BARI_TYPE_NORMAL,
/* 1 */ BARI_TYPE_SWORD_DAMAGE
} EnValiType;
/* 0x000 */ Actor actor;
/* 0x14C */ SkelAnime skelAnime;
/* 0x190 */ EnValiActionFunc actionFunc;
/* 0x194 */ u8 electrifyTimer;
/* 0x195 */ u8 spinTimer;
/* 0x196 */ s16 timer;
/* 0x198 */ Vec3s jointTable[BARI_LIMB_MAX];
/* 0x246 */ Vec3s morphTable[BARI_LIMB_MAX];
/* 0x2F4 */ f32 tentaclesLengthFactor;
/* 0x2F8 */ f32 spinHeight;
/* 0x2FC */ ColliderQuad leftTentacleCollider;
/* 0x37C */ ColliderQuad rightTentacleCollider;
/* 0x3FC */ ColliderCylinder collider;
} EnVali; // size = 0x448
#endif