Additional tileset tweaks

JustRegularLuna · Nov 6, 2018 · 51f3de2 · 51f3de2
1 parent 508ddcc
commit 51f3de2
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/color/data/map_palette_sets.asm b/color/data/map_palette_sets.asm
@@ -17,7 +17,7 @@ MapPaletteSets:
 	db INDOOR_BLUE
 	db INDOOR_YELLOW
 	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
+	db INDOOR_PURPLE
 	db CRYS_TEXTBOX
 
 ; MART
@@ -87,7 +87,7 @@ MapPaletteSets:
 	db INDOOR_BLUE
 	db INDOOR_YELLOW
 	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
+	db INDOOR_PURPLE
 	db CRYS_TEXTBOX
 
 ; FOREST_GATE

diff --git a/color/loadpalettes.asm b/color/loadpalettes.asm
@@ -89,13 +89,13 @@ LoadTilesetPalette:
 	jr nz,.copyLoop
 
 	; HAX: set route gate roofs (outside the tileset) to GRAY
-	ld a,0 ; GRAY
-	ld [hli], a
-	ld [hli], a
+	xor a ; GRAY
+	rept 8
 	ld [hli], a
+	endr
 
 	; Set the remaining values to CRYS_TEXTBOX for text
-	ld b,$9d ;a0 - 3
+	ld b,$98 ;a0 - 8
 	ld a,7;CRYS_TEXTBOX
 .fillLoop
 	ld [hli],a

diff --git a/color/tilesets/overworld.asm b/color/tilesets/overworld.asm
@@ -7,6 +7,6 @@
 	tilepal 0, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, ROOF, GRAY, GRAY, WATER, BROWN, GREEN, GREEN, BROWN
 	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, GRAY, BROWN, ROOF, ROOF, GRAY, GRAY
 	tilepal 0, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, ROOF, BROWN, ROOF, ROOF, GRAY, GRAY
diff --git a/color/tilesets/reds_house.asm b/color/tilesets/reds_house.asm
@@ -1,7 +1,7 @@
 	tilepal 0, BROWN, BROWN, ROOF, ROOF, RED, GRAY, WATER, WATER
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, ROOF, ROOF
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, ROOF, ROOF, RED, GRAY, WATER, WATER
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, ROOF, ROOF
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN

diff --git a/gfx/blocksets/overworld.bst b/gfx/blocksets/overworld.bst
@@ -68,4 +68,4 @@ KKKK
 
 
 
-KKKKUUUUUUUU77UUUU77UUUUUUUUUUUU<<<<<<<<<<FG<<VWSS888SSSSSS	888[[[[[[[[[[FG[[VW,,,,,,,,FGUUVWUUUUUU^^^^:___:,,,:,,,^^^^___:,,:,,::,,,:,,,^^^^____,,:,,:^^^^____^^^^____,,,,,,,,,,,,,,,,^^^^____:,,,:,,,:,,,:,,,,,:,,:,,:,,:,,,,,,,,^^FG__VW:,,,:,,,:,,,_,,,,,:,,:,,:,,_^,,,:,,,:,,,:,,,,,^,,:,,:,,:99999999^^^^____99999999^^FG__VW<<UU<<<<UU<<<<<<UU<<<<UUL```ZaaaZaaa\bbb````aaaaaaaabbbb```MaaaZaaaZbbb]
+KKKKUUUUUUUU77UUUU77UUUUUUUUUUUU<<<<<<<<<<FG<<VWSS888SSSSSS	888[[[[[[[[[[FG[[VW,,,,,,,,FGUUVWUUUUUU^^^^:___:,,,:,,,^^^^___:,,:,,::,,,:,,,^^^^____,,:,,:^^^^____^^^^____,,,,,,,,,,,,,,,,^^^^____:,,,:,,,:,,,:,,,,,:,,:,,:,,:,,,,,,,,^^FG__VW:,,,:,,,:,,,_,,,,,:,,:,,:,,_^,,,:,,,:,,,:,,,,,^,,:,,:,,:99999999^^^^____99999999^^FG__VW<<UU<<<<UU<<<<<<UU<<<<UUd```caaacaaafbbb````aaaaaaaabbbb```eaaacaaacbbbg

diff --git a/gfx/text_box.png b/gfx/text_box.png
diff --git a/gfx/tilesets/house.t2.png b/gfx/tilesets/house.t2.png
diff --git a/gfx/tilesets/reds_house.png b/gfx/tilesets/reds_house.png
diff --git a/maps/PalletTown.blk b/maps/PalletTown.blk
@@ -1,2 +1,2 @@
-mnm<=<=nmnm�� !nmtt7:~nm���1n1tt
+mnm<=<=nmnm�����nmtt7:~nm���1n1tt
 1ned11111n
Original file line number	Diff line number	Diff line change
Expand Up		@@ -68,4 +68,4 @@ KKKK



		KKKKUUUUUUUU77UUUU77UUUUUUUUUUUU<<<<<<<<<<FG<<VWSS888SSSSSS 888[[[[[[[[[[FG[[VW,,,,,,,,FGUUVWUUUUUU^^^^:___:,,,:,,,^^^^___:,,:,,::,,,:,,,^^^^____,,:,,:^^^^____^^^^____,,,,,,,,,,,,,,,,^^^^____:,,,:,,,:,,,:,,,,,:,,:,,:,,:,,,,,,,,^^FG__VW:,,,:,,,:,,,_,,,,,:,,:,,:,,_^,,,:,,,:,,,:,,,,,^,,:,,:,,:99999999^^^^____99999999^^FG__VW<<UU<<<<UU<<<<<<UU<<<<UUL```ZaaaZaaa\bbb````aaaaaaaabbbb```MaaaZaaaZbbb]
		KKKKUUUUUUUU77UUUU77UUUUUUUUUUUU<<<<<<<<<<FG<<VWSS888SSSSSS 888[[[[[[[[[[FG[[VW,,,,,,,,FGUUVWUUUUUU^^^^:___:,,,:,,,^^^^___:,,:,,::,,,:,,,^^^^____,,:,,:^^^^____^^^^____,,,,,,,,,,,,,,,,^^^^____:,,,:,,,:,,,:,,,,,:,,:,,:,,:,,,,,,,,^^FG__VW:,,,:,,,:,,,_,,,,,:,,:,,:,,_^,,,:,,,:,,,:,,,,,^,,:,,:,,:99999999^^^^____99999999^^FG__VW<<UU<<<<UU<<<<<<UU<<<<UUd```caaacaaafbbb````aaaaaaaabbbb```eaaacaaacbbbg
Expand Down