# HG changeset patch # User John Tsiombikas # Date 1501141356 -10800 # Node ID 200e512488e4dcfb0c0021b7f320035c7a9c50ce # Parent b98fa9b135eaf6dc101401c5715e280471673bdd reduced sky copperlist, works on emulator only apparently diff -r b98fa9b135ea -r 200e512488e4 src/main.c --- a/src/main.c Thu Jul 27 02:34:42 2017 +0300 +++ b/src/main.c Thu Jul 27 10:42:36 2017 +0300 @@ -26,26 +26,33 @@ #define MAX_GRID_SHADES 6 static uint32_t *cplist_pal[MAX_GRID_SHADES]; -#define MAX_SKY_SHADES 32 -static uint16_t sky_color[] = { - 0x204, - 0x306, - 0x307, - 0x408, 0x408, - 0x509, - 0x50a, - 0x60b, 0x60b, - 0x60c, 0x60c, - 0x70c, 0x70c, - 0x80c, - 0x80d, - 0x90d, 0x90d, - 0xa0d, - 0xb0c, 0xb0c, 0xb0c, - 0xc0c, 0xc0c, - 0xd0c, 0xd0c, - 0xd0b, 0xd0b, 0xd0b, 0xd0b, - 0xe0a, 0xe0a, 0xe0a +#define MAX_SKY_SHADES 25 +static uint16_t sky_color[][2] = { + {0, 0x204}, + {2, 0x205}, + {3, 0x305}, + {4, 0x306}, + {8, 0x307}, + {10, 0x407}, + {12, 0x408}, + {18, 0x508}, + {20, 0x509}, + {26, 0x50a}, + {28, 0x60a}, + {30, 0x60b}, + {38, 0x60c}, + {46, 0x70c}, + {52, 0x80c}, + {58, 0x80d}, + {62, 0x90d}, + {68, 0xa0d}, + {72, 0xb0d}, + {74, 0xb0c}, + {86, 0xc0c}, + {94, 0xd0c}, + {102, 0xd0b}, + {116, 0xe0b}, + {118, 0xe0a} }; int init(void); @@ -78,8 +85,6 @@ for(i=0; i> 8) * (i + 1) / MAX_GRID_SHADES; uint16_t g = ((grid_pal[j] & 0xf0) >> 4) * (i + 1) / MAX_GRID_SHADES; uint16_t b = (grid_pal[j] & 0xf) * (i + 1) / MAX_GRID_SHADES; @@ -128,9 +133,12 @@ grid_pal = (uint16_t*)(grid_addr + BPLSIZE * 3); - grid_bpl0_addr = grid_addr; - grid_bpl1_addr = grid_addr + BPLSIZE; - grid_bpl2_addr = grid_addr + BPLSIZE * 2; + /* XXX +10 hardcoded temporary scroll to see the middle of the grid + * until we implement proper scrolling and parallax + */ + grid_bpl0_addr = grid_addr + 10; + grid_bpl1_addr = grid_addr + BPLSIZE + 10; + grid_bpl2_addr = grid_addr + BPLSIZE * 2 + 10; for(i=0; i<8; i++) { REG_COLOR_PTR[i] = grid_pal[i]; @@ -141,11 +149,11 @@ add_copper(COPPER_MOVE(REGN_BPL1PTH, backdrop_addr >> 16)); add_copper(COPPER_MOVE(REGN_BPL1PTL, backdrop_addr)); - add_copper(COPPER_MOVE(REGN_COLOR1, sky_color[0])); + add_copper(COPPER_MOVE(REGN_COLOR1, sky_color[0][1])); for(i=0; i