diff options
| author | UnavailableDev <ggwildplay@gmail.com> | 2023-04-06 12:33:09 +0200 |
|---|---|---|
| committer | UnavailableDev <ggwildplay@gmail.com> | 2023-04-06 12:33:09 +0200 |
| commit | 93e9426d5642dfab7a13d5a34873b296de1d9642 (patch) | |
| tree | a2efebcb9917d7f4f3666a722338f50b9590e843 /src/game_loop/shop.c | |
| parent | 0dd7be7230b3ccba9a930c01549d79d108d091c4 (diff) | |
| parent | 5c9e951408399ebda98a2007d7cd24912ba64c49 (diff) | |
Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into dev
Diffstat (limited to 'src/game_loop/shop.c')
| -rw-r--r-- | src/game_loop/shop.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game_loop/shop.c b/src/game_loop/shop.c index eb41248..da27524 100644 --- a/src/game_loop/shop.c +++ b/src/game_loop/shop.c @@ -2,7 +2,7 @@ #include "engine/maths.h" #include "ppu/ppu.h" -void hh_shop(hh_e_game_state* hh_game_state){ +void hh_shop(hh_e_game_state* hh_game_state, hh_level_entity* level_shop){ static hh_e_shop_states hh_e_shop = hh_e_shop_show; static hh_e_upgrades upgrades[HH_SHOP_UPG_DISPLAY] = {0}; static uint8_t selected = 0; @@ -11,11 +11,11 @@ void hh_shop(hh_e_game_state* hh_game_state){ switch (hh_e_shop) { case hh_e_shop_show: - hh_clear_screen(); - hh_clear_sprite(); + // hh_clear_screen(); + // hh_clear_sprite(); // TODO: make function to show shop - // hh_setup_screen(); //hh_setup_shop(); + hh_setup_screen(*level_shop); hh_shop_init(&upgrades); selected = HH_SHOP_UPG_DISPLAY/2; hh_shop_display(selected, &upgrades); @@ -33,7 +33,7 @@ void hh_shop(hh_e_game_state* hh_game_state){ } if(g_hh_controller_p1.button_primary){ //apply selected upgrade - hh_e_shop = hh_e_shop_end; + // hh_e_shop = hh_e_shop_end; } if(g_hh_controller_p1.button_secondary){//Quick exit hh_e_shop = hh_e_shop_end; @@ -60,7 +60,7 @@ void hh_shop_init(hh_e_upgrades* in) { } void hh_shop_display(uint8_t selected, hh_e_upgrades* upgrades) { - const vec_cor start = {48,16}; + const vec_cor start = {104,144+16}; const uint8_t up = 8, space = 24+8; |