From 51f3de2a18543e5e3dba926328e4bfd5a0e125c3 Mon Sep 17 00:00:00 2001 From: TheFakeMateo Date: Mon, 5 Nov 2018 22:23:19 -0600 Subject: [PATCH] Additional tileset tweaks --- color/data/map_palette_sets.asm | 4 ++-- color/loadpalettes.asm | 8 ++++---- color/tilesets/overworld.asm | 4 ++-- color/tilesets/reds_house.asm | 4 ++-- gfx/blocksets/overworld.bst | 2 +- gfx/text_box.png | Bin 631 -> 610 bytes gfx/tilesets/house.t2.png | Bin 1944 -> 1698 bytes gfx/tilesets/reds_house.png | Bin 1489 -> 1421 bytes maps/PalletTown.blk | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/color/data/map_palette_sets.asm b/color/data/map_palette_sets.asm index 12130339e..747e5b294 100755 --- 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 index fea737e94..2371daed1 100755 --- 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 index 32887c092..5d195091b 100755 --- 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 index fc9446612..b5562b99c 100755 --- 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 index 0413768eb..c4bcd3da2 100755 --- a/gfx/blocksets/overworld.bst +++ b/gfx/blocksets/overworld.bst @@ -68,4 +68,4 @@ KKKK -KKKKUUUUUUUU77UUUU77UUUUUUUUUUUU<<<<<<<<<b!0Ruw#w!@J$Cw~F)Nkli2qJ2pFkgifv z1+z*x%1k@uBV)_JgNM+Pv?y|(=W!fla9!7J+eH0+-{B#p1m^Hs+7prLy}H8~;JyAX zBT{&nB1X*n1Hk?a81*6M-O7Nti+O(lfMsJqIr2)`QdZG1G9RFOHq8h`Kg z6=tE40hy)=r{)@8Li<*3)4vIDC;$*-;wU_xhX@VGbO73DMq`WO>ffz_Ca=ZrPWpTb zf#7DGo~QfQVx+lwy+4h-RO0U2)*IBJ70L)dA`~QI`LfPhL15ap4Xa} zq2nnTDH`uCxt(!jJ9f=GzZ@>tW$FSjRX+ZAj>gaEHZTAHQy|=Z4gfjH@~V_3<0e%d;pO&Cw~G4Nklv$Ox;_kp>3_7; zW20*vN5rqhds&wuVY4mNWx6ZZ&|T+30C~!La)W_*4M4!`X{W(0}h`rfX9_ znvT#zy%Eug1ck| diff --git a/gfx/tilesets/house.t2.png b/gfx/tilesets/house.t2.png index 2e53ebc53162a810f663491875721b25f8231b58..afddd2c57deaa2b803d843a4113742619f55a5bb 100755 GIT binary patch delta 1683 zcmV;E25kA5526i_BYy^INklmy{LLfzXz5Gx~ za>NIo4G_%Z>+9?L`}_F2^*8*Mh_HnpFhAHRg8eSUr(cQ&5SXe^Mo zB^`A#fgiZXWAQrr$tLOtHO7Qu;iZHZ$uq3bXqmpVq9YS~{(sYYC&q&&a(&v}tfY@V z*(jvOE%fPSC0xat9>lQG2M_v)On*?j?=Nlg{ZZVEO;XXnQCJTUg52t6v5HXtu75J%zw!Z7V?q2q*a%18#S)`F zB*yL+c+i$@Ux@L;pyO@~YIqkRbb?J^3_Y(h;5zwU5C7FA*a^Wtz&pm}bP#{o zyJeRnNdHti|FvCt7RXco%xUP~cV=D;~j8w;4(zRB}W?yk*Ib)`su;*Cs z$lMz9fFCO~3bzoZ!1Wa~U6hgv4i2ZCP@q0;?|-?42FnP|Jn#x(pNLuKn_22x7^O4W2Z22LX~SB<9nBz^9=O-xMCbDx>ltA zP2qxwMg1DiXNy^jH6TaXp$QUmfk*kXk>GFw=e}KX!DGei#*9T3hK4?XiSB*!a{SGi z;eT7H&*HqWlN#c*sZ8wz11d0-c~FTm5(vRq>jjC5?Ha(AZM485Z`vqoknJSlQyqqm z;)#0j@je<5q72UidsEcxHVd0VlNDA5z&DKIi6qW=PYozKhP+Nf+K13ouKaiv7$;wH(y%YNL3f5`SmBi3ZfA&~HSS7?A8BzrLvE-F(25d`y)} zwpr+M4EDlu&wOh4Z!$q!G{9pXNyhQ}S$S;BV$9_&Ry705r!w&6y;PjJ4bSvvY+HWYLhY`#`i?+vWS{<1wO34h~* zsyF1<29Lqphn$||JmnfEq+pgyIqqiX9ViG?N;aQG#j%lP-x?8YxOUJcGX8?ytnF%r zpJO!T%)}RJ8Kwhv|mm0jcY0oEO8UE}L&Iy5|@V%oLX^ov?}bLHrSw4Zo)b z$QBb5L{`fC_1rV)hMn5J_7B;I>VJ=(9PqlHf{#B9xudXJBH5>gKCYeSC~Cme)yudM z)I!{YYIaZ-CdI-?2jN!`kTs+K`oS!3rvUD-X^o*$D9ecYLeVbHiFfHZq)Z^kl%w{R4f4UcOkO6_+UFa*5XiZ6 zxmjlbE2$K91+@$wQOi5BHO-5AE_KsSrxJi;;3fl dGYjE<0T{I2&ctU@K@0!@002ovPDHLkV1oYPK41U< delta 1931 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 Z{s2u~QlS>D%q0K-002ovPDHLkV1n&-#HIiM diff --git a/maps/PalletTown.blk b/maps/PalletTown.blk index c3065b56d..346933ad6 100755 --- a/maps/PalletTown.blk +++ b/maps/PalletTown.blk @@ -1,2 +1,2 @@ - m  nm<=<=nmnm’• !nmtt7:~nmš›š1n1tt + m  nm<=<=nmnm’•žŸ nmtt7:~nmš›š1n1tt 1ned11111n \ No newline at end of file