diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 4734c8c2ee..e5f79ee068 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -57,7 +57,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, PlayState* play); void BossMo_SetupTentacle(BossMo* this, PlayState* play); void BossMo_Tentacle(BossMo* this, PlayState* play); -void BossMo_Unknown(void); +void BossMo_SfxTest(void); typedef enum BossMoEffectType { /* 0 */ MO_FX_NONE, @@ -188,7 +188,7 @@ s32 BossMo_NearLand(Vec3f* pos, f32 margin) { void BossMo_SpawnRipple(BossMoEffect* effect, Vec3f* pos, f32 scale, f32 maxScale, s16 maxAlpha, s16 countLimit, u8 type) { - static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; s16 i; for (i = 0; i < countLimit; i++, effect++) { @@ -196,8 +196,8 @@ void BossMo_SpawnRipple(BossMoEffect* effect, Vec3f* pos, f32 scale, f32 maxScal effect->stopTimer = 0; effect->type = type; effect->pos = *pos; - effect->vel = zeroVec; - effect->accel = zeroVec; + effect->vel = sZeroVec; + effect->accel = sZeroVec; effect->scale = scale * 0.0025f; effect->fwork[MO_FX_MAX_SIZE] = maxScale * 0.0025f; if (scale > 300.0f) { @@ -2258,7 +2258,10 @@ void BossMo_UpdateCore(Actor* thisx, PlayState* play) { if (player->actor.parent != NULL) { this->actor.flags &= ~ACTOR_FLAG_0; } - BossMo_Unknown(); + +#if PLATFORM_GC + BossMo_SfxTest(); +#endif } void BossMo_UpdateTent(Actor* thisx, PlayState* play) { @@ -2440,7 +2443,7 @@ static Gfx* sTentDLists[41] = { }; void BossMo_DrawTentacle(BossMo* this, PlayState* play) { - static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; s16 i; s16 notCut; s16 index; @@ -2540,9 +2543,9 @@ void BossMo_DrawTentacle(BossMo* this, PlayState* play) { Matrix_Pop(); } - Matrix_MultVec3f(&zeroVec, &this->tentPos[i]); + Matrix_MultVec3f(&sZeroVec, &this->tentPos[i]); if (i == 36) { - Matrix_MultVec3f(&zeroVec, &this->actor.focus.pos); + Matrix_MultVec3f(&sZeroVec, &this->actor.focus.pos); } if (i == 24) { MtxF sp98; @@ -3046,9 +3049,10 @@ void BossMo_DrawEffects(BossMoEffect* effect, PlayState* play) { CLOSE_DISPS(gfxCtx, "../z_boss_mo.c", 7482); } -void BossMo_Unknown(void) { +#if PLATFORM_GC +void BossMo_SfxTest(void) { // Appears to be a test function for sound effects. - static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; static u16 unkSfx[] = { // Walking NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_DIRT, @@ -3592,10 +3596,11 @@ void BossMo_Unknown(void) { if (BREG(32) != 0) { BREG(32)--; SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 1); - Sfx_PlaySfxAtPos(&zeroVec, unkSfx[BREG(33)]); + Sfx_PlaySfxAtPos(&sZeroVec, unkSfx[BREG(33)]); } if (BREG(34) != 0) { BREG(34) = 0; SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, BREG(35)); } } +#endif diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 102eaa6ef0..ebbb8e2b78 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -1577,7 +1577,9 @@ void EnGo2_Init(Actor* thisx, PlayState* play) { this->actionFunc = EnGo2_CurledUp; } } else { +#if PLATFORM_GC CLEAR_INFTABLE(INFTABLE_10C); +#endif this->collider.dim.height = (D_80A4816C[PARAMS_GET_S(this->actor.params, 0, 5)].height * 0.6f); EnGo2_SetupRolling(this, play); this->isAwake = true; diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 9edfbe6a32..147f14cf83 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -16,6 +16,18 @@ #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) +#if PLATFORM_N64 +#define CURSOR_COLOR_R 0 +#define CURSOR_COLOR_G 80 +#define CURSOR_COLOR_B 255 +#define CURSOR_COLOR_A 255 +#else +#define CURSOR_COLOR_R 0 +#define CURSOR_COLOR_G 255 +#define CURSOR_COLOR_B 80 +#define CURSOR_COLOR_A 255 +#endif + void EnOssan_Init(Actor* thisx, PlayState* play); void EnOssan_Destroy(Actor* thisx, PlayState* play); void EnOssan_Update(Actor* thisx, PlayState* play); @@ -1882,10 +1894,10 @@ void EnOssan_UpdateCursorAnim(EnOssan* this) { this->cursorAnimState = 0; } } - this->cursorColorR = ColChanMix(0, 0.0f, t); - this->cursorColorG = ColChanMix(255, 80.0f, t); - this->cursorColorB = ColChanMix(80, 0.0f, t); - this->cursorColorA = ColChanMix(255, 0.0f, t); + this->cursorColorR = ColChanMix(CURSOR_COLOR_R, 0.0f, t); + this->cursorColorG = ColChanMix(CURSOR_COLOR_G, 80.0f, t); + this->cursorColorB = ColChanMix(CURSOR_COLOR_B, 0.0f, t); + this->cursorColorA = ColChanMix(CURSOR_COLOR_A, 0.0f, t); this->cursorAnimTween = t; } @@ -2142,10 +2154,10 @@ void EnOssan_InitActionFunc(EnOssan* this, PlayState* play) { this->cursorIndex = 0; this->cursorZ = 1.5f; - this->cursorColorR = 0; - this->cursorColorG = 255; - this->cursorColorB = 80; - this->cursorColorA = 255; + this->cursorColorR = CURSOR_COLOR_R; + this->cursorColorG = CURSOR_COLOR_G; + this->cursorColorB = CURSOR_COLOR_B; + this->cursorColorA = CURSOR_COLOR_A; this->cursorAnimTween = 0; this->cursorAnimState = 0;