diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/demo.c | 4 | ||||
| -rw-r--r-- | src/engine/sprite_controller.h | 19 | ||||
| -rw-r--r-- | src/game_loop/high_score.c | 104 | ||||
| -rw-r--r-- | src/game_loop/high_score.h | 29 | ||||
| -rw-r--r-- | src/game_loop/shop.c | 4 | ||||
| -rw-r--r-- | src/game_loop/shop.h | 3 | ||||
| -rw-r--r-- | src/makefile | 1 | ||||
| -rw-r--r-- | src/static/background/title_screen_icon.hex | 304 | ||||
| -rw-r--r-- | src/static/dynamic.tsx | 116 | ||||
| -rw-r--r-- | src/static/foreground/bird.hex | 22 | ||||
| -rw-r--r-- | src/static/makefile | 1 |
11 files changed, 451 insertions, 156 deletions
@@ -14,6 +14,7 @@ #include "engine/level_const.h" #include "game_loop/starting_screen.h" +#include "game_loop/high_score.h" #include "game_loop/gameplay.h" #include "game_loop/shop.h" @@ -76,7 +77,8 @@ void hh_demo_loop(unsigned long frame) { // todo: // fucntion: show all previously scored points // function: button pressed goto starting screen - hh_game_states = hh_e_state_starting_screen; + hh_high_score(&hh_game_states); + // hh_game_states = hh_e_state_starting_screen; break; default: hh_game_states = hh_e_state_starting_screen; diff --git a/src/engine/sprite_controller.h b/src/engine/sprite_controller.h index 7467289..3572166 100644 --- a/src/engine/sprite_controller.h +++ b/src/engine/sprite_controller.h @@ -58,14 +58,15 @@ const static hh_ppu_loc_palette_table_t hh_g_palette = { {0x0,0x0,0x0}, {0x0,0x0,0x0}}, {//Bricks - {0x1,0x2,0x3},//01 - {0x0,0x0,0x1},//25 - {0x1,0x1,0x1},//26 - {0x1,0x1,0x2},//27 - {0x2,0x2,0x3},//28 - {0x3,0x4,0x5},//29 - {0x5,0x1,0x7}, - {0xd,0x8,0xa}},//24 + {0x1,0x2,0x3},//0 + {0x0,0x0,0x1},//1 + {0x1,0x1,0x1},//2 + {0x1,0x1,0x2},//3 + {0x2,0x2,0x3},//4 + {0x3,0x4,0x5},//5 + {0x5,0x5,0x7},//6 +// {0x5,0x7,0x7},//6 + {0xd,0x8,0xa}}, {//slime {0x1,0x2,0x3}, {0x1,0x3,0x2}, @@ -75,7 +76,7 @@ const static hh_ppu_loc_palette_table_t hh_g_palette = { {0xa,0x3,0x3}, {0x0,0x0,0x1}, {0xe,0xe,0xe}}, - {//player //TODO: use one less color && update player indexed sprites + {//player {0x0,0x0,0x0}, {0x1,0x1,0x1}, {0x4,0x2,0x5}, diff --git a/src/game_loop/high_score.c b/src/game_loop/high_score.c new file mode 100644 index 0000000..51f3d48 --- /dev/null +++ b/src/game_loop/high_score.c @@ -0,0 +1,104 @@ +#include "high_score.h" + +#include <string.h> + +#define HH_KB_MAX_X 9 +#define HH_KB_MAX_Y 4 + +void hh_high_score(hh_e_game_state* hh_game_state) { + static hh_e_score_states hh_e_score = hh_e_score_show; + // static uint8_t selected[HH_KB_MAX_X][HH_KB_MAX_Y] = {0}; + static char* name = ""; + static hh_s_controller_exp con1; + static uint8_t selected_x = 0, + selected_y = 0; + + hh_update_controller_exp(&con1); + + switch (hh_e_score) + { + case hh_e_score_show: + hh_clear_screen(); + hh_clear_sprite(); + name = ""; + if (!hh_controller_exp_pressed(con1)){ + hh_e_score = hh_e_score_main; + } + break; + case hh_e_score_main: + if (con1.rising.dpad_left || con1.rising.dpad_right){ + hh_shift_selected(&selected_x,con1.pressed.dpad_right,0,HH_KB_MAX_X-1); + } + if (con1.rising.dpad_up || con1.rising.dpad_down){ + hh_shift_selected(&selected_y,con1.pressed.dpad_down,0,HH_KB_MAX_Y-1); + } + if (con1.rising.button_primary) { + int str_idx = selected_x + selected_y*HH_KB_MAX_X; + int len = strlen(name); + if (str_idx < 10) { + name[len] = str_idx + '0'; + } else { + name[len] = str_idx + 'a'; + } + name[len+1] = '\0'; + } + int idx = 37; + hh_ui_show_char(&idx,name,(vec2){16,16}); + hh_kb_display(selected_x + selected_y*HH_KB_MAX_X); + + + break; + case hh_e_score_end: + hh_e_score = hh_e_score_show; + *hh_game_state = hh_e_state_gameplay; + break; + default: + hh_e_score = hh_e_score_show; + break; + } + +} + +bool hh_controller_exp_pressed(hh_s_controller_exp con1) { + return (con1.pressed.button_primary || con1.pressed.button_secondary || con1.pressed.dpad_down || con1.pressed.dpad_up || con1.pressed.dpad_left || con1.pressed.dpad_right); +} + +void hh_update_controller_exp(hh_s_controller_exp* in) { + + in->falling.button_primary = (in->pressed.button_primary && !g_hh_controller_p1.button_primary); + in->falling.button_secondary = (in->pressed.button_secondary && !g_hh_controller_p1.button_secondary); + in->falling.dpad_right = (in->pressed.dpad_right && !g_hh_controller_p1.dpad_right); + in->falling.dpad_left = (in->pressed.dpad_left && !g_hh_controller_p1.dpad_left); + in->falling.dpad_down = (in->pressed.dpad_down && !g_hh_controller_p1.dpad_down); + in->falling.dpad_up = (in->pressed.dpad_up && !g_hh_controller_p1.dpad_up); + + in->rising.button_primary = (!in->pressed.button_primary && g_hh_controller_p1.button_primary); + in->rising.button_secondary = (!in->pressed.button_secondary && g_hh_controller_p1.button_secondary); + in->rising.dpad_right = (!in->pressed.dpad_right && g_hh_controller_p1.dpad_right); + in->rising.dpad_left = (!in->pressed.dpad_left && g_hh_controller_p1.dpad_left); + in->rising.dpad_down = (!in->pressed.dpad_down && g_hh_controller_p1.dpad_down); + in->rising.dpad_up = (!in->pressed.dpad_up && g_hh_controller_p1.dpad_up); + + in->pressed = g_hh_controller_p1; +} + +void hh_kb_display(uint8_t sel) { + const vec_cor start = {(320-16*HH_KB_MAX_X)/2,120}; + const uint8_t space = 16; + int counter = 0; + for (int y = 0; y < HH_KB_MAX_Y; y++) { + for (int x = 0; x < HH_KB_MAX_X; x++) { + hh_ppu_update_foreground(counter++, + (hh_s_ppu_loc_fam_entry){ + .horizontal_flip = false, .vertical_flip = false, + .position_x = x*space+start.x, + .position_y = y*space+start.y, + .palette_index = (counter == sel ? 6 : 4), + .tilemap_index = HH_TM_FONT_OFFSET + counter + }); + } + + } + +} + diff --git a/src/game_loop/high_score.h b/src/game_loop/high_score.h new file mode 100644 index 0000000..1af350a --- /dev/null +++ b/src/game_loop/high_score.h @@ -0,0 +1,29 @@ +#pragma once + +#include "input.h" +#include "engine/draw_screen.h" +#include "engine/maths.h" +#include "ppu/ppu.h" + +#include "game_loop/ui.h" + +#include <stdint.h> +#include <stdbool.h> + +typedef enum { + hh_e_score_show, + hh_e_score_main, + hh_e_score_end, +} hh_e_score_states; + +typedef struct { + hh_s_gamepad pressed, rising, falling; +} hh_s_controller_exp; + +void hh_high_score(hh_e_game_state* hh_game_state); + +bool hh_controller_exp_pressed(hh_s_controller_exp con1); + +void hh_update_controller_exp(hh_s_controller_exp* in); + +void hh_kb_display(uint8_t sel); diff --git a/src/game_loop/shop.c b/src/game_loop/shop.c index c8dcfe5..14d96e2 100644 --- a/src/game_loop/shop.c +++ b/src/game_loop/shop.c @@ -1,8 +1,4 @@ #include "shop.h" -#include "engine/maths.h" -#include "ppu/ppu.h" - -#include "game_loop/ui.h" hh_e_upgrades hh_shop(hh_e_game_state* hh_game_state, hh_g_all_levels* levels, int rng_seed){ static hh_e_shop_states hh_e_shop = hh_e_shop_show; diff --git a/src/game_loop/shop.h b/src/game_loop/shop.h index c4f3ced..8c2f5b2 100644 --- a/src/game_loop/shop.h +++ b/src/game_loop/shop.h @@ -4,7 +4,10 @@ #include "engine/draw_screen.h" #include "engine/level_const.h" #include "engine/sprite_controller.h" +#include "engine/maths.h" +#include "ppu/ppu.h" +#include "game_loop/ui.h" #include <stdint.h> #include <stdbool.h> diff --git a/src/makefile b/src/makefile index 0f5f917..1c103a3 100644 --- a/src/makefile +++ b/src/makefile @@ -47,6 +47,7 @@ LOCAL_SRCS += main.c \ game_loop/shop.c \ game_loop/gameplay.c \ game_loop/game_over.c \ + game_loop/high_score.c \ game_loop/starting_screen.c \ game_loop/ui.c diff --git a/src/static/background/title_screen_icon.hex b/src/static/background/title_screen_icon.hex index 120eaa1..6e4eb98 100644 --- a/src/static/background/title_screen_icon.hex +++ b/src/static/background/title_screen_icon.hex @@ -4,99 +4,211 @@ ;40 27 51 ;7a 36 7b -000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -0000a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 02 -0000b0: 00 00 00 00 00 00 00 00 00 00 02 02 02 02 03 03 -0000c0: 00 00 00 00 00 00 00 02 02 02 03 03 03 03 03 03 -0000d0: 00 00 00 00 02 02 02 03 03 03 03 03 03 03 03 03 -0000e0: 00 00 02 02 03 03 03 03 03 03 03 03 03 03 03 03 -0000f0: 02 02 03 03 03 03 03 03 03 03 03 03 03 03 03 03 -000100: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 02 -000110: 00 00 00 00 00 00 00 00 00 00 00 00 00 02 03 03 -000120: 00 00 00 00 00 00 00 00 00 00 00 00 02 03 03 03 -000130: 00 00 00 00 00 00 00 00 00 00 00 02 03 03 03 03 -000140: 00 00 00 00 00 00 00 00 00 00 02 03 03 03 03 03 -000150: 00 00 00 00 00 00 00 00 00 00 02 03 03 03 03 03 -000160: 00 00 00 00 00 00 00 00 00 02 03 03 03 03 03 03 -000170: 00 00 00 00 00 00 00 00 02 03 03 03 03 03 03 03 -000180: 00 00 00 00 00 00 00 00 02 03 03 03 03 03 03 03 -000190: 00 00 00 00 00 00 00 02 03 03 03 03 03 03 03 03 -0001a0: 00 00 00 00 00 00 00 02 03 03 03 03 03 03 03 03 -0001b0: 00 00 00 00 00 00 00 02 03 03 03 03 03 03 03 03 -0001c0: 00 00 00 00 00 00 02 03 03 03 03 03 03 03 03 01 -0001d0: 00 00 00 00 00 00 02 03 03 03 03 03 03 03 01 01 -0001e0: 00 00 00 00 00 00 02 03 03 03 03 03 03 03 01 01 -0001f0: 00 00 00 00 00 02 03 03 03 03 03 03 03 01 01 01 -000200: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 -000210: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 -000220: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 -000230: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 -000240: 03 03 03 03 03 03 03 03 03 03 01 01 01 01 01 01 -000250: 03 03 03 03 03 03 03 01 01 01 01 01 01 01 01 01 -000260: 03 03 03 03 03 01 01 01 01 01 01 01 01 01 01 01 -000270: 03 03 03 01 01 01 01 01 01 01 01 01 01 01 01 01 -000280: 03 03 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -000290: 03 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -0002a0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -0002b0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -0002c0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -0002d0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -0002e0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -0002f0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -000300: 00 00 00 00 00 02 03 03 03 03 03 03 03 01 01 01 -000310: 00 00 00 00 00 02 03 03 03 03 03 03 03 01 01 01 -000320: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 -000330: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 -000340: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 -000350: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 -000360: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 -000370: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 -000380: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 -000390: 00 00 00 00 00 00 02 03 03 03 03 03 01 01 01 01 -0003a0: 00 00 00 00 00 00 02 03 03 03 03 03 01 01 01 01 -0003b0: 00 00 00 00 00 00 02 03 03 03 03 03 01 01 01 01 -0003c0: 00 00 00 00 00 00 00 02 03 03 03 03 01 01 01 01 -0003d0: 00 00 00 00 00 00 00 02 03 03 03 03 01 01 01 01 -0003e0: 00 00 00 00 00 00 00 02 03 03 03 03 01 01 01 01 -0003f0: 00 00 00 00 00 00 00 00 02 03 03 03 01 01 01 01 -000400: 00 00 00 00 00 00 00 00 02 03 03 03 01 01 01 01 -000410: 00 00 00 00 00 00 00 00 00 02 03 03 01 01 01 01 -000420: 00 00 00 00 00 00 00 00 00 02 03 03 03 01 01 01 -000430: 00 00 00 00 00 00 00 00 00 00 02 03 03 01 01 01 -000440: 00 00 00 00 00 00 00 00 00 00 02 03 03 01 01 01 -000450: 00 00 00 00 00 00 00 00 00 00 00 02 03 03 01 01 -000460: 00 00 00 00 00 00 00 00 00 00 00 02 03 03 01 01 -000470: 00 00 00 00 00 00 00 00 00 00 00 00 02 03 03 01 -000480: 00 00 00 00 00 00 00 00 00 00 00 00 00 02 03 03 -000490: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 03 -0004a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 -0004b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -0004c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -0004d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -0004e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -0004f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000500: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -000510: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -000520: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -000530: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -000540: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -000550: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -000560: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -000570: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -000580: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -000590: 03 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 -0005a0: 03 03 03 01 01 01 01 01 01 01 01 01 01 01 01 01 -0005b0: 02 03 03 03 03 01 01 01 01 01 01 01 01 01 01 01 -0005c0: 00 02 02 03 03 03 03 01 01 01 01 01 01 01 01 01 -0005d0: 00 00 00 02 02 02 03 03 03 03 03 03 01 01 01 01 -0005e0: 00 00 00 00 00 00 02 02 02 02 02 03 03 03 03 03 -0005f0: 00 00 00 00 00 00 00 00 00 00 00 02 02 02 02 02
\ No newline at end of file +000000: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000010: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000020: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000030: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000040: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000050: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000060: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000070: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000080: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000090: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0000a0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0000b0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0000c0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0000d0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0000e0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0000f0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000100: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000110: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000120: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000130: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000140: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000150: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000160: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000170: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000180: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000190: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +0001a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 02 +0001b0: 00 00 00 00 00 00 00 00 00 00 02 02 02 02 03 03 +0001c0: 00 00 00 00 00 00 00 02 02 02 03 03 03 03 03 03 +0001d0: 00 00 00 00 02 02 02 03 03 03 03 03 03 03 03 03 +0001e0: 00 00 02 02 03 03 03 03 03 03 03 03 03 03 03 03 +0001f0: 02 02 03 03 03 03 03 03 03 03 03 03 03 03 03 03 +000200: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 02 +000210: 00 00 00 00 00 00 00 00 00 00 00 00 00 02 03 03 +000220: 00 00 00 00 00 00 00 00 00 00 00 00 02 03 03 03 +000230: 00 00 00 00 00 00 00 00 00 00 00 02 03 03 03 03 +000240: 00 00 00 00 00 00 00 00 00 00 02 03 03 03 03 03 +000250: 00 00 00 00 00 00 00 00 00 00 02 03 03 03 03 03 +000260: 00 00 00 00 00 00 00 00 00 02 03 03 03 03 03 03 +000270: 00 00 00 00 00 00 00 00 02 03 03 03 03 03 03 03 +000280: 00 00 00 00 00 00 00 00 02 03 03 03 03 03 03 03 +000290: 00 00 00 00 00 00 00 02 03 03 03 03 03 03 03 03 +0002a0: 00 00 00 00 00 00 00 02 03 03 03 03 03 03 03 03 +0002b0: 00 00 00 00 00 00 00 02 03 03 03 03 03 03 03 03 +0002c0: 00 00 00 00 00 00 02 03 03 03 03 03 03 03 03 01 +0002d0: 00 00 00 00 00 00 02 03 03 03 03 03 03 03 01 01 +0002e0: 00 00 00 00 00 00 02 03 03 03 03 03 03 03 01 01 +0002f0: 00 00 00 00 00 02 03 03 03 03 03 03 03 01 01 01 +000300: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 +000310: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 +000320: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 +000330: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 +000340: 03 03 03 03 03 03 03 03 03 03 01 01 01 01 01 01 +000350: 03 03 03 03 03 03 03 01 01 01 01 01 01 01 01 01 +000360: 03 03 03 03 03 01 01 01 01 01 01 01 01 01 01 01 +000370: 03 03 03 01 01 01 01 01 01 01 01 01 01 01 01 01 +000380: 03 03 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000390: 03 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0003a0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0003b0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0003c0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0003d0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0003e0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0003f0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000400: 00 00 00 00 00 02 03 03 03 03 03 03 03 01 01 01 +000410: 00 00 00 00 00 02 03 03 03 03 03 03 03 01 01 01 +000420: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 +000430: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 +000440: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 +000450: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 +000460: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 +000470: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 +000480: 00 00 00 00 00 02 03 03 03 03 03 03 01 01 01 01 +000490: 00 00 00 00 00 00 02 03 03 03 03 03 01 01 01 01 +0004a0: 00 00 00 00 00 00 02 03 03 03 03 03 01 01 01 01 +0004b0: 00 00 00 00 00 00 02 03 03 03 03 03 01 01 01 01 +0004c0: 00 00 00 00 00 00 00 02 03 03 03 03 01 01 01 01 +0004d0: 00 00 00 00 00 00 00 02 03 03 03 03 01 01 01 01 +0004e0: 00 00 00 00 00 00 00 02 03 03 03 03 01 01 01 01 +0004f0: 00 00 00 00 00 00 00 00 02 03 03 03 01 01 01 01 +000500: 00 00 00 00 00 00 00 00 02 03 03 03 01 01 01 01 +000510: 00 00 00 00 00 00 00 00 00 02 03 03 01 01 01 01 +000520: 00 00 00 00 00 00 00 00 00 02 03 03 03 01 01 01 +000530: 00 00 00 00 00 00 00 00 00 00 02 03 03 01 01 01 +000540: 00 00 00 00 00 00 00 00 00 00 02 03 03 01 01 01 +000550: 00 00 00 00 00 00 00 00 00 00 00 02 03 03 01 01 +000560: 00 00 00 00 00 00 00 00 00 00 00 02 03 03 01 01 +000570: 00 00 00 00 00 00 00 00 00 00 00 00 02 03 03 01 +000580: 00 00 00 00 00 00 00 00 00 00 00 00 00 02 03 03 +000590: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 03 +0005a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 +0005b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +0005c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +0005d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +0005e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +0005f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000600: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000610: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000620: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000630: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000640: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000650: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000660: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000670: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000680: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000690: 03 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0006a0: 03 03 03 01 01 01 01 01 01 01 01 01 01 01 01 01 +0006b0: 02 03 03 03 03 01 01 01 01 01 01 01 01 01 01 01 +0006c0: 00 02 02 03 03 03 03 01 01 01 01 01 01 01 01 01 +0006d0: 00 00 00 02 02 02 03 03 03 03 03 03 01 01 01 01 +0006e0: 00 00 00 00 00 00 02 02 02 02 02 03 03 03 03 03 +0006f0: 00 00 00 00 00 00 00 00 00 00 00 02 02 02 02 02 +000700: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000710: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000720: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000730: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000740: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000750: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000760: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000770: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000780: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000790: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +0007a0: 02 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +0007b0: 03 03 02 02 02 02 00 00 00 00 00 00 00 00 00 00 +0007c0: 03 03 03 03 03 03 02 02 02 00 00 00 00 00 00 00 +0007d0: 03 03 03 03 03 03 03 03 03 02 02 02 00 00 00 00 +0007e0: 03 03 03 03 03 03 03 03 03 03 03 03 02 02 00 00 +0007f0: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 02 02 +000800: 02 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000810: 03 03 02 00 00 00 00 00 00 00 00 00 00 00 00 00 +000820: 03 03 03 02 00 00 00 00 00 00 00 00 00 00 00 00 +000830: 03 03 03 03 02 00 00 00 00 00 00 00 00 00 00 00 +000840: 03 03 03 03 03 02 00 00 00 00 00 00 00 00 00 00 +000850: 03 03 03 03 03 02 00 00 00 00 00 00 00 00 00 00 +000860: 03 03 03 03 03 03 02 00 00 00 00 00 00 00 00 00 +000870: 03 03 03 03 03 03 03 02 00 00 00 00 00 00 00 00 +000880: 03 03 03 03 03 03 03 02 00 00 00 00 00 00 00 00 +000890: 03 03 03 03 03 03 03 03 02 00 00 00 00 00 00 00 +0008a0: 03 03 03 03 03 03 03 03 02 00 00 00 00 00 00 00 +0008b0: 03 03 03 03 03 03 03 03 02 00 00 00 00 00 00 00 +0008c0: 01 03 03 03 03 03 03 03 03 02 00 00 00 00 00 00 +0008d0: 01 01 03 03 03 03 03 03 03 02 00 00 00 00 00 00 +0008e0: 01 01 03 03 03 03 03 03 03 02 00 00 00 00 00 00 +0008f0: 01 01 01 03 03 03 03 03 03 03 02 00 00 00 00 00 +000900: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 +000910: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 +000920: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 +000930: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 +000940: 01 01 01 01 01 01 03 03 03 03 03 03 03 03 03 03 +000950: 01 01 01 01 01 01 01 01 01 03 03 03 03 03 03 03 +000960: 01 01 01 01 01 01 01 01 01 01 01 03 03 03 03 03 +000970: 01 01 01 01 01 01 01 01 01 01 01 01 01 03 03 03 +000980: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 03 03 +000990: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 03 +0009a0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0009b0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0009c0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0009d0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0009e0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0009f0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000a00: 01 01 01 03 03 03 03 03 03 03 02 00 00 00 00 00 +000a10: 01 01 01 03 03 03 03 03 03 03 02 00 00 00 00 00 +000a20: 01 01 01 01 03 03 03 03 03 03 02 00 00 00 00 00 +000a30: 01 01 01 01 03 03 03 03 03 03 02 00 00 00 00 00 +000a40: 01 01 01 01 03 03 03 03 03 03 02 00 00 00 00 00 +000a50: 01 01 01 01 03 03 03 03 03 03 02 00 00 00 00 00 +000a60: 01 01 01 01 03 03 03 03 03 03 02 00 00 00 00 00 +000a70: 01 01 01 01 03 03 03 03 03 03 02 00 00 00 00 00 +000a80: 01 01 01 01 03 03 03 03 03 03 02 00 00 00 00 00 +000a90: 01 01 01 01 03 03 03 03 03 02 00 00 00 00 00 00 +000aa0: 01 01 01 01 03 03 03 03 03 02 00 00 00 00 00 00 +000ab0: 01 01 01 01 03 03 03 03 03 02 00 00 00 00 00 00 +000ac0: 01 01 01 01 03 03 03 03 02 00 00 00 00 00 00 00 +000ad0: 01 01 01 01 03 03 03 03 02 00 00 00 00 00 00 00 +000ae0: 01 01 01 01 03 03 03 03 02 00 00 00 00 00 00 00 +000af0: 01 01 01 01 03 03 03 02 00 00 00 00 00 00 00 00 +000b00: 01 01 01 01 03 03 03 02 00 00 00 00 00 00 00 00 +000b10: 01 01 01 01 03 03 02 00 00 00 00 00 00 00 00 00 +000b20: 01 01 01 03 03 03 02 00 00 00 00 00 00 00 00 00 +000b30: 01 01 01 03 03 02 00 00 00 00 00 00 00 00 00 00 +000b40: 01 01 01 03 03 02 00 00 00 00 00 00 00 00 00 00 +000b50: 01 01 03 03 02 00 00 00 00 00 00 00 00 00 00 00 +000b60: 01 01 03 03 02 00 00 00 00 00 00 00 00 00 00 00 +000b70: 01 03 03 02 00 00 00 00 00 00 00 00 00 00 00 00 +000b80: 03 03 02 00 00 00 00 00 00 00 00 00 00 00 00 00 +000b90: 03 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000ba0: 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000bb0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000bc0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000bd0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000be0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000bf0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000c00: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000c10: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000c20: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000c30: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000c40: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000c50: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000c60: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000c70: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000c80: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000c90: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 03 +000ca0: 01 01 01 01 01 01 01 01 01 01 01 01 01 03 03 03 +000cb0: 01 01 01 01 01 01 01 01 01 01 01 03 03 03 03 02 +000cc0: 01 01 01 01 01 01 01 01 01 03 03 03 03 02 02 00 +000cd0: 01 01 01 01 03 03 03 03 03 03 02 02 02 00 00 00 +000ce0: 03 03 03 03 03 02 02 02 02 02 00 00 00 00 00 00 +000cf0: 02 02 02 02 02 00 00 00 00 00 00 00 00 00 00 00
\ No newline at end of file diff --git a/src/static/dynamic.tsx b/src/static/dynamic.tsx index fde4347..39aa6df 100644 --- a/src/static/dynamic.tsx +++ b/src/static/dynamic.tsx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tileset version="1.10" tiledversion="1.10.1" name="dynamic" tilewidth="16" tileheight="16" tilecount="129" columns="0"> +<tileset version="1.10" tiledversion="1.10.1" name="dynamic" tilewidth="16" tileheight="16" tilecount="137" columns="0"> <grid orientation="orthogonal" width="1" height="1"/> <tile id="107"> <image width="16" height="16" source="tiled/font_35.png"/> @@ -106,6 +106,9 @@ <tile id="33"> <image width="16" height="16" source="tiled/font_01.png"/> </tile> + <tile id="34"> + <image width="16" height="16" source="tiled/font_00.png"/> + </tile> <tile id="108"> <image width="16" height="16" source="tiled/boss1_05.png"/> </tile> @@ -124,8 +127,8 @@ <tile id="113"> <image width="16" height="16" source="tiled/boss1_00.png"/> </tile> - <tile id="34"> - <image width="16" height="16" source="tiled/font_00.png"/> + <tile id="129"> + <image width="16" height="16" source="tiled/bird_00.png"/> </tile> <tile id="114"> <image width="16" height="16" source="tiled/slime_jumpable_07.png"/> @@ -175,6 +178,9 @@ <tile id="42"> <image width="16" height="16" source="tiled/bullet_01.png"/> </tile> + <tile id="43"> + <image width="16" height="16" source="tiled/bullet_00.png"/> + </tile> <tile id="122"> <image width="16" height="16" source="tiled/upgrades_04.png"/> </tile> @@ -196,9 +202,6 @@ <tile id="128"> <image width="16" height="16" source="tiled/hud_heart_00.png"/> </tile> - <tile id="43"> - <image width="16" height="16" source="tiled/bullet_00.png"/> - </tile> <tile id="44"> <image width="16" height="16" source="tiled/title_screen_letteres_large_13.png"/> </tile> @@ -241,6 +244,27 @@ <tile id="57"> <image width="16" height="16" source="tiled/title_screen_letteres_large_00.png"/> </tile> + <tile id="130"> + <image width="16" height="16" source="tiled/title_screen_icon_12.png"/> + </tile> + <tile id="131"> + <image width="16" height="16" source="tiled/title_screen_icon_11.png"/> + </tile> + <tile id="132"> + <image width="16" height="16" source="tiled/title_screen_icon_10.png"/> + </tile> + <tile id="133"> + <image width="16" height="16" source="tiled/title_screen_icon_09.png"/> + </tile> + <tile id="134"> + <image width="16" height="16" source="tiled/title_screen_icon_08.png"/> + </tile> + <tile id="135"> + <image width="16" height="16" source="tiled/title_screen_icon_07.png"/> + </tile> + <tile id="136"> + <image width="16" height="16" source="tiled/title_screen_icon_06.png"/> + </tile> <tile id="58"> <image width="16" height="16" source="tiled/title_screen_icon_05.png"/> </tile> @@ -259,30 +283,30 @@ <tile id="63"> <image width="16" height="16" source="tiled/title_screen_icon_00.png"/> </tile> - <tile id="64"> - <image width="16" height="16" source="tiled/shop_stall_11.png"/> + <tile id="66"> + <image width="16" height="16" source="tiled/shop_stall_09.png"/> </tile> <tile id="65"> <image width="16" height="16" source="tiled/shop_stall_10.png"/> </tile> - <tile id="66"> - <image width="16" height="16" source="tiled/shop_stall_09.png"/> - </tile> - <tile id="67"> - <image width="16" height="16" source="tiled/shop_stall_08.png"/> + <tile id="64"> + <image width="16" height="16" source="tiled/shop_stall_11.png"/> </tile> - <tile id="68"> - <image width="16" height="16" source="tiled/shop_stall_07.png"/> + <tile id="70"> + <image width="16" height="16" source="tiled/shop_stall_05.png"/> </tile> <tile id="69"> <image width="16" height="16" source="tiled/shop_stall_06.png"/> </tile> - <tile id="70"> - <image width="16" height="16" source="tiled/shop_stall_05.png"/> + <tile id="67"> + <image width="16" height="16" source="tiled/shop_stall_08.png"/> </tile> <tile id="71"> <image width="16" height="16" source="tiled/shop_stall_04.png"/> </tile> + <tile id="68"> + <image width="16" height="16" source="tiled/shop_stall_07.png"/> + </tile> <tile id="72"> <image width="16" height="16" source="tiled/shop_stall_03.png"/> </tile> @@ -301,32 +325,32 @@ <tile id="77"> <image width="16" height="16" source="tiled/crates_00.png"/> </tile> - <tile id="78"> - <image width="16" height="16" source="tiled/bricks_27.png"/> + <tile id="80"> + <image width="16" height="16" source="tiled/bricks_25.png"/> </tile> <tile id="79"> <image width="16" height="16" source="tiled/bricks_26.png"/> </tile> - <tile id="80"> - <image width="16" height="16" source="tiled/bricks_25.png"/> - </tile> - <tile id="81"> - <image width="16" height="16" source="tiled/bricks_24.png"/> + <tile id="78"> + <image width="16" height="16" source="tiled/bricks_27.png"/> </tile> <tile id="82"> <image width="16" height="16" source="tiled/bricks_23.png"/> </tile> - <tile id="83"> - <image width="16" height="16" source="tiled/bricks_22.png"/> + <tile id="86"> + <image width="16" height="16" source="tiled/bricks_19.png"/> </tile> - <tile id="84"> - <image width="16" height="16" source="tiled/bricks_21.png"/> + <tile id="81"> + <image width="16" height="16" source="tiled/bricks_24.png"/> </tile> <tile id="85"> <image width="16" height="16" source="tiled/bricks_20.png"/> </tile> - <tile id="86"> - <image width="16" height="16" source="tiled/bricks_19.png"/> + <tile id="84"> + <image width="16" height="16" source="tiled/bricks_21.png"/> + </tile> + <tile id="83"> + <image width="16" height="16" source="tiled/bricks_22.png"/> </tile> <tile id="87"> <image width="16" height="16" source="tiled/bricks_18.png"/> @@ -349,41 +373,41 @@ <tile id="93"> <image width="16" height="16" source="tiled/bricks_12.png"/> </tile> - <tile id="94"> - <image width="16" height="16" source="tiled/bricks_11.png"/> + <tile id="96"> + <image width="16" height="16" source="tiled/bricks_09.png"/> </tile> <tile id="95"> <image width="16" height="16" source="tiled/bricks_10.png"/> </tile> - <tile id="96"> - <image width="16" height="16" source="tiled/bricks_09.png"/> + <tile id="94"> + <image width="16" height="16" source="tiled/bricks_11.png"/> </tile> - <tile id="97"> - <image width="16" height="16" source="tiled/bricks_08.png"/> + <tile id="99"> + <image width="16" height="16" source="tiled/bricks_06.png"/> </tile> <tile id="98"> <image width="16" height="16" source="tiled/bricks_07.png"/> </tile> - <tile id="99"> - <image width="16" height="16" source="tiled/bricks_06.png"/> + <tile id="97"> + <image width="16" height="16" source="tiled/bricks_08.png"/> </tile> - <tile id="100"> - <image width="16" height="16" source="tiled/bricks_05.png"/> + <tile id="102"> + <image width="16" height="16" source="tiled/bricks_03.png"/> </tile> <tile id="101"> <image width="16" height="16" source="tiled/bricks_04.png"/> </tile> - <tile id="102"> - <image width="16" height="16" source="tiled/bricks_03.png"/> + <tile id="100"> + <image width="16" height="16" source="tiled/bricks_05.png"/> </tile> - <tile id="103"> - <image width="16" height="16" source="tiled/bricks_02.png"/> + <tile id="105"> + <image width="16" height="16" source="tiled/bricks_00.png"/> </tile> <tile id="104"> <image width="16" height="16" source="tiled/bricks_01.png"/> </tile> - <tile id="105"> - <image width="16" height="16" source="tiled/bricks_00.png"/> + <tile id="103"> + <image width="16" height="16" source="tiled/bricks_02.png"/> </tile> <tile id="106"> <image width="16" height="16" source="tiled/air_00.png"/> diff --git a/src/static/foreground/bird.hex b/src/static/foreground/bird.hex new file mode 100644 index 0000000..b7ad583 --- /dev/null +++ b/src/static/foreground/bird.hex @@ -0,0 +1,22 @@ +;indices: 4 +;17 20 38 +;20 2e 37 +;a2 3e 8c +;eb ed e9 + +000000: 00 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 +000010: 00 00 00 00 01 03 03 03 03 03 03 01 00 00 00 00 +000020: 00 00 00 00 01 01 03 01 01 03 01 01 00 00 02 00 +000030: 00 00 00 00 01 03 03 01 01 03 03 01 00 02 00 00 +000040: 00 00 00 00 01 03 03 01 01 03 03 01 02 02 02 00 +000050: 00 00 00 00 01 02 02 01 01 02 02 01 02 02 00 00 +000060: 00 00 00 01 02 02 02 02 02 02 02 02 01 00 00 00 +000070: 00 00 01 03 01 03 03 03 03 03 03 01 03 01 00 00 +000080: 00 00 01 03 01 03 03 03 03 03 03 01 03 01 00 00 +000090: 00 00 01 03 01 03 03 03 03 03 03 01 03 01 00 00 +0000a0: 00 00 01 03 03 03 03 03 03 03 03 03 03 01 00 00 +0000b0: 00 00 01 03 03 03 03 03 03 03 03 03 03 01 00 00 +0000c0: 00 00 01 03 01 03 03 03 03 03 03 01 03 01 00 00 +0000d0: 00 00 00 01 03 03 03 03 03 03 03 03 01 00 00 00 +0000e0: 00 00 00 00 01 01 03 03 03 03 01 01 00 00 00 00 +0000f0: 00 00 00 00 01 00 01 01 01 01 00 01 00 00 00 00
\ No newline at end of file diff --git a/src/static/makefile b/src/static/makefile index 4959f2f..3caeb6e 100644 --- a/src/static/makefile +++ b/src/static/makefile @@ -16,6 +16,7 @@ INPUT += background/air.hex \ foreground/gozer.hex \ foreground/slime.hex \ foreground/slime_jumpable.hex \ + foreground/bird.hex \ foreground/boss1.hex \ foreground/font.hex # world.hex |