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

Format all src C files

Browse source
This commit is contained in:
Roman971 2020-03-22 22:19:43 +01:00
parent 251aea64ab
commit 8cfe7cce9f
652 changed files with 12488 additions and 19093 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/overlays/actors/ovl_En_It/z_en_it.c
View file

@ -2,16 +2,15 @@
* File: z_en_it.c
* Overlay: ovl_En_It
* Description: Dampe's Minigame digging spot hitboxes
*/
*/
#include <ultra64.h>
#include <global.h>
#include <z64.h>
typedef struct
{
/* 0x0000 */ Actor actor;
/* 0x014C */ u32 unk_14C;
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ u32 unk_14C;
/* 0x0150 */ ColliderCylinderMain cylinderCollider;
} ActorIt; // size = 0x019C
@ -22,53 +21,23 @@ static void Init(ActorIt* this, GlobalContext* globalCtx);
static void Destroy(ActorIt* this, GlobalContext* globalCtx);
static void Update(ActorIt* this, GlobalContext* globalCtx);
static ColliderCylinderInit cylinderInitData =
{
0x0A, 0x00, 0x00, 0x05,
0x10, 0x01, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00000000,
0x00, 0x00, 0x00, 0x00,
0x00000000,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x01, 0x00,
0x0028,
0x000A,
0x00000000000000000000,
static ColliderCylinderInit cylinderInitData = {
0x0A, 0x00, 0x00, 0x05, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00,
0x00, 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000, 0x0001, 0x0000, 0x0028, 0x000A, 0x0000,
};
static u8 damageTblInitData[] =
{
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0xFF,
0x00,
0x00,
0x00
static u8 damageTblInitData[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00,
};
const ActorInit En_It_InitVars =
{
ACTOR_EN_IT,
ACTORTYPE_PROP,
ROOM,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(ActorIt),
(ActorFunc)Init,
(ActorFunc)Destroy,
(ActorFunc)Update,
const ActorInit En_It_InitVars = {
ACTOR_EN_IT, ACTORTYPE_PROP, ROOM,
FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ActorIt),
(ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Update,
(ActorFunc)NULL,
};
static void Init(ActorIt* this, GlobalContext* globalCtx)
{
static void Init(ActorIt* this, GlobalContext* globalCtx) {
ActorIt* it = this;
it->actor.params = 0x0D05;
@ -77,15 +46,13 @@ static void Init(ActorIt* this, GlobalContext* globalCtx)
func_80061EFC(&it->actor.sub_98.damageChart, 0, &damageTblInitData); // Init Damage Chart
}
static void Destroy(ActorIt* this, GlobalContext* globalCtx)
{
static void Destroy(ActorIt* this, GlobalContext* globalCtx) {
ActorIt* it = this;
ActorCollider_FreeCylinder(globalCtx, &it->cylinderCollider);
}
static void Update(ActorIt* this, GlobalContext* globalCtx)
{
static void Update(ActorIt* this, GlobalContext* globalCtx) {
s32 pad;
ActorIt* it = this;