From 7134eec5cb5cb08c9bc7a48d6a2e9b6ce3e6dd2f Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Fri, 6 Sep 2013 16:54:04 -0400 Subject: [PATCH 1/5] Remove INCBIN "baserom.gbc" from a comment --- main.asm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/main.asm b/main.asm index 72a572f2..9ba9d0fd 100644 --- a/main.asm +++ b/main.asm @@ -51916,11 +51916,6 @@ db 1,0 ; CHANNELER db 1,0 ; AGATHA db 1,3,0 ; LANCE - -; trainer data: from 5C53 to 652E - -; INCBIN "baserom.gbc",$3989e,$39914 - $3989e - ; trainer pic pointers and base money. dw YoungsterPic db 0,$15,0 From c29ed3b405d41e38f96b268b2e8ffba870f5e5aa Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Sun, 8 Sep 2013 10:18:05 -0400 Subject: [PATCH 2/5] Split blank_leader_names and circle_tile --- gfx/blank_leader_names.2bpp | Bin 368 -> 352 bytes gfx/circle_tile.2bpp | Bin 0 -> 16 bytes main.asm | 8 +++++--- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100755 gfx/circle_tile.2bpp diff --git a/gfx/blank_leader_names.2bpp b/gfx/blank_leader_names.2bpp index 1eac2fae3161136a2ed57032fc193fc74050f24a..2bdf7c63a7eec4acfa5d13f05e81182ddfa054a6 100755 GIT binary patch literal 352 NcmZQz7zMNp0RRDD00961 literal 368 VcmZQz7zMNr0Sks2Fth+#1OO0_0p$Py diff --git a/gfx/circle_tile.2bpp b/gfx/circle_tile.2bpp new file mode 100755 index 0000000000000000000000000000000000000000..b06a180a84c70112c0fd4e2188b7bca2147490f7 GIT binary patch literal 16 ScmZQzU|_Idr~yL@AR7P=FahNN literal 0 HcmV?d00001 diff --git a/main.asm b/main.asm index 9ba9d0fd..499b99f1 100644 --- a/main.asm +++ b/main.asm @@ -44741,10 +44741,12 @@ UnnamedText_2fb93: ; 2fb93 (b:7b93) TrainerInfoTextBoxTileGraphics: ; 2fb98 (b:7b98) INCBIN "gfx/trainer_info.2bpp" -; mostly empty, last tile contains circle BlankLeaderNames: ; 2fc28 (b:7c28) INCBIN "gfx/blank_leader_names.2bpp" +CircleTile: ; 2fd88 (b:7d88) +INCBIN "gfx/circle_tile.2bpp" + BadgeNumbersTileGraphics: ; 2fd98 (b:7d98) INCBIN "gfx/badge_numbers.2bpp" @@ -85899,10 +85901,10 @@ DisplayDiploma: ; 566e2 (15:66e2) ld hl, $d730 set 6, [hl] call DisableLCD - ld hl, BlankLeaderNames + $160 ; $7d88 ; circle tile + ld hl, CircleTile ; $7d88 ld de, $9700 ld bc, $0010 - ld a, BANK(BlankLeaderNames) + ld a, BANK(CircleTile) call FarCopyData2 ld hl, W_SCREENTILESBUFFER ld bc, $1012 From 3b62d2a6f616abd588ddf3af1d03fa63cb187206 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Wed, 11 Sep 2013 12:22:11 -0400 Subject: [PATCH 3/5] gbz80disasm for pokered fix --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras b/extras index 7aa016fb..ef77506d 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 7aa016fb528bcc8dcb30c6a887957851623eccc0 +Subproject commit ef77506d94991b5909473eb8c8902ee1415d727c From 5537897109c43381c222fcab96b2db3b9d3ffe7d Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 16 Sep 2013 12:10:26 -0400 Subject: [PATCH 4/5] give consistency to map names --- constants.asm | 24 ++--- gfx/blocksets/04.bst | Bin 0 -> 304 bytes gfx/blocksets/06.bst | Bin 0 -> 592 bytes gfx/blocksets/07.bst | Bin 0 -> 1856 bytes gfx/blocksets/0a.bst | Bin 0 -> 2048 bytes gfx/blocksets/0c.bst | Bin 0 -> 2048 bytes gfx/tilesets/00.png | Bin 0 -> 1325 bytes gfx/tilesets/01.png | Bin 0 -> 903 bytes gfx/tilesets/02.png | Bin 0 -> 1212 bytes gfx/tilesets/03.png | Bin 0 -> 1422 bytes gfx/tilesets/04.png | Bin 0 -> 903 bytes gfx/tilesets/05.png | Bin 0 -> 1161 bytes gfx/tilesets/06.png | Bin 0 -> 1212 bytes gfx/tilesets/07.png | Bin 0 -> 1161 bytes gfx/tilesets/08.png | Bin 0 -> 1261 bytes gfx/tilesets/09.png | Bin 0 -> 1125 bytes gfx/tilesets/0a.png | Bin 0 -> 1125 bytes gfx/tilesets/0b.png | Bin 0 -> 269 bytes gfx/tilesets/0c.png | Bin 0 -> 1125 bytes gfx/tilesets/0d.png | Bin 0 -> 861 bytes gfx/tilesets/0e.png | Bin 0 -> 1140 bytes gfx/tilesets/0f.png | Bin 0 -> 967 bytes gfx/tilesets/10.png | Bin 0 -> 1177 bytes gfx/tilesets/11.png | Bin 0 -> 1018 bytes gfx/tilesets/12.png | Bin 0 -> 1026 bytes gfx/tilesets/13.png | Bin 0 -> 1012 bytes gfx/tilesets/14.png | Bin 0 -> 1136 bytes gfx/tilesets/15.png | Bin 0 -> 911 bytes gfx/tilesets/16.png | Bin 0 -> 1088 bytes gfx/tilesets/17.png | Bin 0 -> 1013 bytes main.asm | 102 +++++++++--------- maps/celadonhouse.blk | 5 +- maps/celadonhouse2.blk | 1 - maps/celadonmart5.blk | 5 +- ...ladonmart6.blk => celadonmartelevator.blk} | 0 maps/celadonmartroof.blk | 1 + maps/ceruleanhouse.blk | 1 + maps/ceruleanhouse2.blk | 2 +- maps/ceruleanhouse3.blk | 1 - maps/{loreli.blk => lorelei.blk} | 0 ...gateheader.blk => route15gateupstairs.blk} | Bin maps/route18gateupstairs.blk | Bin 0 -> 16 bytes 42 files changed, 71 insertions(+), 71 deletions(-) create mode 100755 gfx/blocksets/04.bst create mode 100755 gfx/blocksets/06.bst create mode 100755 gfx/blocksets/07.bst create mode 100755 gfx/blocksets/0a.bst create mode 100755 gfx/blocksets/0c.bst create mode 100755 gfx/tilesets/00.png create mode 100755 gfx/tilesets/01.png create mode 100755 gfx/tilesets/02.png create mode 100755 gfx/tilesets/03.png create mode 100755 gfx/tilesets/04.png create mode 100755 gfx/tilesets/05.png create mode 100755 gfx/tilesets/06.png create mode 100755 gfx/tilesets/07.png create mode 100755 gfx/tilesets/08.png create mode 100755 gfx/tilesets/09.png create mode 100755 gfx/tilesets/0a.png create mode 100755 gfx/tilesets/0b.png create mode 100755 gfx/tilesets/0c.png create mode 100755 gfx/tilesets/0d.png create mode 100755 gfx/tilesets/0e.png create mode 100755 gfx/tilesets/0f.png create mode 100755 gfx/tilesets/10.png create mode 100755 gfx/tilesets/11.png create mode 100755 gfx/tilesets/12.png create mode 100755 gfx/tilesets/13.png create mode 100755 gfx/tilesets/14.png create mode 100755 gfx/tilesets/15.png create mode 100755 gfx/tilesets/16.png create mode 100755 gfx/tilesets/17.png delete mode 100644 maps/celadonhouse2.blk rename maps/{celadonmart6.blk => celadonmartelevator.blk} (100%) create mode 100644 maps/celadonmartroof.blk create mode 100644 maps/ceruleanhouse.blk delete mode 100644 maps/ceruleanhouse3.blk rename maps/{loreli.blk => lorelei.blk} (100%) rename maps/{route18gateheader.blk => route15gateupstairs.blk} (100%) mode change 100644 => 100755 create mode 100644 maps/route18gateupstairs.blk diff --git a/constants.asm b/constants.asm index 1e03b219..537c3c65 100644 --- a/constants.asm +++ b/constants.asm @@ -2727,7 +2727,7 @@ MT_MOON_3_WIDTH EQU $14 TRASHED_HOUSE_HEIGHT EQU $04 TRASHED_HOUSE_WIDTH EQU $04 -; CeruleanHouse2_h map_id=63 +; CeruleanHouse_h map_id=63 CERULEAN_HOUSE_HEIGHT EQU $04 CERULEAN_HOUSE_WIDTH EQU $04 @@ -2924,12 +2924,12 @@ CELADON_MART_4_HEIGHT EQU $04 CELADON_MART_4_WIDTH EQU $0a ; CeladonMartRoof_h map_id=126 -CELADON_MART_5_HEIGHT EQU $04 -CELADON_MART_5_WIDTH EQU $0a +CELADON_MART_ROOF_HEIGHT EQU $04 +CELADON_MART_ROOF_WIDTH EQU $0a ; CeladonMartElevator_h map_id=127 -CELADON_MART_6_HEIGHT EQU $02 -CELADON_MART_6_WIDTH EQU $02 +CELADON_MART_ELEVATOR_HEIGHT EQU $02 +CELADON_MART_ELEVATOR_WIDTH EQU $02 ; CeladonMansion1_h map_id=128 CELADON_MANSION_1_HEIGHT EQU $06 @@ -2964,8 +2964,8 @@ GAME_CORNER_HEIGHT EQU $09 GAME_CORNER_WIDTH EQU $0a ; CeladonMart5_h map_id=136 -CELADON_HOUSE_HEIGHT EQU $04 -CELADON_HOUSE_WIDTH EQU $0a +CELADON_MART_5_HEIGHT EQU $04 +CELADON_MART_5_WIDTH EQU $0a ; CeladonPrizeRoom_h map_id=137 CELADONPRIZE_ROOM_HEIGHT EQU $04 @@ -2976,8 +2976,8 @@ CELADON_DINER_HEIGHT EQU $04 CELADON_DINER_WIDTH EQU $05 ; CeladonHouse_h map_id=139 -CELADON_HOUSE_2_HEIGHT EQU $04 -CELADON_HOUSE_2_WIDTH EQU $04 +CELADON_HOUSE_HEIGHT EQU $04 +CELADON_HOUSE_WIDTH EQU $04 ; CeladonHotel_h map_id=140 CELADONHOTEL_HEIGHT EQU $04 @@ -3323,9 +3323,9 @@ UNKNOWN_DUNGEON_1_WIDTH EQU $0f NAME_RATERS_HOUSE_HEIGHT EQU $04 NAME_RATERS_HOUSE_WIDTH EQU $04 -; CeruleanHouse3_h map_id=230 -CERULEAN_HOUSE_3_HEIGHT EQU $04 -CERULEAN_HOUSE_3_WIDTH EQU $04 +; CeruleanHouse2_h map_id=230 +CERULEAN_HOUSE_2_HEIGHT EQU $04 +CERULEAN_HOUSE_2_WIDTH EQU $04 ; RockTunnel2_h map_id=232 ROCK_TUNNEL_2_HEIGHT EQU $12 diff --git a/gfx/blocksets/04.bst b/gfx/blocksets/04.bst new file mode 100755 index 0000000000000000000000000000000000000000..6c9f4749ff35108e2df6e6c22094fa71cb8f168b GIT binary patch literal 304 zcmZXP3r~YU5QKN`jIC8$b7!pYwxHlqtUOvDfPL7i{}uiL{JBElLZV-?nM@|Ln@zJc z%Zt278)e+Gg?xQu+;xOZq9?`p`-hOul<_DQk{ZxpDNA|2=NqPB24N5qJvz=;LI3T2M{nzz| iXgsm(udV9@VG>pE*^0=S0#OX?zJcx$@be2?UIBZPogWJT literal 0 HcmV?d00001 diff --git a/gfx/blocksets/06.bst b/gfx/blocksets/06.bst new file mode 100755 index 0000000000000000000000000000000000000000..a82460f5b8dc0b749045a9d0e9150eb6a227cc8e GIT binary patch literal 592 zcmZ8fiBiHa5TyzjP1RNlq)kx{k5swQPCW)hMGLebDju!J|Nn&vx>IRpc6Q$G=4Ib* z5{bpL%oJ;zn}iihrHaMQFBlt+nCtliH=P|wSi&k*DR_j?8qtX!;be;FS_ZJg3l{T> zcyIp5|(9^nkHabmau86^LlXy;vb)keSJr` zP%IQ1%|^3SE|pvDRvYTTb9GB2#uqrCs}PMpV=>k;?~o*<|m~6&W3S!g+v^ zhjY*J2|u%FRxtpfz9B0!Nj?TcBN<{WZqEZR_K>vx7%tBLafgkk;hX;qP zcB>8lNb{eA!)CM97G!3EzD_3J^gYr0MjoPok!P@EgB7pqo}4zDH@Aj2v!sG}ts+q; zr>*wQt?5%76WIgGU_dk)5y2}z80y3K6WIN?=V#gMF{((MjpKMQlrhWuf$LVoY_=K_ z$#7jiFsK^(f%4Fal8n}aDqhX-Gx1ivv&Y@q`q}XlT2JmD>&goM%EP+wvOb^dcsL{) zk2(9PAAXH1WaD_q{SZa(06IMQ8t>P1m2YMo$1<=Ee!u3v?0VJE=*o}AelQxNUwRU$ zrK<6$PxN$xY3EeIzEJ=BkDtF@z5e_gxZdwKKK6RoN9RZ9clUSqs8?^)8>?&j?ChHF z1IPC{zK6JegQ#~+B)=bU;_>~&{~y*Tww{a@MQ_xvt%veHzJ2Eh??2%D*84I&ofDNS SxqPRK??JiZM4hhrLjM78ZN?%M^Dc*8acWjBo!$ierL>}C@}QAtjYqK1yJhu%?Cuz=D*5$p;U zz)tT?6s0RglwMW*E6zCkoq79!<8k)w-gocZ`R<+X&fH~U5)X?fBV%!5%VttC7H6_- zVn`!1;Gak)6V7k@4osa3HJ;aJ7@@FXl$J5o))5M4uyg5^_hWC*s>8n;8*)$@_2}YL8&`4P;kwx>(%wTXs=#EM8PBrRm3;lHfHKkHsz9$-B~JCX#>Pt8Aqo@Ri^F zaPIa)9Ms#De;^Q0d8m2!emdsH;$6C0w$Ate;UG^iTvbt3(NNh?i8G}0HUG^6eprWd zsjDXA=jAhX>#oi%Q(iuCx9*BJbzJql)bsKU1M?bR@e&aAaqeH#FN=>7ho+ zU%42~sno#1eH$C4AL2nOJlqD!9`*qor2_~2Lc$*ihzmR7Lf3Vcx74ynJ$HfJyj7=C)!;$;RXgIjyu&VJ*zo1(u)qM>jk zT3Tk=vVVJh#G$b1FD;8iYwIG>?EafhGbNM6$s|)cEqRx}Qj^wn8tq;86IJJALU<&E zXGZFNn-J>~Nq1gM$_`xgEge_&IoNd`%8oqUeF*%(-qKQ4(c0Qj2|MN*XU?Ac_2#YHe{A2ebJveQ9XWdbx8E=P`PZGl{{bNJAaDQx literal 0 HcmV?d00001 diff --git a/gfx/blocksets/0c.bst b/gfx/blocksets/0c.bst new file mode 100755 index 0000000000000000000000000000000000000000..e4c820a45b66c3e461398bd6c97ab12c261e64a6 GIT binary patch literal 2048 zcmb7F2X|CO6n>ZN?%M^Dc*8acWjBo!$ierL>}C@}QAtjYqK1yJhu%?Cuz=D*5$p;U zz)tT?6s0RglwMW*E6zCkoq79!<8k)w-gocZ`R<+X&fH~U5)X?fBV%!5%VttC7H6_- zVn`!1;Gak)6V7k@4osa3HJ;aJ7@@FXl$J5o))5M4uyg5^_hWC*s>8n;8*)$@_2}YL8&`4P;kwx>(%wTXs=#EM8PBrRm3;lHfHKkHsz9$-B~JCX#>Pt8Aqo@Ri^F zaPIa)9Ms#De;^Q0d8m2!emdsH;$6C0w$Ate;UG^iTvbt3(NNh?i8G}0HUG^6eprWd zsjDXA=jAhX>#oi%Q(iuCx9*BJbzJql)bsKU1M?bR@e&aAaqeH#FN=>7ho+ zU%42~sno#1eH$C4AL2nOJlqD!9`*qor2_~2Lc$*ihzmR7Lf3Vcx74ynJ$HfJyj7=C)!;$;RXgIjyu&VJ*zo1(u)qM>jk zT3Tk=vVVJh#G$b1FD;8iYwIG>?EafhGbNM6$s|)cEqRx}Qj^wn8tq;86IJJALU<&E zXGZFNn-J>~Nq1gM$_`xgEge_&IoNd`%8oqUeF*%(-qKQ4(c0Qj2|MN*XU?Ac_2#YHe{A2ebJveQ9XWdbx8E=P`PZGl{{bNJAaDQx literal 0 HcmV?d00001 diff --git a/gfx/tilesets/00.png b/gfx/tilesets/00.png new file mode 100755 index 0000000000000000000000000000000000000000..f264d943e1f4cd7fdbb897ee4cacc250bc0a5974 GIT binary patch literal 1325 zcmV+|1=9M7P)9?Lb_d_bK9;Pj+=i@{`chE^E}W0 zJm*|=ok^jd3(pb`b4a5hgcd*x(V^kgvFNyTyiR-;ylr@%Be#X{>)h_*SRKFBv0*J1yqnoqr1Y$ zJj$I&dX*o=-bt^Ra56l|;4poC{5+FiYKXN>jxQHa4kgj&HwkMG>)&vIjxM@7IM5(a zM7=7fX&(h!*xiiH%#MDt4>IEjCEws*f&V>GOkss#R~yzApfEIv4UE%VY&!ur?fDZl zS5S}gh;D(5<^dyvCqRCo)Iz@fpH<%`B}&#YnMCo;uvytX1{Cr0E|}Fqm1vc`WX{s4$5C5Sn=!elHi@Ux%mQSCE^m-1NV!jpw-2flfDTksS~zlhrH*xby@XNre>J5f8j z6Su)V8g{j@2t7IxBaitO=9Bz%1BaRO{gfP{beNJK2zuzwM+>5LGphCzlWVEsmD(!5 zr=I*-1YHu-tu#@oq9p7LMd;TB=OYZpgs7(O)Op}UZxcKiRb3dk3bH!L9&Y3QcYzo9v`lq_-uGvQ*|l5Mb>e0uTfgaiyJ9Y_ql+T z+p*PiZVBH%L%oeFt*kRqy^E}Fx$~jWBvz)usGLhrR&X>mAI?NL-N5Npf{UxT_Y@;8 z^vgV0&ezM?lf)c$HDS_uQ-9?AJZj?hMfM&geuHoo@!5pk#DAqGOjVqZ!h9U(&oEzY z!hM`4<0<_I5)70v9m)p;$`d}!tr>h$!e58jv6M6O35Mjb3&KR>e7AsqOKD%qD^={C zir15A7B$%%4ze9M6)b80FpfbS*;pJnEI9fy@y>FlD`%Mz@5uP?MkP<#uvi80ScpP_ zU*`70`z&k}lJt{}zgBvD^)^-~ge2>7Y&-RE1)1U1k~rnh+NT&4gURsbN}kIrQdg_y zv>-bweJ$ugEY@!Jgsh8Q$&8@Ysjx*{;Y=1D(V)zDN%oMb;TG8_Stq zCC`uBDjjqSRcn#1+#H&Vs|5^xa{isbs8IaYd?Q%q$5DrDsI00 z@c(h_zmW3|y+z9J5I2V^bp8KoAv`NK1Vy!~#`_Ry1p*Y)$J{RslKP zAeK>l7tWLw{Q-6p7plaHmuwO2BBVULDas|oIpd4%UOA&r$Kzvp9^cFvjKT9l2K#l( zj^)5|D6!7Y4)p`^maT5jL&4}QlX9ceimMcOWG85(fOC@GHw zOs>KNrV4RPP4NmaiZ{pFkGyq*jW3!0im?QlDW13J1U$Hhm*LbkPW{B_62~*dPqV(x zh}TD346?+Q-LCT#GQ7V`c8V34k|_$h{*VCMAQ-1srbgIrv>1n000Du}P!E5=Z(Bc#Pqz7Mn~r7Qun&Kx_~i_{(>!h~wvDMk zg+hg|zoYi5+t(e(|3@IlVV!E-(aT7i{6}rS=7os-REj*RdJvIc5I-aA71>)L_<|r$ z@HzGkH6!E4=2@M`%Q2GESg^$1`o-;X*R4;oM?pvPd*ty)DVCTkQE+aPLWATu$refH zr!U_fljo3j-&6lDj2_29ynk=6OpxhN{f3Evi)&nboA$fx9&!$c;T3+ZA zX7679LAqB${uLpTziXJy^81EXimX-_5Wx&V?}k4F@9L112*+IQ^cE&Xnv#z?WA3Z@ zS&`{1cuJysmFQPwX{XROKuhkuK z-h1B$oe$=R?pLU-Q#(ubTdMK`Tw+!D1annYi}2V6i4FWL{sNB{IA(_XG;U$t*RLD9 z{=4<4TaI(>I|D@^8~s&8XW>Okb+!Io9qmUFPX$ zobh;?ccs)OIL+D;=>oUjBU$6b2PAXuA(CC}VPgazVaM2ih5ZrcEfuS=XnB<5re&!@ dzH-z%`5%%nDt)2o^4kCa002ovPDHLkV1kB~yzc-2 literal 0 HcmV?d00001 diff --git a/gfx/tilesets/02.png b/gfx/tilesets/02.png new file mode 100755 index 0000000000000000000000000000000000000000..970e457b40147168e27eac4378a3d0dcec9ecd8a GIT binary patch literal 1212 zcmV;t1Vj6YP)r zUuau(6vt1KR=b$l)aEjn&ein~^=9jm8wZj`ZeUq$HPCh5pO%8ow@IGHe8__jjceK! zt)^2P>^|u%;pRtSWxn)5Nangwx?*KmL0D152N}X`n+nt1-k<0EVmf~zxi_EtJ?H$+ z`JHnCpj2YG09P1Hju+dW5Moak!U@CSB7$0NVykVht|<57#dXyy_pKhr#=`K+YY0Rs zedx#H|A9TB7<&YCu`!I`W-YBdQlawA3Po|%{EqYiut6q48A*uE)fm4#4?=h|LfAHA z8wj482gWpJw3JGysKj_jH-c#9>}^+|VmQXb%cS5be+|Kr)tAAa1I`2R@go~S!WYRz zbEr_*xvxqOG2y`|i*%zR3zkn{6gUvggu5ZeZ9&<}jrqer5OAp;br3NS+^k(}+dBB4 z0uTs0+_n|316>d(T@($4$`QExK7<2gQmawb32;kc6vc-9l?9-uCZ~-Z^hYzNy0IQY zm_-6gD#BvjQaE0qT)-dwK*4&9^)PNywsdk0kfwTYE5cYE6pJo;qN9X5C=_G|7*avY zG;JFd9;x`IRJ&LD_VrqJV9^_z<_oZP^3N{Y&fERp1E>|g1a~GU7i-%irO*sOXo?wd zV&&Ka*OL`$xuF=laN2qGsvgQhT>9u|K}#HXmlQ%OZYO-Fcb=TfD~Wg&oqr zuNpvei}~=woUzCuJ%wAhZN!RM#4+f1XAun4-VoyMcmct{KLnn3y+V|^iNJnHpsjR+ z^C>lrqon(&rn-F&U}_kBP+bw6ta)@N+lxM^@&sHhX3d!B1H04%OW=4N*lN?MsdQ9) z=X#y0@ZO=?iFN!5;HN4A{s4?7#QJCwo^d-+(XsZzt^`9;vBLxYPNF?{>_Erb zF{@gJe04>(rROE`C8whqD4Yhukzr>rY?1S{HsIvsE@>4lHLU^Uu#5c?TAr+`aV|km z!5o9HGn=bgYhBTM-Fy$OT=@BZ#IS}4y!ZtwKJjEP#jzKq$@Obv@M$o3tNvo7x#kvp z$(Rq$w$L>BW!T2X-up{aw?d|OW37EkQnwQ54&*Qfk afqwy0<8w!?5xQ~!0000r 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 literal 0 HcmV?d00001 diff --git a/gfx/tilesets/05.png b/gfx/tilesets/05.png new file mode 100755 index 0000000000000000000000000000000000000000..ca4b0669a0dbaf79f2542580de8a0907a673944a GIT binary patch literal 1161 zcmV;41a|w0P)bEfSYC1?~|)h!|H%;KMRM5EgkWFEtf) zGK6Hrm~^Zk%7a;E(CD}!pwz_|95Gqb!~}`5_(9=Hf@CpiIX>sy3tQroCcXLH|9Rfe z1d@g)4LM< zBEglnIy%mNFMtOn7-W-^XMYl)2BnXxysiGe0r7MKAqUM2ummv<0A&ij`WIsg76RlF z_}uz7;tX26=!i~_5QuvPP?^dc@9!iDOdb>93S&yqiUgqs34$)AFkkwZD3ieNS4^j| zr~pA%&}D|zb;Re~whOy$BA@b`plOIB{zk_@pQbUEvmh0*pv9Wz*ZyQI{|*Qq8^~H& zN}H!6P7qa$cruQbl<@K71qmK0*luV^&CYXPHg15RrJ=72$%mJc0mdFZf8@K?w%K{a zSBAhVGrekgL1u~wy-5kSJxWPJi4!O_YT?;^a9mcaw%uj|yv*Q}F#+Pcy`83__;mqh z3cf}PNJ&7Xp;PoUSS-6vAbgCO76!;+OlJB70R7x>U`jYA;o)L6cm@<2zBuhR6gCM? zAx<0sVbzSO2jKB`rqTibka zNiSr+CIZhRe##fePkdHcXSY9K0zLctwLi*}wY32g^mIp0Up{@k5K5`%0%ZTb`ItX& z=TPmreZ|1w)TO)|^_RL$u$Da@@_F^3MF;!Tq_5hgs!Nnq1;7y4-(gAD(h~qo01nzd%gNwQ~ zP1jBwakQ@aWeXG3cyYuS0nNo2BBH)Y&)--P#RXmDd{6soaSxJj2nC`5`sNp}fol{| zT(QOM04cg!p;0lxZrdIvNO9&R6Qo)Uz`Q1CNf98YV^xOJg|^*(v9q-NbCu;f9CjI7 zqr%p&xq(Uzn`t`R1!6xwde+`tuJdIAt2+WD13q7+wzf*3x>o>KGZZN(!85N)MXfKO z;QBqqAsEb4FtvKmNABfv0I4vdh;LUSld*}!#K;IF@*%UdB2qU&IO@#UKolndQ**(& zw4#dg4MjMbaoRu?4U#~3aIP>_w9o+2OvVZK0hL1Rk3oVtOS87Y(ziUkBP_4S*3SWb zZhiMh4`)6JKAw9|+vw`MOA*q;gD&Y*zg?`u|1ASh1=J%R0y!Xcnd0yzIIM+C#Yq8Hd4?2` zAY+!M3dCXl1IC#E00d~uag@FeaTv2O7PM9zRfizLLIhA+g-ab|FY*vg-vmeh8R{6G br5OJK3=P@Sj)-xG00000NkvXXu0mjfJr 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 XR)@jQ3xZFU00000NkvXXu0mjf=t69+ literal 0 HcmV?d00001 diff --git a/gfx/tilesets/09.png b/gfx/tilesets/09.png new file mode 100755 index 0000000000000000000000000000000000000000..fa3f8c9d83c711458e36b3f912f6f97551e45fdf GIT binary patch literal 1125 zcmV-r1e*JaP)s zTS%No6oAiO#Kdm#whPfhv6_Z;^PpCvv`GG~X{aO=FZ|P%VoM2DN-5Mnlr1e@Qnw;f zx;9A3LLSy-Y5$z1_?|^}y*x;|U|+1)} zn8}cCAVjgKKnOkG@)RpmD|2rk zrZ{i&Orz=G^825>>EIRNw@Nl#al=6f`V9wNLI_?$4lRXYPU}ldF`7Y^`Po{=o&-xs znml!=fu*!=0=SdFQZ9U{q-o7ac~^it0j32q*If=Fo`py)9#$&OaqW&q-U|d~6&@hQ zU?8LsAO`Q;(ikvfAbK>0tQgF7E8GiNm0XgQpQoqP;u$Z$D}oL_zEd~gVDoU@eFraA zd3Alb)WL=erP%enr%59(MXs(ombYP=k~c-C2}qf|jXa1C8_bmHXUPaD#$4WH^ruo` zzYiSr`t!oZ$*3P}G~bGXYOlBYzE#!mL4U!3$6YY%z_9zkP$>W&jth3WeiE z!0g>*$x?mFvFWobrehaRn&%yxEq-6J^k`wwv8w(4=l-O-4^(9sKYQ5cSox7K;8inV zt~bfB%f_5Xe&E>U8}zbCCFC0FVO&=A@h&aJxTB?I66RHit@}BNCr~so8-CNE0dAS{F z6dRZ-DN!6h3Vdz@3M@1z|(_`-ZL8mgN^=^tc?TJ{vz9v z5ttsR_R>kqaXhYv(QeBzPu_BD@yoF(#CwcM#My14BgR=FlG~>mn-M?V{+lsiYTOi& z5{my&4dYBgSUOp&OYq`zz&md1dC0gyv2UA|6$EmHajI;}mP&V?HLw@%>;f_~`wXO#YUiKhTx z7qyep}>WO*ASy@5f=;B0p=MwsBqno^IX0X ra;(B10q*I)88M^^Xva!b)_DA1Uw{^PU7q&e00000NkvXXu0mjf?Ufj+ literal 0 HcmV?d00001 diff --git a/gfx/tilesets/0a.png b/gfx/tilesets/0a.png new file mode 100755 index 0000000000000000000000000000000000000000..fa3f8c9d83c711458e36b3f912f6f97551e45fdf GIT binary patch literal 1125 zcmV-r1e*JaP)s zTS%No6oAiO#Kdm#whPfhv6_Z;^PpCvv`GG~X{aO=FZ|P%VoM2DN-5Mnlr1e@Qnw;f zx;9A3LLSy-Y5$z1_?|^}y*x;|U|+1)} zn8}cCAVjgKKnOkG@)RpmD|2rk zrZ{i&Orz=G^825>>EIRNw@Nl#al=6f`V9wNLI_?$4lRXYPU}ldF`7Y^`Po{=o&-xs znml!=fu*!=0=SdFQZ9U{q-o7ac~^it0j32q*If=Fo`py)9#$&OaqW&q-U|d~6&@hQ zU?8LsAO`Q;(ikvfAbK>0tQgF7E8GiNm0XgQpQoqP;u$Z$D}oL_zEd~gVDoU@eFraA zd3Alb)WL=erP%enr%59(MXs(ombYP=k~c-C2}qf|jXa1C8_bmHXUPaD#$4WH^ruo` zzYiSr`t!oZ$*3P}G~bGXYOlBYzE#!mL4U!3$6YY%z_9zkP$>W&jth3WeiE z!0g>*$x?mFvFWobrehaRn&%yxEq-6J^k`wwv8w(4=l-O-4^(9sKYQ5cSox7K;8inV zt~bfB%f_5Xe&E>U8}zbCCFC0FVO&=A@h&aJxTB?I66RHit@}BNCr~so8-CNE0dAS{F z6dRZ-DN!6h3Vdz@3M@1z|(_`-ZL8mgN^=^tc?TJ{vz9v z5ttsR_R>kqaXhYv(QeBzPu_BD@yoF(#CwcM#My14BgR=FlG~>mn-M?V{+lsiYTOi& z5{my&4dYBgSUOp&OYq`zz&md1dC0gyv2UA|6$EmHajI;}mP&V?HLw@%>;f_~`wXO#YUiKhTx z7qyep}>WO*ASy@5f=;B0p=MwsBqno^IX0X ra;(B10q*I)88M^^Xva!b)_DA1Uw{^PU7q&e00000NkvXXu0mjf?Ufj+ literal 0 HcmV?d00001 diff --git a/gfx/tilesets/0b.png b/gfx/tilesets/0b.png new file mode 100755 index 0000000000000000000000000000000000000000..b017ccd7f26e3a8af20b7f67717011b6c25a14ef GIT binary patch literal 269 zcmV+o0rLKdP)405POLiVR*gD%4%2vnCeFq%^b`yZIJ!v>(9rLa`2SGbGLWY)kOq*FwE#(n zltK_N8vLvCxe6uztMhTJ6608-k5ff-I5jfv)e9JT@Z`w-t!Yrn3QTpKHXJcg=OxQt zr}M_Nrx-WU8&z6s zTS%No6oAiO#Kdm#whPfhv6_Z;^PpCvv`GG~X{aO=FZ|P%VoM2DN-5Mnlr1e@Qnw;f zx;9A3LLSy-Y5$z1_?|^}y*x;|U|+1)} zn8}cCAVjgKKnOkG@)RpmD|2rk zrZ{i&Orz=G^825>>EIRNw@Nl#al=6f`V9wNLI_?$4lRXYPU}ldF`7Y^`Po{=o&-xs znml!=fu*!=0=SdFQZ9U{q-o7ac~^it0j32q*If=Fo`py)9#$&OaqW&q-U|d~6&@hQ zU?8LsAO`Q;(ikvfAbK>0tQgF7E8GiNm0XgQpQoqP;u$Z$D}oL_zEd~gVDoU@eFraA zd3Alb)WL=erP%enr%59(MXs(ombYP=k~c-C2}qf|jXa1C8_bmHXUPaD#$4WH^ruo` zzYiSr`t!oZ$*3P}G~bGXYOlBYzE#!mL4U!3$6YY%z_9zkP$>W&jth3WeiE z!0g>*$x?mFvFWobrehaRn&%yxEq-6J^k`wwv8w(4=l-O-4^(9sKYQ5cSox7K;8inV zt~bfB%f_5Xe&E>U8}zbCCFC0FVO&=A@h&aJxTB?I66RHit@}BNCr~so8-CNE0dAS{F z6dRZ-DN!6h3Vdz@3M@1z|(_`-ZL8mgN^=^tc?TJ{vz9v z5ttsR_R>kqaXhYv(QeBzPu_BD@yoF(#CwcM#My14BgR=FlG~>mn-M?V{+lsiYTOi& z5{my&4dYBgSUOp&OYq`zz&md1dC0gyv2UA|6$EmHajI;}mP&V?HLw@%>;f_~`wXO#YUiKhTx z7qyep}>WO*ASy@5f=;B0p=MwsBqno^IX0X ra;(B10q*I)88M^^Xva!b)_DA1Uw{^PU7q&e00000NkvXXu0mjf?Ufj+ literal 0 HcmV?d00001 diff --git a/gfx/tilesets/0d.png b/gfx/tilesets/0d.png new file mode 100755 index 0000000000000000000000000000000000000000..e3095f7d9965a9beaef2339732397bab869f5b61 GIT binary patch literal 861 zcmV-j1ETziP)Z3&M-H$@4B5XBA_c>Bmb ztb?~Y6kni1LWtm{=&W_X7dC__>N1tHUY0Ti7i?Lbgl2K6~4 z!R46-0*H5z!>poM(- zs0dxS5FY&<8XQC494HDZe1~=s`!^E^XP`qAMa)QK5o()*BB6~PVGZ09nLtWH`);gQ z%)}xftV}=*?pYj2C>Yy8VIhiZqct==69a>;ULbT9V z`gUSaI$=iX#b5R|-%du+iu3@wx=M2Y7Ql6o#Zt9D?n#;M{=L56v##c7rIlRIHs5@< z>S(Bw(Xh{2n1iQmS);G=2~)^|^E#>D2bxB?6Zyp|6jWm@l;|Z%yUWW>wDJU0sPCAy z@(`#!-E6jridCQ+-Q~Adqi~S3(*9gB2L}TK$1G~5ij_Cmv*fzknmd00s(VjZ8VeF!|=p|wFZtTkxRK~SMUCii5bz%xalF@0zIHM2I nO+`)S4=m@-*HJytb(Q)HR94m209D6600000NkvXXu0mjf#{!a= literal 0 HcmV?d00001 diff --git a/gfx/tilesets/0e.png b/gfx/tilesets/0e.png new file mode 100755 index 0000000000000000000000000000000000000000..b931bc5014979095ceb4216ce2dcdba75f19d41f GIT binary patch literal 1140 zcmV-)1dIELP)?mhhOeJ_jkX)@A=)} z1$YrbKs_Ma!JC%D2HzrMz_8EFGq66v^c9{&m=(@Du1qqX>x#>5x41sqidP9ea>qEf z%(CFIK1MD{kfpxHGe^ZCqu)@#WmPA5Mo=Yq#5*3z->8%|)yT0FaJ0gS%SsSYhT1%% z4+%3wl7>-a$hwn7%YBP=Jg}_(!-EI9j`Qrkz8Uw3sy*WI`@XP36{;gdecN@Akr{!$ z9=i2SlAh>_Kjz9M#!tEU6i>>8X-*e7?6Gf}Js#D=ycjZ@AlJ{C8tFCs6dA*rB)cZ~ zYM$Xdb{;c@&0?}U)N4YePWB==PPV~YA$#xfuHm@lq$RL?{g8tdUZ3Zn$3n!ylH&(V zjysmQn|znUk123Ol+R$lg*5DHk;a4+Q_R=2vPb`AZh=BSBeUFkWxMQcq=>qx6Fno^ zOWm+x`A-}&NF~ktu;BBJ&q>EmKK>nj3JG^hW0S-I!cVY=$ebcILtla2MRtd*4>EO= z-}9Ue7>al!V*d*JpE5n&8#xgf(_@a+?w+$jZ`y);LfsK@NIbtv@SLEbmd;1y(9PxC ziPQ`C9G1T<2OWck+lCwc+$d0#9A=uvR`VCMG`x&C2X-^Q>4(Q^Huc+=jF0W8e`JYP ziJm(dJBlJw-*;HYs?T#D<8RTtliej%yLh5`q^3$036y%-SqH2Z6qvGK$H#yYcmj;iHQ=6k!q;6@XXcU`5#pt#r zMTW>O%xy*LBA3bUSB*No&nPpv8?DN2QZRx^D5QwTzyL!-TV@$*+FtXLQ(I<@w0fFU zw&6Fa`~2;5O`I=<=xSf0yyllqM{%u)WWRm?Ys{M)Jy8hqT;UiC@DltbMkrVf@@!+oksRqF>5` z9l#6_wTRaeH^YitBUKhri@w(ST82_ab(l$WZJ<^9Rf5q;%2M_bcbqS~^Bc$M@U5@AeGcP=X5Gu~m`F=G zvC;focKW<6z6`nYgGK%HzqhFW0osV{i$7w4L1tlF zh~Q9=n8_k}bSXla#f&DEFw|sK%%-@|ja^LAiYU!|m zLAp%(vTB|#sxOWcto~IlP%7qm(s{d#Sd(1IEL>}G0$gh8Qkgqo0T~+My{joN3BN{Obxva!->PJqm z;yLyfMP&dpOrQpXJSSnAf;5-P3cdnO?z_VBVR~ zv0A0sjbMG{hZNF#>U8c`n6o9Sd1ChGWvRHnJ>oq zY(v}r^_KFf%XEgx8MbF=&2Z{@>d&(CQ~&?_lMnd%Fo%Kyl7$BIZudD@x`UB+pM#N6 pop;wpcg;k1Q|#d?PgdpT{s)O3bm*h;wD14`002ovPDHLkV1jX*?T-Ke literal 0 HcmV?d00001 diff --git a/gfx/tilesets/10.png b/gfx/tilesets/10.png new file mode 100755 index 0000000000000000000000000000000000000000..a48f1d847433eaef7f53464288acf97e12a4a452 GIT binary patch literal 1177 zcmV;K1ZMk*P)r zUuau(6vxjRqg||~U2it=W$AR`_728iTWNEp-rq)XQ13K@E3Qm18>ujNH z4;$FQ42U;d8*k1Eg2ksGx5^MZ#`dzj>`8nYLzCE=q2|x={C@Xt^*)5p{pQ^B?|04* zh@M^$X@Jx^5XDD?Wp;dwLtkoLVPrvM0vrsBbbv7-tN?!$;-%EO*K;|1NbbWj|->u~e?2|1*)G>*D z${ZlH8G^7dIX2ztjDsV_#CtX#p&Nk47`=PX?RgH^OJkIO=$?Auz`fEKJ9X3lIM8}i zsp-8ARE9ZQ*FdfyaX<*?^PeJ|;Am8c^TRjZ;%Es|h^toYd{RJ(*mPpbNWKpTNr=*i zuVj)Q7cazu5GRs3h2u|M8dqrEELr=%dcDT(BpP2+0XTog(Hzx4%qxQm2d*hJFyDnU z3M05yfR@7N5ii3Z^RjFE5X+D|^YO|Uzr2x#Eh?-TR%(83~(NUs_ld=l@_5wHLq`yDsiTmF60wiiQczcd}MJh6kIMclJ}hNDRYcWK%HZHGX+)EDnR`=qwbs;xyFt)guMXvJ7I zY$deq7^~dH6QkO;0alS0J(Gwv4Zu4xY(h?nk70?VaKx7CMTzw3ramPxx`TK}*BEbePuz`q-F}4CYH?RBBixjDty--x900000NkvXXu0mjfXcjG< literal 0 HcmV?d00001 diff --git a/gfx/tilesets/11.png b/gfx/tilesets/11.png new file mode 100755 index 0000000000000000000000000000000000000000..321662733414770c9ad12d8e7041a250a15bb0b0 GIT binary patch literal 1018 zcmVuqHhcEmTcmF1@CW(eu`{pr9`bPeh?1@rbcWrkKSHr>_Ir?UP0~Cc}JcTJ8pdN;72@{gW66?DRB3o0;n5(LE zGToyI8n_)o_V}o_zANeOw4wcD)7o5>q`T(4(_b5%tMXJ}sCaB7y1whFOw;RIQ*q;P zYCblvLEFNMf%ftDEz55KbW9yrqX3?X<%w;0`RJ0$5cQLPoh(Du_xt>W-NweC6}$pn`*XhMzdNv9ZB=IomKQ^}oU$S-5=2C{W~Y}4F(Yf>ofQ1iMHe6d z2Oi#$e{tNGU(Z0~h%tgIK<)Z8JlnS_zqaB|J9`#tvZn6|Bz(}y^vuP#-8Fm~62sp5 zo?ds&!6}Fidp$ZmVE;7DSAZ;Iz0IG)>xhzZ`U|GWP6@QAM@mFJEXwbl28uD$DZByM z;P525)Vx<@!2cTeMgIpCqYS#}{P9#a3xE^8WOG4a7C0G+>q8^9!* z0|2jF1=gZ+#$BVF0rX}RR0hfDK6g`&6@wg9O`<(adYg)r?O?LOP+0o27KO6iANctt zyAbd<7067ie|czYGxj*YMdtFd5wZ*Km5Vv5gLj&L{jgN{V2A2$Xy3T-M&915{+R0R zymPss`*FV9Y6$^ceP%WMt^JKIr_-SFcq*QXrDqr8DJs5ptKDi#&n`Uu5pZs5Poc4P zgHeQ)Q%V0eCMc5xIuGph`j~&4yGGI1ZYU^A3IXS_a~lgtXL1c|JGZf@(wPWaAeclN zFpNAR><^%pFR6I=Yl1`TST%?m9(hR6wX6pppw2pz1kKIb{eix?bgGZwtqW~8SFfR} zUnB50bbe)Cil4y~1ih=_o7ugjg;8iQ>S}Vu;O2l%=UMvkC!Q|_i#3b+Lm zqUxsmfIoq%9`f)J>rHC#z_QWguja8h8SFOeJFNePZDU*59qbJ4CN0B`Va5=*;XLEx z$~~5s_?WV{j0qu@vmwOHY6!9BD*vu>Av(RaRD;R}S(np#bMqgdWX(A$(Cf`g`-fNd4Ux%1cAo zBQ`hL-PO2Ayus!&Z)eT$#YsrV}O4yFPXN)@hDxb~XHWl0UIul#6P_l>ckTBSZE zwMgo?m;x`0K+L}AqDS+1EktcA`1@EblAoyB$$;ddLc~v{G~u5uMX<%1gNR=$xx&Tz zM<9;;lwiCMMS+eE6Gq28Qz6+Z5sm8FB9;qj6Cgoyo&?F2)=xL%Fe&v+UR zTuz)NzBlUf6C|I7>}T|&WpiW`>Rcc!oPXL%kezjDi7+`8blHpP{h-ukFQ)hX(~B90 zR2W%`GHX+c(p2>BAnAa!@MggI8kxav{}e|UKH#%28ErHDnCT36Gpv|C%6pg-@b)#% z{Sb1d79!q|JrFfy!6J(w+veSxVvO#VObu}BGJiZLHxx?k;~&9co2xbUqT=cYCNOuL zn9rOu?DTK*-c?21iTh%me)iRo1*8vo9o}$@$+;^)Y~d0M@6)Q&iu%Du)!aXH$HI#! z?uK2+vrwRVo7S)Hd~0|6R%|@aa*^~E3TaNdcSLI0O-~K`hV~+M0{axZ9|?F5GtXL% zRm(lgyc6e^<>q~E27DcGL-4Ui^ptx^P*!|iX041VYeWwGe7+A~4EiIO>W{w3a^v+) zW}wgY*SYe>=T!O0hVoc!zoh11gv?!X^-xA{b8}RdY1E@_)ybDD;55?(W^Q-IFD@%Y z@N|JEMc(<4JK1h2{|~>UiDf2M*tWFfWXNIbVZ2ylq=tQfZD@SJazpSZUzJ16JAGx# w8k9#`g?Rj={~OU6D;$r<`{xxJN`g!N51Ra>-1>ie6#xJL07*qoM6N<$g0C_E+5i9m literal 0 HcmV?d00001 diff --git a/gfx/tilesets/13.png b/gfx/tilesets/13.png new file mode 100755 index 0000000000000000000000000000000000000000..2ec8f928e52a12213e99f3c01b6000ac60b86338 GIT binary patch literal 1012 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 literal 0 HcmV?d00001 diff --git a/gfx/tilesets/16.png b/gfx/tilesets/16.png new file mode 100755 index 0000000000000000000000000000000000000000..5d69fec8622c2f94bbf8ea113b574ab80b633bc6 GIT binary patch literal 1088 zcmV-G1i$->-}%nD z=X~b?=g0v#FT?M;ep7z{0z_N4o*r6lHP<8{^0`_ocP%%n-}hj7-8wkbs+v9mdPWGW zTZ3o5JNDp&3(@75RvQaVtu<`Jq&3*p*!^3*2g8#VL_&vN)Bv}ks-4tKSpdIlZMJQ7TIA8G~Yq}7fb6~84{;7uZCWKW9OA``CZ+a0fbPdzQ7(+ao z-$>_v{xNqy>q2{e;L85fEb`Aq35+TEzj*$_?o-pf5&)DeD;@0HeQTx5i@1?0H3aKM zi)Y;k@TW?Vz3)Z-ZgC;Zu3Q=#^0m%(ZNs_ri`B-A&V!mgJG!s~?h<;S{sL>8)!^#~V|yC}XeK;LBWfCz#GDU19&-zfl)*C@4DcsE z;n8Aw0gRHtO>+VS@K;OCU~Cv$x?W%cjI*y*Ft&^h)0~$PeR1nJ7~Cl7`h2~Bv0&u~ z0Vz$Zvz_6ig>3K+1xg%I_)Asda(ym z1P^c1nIdQkmXnaS2kht13I0XQ#uo=*z)st@A38b4gZraY{3)3OsmtBiCjo+zEk+T5 zTY31Y*PwpL72IyYsT^vING&cG5zOSDGatiW)fr5b_7AB93q#+G^eb)<-+K zl)tKqNFa{A|Fmk@B-L{=LKADh_v?QSA@`w#{@ExGtBg%hy@*nx2--2x0=1lK-HGrg z>6G-yRd90nDJR5S=$}<^_zvQ;82H=>2c{FgyqiP8xmwOw6Ld`!I#zp}{RNn`+WMf- zGTjpds1rB=f1H59`e)t2q+dcoo&FdG0lJ&&f^h*gYF`^v7)yA-)Rh}h259uUF!h2T zcw-qw(x$K)XKHd3#8v1G%T%AduRznLlpLb-#*Bs4OlESaQ$ZfJKPAvbI=R%msA<<0>;y*{p@u^t%3*cvd2>+$r&O9YV$Xeet5J3lEt46s zm!F8`rU>~(ZG`jJRCYq;&K7AS3x+KY5Jd=xAr8*;zJzV)0;suk&g~*{T#v_NGrd_S zBFbMCk2N*nOdv zgV!adNGHmt&b^JP7+WgKu#r0NrS2ZEFg9lDBo+0Ehy6r?TE>!sM5FbIL_c{Fj#DZ& z5OScn&=(+(%cSQ+p?19lM1}y1rzZt?YGZg~7;Sk@8M#vudgIi>sRc~q#HwF?ZZsj< zM63~b01m4Wld2aNQKJ4?zG-}2FS6|sh&1p8-?%=dC$jZ`LirtDTJxhnKQm1Pc$LnG zn&qTBu%)gQD11y~bbayZqkjHq`ig)7MuoY{CvF7!)|zU-?=?28OeOpDQ28r}1)uj4 z`AkPu#qF*Ys>iFxEo;x#9DE1yWXOJD)@-?E?06s`h7FdA`QF*T>=Bb0F_dzOwp5+P zIIyYPsMFKf=~-E<3Tj6XY0}Zx*6f{dSl65Nx%LuC3ieHj)8WB(qnytjIPOUGIUAAY^r`sr0ZqhkQz$eX{mtLpaPKoBYx-fPY0 zXLeD0w-Rk}ZaIK;t8n0Pli!SOoY;c*AUFQwsAj|HUJ7xzk#&ftsin83a+=S<*ER)4w zLzcfgZ@4%Ka44H$3~da+-3#zUE{-V6w*Xwf0GM)dJSvKU#?(uQDVxb=&_*y|7p1*O zS+q!I3n89(4pZS@1i-cG@t}qkz_YFeA78g`@54l5AHMdbj{3af+&@lZ*rEZzJ|kn~ jA~J@3_Qien?wS7q&n+4=b+jns00000NkvXXu0mjf;Oz3x literal 0 HcmV?d00001 diff --git a/main.asm b/main.asm index 499b99f1..537ceca8 100644 --- a/main.asm +++ b/main.asm @@ -246,7 +246,7 @@ MapHeaderPointers: ; 01ae (0:01ae) dw MtMoon2_h ;id=60 dw MtMoon3_h dw CeruleanHouseTrashed_h - dw CeruleanHouse2_h + dw CeruleanHouse_h dw CeruleanPokecenter_h dw CeruleanGym_h dw BikeShop_h @@ -374,7 +374,7 @@ MapHeaderPointers: ; 01ae (0:01ae) dw Route16House_h dw Route12House_h dw Route18Gate_h ;id=190 - dw Route18GateHeader_h + dw Route18GateUpstairs_h dw SeafoamIslands1_h dw Route22Gate_h dw VictoryRoad2_h @@ -413,7 +413,7 @@ MapHeaderPointers: ; 01ae (0:01ae) dw UnknownDungeon3_h dw UnknownDungeon1_h dw NameRater_h - dw CeruleanHouse3_h + dw CeruleanHouse2_h dw Route16GateMap_h ; unused dw RockTunnel2_h dw SilphCo9_h @@ -18116,7 +18116,7 @@ MapHeaderBanks: ; c23d (3:423d) db BANK(MtMoon2_h) db BANK(MtMoon3_h) db BANK(CeruleanHouseTrashed_h) - db BANK(CeruleanHouse2_h) + db BANK(CeruleanHouse_h) db BANK(CeruleanPokecenter_h) db BANK(CeruleanGym_h) db BANK(BikeShop_h) @@ -18244,7 +18244,7 @@ MapHeaderBanks: ; c23d (3:423d) db BANK(Route16House_h) db BANK(Route12House_h) db BANK(Route18Gate_h) - db BANK(Route18GateHeader_h) + db BANK(Route18GateUpstairs_h) db BANK(SeafoamIslands1_h) db BANK(Route22Gate_h) db BANK(VictoryRoad2_h) @@ -18283,7 +18283,7 @@ MapHeaderBanks: ; c23d (3:423d) db BANK(UnknownDungeon3_h) db BANK(UnknownDungeon1_h) db BANK(NameRater_h) - db BANK(CeruleanHouse3_h) + db BANK(CeruleanHouse2_h) db $01 db BANK(RockTunnel2_h) db BANK(SilphCo9_h) @@ -36712,7 +36712,7 @@ VermilionHouse1Blocks: ; 1c1de (7:41de) NameRaterBlocks: ; 1c1de (7:41de) LavenderHouse1Blocks: ; 1c1de (7:41de) LavenderHouse2Blocks: ; 1c1de (7:41de) -CeruleanHouse2Blocks: ; 1c1de (7:41de) +CeruleanHouseBlocks: ; 1c1de (7:41de) PewterHouse1Blocks: ; 1c1de (7:41de) PewterHouse2Blocks: ; 1c1de (7:41de) ViridianHouseBlocks: ; 0x1c1de 41DE size=16 @@ -38826,26 +38826,26 @@ CeruleanHouseTrashedObject: ; 0x1d6bf (size=43) EVENT_DISP $4, $7, $3 EVENT_DISP $4, $0, $3 -CeruleanHouse2_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63) +CeruleanHouse_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63) db $08 ; tileset db CERULEAN_HOUSE_HEIGHT, CERULEAN_HOUSE_WIDTH ; dimensions (y, x) - dw CeruleanHouse2Blocks, CeruleanHouse2Texts, CeruleanHouse2Script ; blocks, texts, scripts + dw CeruleanHouseBlocks, CeruleanHouseTexts, CeruleanHouseScript ; blocks, texts, scripts db $00 ; connections - dw CeruleanHouse2Object ; objects + dw CeruleanHouseObject ; objects -CeruleanHouse2Script: ; 1d6f6 (7:56f6) +CeruleanHouseScript: ; 1d6f6 (7:56f6) jp EnableAutoTextBoxDrawing ; 0x1d6f9 -CeruleanHouse2Texts: ; 1d6f9 (7:56f9) - dw CeruleanHouse2Text1, CeruleanHouse2Text2 +CeruleanHouseTexts: ; 1d6f9 (7:56f9) + dw CeruleanHouseText1, CeruleanHouseText2 -CeruleanHouse2Text1: ; 1d6fd (7:56fd) - TX_FAR _CeruleanHouse2Text1 +CeruleanHouseText1: ; 1d6fd (7:56fd) + TX_FAR _CeruleanHouseText1 db $50 -CeruleanHouse2Text2: ; 1d702 (7:5702) +CeruleanHouseText2: ; 1d702 (7:5702) db $08 ; asm ld a, $6 ld [W_WHICHTRADE], a @@ -38853,7 +38853,7 @@ CeruleanHouse2Text2: ; 1d702 (7:5702) call Predef jp TextScriptEnd -CeruleanHouse2Object: ; 0x1d710 (size=32) +CeruleanHouseObject: ; 0x1d710 (size=32) db $a ; border tile db $2 ; warps @@ -73041,7 +73041,7 @@ Route15GateBlocks: ; 480c7 (12:40c7) Route11GateBlocks: ; 480c7 (12:40c7) INCBIN "maps/route11gate.blk" -Route18GateHeaderBlocks: ; 480db (12:40db) +Route18GateUpstairsBlocks: ; 480db (12:40db) Route16GateUpstairsBlocks: ; 480db (12:40db) Route12GateUpstairsBlocks: ; 480db (12:40db) Route15GateUpstairsBlocks: ; 480db (12:40db) @@ -73430,7 +73430,7 @@ CeladonMart4Blocks: ; 483a1 (12:43a1) CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126) db $12 ; tileset - db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x) + db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x) dw CeladonMartRoofBlocks, CeladonMartRoofTexts, CeladonMartRoofScript ; blocks, texts, scripts db $00 ; connections @@ -73700,11 +73700,11 @@ CeladonMartRoofObject: ; 0x485a8 (size=36) EVENT_DISP $a, $2, $f ; CELADON_MART_5 CeladonMartRoofBlocks: ; 485cc (12:45cc) - INCBIN "maps/celadonmart5.blk" + INCBIN "maps/celadonmartroof.blk" CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127) db $12 ; tileset - db CELADON_MART_6_HEIGHT, CELADON_MART_6_WIDTH ; dimensions (y, x) + db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x) dw CeladonMartElevatorBlocks, CeladonMartElevatorTexts, CeladonMartElevatorScript ; blocks, texts, scripts db $00 ; connections @@ -73779,7 +73779,7 @@ CeladonMartElevatorObject: ; 0x4866d (size=23) EVENT_DISP $2, $3, $2 ; CELADON_MART_1 CeladonMartElevatorBlocks: ; 48684 (12:4684) - INCBIN "maps/celadonmart6.blk" + INCBIN "maps/celadonmartelevator.blk" CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128) db $13 ; tileset @@ -75034,7 +75034,7 @@ CeladonGameCornerBlocks: ; 49003 (12:5003) CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136) db $12 ; tileset - db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x) + db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x) dw CeladonMart5Blocks, CeladonMart5Texts, CeladonMart5Script ; blocks, texts, scripts db $00 ; connections @@ -75082,7 +75082,7 @@ CeladonMart5Object: ; 0x49085 (size=55) EVENT_DISP $a, $1, $1 ; CELADON_MART_ELEVATOR CeladonMart5Blocks: ; 490bc (12:50bc) - INCBIN "maps/celadonhouse.blk" + INCBIN "maps/celadonmart5.blk" CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137) db $12 ; tileset @@ -75235,7 +75235,7 @@ CeladonDinerBlocks: ; 491ee (12:51ee) CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139) db $13 ; tileset - db CELADON_HOUSE_2_HEIGHT, CELADON_HOUSE_2_WIDTH ; dimensions (y, x) + db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x) dw CeladonHouseBlocks, CeladonHouseTexts, CeladonHouseScript ; blocks, texts, scripts db $00 ; connections @@ -75280,7 +75280,7 @@ CeladonHouseObject: ; 0x49227 (size=38) EVENT_DISP $4, $7, $3 CeladonHouseBlocks: ; 4924d (12:524d) - INCBIN "maps/celadonhouse2.blk" + INCBIN "maps/celadonhouse.blk" CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140) db $06 ; tileset @@ -76246,22 +76246,22 @@ Route18GateObject: ; 0x49937 (size=50) EVENT_DISP $4, $5, $7 EVENT_DISP $4, $8, $6 ; ROUTE_18_GATE_2F -Route18GateHeader_h: ; 0x49969 to 0x49975 (12 bytes) (id=191) +Route18GateUpstairs_h: ; 0x49969 to 0x49975 (12 bytes) (id=191) db $0c ; tileset db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x) - dw Route18GateHeaderBlocks, Route18GateHeaderTexts, Route18GateHeaderScript ; blocks, texts, scripts + dw Route18GateUpstairsBlocks, Route18GateUpstairsTexts, Route18GateUpstairsScript ; blocks, texts, scripts db $00 ; connections - dw Route18GateHeaderObject ; objects + dw Route18GateUpstairsObject ; objects -Route18GateHeaderScript: ; 49975 (12:5975) +Route18GateUpstairsScript: ; 49975 (12:5975) jp DisableAutoTextBoxDrawing ; 0x49978 -Route18GateHeaderTexts: ; 49978 (12:5978) - dw Route18GateHeaderText1, Route18GateHeaderText2, Route18GateHeaderText3 +Route18GateUpstairsTexts: ; 49978 (12:5978) + dw Route18GateUpstairsText1, Route18GateUpstairsText2, Route18GateUpstairsText3 -Route18GateHeaderText1: ; 4997e (12:597e) +Route18GateUpstairsText1: ; 4997e (12:597e) db $08 ; asm ld a, $5 ld [W_WHICHTRADE], a @@ -76269,7 +76269,7 @@ Route18GateHeaderText1: ; 4997e (12:597e) call Predef jp TextScriptEnd -Route18GateHeaderText2: ; 4998c (12:598c) +Route18GateUpstairsText2: ; 4998c (12:598c) db $8 ld hl, UnnamedText_49993 ; $5993 jp Unnamed_55c9 @@ -76280,7 +76280,7 @@ UnnamedText_49993: ; 49993 (12:5993) db $50 ; 0x49993 + 5 bytes -Route18GateHeaderText3: ; 49998 (12:5998) +Route18GateUpstairsText3: ; 49998 (12:5998) db $8 ld hl, UnnamedText_4999f ; $599f jp Unnamed_55c9 @@ -76291,15 +76291,15 @@ UnnamedText_4999f: ; 4999f (12:599f) db $50 ; 0x4999f + 5 bytes -Route18GateHeaderObject: ; 0x499a4 (size=24) +Route18GateUpstairsObject: ; 0x499a4 (size=24) db $a ; border tile db $1 ; warps db $7, $7, $4, ROUTE_18_GATE_1F db $2 ; signs - db $2, $1, $2 ; Route18GateHeaderText2 - db $2, $6, $3 ; Route18GateHeaderText3 + db $2, $1, $2 ; Route18GateUpstairsText2 + db $2, $6, $3 ; Route18GateUpstairsText3 db $1 ; people db SPRITE_BUG_CATCHER, $2 + 4, $4 + 4, $fe, $2, $1 ; person @@ -103369,8 +103369,8 @@ CinnabarPokecenterBlocks: ; 74030 (1d:4030) FuchsiaPokecenterBlocks: ; 74030 (1d:4030) INCBIN "maps/fuchsiapokecenter.blk" -CeruleanHouse3Blocks: ; 7404c (1d:404c) - INCBIN "maps/ceruleanhouse3.blk" +CeruleanHouse2Blocks: ; 7404c (1d:404c) + INCBIN "maps/ceruleanhouse2.blk" ; known jump sources: 5a4c8 (16:64c8) Func_7405c: ; 7405c (1d:405c) @@ -104676,15 +104676,15 @@ UnknownDungeon1Object: ; 0x74d15 (size=97) UnknownDungeon1Blocks: ; 74d76 (1d:4d76) INCBIN "maps/unknowndungeon1.blk" -CeruleanHouse3_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230) +CeruleanHouse2_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230) db $0d ; tileset - db CERULEAN_HOUSE_3_HEIGHT, CERULEAN_HOUSE_3_WIDTH ; dimensions (y, x) - dw CeruleanHouse3Blocks, CeruleanHouse3Texts, CeruleanHouse3Script ; blocks, texts, scripts + db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x) + dw CeruleanHouse2Blocks, CeruleanHouse2Texts, CeruleanHouse2Script ; blocks, texts, scripts db $00 ; connections - dw CeruleanHouse3Object ; objects + dw CeruleanHouse2Object ; objects -CeruleanHouse3Script: ; 74e09 (1d:4e09) +CeruleanHouse2Script: ; 74e09 (1d:4e09) ld a, $1 ld [$cf0c], a dec a @@ -104692,10 +104692,10 @@ CeruleanHouse3Script: ; 74e09 (1d:4e09) ret ; 0x74e13 -CeruleanHouse3Texts: ; 74e13 (1d:4e13) - dw CeruleanHouse3Text1 +CeruleanHouse2Texts: ; 74e13 (1d:4e13) + dw CeruleanHouse2Text1 -CeruleanHouse3Text1: ; 74e15 (1d:4e15) +CeruleanHouse2Text1: ; 74e15 (1d:4e15) db $8 ld hl, UnnamedText_74e77 call PrintText @@ -104807,7 +104807,7 @@ UnnamedText_74eb9: ; 74eb9 (1d:4eb9) db $50 ; 0x74eb9 + 5 bytes -CeruleanHouse3Object: ; 0x74ebe (size=34) +CeruleanHouse2Object: ; 0x74ebe (size=34) db $c ; border tile db $3 ; warps @@ -107565,7 +107565,7 @@ LoreleiObject: ; 0x76280 (size=44) EVENT_DISP $5, $0, $5 ; BRUNOS_ROOM LoreleiBlocks: ; 762ac (1d:62ac) - INCBIN "maps/loreli.blk" + INCBIN "maps/lorelei.blk" Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246) db $07 ; tileset @@ -122965,7 +122965,7 @@ _CeruleanHouseTrashedText3: ; 9886f (26:486f) db $0, "TEAM ROCKET left", $4f db "a way out!", $57 -_CeruleanHouse2Text1: ; 9888c (26:488c) +_CeruleanHouseText1: ; 9888c (26:488c) db $0, "My husband likes", $4f db "trading #MON.", $51 db "If you are a", $4f diff --git a/maps/celadonhouse.blk b/maps/celadonhouse.blk index 8558b3de..4181d9de 100644 --- a/maps/celadonhouse.blk +++ b/maps/celadonhouse.blk @@ -1,4 +1 @@ - %       - - - +D@?D BC FG 6A 6 \ No newline at end of file diff --git a/maps/celadonhouse2.blk b/maps/celadonhouse2.blk deleted file mode 100644 index 4181d9de..00000000 --- a/maps/celadonhouse2.blk +++ /dev/null @@ -1 +0,0 @@ -D@?D BC FG 6A 6 \ No newline at end of file diff --git a/maps/celadonmart5.blk b/maps/celadonmart5.blk index 520407ba..8558b3de 100644 --- a/maps/celadonmart5.blk +++ b/maps/celadonmart5.blk @@ -1 +1,4 @@ -6;??A6! Hv literal 0 HcmV?d00001 From 11aa33e49c2c4a8c9c6033d62da43292283ff675 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 16 Sep 2013 12:57:41 -0400 Subject: [PATCH 5/5] revert pokemontools to 7aa016fb --- .gitignore | 2 +- extras | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 671d30b3..aaab40fa 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ .*.swp # no data from extras/ -extras/*.json +*.json # for any of the poor souls with save game files in their working directory baserom.sgm diff --git a/extras b/extras index ef77506d..7aa016fb 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit ef77506d94991b5909473eb8c8902ee1415d727c +Subproject commit 7aa016fb528bcc8dcb30c6a887957851623eccc0