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

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

@ -179,10 +179,10 @@ 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) {
GlobalContext* globalCtx = globalCtx2; GlobalContext* globalCtx = globalCtx2;
@ -231,7 +231,7 @@ void EnBigpo_Init(Actor* thisx, GlobalContext* globalCtx2) {
} }
if (thisx->params == ENBIGPO_REGULAR) { // the well poe, starts immediately if (thisx->params == ENBIGPO_REGULAR) { // the well poe, starts immediately
thisx->flags &= ~0x10; // always update OFF thisx->flags &= ~0x10; // always update OFF
this->unkBool204 = true; this->unkBool204 = true;
EnBigpo_InitWellBigpo(this); EnBigpo_InitWellBigpo(this);
} else if (thisx->params == ENBIGPO_SUMMONED) { // dampe type } else if (thisx->params == ENBIGPO_SUMMONED) { // dampe type

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;

8
src/overlays/actors/ovl_En_Holl/z_en_holl.c
View File

@ -139,7 +139,7 @@ void EnHoll_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void EnHoll_ChangeRooms(GlobalContext* globalCtx) { void EnHoll_ChangeRooms(GlobalContext* globalCtx) {
Room tempRoom = globalCtx->roomCtx.currRoom; Room tempRoom = globalCtx->roomCtx.currRoom;
globalCtx->roomCtx.currRoom = globalCtx->roomCtx.prevRoom; globalCtx->roomCtx.currRoom = globalCtx->roomCtx.prevRoom;
globalCtx->roomCtx.prevRoom = tempRoom; globalCtx->roomCtx.prevRoom = tempRoom;
globalCtx->roomCtx.activeMemPage ^= 1; globalCtx->roomCtx.activeMemPage ^= 1;
@ -226,7 +226,7 @@ void EnHoll_TransparentIdle(EnHoll* this, GlobalContext* globalCtx) {
Actor_CalcOffsetOrientedToDrawRotation(&this->actor, &transformedPlayerPos, Actor_CalcOffsetOrientedToDrawRotation(&this->actor, &transformedPlayerPos,
useViewEye ? &globalCtx->view.eye : &player->actor.world.pos); useViewEye ? &globalCtx->view.eye : &player->actor.world.pos);
enHollTop = (globalCtx->sceneNum == SCENE_PIRATE) ? EN_HOLL_TOP_PIRATE : EN_HOLL_TOP_DEFAULT; enHollTop = (globalCtx->sceneNum == SCENE_PIRATE) ? EN_HOLL_TOP_PIRATE : EN_HOLL_TOP_DEFAULT;
if ((transformedPlayerPos.y > EN_HOLL_BOTTOM_DEFAULT) && (transformedPlayerPos.y < enHollTop) && if ((transformedPlayerPos.y > EN_HOLL_BOTTOM_DEFAULT) && (transformedPlayerPos.y < enHollTop) &&
(fabsf(transformedPlayerPos.x) < EN_HOLL_HALFWIDTH_TRANSPARENT)) { (fabsf(transformedPlayerPos.x) < EN_HOLL_HALFWIDTH_TRANSPARENT)) {
if (playerDistFromCentralPlane = fabsf(transformedPlayerPos.z), if (playerDistFromCentralPlane = fabsf(transformedPlayerPos.z),
@ -238,7 +238,7 @@ void EnHoll_TransparentIdle(EnHoll* this, GlobalContext* globalCtx) {
s8 room = transitionActorEntry->sides[playerSide].room; s8 room = transitionActorEntry->sides[playerSide].room;
this->actor.room = room; this->actor.room = room;
if ((this->actor.room != globalCtx->roomCtx.currRoom.num) && if ((this->actor.room != globalCtx->roomCtx.currRoom.num) &&
Room_StartRoomTransition(globalCtx, &globalCtx->roomCtx, this->actor.room)) { Room_StartRoomTransition(globalCtx, &globalCtx->roomCtx, this->actor.room)) {
this->actionFunc = EnHoll_RoomTransitionIdle; this->actionFunc = EnHoll_RoomTransitionIdle;
@ -263,7 +263,7 @@ void EnHoll_VerticalBgCoverIdle(EnHoll* this, GlobalContext* globalCtx) {
s32 playerSide = (this->actor.yDistToPlayer > 0.0f) ? EN_HOLL_ABOVE : EN_HOLL_BELOW; s32 playerSide = (this->actor.yDistToPlayer > 0.0f) ? EN_HOLL_ABOVE : EN_HOLL_BELOW;
this->actor.room = globalCtx->doorCtx.transitionActorList[enHollId].sides[playerSide].room; this->actor.room = globalCtx->doorCtx.transitionActorList[enHollId].sides[playerSide].room;
if ((this->actor.room != globalCtx->roomCtx.currRoom.num) && if ((this->actor.room != globalCtx->roomCtx.currRoom.num) &&
Room_StartRoomTransition(globalCtx, &globalCtx->roomCtx, this->actor.room)) { Room_StartRoomTransition(globalCtx, &globalCtx->roomCtx, this->actor.room)) {
this->actionFunc = EnHoll_RoomTransitionIdle; this->actionFunc = EnHoll_RoomTransitionIdle;

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) {