From d8e8e63bac3ef5a203106c09731ed2e55c87688a Mon Sep 17 00:00:00 2001 From: UnavailableDev Date: Thu, 6 Apr 2023 16:40:34 +0200 Subject: rendering hp + strings --- scripts/manifest2header.awk | 2 +- src/engine/animator.c | 8 + src/engine/animator.h | 5 +- src/engine/level_const.c | 6 +- src/engine/sprite_controller.h | 29 ++-- src/engine/types.h | 1 - src/game_loop/gameplay.c | 3 + src/game_loop/shop.c | 7 +- src/game_loop/ui.c | 47 ++++++ src/game_loop/ui.h | 19 +++ src/makefile | 3 +- src/static/.gitignore | 1 - src/static/dynamic.tsx | 328 ++++++++++++++++++++++++++++++++++++ src/static/foreground/boss1.hex | 100 +++++++++++ src/static/foreground/font.hex | 286 +++++++++++++++---------------- src/static/foreground/hud_heart.hex | 42 +++++ src/static/foreground/upgrades.hex | 90 ++++++++++ src/static/makefile | 4 + 18 files changed, 818 insertions(+), 163 deletions(-) create mode 100644 src/game_loop/ui.c create mode 100644 src/game_loop/ui.h create mode 100644 src/static/dynamic.tsx create mode 100644 src/static/foreground/boss1.hex create mode 100644 src/static/foreground/hud_heart.hex create mode 100644 src/static/foreground/upgrades.hex diff --git a/scripts/manifest2header.awk b/scripts/manifest2header.awk index b141a8b..8a114bc 100755 --- a/scripts/manifest2header.awk +++ b/scripts/manifest2header.awk @@ -19,5 +19,5 @@ BEGIN { END { print "#define HH_TM_SIZE "offset print "#define HH_TM_GROUPS "groups - print "const static uint8_t hh_palette_lut[]={"arr", NULL};" + print "const static int hh_palette_lut[]={"arr", NULL};" } diff --git a/src/engine/animator.c b/src/engine/animator.c index e293eb1..71d0582 100644 --- a/src/engine/animator.c +++ b/src/engine/animator.c @@ -39,3 +39,11 @@ void hh_update_sprite(uint16_t *idx, hh_entity* in, vec_cor cam) { } } } + +void hh_show_quad(uint16_t *idx, hh_s_rendering* in) { + hh_s_ppu_loc_fam_entry temp = in->fam; + temp.position_y = CLAMP(in->fam.position_y, -16, HH_PPU_SCREEN_HEIGHT); + temp.position_x = CLAMP(in->fam.position_x, -16, HH_PPU_SCREEN_WIDTH); + hh_ppu_update_foreground(++*idx, temp); + temp.tilemap_index++; +} diff --git a/src/engine/animator.h b/src/engine/animator.h index 2f6e00d..3ace959 100644 --- a/src/engine/animator.h +++ b/src/engine/animator.h @@ -10,5 +10,8 @@ void hh_animate_hit(hh_s_rendering*, bool hit); /** @brief updates current animation frame */ void hh_animate(hh_s_rendering*, uint16_t start, uint16_t end, uint8_t step); -/** @brief passively updates sprite*/ +/** @brief passively updates sprite */ void hh_update_sprite(uint16_t* idx, hh_entity* in, vec_cor cam); + +/** @brief always renders on same screen position */ +void hh_show_quad(uint16_t *idx, hh_s_rendering* in); diff --git a/src/engine/level_const.c b/src/engine/level_const.c index 2522814..4cd9a1b 100644 --- a/src/engine/level_const.c +++ b/src/engine/level_const.c @@ -4,7 +4,7 @@ hh_g_all_levels hh_init_game_levels(){ hh_g_all_levels levels; - levels.current_level=1; + levels.current_level=0; levels.shop.size.x=40; levels.shop.size.y=15; @@ -18,9 +18,9 @@ hh_g_all_levels hh_init_game_levels(){ levels.level[1].size.y=28; levels.level[1].hh_level_completed=false; - FILE *fp = fopen("static/shop_new.bin", "rb"); + FILE *fp = fopen("../test/bin/level1_test.bin", "rb"); if (fp == NULL) { - printf("shop_new.bin not found!\n"); + printf("level1_test.bin not found!\n"); return levels; } fseek(fp, 0, SEEK_END); diff --git a/src/engine/sprite_controller.h b/src/engine/sprite_controller.h index 3693850..93a2aaf 100644 --- a/src/engine/sprite_controller.h +++ b/src/engine/sprite_controller.h @@ -17,11 +17,15 @@ #define HH_PAL_IDX_SKY 0 #define HH_PAL_IDX_BRICK 1 #define HH_PAL_IDX_SLIME 2 +#define HH_PAL_IDX_HUD 2 +#define HH_PAL_IDX_BULLET 3 +#define HH_PAL_IDX_GOZER 3 +#define HH_PAL_IDX_TITLE_SCREEN_ICON 3 #define HH_PAL_IDX_CRATE 4 #define HH_PAL_IDX_SHOP 5 -#define HH_PAL_IDX_TITLE_SCREEN_ICON 3 #define HH_PAL_IDX_FONT 6 #define HH_PAL_IDX_DEV 7 + const static uint8_t hh_g_sprite_palette[HH_TM_GROUPS] = { HH_PAL_IDX_SKY, HH_PAL_IDX_BRICK, @@ -29,12 +33,15 @@ const static uint8_t hh_g_sprite_palette[HH_TM_GROUPS] = { HH_PAL_IDX_SHOP, // HH_PAL_IDX_SHOP, HH_PAL_IDX_TITLE_SCREEN_ICON, - HH_PAL_IDX_FONT, - HH_PAL_IDX_SKY, - HH_PAL_IDX_DEV, + HH_PAL_IDX_TITLE_SCREEN_ICON, + HH_PAL_IDX_HUD, + HH_PAL_IDX_HUD, + HH_PAL_IDX_BULLET, + HH_PAL_IDX_GOZER, HH_PAL_IDX_SLIME, - HH_PAL_IDX_DEV - // HH_PAL_IDX_FONT + HH_PAL_IDX_SLIME, + HH_PAL_IDX_DEV, + HH_PAL_IDX_FONT }; @@ -62,11 +69,11 @@ const static hh_ppu_loc_palette_table_t hh_g_palette = { {0x1,0x2,0x3}, {0x1,0x3,0x2}, {0x4,0x8,0x3}, - {0x7,0xa,0x4}, - {0x0,0x0,0x0}, - {0x0,0x0,0x0}, - {0x0,0x0,0x0}, - {0x0,0x0,0x0}}, + {0x7,0xa,0x4},//hp HUD + {0xa,0xc,0x5}, + {0xa,0x3,0x3}, + {0x0,0x0,0x1}, + {0xe,0xe,0xe}}, {//player //TODO: use one less color && update player indexed sprites {0x0,0x0,0x0}, {0x1,0x1,0x1}, diff --git a/src/engine/types.h b/src/engine/types.h index 8040e46..5fc80fa 100644 --- a/src/engine/types.h +++ b/src/engine/types.h @@ -26,7 +26,6 @@ typedef struct { hh_s_ppu_loc_fam_entry fam; //screen uint16_t frame0; uint16_t palette; - uint16_t ppu_foreground_index; }hh_s_rendering; diff --git a/src/game_loop/gameplay.c b/src/game_loop/gameplay.c index 384ce40..3d750f4 100644 --- a/src/game_loop/gameplay.c +++ b/src/game_loop/gameplay.c @@ -1,6 +1,7 @@ #include "gameplay.h" #include "engine/entity.h" #include "static/tilemap.h" +#include "game_loop/ui.h" // player struct @@ -135,4 +136,6 @@ void hh_render_all_entities(hh_entity* player, hh_entity* bullets, hh_entity* en for (int i = 0; i < enemy_size; i++) { hh_update_sprite(&index,&enemies[i],cam_pos); } + + hh_ui_show_hp(&index, player, 7, cam_pos); } diff --git a/src/game_loop/shop.c b/src/game_loop/shop.c index da27524..60fc70b 100644 --- a/src/game_loop/shop.c +++ b/src/game_loop/shop.c @@ -2,6 +2,8 @@ #include "engine/maths.h" #include "ppu/ppu.h" +#include "game_loop/ui.h" + 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}; @@ -19,6 +21,9 @@ void hh_shop(hh_e_game_state* hh_game_state, hh_level_entity* level_shop){ hh_shop_init(&upgrades); selected = HH_SHOP_UPG_DISPLAY/2; hh_shop_display(selected, &upgrades); + int idx = 16; + hh_ui_show_char(&idx,"aBYz09",(vec2){32,32}); + hh_e_shop = hh_e_shop_main; break; case hh_e_shop_main: @@ -65,7 +70,7 @@ void hh_shop_display(uint8_t selected, hh_e_upgrades* upgrades) { space = 24+8; for (int i = 0; i < HH_SHOP_UPG_DISPLAY; i++) { - hh_ppu_update_foreground(i+16, + hh_ppu_update_foreground(i, (hh_s_ppu_loc_fam_entry){ .horizontal_flip = false, .vertical_flip = false, .position_x = i*space+start.x, .position_y = start.y + (i==selected?-up:0), diff --git a/src/game_loop/ui.c b/src/game_loop/ui.c new file mode 100644 index 0000000..3354d43 --- /dev/null +++ b/src/game_loop/ui.c @@ -0,0 +1,47 @@ +#include "game_loop/ui.h" + +void hh_ui_show_hp(int* idx, hh_entity* player, uint8_t max_hp, vec_cor cam_pos) { + for (int i = 0; i < max_hp; i++) { + int tilemap_idx = HH_TM_HUD_HEART_OFFSET + (player->hp > i?0:1), + palette_idx = HH_PAL_IDX_HUD; + hh_show_quad(idx, &(hh_s_rendering){ + .frame0 = tilemap_idx, + .palette = palette_idx, + .fam = (hh_s_ppu_loc_fam_entry){ + .horizontal_flip = false, .vertical_flip = false, + .palette_index = palette_idx, + .tilemap_index = tilemap_idx, + .position_x = 8 + i*15, .position_y = 8 + } + }); + } +} + +void hh_ui_show_char(int* idx, char* str, vec2 pos) { + int i = 0; + int tilemap_idx, + palette_idx = 6; + while (str[i] != '\0') { + if(str[i] >= 'A' && str[i] <= 'Z'){ + tilemap_idx = HH_TM_FONT_OFFSET + str[i]-'A'+10; + } else if (str[i] >= 'a' && str[i] <= 'z') { + tilemap_idx = HH_TM_FONT_OFFSET + str[i]-'a'+10; + } else if (str[i] >= '0' && str[i] <= '9'){ + tilemap_idx = HH_TM_FONT_OFFSET + str[i]-48; + } else { + return; + } + hh_show_quad(idx, &(hh_s_rendering){ + .frame0 = tilemap_idx, + .palette = palette_idx, + .fam = (hh_s_ppu_loc_fam_entry){ + .horizontal_flip = false, .vertical_flip = false, + .palette_index = palette_idx, + .tilemap_index = tilemap_idx, + .position_x = 8 + i*15, .position_y = 8 + } + }); + i++; + } + +} diff --git a/src/game_loop/ui.h b/src/game_loop/ui.h new file mode 100644 index 0000000..7a8ffbd --- /dev/null +++ b/src/game_loop/ui.h @@ -0,0 +1,19 @@ +#pragma once + +#include "static/tilemap.h" +#include "engine/player_controller.h" + +#include "ppu/types.h" + +#include "engine/types.h" +#include "engine/entity.h" +#include "engine/animator.h" +#include "engine/player_controller.h" + + +// extern hh_g_max_hp; + +void hh_ui_show_hp(int* idx, hh_entity* player, uint8_t max_hp, vec_cor cam_pos); + +void hh_ui_show_char(int* idx, char* str, vec2 pos); + diff --git a/src/makefile b/src/makefile index ada73b1..0f5f917 100644 --- a/src/makefile +++ b/src/makefile @@ -47,7 +47,8 @@ LOCAL_SRCS += main.c \ game_loop/shop.c \ game_loop/gameplay.c \ game_loop/game_over.c \ - game_loop/starting_screen.c + game_loop/starting_screen.c \ + game_loop/ui.c CFLAGS += $(SHARED_FLAGS) LFLAGS += $(SHARED_FLAGS) diff --git a/src/static/.gitignore b/src/static/.gitignore index 746c28c..e960c6e 100644 --- a/src/static/.gitignore +++ b/src/static/.gitignore @@ -4,7 +4,6 @@ manifest.txt tilemap.h tiled/* tiled.mk -*.tsx *.csv *.out *.tiled-session diff --git a/src/static/dynamic.tsx b/src/static/dynamic.tsx new file mode 100644 index 0000000..742083f --- /dev/null +++ b/src/static/dynamic.tsx @@ -0,0 +1,328 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/static/foreground/boss1.hex b/src/static/foreground/boss1.hex new file mode 100644 index 0000000..cb430e3 --- /dev/null +++ b/src/static/foreground/boss1.hex @@ -0,0 +1,100 @@ +;indices: 2 +;17 20 38 +;09 0a 14 + +000000: 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 00 +000010: 01 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 01 01 +000090: 00 00 00 00 00 00 00 00 00 00 00 00 01 01 01 01 +0000a0: 00 00 00 00 00 00 00 00 00 00 01 01 01 01 01 01 +0000b0: 00 00 00 00 00 00 00 00 01 01 01 01 01 01 01 01 +0000c0: 00 00 00 00 00 00 01 01 01 01 01 01 01 01 01 01 +0000d0: 00 00 00 00 00 00 01 01 01 01 01 01 01 01 01 01 +0000e0: 00 00 00 00 00 00 01 01 01 01 01 01 01 01 01 01 +0000f0: 00 00 00 00 00 00 00 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 01 01 01 01 +000160: 00 00 00 00 00 00 00 00 00 00 01 01 01 01 01 01 +000170: 00 00 00 00 00 00 00 00 01 01 01 01 01 01 01 01 +000180: 00 00 00 00 00 00 01 01 01 01 01 01 01 01 01 01 +000190: 00 00 00 00 01 01 01 01 01 01 01 01 01 01 01 01 +0001a0: 00 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0001b0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0001c0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +0001d0: 01 01 01 01 01 01 01 01 01 01 01 01 00 01 01 01 +0001e0: 01 01 01 01 01 01 01 01 01 01 01 00 00 01 01 01 +0001f0: 01 01 01 01 01 01 01 01 01 01 00 00 00 00 00 00 +000200: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 01 +000210: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 +000220: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000230: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000240: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000250: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000260: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000270: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000280: 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 00 +000290: 01 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 +0002a0: 01 01 01 01 01 01 00 00 00 00 00 00 00 00 00 00 +0002b0: 01 01 01 01 01 01 01 00 00 00 00 00 00 00 00 00 +0002c0: 01 01 01 01 01 01 01 01 00 00 00 00 00 00 00 00 +0002d0: 01 01 01 01 01 01 01 01 01 00 00 00 00 00 00 00 +0002e0: 01 01 01 01 01 01 01 01 01 01 00 00 00 00 00 00 +0002f0: 01 01 01 01 01 01 01 01 01 01 01 00 00 00 00 00 +000300: 00 00 00 00 00 00 00 00 01 01 01 01 01 01 01 01 +000310: 00 00 00 00 00 00 00 00 01 01 01 01 01 01 01 01 +000320: 00 00 01 01 01 01 01 00 00 01 01 01 01 01 01 01 +000330: 00 00 01 01 00 01 01 01 01 01 01 01 01 01 01 01 +000340: 00 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000350: 00 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000360: 00 00 00 00 01 01 01 01 01 01 01 01 01 01 01 01 +000370: 00 00 00 00 00 00 00 00 00 01 01 01 01 01 01 01 +000380: 00 00 00 00 00 00 00 00 00 00 01 01 01 01 01 01 +000390: 00 00 00 00 00 00 00 00 00 00 00 00 00 01 01 01 +0003a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 01 01 01 +0003b0: 00 00 00 00 00 00 00 00 00 00 00 00 01 01 01 01 +0003c0: 00 00 00 00 00 00 00 00 00 00 00 01 01 01 01 01 +0003d0: 00 00 00 00 00 00 00 00 00 00 00 01 01 01 01 01 +0003e0: 01 00 00 00 00 00 00 00 00 00 00 01 01 01 01 01 +0003f0: 01 01 00 00 00 00 00 00 00 00 00 00 01 01 01 00 +000400: 01 01 00 00 00 00 00 00 00 00 00 01 01 01 01 01 +000410: 01 01 01 00 00 01 01 01 01 01 01 01 01 01 01 01 +000420: 01 01 01 01 00 01 01 01 01 01 01 01 01 01 01 01 +000430: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000440: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000450: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000460: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000470: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000480: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 +000490: 01 01 00 00 00 00 00 00 00 00 00 00 00 00 01 01 +0004a0: 01 01 00 00 00 00 00 00 00 00 00 00 00 00 01 01 +0004b0: 01 00 00 00 00 00 00 00 00 00 00 00 00 01 01 01 +0004c0: 01 00 00 00 00 00 00 00 00 00 00 00 01 01 01 01 +0004d0: 01 00 00 00 00 00 00 00 00 00 00 00 01 01 01 01 +0004e0: 00 00 00 00 00 00 00 00 00 00 00 00 01 01 01 01 +0004f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 01 01 01 +000500: 01 01 01 01 01 01 01 01 01 01 01 01 00 00 00 00 +000510: 01 01 01 01 01 01 01 01 01 01 01 01 01 00 00 00 +000520: 01 01 01 01 01 01 01 01 01 01 01 01 01 00 00 00 +000530: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 00 00 +000540: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 00 +000550: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 00 +000560: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 00 +000570: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 00 00 +000580: 01 01 01 01 01 01 01 01 01 01 01 01 00 00 00 00 +000590: 01 01 01 01 01 01 01 01 01 01 01 00 00 00 00 00 +0005a0: 01 01 01 01 01 01 00 00 00 00 00 00 00 00 00 00 +0005b0: 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 +0005c0: 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 +0005d0: 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 +0005e0: 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 01 +0005f0: 01 01 01 00 00 00 00 00 00 00 00 00 00 00 01 01 \ No newline at end of file diff --git a/src/static/foreground/font.hex b/src/static/foreground/font.hex index 890554b..4f27ecf 100644 --- a/src/static/foreground/font.hex +++ b/src/static/foreground/font.hex @@ -3,165 +3,165 @@ ;40 27 51 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 01 01 00 00 00 00 00 00 00 -000030: 00 00 00 00 00 01 01 01 01 00 00 00 00 00 00 00 -000040: 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 00 -000050: 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 00 -000060: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 -000070: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 -000080: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 -000090: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 -0000a0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 -0000b0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 -0000c0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +000010: 00 00 00 00 00 00 01 01 01 01 00 00 00 00 00 00 +000020: 00 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 +000030: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +000040: 00 00 00 00 01 01 01 00 01 01 01 01 00 00 00 00 +000050: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +000060: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +000070: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +000080: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +000090: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +0000a0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +0000b0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +0000c0: 00 00 00 00 01 01 01 00 01 01 01 00 00 00 00 00 0000d0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -0000e0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -0000f0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +0000e0: 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 00 +0000f0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 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 01 01 01 01 00 00 00 00 00 00 -000130: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -000140: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -000150: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -000160: 00 00 00 01 01 00 00 00 00 01 01 01 00 00 00 00 -000170: 00 00 00 00 00 00 00 00 01 01 01 01 00 00 00 00 -000180: 00 00 00 00 00 00 00 01 01 01 01 00 00 00 00 00 -000190: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 -0001a0: 00 00 00 00 01 01 01 01 00 00 00 00 00 00 00 00 -0001b0: 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 00 -0001c0: 00 00 00 01 01 01 00 00 00 00 00 00 00 00 00 00 -0001d0: 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 00 -0001e0: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -0001f0: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000120: 00 00 00 00 00 00 00 01 01 00 00 00 00 00 00 00 +000130: 00 00 00 00 00 01 01 01 01 00 00 00 00 00 00 00 +000140: 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 00 +000150: 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 00 +000160: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +000170: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +000180: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +000190: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +0001a0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +0001b0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +0001c0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +0001d0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +0001e0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +0001f0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 000200: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000210: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 -000220: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -000230: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -000240: 00 00 00 01 01 00 00 00 00 01 01 01 00 00 00 00 -000250: 00 00 00 00 00 00 00 00 01 01 01 01 00 00 00 00 -000260: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 -000270: 00 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 -000280: 00 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 -000290: 00 00 00 00 00 00 00 00 01 01 01 01 00 00 00 00 -0002a0: 00 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 -0002b0: 00 00 00 01 01 00 00 00 00 01 01 01 00 00 00 00 -0002c0: 00 00 00 01 01 01 00 00 01 01 01 01 00 00 00 00 -0002d0: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -0002e0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -0002f0: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 +000210: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000220: 00 00 00 00 00 00 01 01 01 01 00 00 00 00 00 00 +000230: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +000240: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000250: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +000260: 00 00 00 01 01 00 00 00 00 01 01 01 00 00 00 00 +000270: 00 00 00 00 00 00 00 00 01 01 01 01 00 00 00 00 +000280: 00 00 00 00 00 00 00 01 01 01 01 00 00 00 00 00 +000290: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 +0002a0: 00 00 00 00 01 01 01 01 00 00 00 00 00 00 00 00 +0002b0: 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 00 +0002c0: 00 00 00 01 01 01 00 00 00 00 00 00 00 00 00 00 +0002d0: 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 00 +0002e0: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +0002f0: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 000300: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000310: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 -000320: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 -000330: 00 00 00 00 00 00 00 01 01 01 01 00 00 00 00 00 -000340: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 -000350: 00 00 00 00 00 01 01 00 01 01 01 00 00 00 00 00 -000360: 00 00 00 00 01 01 00 00 01 01 01 00 00 00 00 00 -000370: 00 00 00 00 01 00 00 00 01 01 01 00 00 00 00 00 -000380: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -000390: 00 00 01 01 01 01 01 01 01 01 01 01 01 00 00 00 -0003a0: 00 00 01 01 01 01 01 01 01 01 01 01 00 00 00 00 -0003b0: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 -0003c0: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 -0003d0: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 -0003e0: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 -0003f0: 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 +000310: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 +000320: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +000330: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000340: 00 00 00 01 01 00 00 00 00 01 01 01 00 00 00 00 +000350: 00 00 00 00 00 00 00 00 01 01 01 01 00 00 00 00 +000360: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 +000370: 00 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 +000380: 00 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 +000390: 00 00 00 00 00 00 00 00 01 01 01 01 00 00 00 00 +0003a0: 00 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 +0003b0: 00 00 00 01 01 00 00 00 00 01 01 01 00 00 00 00 +0003c0: 00 00 00 01 01 01 00 00 01 01 01 01 00 00 00 00 +0003d0: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +0003e0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +0003f0: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 000400: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000410: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -000420: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -000430: 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 00 -000440: 00 00 00 01 01 01 00 00 00 00 00 00 00 00 00 00 -000450: 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 00 -000460: 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 00 -000470: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -000480: 00 00 00 01 01 01 01 00 00 01 01 01 00 00 00 00 -000490: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -0004a0: 00 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 -0004b0: 00 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 -0004c0: 00 00 00 01 01 00 00 00 01 01 01 01 00 00 00 00 -0004d0: 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 00 -0004e0: 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 00 -0004f0: 00 00 00 00 00 01 01 01 01 00 00 00 00 00 00 00 +000410: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 +000420: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 +000430: 00 00 00 00 00 00 00 01 01 01 01 00 00 00 00 00 +000440: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 +000450: 00 00 00 00 00 01 01 00 01 01 01 00 00 00 00 00 +000460: 00 00 00 00 01 01 00 00 01 01 01 00 00 00 00 00 +000470: 00 00 00 00 01 00 00 00 01 01 01 00 00 00 00 00 +000480: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000490: 00 00 01 01 01 01 01 01 01 01 01 01 01 00 00 00 +0004a0: 00 00 01 01 01 01 01 01 01 01 01 01 00 00 00 00 +0004b0: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 +0004c0: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 +0004d0: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 +0004e0: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 +0004f0: 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 000500: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000510: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 -000520: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 -000530: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 -000540: 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 -000550: 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 00 -000560: 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 00 -000570: 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 00 -000580: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000510: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000520: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000530: 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 00 +000540: 00 00 00 01 01 01 00 00 00 00 00 00 00 00 00 00 +000550: 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 00 +000560: 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 00 +000570: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000580: 00 00 00 01 01 01 01 00 00 01 01 01 00 00 00 00 000590: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -0005a0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -0005b0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -0005c0: 00 00 00 01 01 01 00 00 01 01 01 01 00 00 00 00 -0005d0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -0005e0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -0005f0: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 +0005a0: 00 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 +0005b0: 00 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 +0005c0: 00 00 00 01 01 00 00 00 01 01 01 01 00 00 00 00 +0005d0: 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 00 +0005e0: 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 00 +0005f0: 00 00 00 00 00 01 01 01 01 00 00 00 00 00 00 00 000600: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000610: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000620: 00 00 00 01 01 01 01 01 01 01 01 01 01 00 00 00 -000630: 00 00 00 01 01 01 01 01 01 01 01 01 01 00 00 00 -000640: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -000650: 00 00 00 00 00 00 00 00 00 00 01 01 00 00 00 00 -000660: 00 00 00 00 00 00 00 00 00 01 01 00 00 00 00 00 -000670: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 -000680: 00 00 00 00 00 00 00 00 01 01 00 00 00 00 00 00 -000690: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 -0006a0: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 -0006b0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 -0006c0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 -0006d0: 00 00 00 00 00 01 01 01 01 00 00 00 00 00 00 00 -0006e0: 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 -0006f0: 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 +000610: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 +000620: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 +000630: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +000640: 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 +000650: 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 00 +000660: 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 00 +000670: 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 00 +000680: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000690: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +0006a0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +0006b0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +0006c0: 00 00 00 01 01 01 00 00 01 01 01 01 00 00 00 00 +0006d0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +0006e0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +0006f0: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 000700: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000710: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 -000720: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -000730: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -000740: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -000750: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -000760: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -000770: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -000780: 00 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 -000790: 00 00 00 01 01 01 01 00 01 01 01 01 00 00 00 00 -0007a0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -0007b0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -0007c0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -0007d0: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -0007e0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -0007f0: 00 00 00 00 00 01 01 01 01 01 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 01 01 01 01 01 01 01 01 01 01 00 00 00 +000730: 00 00 00 01 01 01 01 01 01 01 01 01 01 00 00 00 +000740: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000750: 00 00 00 00 00 00 00 00 00 00 01 01 00 00 00 00 +000760: 00 00 00 00 00 00 00 00 00 01 01 00 00 00 00 00 +000770: 00 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 +000780: 00 00 00 00 00 00 00 00 01 01 00 00 00 00 00 00 +000790: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 +0007a0: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 +0007b0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +0007c0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +0007d0: 00 00 00 00 00 01 01 01 01 00 00 00 00 00 00 00 +0007e0: 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 +0007f0: 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 000800: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000810: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000820: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 -000830: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -000840: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -000850: 00 00 00 01 01 01 00 00 01 01 01 01 00 00 00 00 -000860: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -000870: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -000880: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -000890: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 -0008a0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -0008b0: 00 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 -0008c0: 00 00 00 00 00 00 00 00 01 01 00 00 00 00 00 00 -0008d0: 00 00 00 00 00 00 01 01 01 01 00 00 00 00 00 00 -0008e0: 00 00 00 00 01 01 01 01 00 00 00 00 00 00 00 00 -0008f0: 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 00 +000810: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 +000820: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +000830: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000840: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +000850: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +000860: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +000870: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +000880: 00 00 00 00 01 01 01 01 01 01 01 01 00 00 00 00 +000890: 00 00 00 01 01 01 01 00 01 01 01 01 00 00 00 00 +0008a0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +0008b0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +0008c0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +0008d0: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +0008e0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +0008f0: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 000900: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -000910: 00 00 00 00 00 00 01 01 01 01 00 00 00 00 00 00 -000920: 00 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 +000910: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000920: 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 00 000930: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -000940: 00 00 00 00 01 01 01 00 01 01 01 01 00 00 00 00 -000950: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 +000940: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +000950: 00 00 00 01 01 01 00 00 01 01 01 01 00 00 00 00 000960: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 000970: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 000980: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -000990: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -0009a0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -0009b0: 00 00 00 01 01 01 00 00 00 01 01 01 00 00 00 00 -0009c0: 00 00 00 00 01 01 01 00 01 01 01 00 00 00 00 00 -0009d0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 -0009e0: 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 00 -0009f0: 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 00 +000990: 00 00 00 01 01 01 01 01 01 01 01 01 00 00 00 00 +0009a0: 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 00 +0009b0: 00 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 +0009c0: 00 00 00 00 00 00 00 00 01 01 00 00 00 00 00 00 +0009d0: 00 00 00 00 00 00 01 01 01 01 00 00 00 00 00 00 +0009e0: 00 00 00 00 01 01 01 01 00 00 00 00 00 00 00 00 +0009f0: 00 00 00 00 01 01 01 00 00 00 00 00 00 00 00 00 000a00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 000a10: 00 00 00 00 00 00 00 00 01 01 00 00 00 00 00 00 000a20: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 diff --git a/src/static/foreground/hud_heart.hex b/src/static/foreground/hud_heart.hex new file mode 100644 index 0000000..26cc730 --- /dev/null +++ b/src/static/foreground/hud_heart.hex @@ -0,0 +1,42 @@ +;indices: 8 +;19 33 2d +;00 00 00 +;00 00 00 +;00 00 00 +;00 00 00 +;a5 30 30 +;09 0a 14 +;eb ed e9 + +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 07 07 07 06 00 00 00 00 07 07 07 06 00 00 +000030: 00 07 05 05 05 07 07 06 07 07 05 05 05 07 06 00 +000040: 00 07 05 05 05 05 05 07 05 05 05 05 05 07 06 00 +000050: 00 07 05 05 07 07 05 05 05 05 05 05 05 07 06 00 +000060: 00 00 07 05 07 05 05 05 05 05 05 05 07 06 00 00 +000070: 00 00 07 05 05 05 05 05 05 05 05 05 07 06 00 00 +000080: 00 00 00 07 05 05 05 05 05 05 05 07 06 00 00 00 +000090: 00 00 00 07 05 05 05 05 05 05 05 07 06 00 00 00 +0000a0: 00 00 00 00 07 05 05 05 05 05 07 06 00 00 00 00 +0000b0: 00 00 00 00 00 07 05 05 05 07 06 00 00 00 00 00 +0000c0: 00 00 00 00 00 00 07 05 07 06 00 00 00 00 00 00 +0000d0: 00 00 00 00 00 00 00 07 06 00 00 00 00 00 00 00 +0000e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +0000f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +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 07 07 07 06 00 00 00 00 07 07 07 06 00 00 +000130: 00 07 06 00 00 07 07 06 07 07 06 00 00 07 06 00 +000140: 00 07 06 00 00 00 00 07 06 00 00 00 00 07 06 00 +000150: 00 07 06 00 07 07 06 00 00 00 00 00 00 07 06 00 +000160: 00 00 07 06 07 06 00 00 00 00 00 00 07 06 00 00 +000170: 00 00 07 06 00 00 00 00 00 00 00 00 07 06 00 00 +000180: 00 00 00 07 06 00 00 00 00 00 00 07 06 00 00 00 +000190: 00 00 00 07 06 00 00 00 00 00 00 07 06 00 00 00 +0001a0: 00 00 00 00 07 06 00 00 00 00 07 06 00 00 00 00 +0001b0: 00 00 00 00 00 07 06 00 00 07 06 00 00 00 00 00 +0001c0: 00 00 00 00 00 00 07 06 07 06 00 00 00 00 00 00 +0001d0: 00 00 00 00 00 00 00 07 06 00 00 00 00 00 00 00 +0001e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +0001f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \ No newline at end of file diff --git a/src/static/foreground/upgrades.hex b/src/static/foreground/upgrades.hex new file mode 100644 index 0000000..261d40d --- /dev/null +++ b/src/static/foreground/upgrades.hex @@ -0,0 +1,90 @@ +;indices: 8 +;19 33 2d +;00 00 00 +;00 00 00 +;00 00 00 +;a0 c0 50 +;a5 30 30 +;09 0a 14 +;eb ed e9 + +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 06 06 07 06 07 07 07 06 00 00 00 00 00 00 +000050: 00 00 06 06 07 07 06 00 00 07 07 06 00 00 00 00 +000060: 00 00 07 07 06 00 00 00 00 00 00 07 06 00 00 00 +000070: 00 00 00 07 06 00 07 00 00 00 00 07 06 00 00 00 +000080: 00 00 07 06 00 07 00 00 00 00 00 00 07 06 00 00 +000090: 00 00 07 05 05 07 05 05 05 05 05 05 07 06 00 00 +0000a0: 00 00 07 05 05 05 05 05 05 05 05 05 07 06 00 00 +0000b0: 00 00 07 05 05 05 05 05 05 05 05 05 07 06 00 00 +0000c0: 00 00 00 07 05 05 05 05 05 05 05 07 06 00 00 00 +0000d0: 00 00 00 07 05 05 05 05 05 05 05 07 06 00 00 00 +0000e0: 00 00 00 00 07 07 05 05 05 07 07 06 00 00 00 00 +0000f0: 00 00 00 00 00 00 07 07 07 06 00 00 00 00 00 00 +000100: 00 00 00 00 00 00 00 00 00 00 00 00 00 07 06 00 +000110: 00 00 00 00 00 00 00 00 00 00 00 00 07 07 07 06 +000120: 00 00 00 00 00 00 00 00 00 00 00 00 00 07 06 00 +000130: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000140: 00 00 07 07 07 06 00 00 00 00 07 07 07 06 00 00 +000150: 00 07 05 05 05 07 07 06 07 07 05 05 05 07 06 00 +000160: 00 07 05 05 05 05 05 07 05 05 05 05 05 07 06 00 +000170: 00 07 05 05 07 07 05 05 05 05 05 05 05 07 06 00 +000180: 00 00 07 05 07 05 05 05 05 05 05 05 07 06 00 00 +000190: 00 00 07 05 05 05 05 05 05 05 05 05 07 06 00 00 +0001a0: 00 00 00 07 05 05 05 05 05 05 05 07 06 00 00 00 +0001b0: 00 00 00 07 05 05 05 05 05 05 05 07 06 00 00 00 +0001c0: 00 00 00 00 07 05 05 05 05 05 07 06 00 00 00 00 +0001d0: 00 00 00 00 00 07 05 05 05 07 06 00 00 00 00 00 +0001e0: 00 00 00 00 00 00 07 05 07 06 00 00 00 00 00 00 +0001f0: 00 00 00 00 00 00 00 07 06 00 00 00 00 00 00 00 +000200: 00 00 00 00 00 00 00 00 00 00 00 00 00 07 06 00 +000210: 00 00 00 00 00 00 00 00 00 00 00 00 07 07 07 06 +000220: 00 00 00 00 00 00 00 07 06 00 00 00 00 07 06 00 +000230: 00 00 00 00 00 00 07 04 07 06 00 00 00 00 00 00 +000240: 00 00 00 00 00 07 04 04 04 07 06 00 00 00 00 00 +000250: 00 00 00 00 07 04 04 04 04 04 07 06 00 00 00 00 +000260: 00 00 00 00 00 00 07 04 07 06 00 00 00 00 00 00 +000270: 00 00 00 00 00 00 07 04 07 06 00 00 00 00 00 00 +000280: 00 00 00 00 00 00 07 06 07 06 00 00 00 00 00 00 +000290: 00 00 00 00 00 00 06 07 06 06 00 00 00 00 00 00 +0002a0: 00 00 00 00 00 00 07 04 07 06 00 00 00 00 00 00 +0002b0: 00 00 00 00 00 07 04 04 04 07 06 00 00 00 00 00 +0002c0: 00 00 00 00 07 04 04 04 04 04 07 06 00 00 00 00 +0002d0: 00 00 00 00 00 00 07 04 07 06 00 00 00 00 00 00 +0002e0: 00 00 00 00 00 00 07 04 07 06 00 00 00 00 00 00 +0002f0: 00 00 00 00 00 00 07 04 07 06 00 00 00 00 00 00 +000300: 00 00 00 00 00 00 00 00 00 00 00 00 00 07 06 00 +000310: 00 00 00 00 00 00 00 00 00 00 00 00 07 07 07 06 +000320: 00 00 00 00 00 00 00 00 00 00 00 00 00 07 06 00 +000330: 00 00 07 06 00 00 00 00 00 00 00 00 00 00 00 00 +000340: 00 00 07 07 06 00 00 00 00 00 00 00 00 00 00 00 +000350: 00 00 00 07 07 06 00 00 00 00 00 00 00 00 00 00 +000360: 00 00 00 00 07 07 06 00 00 00 00 00 00 00 00 00 +000370: 00 00 00 00 00 07 07 06 00 00 00 00 07 06 00 00 +000380: 00 00 00 00 00 00 07 07 06 00 00 07 07 06 00 00 +000390: 00 00 00 00 00 00 00 07 07 06 07 07 06 00 00 00 +0003a0: 00 00 00 00 00 00 00 00 07 07 07 06 00 00 00 00 +0003b0: 00 00 00 00 00 00 00 00 07 07 07 07 06 00 00 00 +0003c0: 00 00 00 00 00 00 00 07 07 06 07 07 07 06 00 00 +0003d0: 00 00 00 00 00 00 07 07 06 00 07 07 07 07 06 00 +0003e0: 00 00 00 00 00 00 00 00 00 00 00 07 07 07 07 00 +0003f0: 00 00 00 00 00 00 00 00 00 00 00 00 07 07 07 00 +000400: 00 00 00 00 00 00 00 00 00 00 00 00 00 07 06 00 +000410: 00 00 00 00 00 00 00 00 00 00 00 00 07 07 07 06 +000420: 00 00 00 00 00 00 00 00 00 00 00 00 00 07 06 00 +000430: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000440: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000450: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +000460: 00 07 00 00 00 00 00 00 00 00 00 00 00 07 06 00 +000470: 00 07 06 07 07 07 07 07 07 07 07 07 06 07 06 00 +000480: 00 07 06 06 06 06 06 06 06 06 06 06 06 07 06 00 +000490: 00 07 06 07 07 07 07 07 07 07 07 07 06 07 06 00 +0004a0: 00 07 06 06 06 06 06 06 06 06 06 06 06 07 06 00 +0004b0: 00 07 06 07 07 07 07 07 07 07 07 07 06 07 06 00 +0004c0: 00 07 06 06 06 06 06 06 06 06 06 06 06 07 06 00 +0004d0: 00 07 06 07 07 07 07 07 07 07 07 07 06 07 06 00 +0004e0: 00 07 06 06 06 06 06 06 06 06 06 06 06 07 06 00 +0004f0: 00 00 07 07 07 07 07 07 07 07 07 07 07 06 00 00 \ No newline at end of file diff --git a/src/static/makefile b/src/static/makefile index ba9b304..4959f2f 100644 --- a/src/static/makefile +++ b/src/static/makefile @@ -10,9 +10,13 @@ INPUT += background/air.hex \ background/shop_stall.hex \ background/title_screen_icon.hex \ foreground/title_screen_letteres_large.hex\ + foreground/hud_heart.hex \ + foreground/upgrades.hex \ foreground/bullet.hex \ foreground/gozer.hex \ foreground/slime.hex \ + foreground/slime_jumpable.hex \ + foreground/boss1.hex \ foreground/font.hex # world.hex USER_META += world.h -- cgit v1.2.3