Skip to content

Free games for graphing calculators: NumWorks, TI-Nspire CX, Casio fx-CG50 and soon TI-84 Plus CE. Balatro, Celeste, Hollow Knight, Minecraft and more.

Doom: closer to vanilla's picture: spans, seg angles, row offsets, visplane splits, lossless graphics, no black stripes

Mason363d9ab8a8a7b17
diff --git a/games/doom/Makefile b/games/doom/Makefile
index f6e46907..bd03c04c 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -122,7 +122,7 @@ $(WHD_GEN): $(WHD_GEN_OBJ)
$(Q) c++ $^ -o $@
data: $(WHD_GEN)
@test -n "$(WAD)" || { echo "make data WAD=<the shareware DOOM1.WAD> (python3 tools/fetch.py downloads it)"; exit 1; }
- $(WHD_GEN) -silent $(WAD) src/doom1.whx
+ $(WHD_GEN) -silent -lossless $(WAD) src/doom1.whx
clean:
$(Q) rm -rf $(BUILD_DIR) build
diff --git a/games/doom/src/doom/r_bsp.c b/games/doom/src/doom/r_bsp.c
index 56f9ff99..16a3e0d1 100644
--- a/games/doom/src/doom/r_bsp.c
+++ b/games/doom/src/doom/r_bsp.c
@@ -228,10 +228,20 @@ R_ClipPassWallSegment
//
// R_ClearClipSegs
//
+#if NUMWORKS
+// the columns of the view drawn this time (all of them, unless a frame has more pieces than there is room for
+// and is drawn in strips: pd_render.cpp)
+extern int nw_strip_x0, nw_strip_x1;
+#endif
void R_ClearClipSegs(void) {
solidsegs[0].first = -0x7fff;
+#if NUMWORKS
+ solidsegs[0].last = nw_strip_x0 - 1;
+ solidsegs[1].first = nw_strip_x1 < viewwidth ? nw_strip_x1 : viewwidth;
+#else
solidsegs[0].last = -1;
solidsegs[1].first = viewwidth;
+#endif
solidsegs[1].last = 0x7fff;
newend = solidsegs + 2;
}
diff --git a/games/doom/src/doom/r_plane.c b/games/doom/src/doom/r_plane.c
index d91a3096..64352e8f 100644
--- a/games/doom/src/doom/r_plane.c
+++ b/games/doom/src/doom/r_plane.c
@@ -350,6 +350,9 @@ R_FindPlane
check->height = height;
check->picnum = picnum;
check->lightlevel = lightlevel;
+#if NUMWORKS
+ nw_plane_new(check - visplanes, SCREENWIDTH, -1);
+#endif
#if !NO_VISPLANE_GUTS
check->minx = SCREENWIDTH;
check->maxx = -1;
@@ -360,6 +363,56 @@ R_FindPlane
return check;
}
+#if NUMWORKS
+// vanilla's visplanes split as in R_CheckPlane, without their top and bottom arrays: the columns each one
+// has (set as the walls mark them, r_segs.c), and how far it goes
+uint8_t nw_plane_used[MAXVISPLANES][SCREENWIDTH / 8];
+int16_t nw_plane_minx[MAXVISPLANES], nw_plane_maxx[MAXVISPLANES];
+
+void nw_plane_new(int pl, int minx, int maxx) {
+ nw_plane_minx[pl] = minx;
+ nw_plane_maxx[pl] = maxx;
+ memset(nw_plane_used[pl], 0, sizeof nw_plane_used[pl]);
+}
+
+visplane_t *R_CheckPlane(visplane_t *pl, int start, int stop) {
+ int intrl, intrh, unionl, unionh, x;
+ int n = pl - visplanes;
+
+ if (start < nw_plane_minx[n]) {
+ intrl = nw_plane_minx[n];
+ unionl = start;
+ } else {
+ unionl = nw_plane_minx[n];
+ intrl = start;
+ }
+ if (stop > nw_plane_maxx[n]) {
+ intrh = nw_plane_maxx[n];
+ unionh = stop;
+ } else {
+ unionh = nw_plane_maxx[n];
+ intrh = stop;
+ }
+ for (x = intrl; x <= intrh; x++)
+ if (nw_plane_used[n][x >> 3] & (1u << (x & 7)))
+ break;
+ if (x > intrh) {
+ nw_plane_minx[n] = unionl;
+ nw_plane_maxx[n] = unionh;
+ return pl; // use the same one
+ }
+ // make a new visplane
+ if (lastvisplane - visplanes == MAXVISPLANES)
+ I_Error("R_CheckPlane: no more visplanes");
+ lastvisplane->height = pl->height;
+ lastvisplane->picnum = pl->picnum;
+ lastvisplane->lightlevel = pl->lightlevel;
+ pl = lastvisplane++;
+ nw_plane_new(pl - visplanes, start, stop);
+ return pl;
+}
+#endif
+
#if !NO_VISPLANE_GUTS
//
// R_CheckPlane
diff --git a/games/doom/src/doom/r_plane.h b/games/doom/src/doom/r_plane.h
index f9cfb754..36bc034d 100644
--- a/games/doom/src/doom/r_plane.h
+++ b/games/doom/src/doom/r_plane.h
@@ -87,6 +87,12 @@ R_CheckPlane
int start,
int stop );
#endif
+#if NUMWORKS
+extern uint8_t nw_plane_used[MAXVISPLANES][SCREENWIDTH / 8];
+void nw_plane_new(int pl, int minx, int maxx);
+// (a wall marks a column of a floor or ceiling as vanilla sets its top and bottom)
+#define NW_PLANE_MARK(pl, x) (nw_plane_used[(pl) - visplanes][(x) >> 3] |= (uint8_t)(1u << ((x) & 7)))
+#endif
#endif
diff --git a/games/doom/src/doom/r_segs.c b/games/doom/src/doom/r_segs.c
index d6f21aa4..451b68d1 100644
--- a/games/doom/src/doom/r_segs.c
+++ b/games/doom/src/doom/r_segs.c
@@ -285,6 +285,8 @@ void R_RenderSegLoop(void) {
#if !NO_VISPLANE_GUTS
ceilingplane->top[rw_x] = top;
ceilingplane->bottom[rw_x] = bottom;
+#elif NUMWORKS
+ NW_PLANE_MARK(ceilingplane, rw_x);
#endif
#if PICO_DOOM
if (frontsector->ceilingpic != skyflatnum) {
@@ -341,6 +343,8 @@ void R_RenderSegLoop(void) {
#if !NO_VISPLANE_GUTS
floorplane->top[rw_x] = top;
floorplane->bottom[rw_x] = bottom;
+#elif NUMWORKS
+ NW_PLANE_MARK(floorplane, rw_x);
#endif
#if PICO_DOOM
pd_add_plane_column(rw_x, top, bottom, rw_scale + EPSILON, true, floorplane - visplanes);
@@ -354,6 +358,9 @@ void R_RenderSegLoop(void) {
angle = (rw_centerangle + x_to_viewangle(rw_x)) >> ANGLETOFINESHIFT;
texturecolumn = rw_offset - FixedMul(finetangent(angle), rw_distance);
texturecolumn >>= FRACBITS;
+#if HOST
+ { extern int nw_dbg_x; if (nw_dbg_x == rw_x) printf("TC x=%d off=%d dist=%d cang=%u tc=%d scale=%d\n", rw_x, rw_offset, rw_distance, rw_centerangle, texturecolumn, rw_scale); }
+#endif
// calculate lighting
index = rw_scale >> LIGHTSCALESHIFT;
@@ -556,7 +563,9 @@ R_StoreWallRange
line_set_mapped(linedef);
// calculate rw_distance for scale calculation
-#if WHD_SUPER_TINY
+#if WHD_SEG_ANGLES
+ rw_normalangle = seg_angle_whd(curline) + ANG90;
+#elif WHD_SUPER_TINY
// don't bother to store angle in seg
int dx = vertex_x(seg_v2(curline)) - vertex_x(seg_v1(curline));
int dy = vertex_y(seg_v2(curline)) - vertex_y(seg_v1(curline));
@@ -644,6 +653,9 @@ R_StoreWallRange
rw_midtexturemid = worldtop;
}
rw_midtexturemid += side_rowoffset(sidedef);
+#if HOST
+ { extern int nw_dbg_x; if (nw_dbg_x >= start && nw_dbg_x <= stop) printf("SEG mid tex %d h %d worldtop %d viewz %d rowoff %d peg %d floor %d tmid %d\n", side_midtexture(sidedef), texture_height(side_midtexture(sidedef)), worldtop, viewz, side_rowoffset(sidedef), (line_flags(linedef) & ML_DONTPEGBOTTOM) != 0, sector_floorheight(frontsector), rw_midtexturemid); }
+#endif
#if !NO_DRAWSEGS
ds_p->silhouette = SIL_BOTH;
@@ -885,7 +897,7 @@ R_StoreWallRange
}
}
-#if !NO_VISPLANE_GUTS
+#if !NO_VISPLANE_GUTS || NUMWORKS
// render it
if (markceiling)
ceilingplane = R_CheckPlane(ceilingplane, rw_x, rw_stopx - 1);
diff --git a/games/doom/src/doom/r_state.h b/games/doom/src/doom/r_state.h
index 7d8b26d4..08f56f77 100644
--- a/games/doom/src/doom/r_state.h
+++ b/games/doom/src/doom/r_state.h
@@ -305,10 +305,12 @@ static inline int side_rowoffset16(side_t *side) {
int16_t rowoff = 0;
if (side[0] & 64) {
uint enc = side[0] & 0xf;
- uint pos = offset_offset[enc] + ((sides_z[0] >> 4)&3);
+ // (RP2040 Doom read these two from the level's first sidedef, sides_z, instead of this one: a row
+ // offset was then taken from the wrong byte whenever their texture offsets took up different sizes)
+ uint pos = offset_offset[enc] + ((side[0] >> 4)&3);
rowoff = side[pos];
if (rowoff & 128) {
- rowoff = ((rowoff << 8) | sides_z[pos + 1])<<1;
+ rowoff = ((rowoff << 8) | side[pos + 1])<<1;
rowoff /= 2;
} else {
rowoff <<= 1;
@@ -559,8 +561,18 @@ static inline int seg_next_step(const seg_t *s) {
if (s[0]&64) {
size += s[5]&128 ? 2 : 1;
}
+#if WHD_SEG_ANGLES
+ size += 2;
+#endif
return size;
}
+#if WHD_SEG_ANGLES
+// the seg's angle as the WAD has it (the last two bytes of its record, whd_gen -lossless)
+static inline angle_t seg_angle_whd(const seg_t *s) {
+ int p = seg_next_step(s) - 2;
+ return (angle_t)(s[p] | (s[p + 1] << 8)) << 16;
+}
+#endif
#endif
#define seg_sidedef(s) (sidenum_to_side(line_sidenum(seg_linedef(s), seg_side(s))))
static inline sector_t *seg_frontsector(const seg_t *seg) {
diff --git a/games/doom/src/doom/r_things.c b/games/doom/src/doom/r_things.c
index 3f55fe9e..a9d74d74 100644
--- a/games/doom/src/doom/r_things.c
+++ b/games/doom/src/doom/r_things.c
@@ -610,8 +610,14 @@ R_DrawVisSprite
#if USE_WHD
framedrawable_t *fd = lookup_patch(vis->patch);
+#endif
+#if NUMWORKS
+ extern int nw_strip_x0, nw_strip_x1;
#endif
for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale) {
+#if NUMWORKS
+ if (dc_x < nw_strip_x0 || dc_x >= nw_strip_x1) continue; // (outside the strip being drawn)
+#endif
texturecolumn = frac >> FRACBITS;
#ifdef RANGECHECK
if (patch && (texturecolumn < 0 || texturecolumn >= patch_width(patch)))
diff --git a/games/doom/src/doom1.whx b/games/doom/src/doom1.whx
index 321a622f..92018840 100644
Binary files a/games/doom/src/doom1.whx and b/games/doom/src/doom1.whx differ
diff --git a/games/doom/src/nw/doomconf.h b/games/doom/src/nw/doomconf.h
index 74fc2548..745d7161 100644
--- a/games/doom/src/nw/doomconf.h
+++ b/games/doom/src/nw/doomconf.h
@@ -85,6 +85,7 @@
#define NO_USE_LOADING_DISK 1
#define USE_WHD 1
#define WHD_SUPER_TINY 1
+#define WHD_SEG_ANGLES 1 /* (the segs keep their angles: whd_gen -lossless) */
#define NO_Z_MALLOC_USER_PTR 1
#define FIXED_SCREENWIDTH 1
#define FLOOR_CEILING_CLIP_8BIT 1
@@ -99,7 +100,7 @@
#define PICODOOM_RENDER_NEWHOPE 1
#define MERGE_DISTSCALE0_INTO_VIEWCOSSINANGLE 1
#ifndef NW_RENDER_COL_MAX
-#define NW_RENDER_COL_MAX 3600
+#define NW_RENDER_COL_MAX 2700
#endif
/* the calculator: no speaker, one core, files in Epsilon's file system */
diff --git a/games/doom/src/nw/i_video.c b/games/doom/src/nw/i_video.c
index 69af8d90..19c66c94 100644
--- a/games/doom/src/nw/i_video.c
+++ b/games/doom/src/nw/i_video.c
@@ -94,7 +94,23 @@ void nw_frame_begin(void) {
void host_frame(void); /* tests/play.c: time goes by, screenshots */
void nw_frame_end(void) { host_frame(); }
#else
-void nw_frame_end(void) {}
+/* how long frames take to make (the emulator, tools/emu.py, reads perf_frames, perf_max and perf_slow; the
+ * rest are for tests: the work of each frame in ms, by 1 ms, and the most frames in a row over a tic) */
+uint32_t perf_frames, perf_max, perf_slow, perf_hist[64];
+extern uint32_t nw_slept_ms;
+void nw_frame_end(void) {
+ static uint32_t last_ms, last_slept;
+ uint32_t now = plat_millis();
+ uint32_t work = (now - last_ms) - (nw_slept_ms - last_slept);
+ if (perf_frames) {
+ if (work > perf_max) perf_max = work;
+ if (work > 28) perf_slow++;
+ perf_hist[work < 63 ? work : 63]++;
+ }
+ perf_frames++;
+ last_ms = now;
+ last_slept = nw_slept_ms;
+}
#endif
void nw_band_begin(uint8_t *band, int y0, int y1) {
@@ -108,21 +124,23 @@ void nw_band_begin(uint8_t *band, int y0, int y1) {
uint8_t host_doom_screen[SCREENWIDTH * SCREENHEIGHT]; /* (tests: the frame in Doom's own pixels) */
#endif
-void nw_band_end(void) {
+void nw_band_end(int x0, int x1) {
+ int w = x1 - x0;
#ifdef HOST
- memcpy(host_doom_screen + nw_band_y0 * SCREENWIDTH, nw_band, (nw_band_y1 - nw_band_y0) * SCREENWIDTH);
+ for (int y = nw_band_y0; y < nw_band_y1; y++)
+ memcpy(host_doom_screen + y * SCREENWIDTH + x0, nw_band + (y - nw_band_y0) * SCREENWIDTH + x0, w);
#endif
uint16_t lines[SCREENWIDTH * 6];
for (int y = nw_band_y0; y < nw_band_y1; y += 5) {
- const uint8_t *src = nw_band + (y - nw_band_y0) * SCREENWIDTH;
+ const uint8_t *src = nw_band + (y - nw_band_y0) * SCREENWIDTH + x0;
uint16_t *d = lines;
for (int j = 0; j < 5; j++) {
- for (int i = 0; i < SCREENWIDTH; i++) d[i] = palette[src[i]];
+ for (int i = 0; i < w; i++) d[i] = palette[src[i]];
src += SCREENWIDTH;
- d += SCREENWIDTH;
+ d += w;
}
- memcpy(d, d - SCREENWIDTH, SCREENWIDTH * sizeof *d);
- plat_push(0, y / 5 * 6, SCREENWIDTH, 6, lines);
+ memcpy(d, d - w, w * sizeof *d);
+ plat_push(x0, y / 5 * 6, w, 6, lines);
}
}
diff --git a/games/doom/src/nw/plat_eadk.c b/games/doom/src/nw/plat_eadk.c
index 89faf050..46d8d8c8 100644
--- a/games/doom/src/nw/plat_eadk.c
+++ b/games/doom/src/nw/plat_eadk.c
@@ -6,7 +6,11 @@
uint64_t plat_keys(void) { return eadk_keyboard_scan(); }
uint32_t plat_millis(void) { return (uint32_t)eadk_timing_millis(); }
-void plat_sleep(uint32_t ms) { eadk_timing_msleep(ms); }
+uint32_t nw_slept_ms; /* (the time spent asleep: what is left is the work, nw/i_video.c) */
+void plat_sleep(uint32_t ms) {
+ nw_slept_ms += ms;
+ eadk_timing_msleep(ms);
+}
void plat_push(int x, int y, int w, int h, const uint16_t *px) {
eadk_display_push_rect((eadk_rect_t){(uint16_t)x, (uint16_t)y, (uint16_t)w, (uint16_t)h}, px);
}
diff --git a/games/doom/src/pd_render.cpp b/games/doom/src/pd_render.cpp
index 5082614d..9fa6acf1 100644
--- a/games/doom/src/pd_render.cpp
+++ b/games/doom/src/pd_render.cpp
@@ -176,7 +176,7 @@ extern uint8_t *nw_band;
extern int nw_band_y0, nw_band_y1;
extern boolean nw_direct;
void nw_band_begin(uint8_t *band, int y0, int y1);
-void nw_band_end(void);
+void nw_band_end(int x0, int x1);
void nw_frame_begin(void);
void nw_frame_end(void);
void V_DrawPatchListBand(const vpatchlist_t *patchlist);
@@ -200,6 +200,14 @@ static_assert(USE_ROWAD, ""); // don't want things moving!
#define SHOW_COSTLY_DATA_STATS 0
// we always want to collapse range of iscale and dda
+#if NUMWORKS
+#define SHIFT 0
+#define DOWN_SHIFT(x) (x)
+#define MINI INT32_MIN
+#define MAXI INT32_MAX
+#define TEXTUREMID_PLANE INT32_MIN
+#define UP_SHIFT(x) (x)
+#else
#define SHIFT 7
#define DOWN_SHIFT(x) ((x) >> SHIFT) // only used for texturemid
#define MINI (-512*65536)
@@ -208,13 +216,18 @@ static_assert(USE_ROWAD, ""); // don't want things moving!
static_assert(TEXTUREMID_PLANE == 0x3ffff, "");
#define UP_SHIFT(x) ((x) << SHIFT) // only used for texturemid
+#endif
#define CLAMP(x) (((x)<<13)>>13)
#define DDA_MIN 0
#define DDA_SHIFT 0
#define DDA_DOWN_SHIFT(x) ((x)>>DDA_SHIFT)
+#if NUMWORKS
+#define DDA_MAX 0xffffff // (vanilla's iscale is always below this)
+#else
// note max is slightly over this, but the texture is likely unintelligable at this point anyway
#define DDA_MAX 0xfffff
+#endif
#define DDA_CLAMP(x) (((uint)((x)<<12))>>12)
#define DDA_UP_SHIFT(x) ((x) << DDA_SHIFT)
@@ -243,6 +256,29 @@ int pd_dump_frame = -1;
// <19,0x4000> <5,cmap_index> <8, len>
// <24,0x000000> <8, visplane_idx>
+#if NUMWORKS
+// vanilla's column at its full precision: the whole texturemid, and the iscale (always below 2^24: vanilla
+// keeps scales between 1/256 and 64), as R_DrawColumn uses them
+struct pd_column {
+ int16_t next;
+ uint8_t yl;
+ uint8_t yh;
+
+ uint32_t scale: 24;
+ uint32_t colormap_index: 6;
+ uint32_t spare: 2;
+
+ int32_t texturemid; // TEXTUREMID_PLANE for floors and ceilings
+
+ uint8_t col;
+ uint8_t fd_num;
+ union {
+ uint8_t plane;
+ uint8_t x;
+ };
+ uint8_t spare2;
+};
+#else
struct pd_column {
#if PD_COLUMN_DEBUG
pd_column_type type;
@@ -265,6 +301,7 @@ struct pd_column {
uint8_t x;
};
};
+#endif
#define TO_COL_HI(c) ((c)>>5)
#define TO_COL_LO(c) ((c)&0x1f)
@@ -278,8 +315,12 @@ struct __packed __aligned(2) flat_run {
};
static_assert(sizeof(flat_run) == 6, "");
+#if NUMWORKS
+static_assert(sizeof(pd_column) == 16, "");
+#else
static_assert(sizeof(pd_column) == 12, "");
static_assert(sizeof(pd_column) == sizeof(flat_run) * 2, ""); // we pack two into the space of the other
+#endif
static __aligned(4) int16_t column_heads[SCREENWIDTH * 2];
#define fuzzy_column_heads (&column_heads[SCREENWIDTH])
@@ -358,10 +399,8 @@ static flat_run nw_flat_runs[NW_FLAT_RUNS];
static int16_t nw_flat_run_count;
#define flat_runs nw_flat_runs
// for each column of a band, the next of its framedrawable (the column lists' own links stay as they are,
-// for the next band), and the framedrawable itself (its field holds the column's x); both on the stack of
-// pd_end_frame, which has room to spare where the zone has none
+// for the next band); on the stack of pd_end_frame, which has room to spare where the zone has none
static int16_t *fd_next;
-static uint8_t *col_fd;
#else
#define flat_runs ((flat_run *)list_buffer)
#endif
@@ -371,12 +410,13 @@ static int16_t render_col_free;
// (tests read these: the most columns a frame had, the columns that found no room, how many frames had
// 0-249 columns, 250-499...)
extern "C" { uint32_t nw_col_overflows, nw_col_peak, nw_col_frames[40]; }
+static bool nw_overflowed; // (this frame's columns did not all find room: it is drawn in strips)
#endif
static int16_t alloc_pd_column(int x) {
if (render_col_free < 0) {
#if NUMWORKS
if (render_col_count >= (int)nw_col_peak) nw_col_peak = render_col_count + 1;
- if (render_col_count == RENDER_COL_MAX) nw_col_overflows++;
+ if (render_col_count == RENDER_COL_MAX) nw_col_overflows++, nw_overflowed = true;
#endif
if (render_col_count == RENDER_COL_MAX) {
assert(x>=0 && x<SCREENWIDTH);
@@ -832,6 +872,9 @@ void pd_begin_frame() {
render_col_count = 0;
render_col_free = -1;
pd_frame++;
+#if NUMWORKS
+ nw_overflowed = false;
+#endif
DEBUG_PINS_CLR(start_end, 1);
}
@@ -890,6 +933,9 @@ void pd_add_span() {
}
#define FORCE_ISCALE 1
+#if HOST
+extern "C" { int nw_dbg_x = -1; }
+#endif
void pd_add_column(pd_column_type type) {
// --- VALIDATION AND CLAMPING
@@ -919,6 +965,21 @@ void pd_add_column(pd_column_type type) {
if (texturemid > MAXI) texturemid = MAXI;
// --------
+#if HOST
+ {
+ // (tests: DUMPCOL="x tic" prints the columns at x in that tic's frame, as the reference does)
+ static int dump_x = -2, dump_tic;
+ if (dump_x == -2) {
+ const char *e = getenv("DUMPCOL");
+ dump_x = e ? atoi(e) : -1;
+ dump_tic = e && strchr(e, ' ') ? atoi(strchr(e, ' ')) : -1;
+ }
+ nw_dbg_x = leveltime == dump_tic && gamestate == GS_LEVEL ? dump_x : -1;
+ if (dc_x == dump_x && leveltime == dump_tic && gamestate == GS_LEVEL)
+ printf("COL x=%d yl=%d yh=%d iscale=%d texturemid=%d (pd_scale %d type %d)\n", dc_x, dc_yl, dc_yh,
+ (int)iscale, dc_texturemid, pd_scale, (int)type);
+ }
+#endif
// todo it would be nice to defer filling this in in case we are entirely clipped - let's get some stats on that
int rc_index = alloc_pd_column(dc_x);
if (rc_index < 0) return;
@@ -944,8 +1005,12 @@ void pd_add_column(pd_column_type type) {
#endif
render_cols[rc_index].fd_num = dc_source.fd_num;
+#if NUMWORKS
+ render_cols[rc_index].col = dc_source.col;
+#else
render_cols[rc_index].col_hi = TO_COL_HI(dc_source.col);
render_cols[rc_index].col_lo = TO_COL_LO(dc_source.col);
+#endif
#if !PICO_ON_DEVICE && !NUMWORKS
if (dc_source.real_id < 0) {
// patch
@@ -1045,8 +1110,12 @@ void pd_add_masked_columns(uint8_t *ys, int seg_count) {
#endif
render_cols[rc_index].fd_num = dc_source.fd_num;
+#if NUMWORKS
+ render_cols[rc_index].col = dc_source.col;
+#else
render_cols[rc_index].col_hi = TO_COL_HI(dc_source.col);
render_cols[rc_index].col_lo = TO_COL_LO(dc_source.col);
+#endif
#if !PICO_ON_DEVICE && !NUMWORKS
if (dc_source.real_id < 0) {
// patch
@@ -1147,6 +1216,9 @@ void pd_add_plane_column(int x, int yl, int yh, fixed_t scale, int floor, int fd
render_cols[rc_index].colormap_index = dc_colormap_index;
render_cols[rc_index].texturemid = TEXTUREMID_PLANE;
render_cols[rc_index].fd_num = fd_num;
+#if NUMWORKS
+ render_cols[rc_index].plane = fd_num; // (the visplane: fd_num has a byte of its own here)
+#endif
render_cols[rc_index].next = -1;
push_down_x(x, rc_index);
}
@@ -1385,6 +1457,45 @@ static void flush_visplanes(int8_t *flatnum_next, int numvisplanes) {
uint32_t step;
uint32_t position;
#endif
+#if NUMWORKS
+ // each run is one of vanilla's spans (R_MapPlane, R_DrawSpan): its texture position is worked out
+ // at its own first pixel, and the packed position carries from y into x as in vanilla (the flat is
+ // stored a column at a time, flat[x * 64 + y])
+ fixed_t distance = 0;
+ for (int16_t fr = visplane_heads[vp]; fr != -1; fr = flat_runs[fr].next) {
+ int y = flat_runs[fr].y, x1 = flat_runs[fr].x_start;
+ if (y != last_y) {
+ distance = FixedMul(rel_height, yslope[y]);
+ xstep = FixedMul(distance, basexscale);
+ ystep = FixedMul(distance, baseyscale);
+ int colormap_index;
+ if (fixedcolormap) {
+ colormap_index = fixedcolormap;
+ } else {
+ unsigned index = distance >> LIGHTZSHIFT;
+ // (vanilla's zlight table, worked out)
+ int level = startmap - (int)(80 / (index + 1));
+ if (level < 0) level = 0;
+ if (level >= NUMCOLORMAPS) level = NUMCOLORMAPS - 1;
+ colormap_index = level;
+ }
+ colormap = xcolormaps + colormap_index * 256;
+ last_y = y;
+ }
+ fixed_t length = FixedMul(distance, distscale(x1));
+ angle_t angle = (viewangle + x_to_viewangle(x1)) >> ANGLETOFINESHIFT;
+ xfrac = viewx + FixedMul(finecosine(angle), length);
+ yfrac = -viewy - FixedMul(finesine(angle), length);
+ uint32_t position = ((xfrac << 10) & 0xffff0000) | ((yfrac >> 6) & 0x0000ffff);
+ uint32_t step = ((xstep << 10) & 0xffff0000) | ((ystep >> 6) & 0x0000ffff);
+ uint8_t *p = render_frame_buffer + y * SCREENWIDTH + x1;
+ uint8_t *p_end = render_frame_buffer + y * SCREENWIDTH + flat_runs[fr].x_end;
+ while (p < p_end) {
+ *p++ = colormap[flat_data[((position >> 20) & 0x0fc0) | ((position >> 10) & 63)]];
+ position += step;
+ }
+ }
+#else
for (int16_t fr = visplane_heads[vp]; fr != -1; fr = flat_runs[fr].next) {
int delta;
if (flat_runs[fr].y != last_y) {
@@ -1477,6 +1588,7 @@ static void flush_visplanes(int8_t *flatnum_next, int numvisplanes) {
}
// last_x_end = flat_runs[fr].x_end;
}
+#endif
vp = flatnum_next[vp];
} while (vp != -1);
DEBUG_PINS_CLR(render_thing, 2);
@@ -1879,7 +1991,11 @@ static void draw_patch_columns(int patch_num, int patch_head, int16_t *col_heads
int h = patch_height(pdi.patch);
do {
auto &c = render_cols[i & 0x7fffu];
+ #if NUMWORKS
+ uint col = c.col;
+#else
uint col = FROM_COL_HI_LO(c.col_hi, c.col_lo);
+#endif
assert(col < pdi.w);
int16_t tmp = col_heads[col];
col_heads[col] = (int16_t)i;
@@ -2022,7 +2138,11 @@ static void draw_composite_columns(int texture_num, int tex_head) {
// printf("DCC tex=%d\n", texture_num);
do {
auto &c = render_cols[i & 0x7fffu];
+ #if NUMWORKS
+ uint col = c.col;
+#else
uint col = FROM_COL_HI_LO(c.col_hi, c.col_lo);
+#endif
assert(col < w);
int16_t tmp = col_heads[col];
col_heads[col] = (int16_t)i;
@@ -3024,13 +3144,12 @@ void pd_end_frame(int wipe_start) {
// ---------------------------------------------------------------------------------------------------------------
// The calculator: the frame drawn a band at a time
-// regular columns keep their x where their framedrawable was (col_fd remembers that)
+// regular columns keep their x (its low 8 bits; the links say if it is 256 or more)
static void nw_freeze_columns() {
for (int x = 0; x < SCREENWIDTH; x++) {
for (int16_t i = column_heads[x]; i >= 0; i = render_cols[i].next) {
auto &c = render_cols[i];
if (c.texturemid != TEXTUREMID_PLANE) {
- col_fd[i] = c.fd_num;
c.x = (uint8_t)x;
}
}
@@ -3142,8 +3261,8 @@ static void __noinline nw_draw_columns(int y0, int y1) {
for (int16_t i = column_heads[x]; i >= 0; i = render_cols[i].next) {
const auto &c = render_cols[i];
if (c.texturemid == TEXTUREMID_PLANE || c.yh < y0 || c.yl >= y1) continue;
- fd_next[i] = fd_heads[col_fd[i]];
- fd_heads[col_fd[i]] = (x >> 8) ? (int16_t) (i | 0x8000) : i;
+ fd_next[i] = fd_heads[c.fd_num];
+ fd_heads[c.fd_num] = (x >> 8) ? (int16_t) (i | 0x8000) : i;
}
}
for (int fd_num = 0; fd_num < num_framedrawables; fd_num++) {
@@ -3258,13 +3377,8 @@ static void nw_draw_background(int y0, int y1) {
// the status bar, messages, the menu... over the picture
static vpatchlist_t nw_patches[400];
-void pd_end_frame(int wipe_start) {
- // these were only clipped as they were inserted (so may be more obscured)
- reclip_fuzz_columns();
- bool showing_help = inhelpscreens;
- bool view = gamestate == GS_LEVEL && !showing_help;
-
- // flats are cached in what the columns leave of list_buffer
+// flats are cached in what the columns leave of list_buffer
+static void nw_columns_ready(bool view) {
uint8_t *list_buffer_limit = list_buffer + count_of(list_buffer);
if (cached_flat0 != list_buffer_limit - 4096) {
cached_flat0 = list_buffer_limit - 4096;
@@ -3275,35 +3389,14 @@ void pd_end_frame(int wipe_start) {
if (new_cache_flat_slots < 1) new_cache_flat_slots = 1;
for (int i = cached_flat_slots; i < new_cache_flat_slots; i++) cached_flat_picnum[i] = 0xff;
cached_flat_slots = new_cache_flat_slots;
- int16_t fd_next_here[RENDER_COL_MAX];
- uint8_t col_fd_here[RENDER_COL_MAX];
- fd_next = fd_next_here;
- col_fd = col_fd_here;
if (view) {
nw_col_frames[render_col_count / 250 < 40 ? render_col_count / 250 : 39]++;
nw_freeze_columns();
}
+}
- // what is drawn over the picture, gathered once
- nw_patches[0].header.max = count_of(nw_patches) - 1;
- V_BeginPatchList(nw_patches);
- if (!showing_help) {
- if (gamestate == GS_LEVEL) ST_Drawer(false, !pre_wipe_state);
- else if (gamestate == GS_INTERMISSION) WI_Drawer();
- } else if (gamestate == GS_LEVEL) {
- ST_doPaletteStuff();
- }
- ST_FpsDrawer(-1);
- if (!pre_wipe_state && gamestate == GS_LEVEL && gametic && !inhelpscreens) HU_Drawer();
- if (paused) {
- int y = automapactive ? 4 : viewwindowy + 4;
- V_DrawPatchDirect(viewwindowx + (scaledviewwidth - 68) / 2, y, VPATCH_HANDLE(VPATCH_NAME(M_PAUSE)));
- }
- M_Drawer();
- if (pre_wipe_state == PRE_WIPE_EXTRA_FRAME_NEEDED) pre_wipe_state = PRE_WIPE_EXTRA_FRAME_DONE;
-
- nw_frame_begin();
- uint8_t __aligned(8) band[SCREENWIDTH * NW_BAND_H];
+// the frame, band by band, for the columns x0 to x1 of the screen
+static void nw_draw_bands(uint8_t *band, bool view, bool showing_help, int x0, int x1) {
for (int y0 = 0; y0 < SCREENHEIGHT; y0 += NW_BAND_H) {
int y1 = y0 + NW_BAND_H;
nw_band_begin(band, y0, y1);
@@ -3342,7 +3435,67 @@ void pd_end_frame(int wipe_start) {
}
}
V_DrawPatchListBand(nw_patches);
- nw_band_end();
+ nw_band_end(x0, x1);
+ }
+}
+
+// a frame with more pieces than list_buffer has room for is drawn again in strips, each with the view
+// rendered for its columns only, halved again as long as needed (vanilla has no such limit, and neither do we)
+extern "C" { int nw_strip_x0 = 0, nw_strip_x1 = SCREENWIDTH; uint32_t nw_strips; }
+static void nw_draw_strip(uint8_t *band, int x0, int x1) {
+ pd_begin_frame();
+ nw_strip_x0 = x0;
+ nw_strip_x1 = x1;
+ R_RenderPlayerView(&players[displayplayer]);
+ nw_strip_x0 = 0;
+ nw_strip_x1 = SCREENWIDTH;
+ if (nw_overflowed && x1 - x0 > 8) {
+ int mid = (x0 + x1) / 2;
+ nw_draw_strip(band, x0, mid);
+ nw_draw_strip(band, mid, x1);
+ return;
+ }
+ nw_strips++;
+ reclip_fuzz_columns();
+ nw_columns_ready(true);
+ nw_draw_bands(band, true, false, x0, x1);
+}
+
+void pd_end_frame(int wipe_start) {
+ // these were only clipped as they were inserted (so may be more obscured)
+ reclip_fuzz_columns();
+ bool showing_help = inhelpscreens;
+ bool view = gamestate == GS_LEVEL && !showing_help;
+ int16_t fd_next_here[RENDER_COL_MAX];
+ fd_next = fd_next_here;
+ bool strips = view && !automapactive && nw_overflowed;
+ if (!strips) nw_columns_ready(view);
+
+ // what is drawn over the picture, gathered once
+ nw_patches[0].header.max = count_of(nw_patches) - 1;
+ V_BeginPatchList(nw_patches);
+ if (!showing_help) {
+ if (gamestate == GS_LEVEL) ST_Drawer(false, !pre_wipe_state);
+ else if (gamestate == GS_INTERMISSION) WI_Drawer();
+ } else if (gamestate == GS_LEVEL) {
+ ST_doPaletteStuff();
+ }
+ ST_FpsDrawer(-1);
+ if (!pre_wipe_state && gamestate == GS_LEVEL && gametic && !inhelpscreens) HU_Drawer();
+ if (paused) {
+ int y = automapactive ? 4 : viewwindowy + 4;
+ V_DrawPatchDirect(viewwindowx + (scaledviewwidth - 68) / 2, y, VPATCH_HANDLE(VPATCH_NAME(M_PAUSE)));
+ }
+ M_Drawer();
+ if (pre_wipe_state == PRE_WIPE_EXTRA_FRAME_NEEDED) pre_wipe_state = PRE_WIPE_EXTRA_FRAME_DONE;
+
+ nw_frame_begin();
+ uint8_t __aligned(8) band[SCREENWIDTH * NW_BAND_H];
+ if (strips) {
+ nw_draw_strip(band, 0, SCREENWIDTH / 2);
+ nw_draw_strip(band, SCREENWIDTH / 2, SCREENWIDTH);
+ } else {
+ nw_draw_bands(band, view, showing_help, 0, SCREENWIDTH);
}
nw_frame_end();
}
diff --git a/games/doom/src/z_zone.c b/games/doom/src/z_zone.c
index 9535f19f..967e1ff7 100644
--- a/games/doom/src/z_zone.c
+++ b/games/doom/src/z_zone.c
@@ -115,6 +115,9 @@ static memzone_t *mainzone;
#if NUMWORKS
// what the zone holds, and the most it held (tests read these)
uint32_t nw_zone_used, nw_zone_peak, nw_zone_size;
+// (and of that, what can't be purged: the zone runs out only when this does not fit)
+uint32_t nw_zone_fixed, nw_zone_fixed_peak;
+#define NW_FIXED(tag) ((tag) != PU_FREE && (tag) < PU_PURGELEVEL)
#endif
#if !NO_ZONE_DEBUG
static boolean zero_on_free;
@@ -238,6 +241,7 @@ void Z_Free (void* ptr)
#endif
#if NUMWORKS
if (block->tag != PU_FREE) nw_zone_used -= memblock_size(block);
+ if (NW_FIXED(block->tag)) nw_zone_fixed -= memblock_size(block);
#endif
// mark as free
@@ -426,6 +430,8 @@ Z_MallocNoUser
#if NUMWORKS
nw_zone_used += memblock_size(base);
if (nw_zone_used > nw_zone_peak) nw_zone_peak = nw_zone_used;
+ if (NW_FIXED(base->tag) && (nw_zone_fixed += memblock_size(base)) > nw_zone_fixed_peak)
+ nw_zone_fixed_peak = nw_zone_fixed;
#endif
#ifdef USE_MEM_USE_TRACKING
mem_used += memblock_size(base) + sizeof(memblock_t);
@@ -611,6 +617,11 @@ void Z_ChangeTag2(void *ptr, int tag, const char *file, int line)
"for purgable blocks", file, line);
#endif
+#if NUMWORKS
+ if (NW_FIXED(block->tag)) nw_zone_fixed -= memblock_size(block);
+ if (NW_FIXED(tag) && (nw_zone_fixed += memblock_size(block)) > nw_zone_fixed_peak)
+ nw_zone_fixed_peak = nw_zone_fixed;
+#endif
block->tag = tag;
}
diff --git a/games/doom/tests/play.c b/games/doom/tests/play.c
index 35b41356..44424362 100644
--- a/games/doom/tests/play.c
+++ b/games/doom/tests/play.c
@@ -87,11 +87,11 @@ void host_tick(void) {
}
/* checks against Chocolate Doom: the state at the end of each demo, the player at each tic (--trace), and
- * the frame of the level in Doom's own pixels at given tics of the level (--dump-tics, DIR/frame_<tic>.raw) */
+ * the frame of the level in Doom's own pixels at given tics of each level (--dump-tics, DIR/frame_<map>_<tic>.raw) */
extern int rndindex, prndindex;
static FILE *trace_file;
static int dump_tics[256], ndump;
-static uint8_t dumped[256];
+static uint8_t dumped[10][256];
extern uint8_t host_doom_screen[SCREENWIDTH * SCREENHEIGHT];
void host_demo_end(void) {
@@ -117,10 +117,10 @@ void host_tic(void) {
static void dump_frame(void) {
if (gamestate != GS_LEVEL) return;
for (int i = 0; i < ndump; i++) {
- if (dumped[i] || dump_tics[i] != leveltime) continue;
- dumped[i] = 1;
+ if (dumped[gamemap % 10][i] || dump_tics[i] != leveltime) continue;
+ dumped[gamemap % 10][i] = 1;
char path[512];
- snprintf(path, sizeof path, "%s/frame_%d.raw", out, leveltime);
+ snprintf(path, sizeof path, "%s/frame_%d%d_%d.raw", out, gameepisode, gamemap, leveltime);
FILE *f = fopen(path, "wb");
if (f) {
fwrite(host_doom_screen, 1, sizeof host_doom_screen, f);
@@ -183,9 +183,11 @@ int main(int argc, char **argv) {
host_save_dir(saves);
int r = nw_main();
if (stats) {
- extern uint32_t nw_col_overflows, nw_col_peak, nw_col_frames[40], nw_zone_peak, nw_zone_size;
- printf("STATS zone_free %d columns peak %u overflows %u zone peak %u of %u frames by 250 columns:",
- Z_FreeMemory(), nw_col_peak, nw_col_overflows, nw_zone_peak, nw_zone_size);
+ extern uint32_t nw_col_overflows, nw_col_peak, nw_col_frames[40], nw_zone_peak, nw_zone_size,
+ nw_zone_fixed_peak, nw_strips;
+ printf("STATS zone_free %d columns peak %u overflows %u zone peak %u of %u fixed %u strips %u frames by 250 "
+ "columns:", Z_FreeMemory(), nw_col_peak, nw_col_overflows, nw_zone_peak, nw_zone_size,
+ nw_zone_fixed_peak, nw_strips);
for (int i = 0; i < 40; i++) printf(" %u", nw_col_frames[i]);
printf("\n");
}
diff --git a/games/doom/tools/whd_gen/textscreen_normal_font.h b/games/doom/tools/whd_gen/textscreen_normal_font.h
new file mode 100644
index 00000000..aa486a2d
--- /dev/null
+++ b/games/doom/tools/whd_gen/textscreen_normal_font.h
@@ -0,0 +1,613 @@
+/* Font data made from normal.bmp; do not edit.
+ Please see textscreen/fonts/README for copyright
+ information. */
+
+#if !DOOM_TINY
+static const uint8_t normal_font_data[] =
+{
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xbd,
+ 0x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x7e, 0xff, 0xdb, 0xff, 0xff, 0xc3,
+ 0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x36, 0x7f, 0x7f, 0x7f,
+ 0x7f, 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x3e, 0x7f,
+ 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0xe7, 0xe7,
+ 0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff,
+ 0x7e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
+ 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc3,
+ 0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42,
+ 0x42, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x99, 0xbd,
+ 0xbd, 0x99, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0x00, 0x00, 0x78, 0x70, 0x58, 0x4c, 0x1e, 0x33,
+ 0x33, 0x33, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c,
+ 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xfc, 0xcc, 0xfc, 0x0c, 0x0c, 0x0c,
+ 0x0c, 0x0e, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xfe, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6,
+ 0xc6, 0xe6, 0xe7, 0x67, 0x03, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x18, 0x18, 0xdb, 0x3c, 0xe7,
+ 0x3c, 0xdb, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x7f, 0x1f,
+ 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x40, 0x60, 0x70, 0x78, 0x7c, 0x7f, 0x7c,
+ 0x78, 0x70, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18,
+ 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+ 0x66, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xfe, 0xdb, 0xdb, 0xdb, 0xde, 0xd8,
+ 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x3e, 0x63, 0x06, 0x1c, 0x36, 0x63, 0x63,
+ 0x36, 0x1c, 0x30, 0x63, 0x3e, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18,
+ 0x7e, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x7f,
+ 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0x7f,
+ 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
+ 0x03, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x66, 0xff,
+ 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x1c, 0x3e,
+ 0x3e, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x3e, 0x3e,
+ 0x1c, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18,
+ 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x66, 0x66, 0x66, 0x24, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x36, 0x36, 0x7f, 0x36, 0x36,
+ 0x36, 0x7f, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00,
+ 0x18, 0x18, 0x3e, 0x63, 0x43, 0x03, 0x3e, 0x60,
+ 0x60, 0x61, 0x63, 0x3e, 0x18, 0x18, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x43, 0x63, 0x30, 0x18,
+ 0x0c, 0x06, 0x63, 0x61, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x1c, 0x36, 0x36, 0x1c, 0x6e, 0x3b,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x0c, 0x0c, 0x0c, 0x06, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c,
+ 0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30,
+ 0x30, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0xff,
+ 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
+ 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x18, 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x30, 0x18,
+ 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3c, 0x66, 0xc3, 0xc3, 0xdb, 0xdb,
+ 0xc3, 0xc3, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x18, 0x1c, 0x1e, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3e, 0x63, 0x60, 0x30, 0x18, 0x0c,
+ 0x06, 0x03, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3e, 0x63, 0x60, 0x60, 0x3c, 0x60,
+ 0x60, 0x60, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x30, 0x38, 0x3c, 0x36, 0x33, 0x7f,
+ 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x7f, 0x03, 0x03, 0x03, 0x3f, 0x60,
+ 0x60, 0x60, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x1c, 0x06, 0x03, 0x03, 0x3f, 0x63,
+ 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x7f, 0x63, 0x60, 0x60, 0x30, 0x18,
+ 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x3e, 0x63,
+ 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x7e, 0x60,
+ 0x60, 0x60, 0x30, 0x1e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
+ 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
+ 0x00, 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06,
+ 0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
+ 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60,
+ 0x30, 0x18, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3e, 0x63, 0x63, 0x30, 0x18, 0x18,
+ 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x3e, 0x63, 0x63, 0x7b, 0x7b,
+ 0x7b, 0x3b, 0x03, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x08, 0x1c, 0x36, 0x63, 0x63, 0x7f,
+ 0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3f, 0x66, 0x66, 0x66, 0x3e, 0x66,
+ 0x66, 0x66, 0x66, 0x3f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3c, 0x66, 0x43, 0x03, 0x03, 0x03,
+ 0x03, 0x43, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x1f, 0x36, 0x66, 0x66, 0x66, 0x66,
+ 0x66, 0x66, 0x36, 0x1f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x7f, 0x66, 0x46, 0x16, 0x1e, 0x16,
+ 0x06, 0x46, 0x66, 0x7f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x7f, 0x66, 0x46, 0x16, 0x1e, 0x16,
+ 0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3c, 0x66, 0x43, 0x03, 0x03, 0x7b,
+ 0x63, 0x63, 0x66, 0x5c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x63, 0x63, 0x63, 0x63, 0x7f, 0x63,
+ 0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x78, 0x30, 0x30, 0x30, 0x30, 0x30,
+ 0x33, 0x33, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x67, 0x66, 0x66, 0x36, 0x1e, 0x1e,
+ 0x36, 0x66, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x0f, 0x06, 0x06, 0x06, 0x06, 0x06,
+ 0x06, 0x46, 0x66, 0x7f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xc3,
+ 0xc3, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x63, 0x67, 0x6f, 0x7f, 0x7b, 0x73,
+ 0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3f, 0x66, 0x66, 0x66, 0x3e, 0x06,
+ 0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63,
+ 0x63, 0x6b, 0x7b, 0x3e, 0x30, 0x70, 0x00, 0x00,
+ 0x00, 0x00, 0x3f, 0x66, 0x66, 0x66, 0x3e, 0x36,
+ 0x66, 0x66, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3e, 0x63, 0x63, 0x06, 0x1c, 0x30,
+ 0x60, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xff, 0xdb, 0x99, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3,
+ 0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb,
+ 0xdb, 0xff, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 0x18,
+ 0x3c, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18,
+ 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xff, 0xc3, 0x61, 0x30, 0x18, 0x0c,
+ 0x06, 0x83, 0xc3, 0xff, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+ 0x0c, 0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0e, 0x1c,
+ 0x38, 0x70, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30,
+ 0x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x08, 0x1c, 0x36, 0x63, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
+ 0x0c, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x30, 0x3e,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x07, 0x06, 0x06, 0x1e, 0x36, 0x66,
+ 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x03,
+ 0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x38, 0x30, 0x30, 0x3c, 0x36, 0x33,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x7f,
+ 0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x1c, 0x36, 0x26, 0x06, 0x0f, 0x06,
+ 0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x33, 0x33,
+ 0x33, 0x33, 0x33, 0x3e, 0x30, 0x33, 0x1e, 0x00,
+ 0x00, 0x00, 0x07, 0x06, 0x06, 0x36, 0x6e, 0x66,
+ 0x66, 0x66, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x18, 0x18, 0x00, 0x1c, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x60, 0x60, 0x00, 0x70, 0x60, 0x60,
+ 0x60, 0x60, 0x60, 0x60, 0x66, 0x66, 0x3c, 0x00,
+ 0x00, 0x00, 0x07, 0x06, 0x06, 0x66, 0x36, 0x1e,
+ 0x1e, 0x36, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0xff, 0xdb,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x66, 0x66,
+ 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x66, 0x66,
+ 0x66, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x0f, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x33, 0x33,
+ 0x33, 0x33, 0x33, 0x3e, 0x30, 0x30, 0x78, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x6e, 0x66,
+ 0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x06,
+ 0x1c, 0x30, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x08, 0x0c, 0x0c, 0x3f, 0x0c, 0x0c,
+ 0x0c, 0x0c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x33, 0x33,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0xc3,
+ 0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0xc3,
+ 0xdb, 0xdb, 0xff, 0x66, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c,
+ 0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x7e, 0x60, 0x30, 0x1f, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x33, 0x18,
+ 0x0c, 0x06, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x0e, 0x18,
+ 0x18, 0x18, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x0e, 0x18, 0x18, 0x18, 0x70, 0x18,
+ 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x6e, 0x3b, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x36, 0x63,
+ 0x63, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x3c, 0x66, 0x43, 0x03, 0x03, 0x03,
+ 0x43, 0x66, 0x3c, 0x30, 0x60, 0x3e, 0x00, 0x00,
+ 0x00, 0x00, 0x33, 0x00, 0x00, 0x33, 0x33, 0x33,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x30, 0x18, 0x0c, 0x00, 0x3e, 0x63, 0x7f,
+ 0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x08, 0x1c, 0x36, 0x00, 0x1e, 0x30, 0x3e,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x33, 0x00, 0x00, 0x1e, 0x30, 0x3e,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x06, 0x0c, 0x18, 0x00, 0x1e, 0x30, 0x3e,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x1c, 0x36, 0x1c, 0x00, 0x1e, 0x30, 0x3e,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x06, 0x06,
+ 0x66, 0x3c, 0x30, 0x60, 0x3c, 0x00, 0x00, 0x00,
+ 0x00, 0x08, 0x1c, 0x36, 0x00, 0x3e, 0x63, 0x7f,
+ 0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x63, 0x00, 0x00, 0x3e, 0x63, 0x7f,
+ 0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x06, 0x0c, 0x18, 0x00, 0x3e, 0x63, 0x7f,
+ 0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x66, 0x00, 0x00, 0x1c, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x18, 0x3c, 0x66, 0x00, 0x1c, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x06, 0x0c, 0x18, 0x00, 0x1c, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x63, 0x00, 0x08, 0x1c, 0x36, 0x63, 0x63,
+ 0x7f, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+ 0x1c, 0x36, 0x1c, 0x00, 0x1c, 0x36, 0x63, 0x63,
+ 0x7f, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+ 0x18, 0x0c, 0x06, 0x00, 0x7f, 0x66, 0x06, 0x3e,
+ 0x06, 0x06, 0x66, 0x7f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0xd8,
+ 0x7e, 0x1b, 0x3b, 0xee, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x7c, 0x36, 0x33, 0x33, 0x7f, 0x33,
+ 0x33, 0x33, 0x33, 0x73, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x08, 0x1c, 0x36, 0x00, 0x3e, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x63, 0x00, 0x00, 0x3e, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x06, 0x0c, 0x18, 0x00, 0x3e, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x0c, 0x1e, 0x33, 0x00, 0x33, 0x33, 0x33,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x06, 0x0c, 0x18, 0x00, 0x33, 0x33, 0x33,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x63, 0x00, 0x00, 0x63, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x7e, 0x60, 0x30, 0x1e, 0x00,
+ 0x00, 0x63, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x63, 0x00, 0x63, 0x63, 0x63, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x18, 0x18, 0x7e, 0xc3, 0x03, 0x03, 0x03,
+ 0xc3, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x1c, 0x36, 0x26, 0x06, 0x0f, 0x06, 0x06,
+ 0x06, 0x06, 0x67, 0x3f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0xff, 0x18,
+ 0xff, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x3f, 0x66, 0x66, 0x3e, 0x46, 0x66, 0xf6,
+ 0x66, 0x66, 0x66, 0xcf, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x70, 0xd8, 0x18, 0x18, 0x18, 0x7e, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x1b, 0x0e, 0x00, 0x00,
+ 0x00, 0x18, 0x0c, 0x06, 0x00, 0x1e, 0x30, 0x3e,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x30, 0x18, 0x0c, 0x00, 0x1c, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x18, 0x0c, 0x06, 0x00, 0x3e, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x18, 0x0c, 0x06, 0x00, 0x33, 0x33, 0x33,
+ 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x6e, 0x3b, 0x00, 0x3b, 0x66, 0x66,
+ 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
+ 0x6e, 0x3b, 0x00, 0x63, 0x67, 0x6f, 0x7f, 0x7b,
+ 0x73, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x3c, 0x36, 0x36, 0x7c, 0x00, 0x7e, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x1c, 0x36, 0x36, 0x1c, 0x00, 0x3e, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x06,
+ 0x03, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x03,
+ 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x60,
+ 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x03, 0x03, 0x43, 0x63, 0x33, 0x18, 0x0c,
+ 0x06, 0x73, 0xd9, 0x60, 0x30, 0xf8, 0x00, 0x00,
+ 0x00, 0x03, 0x03, 0x43, 0x63, 0x33, 0x18, 0x0c,
+ 0x66, 0x73, 0x69, 0x7c, 0x60, 0x60, 0x00, 0x00,
+ 0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18,
+ 0x3c, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x36, 0x1b,
+ 0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x36, 0x6c,
+ 0x36, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22,
+ 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22,
+ 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55,
+ 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55,
+ 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee,
+ 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6f,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x1f,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6f, 0x60, 0x6f,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x60, 0x6f,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6f, 0x60, 0x7f,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x7f,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec, 0x0c, 0xfc,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0c, 0xec,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xef, 0x00, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xef,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec, 0x0c, 0xec,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xef, 0x00, 0xef,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xfc,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xf8,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xff,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0xff,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+ 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+ 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+ 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x1b,
+ 0x1b, 0x1b, 0x3b, 0x6e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x1e, 0x33, 0x33, 0x33, 0x1b, 0x33,
+ 0x63, 0x63, 0x63, 0x33, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x7f, 0x63, 0x63, 0x03, 0x03, 0x03,
+ 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x7f, 0x36, 0x36, 0x36,
+ 0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x7f, 0x63, 0x06, 0x0c, 0x18,
+ 0x0c, 0x06, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x1b, 0x1b,
+ 0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66,
+ 0x66, 0x3e, 0x06, 0x06, 0x03, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x7e, 0x18, 0x3c, 0x66, 0x66,
+ 0x66, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x1c, 0x36, 0x63, 0x63, 0x7f,
+ 0x63, 0x63, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x1c, 0x36, 0x63, 0x63, 0x63, 0x36,
+ 0x36, 0x36, 0x36, 0x77, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x78, 0x0c, 0x18, 0x30, 0x7c, 0x66,
+ 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xdb, 0xdb,
+ 0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xc0, 0x60, 0x7e, 0xdb, 0xdb,
+ 0xcf, 0x7e, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x38, 0x0c, 0x06, 0x06, 0x3e, 0x06,
+ 0x06, 0x06, 0x0c, 0x38, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63,
+ 0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x7f,
+ 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18,
+ 0x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30,
+ 0x18, 0x0c, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x06, 0x0c,
+ 0x18, 0x30, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x70, 0xd8, 0xd8, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+ 0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e,
+ 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x00,
+ 0x6e, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x1c, 0x36, 0x36, 0x1c, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
+ 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xf0, 0x30, 0x30, 0x30, 0x30, 0x30, 0x37,
+ 0x36, 0x36, 0x3c, 0x38, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x1b, 0x36, 0x36, 0x36, 0x36, 0x36, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x0e, 0x1b, 0x0c, 0x06, 0x13, 0x1f, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e, 0x3e,
+ 0x3e, 0x3e, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+static const txt_font_t normal_font =
+{
+ "normal", normal_font_data, 8, 16,
+};
+
+#else
+
+static const uint8_t normal_font_data_z[1983] = {
+ 0x82, 0x87, 0x69, 0xb1, 0xe2, 0x88, 0x25, 0xb6, 0xb8, 0x4c, 0x0b, 0xaf, 0x79, 0x2f, 0x51, 0x55, 0xb9, 0x58, 0xac, 0x3b, 0xf2, 0x96, 0x15, 0x4f,
+ 0x35, 0x32, 0x85, 0x8b, 0x20, 0xf2, 0xe2, 0x62, 0xab, 0x12, 0x29, 0x76, 0xdd, 0xe4, 0xc5, 0x91, 0xc9, 0xbd, 0x23, 0x71, 0x6a, 0xab, 0xe9, 0xc2,
+ 0x08, 0xd0, 0x04, 0x82, 0x4b, 0x22, 0x10, 0x51, 0xe5, 0xa5, 0x31, 0x85, 0x4b, 0x35, 0x5e, 0xef, 0xba, 0x02, 0x37, 0x86, 0x29, 0xce, 0x0f, 0x5c,
+ 0x23, 0xa6, 0xba, 0x00, 0x00, 0x38, 0xff, 0xf4, 0x1f, 0x3f, 0xfd, 0xf4, 0x97, 0x9f, 0x7f, 0xfa, 0xe9, 0x0c, 0x9c, 0xf7, 0xfb, 0x7d, 0xbf, 0x7c,
+ 0xde, 0xf7, 0x33, 0xc0, 0xbc, 0x6d, 0xdb, 0xb6, 0x1e, 0x1f, 0x03, 0x3c, 0x3e, 0xae, 0xdb, 0x7a, 0x7c, 0x0c, 0x90, 0x65, 0xf9, 0xfc, 0xf9, 0x73,
+ 0xb2, 0x00, 0xb2, 0x9c, 0xf7, 0xfd, 0x9c, 0x2c, 0x00, 0x64, 0x59, 0x02, 0xec, 0xfb, 0xbe, 0xef, 0xfb, 0xe7, 0xcb, 0xe5, 0xf3, 0xbe, 0xef, 0xfb,
+ 0xbe, 0x83, 0xa5, 0xfe, 0xe9, 0x4f, 0x75, 0x01, 0xfb, 0xbe, 0xef, 0xfb, 0xe5, 0xe7, 0xbf, 0xfc, 0xe5, 0xe7, 0xcb, 0xbe, 0xef, 0xfb, 0xce, 0xdb,
+ 0x37, 0xff, 0xf8, 0x0f, 0xd7, 0xd3, 0x34, 0x4d, 0xd7, 0xc0, 0x52, 0x6b, 0xad, 0x4b, 0xce, 0x09, 0xf0, 0xfb, 0x7f, 0xfd, 0x3e, 0x0c, 0xc3, 0xf0,
+ 0xe4, 0xf0, 0x08, 0xf8, 0xdb, 0x2f, 0x7f, 0xfb, 0xe5, 0x97, 0x5f, 0x7e, 0xf9, 0xbf, 0xcf, 0xaf, 0x3a, 0x20, 0xb9, 0x5f, 0x3e, 0x2f, 0xf7, 0x09,
+ 0xf8, 0xa6, 0x7b, 0x74, 0xb8, 0xd9, 0x6e, 0x0e, 0x8f, 0xba, 0x6f, 0xc0, 0x77, 0xa7, 0x37, 0x6f, 0x7f, 0xdc, 0x7e, 0x7c, 0xfb, 0xe6, 0xf4, 0x1d,
+ 0x90, 0xe5, 0x9c, 0xe4, 0xbc, 0x04, 0x50, 0x6b, 0xad, 0xb5, 0x56, 0xb5, 0x02, 0x7f, 0xbb, 0xbf, 0xbf, 0xff, 0xdf, 0x4f, 0x9f, 0x3e, 0x7d, 0xfa,
+ 0x04, 0xd6, 0xd2, 0x1f, 0xe7, 0x52, 0xe6, 0xe3, 0x58, 0x56, 0x00, 0x6c, 0xdb, 0xb6, 0x01, 0x59, 0xce, 0x49, 0xce, 0x4b, 0xce, 0x40, 0x96, 0x73,
+ 0x92, 0x24, 0x01, 0x92, 0x24, 0xc9, 0x79, 0x09, 0x80, 0x8c, 0xdb, 0x18, 0x00, 0x0c, 0xfd, 0xd6, 0x0f, 0x00, 0xd0, 0x75, 0xdd, 0x06, 0x80, 0x3f,
+ 0xd4, 0xbd, 0xfe, 0x01, 0x80, 0xc7, 0xc7, 0xe3, 0xba, 0x6e, 0x1b, 0x80, 0x6d, 0x5b, 0xd7, 0xe3, 0xf1, 0x31, 0x00, 0x00, 0x20, 0xcb, 0xb2, 0x24,
+ 0x91, 0x80, 0x5a, 0xeb, 0x1f, 0x00, 0x80, 0x79, 0xde, 0xe6, 0x79, 0xde, 0xe6, 0x19, 0x92, 0xb5, 0xbc, 0xe8, 0xd6, 0xd3, 0xe9, 0xcf, 0x65, 0x4d,
+ 0x80, 0x17, 0x65, 0xcc, 0xd0, 0x97, 0x3f, 0x03, 0xc7, 0x79, 0x3e, 0xde, 0xdd, 0x4e, 0xd3, 0x74, 0x07, 0x86, 0x61, 0xe8, 0x01, 0xc0, 0x98, 0x61,
+ 0x18, 0x86, 0x61, 0xc8, 0x08, 0x0c, 0x19, 0xc7, 0x71, 0x1c, 0xc7, 0x0c, 0x00, 0xea, 0xb2, 0x2f, 0x15, 0x00, 0xc9, 0x39, 0x01, 0x00, 0x24, 0x19,
+ 0x00, 0xd8, 0x00, 0x00, 0x48, 0x00, 0xbe, 0x3b, 0x8d, 0x19, 0xfa, 0xee, 0x1b, 0x60, 0xa9, 0x97, 0xcb, 0xfd, 0xfd, 0xe5, 0x52, 0x17, 0x20, 0xc7,
+ 0xeb, 0x24, 0x49, 0xce, 0xc0, 0x5a, 0x4e, 0x63, 0x86, 0xbe, 0x2b, 0x1b, 0xb0, 0x96, 0xd3, 0x69, 0x39, 0x9d, 0x4e, 0x65, 0x05, 0xc6, 0x67, 0xcb,
+ 0x3c, 0x6d, 0xe3, 0x38, 0xbe, 0x05, 0xb6, 0xae, 0xeb, 0x9e, 0x9f, 0x4e, 0xa7, 0xb2, 0x02, 0xc7, 0xbe, 0xeb, 0x9e, 0x97, 0x52, 0xca, 0x0a, 0x6c,
+ 0xe5, 0x74, 0x1a, 0x33, 0x0c, 0xc3, 0x00, 0xac, 0xa5, 0x94, 0xb5, 0x94, 0x52, 0x56, 0x60, 0x2d, 0xa5, 0x9c, 0x4f, 0xa7, 0xd3, 0x78, 0x0d, 0x90,
+ 0x20, 0x01, 0x90, 0x20, 0x19, 0x00, 0xa7, 0x31, 0x43, 0x3f, 0x64, 0x3c, 0x01, 0x38, 0x73, 0x06, 0xa0, 0x1f, 0x32, 0x9e, 0xc6, 0x0c, 0x3d, 0xb0,
+ 0x96, 0x32, 0x26, 0x91, 0x00, 0xd6, 0x52, 0xde, 0xbd, 0x7b, 0x77, 0xdb, 0xad, 0xc0, 0xe3, 0xe3, 0x5c, 0xca, 0x56, 0x4a, 0x29, 0xc0, 0xf3, 0x5a,
+ 0xeb, 0x5a, 0x6b, 0xad, 0xcf, 0x81, 0xa5, 0xbe, 0xe8, 0xba, 0xae, 0x7b, 0x51, 0x17, 0xe0, 0x66, 0xae, 0xb5, 0xd6, 0x5a, 0xe7, 0x1b, 0x60, 0xab,
+ 0xdf, 0x7f, 0x7b, 0xfd, 0x6d, 0xff, 0x7d, 0xdd, 0x80, 0xad, 0x7e, 0xff, 0xed, 0xf5, 0xb7, 0x7d, 0xdf, 0x1f, 0x80, 0xa5, 0xbe, 0xe8, 0xba, 0x77,
+ 0xa5, 0xd4, 0x7f, 0x02, 0x4a, 0x29, 0x65, 0x2b, 0xa5, 0x94, 0x02, 0x2c, 0x49, 0x92, 0x24, 0x0b, 0xf0, 0x76, 0x1c, 0xc7, 0x71, 0x9c, 0xa6, 0xe9,
+ 0x1a, 0x78, 0x55, 0xeb, 0x7c, 0x7d, 0x3d, 0xd7, 0xfa, 0x0a, 0x38, 0xf4, 0x7d, 0xdf, 0xf7, 0xfd, 0xf7, 0x75, 0x03, 0x2e, 0x9f, 0xf7, 0xfd, 0xfe,
+ 0x72, 0xb9, 0x5c, 0x2e, 0x40, 0x79, 0xf5, 0x7a, 0x7b, 0xf7, 0x43, 0x29, 0xa5, 0x00, 0x6b, 0x29, 0xa5, 0x94, 0x52, 0xca, 0x0a, 0x3c, 0xaf, 0xb5,
+ 0xae, 0x7d, 0xdf, 0xf7, 0x07, 0x60, 0x2d, 0xa5, 0x94, 0x52, 0xfe, 0xe5, 0xdd, 0x3a, 0xbe, 0x81, 0xe7, 0xb5, 0xd6, 0x75, 0xae, 0xb5, 0xbe, 0x02,
+ 0xd6, 0x52, 0xfa, 0xe3, 0x78, 0x2a, 0x65, 0x05, 0xf6, 0xfb, 0x9f, 0x93, 0x24, 0x59, 0x80, 0x52, 0x4a, 0x29, 0xa5, 0x94, 0xb2, 0x02, 0x97, 0xcb,
+ 0xe5, 0x72, 0xb9, 0x5c, 0xea, 0x12, 0xe0, 0x72, 0xb9, 0x5c, 0x2e, 0xf7, 0xf7, 0x7b, 0xad, 0xc0, 0xe5, 0x52, 0x97, 0x64, 0xa9, 0x97, 0x0b, 0x70,
+ 0xb9, 0x5c, 0xea, 0x92, 0x24, 0x0b, 0xb0, 0x5f, 0xfe, 0x3c, 0x66, 0xe8, 0xff, 0xfd, 0xb2, 0x03, 0xcb, 0x30, 0x0c, 0xc3, 0x30, 0x0c, 0xc3, 0x02,
+ 0xf8, 0xa6, 0x7b, 0xf4, 0xe4, 0xf8, 0xec, 0xcd, 0xe9, 0x3b, 0x60, 0x19, 0xc7, 0x71, 0x1c, 0xc7, 0x71, 0x5c, 0xe0, 0xf1, 0x71, 0x2e, 0x00, 0x00,
+ 0x00, 0x76, 0x86, 0x21, 0x00, 0x00, 0x5c, 0x8f, 0xeb, 0x34, 0x4d, 0x77, 0xc0, 0xa3, 0xbe, 0xbf, 0x9e, 0x6b, 0xad, 0x75, 0x05, 0xb0, 0x96, 0xae,
+ 0xeb, 0xca, 0x0a, 0x3c, 0x1b, 0xc7, 0x65, 0x9e, 0xa6, 0x69, 0xba, 0x03, 0xb0, 0x96, 0xad, 0xeb, 0xca, 0x0a, 0x1c, 0xe7, 0x3f, 0xf6, 0x87, 0xbe,
+ 0xef, 0xfb, 0x03, 0x80, 0xbb, 0x69, 0x9a, 0xa6, 0x69, 0x1d, 0xa7, 0x6b, 0x3c, 0xea, 0xfb, 0xf9, 0xae, 0xd6, 0x5a, 0x5f, 0x01, 0x89, 0x63, 0x92,
+ 0x64, 0x01, 0x4e, 0x27, 0x6f, 0x4e, 0xa7, 0xd3, 0xe9, 0x74, 0xaa, 0x75, 0xc1, 0xa3, 0xbe, 0xaf, 0xf3, 0xf5, 0xf5, 0x5c, 0x5f, 0x01, 0xc7, 0x24,
+ 0x49, 0x92, 0x05, 0xc0, 0xab, 0xfd, 0xfe, 0xfe, 0xfe, 0xfe, 0x1e, 0xc0, 0x6d, 0xad, 0xb5, 0xd6, 0x0a, 0x60, 0x2d, 0xa5, 0x94, 0xb2, 0x02, 0xb8,
+ 0xad, 0xb5, 0xd6, 0xba, 0xf6, 0xfd, 0x01, 0xb8, 0x9b, 0xa6, 0x69, 0x9a, 0xd6, 0x71, 0x7c, 0x0b, 0xdc, 0xde, 0xd5, 0xbe, 0xef, 0x0f, 0x00, 0xd6,
+ 0xd2, 0x1f, 0xc7, 0xb2, 0x02, 0x8f, 0x87, 0xe1, 0xf9, 0x30, 0x0c, 0x43, 0x7b, 0x06, 0x60, 0x9a, 0xa6, 0x69, 0x9a, 0xee, 0x00, 0x5c, 0x2e, 0x97,
+ 0x4b, 0x5d, 0x02, 0xe0, 0x72, 0xb9, 0xdc, 0xdf, 0xef, 0x15, 0xc0, 0xa5, 0x2e, 0x59, 0xea, 0x05, 0x40, 0x29, 0xa5, 0x94, 0x72, 0x3e, 0x8d, 0x37,
+ 0xc0, 0x36, 0x65, 0xe8, 0xcb, 0x06, 0xbc, 0x49, 0xf2, 0x24, 0x49, 0xde, 0x00, 0x49, 0x22, 0x49, 0x02, 0x3c, 0x49, 0xf2, 0x26, 0x49, 0x9e, 0x00,
+ 0x77, 0xb7, 0x00, 0x00, 0x8f, 0x8f, 0x73, 0x29, 0x65, 0x03, 0x2c, 0xf5, 0x45, 0xd7, 0x75, 0x2f, 0xea, 0x32, 0x9e, 0x56, 0x98, 0x98, 0xa6, 0x69,
+ 0x9a, 0xa6, 0x3b, 0x30, 0x66, 0xb0, 0x96, 0xad, 0xeb, 0xca, 0x0a, 0x1e, 0x1f, 0x67, 0xd7, 0xe3, 0x3a, 0x4d, 0xd3, 0x1d, 0x30, 0x71, 0x3d, 0xae,
+ 0xd3, 0x34, 0xdd, 0x81, 0x7e, 0x88, 0xeb, 0x71, 0x9d, 0xa6, 0xe9, 0x0e, 0x1c, 0xe7, 0xa3, 0xeb, 0x71, 0x9d, 0xa6, 0xe9, 0x0e, 0x60, 0xa9, 0x7d,
+ 0x5f, 0x97, 0xf1, 0xb4, 0xc0, 0xe3, 0xe3, 0x6c, 0x2d, 0x5b, 0xd7, 0x95, 0x15, 0x28, 0xac, 0x65, 0xeb, 0xba, 0xb2, 0x82, 0x7e, 0x88, 0xb5, 0x6c,
+ 0x5d, 0x57, 0x56, 0xa0, 0x72, 0x4c, 0x92, 0x2c, 0x20, 0x4b, 0x75, 0x4c, 0x92, 0x2c, 0xa0, 0x1f, 0xe2, 0x98, 0x24, 0x59, 0x40, 0xf1, 0xf8, 0x38,
+ 0x97, 0xb2, 0x95, 0x52, 0xe0, 0x38, 0x1f, 0x1d, 0xe7, 0x52, 0xb6, 0x52, 0x0a, 0x64, 0xe8, 0x6d, 0xb5, 0x5f, 0xfb, 0xbe, 0x6e, 0x00, 0xfe, 0xf5,
+ 0x7f, 0x3e, 0x9d, 0xaf, 0x6e, 0xbf, 0x00, 0x3f, 0xce, 0xd3, 0xb4, 0x4d, 0xd3, 0x34, 0xfd, 0x00, 0x1e, 0x1f, 0x67, 0x6b, 0x29, 0xa5, 0x94, 0x15,
+ 0x28, 0xac, 0xa5, 0x94, 0x52, 0x56, 0xd0, 0x0f, 0xb1, 0x96, 0x52, 0x4a, 0x59, 0xc1, 0x70, 0x3d, 0x99, 0xa6, 0x69, 0x9a, 0xa6, 0x3b, 0xd0, 0x0f,
+ 0x31, 0x4d, 0xd3, 0x34, 0x4d, 0x77, 0x40, 0xa1, 0x94, 0x52, 0x4a, 0x39, 0x9f, 0xc6, 0x6b, 0x8a, 0xb5, 0x94, 0x52, 0x4a, 0x29, 0x2b, 0x28, 0x4a,
+ 0x29, 0xa5, 0x94, 0x52, 0x56, 0x90, 0x9c, 0x2f, 0x5d, 0xd7, 0x5d, 0xce, 0x09, 0x38, 0xce, 0x7f, 0xec, 0x0f, 0x7d, 0xdf, 0xf7, 0xaf, 0x9e, 0x03,
+ 0x97, 0xba, 0x64, 0xcf, 0x9e, 0x04, 0x3c, 0xaf, 0x75, 0xfd, 0xbe, 0xfe, 0x7f, 0xad, 0xf5, 0xaf, 0xe0, 0xcd, 0xa7, 0x24, 0xe7, 0x24, 0xc9, 0xd5,
+ 0x13, 0x64, 0xe8, 0x5d, 0x8f, 0xeb, 0x34, 0x4d, 0x77, 0x60, 0xcc, 0xe0, 0x98, 0x24, 0x59, 0x40, 0x86, 0xde, 0x5a, 0x4a, 0x29, 0x65, 0x05, 0x19,
+ 0x7a, 0xd3, 0x34, 0x4d, 0xd3, 0x74, 0x07, 0xdc, 0xdd, 0xba, 0xad, 0xb5, 0xd6, 0x5a, 0xe1, 0xee, 0x56, 0x79, 0xf5, 0x7a, 0x7b, 0xf7, 0x43, 0x29,
+ 0x05, 0x2c, 0xf3, 0xfc, 0xa3, 0x33, 0x00, 0xc7, 0x79, 0x3e, 0x5a, 0x01, 0x30, 0x0c, 0x86, 0xa1, 0xef, 0x4a, 0x59, 0x01, 0xd8, 0xba, 0xae, 0xeb,
+ 0x00, 0xb0, 0x9d, 0x4e, 0xa7, 0x13, 0xd0, 0x75, 0x2f, 0xca, 0x94, 0xa1, 0xff, 0xe1, 0xbf, 0x4f, 0xe3, 0x57, 0x74, 0xdd, 0x8b, 0x32, 0x65, 0xa8,
+ 0x3f, 0xfc, 0xf3, 0x8f, 0xa7, 0x13, 0x24, 0x92, 0x2c, 0xcb, 0x12, 0x00, 0x6d, 0xbe, 0x9a, 0x1b, 0x00, 0xae, 0xe6, 0x36, 0x5f, 0x01, 0xef, 0x9f,
+ 0xbe, 0x7f, 0xfa, 0xfe, 0xe9, 0xfb, 0xa7, 0xef, 0x9f, 0xbe, 0x7f, 0xfa, 0xfe, 0xe9, 0xfb, 0xa7, 0x1f, 0x5e, 0x7e, 0x78, 0xf9, 0xe1, 0xe5, 0x87,
+ 0x97, 0x1f, 0x5e, 0x7e, 0x78, 0xf9, 0xe1, 0xe5, 0x87, 0x97, 0x1f, 0xbf, 0x7c, 0xfc, 0xf2, 0xf1, 0xcb, 0xc7, 0x2f, 0x1f, 0xbf, 0x7c, 0xfc, 0xf2,
+ 0xf1, 0xcb, 0xc7, 0x2f, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, 0x49, 0x92, 0xe4, 0x26, 0x49, 0x92, 0x24, 0x49, 0x72, 0x93, 0x9b, 0x24, 0x49, 0x92,
+ 0xd6, 0x5a, 0x6b, 0xad, 0xbd, 0x6e, 0xad, 0xb5, 0xd6, 0x5a, 0x03, 0x6c, 0xad, 0xb5, 0xd6, 0x5a, 0x6b, 0xe0, 0x26, 0x37, 0x49, 0x92, 0x24, 0xad,
+ 0xb5, 0xd6, 0x5e, 0x9f, 0x5e, 0xb7, 0xd6, 0x5a, 0x6b, 0xad, 0xb5, 0xd6, 0x5a, 0x6b, 0xad, 0xb5, 0xd6, 0x5a, 0x6b, 0xad, 0x81, 0xed, 0xf4, 0xba,
+ 0xb5, 0xd6, 0x5a, 0x6b, 0xad, 0xb5, 0xd6, 0xda, 0xeb, 0xd3, 0x06, 0xd0, 0x5a, 0x6b, 0xad, 0xb5, 0x0d, 0x20, 0x49, 0x72, 0x93, 0x1b, 0x00, 0xc0,
+ 0x4d, 0x92, 0x24, 0x49, 0x92, 0x24, 0xf9, 0x0a, 0x90, 0x24, 0x49, 0x76, 0x00, 0xc0, 0x9e, 0x24, 0x49, 0x92, 0x24, 0x49, 0xbe, 0x26, 0x49, 0x92,
+ 0x00, 0x76, 0x80, 0x24, 0x49, 0xb2, 0x27, 0x49, 0x92, 0x24, 0x49, 0xbe, 0xe6, 0x6b, 0x92, 0x24, 0x49, 0x6b, 0xad, 0xb5, 0xd6, 0x7e, 0x6d, 0xad,
+ 0xb5, 0xd6, 0x5a, 0x6b, 0xad, 0xb5, 0xf6, 0xeb, 0xf0, 0x3b, 0x00, 0xf8, 0x7d, 0xf8, 0xb5, 0xb5, 0xd6, 0x5a, 0x6b, 0xad, 0xb5, 0xd6, 0xda, 0x6f,
+ 0x76, 0x00, 0xb0, 0xfb, 0xad, 0xb5, 0xd6, 0x5a, 0x6b, 0xad, 0xb5, 0xd6, 0xda, 0xaf, 0xc3, 0xaf, 0xad, 0xb5, 0xd6, 0x5a, 0x6b, 0x60, 0xb7, 0x03,
+ 0xb4, 0xd6, 0x5a, 0xfb, 0xcd, 0x6f, 0xad, 0xb5, 0xd6, 0x5a, 0x6b, 0x49, 0x92, 0xdd, 0x0e, 0xd0, 0x5a, 0x6b, 0xad, 0xb5, 0x1d, 0x00, 0xec, 0xf6,
+ 0x24, 0x49, 0x12, 0xc0, 0xde, 0x5a, 0x6b, 0xad, 0xb5, 0xd6, 0x5a, 0x6b, 0xad, 0xb5, 0xdf, 0x01, 0x92, 0x24, 0x5f, 0xf3, 0x15, 0x00, 0x7c, 0xcd,
+ 0xd7, 0x24, 0x49, 0x12, 0xc0, 0xef, 0xad, 0xb5, 0xd6, 0x5a, 0x6b, 0xad, 0xb5, 0xd6, 0x5a, 0xdb, 0x5b, 0x6b, 0xad, 0xb5, 0xd6, 0x92, 0x24, 0x7b,
+ 0xf6, 0x24, 0x49, 0x92, 0x24, 0x49, 0x72, 0x03, 0x00, 0xf8, 0x9a, 0x24, 0x49, 0xb2, 0xef, 0xfb, 0xbe, 0xef, 0xfb, 0xbe, 0xef, 0xfb, 0xbe, 0xef,
+ 0xfb, 0x0e, 0xd8, 0xf7, 0x7d, 0xdf, 0xf7, 0x7d, 0xdf, 0x0f, 0x87, 0xc3, 0xe1, 0x70, 0x38, 0x1c, 0x0e, 0x87, 0xc3, 0xe1, 0x70, 0x38, 0x1c, 0x1e,
+ 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0xf6, 0x7d, 0xdf, 0xf7, 0x7d, 0x07, 0x00, 0xee, 0x6e,
+ 0xaf, 0xae, 0xae, 0x6e, 0xef, 0x80, 0xeb, 0x69, 0x9a, 0xae, 0xa6, 0x52, 0xca, 0x04, 0x6c, 0xa5, 0x74, 0x5d, 0xd7, 0x75, 0x5d, 0x07, 0xb0, 0xcd,
+ 0xf3, 0x3c, 0xcf, 0xf3, 0x0c, 0xd8, 0x4a, 0x3f, 0x64, 0xe8, 0xcb, 0x06, 0xe0, 0x7c, 0x75, 0x75, 0x75, 0x75, 0xf5, 0x04, 0xa0, 0xd6, 0x5a, 0xeb,
+ 0xda, 0xf7, 0x1d, 0xe0, 0xee, 0x36, 0x49, 0x12, 0xc0, 0x39, 0x4b, 0xad, 0x75, 0xc9, 0x19, 0x70, 0x9c, 0x4b, 0xd9, 0x4a, 0x99, 0x8f, 0xc0, 0x71,
+ 0x2e, 0xa5, 0xcc, 0xf3, 0x3c, 0xff, 0x1b, 0xf0, 0x76, 0xc8, 0xf8, 0x63, 0xad, 0xb5, 0x2e, 0x00, 0xce, 0xf7, 0xf7, 0xf7, 0x67, 0x00, 0xff, 0x79,
+ 0x3a, 0xdf, 0xdf, 0xff, 0xf5, 0xdc, 0x77, 0xc0, 0xb3, 0xa1, 0xef, 0xd7, 0xbe, 0xef, 0x87, 0x67, 0x80, 0xb5, 0x94, 0x52, 0x4a, 0x29, 0x05, 0x60,
+ 0x63, 0x63, 0x03, 0x90, 0x9c, 0x13, 0x76, 0xc0, 0x90, 0xf1, 0x34, 0x66, 0x70, 0x06, 0x8c, 0x19, 0xfa, 0x21, 0xa3, 0x33, 0xf0, 0xe6, 0xd3, 0xa7,
+ 0x24, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, 0x57, 0x57, 0x57, 0x4f, 0x00, 0x12, 0x67, 0x09, 0x00, 0x77, 0xb7, 0xee, 0x6e, 0x01, 0xc7, 0x79, 0x3e,
+ 0x02, 0x00, 0x90, 0x00, 0x00, 0x02, 0xf0, 0x30, 0x8e, 0xe3, 0x38, 0xfe, 0xfd, 0x3c, 0x2f, 0xcf, 0xc0, 0xd5, 0x3c, 0xcf, 0xf3, 0x0c, 0xc0, 0x93,
+ 0xab, 0xa1, 0xff, 0xbb, 0x1b, 0x00, 0xb0, 0xae, 0xeb, 0xba, 0xae, 0x2b, 0x00, 0x00, 0x00,
+};
+#endif
diff --git a/games/doom/tools/whd_gen/whd_gen.cpp b/games/doom/tools/whd_gen/whd_gen.cpp
index f4bf4d87..7269f246 100644
--- a/games/doom/tools/whd_gen/whd_gen.cpp
+++ b/games/doom/tools/whd_gen/whd_gen.cpp
@@ -3,6 +3,7 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
+#include "config.h" // (this folder's: the engine's headers would otherwise find the engine's own config.h)
#include "wad.h"
#include <iostream>
#include <ostream>
@@ -36,12 +37,15 @@ typedef struct __packed {
const uint8_t w;
const uint8_t h;
} txt_font_t;
-#include "../../textscreen/fonts/normal.h"
+#include "textscreen_normal_font.h" /* (Chocolate Doom's textscreen font) */
bool super_tiny = true;
// -silent: no sound effects or music (a calculator has no speaker), their lumps kept empty
bool silent = false;
+// -lossless: what RP2040 Doom approximates is kept as in the WAD: the menu, status bar and font graphics
+// keep all their colours (RP2040 Doom merges the closest to fit them in 16 or 64), and segs keep their angles
+bool lossless = false;
using std::vector;
@@ -748,6 +752,9 @@ struct texture_index {
extern "C" {
#include "adpcm-lib.h"
+#ifndef LOOKAHEAD
+#define LOOKAHEAD 3 // (as config.h has it; with -silent there are no sounds to encode)
+#endif
}
template<typename T>
@@ -2041,6 +2048,21 @@ void convert_vpatch(wad &wad, lump &patch, int max_colors, bool use_runs, std::s
// note in the case of shared_palettes we are doing the same color reduction work for every patch, but it is idempotent, and it was easier
// than extracting/refactoring the code!!!
+ if (lossless) {
+ std::set<int> own;
+ for (const auto &p: pix) own.insert(p);
+ int needed = (int)own.size() - (own.find(-1) != own.end() ? 1 : 0);
+ const std::set<int> &pal = shared_palette_handle >= 0 ? colors : own;
+ int cap = max_colors + (use_runs && pal.find(-1) != pal.end() ? 1 : 0);
+ if ((int)pal.size() > cap) {
+ // a palette big enough for this patch alone, and runs for its transparent pixels
+ max_colors = needed <= 16 ? 16 : needed <= 64 ? 64 : 256;
+ use_runs = true;
+ shared_palette_handle = -1;
+ colors = own;
+ }
+ if (needed > 255) fail("too many colours for a vpatch");
+ }
if (use_runs && colors.find(-1) != colors.end()) max_colors++;
// this only saves 500 bytes (trying 4 color textures)
// if (max_colors == 16 || max_colors == 17) {
@@ -2186,8 +2208,8 @@ void convert_vpatch(wad &wad, lump &patch, int max_colors, bool use_runs, std::s
if (xend - x >= 255) fail("gap too big");
patch.data.push_back(xend - x);
x = xend;
- while (xend < ph.width && pix[i + xend] != -1) xend++;
- if (xend - x > 255) fail("run too big");
+ // (a longer run goes on as another, after a gap of 0)
+ while (xend < ph.width && pix[i + xend] != -1 && xend - x < 255) xend++;
patch.data.push_back(xend - x);
}
} else {
@@ -2852,6 +2874,12 @@ std::vector<int> convert_segs(wad &wad, lump &lump, const std::vector<int>& line
newdata.push_back(ms.offset&0xff);
}
}
+ if (lossless) {
+ // the seg's own angle, which vanilla draws its wall with (RP2040 Doom works it out from the
+ // vertexes again, which is not always the same to the last bits)
+ newdata.push_back(ms.angle & 0xff);
+ newdata.push_back((ms.angle >> 8) & 0xff);
+ }
}
offset = 0;
int pos = 0;
@@ -2877,6 +2905,10 @@ std::vector<int> convert_segs(wad &wad, lump &lump, const std::vector<int>& line
}
pos += 5;
assert(soffset == ms.offset);
+ if (lossless) {
+ assert((short)(newdata[pos] | (newdata[pos + 1] << 8)) == ms.angle);
+ pos += 2;
+ }
}
rc.push_back(newdata.size()); // we need an end marker too
}
@@ -4729,6 +4761,7 @@ int main(int argc, const char **argv) {
while (argn < argc && argv[argn][0] == '-') {
if (!strcmp(argv[argn], "-no-super-tiny")) super_tiny = false;
else if (!strcmp(argv[argn], "-silent")) silent = true;
+ else if (!strcmp(argv[argn], "-lossless")) lossless = true;
else usage();
argn++;
}