From 84cf9e9bff3769531fb974a4e5ce91fc82e64743 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 26 Dec 2023 12:26:16 +0000 Subject: [PATCH] Oak's Lab improvements - Fixed some collision on the back wall - Made the exit tiles more obvious --- data/tilesets/collision_tile_ids.asm | 2 +- gfx/blocksets/fossillab.bst | Bin 928 -> 944 bytes gfx/tilesets/fossillab.png | Bin 2280 -> 1734 bytes maps/OaksLab.blk | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index 2c2c0669..c0433d36 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -59,7 +59,7 @@ Lab_Coll:: coll_tiles $0c, $26, $16, $1e, $34, $37 FossilLab_Coll:: ; Originally just the Lab collision, but now that Oak uses it, it's using separate collision. Added plenty just to be sure. - coll_tiles $0c, $26, $16, $1e, $34, $37, $17, $4C, $47, $58, $57, $59, $27, $4D + coll_tiles $0c, $26, $16, $1e, $34, $37, $17, $4C, $47, $58, $57, $59, $27, $4D, $4F Club_Coll:: coll_tiles $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41 diff --git a/gfx/blocksets/fossillab.bst b/gfx/blocksets/fossillab.bst index ba89bc108453d94300edde9140526cf2595530d1..6b5d55b39b21f9ebf97f899a6004f1da839bada0 100644 GIT binary patch delta 36 dcmZ3$zJYy$0f!P4Y_!N=7I23Ge;_ai0sy6h2OV1ZP1_K>z@;j|==^1poj5 z24YJ`L;(K){{a7>y{D4^00tpRL_t(|oZXviZrm^og!haAa(~49$t7DjDBH%Y?6b1qJ`Dhs0(3HYcu+~785rHbjRdtDz)THPebr{C z0?a7y76pj&%zwGpJ-i=(D+{OK5~C)noQeHc&q3R<1XNIDb;$ZuRSU1fy%X zTMkB+0QB811=tF}4h6^xL!j1S90%4%M{*|5IAXS_F@KLhGZTE}>!S)#IUpXoQvsY@ zBLM7_M*%Qn@%${fIMxvWI%9_Of3H)W^^={?0L)|pXEZB-1HetL3&5=Oue8Pay0N-B zAOzu~j#&WQ?l}t=QGg793HpW`e+7L;UOjIK?Xg$R?d-t^#1hG5}P6ycVBQ zfNbsxmS+NB#J&N5S>YVO1IHkYPGHqK01Re=oPR5xI|bmQ3pgKl05Dr_qvSlBDF7xj zA$3xv04w%z0A`$r^*b_$%AzbBFmmiVAj`haKBS{S*zaiIJN4e)-o6aa@mhAB>!gN( zZ&L&HcL6X1K?eZk^h}m#1DF96_bY(dK0ZFajDxHG?$p8lgpIuho&w;W3Xla;?GgA| zoPVDHKn2WYeRl2u5UTL~OJK(kfYHoR&X00J0npi%0^s~&Zc+GrCjgka6#$vEyLt)$ z=wt1-fLBle&e{wB4)!wx(6uQ5(6K6*Cjgj%U{nE|3OUfbZD!2@u*0SRaKS_;yn+H$ z<2$tp?7l^G0ElZ{TLwTmQYpYHo%c|HYJWeo62KK7MB5Ai4BQL=>e>$gN)HMUI_;6g#mKQMrVl`1wh&5Gu+&~9`SpSp)@IHY7#63V~ zzmQ$a0O0e^ocW&Xs|`SB7ux|KQ-SKuqx(iOs{q-?P;C@B^E<&0rQ(81SmzUN9HWg| zZt)(sSD%Z&=22yM7l3LB;PolacYo}nR}>)Y6Mdn87=2^tDgb9R2bF!Cz4mc?wsa4` z&gpD$I-5ZLLKXK%9GPXSv#PjF9^PkFK|reDD?i3Hl_W~GJ3D;k`^^7;=fiU4vLmw@ z0J3k|yREaFsH_ZlRslObzhyf)NG#d9bUMJD3>^i8703m@Dz3k5d@=9q$bb6`x9>>C zxcq4zFJKz{|miUK$QD&>0_1;C)HH-Ksha0*aOunT~?hsvOWj{#G* zLjfv#dIeB{uYUbfdw^L5=$kGvL|(w*s70 z0UY1#CKZEHEs3k9o^^Kxr~;ZfIL3&_dr9U=1#kfD8sEbK!2T-$REDeIcO9(28d;vQ zdf2y9fK>ph4KfGW{Yv<<0IVoL1;9v_X8<^OI)FII9W45^^Owr*2X zl`I=)*Lwu31Hh^RWG}%~AI_>a4*_7c>;T}TjVi~i0;uazM%&@>H^PL~2^_tu!~g&Q M07*qoM6N<$f;M6Rz5oCK delta 2268 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