mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
Code Issues Projects Releases Wiki Activity

ovl_Obj_Comb add header

Browse source
This commit is contained in:
zelda2773 2020-03-31 00:03:53 -04:00
parent c05de00a96
commit 730b788f6e
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
View file

@ -1,3 +1,9 @@
/*
* File: z_obj_comb.c
* Overlay: ovl_Obj_Comb
* Description: Beehive
*/
#include "z_obj_comb.h" #include "z_obj_comb.h"
#define ROOM 0x00 #define ROOM 0x00
@ -37,7 +43,7 @@ UNK_TYPE D_80B92304[] = {
&D_80B922E0, &D_80B922E0,
}; };
InitChainEntry D_80B92314[] = { InitChainEntry initChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 1100, ICHAIN_CONTINUE), ICHAIN_F32(unk_F4, 1100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 100, ICHAIN_CONTINUE), ICHAIN_F32(unk_F8, 100, ICHAIN_CONTINUE),
@ -95,7 +101,6 @@ void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx) {
} else { } else {
u0 = 32; u0 = 32;
} }
Effect_SpawnFragment(globalCtx, &posSum, &pos2, &posSum, gravityInfluence, u0, rotSpeed, 4, 0, scale, 0, 0, 80, Effect_SpawnFragment(globalCtx, &posSum, &pos2, &posSum, gravityInfluence, u0, rotSpeed, 4, 0, scale, 0, 0, 80,
-1, 2, dlist); -1, 2, dlist);
} }
@ -128,7 +133,7 @@ void func_80B91E4C(ObjComb* this, GlobalContext* globalCtx) {
void ObjComb_Init(ObjComb* this, GlobalContext* globalCtx) { void ObjComb_Init(ObjComb* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
Actor_ProcessInitChain(&this->actor, &D_80B92314); Actor_ProcessInitChain(&this->actor, &initChain);
func_8005BBF8(globalCtx, &this->collider); func_8005BBF8(globalCtx, &this->collider);
func_8005C050(globalCtx, &this->collider, this, &D_80B92304, &this->unk_170); func_8005C050(globalCtx, &this->collider, this, &D_80B92304, &this->unk_170);
func_80B91FB0(this); func_80B91FB0(this);