From b63a10d0cecf602d90cf8c3c609538fa9202989f Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Sun, 21 Jul 2024 03:34:53 -0400 Subject: [PATCH] mild improvements to tilesets + blue is blue now --- data/sprites/sprites.asm | 2 +- data/tilesets/nihon01_metatiles.bin | Bin 2288 -> 2288 bytes data/tilesets/nihon_snowy_attributes.bin | Bin 736 -> 752 bytes data/tilesets/nihon_snowy_collision.asm | 1 + data/tilesets/nihon_snowy_metatiles.bin | Bin 736 -> 752 bytes gfx/tilesets/bluelab.png | Bin 851 -> 1963 bytes gfx/tilesets/nihon_snowy.png | Bin 3646 -> 3909 bytes maps/BlueForest.ablk | 2 +- maps/SilentHills.ablk | 2 +- 9 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index c8b536d..7dc4585 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -13,7 +13,7 @@ OverworldSprites: overworld_sprite RivalSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite OakSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN overworld_sprite RedSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED - overworld_sprite BlueSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite BlueSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite BillSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite ElderSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN overworld_sprite JanineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED diff --git a/data/tilesets/nihon01_metatiles.bin b/data/tilesets/nihon01_metatiles.bin index 7fc86789c5d3925349db72f388b03c7c5f5ff857..8adce6ec754b6cd43b35374a4d7c8f0422eb3cf0 100644 GIT binary patch delta 14 Vcmew$_(5>PY8FPN&1+a(SO6}g1uy^r delta 14 Vcmew$_(5>PY8FPF&1+a(SO6~H1v&r# diff --git a/data/tilesets/nihon_snowy_attributes.bin b/data/tilesets/nihon_snowy_attributes.bin index a536c8d4a8585ea0088753e9f1ee94cc7f36000d..dac245ac3d4b3961b0be1077924aae230bf93ac8 100644 GIT binary patch delta 115 zcmaFB`hj%=2O|dq6igOiG>`@HkTFOO&Y!3#Jh_0;ToEpSEQ!pXs3@`c0VAUT6B7di J2t!CFCIDCS2%P`` delta 34 kcmeys`hax<2O|d)6igOiG?=JpFu8!ye4>Ws;s=b30EX-c6aWAK diff --git a/data/tilesets/nihon_snowy_collision.asm b/data/tilesets/nihon_snowy_collision.asm index fddf294..5d011e9 100644 --- a/data/tilesets/nihon_snowy_collision.asm +++ b/data/tilesets/nihon_snowy_collision.asm @@ -44,3 +44,4 @@ tilecoll WATER, WATER, WATER, WATER ; 2b tilecoll WATER, WATER, WATER, WATER ; 2c tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2d + tilecoll PIT, FLOOR, PIT, FLOOR ; 2e diff --git a/data/tilesets/nihon_snowy_metatiles.bin b/data/tilesets/nihon_snowy_metatiles.bin index ad0ad6faac9e955b47e582c31bd1171dc28631d3..ed883a7ba12c9fc4f91bd13efd9e0e69ceb08a72 100644 GIT binary patch delta 98 zcmaFB`hj(W1EU-R8c+fP1~oM`i16e%Mo&dF6`0)3Cm1Cd1)N>j7>t}4*w`4HT^QJm FoB-eM2=f2{ delta 81 vcmeys`hazV1EZXh5(9&p8Uq7@R#H*}0tkO{9HXZqiY&Tn5P$OtMhQj$`B4iI diff --git a/gfx/tilesets/bluelab.png b/gfx/tilesets/bluelab.png index 7d9c5cf235c596468b389d1416ff136c0782bb32..a32434fd5d0cf3e7f416306722cb96b9d7c3b329 100644 GIT binary patch delta 1961 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 Nm>XLfRTwx%{}Tdp?QQ@7 literal 3646 zcma)wXdlbAtW`s3s`=*cZay7S}8QfZ9y49e3cq77ez! z9R>hM_WTn9uQVl(@1HbgYi03glLpXED-d^Tg$&>cHLHg0ht2iw%c< zxgIhPw9(RX`l-n6hlpX9*H}zqVBbbIG0uBGBS;F%J=Nb=iskyk^zI4kseHS^-R-!HoB43l zOi2n|YvLj`nOx?9e1)?VYf5x=f)vLBicQb$MX1CGwhXpX)yx{S&2VP$U(#geqyvoY#Qe z_mp6J`)At=Tbf1@0uxG-!`;!s^0yI#oTbxc6;<(l4@hvevfgAIUy)N7iWw@W3#uCK z9h|l(CBSq4psxh$SJ$JxHqr^srs0upKVu3-{f6y&F;EhF9BK5lF@XnkJDHy1|A+3hW~0turOA%6;jww;2;l=JgB@p>RQfQajPIaUDxuh zQm%eRVV{VmwzqL~KJpRk!hm$VM01q8g>oM?^!ftxR=Kgo@fsibLf)QyD@Y9VRplTu271mb)RfSoh{q;qBEF02HmZ7~0=docc zwiLH&t5}93P5?UFJmO6XEtxU7{s=g4wQ;{5gC4X3b(J#e(cCVxa>K{9wbX}^9;D=u z%!9S&5ax8YOY+=5y-MDl@A^RRSqQpdl$OqwHq8yzuR8lEzxsqnUKx$*=uG{7PC;gf zq3)X8DEHZn$;ZMs`s?K1F|$TQ&qqP`sg%ySz&i;wSt^HHYVBPOYlR@E2f9xX@+TI& z#dygf8PJxq6l)aAdBmBsZb#wVAhFvCDvLfd90h*QHxR?DM2&;4J!CW<=^@W%X2nT6Spcv&Y@WLKOT77<9L}CDpzKEV)LTI zJ| zGX3X-c?(c+g?6Q(JB8;a)+|u6;bcP#?oyYMS>~BirH)EewbkZ8BpttnbZ`5FJoiaZ}V94H(rdcDV zr(|FH+_CL5tF7_cPtuxb*Tv_~-Tq|4JG5)tLwpu$59>x;m9SI@$VnR2GpQn1%>iV;{IySG& zc=~q=w!GRKix=b8&gT2FQ7-ZwaLvE96Zo^bM=~5G^`d z@z~yJV9^t`IuYv&#z3;Q&yq{9Kg0sFoO|Ap5Cmi9R3;hBZra@GiQY2TVV#}FCp$Yr zbd%;>V6QSJJyIfVYbNjEY}RD^srMZEL_L5Yk9UjrLA}vk`OkS*SA>>lT*GJK8K2=J z_^bei49|Ea&WaA&8JKKDNi|X(M+CTClNI1O|D2ecu-WBHfsdl|SG7pZ*7&8k={A+5 z#_b_|t1p=8-yp)j} z`hvozBwQk(kLR=gXkW4&iCFq5l8O$?@7#>^FC5w8$8{f?!PcmLL@x zqk4S&WwgwaVCV<8=GFZ2Kf26vF<~>JG}=46}pLI0;6CiVHI$=!*7T zmCflmbC5fDyT?3WiQk5SvMXb%03t6;%B_otCl4D+Lb4|Vd!KZ|p3li#VO`L;rAg|} z`P3B~;W-139shulHxDhWyuR30iE)~{5}(>B@+J=Pm@Z^r{rM9>-rF_tslIMkZ?62e zS)5pK2m{z+#1e$(M+@i>{-1K*-n98%so)qNxs3H7=~<)((6G(O{i|{~=0(F|3ebj6 z9TfBJw>RsFQc3d6NP!mRDe<1X?0u(UAExBb())Xz9IoHDFRzwa`un5lLhvatR^(Po z-T&?-?!(1Ptr2c4vtkodG$)yx05Rt#;{VveA=^7DZr_I@<7c!?yn-(*(}`e+5ImoI zxy#hKk+>=#SM86c3u(cr|7}mg%r(;5csb` z`Xl0}lK6N|U+7x%O&Gg8#@gig$pVQi!ebk6%XjrBzEY)s_&*81Wc7dTihx~ekxlVeq%Vj&Q-lVO@xO4qMzT+X*Yq3;kZdv~?O(J0g)mUS zzw;nfWX8Q{>aaxk*?-mlOXn5Mfj4^dE-hmMAiJ=x`PflcK%fYHhl^;R`jYqOFUGZPzez(hK#8BFVP4QP ze_$P3{N8iWZ0Z1Mf63KY6r}a}7pnNGV!|dqkJqe1~x1`XngQ>(M zjfDow4&fQCAQvwhVyu%N7Oe6iHM81P{2@2^%%XkayFeOZyb~-CcOyA<=zHwi#^?>m lLbi~J{}_LWlMufR!i|`@EYh_`_y2qVTWbfa>fhWR{ujh7ab^Gj diff --git a/maps/BlueForest.ablk b/maps/BlueForest.ablk index 5e75b3d..0d30dc1 100644 --- a/maps/BlueForest.ablk +++ b/maps/BlueForest.ablk @@ -1,2 +1,2 @@ -&(*)'%%%%%"!#%% ! %    +&(*)'%%%%%"!#%% ! % ....      -%%%%%%%%%%%%% \ No newline at end of file diff --git a/maps/SilentHills.ablk b/maps/SilentHills.ablk index d0c52be..3c9777e 100644 --- a/maps/SilentHills.ablk +++ b/maps/SilentHills.ablk @@ -1 +1 @@ -IJHF|}+BF~-/JIJ !A|}G~-$AAAAAATnnnnUX5555Y \ No newline at end of file +IJHF|}+BF~-/JIJ !A|}G~-bAAAAAATnnnnUX5555Y \ No newline at end of file