falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some misformatted files in current master (#315) 

* Run ./format.sh on current master

* Format something in bigpo better by deleting commas + running format again
This commit is contained in:
Tom Overton 2021-09-19 05:56:05 -07:00 committed by GitHub
parent da1265f4bc
commit b65d363cec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
View File

@ -179,9 +179,9 @@ static u8 D_80B65078[] = {
// used in limbdraw // used in limbdraw
static Vec3f D_80B65084[] = { static Vec3f D_80B65084[] = {
{ 2000.0f, 4000.0f, 0.0f,}, { 2000.0f, 4000.0f, 0.0f },
{-1000.0f, 1500.0f, -2000.0f,}, { -1000.0f, 1500.0f, -2000.0f },
{-1000.0f, 1500.0f, 2000.0f,}, { -1000.0f, 1500.0f, 2000.0f },
}; };
void EnBigpo_Init(Actor* thisx, GlobalContext* globalCtx2) { void EnBigpo_Init(Actor* thisx, GlobalContext* globalCtx2) {

12
src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
View File

@ -279,16 +279,8 @@ static InitChainEntry sInitChain[] = {
void EnDinofos_Init(Actor* thisx, GlobalContext* globalCtx) { void EnDinofos_Init(Actor* thisx, GlobalContext* globalCtx) {
static s32 D_8089E364 = 0; static s32 D_8089E364 = 0;
static EffBlureInit2 D_8089E368 = { static EffBlureInit2 D_8089E368 = {
0, 0, 8, 0, { 255, 255, 255, 255 }, { 255, 255, 255, 64 }, { 255, 255, 255, 0 }, { 255, 255, 255, 0 }, 8,
8, 0, 2, 0, { 0, 0, 0, 0 }, { 0, 0, 0, 0 },
0,
{ 255, 255, 255, 255 },
{ 255, 255, 255, 64 },
{ 255, 255, 255, 0 },
{ 255, 255, 255, 0 },
8, 0, 2, 0,
{ 0, 0, 0, 0 },
{ 0, 0, 0, 0 },
}; };
EnDinofos* this = THIS; EnDinofos* this = THIS;
s32 i; s32 i;

4
src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
View File

@ -346,8 +346,8 @@ void func_80A52DC8(EnDnq* this, GlobalContext* globalCtx) {
if (!(gSaveContext.weekEventReg[23] & 0x20)) { if (!(gSaveContext.weekEventReg[23] & 0x20)) {
this->unk_390 = 70.0f; this->unk_390 = 70.0f;
if (func_80114F2C(ITEM_DEKU_PRINCESS) && !func_801690CC(globalCtx) && (func_80152498(&globalCtx->msgCtx) == 0) && if (func_80114F2C(ITEM_DEKU_PRINCESS) && !func_801690CC(globalCtx) &&
(ActorCutscene_GetCurrentIndex() == -1)) { (func_80152498(&globalCtx->msgCtx) == 0) && (ActorCutscene_GetCurrentIndex() == -1)) {
if ((DECR(this->unk_384) == 0) && (gSaveContext.weekEventReg[29] & 0x40)) { if ((DECR(this->unk_384) == 0) && (gSaveContext.weekEventReg[29] & 0x40)) {
func_801518B0(globalCtx, 0x969, NULL); func_801518B0(globalCtx, 0x969, NULL);
this->unk_384 = 200; this->unk_384 = 200;

3
src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c
View File

@ -879,7 +879,8 @@ void EnPametfrog_FallInAir(EnPametfrog* this, GlobalContext* globalCtx) {
} else { } else {
this->spinYaw += 0xF00; this->spinYaw += 0xF00;
if (this->camId != 0) { if (this->camId != 0) {
Play_CameraSetAtEye(globalCtx, this->camId, &this->actor.world.pos, &Play_GetCamera(globalCtx, this->camId)->eye); Play_CameraSetAtEye(globalCtx, this->camId, &this->actor.world.pos,
&Play_GetCamera(globalCtx, this->camId)->eye);
} }
if (this->actor.bgCheckFlags & 1) { if (this->actor.bgCheckFlags & 1) {