From 1d464d7dd4ab6ad8ba33ac172d136b5d57e19073 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Mon, 28 Oct 2024 22:24:27 -0400 Subject: [PATCH] I fucking forgot to include route 52's files, whoops Also comes with the map for route 53, though unimplemented. --- data/tilesets/nihon_hightech_attributes.bin | Bin 1408 -> 1792 bytes data/tilesets/nihon_hightech_collision.asm | 30 ++++++++++++++++++-- data/tilesets/nihon_hightech_metatiles.bin | Bin 1408 -> 1792 bytes gfx/tilesets/nihon_hightech.png | Bin 1408 -> 3793 bytes maps/Route52.ablk | 1 + maps/Route52.asm | 18 ++++++++++++ maps/Route53.ablk | 1 + 7 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 maps/Route52.ablk create mode 100644 maps/Route52.asm create mode 100644 maps/Route53.ablk diff --git a/data/tilesets/nihon_hightech_attributes.bin b/data/tilesets/nihon_hightech_attributes.bin index 1588ab6102458e296befc81e9a4b9f2e3ad89873..614cfce076432eff268d0467f2d09574a5310021 100644 GIT binary patch literal 1792 zcmcgr(GtQi2y0#IsdxVW?@F3xv}|*?2gU0!1SkXcc+7GOl6E9_0ks4P;kT4?8c%Rv z?ia<&sWqi)QVO1~g-RD;YCV-l*IOFPQ_6swt1vXKidgwr4J(38`Nf0rdP{L$47Kd8 zJu^IVW=8SOM!T@?C64i!SGFG?aeC+2x?(-C&M|#GkC;6WHtxjCo+I@^U1TL_5-Vz} zYHeG$0cNM$D#(69}j^n@It2z`fy#0RNf;SY} t#xX;4@nkJvhQCMS@Kh&sE2e8zA$!F7KEYp+SC@Aei^YsKb5hPoegI-K7AF7z delta 65 bcmZqRYvA7Sfkl7=4NPJ+z!014fJG1h5UvJ2 diff --git a/data/tilesets/nihon_hightech_collision.asm b/data/tilesets/nihon_hightech_collision.asm index a05282b..6aedb73 100644 --- a/data/tilesets/nihon_hightech_collision.asm +++ b/data/tilesets/nihon_hightech_collision.asm @@ -77,12 +77,36 @@ tilecoll WALL, WALL, WALL, FLOOR ; 4c tilecoll WALL, WALL, FLOOR, FLOOR ; 4d tilecoll WALL, WALL, FLOOR, WALL ; 4e - tilecoll WALL, WALL, WALL, WALL ; 4f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4f tilecoll WALL, FLOOR, WALL, FLOOR ; 50 tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 51 tilecoll FLOOR, WALL, FLOOR, WALL ; 52 - tilecoll WALL, WALL, WALL, WALL ; 53 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 53 tilecoll WALL, FLOOR, WALL, WALL ; 54 tilecoll FLOOR, FLOOR, WALL, WALL ; 55 tilecoll FLOOR, WALL, WALL, WALL ; 56 - tilecoll WALL, WALL, WALL, WALL ; 57 + tilecoll FLOOR, FLOOR, WALL, WALL ; 57 + tilecoll WALL, FLOOR, WALL, WALL ; 58 + tilecoll FLOOR, WALL, FLOOR, WALL ; 59 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5a + tilecoll WALL, WALL, WALL, WALL ; 5b + tilecoll WALL, WALL, WALL, WALL ; 5c + tilecoll WALL, WALL, WALL, WALL ; 5d + tilecoll WALL, WALL, WALL, WALL ; 5e + tilecoll WALL, WALL, WALL, WALL ; 5f + tilecoll WALL, WALL, WALL, WALL ; 60 + tilecoll WALL, WALL, WALL, WALL ; 61 + tilecoll WALL, WALL, WALL, WALL ; 62 + tilecoll WALL, WALL, WALL, WALL ; 63 + tilecoll WALL, WATER, WALL, WATER ; 64 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 65 + tilecoll WALL, WALL, WALL, WALL ; 66 + tilecoll WALL, WALL, WALL, WALL ; 67 + tilecoll WALL, WALL, DOOR, DOOR ; 68 + tilecoll WALL, WALL, WALL, WALL ; 69 + tilecoll WALL, WALL, WALL, WALL ; 6a + tilecoll WALL, WALL, WALL, WALL ; 6b + tilecoll WALL, WALL, WALL, WALL ; 6c + tilecoll WALL, WALL, WALL, WALL ; 6d + tilecoll WALL, WALL, WALL, WALL ; 6e + tilecoll WALL, WALL, WALL, WALL ; 6f diff --git a/data/tilesets/nihon_hightech_metatiles.bin b/data/tilesets/nihon_hightech_metatiles.bin index debc63250e40bfd20f1af34c4346d1fce59a455e..7c03be74572f0fd58a404370f160301e2a21f4cc 100644 GIT binary patch delta 470 zcmZ8d%WlFj5Oh)T0k^J0tsY3#Mvh}%3Ls$)T%ecq2r)?Q4L&7&1AIyUsGq`a$ySJw zN3%2bZdN&ngH+`We$?;1N{XaloN+h|_1K&!s!_M|?fmr7oK*DC035)Wq;QUL@=0L~ zw5?)JL9{-8g2lu}+3 v>@A)k_~&Rm8ZVZMH;9b1I4=oI?wNjpQ=~f47i=Z{wgd|2sXu delta 83 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 delta 1401 zcmV-<1%~?39e@jv7=Ho)0002FcR#NH00l=$L_t(|+U=D8PZM_-$Ddj%ie*RV$`;Ln z;xx;eDBJz8Y@%)900C2l>tof4WeIedEQ^~lW)Y$|S+egVV6t|Zl?19>H_@5t;w|ZI z&@!Q>2vg?|TAHa5GD@*DI+cF*xt8f>GWrLM=aNg>&nxfu^MB>@91wErjwp(+5h8jB z4S~iJE*f7X-yj2ojJblro8j@e;079x17`?1y=BiHaWC-*Zb?tb69D6(J zh$veyYKB=ZD}QW$1kl26gh#sKQ_e<>t>DMb-2r&K{*vJY}+f;v8-2#ow5 z9=nFS$1VhQ7cDY>>rR{mb*6A6Ds@i_wY-e@)v0Sbk_fqVLEXnNTAl zat_wooP+d^h!j{;AG4~m509+ld@cI{=6K6OymQd*kbyW!0GBUIyeJe-(j!N_?pjsG{Jif z3JPrhURHqBu&GOH?j2ec7HpjHc9XB10!0-Ru*N8$k30c&1i;I$8WQZrtSQU64I!S+ zSLqzITx14H)cFi}2%@h=XLbl_93j0M+J-U&;eUv85YeC@5hf0DGjfgEKZ=j$E{QOL zaB4NJjfVKcYVkxqRTuzBFNL{hhI9N}?+{{|X?#Qm!apCl8DSy}>?35#02!BVf@3C_>kJMa_yDA7Zh*U5B}F5aTWX@zuS zcD1Gh`5$?&tneGa^4!tRb=xciVJYG|Nbf2AT)KB?+c&&d&Y>DWRq$$iVMBdR41bCc zE5KT$(MQHdEXrgR8|eZ+ccAf^-CpxlV%*sTT35D`INqtUCYnR@YN~mvFlLDbfJ~WH z`-ms;_oQ}GE7wjFPwOeFcrsf5Y!Jvq`Xoc@62LC+E-zN7kY2j<2@O{seFv>T6rTGA zvZ+h{aFmD2+fZS^69Ad-_lldlFlI$qaNQxyJD3{HyyB3-EJyeab00000NkvXX Hu0mjftfh^u diff --git a/maps/Route52.ablk b/maps/Route52.ablk new file mode 100644 index 0000000..9e00500 --- /dev/null +++ b/maps/Route52.ablk @@ -0,0 +1 @@ +3    5UUUUUUUUUUUUUUUUUUUUUUWPQQ QQKKQQP UU%' 'Q+)QP%Q'QQ% Q'%Q %'Q'%Q Q#!QP KQQQKKKKQQP MMMMMMMMMMMMMMMMMMMMMMMM  2(((((((((( \ No newline at end of file diff --git a/maps/Route52.asm b/maps/Route52.asm new file mode 100644 index 0000000..36a0112 --- /dev/null +++ b/maps/Route52.asm @@ -0,0 +1,18 @@ + object_const_def + +Route52_MapScripts: + def_scene_scripts + + def_callbacks + +Route52_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events + diff --git a/maps/Route53.ablk b/maps/Route53.ablk new file mode 100644 index 0000000..4533aac --- /dev/null +++ b/maps/Route53.ablk @@ -0,0 +1 @@ +lllllllllllmnolllllllijklllllllijkllllllfhgll^]\^_aeeeee`__a`__aeeeee`__a`__aeeeee`__a`__aeeeee`_[cSSS`_?`_?`_?`_?===SSSb[?d(?===;?99OOOXW???OYOOO&&&&&&Z \ No newline at end of file