diff --git a/Realite.g1a b/Realite.g1a index f848174..cd8ed8b 100644 Binary files a/Realite.g1a and b/Realite.g1a differ diff --git a/assets/player/boy/jump/a0.png b/assets/player/boy/jump/a0.png index 2aa5902..cf91470 100644 Binary files a/assets/player/boy/jump/a0.png and b/assets/player/boy/jump/a0.png differ diff --git a/assets/player/boy/jump/a1.png b/assets/player/boy/jump/a1.png index f964e0d..12bf172 100644 Binary files a/assets/player/boy/jump/a1.png and b/assets/player/boy/jump/a1.png differ diff --git a/assets/player/boy/jump/a2.png b/assets/player/boy/jump/a2.png index 137210d..34dc5d1 100644 Binary files a/assets/player/boy/jump/a2.png and b/assets/player/boy/jump/a2.png differ diff --git a/assets/player/boy/jump/a3.png b/assets/player/boy/jump/a3.png index 094bfc0..d238cf4 100644 Binary files a/assets/player/boy/jump/a3.png and b/assets/player/boy/jump/a3.png differ diff --git a/assets/player/boy/jump/a4.png b/assets/player/boy/jump/a4.png index 0b9d039..d490aff 100644 Binary files a/assets/player/boy/jump/a4.png and b/assets/player/boy/jump/a4.png differ diff --git a/assets/player/boy/jump/a5.png b/assets/player/boy/jump/a5.png index 0603862..9247a9f 100644 Binary files a/assets/player/boy/jump/a5.png and b/assets/player/boy/jump/a5.png differ diff --git a/assets/player/boy/jump/a6.png b/assets/player/boy/jump/a6.png index 27618a0..a512ced 100644 Binary files a/assets/player/boy/jump/a6.png and b/assets/player/boy/jump/a6.png differ diff --git a/assets/player/boy/jump/a7.png b/assets/player/boy/jump/a7.png index 2ae05df..fc9356c 100644 Binary files a/assets/player/boy/jump/a7.png and b/assets/player/boy/jump/a7.png differ diff --git a/assets/player/boy/jump/a8.png b/assets/player/boy/jump/a8.png index 9c9c817..5a35f88 100644 Binary files a/assets/player/boy/jump/a8.png and b/assets/player/boy/jump/a8.png differ diff --git a/assets/player/boy/jump/alpha_gen.py b/assets/player/boy/jump/alpha_gen.py index f18fba6..12c9910 100644 --- a/assets/player/boy/jump/alpha_gen.py +++ b/assets/player/boy/jump/alpha_gen.py @@ -8,5 +8,6 @@ with Image.open(sys.argv[1]) as im: pixels = rgb_im.load() for y in range(rgb_im.size[1]): for x in range(rgb_im.size[0]): - if pixels[x, y] != (0, 0, 0, 0): pixels[x, y] = (255, 255, 255, 255) + if pixels[x, y] != (0, 0, 0, 0): pixels[x, y] = (0, 0, 0, 255) + else: pixels[x, y] = (255, 255, 255, 255) rgb_im.save("a"+str(i)+".png") diff --git a/assets/player/boy/run/a0.png b/assets/player/boy/run/a0.png index 4af4046..e1c6944 100644 Binary files a/assets/player/boy/run/a0.png and b/assets/player/boy/run/a0.png differ diff --git a/assets/player/boy/run/a1.png b/assets/player/boy/run/a1.png index 08f9f5c..6a8a51b 100644 Binary files a/assets/player/boy/run/a1.png and b/assets/player/boy/run/a1.png differ diff --git a/assets/player/boy/run/a10.png b/assets/player/boy/run/a10.png index a73483f..d56329d 100644 Binary files a/assets/player/boy/run/a10.png and b/assets/player/boy/run/a10.png differ diff --git a/assets/player/boy/run/a11.png b/assets/player/boy/run/a11.png index 5cb302a..11e4aa4 100644 Binary files a/assets/player/boy/run/a11.png and b/assets/player/boy/run/a11.png differ diff --git a/assets/player/boy/run/a2.png b/assets/player/boy/run/a2.png index 00abfae..09bfb36 100644 Binary files a/assets/player/boy/run/a2.png and b/assets/player/boy/run/a2.png differ diff --git a/assets/player/boy/run/a3.png b/assets/player/boy/run/a3.png index a09d363..6d6afd1 100644 Binary files a/assets/player/boy/run/a3.png and b/assets/player/boy/run/a3.png differ diff --git a/assets/player/boy/run/a4.png b/assets/player/boy/run/a4.png index f564756..cd2a7a0 100644 Binary files a/assets/player/boy/run/a4.png and b/assets/player/boy/run/a4.png differ diff --git a/assets/player/boy/run/a5.png b/assets/player/boy/run/a5.png index 5cb302a..11e4aa4 100644 Binary files a/assets/player/boy/run/a5.png and b/assets/player/boy/run/a5.png differ diff --git a/assets/player/boy/run/a6.png b/assets/player/boy/run/a6.png index 0ba8ae1..92acdd0 100644 Binary files a/assets/player/boy/run/a6.png and b/assets/player/boy/run/a6.png differ diff --git a/assets/player/boy/run/a7.png b/assets/player/boy/run/a7.png index a0d2b51..a6020e4 100644 Binary files a/assets/player/boy/run/a7.png and b/assets/player/boy/run/a7.png differ diff --git a/assets/player/boy/run/a8.png b/assets/player/boy/run/a8.png index 00abfae..09bfb36 100644 Binary files a/assets/player/boy/run/a8.png and b/assets/player/boy/run/a8.png differ diff --git a/assets/player/boy/run/a9.png b/assets/player/boy/run/a9.png index 24b5f2d..253b050 100644 Binary files a/assets/player/boy/run/a9.png and b/assets/player/boy/run/a9.png differ diff --git a/assets/player/boy/run/alpha_gen.py b/assets/player/boy/run/alpha_gen.py index f18fba6..12c9910 100644 --- a/assets/player/boy/run/alpha_gen.py +++ b/assets/player/boy/run/alpha_gen.py @@ -8,5 +8,6 @@ with Image.open(sys.argv[1]) as im: pixels = rgb_im.load() for y in range(rgb_im.size[1]): for x in range(rgb_im.size[0]): - if pixels[x, y] != (0, 0, 0, 0): pixels[x, y] = (255, 255, 255, 255) + if pixels[x, y] != (0, 0, 0, 0): pixels[x, y] = (0, 0, 0, 255) + else: pixels[x, y] = (255, 255, 255, 255) rgb_im.save("a"+str(i)+".png") diff --git a/assets/player/girl/jump/a0.png b/assets/player/girl/jump/a0.png index f3e3191..7a95ffa 100644 Binary files a/assets/player/girl/jump/a0.png and b/assets/player/girl/jump/a0.png differ diff --git a/assets/player/girl/jump/a1.png b/assets/player/girl/jump/a1.png index f912d65..1308ce4 100644 Binary files a/assets/player/girl/jump/a1.png and b/assets/player/girl/jump/a1.png differ diff --git a/assets/player/girl/jump/a2.png b/assets/player/girl/jump/a2.png index f68a1f0..ae38062 100644 Binary files a/assets/player/girl/jump/a2.png and b/assets/player/girl/jump/a2.png differ diff --git a/assets/player/girl/jump/a3.png b/assets/player/girl/jump/a3.png index fc1b6e1..85b07a6 100644 Binary files a/assets/player/girl/jump/a3.png and b/assets/player/girl/jump/a3.png differ diff --git a/assets/player/girl/jump/a4.png b/assets/player/girl/jump/a4.png index ed389b4..64d9fc3 100644 Binary files a/assets/player/girl/jump/a4.png and b/assets/player/girl/jump/a4.png differ diff --git a/assets/player/girl/jump/a5.png b/assets/player/girl/jump/a5.png index 48a75ba..30ae324 100644 Binary files a/assets/player/girl/jump/a5.png and b/assets/player/girl/jump/a5.png differ diff --git a/assets/player/girl/jump/a6.png b/assets/player/girl/jump/a6.png index 705661d..f22272f 100644 Binary files a/assets/player/girl/jump/a6.png and b/assets/player/girl/jump/a6.png differ diff --git a/assets/player/girl/jump/a7.png b/assets/player/girl/jump/a7.png index 5d1a98b..d4a0d11 100644 Binary files a/assets/player/girl/jump/a7.png and b/assets/player/girl/jump/a7.png differ diff --git a/assets/player/girl/jump/a8.png b/assets/player/girl/jump/a8.png index f912d65..1308ce4 100644 Binary files a/assets/player/girl/jump/a8.png and b/assets/player/girl/jump/a8.png differ diff --git a/assets/player/girl/jump/alpha_gen.py b/assets/player/girl/jump/alpha_gen.py index f18fba6..12c9910 100644 --- a/assets/player/girl/jump/alpha_gen.py +++ b/assets/player/girl/jump/alpha_gen.py @@ -8,5 +8,6 @@ with Image.open(sys.argv[1]) as im: pixels = rgb_im.load() for y in range(rgb_im.size[1]): for x in range(rgb_im.size[0]): - if pixels[x, y] != (0, 0, 0, 0): pixels[x, y] = (255, 255, 255, 255) + if pixels[x, y] != (0, 0, 0, 0): pixels[x, y] = (0, 0, 0, 255) + else: pixels[x, y] = (255, 255, 255, 255) rgb_im.save("a"+str(i)+".png") diff --git a/assets/player/girl/run/a0.png b/assets/player/girl/run/a0.png index 1bb1bab..2bf186f 100644 Binary files a/assets/player/girl/run/a0.png and b/assets/player/girl/run/a0.png differ diff --git a/assets/player/girl/run/a1.png b/assets/player/girl/run/a1.png index 59a3e9f..9ddbf1f 100644 Binary files a/assets/player/girl/run/a1.png and b/assets/player/girl/run/a1.png differ diff --git a/assets/player/girl/run/a10.png b/assets/player/girl/run/a10.png index e8c8a1b..69dcac8 100644 Binary files a/assets/player/girl/run/a10.png and b/assets/player/girl/run/a10.png differ diff --git a/assets/player/girl/run/a11.png b/assets/player/girl/run/a11.png index b483a07..eb47ddc 100644 Binary files a/assets/player/girl/run/a11.png and b/assets/player/girl/run/a11.png differ diff --git a/assets/player/girl/run/a2.png b/assets/player/girl/run/a2.png index d9b3494..cfd6e83 100644 Binary files a/assets/player/girl/run/a2.png and b/assets/player/girl/run/a2.png differ diff --git a/assets/player/girl/run/a3.png b/assets/player/girl/run/a3.png index 023be01..f9c859e 100644 Binary files a/assets/player/girl/run/a3.png and b/assets/player/girl/run/a3.png differ diff --git a/assets/player/girl/run/a4.png b/assets/player/girl/run/a4.png index ce86362..5a3c488 100644 Binary files a/assets/player/girl/run/a4.png and b/assets/player/girl/run/a4.png differ diff --git a/assets/player/girl/run/a5.png b/assets/player/girl/run/a5.png index 70589cf..fcc4df5 100644 Binary files a/assets/player/girl/run/a5.png and b/assets/player/girl/run/a5.png differ diff --git a/assets/player/girl/run/a6.png b/assets/player/girl/run/a6.png index a596920..997e8a7 100644 Binary files a/assets/player/girl/run/a6.png and b/assets/player/girl/run/a6.png differ diff --git a/assets/player/girl/run/a7.png b/assets/player/girl/run/a7.png index 8924e1b..611bc2b 100644 Binary files a/assets/player/girl/run/a7.png and b/assets/player/girl/run/a7.png differ diff --git a/assets/player/girl/run/a8.png b/assets/player/girl/run/a8.png index 859b9d9..3924b0d 100644 Binary files a/assets/player/girl/run/a8.png and b/assets/player/girl/run/a8.png differ diff --git a/assets/player/girl/run/a9.png b/assets/player/girl/run/a9.png index 023be01..f9c859e 100644 Binary files a/assets/player/girl/run/a9.png and b/assets/player/girl/run/a9.png differ diff --git a/assets/player/girl/run/alpha_gen.py b/assets/player/girl/run/alpha_gen.py index f18fba6..12c9910 100644 --- a/assets/player/girl/run/alpha_gen.py +++ b/assets/player/girl/run/alpha_gen.py @@ -8,5 +8,6 @@ with Image.open(sys.argv[1]) as im: pixels = rgb_im.load() for y in range(rgb_im.size[1]): for x in range(rgb_im.size[0]): - if pixels[x, y] != (0, 0, 0, 0): pixels[x, y] = (255, 255, 255, 255) + if pixels[x, y] != (0, 0, 0, 0): pixels[x, y] = (0, 0, 0, 255) + else: pixels[x, y] = (255, 255, 255, 255) rgb_im.save("a"+str(i)+".png") diff --git a/build/Realite.bin b/build/Realite.bin index 90ed5a7..d0b72ac 100755 Binary files a/build/Realite.bin and b/build/Realite.bin differ diff --git a/build/Realite.elf b/build/Realite.elf index c04971c..ee360a3 100755 Binary files a/build/Realite.elf and b/build/Realite.elf differ diff --git a/build/main.c.o b/build/main.c.o index 4faad7b..5a000b0 100644 Binary files a/build/main.c.o and b/build/main.c.o differ diff --git a/build/player.c.o b/build/player.c.o index e75604e..e9b3c6e 100644 Binary files a/build/player.c.o and b/build/player.c.o differ diff --git a/src/assets.h b/src/assets.h index b5f7808..f1f3cac 100644 --- a/src/assets.h +++ b/src/assets.h @@ -1,7 +1,7 @@ #ifndef ASSETS_H #define ASSETS_H -extern unsigned char** player_sprites; -extern unsigned char** player_alpha; +extern unsigned char** player_sprites[]; +extern unsigned char** player_alpha[]; #endif diff --git a/src/main.c b/src/main.c index 480143a..f68f593 100644 --- a/src/main.c +++ b/src/main.c @@ -10,6 +10,7 @@ void slocate_int(int x, int y, int n) { } int main(void) { + int ticks; /* Wait that all keys are released before starting the game. */ while(kisdown()); /* Init game */ @@ -22,6 +23,8 @@ int main(void) { pinit(&game); while(!kcheck(KCEXIT)){ sclear(); + treset(); + ticks = tgetticks(); switch(game.screen){ case S_GAME: aframe_done(&game.player.anim); @@ -46,6 +49,7 @@ int main(void) { game.screen = S_GAME; /* TODO: change this to S_TITLE ... */ } supdate(); + while(!tiselapsed(ticks, 20)); } return 1; } diff --git a/src/player.c b/src/player.c index 6c7ca96..51f3236 100644 --- a/src/player.c +++ b/src/player.c @@ -27,7 +27,7 @@ void pdraw(Game *game) { 32, 48, player_alpha[game->player.skin * 2 + game->player.action] [game->player.anim.anim_frame], - SNOBLACK + SNOWHITE ); simage( (*game->map).px, (*game->map).py,