From eafc71f4a28efd49adacb6c4cf0372c4d708914b Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 21 Dec 2023 19:57:17 +0100 Subject: [PATCH] Add east/west connected map for testing --- constants/map_constants.asm | 1 + data/maps/attributes.asm | 6 +++- data/maps/blocks.asm | 3 ++ data/maps/maps.asm | 1 + data/maps/scripts.asm | 1 + data/tilesets/board_debug_2_collision.asm | 2 +- data/tilesets/board_debug_2_metatiles.bin | 2 +- engine/board/spaces.asm | 0 gfx/tilesets/board_debug_1.png | Bin 2249 -> 5042 bytes gfx/tilesets/board_debug_1_palette_map.asm | 4 +-- gfx/tilesets/board_debug_2.png | Bin 2921 -> 2962 bytes gfx/tilesets/board_debug_2_palette_map.asm | 4 +-- gfx/tilesets/spaces/variable_spaces_1.png | Bin 424 -> 475 bytes .../spaces/variable_spaces_1_palette_map.asm | 4 +-- maps/DebugLevel2_Map1.asm | 11 ++++++- maps/DebugLevel2_Map1.blk | Bin 150 -> 150 bytes maps/DebugLevel2_Map2.asm | 27 ++++++++++++++++++ maps/DebugLevel2_Map2.blk | 1 + 18 files changed, 57 insertions(+), 10 deletions(-) mode change 100644 => 100755 engine/board/spaces.asm create mode 100755 maps/DebugLevel2_Map2.asm create mode 100755 maps/DebugLevel2_Map2.blk diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0d987feb9..dc6ce31c1 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -51,6 +51,7 @@ if DEF(_DEBUG) newgroup DEBUGLEVEL_2 map_const DEBUGLEVEL_2_MAP_1, 15, 10 ; 1 + map_const DEBUGLEVEL_2_MAP_2, 5, 5 ; 2 endgroup newgroup DEBUGLEVEL_3 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index a6352268a..4f34b4c95 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -111,7 +111,11 @@ if DEF(_DEBUG) connection south, DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, 0 connection north, DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, 0 - map_attributes DebugLevel2_Map1, DEBUGLEVEL_2_MAP_1, $00, 0 + map_attributes DebugLevel2_Map1, DEBUGLEVEL_2_MAP_1, $00, WEST + connection west, DebugLevel2_Map2, DEBUGLEVEL_2_MAP_2, 3 + + map_attributes DebugLevel2_Map2, DEBUGLEVEL_2_MAP_2, $00, EAST + connection east, DebugLevel2_Map1, DEBUGLEVEL_2_MAP_1, -3 map_attributes DebugLevel3_Map1, DEBUGLEVEL_3_MAP_1, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 26594bd44..23f796085 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -10,6 +10,9 @@ INCBIN "maps/DebugLevel1_Map1.blk" DebugLevel2_Map1_Blocks: INCBIN "maps/DebugLevel2_Map1.blk" +DebugLevel2_Map2_Blocks: +INCBIN "maps/DebugLevel2_Map2.blk" + DebugLevel3_Map1_Blocks: INCBIN "maps/DebugLevel3_Map1.blk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 25327c04c..d80017965 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -48,6 +48,7 @@ MapGroup_DebugLevel1: MapGroup_DebugLevel2: table_width MAP_LENGTH, MapGroup_DebugLevel2 map DebugLevel2_Map1, TILESET_BOARD_DEBUG_2, INDOOR_CAVE, LANDMARK_DEBUGLEVEL_2, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_NITE, FISHGROUP_SHORE + map DebugLevel2_Map2, TILESET_BOARD_DEBUG_2, INDOOR_CAVE, LANDMARK_DEBUGLEVEL_2, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_NITE, FISHGROUP_SHORE assert_table_length NUM_DEBUGLEVEL_2_MAPS MapGroup_DebugLevel3: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 1988b12a7..d6715a2f4 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -5,6 +5,7 @@ INCLUDE "maps/Level1_Map1.asm" if DEF(_DEBUG) INCLUDE "maps/DebugLevel1_Map1.asm" INCLUDE "maps/DebugLevel2_Map1.asm" +INCLUDE "maps/DebugLevel2_Map2.asm" INCLUDE "maps/DebugLevel3_Map1.asm" INCLUDE "maps/DebugLevel4_Map1.asm" INCLUDE "maps/DebugLevel5_Map1.asm" diff --git a/data/tilesets/board_debug_2_collision.asm b/data/tilesets/board_debug_2_collision.asm index b33e9bbcc..4f4eb33fd 100755 --- a/data/tilesets/board_debug_2_collision.asm +++ b/data/tilesets/board_debug_2_collision.asm @@ -123,7 +123,7 @@ tilecoll WATER, WATER, WATER, WATER ; 7a tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7c - tilecoll WALL, WALL, WALL, WALL ; 7d + tilecoll BRANCH_SPACE, FLOOR, FLOOR, FLOOR ; 7d tilecoll BRANCH_SPACE, FLOOR, FLOOR, FLOOR ; 7e tilecoll UNION_SPACE, FLOOR, FLOOR, FLOOR ; 7f tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 80 diff --git a/data/tilesets/board_debug_2_metatiles.bin b/data/tilesets/board_debug_2_metatiles.bin index a156f34e5..fb65e5162 100755 --- a/data/tilesets/board_debug_2_metatiles.bin +++ b/data/tilesets/board_debug_2_metatiles.bin @@ -3,4 +3,4 @@ &  &&67&&67&&&&$$$$*+:;$$$$"#23     ()89       !01     $$&&&&    @@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%' &&&&&&&&  & 67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&  -&&&$$()89IIIIJJJJNO^_JJJJNO^_JJZZZZYYYYZZZZYYYYJJZZZZYYYYLL;;;;====;;;;====;;;KLLL===LLLM;;;KLLL===LLLM\LLL===LLL];;;LLLLLLLL====;;;;LL>?E>?>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?>?E>?;;<<;;<<;;<<;;<<<<==<<==<<==<<==<+,,+;<<;;<<;;<<,,-<<<=-<<==<<==;;<<;;<<;KLLKLLL<<==<<==LLM=LLLM<<<<<<<?E>?>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?>?E>?;;<<;;<<;;<<;;<<<<==<<==<<==<<==<+,,+;<<;;<<;;<<,,-<<<=-<<==<<==;;<<;;<<;KLLKLLL<<==<<==LLM=LLLM<<<<<<<*x^Jo#cU)=2QLSj*R8b+U?y5TC zjG`5apzgZkJ}QVf8gYd1x9|7&!^}LtnfX1>%zT-7=Jf+p1JD_XGXMYpWMp{P;>1S& zC#QK&bPK|{>%;(276!KgWxbG<6Tt0p%j6aSP?02X=*)A1`TY#7Q2@aC!2bj|{X{Ah z01z=Sx_j$Ur~@M>A$XCL$eV^ow=K$~;U*tbI0WWktYjk?o z3CFdY?SjXg-I-6v`!s@XU?FFNd|c)lapJ005PT|&iT|Z7@Jr_f-P!TFWhv8;080&f zbRGetF06Wg?Q^O>4bJx#LxVY6$5ibmX@wD^Qs(+!f#K%KNvXj@LT38kMhdI zp?Ja81h80ego9)s|E7qz)1c(Lt11_mKOsRJ19r8r#^D)hBZX;M#aGYwa(IJ&?B8NoifxFsg^pcx zc(J`7TNv?(S!JyY{4(4Z1Nwyfi#4+J)7`&im@4CF96u2pCh$x91roTL2b-wMz!rz^ z@*QV!9!1lrZSs%4>}e;t1Cgf8A2|1UctTF_g>rA`gy%##403b8| zqb4GCl4xz$K$m)kWe&J%pRNwfSzdQI?#>_yhV968hI>!c<}9ei zd*bug@2o;R9E-X*!?@@W?FGak*Ms|_MWzi8>|VJPD+u-s7Gt>^d!xx_VN{(C?FZDo ze|s7=hin6bCJ0etLg|^^51IZQ*1jCMp#LM68(F)pDv5eF>s34!A)sG{auOd1{pE?x z>4VyHR&6412=i&N<^%+w;4kBat;5q4LZDA4ed1Rv~=x{JHGEO|&G3jzsIk$3<26 zpBrzB-*Qk_RY$!%@@&=NS(=}vX5dH@b>|n1j;L7G z)+@Hl5l_m*$M9FjTN3a*#{ax1Eg+$a@9q9B^%+K?PWY+%Wrl6}xUGc@5p_DeI~^y)_N;o9SZ&U=3ND$| z*ZNtMp2fW9;zMhXE6%KLb*m7mHAENUsD!_^IBj)t{p62T~Fen>c z<6%m@mytF`zO>jqsNbDpocy~zc@R?`s$xZgPoC}o8DZx0E9(rnV{anVr|arfmse#K zk38G03Q;bj1b?OmL870IxSFk9+r^`v=?CVj+w;1^h~^snntLR= z>XN#S;zs`rX+NQ$qq@(5yCShZtK2d>*>xmDXk-rf^VUzua@q7f2QF#KonarrgGARp z)jV=If2(kQj!V;sjMdrY4Y$XTs>pbgP5<7qvXa_tsY;L!H@enMNF6J8A;6-r4kdVq za{NH;j(hSo2+A3=+!ghr6Bb&X93#$l1J!>Qn2H{=x#8wuNT?2R%e8s9^e2s1K5Icd znSjTn`t1dkj>P*~qAnK0wofa^GTnW=_RBliXU6V@ax<*}*w%2%rn5DTS%|nkQ0QB& zcG={(ud}yDzZ689X4@D!?$}_~;fUBV2bHGrXrN+>l3s@+2bw=(%cR}DVm%tWJ;xtY zzVHZf`C zAQvyby59~)_$m3UPEGwfdns0f!(n_7G%PWee(YRn+Ls#F^Nl2}I}c1KPb}%ul%Bw# zwASZ4(`%xcx7J%eUfr&Ghrbh1jaVVnvx_Qhi|HK@%z@S1`Ew27{5Q-CJ&GjxMfq-m zvEa%-OL1aUKBXv3HW8*pw>DKL!MKX%yu};X+GIt^53)U`RYO%mbE5K!5 ztH{;5RdnwOw&pK&H<(ml-6f)XK)PV753?G6(ULK}zdRSG@-gIS@>i(4qSAwBR-yEzhZ0?UA|9ZU_doe*d3|!BXma z<0(DHMoQ;b?jI&4W~_@TtUR^e1kF1=X>{ECh7n`3>!XM39<=Ble4-_}8@Ly;5zdSc z3^>356kMY=rqVsTjs{dNVje*1tUm~pVw+-!F!DuLU9PQ?_L_wGP6kBpKE-IgeZg^#TY4T0#16o)*dHeJ_u-ctG95>Qmlcq#QE4`7Z*A zV?Gh|$B1kqyw*F9v8N=i#^P^Euu}-zzzS9oPHPK$Nb4f6LpdaMTEO~nwi$+Vqhr71 znPy&tMDbs#??c{ABouJqh9d$Vp6UiYZD}%8NS~tlGP27q$B_DChJ?;ED>Y-?fg_A5 ze(uxWzO|v^Ruie}yJs2oV<^la2$R}jqgWhv#l+cY+rSpWUVb5Y-nRlpdp6|1Jv6{V@$@t(9`<30$lHn7t z*;7P$!bq-ffEZY*=uN%!aE?;?ar^4DCL?6=Z+Nb%a!r{H%0bEREO|g1ou#!y*&Tc1 zaTYVePaPP-?n>dpLNK-_g2^A5 zRB;irfbnYU3+K{iCEYey{BW{_2&g2O1;S<0CZO8}zO%IV{qx8opSqkc4r1>{+hC-X zCU7o4aOKH9Sd=dt>d~o>n40r4XZBHOHvP3T+?C}X7nAEQ|Mm=MAuwaxVUYMxa$#!D z8MUD0IsLw19XUn#T7ShuITG11)}Rt~HkdEurS_z7-RtUze_|P56V^sX+x%u1-EE8Owee<)Fm%Rdri z{4hL2A#a?dI%7*Kh)r3elb2#@uE#hCE}4cLG-XnQT_!I<%O$&zvyAwSX3E&~-jpt1 zcIb^QsJ&Nh$JK8C4~Ye;?2C1$ZR^BOQ3ee#-!y`m=yM~f%w=06sm3giV5%fsBB){0bH7nC&fYB_v2I8a1V5FbwWux9=0#$oA2gy9zm9Onf;%b)HkRrZM zze5dNGB=i^_L!=8em~-0yrE#wm6Z35eACcM#f|(qaW( zge+)X#p&VUBfw4<$&CQX5}DkU^R``J@I*?K8&H1o zYz72go1QxIP2E)#Vvw>+%>Z=R0C8hyjh=Q?=`(GCRNoo@Oj`eCm5qrq5j$8R zzVPQdrJoHNV@Wl?T>K8HPQS-eB-i9cy`sjHWN8FZmec6wX?=J2s$E}aw~Nj5(*9M5 zw~lke+)YUFM1?<)oM=<5-IAZ(kyLOu3abiojTK9BGMnlBcSy5R_m@$FcdOP~b|1pK zoM`rjv~9i`b~7AUn{navDg%^0HR$puQWvUURiU^XD!+M2KNvby;?AxruYTOgp zA8Q7Av3M0uu^W^}>v((R1KSdayxnSr>WqE2-;Q`1+lwNXY%|CI%A;3`R-Xcmr@Sb`; z8L9Q;%d*G)!di+2oFIXJXy05Gs5zu*Kw@kp9H&e9ueu*SwtScO7~n{y=rN*U?lI=j z)!QDXhBMX1jF3%pqj1OQZs3yfmg@ztq(GL8Z(`AvvGn*Nwz=u?G3d)4^l)1}3QTMZ z0y^O7TwgRsc|!fm1UBdGz_V?2%1v=7`$#aY9-z|u|0W!eg=S}PJ@ZocJ1!h!C`54N z?0dhY__}$iBwhBX&QXxC_Vr`7WixMDAa9&Je^|!e_#MAoj~?IS<-=8jB{G&T6BN_C z8D5xwMJ+Ikk*o zHJnrz62{gEW3#@pFY5A?37iX^gJaX49|?rALryx2GSf_5ENl*02nO!Oz>R4K4ebZ(yPdoJI(yoO>zHpSZu) z-B;Rc!A%J~5CgvL0k9KMaDkP@`Tgg?JN)MNEnSXSX0~AU)Ux%andT{fgVjuX?Z8H& zL_`R1(#cnJ4Dmb}Vg;QQ&b4lDgN1-2lg8E;Lfv$~r9>ZeXeqB}9huCk<$f85j6OU< z-**IzX^BzZz9D68h+r1LeLsVN+F#ZI)r^aI8=SCROUdVNPc?)WXuXZ2`R(#Q5EA$V z;t2EU_2Ok|FMETxG)}%hm`xL`@pfHf2lnE+vYt-)Wwsagjud~q3lP&=ArJ058PczE zEg)=WM|{Ucd^a*DL=N0H*MDU;C4rEj1ILl4@%c>baA;%CRZO_gAm{qtm4$tajzY?S x3QnB)ee1vThLgLf0Lk|mLsE{n+K*426$&}mqAUzQ`Lh9x{xrQ?cH8O2{{YW6Kgj?9 literal 2249 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%0DKoj)$OzQeU5q)qaBj++GY5^ zJLD@;@}GWE1~`K3F?YspqnvTu%E79WuEVX|(HZwD&B_*F8z(St1sI}c`IwHK&KOMK z4qX)arL6Z~^~>M5E?h!1ChgJ2SPmf!t#OKGNOyB4cN!-92x|_`5z36yi`Iy~=ZewF z0wh#a4UMuCpBH>f*I4*4kt7zJSgWvAK8AF^B{*}oJ_6v6xx^n>8Cgc+4&9)fO8x<0}!|50tFzfAUEY1}e-+a%to zYOeXH?0U~{O`44Zs_QdRzNKK&jm+*)6y$g>H+AY#Zp2+MeoJy4n z*kxY(H$NDSew;}j`SZn6ua?q{OFXi8iM#SHlJVXcxR$9i&Nj1rWw^Yf%v$-eV;j;H WE-_^#*XpVK6`wQbPSZRt-}(;+v}S(* delta 2611 zcmbu5=|j>71IJPGcq$`r^TOs@Pb)KTbO_Snk*mz|$~!X;ywd3dqW&st_6!uznWca> zoMtNJ%KO4J(OHtqfwxT%Jn$e?5D}jJ4bMJrzOOznzMmqaB}1Y=uwUVQ9(f%dzDg-b zn}QzHDDRBkB`%%Yesh_u#mG&qde&V0IceV)EAKdH{TP_Ks|8 zC5E2s5c>t#-Cm8}EN*FO!8tjl6ZIx;rYIY>$RV1J)s)uvjTb(EX~x@;i1cbFCR_GQ z!#zQlv-U3gX~j7prqO_nnvk-qE!my>#X63ega)wVv&)H3A#{iZ9wV9+HlqTnpHZ;XQ?WpXsCqkVyvszTXr~jBxXO4M* zADU*6=igitE|wz?32O`NJxtSu{Cd}3;OmkyHOK(Ug#2AVN?7)w@c>y98o`ID-RaQw z)jQHL(NG@no`m7>-~QzWt@3y@4ECUKH@ggqg(~KNm8B8y=m&z-`Zn1pB82WeNlL)( z;|;mJwpd-1tQcP2IRr}<}O`Bd%ng2Gmx+GNmalsb|3DC@~+`y!4_ z&GoM#U_(tnfFBnWM`^O9|6)FU*h6G^m1}1~jxF3o+69<)^Y6az8{c|=fL`kvz4syx zp_`KA(i1rNP-FXMXZ4mXU#10OLP0kKV}+!Cmz8DwuvBLtHXNrZ)M|dQb&ZhSMBDlk z{0b>+rE-7fd3CN3-pa}9(;RX2WynBjyIIxeN*Yj<8JT#hip>hTr4Ob_$AnR^Xvz5w zDoUC#Y$j`^UyeXsENHEc;GfHbzcK_bfo0Pt$9^kKSv+_2#A*Eg_iYNIE2r0`NZf?Z z2sa++k28(u*dxTtD_Qgt<46dT{tN~8h5R=k&rG%+@E^)x#;Xl5U=r`JoR6G{eIlz9 z$UWO1AZ7z5jfeut<(}n4g5%92|5=O$8T>U`%&WlZ{e~0aUfZ^Yv z&rQ0bNBYHI(FK^^tzqNfqTD}x7{|kykGfspdMvY}8pbtj_zmYmSX@%9Etq)VRZPKW z=xT6j6Z8rqwceaubA{>+%!OWARuJI>wRPa_7}%@>6H*u$w%Rff(jQDI+DRt8A2##j z+?kOi!YX`5NM)~cscqC(g)_E`G`9>{T#q7z@f*6U0hB%%qRksNXzsM87StGW>}SVy zq>DIyK*vH)ej{I%bs=Z=_fbrEBo$jxz@&;pERPfO8+Va=K>Z8Wf;impwE5KwSh`Jb z#X$Y9)(c*+SBFLj#KyIIk%(eVyUU{<$&Ja!_9Ck!^N@Qx&yNYLj>v-kjjJ#`8~Q1* zJm0H=Bz#xL@|E1qMN#$BYlpz>0-h^=b5#0f?pt?wBsHUo4lhM(aE6eLXuY?CDVG?( zjJ2dTuaSrV?IINn@luZNsAHF}!g#Kj>ESz*8yA+_ogC7|OW?n=$R6HfX^m%nW8Dp* zRTyjXCU8uIB+nJm*TwpH)y52yPb3489j-t*2%vR=x#Z$tqH2csUu zR+?IFyyf)NPzp8@e^Ap$Q@J zQWU2;S5FaIA|jH}+r4p@3Z;oi7{$wKtZ>#U+EuYFjZ#BLftXDP1d2W8)1bNk@HylSSNJjW~G(=Y+hA1&58w@p0%VoC~Yd% zKwCGFP0w~!;ouqz73_vy-{Zyf^#d_tDBRJ#E7E^+LgpQHDbl)mCq2}(GW^xIsq5;U z$D4QD$XWa3Be?aK#|dY?tV*ZmG36oj4@pMs(q8O5rq+%(GVjB`YFGXDksb#|#}bQ} j4?X9W%AC_xE(`-%kQx{K;!l&Hzwy3s`8@q>plr~3?O^v&AU<@yUmrn!ILi^0@ zpDh3e7QnESpr;FJP$0JhlNc3je1uq5uubvQ9Uj(`#)zP#RN_*edW zbQb`qB?e=Z6zY2J6RmM)EUyA!@^T5Fu9ZNZ`}*upb!bb^fSz`xbx@o!L_0v5ERgEZ zK9K-CQ_rF21b;c5b05OIjxu#g69PX7?T0M4eY6n(>Nv;Y7A00>D%PDHLkV1fwByW9W( delta 347 zcmV-h0i^!h1E>R#R)0N7L_t(&L+zN24uc>JgmLev52+8id0lF12UzNFmVODrVQ<6S z1#n$T={>jG7{`(NVHl{l!a64OK0O6shCWET4!7tg^*JmxHK4~tFnRqzTS!gl{rYSG z*cgDqlEFs=0Pt^3(?tCiecw}$xq;C8^)I>-Nb>=%*(fWhmw(NIb@Cur8+xC96#zDi zlLh$NY9xc;$RGvJWEB7`<+sH1eHi#ZG;IM};EkcyxMuHxGB}P^0JLGcaZT+_ zq0~T08{Eed090+5ZeXv0d$hqhG;INAn$LevTFBLg-lxZDZuZ7!EFT8<=y9mT%EE_C tD^e4Bzn%i{9l8hk5H08j4!uX8(g(k2YZ-EJ>VW_N002ovPDHLkV1g%Qp~e6J diff --git a/gfx/tilesets/spaces/variable_spaces_1_palette_map.asm b/gfx/tilesets/spaces/variable_spaces_1_palette_map.asm index cc3ba3f4e..dea0c00f6 100755 --- a/gfx/tilesets/spaces/variable_spaces_1_palette_map.asm +++ b/gfx/tilesets/spaces/variable_spaces_1_palette_map.asm @@ -1,4 +1,4 @@ - tilepal 1, RED, RED, RED, RED, BROWN, BROWN, GRAY, GRAY + tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, RED, RED, RED, RED, BROWN, BROWN, GRAY, GRAY + tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/maps/DebugLevel2_Map1.asm b/maps/DebugLevel2_Map1.asm index 422801350..4bb0234d3 100755 --- a/maps/DebugLevel2_Map1.asm +++ b/maps/DebugLevel2_Map1.asm @@ -30,7 +30,7 @@ DebugLevel2_Map1_MapEvents: DebugLevel2_Map1_MapSpaces: space 6, 16, $0, 1 ; 0 space 6, 14, $0, 2 ; 1 - space 6, 12, $0, 3 ; 2 + space 6, 12, .BS1 ; 2 .BS1 space 6, 10, $0, GO_UP ; 3 space 20, 2, $0, 5 ; 4 space 22, 2, $0, 6 ; 5 @@ -41,3 +41,12 @@ DebugLevel2_Map1_MapSpaces: space 20, 14, $0, 11 ; 10 space 20, 16, $0, 12 ; 11 space 20, 18, $0, 12 ; 12 + + space 4, 12, $0, 14 ; 13 + space 2, 12, $0, 15 ; 14 + space 0, 12, $0, GO_LEFT ; 15 + +.BS1: + branchdir LEFT, 13, 0 + branchdir UP, 3, 0 + endbranch diff --git a/maps/DebugLevel2_Map1.blk b/maps/DebugLevel2_Map1.blk index 28649185a64fb99ebf966a3e97cdc3afc4aefc90..12d36d439db38ce39cfb2c6c720dcaeae383e4e2 100755 GIT binary patch delta 42 kcmbQnIE`_Fw}PUgOoI#)0}M1YG}MB*Okf}>IWb!s0H6d0rT_o{ delta 42 ecmbQnIE`_Fw*nKBOoI#)0}Q~qOi(Z}TN?m;(*)fB diff --git a/maps/DebugLevel2_Map2.asm b/maps/DebugLevel2_Map2.asm new file mode 100755 index 000000000..576e3f748 --- /dev/null +++ b/maps/DebugLevel2_Map2.asm @@ -0,0 +1,27 @@ + object_const_def + +DebugLevel2_Map2_MapScripts: + def_scene_scripts + + def_callbacks + +DebugLevel2_Map2_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_anchor_events + anchor_event 9, 6, 0 + + def_coord_events + + def_bg_events + + def_object_events + +DebugLevel2_Map2_MapSpaces: + space 8, 6, $0, 1 ; 0 + space 6, 6, $0, 2 ; 1 + space 4, 6, $0, 3 ; 2 + space 2, 6, $0, 4 ; 3 + space 0, 6, $0, 4 ; 4 diff --git a/maps/DebugLevel2_Map2.blk b/maps/DebugLevel2_Map2.blk new file mode 100755 index 000000000..b8806227f --- /dev/null +++ b/maps/DebugLevel2_Map2.blk @@ -0,0 +1 @@ +!!!!!À€€€€ \ No newline at end of file