diff options
Diffstat (limited to 'src/draft')
| -rw-r--r-- | src/draft/draft.pde | 14 | ||||
| -rw-r--r-- | src/draft/graphics.pde | 21 |
2 files changed, 21 insertions, 14 deletions
diff --git a/src/draft/draft.pde b/src/draft/draft.pde index 0852cb5..526faea 100644 --- a/src/draft/draft.pde +++ b/src/draft/draft.pde @@ -1,15 +1,17 @@ #include <SPI.h> #include <GD.h> -#include "allsewage.h" // http://gameduino.com/results/b2f4c588/ -#include "sprites.h" // http://gameduino.com/results/16fe50de/ +#include "background.h" // http://gameduino.com/results/3514e886/ +#include "splash.h" // http://gameduino.com/results/fe36d9fd/ +#include "allsewage.h" // http://gameduino.com/results/b2f4c588/ +#include "sprites.h" // http://gameduino.com/results/16fe50de/ #define SWIM_SPEED 1 #define WEAPON_GROUP 0 #define TARGET_GROUP 1 -#define NUM_TRASH 20 +#define NUM_TRASH 32 // ugh, redefined #define KEY_UP(x) ((x >> 7) & 0x01) #define KEY_DOWN(x) ((x >> 6) & 0x01) @@ -89,6 +91,9 @@ void setup() narcoy = 150; narcovy = -1; trash_rate = 100; + scrollx = 0; + scrolly = 3; + t = 0; delay(250); GD.begin(); @@ -125,10 +130,11 @@ void loop() // scroll background GD.wr16(SCROLL_X, scrollx); + GD.wr16(SCROLL_Y, scrolly); GD.__wstartspr(0); //draw_standing_all(10,270); draw_all_trash(); - if (t > 72 * 30) { + if (t > (72 * 30)) { draw_narco(narcox, narcoy, narco_sunk); if (narco_sunk) { for (uint8 i = 0; i < 5; i++) { diff --git a/src/draft/graphics.pde b/src/draft/graphics.pde index b8af1b9..7908b2d 100644 --- a/src/draft/graphics.pde +++ b/src/draft/graphics.pde @@ -14,30 +14,31 @@ static void clear_all_sprites() { } static void init_splashpage() { - for (byte y = 0; y < 64; y++) - GD.copy(RAM_PIC + y * 64, allsewage_pic + y * 64, 64); - GD.copy(RAM_CHR, allsewage_chr, sizeof(allsewage_chr)); - GD.copy(RAM_PAL, allsewage_pal, sizeof(allsewage_pal)); - + for (byte y = 0; y < 37; y++) + GD.copy(RAM_PIC + y * 64, splash_pic + y * 49, 49); + GD.copy(RAM_CHR, splash_chr, sizeof(splash_chr)); + GD.copy(RAM_PAL, splash_pal, sizeof(splash_pal)); + /* GD.__wstartspr(0); for (int rand_count = 0; rand_count < 20; rand_count += 1) { draw_standing_all(random(400),random(300)); } GD.__end(); + */ } static void init_background() { for (byte y = 0; y < 64; y++) - GD.copy(RAM_PIC + y * 64, allsewage_pic + y * 64, 64); - GD.copy(RAM_CHR, allsewage_chr, sizeof(allsewage_chr)); - GD.copy(RAM_PAL, allsewage_pal, sizeof(allsewage_pal)); + GD.copy(RAM_PIC + y * 64, background_pic + y * 64, 64); + GD.copy(RAM_CHR, background_chr, sizeof(background_chr)); + GD.copy(RAM_PAL, background_pal, sizeof(background_pal)); } // ================ TRASH MANAGEMENT =================== #define DEAD_TRASH_SPRID 54 -#define NUM_TRASH 20 +#define NUM_TRASH 32 #define STUCKX 100 struct trash_item { @@ -87,7 +88,7 @@ static void add_trash() { for (i = 0; i < NUM_TRASH; i++) { if(trash_bag[i].sprid == 0xFF) { trash_bag[i].x = 400; - trash_bag[i].y = 25 + random(200); + trash_bag[i].y = 90 + random(200); trash_bag[i].vx = 3 + random(5); trash_bag[i].sprid = 36; trash_bag[i].collid = 255; |