diff --git a/README.md b/README.md index dbc1bef..fb09f97 100644 --- a/README.md +++ b/README.md @@ -14,3 +14,8 @@ For FX ```sh $ fxsdk build-fx ``` + +# License +Copyright (C) 2021 KikooDX +The source code in this repository is under the GNU GPL v.3 license. + diff --git a/assets-cg b/assets-cg index 1bfb538..c03ff50 160000 --- a/assets-cg +++ b/assets-cg @@ -1 +1 @@ -Subproject commit 1bfb53822cf113d6566d53dbf67d9d1333377f64 +Subproject commit c03ff50e64bc65f1245de7df1dc1f45780d6e5b5 diff --git a/assets-fx b/assets-fx index bc1e99c..cd8bd31 160000 --- a/assets-fx +++ b/assets-fx @@ -1 +1 @@ -Subproject commit bc1e99c2db0a5c85f68b2be6c1638debb061b6ab +Subproject commit cd8bd3150ec3d01be6545d84f864c88c002d4b1a diff --git a/include/conf.h b/include/conf.h index f1394a8..e26d8d2 100644 --- a/include/conf.h +++ b/include/conf.h @@ -1,17 +1,20 @@ +/* TODO: Remove duplicates */ + #define VEC_PRECISION 16384 #define UPS 256 #define PXS (VEC_PRECISION / UPS) -#define TILE_SIZE (8 * VEC_PRECISION) +#define TILE_SIZE VEC_PRECISION #define VEC_DCENTER (Vec){DWIDTH / 2, DHEIGHT / 2} #ifdef FX9860G -#define SCALE 1 +#define SCALE 5 #define FPS 16 #endif /* FX9860G */ #ifdef FXCG50 -#define SCALE 2 +#define SCALE 16 #define FPS 32 #endif /* FXCG50 */ -#define TILE_PX_SIZE (8 * SCALE) +#define TILE_PX_SIZE SCALE #define VEC_SCALED_DCENTER (Vec){DWIDTH / (2 * SCALE), DHEIGHT / (2 * SCALE)} + diff --git a/src/player.c b/src/player.c index 2c197f6..ad64e49 100644 --- a/src/player.c +++ b/src/player.c @@ -32,8 +32,8 @@ void player_init(Player *player, const Level *level) { player->spd.y = 0; player->hbox.x = TILE_SIZE - 1; player->hbox.y = TILE_SIZE - 1; - player->vbox.x = 7; - player->vbox.y = 7; + player->vbox.x = 0; + player->vbox.y = 0; player->origin.x = 0; player->origin.y = 0; player->grace = 0;