Skip to content

Commit 6ff996f

Browse files
JustRegularLunaJustRegularLuna
committed
Some things look better in color, shut RGBDS up
1 parent 28c3fd9 commit 6ff996f

22 files changed

+78
-67
lines changed

‎color/data/map_palette_constants.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ const_value = 0
2929
const CAVE_YELLOW ; 1B
3030
const CAVE_BROWN ; 1C
3131
const CAVE_LIGHT_BLUE ; 1D
32-
const BENCH_GUY_PAL ; 1E
32+
const POKECENTER_TABLE ; 1E
3333
const PC_POKEBALL_PAL ; 1F: doubles as textbox palette for some areas
3434
const FOREST_ROCKS ; 20
3535
const FOREST_TREES ; 21
3636
const ALT_TEXTBOX_PAL ; 22: used in areas with skeleton pokemon
37+
const POKECENTER_FLOOR ; 23
3738

3839
; These are unused
39-
const MAP_PALETTE_23 ; 23
4040
const MAP_PALETTE_24 ; 24
4141
const MAP_PALETTE_25 ; 25
4242
const MAP_PALETTE_26 ; 26

‎color/data/map_palette_sets.asm

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ MapPaletteSets:
6262

6363
; POKECENTER
6464
db INDOOR_GRAY
65-
db INDOOR_RED
65+
db POKECENTER_TABLE
6666
db INDOOR_GREEN
6767
db INDOOR_BLUE
6868
db INDOOR_YELLOW
6969
db INDOOR_BROWN
70-
db INDOOR_LIGHT_BLUE
70+
db POKECENTER_FLOOR
7171
db PC_POKEBALL_PAL
7272

7373
; GYM
@@ -122,10 +122,10 @@ MapPaletteSets:
122122

123123
; GATE
124124
db INDOOR_GRAY
125-
db INDOOR_RED
125+
db POKECENTER_TABLE
126126
db INDOOR_GREEN
127127
db INDOOR_BLUE
128-
db INDOOR_YELLOW
128+
db POKECENTER_FLOOR
129129
db INDOOR_BROWN
130130
db INDOOR_LIGHT_BLUE
131131
db CRYS_TEXTBOX

‎color/data/map_palettes.asm

+9-9
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,10 @@ MapPalettes:
182182
RGB 11,9,20
183183
RGB 0,0,0
184184

185-
; 0x1e: BENCH_GUY_PAL
186-
RGB 31,19,10
187-
RGB 31,19,24
188-
RGB 30,10,6
185+
; 0x1e: POKECENTER_TABLE
186+
RGB 31,29,27
187+
RGB 31,16,14
188+
RGB 25,10,08
189189
RGB 7,7,7
190190

191191
; 0x1f: PC_POKEBALL_PAL
@@ -212,11 +212,11 @@ MapPalettes:
212212
RGB 13,13,13
213213
RGB 0,0,0
214214

215-
; 0x23: MAP_PALETTE_23
216-
RGB 0,0,0
217-
RGB 0,0,0
218-
RGB 0,0,0
219-
RGB 0,0,0
215+
; 0x23: POKECENTER_FLOOR
216+
RGB 28,27,19
217+
RGB 27,24,13
218+
RGB 23,20,10
219+
RGB 7,7,7
220220

221221
; 0x24: MAP_PALETTE_24
222222
RGB 0,0,0

‎color/data/roofpalettes.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ RoofPalettes:
3838
dw CeruleanRoof ; ROUTE_25
3939

4040
PalletRoof:
41-
RGB 31,31,31
42-
RGB 24,24,24
41+
RGB 31,16,14
42+
RGB 25,10,08
4343

4444
ViridianRoof:
4545
RGB 0,29,7

‎color/sprites.asm

+11
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ ColorOverworldSprite:
6666
ld d,wSpriteStateData1>>8
6767
ld a,[de] ; Load A with picture ID
6868
dec a
69+
and a
70+
jr z, .playerSprite
6971

7072
ld de, SpritePaletteAssignments
7173
add e
@@ -74,7 +76,16 @@ ColorOverworldSprite:
7476
inc d
7577
.noCarry
7678
ld a,[de] ; Get the picture ID's palette
79+
jr .continue
80+
81+
.playerSprite
82+
ld a, [wPlayerGender]
83+
and a
84+
ld a, PAL_OW_RED
85+
jr z, .continue
86+
ld a, PAL_OW_GREEN
7787

88+
.continue
7889
; If it's PAL_OW_RANDOM, that means no particular palette is assigned
7990
cp PAL_OW_RANDOM
8091
jr nz,.norandomColor

‎color/tilesets/cemetery.asm

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN
33
tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
44
tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN
5-
tilepal 0, BROWN, BROWN, ROOF, BROWN, BROWN, BROWN, BROWN, RED
6-
tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, RED
7-
tilepal 0, BROWN, BROWN, RED, BROWN, BROWN, BROWN, BROWN, RED
8-
tilepal 0, ROOF, ROOF, WATER, WATER, WATER, GRAY, GRAY, RED
5+
tilepal 0, BROWN, BROWN, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY
6+
tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
7+
tilepal 0, BROWN, BROWN, RED, BROWN, BROWN, BROWN, BROWN, GRAY
8+
tilepal 0, ROOF, ROOF, WATER, WATER, WATER, GRAY, GRAY, GRAY
99
tilepal 0, BROWN, BROWN, RED, GRAY, BROWN, BROWN, BROWN, GRAY
1010
tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, WATER, BROWN
1111
tilepal 0, BROWN, BROWN, RED, GRAY, GRAY, GRAY, GRAY, BROWN

‎color/tilesets/facility.asm

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
tilepal 0, GRAY, GRAY, BROWN, GRAY, GRAY, GREEN, GREEN, BROWN
2-
tilepal 0, GRAY, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN
2+
tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
33
tilepal 0, GRAY, GRAY, BROWN, GRAY, WATER, GREEN, GREEN, BROWN
4-
tilepal 0, GRAY, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN
5-
tilepal 0, RED, RED, RED, TEXT, GRAY, GRAY, BROWN, GRAY
4+
tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
5+
tilepal 0, GRAY, GRAY, RED, GRAY, GRAY, GRAY, BROWN, GRAY
66
tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
7-
tilepal 0, RED, RED, RED, GRAY, GRAY, BROWN, BROWN, GRAY
8-
tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY
9-
tilepal 0, BROWN, BROWN, RED, GRAY, BROWN, BROWN, TEXT, TEXT
10-
tilepal 0, TEXT, TEXT, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN
11-
tilepal 0, BROWN, BROWN, RED, BROWN, BROWN, RED, GRAY, BROWN
12-
tilepal 0, GRAY, BROWN, GRAY, GRAY, TEXT, TEXT, RED, TEXT
7+
tilepal 0, GRAY, GRAY, RED, GRAY, GRAY, BROWN, BROWN, GRAY
8+
tilepal 0, GRAY, GRAY, WATER, WATER, WATER, GRAY, GRAY, GRAY
9+
tilepal 0, BROWN, BROWN, RED, GRAY, BROWN, BROWN, GRAY, GRAY
10+
tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
11+
tilepal 0, BROWN, BROWN, RED, BROWN, BROWN, RED, GRAY, WATER
12+
tilepal 0, GRAY, WATER, GRAY, GRAY, WATER, WATER, GRAY, GRAY

‎color/tilesets/gate.asm

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
tilepal 0, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
2-
tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
1+
tilepal 0, BROWN, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
2+
tilepal 0, BROWN, BROWN, GRAY, GRAY, YELLOW, YELLOW, GREEN, GREEN
33
tilepal 0, GRAY, BROWN, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN
4-
tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
4+
tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
55
tilepal 0, ROOF, ROOF, ROOF, ROOF, BROWN, BROWN, BROWN, RED
6-
tilepal 0, RED, RED, GRAY, ROOF, ROOF, ROOF, BROWN, BROWN
6+
tilepal 0, RED, RED, GRAY, RED, RED, RED, BROWN, BROWN
77
tilepal 0, ROOF, ROOF, ROOF, ROOF, BROWN, BROWN, BROWN, RED
8-
tilepal 0, GRAY, RED, GRAY, ROOF, ROOF, ROOF, BROWN, BROWN
8+
tilepal 0, GRAY, RED, GRAY, RED, RED, RED, BROWN, BROWN
99
tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, GRAY, RED
10-
tilepal 0, RED, RED, BROWN, ROOF, ROOF, ROOF, ROOF, WATER
11-
tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
12-
tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, ROOF, GRAY
10+
tilepal 0, RED, RED, GRAY, RED, RED, RED, ROOF, WATER
11+
tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
12+
tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, GRAY

‎color/tilesets/interior.asm

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
tilepal 0, GRAY, WATER, WATER, GRAY, GRAY, GRAY, GRAY, WATER
2-
tilepal 0, WATER, WATER, WATER, BROWN, BROWN, BROWN, BROWN, WATER
3-
tilepal 0, WATER, BROWN, BROWN, GREEN, GREEN, GRAY, GRAY, WATER
4-
tilepal 0, WATER, WATER, WATER, BROWN, BROWN, BROWN, BROWN, GRAY
5-
tilepal 0, GRAY, BROWN, BROWN, GREEN, GREEN, GRAY, GRAY, WATER
6-
tilepal 0, WATER, WATER, WATER, BROWN, BROWN, GRAY, GRAY, GRAY
7-
tilepal 0, GRAY, WATER, WATER, WATER, GRAY, GRAY, GRAY, WATER
8-
tilepal 0, WATER, WATER, WATER, BROWN, BROWN, BROWN, BROWN, BROWN
9-
tilepal 0, BROWN, WATER, WATER, WATER, BROWN, GRAY, RED, RED
2+
tilepal 0, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY, WATER
3+
tilepal 0, WATER, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, WATER
4+
tilepal 0, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY
5+
tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, WATER
6+
tilepal 0, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY
7+
tilepal 0, GRAY, GREEN, GREEN, GREEN, GRAY, GRAY, GRAY, WATER
8+
tilepal 0, WATER, WATER, WATER, GRAY, GRAY, BROWN, BROWN, BROWN
9+
tilepal 0, BROWN, GREEN, GREEN, GREEN, BROWN, GRAY, RED, RED
1010
tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
11-
tilepal 0, WATER, BROWN, BROWN, RED, RED, RED, RED, GRAY
12-
tilepal 0, BROWN, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY
11+
tilepal 0, WATER, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY
12+
tilepal 0, WATER, GRAY, GRAY, WATER, WATER, GRAY, GRAY, GRAY

‎color/tilesets/mansion.asm

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
tilepal 0, GRAY, RED, BROWN, BROWN, RED, ROOF, BROWN, BROWN
2-
tilepal 0, GREEN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
3-
tilepal 0, GRAY, ROOF, BROWN, BROWN, RED, BROWN, BROWN, BROWN
4-
tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
1+
tilepal 0, GRAY, BROWN, BROWN, BROWN, RED, RED, WATER, WATER
2+
tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, WATER, GRAY
3+
tilepal 0, GRAY, RED, BROWN, BROWN, RED, BROWN, WATER, WATER
4+
tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, WATER, GRAY
55
tilepal 0, ROOF, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
66
tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
7-
tilepal 0, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
7+
tilepal 0, WATER, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
88
tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN
99
tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
10-
tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
11-
tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
12-
tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
10+
tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
11+
tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
12+
tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN

‎color/tilesets/oakts.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
tilepal 0, ROOF, GRAY, BROWN, BROWN, RED, BROWN, BROWN, BROWN
1+
tilepal 0, ROOF, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
22
tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
3-
tilepal 0, RED, GRAY, BROWN, BROWN, RED, BROWN, BROWN, BROWN
3+
tilepal 0, RED, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
44
tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
55
tilepal 0, RED, BROWN, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF
66
tilepal 0, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

‎color/tilesets/pokecenter.asm

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
tilepal 0, GRAY, RED, RED, RED, RED, RED, RED, GRAY
22
tilepal 0, GRAY, GRAY, ROOF, GRAY, RED, RED, GREEN, GREEN
3-
tilepal 0, YELLOW, YELLOW, RED, GRAY, GRAY, GRAY, GRAY, GRAY
3+
tilepal 0, ROOF, ROOF, RED, GRAY, GRAY, GRAY, GRAY, GRAY
44
tilepal 0, GRAY, BROWN, GRAY, GRAY, RED, RED, GREEN, GREEN
5-
tilepal 0, BROWN, RED, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY
5+
tilepal 0, WATER, BROWN, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY
66
tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, BROWN, BROWN
7-
tilepal 0, BROWN, RED, YELLOW, GRAY, GRAY, GRAY, GRAY, RED
8-
tilepal 0, ROOF, GRAY, GRAY, RED, RED, RED, BROWN, BROWN
9-
tilepal 0, BROWN, BROWN, YELLOW, YELLOW, RED, GRAY, RED, GRAY
10-
tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, ROOF, ROOF
11-
tilepal 0, BROWN, BROWN, YELLOW, YELLOW, GRAY, GRAY, RED, GRAY
12-
tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, ROOF, ROOF
7+
tilepal 0, WATER, BROWN, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY
8+
tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, BROWN, BROWN
9+
tilepal 0, WATER, WATER, WATER, WATER, RED, GRAY, RED, GRAY
10+
tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, WATER, WATER
11+
tilepal 0, WATER, WATER, WATER, WATER, GRAY, GRAY, RED, GRAY
12+
tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, WATER, WATER

‎gfx/blocksets/mansion.bst

0 Bytes
Binary file not shown.

‎gfx/tilesets/cemetery.t4.png

141 Bytes
Loading

‎gfx/tilesets/facility.png

120 Bytes
Loading

‎gfx/tilesets/forest_gate.png

147 Bytes
Loading

‎gfx/tilesets/gate.t1.png

-64 Bytes
Loading

‎gfx/tilesets/house.t2.png

108 Bytes
Loading

‎gfx/tilesets/interior.t1.png

172 Bytes
Loading

‎gfx/tilesets/mansion.t2.png

157 Bytes
Loading

‎gfx/tilesets/pokecenter.png

-11 Bytes
Loading

‎macros/asm_macros.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
lb: MACRO ; r, hi, lo
3-
ld \1, (\2) << 8 + ((\3) & $ff)
3+
ld \1, ((\2) & $ff) << 8 + ((\3) & $ff)
44
ENDM
55

66
homecall: MACRO

0 commit comments

Comments
 (0)