1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 06:10:21 +00:00

Format all src C files

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

View file

@ -2,21 +2,20 @@
* File: z_obj_makekinsuta.c
* Overlay: ovl_Obj_Makekinsuta
* Description: Skulltula Sprouting from Bean Spot.
*/
*/
#include <ultra64.h>
#include <global.h>
#include <vt.h>
typedef struct
{
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ ActorFunc actionFunc;
/* 0x150 */ s16 unk_150;
/* 0x152 */ s16 unk_152;
} ObjMakekinsuta; // size = 0x0154
#define ROOM 0x00
#define ROOM 0x00
#define FLAGS 0x00000010
static void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx);
@ -24,8 +23,7 @@ static void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx
static void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx);
static void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx);
const ActorInit Obj_Makekinsuta_InitVars =
{
const ActorInit Obj_Makekinsuta_InitVars = {
ACTOR_OBJ_MAKEKINSUTA,
ACTORTYPE_ITEMACTION,
ROOM,
@ -38,49 +36,39 @@ const ActorInit Obj_Makekinsuta_InitVars =
NULL,
};
static void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx)
{
if ((this->actor.params & 0x6000) == 0x4000)
{
static void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx) {
if ((this->actor.params & 0x6000) == 0x4000) {
osSyncPrintf(VT_FGCOL(BLUE));
// Translation: Gold Star Enemy(arg_data %x)
// Translation: Gold Star Enemy(arg_data %x)
osSyncPrintf("金スタ発生敵(arg_data %x)\n", this->actor.params);
osSyncPrintf(VT_RST);
}
else
{
} else {
osSyncPrintf(VT_COL(YELLOW, BLACK));
// Translation: Invalid Argument (arg_data %x)(%s %d)
// Translation: Invalid Argument (arg_data %x)(%s %d)
osSyncPrintf("引数不正 (arg_data %x)(%s %d)\n", this->actor.params, "../z_obj_makekinsuta.c", 119);
osSyncPrintf(VT_RST);
}
this->actionFunc = func_80B98320;
}
static void func_80B98320(ObjMakekinsuta* this,GlobalContext* globalCtx)
{
if (this->unk_152 != 0)
{
if (this->unk_150 >= 0x3C && !func_8002DEEC(PLAYER))
{
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_SW,
this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z,
0, this->actor.shape.rot.y, 0, (this->actor.params | 0x8000));
this->actionFunc = &func_80B983D4;
return;
}
static void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx) {
if (this->unk_152 != 0) {
if (this->unk_150 >= 0x3C && !func_8002DEEC(PLAYER)) {
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_SW, this->actor.posRot.pos.x,
this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.shape.rot.y, 0,
(this->actor.params | 0x8000));
this->actionFunc = &func_80B983D4;
return;
}
this->unk_150 = this->unk_150 + 1;
return;
}
this->unk_150 = 0;
this->unk_150 = 0;
}
static void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx)
{
static void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx) {
}
static void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx)
{
static void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx) {
this->actionFunc(&this->actor, globalCtx);
}