diff --git a/actors/luigi/geo.inc.c b/actors/luigi/geo.inc.c index f0084c18..6035e8a5 100644 --- a/actors/luigi/geo.inc.c +++ b/actors/luigi/geo.inc.c @@ -688,7 +688,7 @@ const GeoLayout luigi_geo[] = { GEO_OPEN_NODE(), GEO_SCALE(0x00, 16384), GEO_OPEN_NODE(), - GEO_ASM(0, geo_mario_set_player_colors), + GEO_ASM(0, geo_mario_set_player_colors), GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors), GEO_ASM(0, geo_mirror_mario_backface_culling), GEO_ASM(0, geo_mirror_mario_set_alpha), diff --git a/src/pc/djui/djui_panel_player.c b/src/pc/djui/djui_panel_player.c index 292d008c..59a1f386 100644 --- a/src/pc/djui/djui_panel_player.c +++ b/src/pc/djui/djui_panel_player.c @@ -265,10 +265,15 @@ void djui_panel_player_create(struct DjuiBase* caller) { } djui_selectionbox_create(body, DLANG(PLAYER, MODEL), modelChoices, CT_MAX, &configPlayerModel, djui_panel_player_value_changed); + time_t currentTime; + time(¤tTime); + struct tm *lt = localtime(¤tTime); + bool aprilFools = lt->tm_mon == 3 && lt->tm_mday == 1; // months are 0 indexed + char* paletteChoices[PALETTE_PRESET_MAX+1] = { DLANG(PALETTE, MARIO), DLANG(PALETTE, LUIGI), - DLANG(PALETTE, WALUIGI), + aprilFools ? "Lame Shitilizer" : DLANG(PALETTE, WALUIGI), DLANG(PALETTE, WARIO), DLANG(PALETTE, CHUCKYA), DLANG(PALETTE, GOOMBA), @@ -297,7 +302,7 @@ void djui_panel_player_create(struct DjuiBase* caller) { DLANG(PALETTE, RASPBERRY), DLANG(PALETTE, BUBBLEGUM), DLANG(PALETTE, ICE_MARIO), - DLANG(PALETTE, ICE_LUIGI), + aprilFools ? "The Shitilizer" : DLANG(PALETTE, ICE_LUIGI), DLANG(PALETTE, TOAD), DLANG(PALETTE, CUSTOM), };