diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/player_controller.c | 13 | ||||
| -rw-r--r-- | src/engine/sprite_controller.h | 10 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/engine/player_controller.c b/src/engine/player_controller.c index 1b4eec8..807037a 100644 --- a/src/engine/player_controller.c +++ b/src/engine/player_controller.c @@ -18,16 +18,15 @@ void hh_player_actions() { .radius = 16, .pos = (vec2){128+16,32}, .vel = (vec2){0,0}, - .size = (vec2){32,32}, + .size = (vec2){16,32}, .render = { - .frame0 = HH_TM_SLIME_OFFSET, + .frame0 = HH_TM_GOZER_OFFSET, .palette = 3, - .ppu_foreground_index = 0, .fam = (hh_s_ppu_loc_fam_entry){ .horizontal_flip = false, .vertical_flip = false, .palette_index = 3, - .tilemap_index = HH_TM_SLIME_OFFSET, + .tilemap_index = HH_TM_GOZER_OFFSET, } } }, player_new = {0}; @@ -41,13 +40,13 @@ void hh_player_actions() { .pos = (vec2){-16,-16}, .vel = (vec2){0,0}, .render = { - .frame0 = 84, + .frame0 = HH_TM_BULLET_OFFSET, .palette = 3, .fam = (hh_s_ppu_loc_fam_entry){ .horizontal_flip = false, .vertical_flip = false, - .palette_index = 7, - .tilemap_index = 84, + .palette_index = 3, + .tilemap_index = HH_TM_BULLET_OFFSET, } } }; diff --git a/src/engine/sprite_controller.h b/src/engine/sprite_controller.h index 244181c..d89b068 100644 --- a/src/engine/sprite_controller.h +++ b/src/engine/sprite_controller.h @@ -12,7 +12,7 @@ //TODO: pack data inside of sprite_palette LUT //HH_PPU_PALETTE_COUNT #define HH_SPRITE_COUNT 80 -#define HH_PAL_IDX_SKY 512 +#define HH_PAL_IDX_SKY 0 #define HH_PAL_IDX_BRICK 1 const static uint8_t hh_g_sprite_palette[HH_SPRITE_COUNT] = { //TODO: FIGURE OUT HOW TO DEAL WITH DYNAMIC PALLETS @@ -70,9 +70,9 @@ const static hh_ppu_loc_palette_table_t hh_g_palette = { {0x4,0x2,0x5}, {0x7,0x3,0x7}, {0xe,0xe,0xe}, - {0xe,0xe,0xe}, //elemental - {0x0,0x0,0x0}, - {0x0,0x0,0x0}}, + {0x7,0x2,0x3}, //elemental + {0xc,0x5,0x3}, + {0xe,0xc,0x7}}, {//crates {0x5,0x7,0x7}, {0x3,0x1,0x2}, @@ -113,7 +113,9 @@ const static hh_ppu_loc_palette_table_t hh_g_palette = { void hh_setup_palettes(); +//TODO: UPDATE THIS FUNCTION /** @brief return palette index that belongs to tilemap index */ uint8_t hh_get_palette(uint8_t tile_idx); +//TODO: UPDATE THIS FUNCTION bool hh_colidable(uint8_t tile_idx); |