From c84c56eb860c2d7003b92d8205d6fc1f80f6bb95 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Sun, 20 Oct 2024 02:36:28 -0400 Subject: [PATCH] Quiet Cave Tileset --- constants/map_constants.asm | 2 +- constants/tileset_constants.asm | 1 + data/maps/attributes.asm | 2 +- data/maps/maps.asm | 2 +- data/tilesets.asm | 1 + data/tilesets/lushcave_attributes.bin | Bin 0 -> 1344 bytes data/tilesets/lushcave_collision.asm | 84 ++++++++++++++++++++++++++ data/tilesets/lushcave_metatiles.bin | Bin 0 -> 1344 bytes data/tilesets/nihon01_metatiles.bin | Bin 2288 -> 2288 bytes engine/tilesets/tileset_anims.asm | 13 ++++ gfx/tilesets.asm | 12 ++++ gfx/tilesets/lushcave.png | Bin 0 -> 2816 bytes gfx/tilesets/sevii.png | Bin 4334 -> 4313 bytes maps/QuietCave.ablk | 3 +- maps/QuietCave.asm | 24 ++++---- 15 files changed, 128 insertions(+), 16 deletions(-) create mode 100644 data/tilesets/lushcave_attributes.bin create mode 100644 data/tilesets/lushcave_collision.asm create mode 100644 data/tilesets/lushcave_metatiles.bin create mode 100644 gfx/tilesets/lushcave.png diff --git a/constants/map_constants.asm b/constants/map_constants.asm index d9a7b86..13f78fc 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -636,7 +636,7 @@ ENDM map_const SILENT_HILLS, 10, 10 ; 4 map_const DEBUG_ROOM, 20, 20 ; 5 map_const ROUTE_49, 15, 9 ; 6 - map_const QUIET_CAVE, 27, 18 ; 7 + map_const QUIET_CAVE, 25, 18 ; 7 map_const ROUTE_49_2, 10, 19 ; 8 map_const SILENT_HILLS_POKECENTER_1F, 10, 4 ; 9 map_const SILVERS_HOUSE, 5, 5 ; 10 diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index af23d86..dc89852 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -52,6 +52,7 @@ const TILESET_NIHON_MART ; 32 const TILESET_NIHON_WHITECITY ; 33 const TILESET_SEVII ; 34 + const TILESET_LUSHCAVE ; 35 DEF NUM_TILESETS EQU const_value - 1 ; wTileset struct size diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 2035990..51cf634 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -834,7 +834,7 @@ ENDM connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0 connection west, SilentHills, SILENT_HILLS, 0 - map_attributes QuietCave, QUIET_CAVE, $76, 0 + map_attributes QuietCave, QUIET_CAVE, $01, 0 map_attributes BlueLab, BLUE_LAB, $00, 0 map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0 map_attributes SilversHouse, SILVERS_HOUSE, $00, 0 diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 36d532d..95ec5a5 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -695,7 +695,7 @@ MapGroup_SilentHills: map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_NONE map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_DEBUG_ROOM, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND - map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND + map QuietCave, TILESET_LUSHCAVE, FOREST, LANDMARK_QUIET_CAVE, MUSIC_NIHONTIME, TRUE, PALETTE_NITE, FISHGROUP_POND map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE diff --git a/data/tilesets.asm b/data/tilesets.asm index 5ac4b37..76b6733 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -64,4 +64,5 @@ Tilesets:: tileset TilesetNihonMart tileset TilesetNihonWhiteCity tileset TilesetSevii + tileset TilesetLushCave assert_table_length NUM_TILESETS + 1 diff --git a/data/tilesets/lushcave_attributes.bin b/data/tilesets/lushcave_attributes.bin new file mode 100644 index 0000000000000000000000000000000000000000..e38fe531339a28b6d3d87f8a46048a5c223037b2 GIT binary patch literal 1344 zcmb7@ix$El3`22~|Nmvv!lf(Bp*_RClC+{LC0pItaU9j3?iYA#*NUG2;wPKh+tkUg z^#rPQCs0K ULn|4_*~(SmM02oGFu11k0sB=Gw*UYD literal 0 HcmV?d00001 diff --git a/data/tilesets/lushcave_collision.asm b/data/tilesets/lushcave_collision.asm new file mode 100644 index 0000000..b47fa90 --- /dev/null +++ b/data/tilesets/lushcave_collision.asm @@ -0,0 +1,84 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 + tilecoll WALL, WALL, WALL, DOOR ; 13 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, WALL ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 18 + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll FLOOR, WALL, WALL, WALL ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll WALL, WALL, WALL, FLOOR ; 24 + tilecoll WALL, HEADBUTT_TREE, WALL, FLOOR ; 25 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 26 + tilecoll HEADBUTT_TREE, WALL, FLOOR, WALL ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, WALL, WALL, WALL ; 2b + tilecoll FLOOR, WALL, FLOOR, WALL ; 2c + tilecoll FLOOR, FLOOR, WALL, WALL ; 2d + tilecoll WALL, FLOOR, WALL, FLOOR ; 2e + tilecoll WALL, FLOOR, WALL, WALL ; 2f + tilecoll WALL, FLOOR, WALL, WALL ; 30 + tilecoll FLOOR, FLOOR, WALL, WALL ; 31 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 32 + tilecoll FLOOR, WALL, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, FLOOR ; 34 + tilecoll WALL, WALL, FLOOR, FLOOR ; 35 + tilecoll WALL, WALL, WALL, WALL ; 36 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 37 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3b + tilecoll WALL, FLOOR, WALL, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 40 + tilecoll FLOOR, WALL, WALL, WALL ; 41 + tilecoll FLOOR, FLOOR, WALL, WALL ; 42 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 43 + tilecoll FLOOR, WALL, FLOOR, WALL ; 44 + tilecoll FLOOR, WALL, FLOOR, WALL ; 45 + tilecoll WALL, FLOOR, WALL, HEADBUTT_TREE ; 46 + tilecoll FLOOR, WALL, HEADBUTT_TREE, WALL ; 47 + tilecoll WALL, FLOOR, WALL, FLOOR ; 48 + tilecoll FLOOR, WALL, FLOOR, WALL ; 49 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 4c + tilecoll WATER, WATER, WATER, WATER ; 4d + tilecoll WATER, WATER, WATER, WATER ; 4e + tilecoll WATER, WATER, WATER, WATER ; 4f + tilecoll WATER, WATER, WATER, WATER ; 50 + tilecoll WATER, WATER, WATER, WATER ; 51 + tilecoll WATER, WATER, WATER, WATER ; 52 + tilecoll WATER, WATER, WATER, WATER ; 53 diff --git a/data/tilesets/lushcave_metatiles.bin b/data/tilesets/lushcave_metatiles.bin new file mode 100644 index 0000000000000000000000000000000000000000..29883bdee69a21114a9f8a103bfb4e44615dabc6 GIT binary patch literal 1344 zcmaJ>O;5ux44n!S(%M2T&CO+lOPAeS3GRGcL25a}|Nj>}Cw1bMffqYpeop-2uGwsw zP1C@lgQc|;?;k{8-|J;NFTx~RyB^1BJq)f_vh&_M7zg9T{Fc)DlF=BAL(D6>LJLD+ z7P3AckcIR^KRmz0-#Cra8E6mVVQ}>M0{+B&@@O8-$nBl?_Yc8;+jU#qY`z_J5F4lK zZZLH)&aL+ZW4-%@?W^Ehc-;ahmtxc%VVIORJL?L2ba#XRL5qNsn4tNaQd&Q-N@hhrQo zHue!&)m42s9*)AV)f}&?na#e*U-DDD-d}q?%kn}0yuW>0%}M&qzkS{8k$JcrA?LBo zFGo;bb!9nMyzb`wB3p~^4NkaE_zu;7{cg$&NxezU&b`(FbF2%kC#?hQ7tyB(bsYAK uSRVyq$a(1>Bp?3ga`->l@Aqz2;Ss|mk_RTN3jY$mY&2md#sx`O?C}pI34U|{ literal 0 HcmV?d00001 diff --git a/data/tilesets/nihon01_metatiles.bin b/data/tilesets/nihon01_metatiles.bin index 722eba45475ead18efa955d49b25bb92cfb842fc..d0c81f64a48aff2679adcc159d008329c612bb3b 100644 GIT binary patch delta 19 acmew$_(5=k6f>K%2`j6r^JWF+3#odtvd diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index bf97101..2965b44 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -308,6 +308,19 @@ TilesetSeviiAnim: dw NULL, StandingTileFrame8 dw NULL, DoneTileAnimation +TilesetLushCaveAnim: + dw vTiles2 tile $14, ReadTileToAnimBuffer + dw NULL, AnimateFlowerTile + dw wTileAnimBuffer, ScrollTileRightLeft + dw vTiles2 tile $14, WriteTileFromAnimBuffer + dw NULL, AnimateWaterPalette + dw vTiles2 tile $40, ReadTileToAnimBuffer + dw wTileAnimBuffer, ScrollTileDown + dw wTileAnimBuffer, ScrollTileDown + dw wTileAnimBuffer, ScrollTileDown + dw vTiles2 tile $40, WriteTileFromAnimBuffer + dw NULL, DoneTileAnimation + TilesetBattleTowerOutsideAnim: TilesetHouseAnim: TilesetPlayersHouseAnim: diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 1600648..db8aecc 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -627,6 +627,18 @@ INCLUDE "data/tilesets/sevii_collision.asm" TilesetSeviiAttr:: INCBIN "data/tilesets/sevii_attributes.bin" +TilesetLushCaveGFX:: +INCBIN "gfx/tilesets/lushcave.2bpp.lz" + +TilesetLushCaveMeta:: +INCBIN "data/tilesets/lushcave_metatiles.bin" + +TilesetLushCaveColl:: +INCLUDE "data/tilesets/lushcave_collision.asm" + +TilesetLushCaveAttr:: +INCBIN "data/tilesets/lushcave_attributes.bin" + ; there should be space here, lavender crypt's set is just big SECTION "Tileset Data 16", ROMX diff --git a/gfx/tilesets/lushcave.png b/gfx/tilesets/lushcave.png new file mode 100644 index 0000000000000000000000000000000000000000..407140465a26b19257de253bd73466234b1d573f GIT binary patch literal 2816 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 Sdd=?u0000KY`o! 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 delta 4034 zcmbVOc{J1w_aCH5Vp5s03<{yAVNjOIGM4B;nzTHrnUE#K*e0@#uO(5|OmCEBB$cu! zq%ed*mLdDTHiHqy*oI+V?|IMr&+pIQJ?H*$&pr2kKKFCaJ?9RcS~`{d4-jQ>(fCH7 z-Ji?|zmcz^X6cvFrI{PYN8EX(`EO_4ifpdF^!zYpe&L*LBuFR)bXxf~g@~aj8RDiG zG%{g_!)8E4dE4vE81ISNj#>=a5byO0JlCRS?kg+ET8hX31-07xlS8)WCMW>eKPZ1o zjsc8E7!TZmeb^c=M zh~7L*36nn=Zg>vhZm}K=CB+nAJ_lQyKvCFc6y+^ds@@I}yb!W=3wSxWjs;~eTO3V| zMnMl7#CdySeLQcCW(;sPHG^~5?lGN^HG>(2DbJvfw#b1z#zfDh$|v8Eb#}HdIMlqR zO2Hk6^xh!g+K%|ltqfB16Pwa^iM-?0^MZl-0#)u%*>Vr`NxI9uq{gy7(MAWv`r&3}GUAk!rp@)2tay!QO=%t}&Xk3Xz8*@nLDQ$v>!HmkOkmeImp@tYnc$G) zOvBNARS@U9nRn;q^WU^vsA2i<9O%D*NExyCsr}fE-YA2GZSauxADI;v!Tu(ol z-CffFZ3ok;J}0ZElNWa$$+=jC-q#d%`0r`6u-9A^E)J8cr!yh26wIm$O5vNbv z&DSVC{<_9etPM`GqjJ))&?96n)ZLV36~6S1TD;TcC8OW`9{JewOqO(ef`#k%CtzEv z6I=9FgCg;#HKS!@n+THE5lCdJ(IO*kwfaN?!5>vey|C^$AB7W^3m`VSEcFTdFcVT$ zg_tWV*tsy^Ukjee7IO}i+eb+)VHa zM>Gp@^R`r~4}+3A9AS)zLJiw?Ywyzo6F>4M;lFZ60=@#xflta&j(mCx0?EXO)87yJ zei=$_w;#Jsmu=7Va8dKXXK6^B#43%@6WThQXSq)Zi}c%KKvRdD-~%sv(8R zy}2@bSxY|#$*N7@(nw|uPI*n$Fx#okcY#*!2EA#UoY1EnUpmMxZ>p9`>W^BASP!)x zj}t0*8X~N_Ec-DUysEUA?mOJYmhajQpOUs|?s6TA(+M{}sjj`7j32I#yNZnX3`4(` zwE&cs3XwllJyG5=rsUTg(62k5w6iGc1*CWQ`NJDr$$D);6~lDEx>ND~g-C6+o((FnMN&boIo={}1d%Q>o30bCV=nR7AP#b{mrfm26gn+R za4*$(ACf}E#t(;_dJ_wlyZ5=@A)eI_OveArGW5OO0FSzWda)L@Bmbm4+aIn9u@8H3 z-{4;y5zs4yjyd+D@H1}^l24cHJFM~Dl-%nz4{(~*s&BjgFd!l*{MmM<6Qj* zt*Y&DKMNl*YU88GZoyH{&@PCG&cO$*b0L1l43Z*sFtM3ha|Ck{!{0DmTu|s56LICYCGLnvA7#o z%WA4E^($cCJC89Z-f1k~TpNoE3GW`Xnb4j4A_+6tF=7s0DhXAH#YSu?%J-PWA-zQl z1E_t<6B0sBL>bP3H<%FH{x<;T2({`7Q$tj*(4!h0=!hbr+Ld+h#RoYQaE=l_-7w#C z<>wPJ!@5QcMLh(kQ$C}G8;A?a(y>~N83{#VGI5+Wp7n4QjOJ4bH-Z6j1T zoA(wD+wGQcnUkIo5r~6d%C}_f`0tctqiAjQx?Ux||_TCQJbazq?h^-#^BimUj8x$m~B_;iE@$J7bzuEdYvPcyO2Qj5n&C|3** zWYJ>OCqRR10)>Xnf5ZcoN{R*Fkkc(67}w>voK?HAE7=hFS7-5zTf%eZ1V0<~-8-KW z&6z^nzOfU_=%tMVGO3d=f2SLFhl``rGt}w_FB=v*`?{C^j-1zFLD8*YMP?pH=zR^I z(PdSTO%tB?q@=E#S;x6x(NUtM!w2A5a80sL~CADMaLF#@h7Odr3}BL08iwxbDVFwsU7$ z9`%}QMrz&5nh;UOd;0}_hb3-8Hp0iNv2N{59{7HNvBZp$8%yKmOO|9=h0%9y>hx$N z!Q-AmDlk|)Q_~nEW?nLY^~rLrfI1|WMg?^`M(!mdzRm_-(I=0aeijpW`&~o1s(uvi zG?;;@Z31g&2w#wm&kP=}lQ&Y${rbeW5?bpR-_6}NZy`$PZPp5I9+}NdE4V(R-Z^^T zxFdu*#Ls%Vxp+!s^2b`YxC0^ngSA{_X1FJ{5pbBfDv8b1M!v3v3pBPEELeR{K5|iR z$4KQ$O{|B{L0W`F68m>_=!wNPTsSJbD>g{1`In#C#_Uk#VM5x@d6`96OgokliSXiE ze|1#YINfP&j8SzTN-@3$QtXuGJnNew9&9Ej71wTmqh@aR- zO7tg4G|NMcjq8;BeaU=}!=LTb(j7TiI-lwVzwtd#Xf?YWv}UcJJ3ckudygqN$nP7k z^$o;PAC2_B)Ss7nl4Y$CoL2Okvi-CSz=2kdiWc}>l}N}J{ywGk*=SDbhnA-Yf>ehu zvQ2)S_sk=qi}vk{9cZfhEe;?3;aASEWqA^Jvt%B9B4{-%h|M!;Y2~G}`QaJ=9|z)= z1y%$PQNsB`DEFpQ&#qcQ$6(qU>f7H;625PgKk1guAUN|v`4GXXwG*J}boKRP@!S(~ ztdaAG+I9Y$DSJNq(rCFail^|GHjr|B9Dn6FrZnH!fri%;ITXRhcPoeNqb<9~ z3lkCqtgKs}@3vJ&*2~`+ef%TXq5{}1@B45Q=iRYP9V&@_#12xK3i0#LdRQ?VyZ4)N z?4MHI3eJ;oElQJ)cChj zzc@$dLt`HrUc4YDp9y*18B@I-hAAkF>i5BQmd9$DLt#VvMV{10h{0xt;jw{_q-BUC z$xcKBn5KkoXb#9tZWXk0*1-)wwa~qC7xflspzrA8_NZsT-YIpYF%+=+LExj`XQ|Q^ zo|VvdK-6b|qgrPLf=)OW)u-V=W7F4fv`qi{OGq%kLbP8&cE?Gz zu`PW^rbg(2-)!FA6y=EgE3Kz8oL-^m(QCj%i=E-GkFDqtT^KLtzs6UidS0~L?h;!Z z@KKZR?69qT_BGL0tdtyL924I&pZQ;z{;x`uU6@H|4xZD)lxkj>CzI%|Clq9f_xrd;$X}V^y5oiR&RkUaGaW&aGBgTYo68 zuS^dmF4^0W4-v5kdh>IUjAIxwUYR5&a)Oj8Dk`qIqXNwg7W$$pV2^*Mjm?DuZQM^J zK8TF?KD!A|XhI^s@41Uf_a#F*!{wJ9DIOw2f6dxf+odQxm3*TU{akUkKR|wSe?_T-Q^y%Jt*@Uc)x^+21GJ+Kl8Yflam<$SobTBt5?_f ze3wgL>8dCz?*njXWIoYO&ZF>Ki3@0+sQOJ`XWoAFRAJ|TiKrbKMc^`gh=ztGMfv&p yZBLN@*DvsQ-X41ybo|l=833p07V!pRc%akaE=79qM~^}KW?^>aVv&hM8;4226$$$h;8222264822822226226 \ No newline at end of file +  +=99999B  $)/11--11-+C9A  %&. #&&&'  #  H I  . #E  H 2.C973 # % ID #4558H D@&I  H< !!"D #   079;22D#&@' #%&&&&&&&'  J >!" I  HH 2J  !?2 >!!" #K. II#     .F@@@@G  L %&&<D&&'6: \ No newline at end of file diff --git a/maps/QuietCave.asm b/maps/QuietCave.asm index 4f83eb7..a909ad6 100644 --- a/maps/QuietCave.asm +++ b/maps/QuietCave.asm @@ -206,21 +206,21 @@ QuietCave_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 53, 29, ROUTE_49, 1 - warp_event 53, 30, ROUTE_49, 2 - warp_event 8, 0, ROUTE_49_2, 1 - warp_event 9, 0, ROUTE_49_2, 2 + warp_event 47, 30, ROUTE_49, 1 + warp_event 47, 31, ROUTE_49, 2 + warp_event 7, 1, ROUTE_49_2, 1 + warp_event 7, 1, ROUTE_49_2, 2 def_coord_events def_bg_events - bg_event 50, 28, BGEVENT_READ, Route49Sign1 - bg_event 13, 2, BGEVENT_READ, Route49Sign2 + bg_event 47, 28, BGEVENT_READ, Route49Sign1 + bg_event 9, 2, BGEVENT_READ, Route49Sign2 def_object_events - object_event 45, 28, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, QuietCaveBoy1, -1 - object_event 45, 19, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherSioned, -1 - object_event 33, 26, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulie, -1 - object_event 31, 6, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherDick, -1 - object_event 11, 27, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBugCatcherElwyn, -1 - object_event 11, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 6, TrainerSchoolboyPero, -1 + object_event 41, 28, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, QuietCaveBoy1, -1 + object_event 41, 19, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherSioned, -1 + object_event 29, 26, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulie, -1 + object_event 28, 6, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherDick, -1 + object_event 9, 25, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBugCatcherElwyn, -1 + object_event 9, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 6, TrainerSchoolboyPero, -1