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_Bb (Bubble (flying skull)) (#551)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* bubbles!

* match

* stuff

* more names

* let's go

* SFX error

* fixes

* also formatting

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
petrie911 2020-12-29 15:06:20 -06:00 • committed by GitHub
parent 94d51ce86f
commit e4d88bf942
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 1244 additions and 4170 deletions
Download patch file Download diff file Expand all files Collapse all files

1236
src/overlays/actors/ovl_En_Bb/z_en_bb.c
View file

File diff suppressed because it is too large Load diff

47
src/overlays/actors/ovl_En_Bb/z_en_bb.h
View file

@ -6,11 +6,56 @@
struct EnBb;
typedef void (*EnBbActionFunc)(struct EnBb*, GlobalContext*);
typedef struct EnBb {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x1DC];
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s limbDrawTbl[16];
/* 0x01F0 */ Vec3s transitionDrawTbl[16];
/* 0x0250 */ s32 action;
/* 0x0254 */ s32 unk_254; // unused
/* 0x0258 */ EnBbActionFunc actionFunc;
/* 0x025C */ s32 moveMode;
/* 0x0260 */ s32 timer;
/* 0x0264 */ s32 unk_264; // unused
/* 0x0268 */ s16 actionState;
/* 0x026A */ s16 charge;
/* 0x026C */ s16 actionVar1; // index for flame trail, phase of small hop when blue finds a bomb
/* 0x026E */ s16 actionVar2; // move yaw for blue, flame timer for green, maxAlpha for flame trail
/* 0x0270 */ s16 flameScrollMod;
/* 0x0274 */ f32 bobPhase;
/* 0x0278 */ f32 bobSize;
/* 0x027C */ f32 maxSpeed;
/* 0x0280 */ f32 flyHeightMod;
/* 0x027C */ f32 bobSpeedMod; // y speed for blue, phase speed for green
/* 0x0288 */ f32 flameScaleY;
/* 0x028C */ f32 flameScaleX;
/* 0x0290 */ Vec3f waypointPos;
/* 0x029C */ u8 path;
/* 0x029D */ u8 waypoint;
/* 0x029E */ u8 flamePrimBlue;
/* 0x029F */ u8 flamePrimAlpha;
/* 0x02A0 */ Color_RGB8 flameEnvColor;
/* 0x02A4 */ s32 blureIdx;
/* 0x02A8 */ s16 fireIceTimer;
/* 0x02AA */ u8 dmgEffect;
/* 0x02AC */ ColliderJntSph collider;
/* 0x02CC */ ColliderJntSphItem elements[1];
/* 0x030C */ struct_80032E24 enPartInfo;
/* 0x0324 */ Actor* targetActor;
} EnBb; // size = 0x0328
typedef enum {
ENBB_GREEN_BIG = -5,
ENBB_GREEN,
ENBB_WHITE,
ENBB_RED,
ENBB_BLUE,
ENBB_FLAME_TRAIL,
ENBB_KILL_TRAIL = 11
} EnBbType;
extern const ActorInit En_Bb_InitVars;
#endif