From dc7cbd2c0610b7c74d3a20521356d9ef037ddaac Mon Sep 17 00:00:00 2001 From: Sonic Dreamcaster Date: Tue, 19 Nov 2024 15:41:10 -0300 Subject: [PATCH] fix variables --- src/overlays/ovl_i3/fox_a6.c | 10 +++++----- src/overlays/ovl_i6/fox_sy.c | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/overlays/ovl_i3/fox_a6.c b/src/overlays/ovl_i3/fox_a6.c index 52bf33e2..838a3697 100644 --- a/src/overlays/ovl_i3/fox_a6.c +++ b/src/overlays/ovl_i3/fox_a6.c @@ -2614,7 +2614,7 @@ void Area6_8018EB3C(ActorCutscene* this) { AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, this->sfxSource, 0); } -void Area6_8018EC38(ActorCutscene* this, s32 arg1) { +void Area6_8018EC38(ActorCutscene* this, s32 teamIdx) { Vec3f sp2C[3] = { { -150.0f, 40.0f, 75.0f }, { 150.0f, 40.0f, 150.0f }, @@ -2622,14 +2622,14 @@ void Area6_8018EC38(ActorCutscene* this, s32 arg1) { }; Player* player = &gPlayer[0]; - if (gTeamShields[arg1 + 1] > 0) { + if (gTeamShields[teamIdx + 1] > 0) { Actor_Initialize(this); this->obj.status = OBJ_ACTIVE; this->obj.id = OBJ_ACTOR_CUTSCENE; - this->obj.pos.x = sp2C[arg1].x + player->pos.x; - this->obj.pos.y = sp2C[arg1].y + player->pos.y; - this->obj.pos.z = sp2C[arg1].z + player->pos.z; + this->obj.pos.x = sp2C[teamIdx].x + player->pos.x; + this->obj.pos.y = sp2C[teamIdx].y + player->pos.y; + this->obj.pos.z = sp2C[teamIdx].z + player->pos.z; this->state = 100; diff --git a/src/overlays/ovl_i6/fox_sy.c b/src/overlays/ovl_i6/fox_sy.c index 7889bfae..b39c2faf 100644 --- a/src/overlays/ovl_i6/fox_sy.c +++ b/src/overlays/ovl_i6/fox_sy.c @@ -2585,20 +2585,20 @@ Vec3f D_i6_801A6AEC[5] = { { 0.0f, 345.0f, 350.0f }, { 90.0f, 87.0f, 93.0f }, }; -void SectorY_801A06A4(ActorCutscene* this, s32 arg1) { - if (gTeamShields[1 + arg1] > 0) { +void SectorY_801A06A4(ActorCutscene* this, s32 teamIdx) { + if (gTeamShields[1 + teamIdx] > 0) { Actor_Initialize(this); this->obj.status = OBJ_ACTIVE; this->obj.id = OBJ_ACTOR_CUTSCENE; - this->obj.pos.x = gPlayer[0].pos.x + D_i6_801A6AEC[arg1].x; - this->obj.pos.y = gPlayer[0].pos.y + D_i6_801A6AEC[arg1].y; - this->obj.pos.z = gPlayer[0].pos.z + D_i6_801A6AEC[arg1].z; + this->obj.pos.x = gPlayer[0].pos.x + D_i6_801A6AEC[teamIdx].x; + this->obj.pos.y = gPlayer[0].pos.y + D_i6_801A6AEC[teamIdx].y; + this->obj.pos.z = gPlayer[0].pos.z + D_i6_801A6AEC[teamIdx].z; this->fwork[0] = gPlayer[0].baseSpeed; this->rot_0F4.y = gPlayer[0].rot.y; this->rot_0F4.z = gPlayer[0].rot.z; - this->state = arg1 + 7; + this->state = teamIdx + 7; this->iwork[11] = 1; Object_SetInfo(&this->info, this->obj.id);