diff --git a/assets-cg/fxconv-metadata.txt b/assets-cg/fxconv-metadata.txt index be2bccc..3144da4 100644 --- a/assets-cg/fxconv-metadata.txt +++ b/assets-cg/fxconv-metadata.txt @@ -1,7 +1,7 @@ tileset.png: type: bopti-image name: img_tileset - profile:p4 + profile:p8 spritesheet.png: type: bopti-image diff --git a/assets-cg/maps/inside/1.tmx b/assets-cg/maps/inside/1.tmx index 9b318b5..8b8b2c2 100644 --- a/assets-cg/maps/inside/1.tmx +++ b/assets-cg/maps/inside/1.tmx @@ -1,67 +1,48 @@ - + -2,3,2,1,3,3,2,3,2,1,1,3, -1,6,6,6,156,157,157,158,2,1,2,2, -3,6,156,157,159,233,235,160,158,3,1,1, -1,6,185,233,234,236,237,235,187,1,6,1, -1,6,185,291,292,265,301,264,187,1,6,1, -1,6,214,215,188,291,292,293,160,158,6,1, -2,6,3,1,214,215,215,215,215,216,6,1, -2,3,2,2,1,5,3,109,2,6,6,3, -2,3,2,1,3,2,3,2,6,6,6,3, -1,2,0,1,2,2,2,1,3,3,1,3 +682,683,683,683,683,683,683,683,683,683,683,684, +711,712,712,712,712,712,712,712,712,712,712,713, +740,741,741,741,741,741,741,741,741,741,741,742, +617,617,617,617,617,617,617,617,617,617,617,617, +617,617,617,617,617,617,617,617,617,617,617,617, +617,617,617,617,617,617,617,617,617,617,617,617, +617,617,617,617,617,617,617,617,617,736,736,736, +617,617,617,617,617,617,617,617,736,736,736,736, +617,617,617,617,617,617,617,617,736,736,736,736, +617,617,238,617,617,617,617,617,617,736,736,736 -248,249,249,249,249,249,249,249,249,249,249,251, -277,0,0,0,0,0,0,0,0,20,21,280, -277,0,0,0,0,0,0,0,0,49,50,280, -277,0,0,0,0,0,0,0,0,0,0,280, -277,0,0,0,0,0,0,0,0,0,0,280, -277,0,0,26,0,0,0,0,0,0,0,280, -277,0,0,55,0,0,0,0,0,0,0,280, -277,0,0,0,0,0,0,0,0,0,0,280, -277,0,0,0,0,0,0,0,0,0,0,280, -306,278,238,279,250,250,250,250,250,250,250,309 - - - - 0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,29,0,0,0,0, -0,0,0,0,0,0,0,58,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0 +0,0,0,0,0,710,710,0,0,0,0,0, +678,0,701,701,0,739,739,0,0,0,646,647, +707,0,730,730,0,736,736,0,0,0,675,676, +0,0,0,0,0,736,736,0,0,0,0,0, +736,0,702,703,0,0,0,0,248,250,249,250, +736,0,731,732,0,0,0,0,277,704,705,736, +0,0,0,0,0,0,0,0,277,733,734,0, +614,615,615,615,616,0,0,0,0,735,735,678, +643,644,238,644,645,0,0,0,0,0,0,707 - + - - Salutation ! -Ça va ? + + - + - - - - - - + + diff --git a/assets-cg/maps/inside/2.tmx b/assets-cg/maps/inside/2.tmx index 6ac5db0..650350a 100644 --- a/assets-cg/maps/inside/2.tmx +++ b/assets-cg/maps/inside/2.tmx @@ -1,35 +1,63 @@ - + -94,94,94,94,94,94,94,94,94,94,94,94,94,94,94, -94,94,94,94,94,94,94,94,94,94,94,94,94,94,94, -94,94,94,94,94,94,94,94,94,94,94,94,94,94,94, -94,94,97,123,123,123,123,123,123,123,123,123,96,94,94, -94,94,95,161,162,162,162,162,162,162,162,163,93,94,94, -94,94,95,190,191,191,191,223,191,223,223,192,93,94,94, -94,94,95,219,220,220,193,223,194,220,220,221,93,94,94, -94,94,68,65,65,66,190,191,192,64,65,65,67,94,94, -94,94,94,94,94,95,190,191,192,93,94,94,94,94,94, -94,94,94,94,94,95,190,222,192,93,94,94,94,94,94 +682,683,683,683,683,683,683,683,683,683,683,683,683,683,684, +711,712,712,712,712,712,712,712,712,712,712,712,712,712,713, +740,741,741,741,741,741,741,741,741,741,741,741,741,741,742, +617,617,617,617,617,617,617,617,617,617,617,617,617,617,617, +736,736,736,736,736,736,736,736,736,736,736,736,736,736,736, +736,736,736,736,736,736,736,736,736,736,736,736,736,736,736, +736,736,736,736,617,736,736,736,736,736,736,736,736,736,736, +617,617,736,736,617,736,736,736,736,736,736,736,736,736,736, +617,617,736,736,617,736,736,736,736,736,736,736,736,736,736, +736,736,736,736,617,736,736,736,736,736,736,736,736,736,736 -224,225,225,225,225,225,225,225,225,225,225,225,225,225,226, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,323,324,325,246,0,0,0,0,0, -0,0,0,0,22,23,352,353,354,275,0,0,0,0,0, -0,0,0,0,51,52,381,382,383,304,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,238,0,0,0,0,0,0,0 +0,0,710,710,0,0,679,680,681,0,0,710,710,0,0, +678,0,739,739,0,0,0,0,0,0,0,739,739,646,647, +707,0,0,0,0,0,0,0,0,0,0,0,0,675,676, +0,706,706,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,560,561,0,0,0,0,614,615,615,616,0, +708,709,0,0,589,590,0,0,0,0,643,644,644,645,0, +737,738,0,0,589,590,0,0,0,0,672,673,673,674,0, +0,0,0,0,589,590,614,615,616,0,0,0,0,0,0, +0,0,0,0,589,590,643,238,645,0,0,0,0,0,0 + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,704,705,0,0,0,0,0,0,701,701,0,0,0,677, +0,733,734,0,0,0,0,0,0,730,730,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,702,703,0,0, +0,0,0,0,0,0,0,0,0,0,0,731,732,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,678,0,678,0,0,0,0,0,0, +0,0,0,0,0,0,707,0,707,0,0,0,0,0,0 + + + + + + + + + + + + + + + + diff --git a/assets-cg/maps/tileset.tsx b/assets-cg/maps/tileset.tsx index e2b2cb0..188e718 100644 --- a/assets-cg/maps/tileset.tsx +++ b/assets-cg/maps/tileset.tsx @@ -156,10 +156,18 @@ + + + + + + + + @@ -172,6 +180,9 @@ + + + @@ -184,6 +195,14 @@ + + + + + + + + @@ -196,6 +215,16 @@ + + + + + + + + + + diff --git a/assets-cg/tileset.png b/assets-cg/tileset.png index 4303121..2c81291 100644 Binary files a/assets-cg/tileset.png and b/assets-cg/tileset.png differ diff --git a/src/main.c b/src/main.c index 7ba8853..9419c10 100644 --- a/src/main.c +++ b/src/main.c @@ -3,6 +3,8 @@ #include #include +#include + #include "game.h" #include "engine.h" #include "player.h" @@ -24,6 +26,9 @@ int main(void) { GINT_CALL(callback_tick, &tick)); if(t >= 0) timer_start(t); + usb_interface_t const *interfaces[] = {&usb_ff_bulk, NULL}; + usb_open(interfaces, GINT_CALL_NULL); + /*Main loop*/ while(!keydown(KEY_MENU)) { while(!tick) sleep(); @@ -31,6 +36,8 @@ int main(void) { engine_draw(&game); dupdate(); + if (keydown(KEY_VARS) && usb_is_open()) + usb_fxlink_screenshot(1); int action = get_inputs(); if(action >= 0 && action <= 3) @@ -42,5 +49,6 @@ int main(void) { } if(t >= 0) timer_stop(t); + usb_close(); return 0; }