diff --git a/src/effect/ef_effect_control.c b/src/effect/ef_effect_control.c index 12813113..0eed768f 100644 --- a/src/effect/ef_effect_control.c +++ b/src/effect/ef_effect_control.c @@ -180,7 +180,7 @@ static void eEC_Name2EffectMake(int effect_id, xyz_t pos, int prio, s16 angle, G eEC_Effect_c* effect = eEC_ctrl_work.effects; /* Check if any of the spawned effects are an exact match to this one */ - for (i = 0; i < eEC_EFFECT_ACTIVE_MAX; i++, active_flags++, effect++) { + for (i = 0; i < eEC_EFFECT_ACTIVE_MAX; active_flags++, effect++, i++) { if (*active_flags && effect->name == effect_id && effect->item_name == item_name) { return; } diff --git a/src/effect/ef_gimonhu.c b/src/effect/ef_gimonhu.c index b4fea60d..101ba516 100644 --- a/src/effect/ef_gimonhu.c +++ b/src/effect/ef_gimonhu.c @@ -92,7 +92,7 @@ static void eGM_dw(eEC_Effect_c* effect, GAME* game) { _texture_z_light_fog_prim_xlu(game->graph); eEC_CLIP->auto_matrix_xlu_offset_proc(game, &effect->position, &effect->scale, &effect->offset); gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 128, 255, 255, 255, v); + gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 128, 255, 255, 255, (u8)v); gSPDisplayList(NEXT_POLY_XLU_DISP, ef_gimonhu01_00_modelT); CLOSE_DISP(game->graph); } diff --git a/src/effect/ef_goki.c b/src/effect/ef_goki.c index e4d700f9..ddb6a994 100644 --- a/src/effect/ef_goki.c +++ b/src/effect/ef_goki.c @@ -83,7 +83,7 @@ static void eGoki_dw(eEC_Effect_c* effect, GAME* game) { Matrix_RotateZ(effect->effect_specific[0], MTX_MULT); Evw_Anime_Set(play, ef_goki01_01_evw_anime); gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 255, 255, 255, opacity); + gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 255, 255, 255, (u8)opacity); gSPDisplayList(NEXT_POLY_XLU_DISP, ef_goki01_01_modelT); CLOSE_DISP(game->graph); } diff --git a/src/effect/ef_ha.c b/src/effect/ef_ha.c index 1fac96a3..16cfbccd 100644 --- a/src/effect/ef_ha.c +++ b/src/effect/ef_ha.c @@ -69,7 +69,7 @@ static void eHA_dw(eEC_Effect_c* effect, GAME* game) { effect->scale.y * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f), effect->scale.z * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f), MTX_MULT); gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 128, 255, 255, 255, opacity); + gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 128, 255, 255, 255, (u8)opacity); gDPSetEnvColor(NEXT_POLY_XLU_DISP, 0, 0, 255, 255); gSPDisplayList(NEXT_POLY_XLU_DISP, ef_ha01_00_modelT); CLOSE_DISP(game->graph); diff --git a/src/effect/ef_hanabira.c b/src/effect/ef_hanabira.c index a7092821..67fda7fd 100644 --- a/src/effect/ef_hanabira.c +++ b/src/effect/ef_hanabira.c @@ -96,7 +96,7 @@ static void eHanabira_dw(eEC_Effect_c* effect, GAME* game) { } break; } gSPMatrix(NEXT_POLY_XLU_DISP, m, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 255, 255, 255, v); + gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 255, 255, 255, (u8)v); gSPDisplayList(NEXT_POLY_XLU_DISP, ef_hanabira_model_tbl[effect->effect_specific[0]]); CLOSE_DISP(game->graph); } diff --git a/src/effect/ef_kangaeru.c b/src/effect/ef_kangaeru.c index fd4d9d4c..11cbb29b 100644 --- a/src/effect/ef_kangaeru.c +++ b/src/effect/ef_kangaeru.c @@ -52,9 +52,9 @@ static void eKG_mv(eEC_Effect_c* effect, GAME* game) { s16 orig_es1 = effect->effect_specific[1]; eEC_CLIP->set_continious_env_proc(effect, 36, 20); - if (effect->effect_specific[0] < 10) { - effect->effect_specific[1] += DEG2SHORT_ANGLE(2.5f); - effect->effect_specific[2] -= DEG2SHORT_ANGLE(3.75f); + if (effect->effect_specific[0] < FRAMERATE_TIMER(10)) { + effect->effect_specific[1] += FRAMERATE_TIMER(DEG2SHORT_ANGLE(2.5f)); + effect->effect_specific[2] -= FRAMERATE_TIMER(DEG2SHORT_ANGLE(3.75f)); } if ((effect->effect_specific[1] >= 0) && (orig_es1 < 0)) { @@ -64,7 +64,7 @@ static void eKG_mv(eEC_Effect_c* effect, GAME* game) { effect->effect_specific[0]++; - if (effect->effect_specific[0] >= 25) { + if (effect->effect_specific[0] >= FRAMERATE_SELECT(25, 21)) { effect->effect_specific[0] = 0; } @@ -121,7 +121,7 @@ static void eKG_dw(eEC_Effect_c* effect, GAME* game) { Matrix_RotateZ(effect->effect_specific[2], MTX_MULT); gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 255, 255, 255, effect->effect_specific[4]); + gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 255, 255, 255, (u8)effect->effect_specific[4]); gSPDisplayList(NEXT_POLY_XLU_DISP, ef_think_s_modelT); CLOSE_DISP(game->graph); diff --git a/src/effect/ef_kantanhu.c b/src/effect/ef_kantanhu.c index 60b96955..cfd5fcd7 100644 --- a/src/effect/ef_kantanhu.c +++ b/src/effect/ef_kantanhu.c @@ -91,7 +91,7 @@ static void eKT_dw(eEC_Effect_c* effect, GAME* game) { eEC_CLIP->auto_matrix_xlu_offset_proc(game, &effect->position, &effect->scale, &effect->offset); gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 128, 255, 255, 255, alpha); + gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 128, 255, 255, 255, (u8)alpha); gSPDisplayList(NEXT_POLY_XLU_DISP, ef_kantanhu01_00_modelT); CLOSE_DISP(game->graph); diff --git a/src/effect/ef_neboke_awa.c b/src/effect/ef_neboke_awa.c index 9d0e184d..39b14270 100644 --- a/src/effect/ef_neboke_awa.c +++ b/src/effect/ef_neboke_awa.c @@ -105,7 +105,7 @@ static void eSleep_dw(eEC_Effect_c* effect, GAME* game) { Matrix_scale(effect->scale.x, effect->scale.y, effect->scale.z, MTX_MULT); gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 128, 255, 255, 255, effect->effect_specific[1]); + gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 128, 255, 255, 255, (u8)effect->effect_specific[1]); gSPDisplayList(NEXT_POLY_XLU_DISP, ef_sleep01_modelT); effect->offset = vec; diff --git a/src/effect/ef_shooting_kira.c b/src/effect/ef_shooting_kira.c index d9a870e4..17e5f082 100644 --- a/src/effect/ef_shooting_kira.c +++ b/src/effect/ef_shooting_kira.c @@ -95,7 +95,7 @@ static void eShootingKira_dw(eEC_Effect_c* effect, GAME* game) { OPEN_DISP(game->graph); gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 255, 255, 255, (int)alpha); + gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 255, 255, 255, (u8)(int)alpha); gSPSegment(NEXT_POLY_XLU_DISP, ANIME_1_TXT_SEG, ef_takurami01_normal_render_mode); gSPDisplayList(NEXT_POLY_XLU_DISP, ef_takurami01_kira_modelT); diff --git a/src/effect/ef_tamaire.c b/src/effect/ef_tamaire.c index 1f375294..460e38c0 100644 --- a/src/effect/ef_tamaire.c +++ b/src/effect/ef_tamaire.c @@ -159,7 +159,7 @@ static void eTamaire_dw(eEC_Effect_c* effect, GAME* game) { Matrix_RotateZ(effect->effect_specific[0], MTX_MULT); gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 255, 255, 255, (int)alpha); + gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 255, 255, 255, (u8)(int)alpha); gSPDisplayList(NEXT_POLY_XLU_DISP, tamaire_model[effect->arg0]); CLOSE_DISP(graph);