From c68b45e41bed375b66a929f51382ac54164ceae7 Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Sat, 4 Nov 2023 01:08:58 -0300 Subject: [PATCH] format --- assets/xml/misc/skyboxes.xml | 2 +- src/overlays/actors/ovl_En_Bsb/z_en_bsb.c | 4 +-- src/overlays/actors/ovl_En_Jso2/z_en_jso2.c | 36 ++++++++++----------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/assets/xml/misc/skyboxes.xml b/assets/xml/misc/skyboxes.xml index cc2260f0f..3e82f084f 100644 --- a/assets/xml/misc/skyboxes.xml +++ b/assets/xml/misc/skyboxes.xml @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c index 3acf3d4aa..2dafbe5da 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -52,7 +52,7 @@ void func_80C0E1C0(EnBsb* this, PlayState* play); void func_80C0E480(EnBsb* this, PlayState* play); void func_80C0E4FC(EnBsb* this, PlayState* play); s32 func_80C0E9CC(EnBsb* this, PlayState* play); -void func_80C0B290(EnBsb* this, s32 arg0); +void func_80C0B290(EnBsb* this, s32 animIndex); void func_80C0B31C(PlayState* play, EnBsb* this, Vec3f* pos); s32 func_80C0B888(EnBsb* this, PlayState* play); void func_80C0C32C(EnBsb* this); @@ -60,7 +60,7 @@ void func_80C0C430(EnBsb* this); void func_80C0D00C(EnBsb* this); void func_80C0E3B8(EnBsb* this); void func_80C0E618(EnBsb* this, PlayState* play); -void func_80C0F544(EnBsb* this, Vec3f* pos, Vec3f* unk_02, Vec3f* unk3, f32 unk4, s16 unk5); +void func_80C0F544(EnBsb* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 arg0, s16 arg1); void func_80C0F640(EnBsb* this, PlayState* play); void func_80C0F758(EnBsb* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c index 01c0d8d9c..1a94e1726 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -17,7 +17,7 @@ void EnJso2_Init(Actor* thisx, PlayState* play); void EnJso2_Destroy(Actor* thisx, PlayState* play); void EnJso2_Update(Actor* thisx, PlayState* play); -void EnJso2_Draw(Actor* thisx, PlayState* play); +void EnJso2_Draw(Actor* thisx, PlayState* play2); void func_80A776E0(EnJso2* this, s32 animIndex); void func_80A778D8(EnJso2* this); @@ -211,44 +211,44 @@ void EnJso2_Init(Actor* thisx, PlayState* play) { Collider_InitAndSetQuad(play, &this->unkF40, &this->actor, &D_80A7B634); Collider_InitAndSetQuad(play, &this->unkFC0, &this->actor, &D_80A7B634); - rightSwordBlureInit.p2EndColor[2] = rightSwordBlureInit.p1EndColor[0] = 0xFF; // 0x360 // t7 + rightSwordBlureInit.p2EndColor[2] = rightSwordBlureInit.p1EndColor[0] = 0xFF; // 0x360 // t7 - rightSwordBlureInit.p2EndColor[0] = 0xFF; // 0x364 // t9 + rightSwordBlureInit.p2EndColor[0] = 0xFF; // 0x364 // t9 - leftSwordBlureInit.p2EndColor[2] = leftSwordBlureInit.p1EndColor[0] = 0xFF; // 0x1c0 // t6 -> t7 + leftSwordBlureInit.p2EndColor[2] = leftSwordBlureInit.p1EndColor[0] = 0xFF; // 0x1c0 // t6 -> t7 - leftSwordBlureInit.p2EndColor[0] = 0xFF; // 0x1c4 // t8 + leftSwordBlureInit.p2EndColor[0] = 0xFF; // 0x1c4 // t8 rightSwordBlureInit.p2StartColor[3] = leftSwordBlureInit.p2StartColor[3] = 0x40; // 0x1bf // t9 - leftSwordBlureInit.elemDuration = 8; // 0x1c8 // t6 + leftSwordBlureInit.elemDuration = 8; // 0x1c8 // t6 - rightSwordBlureInit.p1StartColor[0] = 0xFF; // 0x358 // t0 + rightSwordBlureInit.p1StartColor[0] = 0xFF; // 0x358 // t0 - leftSwordBlureInit.p1StartColor[0] = 0xFF; // 0x1b8 + leftSwordBlureInit.p1StartColor[0] = 0xFF; // 0x1b8 - rightSwordBlureInit.p1StartColor[2] = rightSwordBlureInit.p1StartColor[1] = 0; // 0x359 // zero + rightSwordBlureInit.p1StartColor[2] = rightSwordBlureInit.p1StartColor[1] = 0; // 0x359 // zero - rightSwordBlureInit.p1StartColor[3] = 0x80; // 0x35b // t3 + rightSwordBlureInit.p1StartColor[3] = 0x80; // 0x35b // t3 - rightSwordBlureInit.p2StartColor[0] = 0xFF; // 0x35c // t4 + rightSwordBlureInit.p2StartColor[0] = 0xFF; // 0x35c // t4 rightSwordBlureInit.p1EndColor[3] = leftSwordBlureInit.p1EndColor[3] = rightSwordBlureInit.p2EndColor[3] = leftSwordBlureInit.p2EndColor[3] = rightSwordBlureInit.p2EndColor[1] = leftSwordBlureInit.p2EndColor[1] = rightSwordBlureInit.p1EndColor[2] = leftSwordBlureInit.p1EndColor[2] = rightSwordBlureInit.p1EndColor[1] = leftSwordBlureInit.p1EndColor[1] = rightSwordBlureInit.p2StartColor[2] = - rightSwordBlureInit.p2StartColor[1] = 0; // 0x35d // zero + rightSwordBlureInit.p2StartColor[1] = 0; // 0x35d // zero - rightSwordBlureInit.elemDuration = 8; // 0x368 // t7 + rightSwordBlureInit.elemDuration = 8; // 0x368 // t7 rightSwordBlureInit.unkFlag = leftSwordBlureInit.unkFlag = 0; // 0x1cc // zero - leftSwordBlureInit.calcMode = 2; // 0x1d0 - rightSwordBlureInit.calcMode = 2; // 0x370 + leftSwordBlureInit.calcMode = 2; // 0x1d0 + rightSwordBlureInit.calcMode = 2; // 0x370 - leftSwordBlureInit.p2StartColor[0] = 0xFF; // 0x1bc + leftSwordBlureInit.p2StartColor[0] = 0xFF; // 0x1bc - leftSwordBlureInit.p1StartColor[3] = 0x80; // 0x1bb + leftSwordBlureInit.p1StartColor[3] = 0x80; // 0x1bb leftSwordBlureInit.p2StartColor[2] = leftSwordBlureInit.p2StartColor[1] = leftSwordBlureInit.p1StartColor[2] = leftSwordBlureInit.p1StartColor[1] = 0; // 0x1b9 // zero @@ -1669,4 +1669,4 @@ void EnJso2_Draw(Actor* thisx, PlayState* play2) { } CLOSE_DISPS(play->state.gfxCtx); -} \ No newline at end of file +}