From 776cf354f8d5410c279075e0ccf982bd03bfde77 Mon Sep 17 00:00:00 2001 From: Alvie Rahman Date: Thu, 9 Jun 2022 16:07:21 +0100 Subject: [PATCH] add arrow sprite --- res/sprites.c | 14 ++++++++------ res/sprites.gbr | Bin 10069 -> 10069 bytes res/sprites.h | 4 ++-- res/tiles.c | 4 ++-- res/tiles.gbr | Bin 10347 -> 10347 bytes src/main.c | 8 +++++--- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/res/sprites.c b/res/sprites.c index 5f0a977..d32c5a4 100644 --- a/res/sprites.c +++ b/res/sprites.c @@ -10,7 +10,7 @@ Compression : None. Counter : None. Tile size : 8 x 8 - Tiles : 0 to 10 + Tiles : 0 to 11 Palette colors : None. SGB Palette : None. @@ -27,8 +27,8 @@ /* Start of tile array. */ unsigned char sprites[] = { - 0xF7,0x08,0xED,0x12,0xFE,0x11,0xFF,0x38, - 0xFE,0x39,0xFE,0x39,0xFF,0x7E,0xFF,0x6E, + 0xFF,0x19,0xEF,0x17,0xFF,0x11,0xFF,0x3B, + 0xFE,0x3F,0xFE,0x3D,0xFF,0x7E,0xFF,0x6E, 0xFF,0x00,0xC3,0x42,0x81,0x00,0x81,0x00, 0x81,0x00,0x81,0x00,0xC3,0x42,0xFF,0x00, 0xC3,0xC3,0xDB,0xDB,0x3C,0x3C,0x7E,0x7E, @@ -48,7 +48,9 @@ unsigned char sprites[] = 0xC3,0xC3,0xDB,0xDB,0x3C,0x3C,0x7E,0x7E, 0x7E,0x7E,0x3C,0x3C,0xDB,0xDB,0x42,0xC3, 0x43,0xC3,0xDB,0xDB,0x3C,0x3C,0x7E,0x7E, - 0x7E,0x7E,0x3C,0x3C,0xDB,0xDB,0x43,0xC3 + 0x7E,0x7E,0x3C,0x3C,0xDB,0xDB,0x43,0xC3, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x43,0x38,0xC6,0x00,0x43 }; @@ -64,7 +66,7 @@ SpriteCorners sprite_offsets[] = { { .itl = { .x = 8, .y = 8}, .itr = { .x = 1, .y = 8}, .ibl = { .x = 8, .y = 1}, .ibr = { .x = 1, .y = 1}, }, { .itl = { .x = 8, .y = 8}, .itr = { .x = 1, .y = 8}, .ibl = { .x = 8, .y = 1}, .ibr = { .x = 1, .y = 1}, }, { .itl = { .x = 8, .y = 8}, .itr = { .x = 1, .y = 8}, .ibl = { .x = 8, .y = 1}, .ibr = { .x = 1, .y = 1}, }, - { .itl = { .x = 8, .y = 8}, .itr = { .x = 1, .y = 8}, .ibl = { .x = 8, .y = 1}, .ibr = { .x = 1, .y = 1}, } + { .itl = { .x = 8, .y = 8}, .itr = { .x = 1, .y = 8}, .ibl = { .x = 8, .y = 1}, .ibr = { .x = 1, .y = 1}, }, + { .itl = { .x = 8, .y = 3}, .itr = { .x = 1, .y = 3}, .ibl = { .x = 8, .y = 1}, .ibr = { .x = 1, .y = 1}, } }; - /* End of SPRITES.C */ diff --git a/res/sprites.gbr b/res/sprites.gbr index 368fb5d753a8d6ace8c95d7ce0b5fadd0abc2270..de0a94ff2e2c1019fa37a5e51a6d3d951ac252e0 100644 GIT binary patch delta 119 zcmccWchzr#9_wUAMh1q7#x2^+%#4gc#K^?R3}S-WAR!c+}{KbvTvb@Ydo-j}vXfz|^=7S17Y#bS>$=Oc%6&wISTnl3W(F~!G?c&b(Qc;A7nq;OOuoQu f%*)Kc#30PTz`zJZ%$pA?^ssTvVcY@~$higpb!ZX+ diff --git a/res/sprites.h b/res/sprites.h index 54bcfa6..49f5dda 100644 --- a/res/sprites.h +++ b/res/sprites.h @@ -10,7 +10,7 @@ Compression : None. Counter : None. Tile size : 8 x 8 - Tiles : 0 to 10 + Tiles : 0 to 11 Palette colors : None. SGB Palette : None. @@ -22,7 +22,7 @@ */ -#include "../src/sprite.h" +#include "../src/sprite.h" /* Bank of tiles. */ #define spritesBank 0 diff --git a/res/tiles.c b/res/tiles.c index 0404dab..710abe2 100644 --- a/res/tiles.c +++ b/res/tiles.c @@ -25,8 +25,8 @@ /* Start of tile array. */ unsigned char tiles[] = { - 0x10,0x00,0x00,0x00,0x08,0x00,0x10,0x00, - 0x30,0x00,0x20,0x00,0x60,0x00,0x50,0x20, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0xFF,0xFF,0xFF,0xFF,0x00,0xFF,0x00,0xFF, 0x00,0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF, 0x00,0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF, diff --git a/res/tiles.gbr b/res/tiles.gbr index 8ff20907b11797e0a31f5d18adceb51ba90dc8d0..0876c8527a1673858e415dfb5a0ef55613045da9 100644 GIT binary patch delta 17 ZcmaDI@H$|^_Q^+BZ8v_&SD#qG0RUFC2%7)^ delta 77 vcmaDI@H$|^c1uPEGyoNVQH%_XASRd#WrMg(j2k}`t8+|a44LA}5F!KsPgw|a diff --git a/src/main.c b/src/main.c index e154213..5d03e40 100644 --- a/src/main.c +++ b/src/main.c @@ -8,14 +8,16 @@ #include "./sprite.h" #include "./vec.h" +#define SPRITE_NO 11 + void init_gfx() { // Load Background tiles and then map set_bkg_data(0, 23, tiles); set_bkg_tiles(0, 0, map.width, map.height, map.data); - set_sprite_data(0, 11, sprites); - set_sprite_tile(0, 2); + set_sprite_data(0, 12, sprites); + set_sprite_tile(0, SPRITE_NO); set_sprite_prop(0, 0); // Turn the background map on to make it visible @@ -36,7 +38,7 @@ void main(void) sprite.vel.y = 0; sprite.acc.x = 0; sprite.acc.y = 0; - sprite.collision_offset = sprite_offsets[0]; + sprite.collision_offset = sprite_offsets[SPRITE_NO]; move_sprite(0, sprite.pos.x, sprite.pos.y);