1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00

First proper commit.

This commit is contained in:
Jack Walker 2020-03-17 00:31:30 -04:00
parent be78236d36
commit 087f561f77
14086 changed files with 1200489 additions and 1 deletions

View file

@ -0,0 +1,2 @@
ovl_Obj_Comb
z_obj_comb.c

View file

@ -0,0 +1,40 @@
#include "z_obj_comb.h"
#define ROOM 0x00
#define FLAGS 0x00000000
void ObjComb_Init(ObjComb* this, GlobalContext* globalCtx);
void ObjComb_Destroy(ObjComb* this, GlobalContext* globalCtx);
void ObjComb_Update(ObjComb* this, GlobalContext* globalCtx);
void ObjComb_Draw(ObjComb* this, GlobalContext* globalCtx);
/*
const ActorInit Obj_Comb_InitVars =
{
ACTOR_OBJ_COMB,
ACTORTYPE_PROP,
ROOM,
FLAGS,
OBJECT_GAMEPLAY_FIELD_KEEP,
sizeof(ObjComb),
(ActorFunc)ObjComb_Init,
(ActorFunc)ObjComb_Destroy,
(ActorFunc)ObjComb_Update,
(ActorFunc)ObjComb_Draw,
};
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91B60.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91E4C.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Init.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Destroy.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91FB0.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91FC0.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Update.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Draw.s")

View file

@ -0,0 +1,15 @@
#ifndef _Z_OBJ_COMB_H_
#define _Z_OBJ_COMB_H_
#include <ultra64.h>
#include <global.h>
typedef struct
{
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x68];
} ObjComb; // size = 0x01B4
extern const ActorInit Obj_Comb_InitVars;
#endif