summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Overton <tom-overton@users.noreply.github.com>2021-09-19 05:56:05 -0700
committerGitHub <noreply@github.com>2021-09-19 08:56:05 -0400
commitb65d363cecc7bede1a827d43866a6491ced166e7 (patch)
tree5500e4f1a66cad5b37c6eab7ae8895af02e65eb8 /src
parentda1265f4bcaec99bc884cb9ee0a5f61535780014 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c10
-rw-r--r--src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c12
-rw-r--r--src/overlays/actors/ovl_En_Dnq/z_en_dnq.c4
-rw-r--r--src/overlays/actors/ovl_En_Holl/z_en_holl.c8
-rw-r--r--src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c3
5 files changed, 15 insertions, 22 deletions
diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
index ce3e557f7..f1da2dc1d 100644
--- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
+++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
@@ -179,10 +179,10 @@ static u8 D_80B65078[] = {
// used in limbdraw
static Vec3f D_80B65084[] = {
- { 2000.0f, 4000.0f, 0.0f,},
- {-1000.0f, 1500.0f, -2000.0f,},
- {-1000.0f, 1500.0f, 2000.0f,},
-};
+ { 2000.0f, 4000.0f, 0.0f },
+ { -1000.0f, 1500.0f, -2000.0f },
+ { -1000.0f, 1500.0f, 2000.0f },
+};
void EnBigpo_Init(Actor* thisx, GlobalContext* 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
- thisx->flags &= ~0x10; // always update OFF
+ thisx->flags &= ~0x10; // always update OFF
this->unkBool204 = true;
EnBigpo_InitWellBigpo(this);
} else if (thisx->params == ENBIGPO_SUMMONED) { // dampe type
diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
index a71f41519..add94bf4b 100644
--- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
+++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
@@ -279,16 +279,8 @@ static InitChainEntry sInitChain[] = {
void EnDinofos_Init(Actor* thisx, GlobalContext* globalCtx) {
static s32 D_8089E364 = 0;
static EffBlureInit2 D_8089E368 = {
- 0,
- 8,
- 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 },
+ 0, 8, 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;
s32 i;
diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
index 4a16868aa..ac92ed454 100644
--- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
+++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
@@ -346,8 +346,8 @@ void func_80A52DC8(EnDnq* this, GlobalContext* globalCtx) {
if (!(gSaveContext.weekEventReg[23] & 0x20)) {
this->unk_390 = 70.0f;
- if (func_80114F2C(ITEM_DEKU_PRINCESS) && !func_801690CC(globalCtx) && (func_80152498(&globalCtx->msgCtx) == 0) &&
- (ActorCutscene_GetCurrentIndex() == -1)) {
+ if (func_80114F2C(ITEM_DEKU_PRINCESS) && !func_801690CC(globalCtx) &&
+ (func_80152498(&globalCtx->msgCtx) == 0) && (ActorCutscene_GetCurrentIndex() == -1)) {
if ((DECR(this->unk_384) == 0) && (gSaveContext.weekEventReg[29] & 0x40)) {
func_801518B0(globalCtx, 0x969, NULL);
this->unk_384 = 200;
diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c
index d9e6e8ea1..1d7dc33f6 100644
--- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c
+++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c
@@ -139,7 +139,7 @@ void EnHoll_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void EnHoll_ChangeRooms(GlobalContext* globalCtx) {
Room tempRoom = globalCtx->roomCtx.currRoom;
-
+
globalCtx->roomCtx.currRoom = globalCtx->roomCtx.prevRoom;
globalCtx->roomCtx.prevRoom = tempRoom;
globalCtx->roomCtx.activeMemPage ^= 1;
@@ -226,7 +226,7 @@ void EnHoll_TransparentIdle(EnHoll* this, GlobalContext* globalCtx) {
Actor_CalcOffsetOrientedToDrawRotation(&this->actor, &transformedPlayerPos,
useViewEye ? &globalCtx->view.eye : &player->actor.world.pos);
enHollTop = (globalCtx->sceneNum == SCENE_PIRATE) ? EN_HOLL_TOP_PIRATE : EN_HOLL_TOP_DEFAULT;
-
+
if ((transformedPlayerPos.y > EN_HOLL_BOTTOM_DEFAULT) && (transformedPlayerPos.y < enHollTop) &&
(fabsf(transformedPlayerPos.x) < EN_HOLL_HALFWIDTH_TRANSPARENT)) {
if (playerDistFromCentralPlane = fabsf(transformedPlayerPos.z),
@@ -238,7 +238,7 @@ void EnHoll_TransparentIdle(EnHoll* this, GlobalContext* globalCtx) {
s8 room = transitionActorEntry->sides[playerSide].room;
this->actor.room = room;
-
+
if ((this->actor.room != globalCtx->roomCtx.currRoom.num) &&
Room_StartRoomTransition(globalCtx, &globalCtx->roomCtx, this->actor.room)) {
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;
this->actor.room = globalCtx->doorCtx.transitionActorList[enHollId].sides[playerSide].room;
-
+
if ((this->actor.room != globalCtx->roomCtx.currRoom.num) &&
Room_StartRoomTransition(globalCtx, &globalCtx->roomCtx, this->actor.room)) {
this->actionFunc = EnHoll_RoomTransitionIdle;
diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c
index 8ca360469..9e47e89bb 100644
--- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c
+++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c
@@ -879,7 +879,8 @@ void EnPametfrog_FallInAir(EnPametfrog* this, GlobalContext* globalCtx) {
} else {
this->spinYaw += 0xF00;
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) {