diff --git a/assets.h b/assets.h index 655e47c..4598a07 100644 --- a/assets.h +++ b/assets.h @@ -422,6 +422,27 @@ SFG_PROGRAM_MEMORY uint8_t SFG_itemSprites[][SFG_TEXTURE_STORE_SIZE] = 119,119,114,34,39,119,119,114,0,0,0,0,0,0,0,0,34,34,32,0,2,34,34,32,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 + }, + { // 2, bullets +175,124,168,112,125,5,194,21,19,17,113,190,2,3,4,23,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,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,51,136,200,211,0,0, +0,0,0,0,0,0,0,0,0,3,120,119,215,195,32,0,0,0,0,2,34,34,34,34,34,35,51,51,51,54, +32,0,0,0,0,33,102,102,102,106,102,102,238,230,102,22,32,0,0,0,0,36,17,17,51,58, +102,102,238,230,102,22,32,0,0,0,0,36,17,51,136,202,102,102,238,230,102,22,32,0, +0,0,0,36,19,120,119,218,68,68,255,244,68,70,32,0,0,0,0,36,17,34,51,58,65,17,85, +81,17,65,32,0,0,0,0,36,17,51,136,202,65,17,85,81,17,65,32,0,0,0,0,36,19,120,119, +218,65,17,91,177,17,65,32,0,0,0,0,36,17,57,127,90,65,17,187,81,17,65,32,0,0,0,0, +36,17,56,153,154,65,17,181,81,17,65,32,0,0,0,0,36,19,120,119,218,65,17,91,81,22, +22,32,0,0,0,0,36,17,56,153,154,65,17,187,182,51,51,50,0,0,0,0,36,17,57,136,202, +65,17,85,51,136,200,194,0,0,0,0,36,19,120,119,218,65,17,83,120,119,215,210,0,0, +0,0,36,17,57,127,90,65,17,187,57,255,95,82,0,0,0,0,36,17,57,136,202,65,17,85, +177,153,147,50,0,0,0,0,36,19,120,119,218,65,17,91,177,19,204,210,0,0,0,0,36,17, +57,127,90,65,17,181,177,19,247,130,0,0,0,0,36,19,136,153,154,65,17,181,81,25,93, +194,0,0,0,0,36,17,57,136,202,65,17,91,177,25,247,130,0,0,0,0,36,19,120,119,218, +65,17,91,81,17,151,130,0,0,0,0,2,34,51,127,90,65,17,187,177,17,152,32,0,0,0,0,0, +0,0,34,42,65,17,85,81,17,67,32,0,0,0,0,0,0,0,0,2,65,17,85,81,17,65,32,0,0,0,0,0, +0,0,0,2,34,34,34,34,34,65,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,32,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 } }; diff --git a/assets/item_bullets.png b/assets/item_bullets.png new file mode 100644 index 0000000..15ac144 Binary files /dev/null and b/assets/item_bullets.png differ diff --git a/levels.h b/levels.h index 2b37210..d62c235 100644 --- a/levels.h +++ b/levels.h @@ -89,6 +89,7 @@ typedef struct #define SFG_LEVEL_ELEMENT_NONE 255 #define SFG_LEVEL_ELEMENT_BARREL 0x01 #define SFG_LEVEL_ELEMENT_HEALTH 0x02 +#define SFG_LEVEL_ELEMENT_BULLETS 0x03 /* Monsters have lower 4 bits zero and are only distinguished by the 4 upper @@ -267,7 +268,7 @@ SFG_PROGRAM_MEMORY SFG_Level SFG_level0 = {SFG_LEVEL_ELEMENT_MONSTER_PLASMABOT, {19, 31}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_MONSTER_TURRET, {5, 24}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_MONSTER_EXPLODER, {22, 18}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}}, - {SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}}, + {SFG_LEVEL_ELEMENT_BULLETS, {7, 23}}, {SFG_LEVEL_ELEMENT_BULLETS, {8, 23}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}}, diff --git a/main.c b/main.c index 614c452..feeede2 100755 --- a/main.c +++ b/main.c @@ -1046,7 +1046,7 @@ void SFG_init() SFG_backgroundScroll = 0; - SFG_setAndInitLevel(&SFG_level1); + SFG_setAndInitLevel(&SFG_level0); SFG_lastFrameTimeMs = SFG_getTimeMs(); }