diff --git a/assets-cg/img/nbswitchlayout.png b/assets-cg/img/nbswitchlayout.png index d195aec..21b017e 100755 Binary files a/assets-cg/img/nbswitchlayout.png and b/assets-cg/img/nbswitchlayout.png differ diff --git a/assets-cg/img/speedrun.png b/assets-cg/img/speedrun.png index a157b7c..2683ef4 100755 Binary files a/assets-cg/img/speedrun.png and b/assets-cg/img/speedrun.png differ diff --git a/editor/levels/16.lvl b/editor/levels/16.lvl index 42b8a2c..15b0b35 100755 --- a/editor/levels/16.lvl +++ b/editor/levels/16.lvl @@ -1,4 +1,4 @@ -11111111t133111111100011111111111133311111110K01111100000100111111111000111110s00010i11111100000001111d110K10i11111d000000011111110K10i1111a001BBBBB11110000010i111d0a010000011110000010i11a03011d0ddd1111001ddd0i1d0a0d110000011110000000i0a30111100e00111100000k0130ad11110aa001111dd000001031111111ddd11111111111B1001111111aaa11111111111010011111110001116 +11111111t133111111100011111111111133311111110K01111100000100111111111000111110s00010i11111100000001111d11zz10i11111d000000011111110010i1111a001BBBBB11110000010i111d0a010000011110000010i11a03011d0ddd1111001ddd0i1d0a0d110000011110000000i0a30111100e001111K0000k0130ad11110aa001111d0000001031111111ddd11111111111B1001111111aaa11111111111010011111110001116 13 10 -1 \ No newline at end of file +10 \ No newline at end of file diff --git a/editor/levels/9.lvl b/editor/levels/9.lvl index 0998bf8..275c234 100755 --- a/editor/levels/9.lvl +++ b/editor/levels/9.lvl @@ -1,4 +1,4 @@ -10001011111011111111111111000101dd10001111dddd11110000101dd10001000000000001111101dd1aaa1000ccccddd110s00010013331000000000011dddd110010001mmmdd00000100000000010e010t0dd00000011111100011111d1dddddd1111k00000001d000111001111111111111101d00000000000111000010000100000000000000010K010000100011100000011110001000010001110000dd11110001011111011111111111117 +10001011111011111111111111000101dd10001111dddd11110000101dd10001000000000001111101dd1aaa1000ccccddd110s00010013331000000000011dddd110010001mmmdd00000100000000010e010t0dd00000011111100011111d1dddddd1111k00000001d000111001111111111111001d00000000000111000010000100000000000000010K010000100011100000011110001000010001110000dd11110001011111011111111111117 5 9 1 \ No newline at end of file diff --git a/src/main.c b/src/main.c index 888d46d..1e7b84c 100644 --- a/src/main.c +++ b/src/main.c @@ -120,7 +120,8 @@ static void game(int *id_level, char mode, char *type) float friction; float acceleration; - if (*id_level == 10 && *type != 3) + /*KikooDX level*/ + if (*id_level == 16 && *type != 3) *type = 2; else if (*type != 3) *type = 1; @@ -169,8 +170,6 @@ static void game(int *id_level, char mode, char *type) coin); if (check_nbswitch) draw_nbswitch(nbswitch); - dprint(330, 0, C_RED, "%d", collide_solid(player_x, player_y - 1, level)); - dprint(350, 0, C_RED, "%d", collide_solid(player_x, player_y + 1, level)); dupdate(); if (keydown(KEY_VARS) && usb_is_open()) usb_fxlink_screenshot(1); diff --git a/src/menu.c b/src/menu.c index 7349fd0..76e1499 100644 --- a/src/menu.c +++ b/src/menu.c @@ -84,7 +84,7 @@ char level_selection(int *id_level) draw_level(level); dimage(0, 0, &img_speedrun); if (sto != 0) - check_medal(round(sto * 0.01 * FPS), *id_level, 335, 8); + check_medal(round(sto * 0.01 * FPS), *id_level, 335, 15); dtext(190, 45, C_BLACK, "Time : "); dprint(80, 20, C_BLACK, "Level : %d", *id_level); if (sto != 0) @@ -117,6 +117,7 @@ enum MenuPause pause_menu(char level[], int id_level, int coin, int death_count) { extern bopti_image_t img_speedrun; + extern bopti_image_t img_coin; char menu_loop = 1; char selected = 0; @@ -136,9 +137,10 @@ enum MenuPause pause_menu(char level[], int id_level, int coin, int death_count) dtext(32, Y_POS, C_BLACK, "CONTINUE"); dtext(32, Y_POS + 12, C_BLACK, "BACK"); dtext(16, Y_POS + (selected * 12), C_BLACK, ">"); - dprint(176, 45, C_BLACK, "LEVEL : %d", id_level); - dprint(320, 3, C_RGB(255, 178, 0), "COIN : %d", coin); - dprint(311, 17, C_RGB(150, 16, 16), "DEATH : %d", death_count); + dprint(174, 45, C_BLACK, "LEVEL : %d", id_level); + dimage(320,3,&img_coin); + dprint(335, 7, C_RGB(255, 178, 0), " : %d", coin); + dprint(311, 21, C_RGB(150, 16, 16), "DEATH : %d", death_count); draw_time(id_level); dupdate(); if (keydown_any(KEY_SHIFT, KEY_EXE, 0)) { diff --git a/src/save.c b/src/save.c index 125fcae..dac182c 100644 --- a/src/save.c +++ b/src/save.c @@ -7,7 +7,7 @@ int retcode; int times[LEVEL_MAX]; -static const uint16_t *filepath = u"\\\\fls0\\AST3.sav"; +static const uint16_t *filepath = u"\\\\fls0\\AST3C.sav"; /* savefile() write the time of all the player's times in the savefile. * savefile() is long to execute. That's why it must be call once per diff --git a/times.lvl b/times.lvl index e56e2f7..aca52e8 100755 --- a/times.lvl +++ b/times.lvl @@ -1,19 +1,19 @@ -5.91 +6.13 8.25 -8.76 +8.86 3.52 5.80 3.58 -6.81 +7.08 6.23 -8.62 -7.65 +8.82 +7.82 9.62 8.35 6.93 10.78 5.39 -6.04 +6.24 17.95 7.45 10.53