diff --git a/palettes.txt b/palettes.txt index 9a7a6b8..1072c68 100644 --- a/palettes.txt +++ b/palettes.txt @@ -6,6 +6,7 @@ Arcade Mode palette notes: -- 2: dolphin shading -- 3: azure water, maybe score display? (140) -- 4, 5: keep default in sky layer (for emergency awakener) +-- 4 (underwater) is a deeper blue shade part of sea -- 6: dolphin specular highlights -- 7: dolphin white paint -- 8, 9: unassigned, layer specific diff --git a/vacation.p8 b/vacation.p8 index 4097473..8bd3b27 100644 --- a/vacation.p8 +++ b/vacation.p8 @@ -1377,24 +1377,20 @@ function wordtarget:draw() print(self.str, self.x, self.y, 0x100a) end -game_nrm_pal = { - [0] = 1, 0, 2, 140, 4, 5, 7, 7, 8, 9, 10, 132, 12, 12, 14, 7 -} - --- undersea palette local decisions: --- 4: deeper sea blue (129) -game_uw_pal = { - [0]=1, 0, 130, 140, 129, 5, 141, 13, 8, 9, 10, 132, 131, 12, 141, 7 -} - function setup_arcade_pal() -- per-line color mode poke(0x5f5f, 0x10) -- rows 72 and lower: sea memset(0x5f79,0xff,7) pal() - pal(game_nrm_pal, 1) - pal(game_uw_pal, 2) + --game_nrm_pal + pal({ + [0] = 1, 0, 2, 140, 4, 5, 7, 7, 8, 9, 10, 132, 12, 12, 14, 7 + }, 1) + --game_uw_pal + pal({ + [0]=1, 0, 130, 140, 129, 5, 141, 13, 8, 9, 10, 132, 131, 12, 141, 7 + }, 2) end function wave() @@ -1696,7 +1692,7 @@ function ggwp:draw() print(self.score_str, xpos+1, 33, 12) print(self.score_str, xpos, 32, 0) - print(self.score_pct,64-3*#self.score_pct,59,self.col) + print(self.score_pct,64-print(self.score_pct,0,-9999)/2,59,self.col) font_default() local xoff = print(self.final_text, 0, -999, 0) - 1