mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

Run formatter with changes

Browse source
This commit is contained in:
Roman971 2020-03-24 00:11:21 +01:00
parent 5b42bda4eb
commit 9a63f1d4d1
19 changed files with 489 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
View file

@ -70,12 +70,10 @@ static void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx) {
if (this->unk_168 == 1 && !(gSaveContext.inf_table[7] & 0x40)) {
this->unk_178 = 2;
this->actionFunc = (ActorFunc)func_80878300;
}
else if (this->unk_168 == 2) {
} else if (this->unk_168 == 2) {
this->unk_178 = 2;
this->actionFunc = (ActorFunc)func_80878300;
}
else if (this->unk_168 < 0) {
} else if (this->unk_168 < 0) {
this->unk_178 = 2;
this->actionFunc = (ActorFunc)func_808783D4;
}

13
src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
View file

@ -20,11 +20,18 @@ static void func_808C0CD4(BgZg* this, GlobalContext* globalCtx);
static void func_808C0D08(BgZg* this, GlobalContext* globalCtx);
static void func_808C0EEC(BgZg* this, GlobalContext* globalCtx);
static const ActorFunc actionFuncs[] = { (ActorFunc)func_808C0CD4, (ActorFunc)func_808C0D08, };
static const ActorFunc actionFuncs[] = {
(ActorFunc)func_808C0CD4,
(ActorFunc)func_808C0D08,
};
static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), };
static InitChainEntry initChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
};
static const ActorFunc drawFuncs[] = { (ActorFunc)func_808C0EEC, };
static const ActorFunc drawFuncs[] = {
(ActorFunc)func_808C0EEC,
};
const ActorInit Bg_Zg_InitVars = {
ACTOR_BG_ZG,

12
src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
View file

@ -98,12 +98,13 @@ void EnTuboTrap_SpawnFragments(EnTuboTrap* this, GlobalContext* globalCtx) {
spC8.z += actorPos->z;
rand = Math_Rand_ZeroOne();
if (rand < 0.2f)
if (rand < 0.2f) {
temp = 96;
else if (rand < 0.6f)
} else if (rand < 0.6f) {
temp = 64;
else
} else {
temp = 32;
}
Effect_SpawnFragment(globalCtx, &spC8, &spBC, actorPos, -240, temp, 10, 10, 0,
(Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 60, -1, 3, addr);
@ -153,10 +154,11 @@ void EnTuboTrap_SpawnWaterFragments(EnTuboTrap* this, GlobalContext* globalCtx)
spC8.z += actorPos->z;
rand = Math_Rand_ZeroOne();
if (rand < 0.2f)
if (rand < 0.2f) {
temp = 64;
else
} else {
temp = 32;
}
Effect_SpawnFragment(globalCtx, &spC8, &spBC, actorPos, -180, temp, 30, 30, 0,
(Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 70, -1, 3, addr);