Skip to content

Commit c90fdf9

Browse files
committed
Add final polish
Correct CGB colors, mainly
1 parent 400c2f4 commit c90fdf9

File tree

4 files changed

+22
-16
lines changed

4 files changed

+22
-16
lines changed

src/patch.asm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,6 +1232,7 @@ wText:
12321232
INCLUDE "res/text.bin.size"
12331233
ds SIZE
12341234

1235+
static_assert @ == WINX_BASE, "{@} != {WINX_BASE}"
12351236
wWindowXValuesRLE:
12361237
INCLUDE "res/winx.bin.size"
12371238
ds SIZE - NB_STREAMED_TILES * 16

src/res/palettes.asm

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,29 @@ SECTION "Palettes", ROM0[0]
1010

1111
; BG0
1212
rgb 255, 255, 255 ; Light
13-
rgb 122, 35, 105 ; Character skin
14-
rgb 51, 44, 80 ; Window frame
13+
rgb 177, 89, 165 ; Character skin
14+
rgb 71, 64, 100 ; Window frame
1515
rgb 0, 0, 0 ; Outside dark
1616
; BG1
1717
rgb 255, 255, 255 ; Light
18-
rgb 122, 35, 105 ; Character skin
19-
rgb 51, 44, 80 ; Window frame
20-
rgb 16, 18, 85 ; Car interior
18+
rgb 177, 89, 165 ; Character skin
19+
rgb 71, 64, 100 ; Window frame
20+
rgb 16, 16, 85 ; Car interior
2121
; BG2
2222
rgb 255, 255, 255 ; Light
23-
rgb 122, 35, 105 ; Character skin
24-
rgb 68, 40, 91 ; Character "edges" & clothes
25-
rgb 16, 18, 85 ; Car interior
23+
rgb 177, 89, 165 ; Character skin
24+
rgb 108, 44, 121 ; Character "edges" & clothes
25+
rgb 16, 16, 85 ; Car interior
2626
; BG3
2727
rgb 255, 255, 255 ; Light
28-
rgb 122, 35, 105 ; Character skin
29-
rgb 68, 40, 91 ; Character "edges" & clothes
28+
rgb 177, 89, 165 ; Character skin
29+
rgb 108, 44, 121 ; Character "edges" & clothes
3030
rgb 0, 0, 0 ; Outside dark
3131
; BG4
3232
rgb 255, 255, 255 ; Light
33-
rgb 122, 35, 105 ; Character skin
34-
rgb 68, 40, 91 ; Character "edges" & clothes
35-
rgb 18, 25, 87 ; Eye
33+
rgb 177, 89, 165 ; Character skin
34+
rgb 108, 44, 121 ; Character "edges" & clothes
35+
rgb 16, 25, 87 ; Eye
3636
; BG5
3737
rgb 255, 255, 255 ; Light (unused)
3838
rgb 108, 108, 108 ; Cartridge
@@ -44,5 +44,5 @@ SECTION "Palettes", ROM0[0]
4444
; OBJ0
4545
dw 0 ; Unused
4646
rgb 8, 128, 128 ; GB shell (flashing on DMG)
47-
rgb 68, 40, 91 ; GB shell "edges"
47+
rgb 68, 44, 91 ; GB shell "edges"
4848
rgb 255, 255, 255 ; GB light & text

src/res/text.asm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ SECTION "Text", ROM0[0]
5454
frame "CODE", "", "ISSOTM"
5555
frame "GFX", "", "DOCTOR"
5656
frame "MUSIC", "", "DEVED"
57+
frame "GREETS TO", "PHANTASY", ""
58+
frame "GREETS TO", "SNORPUNG", "CNCD"
5759
frame "PRESS ANY", "BTN FOR", "THE GAME"
58-
frame "SCROLLER", "LOOPS NOW", "..."
60+
frame "SCROLLER", "LOOPING", "..."
5961
db 0 ; Terminator

src/res/winx.asm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ INCLUDE "hardware.inc/hardware.inc"
44

55
SECTION "Data", ROM0[0]
66

7-
LOAD "Decompressed data", WRAM0[$C22C]
7+
WINX_BASE equ $C25C
8+
PRINTT "WINX_BASE equ {WINX_BASE}\n"
9+
10+
LOAD "Decompressed data", WRAM0[WINX_BASE]
811

912
WXVAL_LEN = 0 ; Length of dest buffer
1013
CUR_FRAME = 0

0 commit comments

Comments
 (0)