diff --git a/.gitignore b/.gitignore index c3b9049..bc4e84d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ build/* demo *.exe -stdout.txt \ No newline at end of file +*.elf +stdout.txt diff --git a/README b/README index 6bb41fd..8dccc97 100644 --- a/README +++ b/README @@ -14,8 +14,8 @@ support. - Screenshot: "wip-screenshot.PNG". The game controls are: - A button shooting bullets - B button jumping + A button jumping + B button shooting bullets D-pad movement ------------------------------------------------------------------- diff --git a/clown3d-DS.elf b/clown3d-DS.elf deleted file mode 100644 index 3a7dec6..0000000 Binary files a/clown3d-DS.elf and /dev/null differ diff --git a/clown3d-DS.nds b/clown3d-DS.nds index 134942a..7d4ceab 100644 Binary files a/clown3d-DS.nds and b/clown3d-DS.nds differ diff --git a/player.c b/player.c index 75c282c..30ca2f0 100644 --- a/player.c +++ b/player.c @@ -56,9 +56,7 @@ void playerTick(game_obj* player) player->data[PLAYER_MOVEY] = 0; } - /* Convert the player angle to a unit vector, - converting the said angle to radians along - the way */ + /* Convert the player angle to a unit vector */ #ifdef PC_TARGET player->data[PLAYER_DIRX] = (float)sin(player->data[PLAYER_ANGLE] / 360.0 * (2*3.14)); @@ -92,8 +90,8 @@ void playerTick(game_obj* player) from an example by Dovoto */ scanKeys(); u16 keys = keysHeld(); - shoot = (keys & KEY_A); - jump = (keys & KEY_B); + jump = (keys & KEY_A); + shoot = (keys & KEY_B); left = (keys & KEY_LEFT); right = (keys & KEY_RIGHT); down = (keys & KEY_DOWN);