diff --git a/src/dusk/cutscene/cutscene.c b/src/dusk/cutscene/cutscene.c index 6466dbc9..72ad2b8c 100644 --- a/src/dusk/cutscene/cutscene.c +++ b/src/dusk/cutscene/cutscene.c @@ -9,6 +9,7 @@ #include "script/module/modulebase.h" #include "script/module/cutscene/modulecutscene.h" #include "console/console.h" +#include "time/time.h" cutscene_t CUTSCENE; @@ -105,6 +106,12 @@ errorret_t cutsceneInit(void) { } errorret_t cutsceneUpdate(void) { + #ifdef DUSK_TIME_DYNAMIC + if(TIME.dynamicUpdate) { + errorOk(); + } + #endif + errorChain(moduleCutsceneUpdate()); if(!CUTSCENE.active) errorOk(); diff --git a/src/dusk/scene/scene.c b/src/dusk/scene/scene.c index eae281e3..d92d45de 100644 --- a/src/dusk/scene/scene.c +++ b/src/dusk/scene/scene.c @@ -58,7 +58,8 @@ errorret_t sceneRender(void) { mat4 view, proj, model; errorChain(displaySetState((displaystate_t){ - .flags = DISPLAY_STATE_FLAG_CULL | DISPLAY_STATE_FLAG_DEPTH_TEST + // .flags = DISPLAY_STATE_FLAG_CULL | DISPLAY_STATE_FLAG_DEPTH_TEST + .flags = 0 })); // For each camera diff --git a/src/duskdolphin/display/displaydolphin.c b/src/duskdolphin/display/displaydolphin.c index e6aabd1a..62445b7d 100644 --- a/src/duskdolphin/display/displaydolphin.c +++ b/src/duskdolphin/display/displaydolphin.c @@ -101,7 +101,7 @@ errorret_t displayUpdateDolphin(void) { errorret_t displaySetStateDolphin(displaystate_t state) { if(state.flags & DISPLAY_STATE_FLAG_CULL) { - GX_SetCullMode(GX_CULL_BACK); + GX_SetCullMode(GX_CULL_FRONT); } else { GX_SetCullMode(GX_CULL_NONE); } diff --git a/src/duskdolphin/input/inputdolphin.c b/src/duskdolphin/input/inputdolphin.c index 67790172..d634fc2c 100644 --- a/src/duskdolphin/input/inputdolphin.c +++ b/src/duskdolphin/input/inputdolphin.c @@ -25,9 +25,12 @@ inputbuttondata_t INPUT_BUTTON_DATA[] = { { .name = "r", { .type = INPUT_BUTTON_TYPE_GAMEPAD, .gpButton = PAD_TRIGGER_R } }, { .name = "z", { .type = INPUT_BUTTON_TYPE_GAMEPAD, .gpButton = PAD_TRIGGER_Z } }, { .name = "menu", { .type = INPUT_BUTTON_TYPE_GAMEPAD, .gpButton = PAD_BUTTON_MENU } }, - { .name = "lstick_up", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_LEFT_X, .positive = true } } }, - { .name = "lstick_down", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_LEFT_X, .positive = false } } }, - { .name = "lstick_left", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_LEFT_Y, .positive = true } } }, + + { .name = "lstick_up", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_LEFT_Y, .positive = true } } }, + { .name = "lstick_down", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_LEFT_Y, .positive = false } } }, + { .name = "lstick_left", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_LEFT_X, .positive = false } } }, + { .name = "lstick_right", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_LEFT_X, .positive = true } } }, + { .name = "rstick_up", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_C_X, .positive = true } } }, { .name = "rstick_down", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_C_X, .positive = false } } }, { .name = "rstick_left", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_C_Y, .positive = true } } },