Merge branch 'fullbright-ebrake' into 'master'

Fullbright ebrake vfx

See merge request KartKrew/Kart!1601
This commit is contained in:
Oni 2023-11-05 10:48:04 +00:00
commit 0201d90d21

View file

@ -5392,18 +5392,18 @@ state_t states[NUMSTATES] =
{SPR_SDWN, FF_ANIMATE|FF_PAPERSPRITE, 18, {NULL}, 9, 2, S_NULL}, // S_SPINDASHWIND
// Soft Landing
{SPR_EBRK, 0|FF_ADD|FF_FLOORSPRITE, 4, {NULL}, 0, 0, S_SOFTLANDING2}, // S_SOFTLANDING1
{SPR_EBRK, 1|FF_ADD|FF_FLOORSPRITE, 4, {NULL}, 0, 0, S_SOFTLANDING3}, // S_SOFTLANDING2
{SPR_EBRK, 2|FF_ADD|FF_FLOORSPRITE, 4, {NULL}, 0, 0, S_SOFTLANDING4}, // S_SOFTLANDING3
{SPR_EBRK, 3|FF_ADD|FF_FLOORSPRITE, 4, {NULL}, 0, 0, S_SOFTLANDING5}, // S_SOFTLANDING4
{SPR_EBRK, 4|FF_ADD|FF_FLOORSPRITE, 4, {NULL}, 0, 0, S_NULL}, // S_SOFTLANDING5
{SPR_EBRK, 0|FF_ADD|FF_FLOORSPRITE|FF_FULLBRIGHT, 4, {NULL}, 0, 0, S_SOFTLANDING2}, // S_SOFTLANDING1
{SPR_EBRK, 1|FF_ADD|FF_FLOORSPRITE|FF_FULLBRIGHT, 4, {NULL}, 0, 0, S_SOFTLANDING3}, // S_SOFTLANDING2
{SPR_EBRK, 2|FF_ADD|FF_FLOORSPRITE|FF_FULLBRIGHT, 4, {NULL}, 0, 0, S_SOFTLANDING4}, // S_SOFTLANDING3
{SPR_EBRK, 3|FF_ADD|FF_FLOORSPRITE|FF_FULLBRIGHT, 4, {NULL}, 0, 0, S_SOFTLANDING5}, // S_SOFTLANDING4
{SPR_EBRK, 4|FF_ADD|FF_FLOORSPRITE|FF_FULLBRIGHT, 4, {NULL}, 0, 0, S_NULL}, // S_SOFTLANDING5
// Downwards Lines
{SPR_HMTR, 0|FF_ADD, 1, {NULL}, 0, 0, S_DOWNLINE2}, // S_DOWNLINE1
{SPR_HMTR, 1|FF_ADD, 1, {NULL}, 0, 0, S_DOWNLINE3}, // S_DOWNLINE2
{SPR_HMTR, 2|FF_ADD, 1, {NULL}, 0, 0, S_DOWNLINE4}, // S_DOWNLINE3
{SPR_HMTR, 3|FF_ADD, 1, {NULL}, 0, 0, S_DOWNLINE5}, // S_DOWNLINE4
{SPR_HMTR, 4|FF_ADD, 1, {NULL}, 0, 0, S_NULL}, // S_DOWNLINE5
{SPR_HMTR, 0|FF_ADD|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DOWNLINE2}, // S_DOWNLINE1
{SPR_HMTR, 1|FF_ADD|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DOWNLINE3}, // S_DOWNLINE2
{SPR_HMTR, 2|FF_ADD|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DOWNLINE4}, // S_DOWNLINE3
{SPR_HMTR, 3|FF_ADD|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DOWNLINE5}, // S_DOWNLINE4
{SPR_HMTR, 4|FF_ADD|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_NULL}, // S_DOWNLINE5
// HOLD Bubble
{SPR_HBUB, 0|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_HOLDBUBBLE}, // S_HOLDBUBBLE