mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +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

63
src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
View file

@ -2,11 +2,11 @@
* File: z_bg_mjin.c
* Overlay: ovl_Bg_Mjin
* Description: Warp Pad
*/
*/
#include "z_bg_mjin.h"
#define ROOM 0x00
#define ROOM 0x00
#define FLAGS 0x00000010
static void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc);
@ -17,8 +17,7 @@ static void func_808A0920(BgMjin* this, GlobalContext* globalCtx);
static void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx);
static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx);
const ActorInit Bg_Mjin_InitVars =
{
const ActorInit Bg_Mjin_InitVars = {
ACTOR_BG_MJIN,
ACTORTYPE_BG,
ROOM,
@ -36,51 +35,43 @@ extern u32 D_06000140;
extern u32 D_06000330;
extern u32 D_06000658;
static InitChainEntry initChain[] =
{
static InitChainEntry initChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 4000, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 400, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 400, ICHAIN_STOP)
ICHAIN_F32(unk_FC, 400, ICHAIN_STOP),
};
static s16 objectTbl[] = { OBJECT_MJIN_FLASH, OBJECT_MJIN_DARK, OBJECT_MJIN_FLAME, OBJECT_MJIN_ICE, OBJECT_MJIN_SOUL, OBJECT_MJIN_WIND };
static s16 objectTbl[] = { OBJECT_MJIN_FLASH, OBJECT_MJIN_DARK, OBJECT_MJIN_FLAME,
OBJECT_MJIN_ICE, OBJECT_MJIN_SOUL, OBJECT_MJIN_WIND };
static void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc)
{
static void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
static void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx)
{
static void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
s8 objBankIndex;
Actor_ProcessInitChain(thisx, initChain);
objBankIndex = Object_GetIndex(&globalCtx->objectCtx, (thisx->params != 0 ? OBJECT_MJIN : OBJECT_MJIN_OKA));
this->objBankIndex = objBankIndex;
if (objBankIndex < 0)
{
if (objBankIndex < 0) {
Actor_Kill(thisx);
}
else
{
} else {
BgMjin_SetupAction(this, &func_808A0850);
}
}
static void BgMjin_Destroy(BgMjin* this, GlobalContext* globalCtx)
{
static void BgMjin_Destroy(BgMjin* this, GlobalContext* globalCtx) {
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
static void func_808A0850(BgMjin* this, GlobalContext* globalCtx)
{
static void func_808A0850(BgMjin* this, GlobalContext* globalCtx) {
u32 local_c;
u32 collision;
if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex))
{
if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) {
local_c = 0;
this->dyna.actor.flags &= ~0x10;
this->dyna.actor.objBankIndex = this->objBankIndex;
@ -88,24 +79,21 @@ static void func_808A0850(BgMjin* this, GlobalContext* globalCtx)
DynaPolyInfo_SetActorMove(&this->dyna.actor, 0);
collision = this->dyna.actor.params != 0 ? &D_06000658 : &D_06000330;
DynaPolyInfo_Alloc(collision, &local_c);
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, local_c);
this->dyna.dynaPolyId =
DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, local_c);
BgMjin_SetupAction(this, &func_808A0920);
this->dyna.actor.draw = &BgMjin_Draw;
}
}
static void func_808A0920(BgMjin* this, GlobalContext* globalCtx)
{
static void func_808A0920(BgMjin* this, GlobalContext* globalCtx) {
}
static void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx)
{
static void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx);
}
static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx)
{
static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) {
s32 objBankIndex;
u32 dlist;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
@ -113,22 +101,19 @@ static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx)
s32 pad;
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250);
if (this->dyna.actor.params != 0)
{
if (this->dyna.actor.params != 0) {
objBankIndex = Object_GetIndex(&globalCtx->objectCtx, objectTbl[this->dyna.actor.params - 1]);
if (objBankIndex >= 0)
{
if (objBankIndex >= 0) {
gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objBankIndex].segment);
}
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(&D_06000000));
dlist = &D_06000330;
}
else
{
} else {
dlist = &D_06000140;
}
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 285), G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 285),
G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, dlist);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 288);
}