From 6504863b284bbec8279860d3a1621b9d966783f3 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 25 Nov 2023 19:22:15 +0000 Subject: [PATCH] Seagallop Ferry Port This adds a new tileset for the Seagallop Ferry. Had to remake the tileset from scratch using the S.S. Anne one. Very awkward! The map could be made to look more like the FRLG one but that's neither here nor there. --- constants/tileset_constants.asm | 1 + data/maps/headers/VermilionFerryDock.asm | 2 +- data/maps/objects/VermilionFerryDock.asm | 4 ++-- data/tilesets/collision_tile_ids.asm | 3 +++ data/tilesets/door_tile_ids.asm | 7 +++++-- data/tilesets/tileset_headers.asm | 1 + data/tilesets/warp_tile_ids.asm | 1 + gfx/blocksets/seagallop_port.bst | Bin 0 -> 480 bytes gfx/tilesets.asm | 2 ++ gfx/tilesets/seagallop_port.png | Bin 0 -> 1974 bytes maps/VermilionFerryDock.blk | Bin 84 -> 84 bytes 11 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 gfx/blocksets/seagallop_port.bst create mode 100644 gfx/tilesets/seagallop_port.png diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index a519fe43..8d9b9e69 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -32,4 +32,5 @@ const BETAMART const JACKY const FOSSILLAB + const SEAGALLOPPORT DEF NUM_TILESETS EQU const_value diff --git a/data/maps/headers/VermilionFerryDock.asm b/data/maps/headers/VermilionFerryDock.asm index fe5279e5..c988f186 100644 --- a/data/maps/headers/VermilionFerryDock.asm +++ b/data/maps/headers/VermilionFerryDock.asm @@ -1,2 +1,2 @@ - map_header VermilionFerryDock, VERMILION_FERRY_DOCK, SHIP_PORT, 0 + map_header VermilionFerryDock, VERMILION_FERRY_DOCK, SEAGALLOPPORT, 0 end_map_header diff --git a/data/maps/objects/VermilionFerryDock.asm b/data/maps/objects/VermilionFerryDock.asm index 466a658f..a8d070a7 100644 --- a/data/maps/objects/VermilionFerryDock.asm +++ b/data/maps/objects/VermilionFerryDock.asm @@ -1,9 +1,9 @@ VermilionFerryDock_Object: - db $f ; border block + db $13 ; border block def_warp_events warp_event 14, 0, LAST_MAP, 9 - warp_event 14, 2, SEAGALLOP_FERRY, 1 + warp_event 14, 5, SEAGALLOP_FERRY, 1 def_bg_events diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index 44b51514..052a2e84 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -85,3 +85,6 @@ BetaMart_Coll:: Jacky_Coll:: coll_tiles $01, $40, $11, $04, $14, $02, $03, $13, $12, + +SeagallopPort_Coll:: + coll_tiles $1C, $0E, $1E diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm index 4cbdbf2f..5a097dc1 100644 --- a/data/tilesets/door_tile_ids.asm +++ b/data/tilesets/door_tile_ids.asm @@ -15,6 +15,7 @@ DoorTileIDPointers: dbw INTERIOR, .InteriorDoorTileIDs ; fixes weirdness in silph co. dbw CITRINE, .CitrineDoorTileIDs dbw CELESTE, .CelesteDoorTileIDs + dbw SEAGALLOPPORT, .SeagallopPortDoorTileIDs db -1 ; end MACRO door_tiles @@ -60,9 +61,11 @@ ENDM .InteriorDoorTileIDs: door_tiles $04, $15 -.CitrineDoorTileIDs +.CitrineDoorTileIDs: door_tiles $1C, $1B, $58, $59 -.CelesteDoorTileIDs +.CelesteDoorTileIDs: door_tiles $0C, $1C +.SeagallopPortDoorTileIDs: + door_tiles $0E, $1E diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index 05e32aa5..581ddb32 100644 --- a/data/tilesets/tileset_headers.asm +++ b/data/tilesets/tileset_headers.asm @@ -40,4 +40,5 @@ Tilesets: tileset BetaMart, $18, -1, -1, -1, TILEANIM_NONE tileset Jacky, -1, -1, -1, -1, TILEANIM_NONE tileset FossilLab, -1, -1, -1, -1, TILEANIM_NONE + tileset SeagallopPort, -1, -1, -1, -1, TILEANIM_WATER assert_table_length NUM_TILESETS diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 9417864e..0282b6b6 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -33,6 +33,7 @@ WarpTileIDPointers: dw .BetaMartWarpTileIDs dw .JackyWarpTileIDs dw .LabWarpTileIDs ; Fossil Lab + dw .ShipPortWarpTileIDs ; Seagallop Port assert_table_length NUM_TILESETS MACRO warp_tiles diff --git a/gfx/blocksets/seagallop_port.bst b/gfx/blocksets/seagallop_port.bst new file mode 100644 index 0000000000000000000000000000000000000000..e0ac6cd6266862088c72c240741eabbc9988c85b GIT binary patch literal 480 zcmZQzWMUQ&6cScYR8lrDG%{vpWn*f^NF_#p-W Du|H#X literal 0 HcmV?d00001 diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 37543234..aee94231 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -88,3 +88,5 @@ Jacky_Block:: INCBIN "gfx/blocksets/jacky.bst" FossilLab_GFX:: INCBIN "gfx/tilesets/fossillab.2bpp" FossilLab_Block:: INCBIN "gfx/blocksets/fossillab.bst" +SeagallopPort_GFX:: INCBIN "gfx/tilesets/seagallop_port.2bpp" +SeagallopPort_Block:: INCBIN "gfx/blocksets/seagallop_port.bst" diff --git a/gfx/tilesets/seagallop_port.png b/gfx/tilesets/seagallop_port.png new file mode 100644 index 0000000000000000000000000000000000000000..9bc24d9c680f7f17aeac79fc32d0d6afe57c6ec0 GIT binary patch literal 1974 zcmV;n2TAyeP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf2TMsrK~#8N?VHVR z+d344or^B=Xk7*=g;K906V4o3&j8Y`Sa#%T^~XG z@Owz)R7xLm2XG(Whra3FgsCDpAr%j@yXXf{cqpCZO&F>NRK9n z2KfE^_gIg1q<}C{Nc7M>T$%A|=lIynEYIEI-s_LpNA{A8U&96XC>>-nDg z!L?yvw@18>>gZ5CzZS2T(y2pr1_L1V2ziyU;M1`o`PgXJyhNl@G)rMSJ2&`DPNg|i&V990IGmbl-v3;Cq7@?&A^wEe1dwgaV~%OPUj|7TqhFKxP{a;DXiSqAw9aZf|clxi#t_ zYp4Y1LBhAbpM$_L0zl3HAQR|4a>Usz6Nq@O`$l!D}w|p(^wC8gnnKE%PBLIDs z@wisA1We)ODG^KU-5ja*dwYPC2@Yw1Nc^J2XEN(>4{ii#HAAfdK*GBLdVgW1ZJe70)T<=*D=AsB7=x2-oDHzvMsE*Jk?(lmAc2ea#5kLj1_#SApmJ?sI4>5Ec zgVyJGl#qywEBR6iDZ`ZX=_%ja1Hev&!G)y=z{@VV%buE1OGcYkeD=ds1Yk^bjqyZK ziCaQ-5iHfl^^vGfOZoUcKxvawG5{1F#=}l#n1Xd&|dP z1J~I+h#S}3xLb#4l)0on5gY@=PrY-5iQo~yXZ_LAGu{1n` z0haIx6T|S5aBrT$yOhLF?FkMUog|!ujP#aQMSxa3R4=((*Pz#g=Ux!McEhJgAyYEr zIp_M)5kTZ-vS=;eGXO8}9v`vZ8^XC8w+0CKd?poNqHmKGnj1~^sWL4P>XBEGNt zjzo7f@U0xh0K)^uzX&?S8vd`tQW5tgGJr>bIUHpPIE&wo?-Noca04J>&mJJxMj}E= z=$7(51JrJS&b(1;fELu|DBlCn*+YJWIR$b{0Zh&26sZU>SLj^%b`PM>+GqO68GwP$ ziBf{LXd@0`g6(esy(Zwr-R+J?mfUA|J@dWGYu{svlnF|+-UW`7+V&7lu>B^Ghvfz- z1$8-cg9cM&AC1y`=zW(2@mb@w&LfT=Q|9O)iVx%e3lMaKABHq5rtnP;`4n+bW4(`F zE>tg9E{GB_3PfB~3D2141n)ILZS>gtIhc;rn&8YnZUBtqLLjEk!jb{zh)>&;31Sq; z{yo6i1pUYaZUBi-$|3P#$^a6q7KEKL0QfzV|1SX4nX?JnS<(PG5p$@GQi&b)72609 zD|%;6-2|z1U7reaWn7m57)uwJv?T(xn1Fk^0YuIS+fM;1P(_E`Z|X%)fgbT&!3-`8 z!nKHALr&l1CJ=B^q_hh@b)xu89L+|?RWqE_BLHaTI!is#7SYr9(g4?mc1#3kNZv;Y7A07*qo IM6N<$g0vu*W&i*H literal 0 HcmV?d00001 diff --git a/maps/VermilionFerryDock.blk b/maps/VermilionFerryDock.blk index f4a9573982a3f37685047ffe84e95bca52063a8b..c9c5d199d6849cb03326ec1ee2e555440e53ef8c 100644 GIT binary patch literal 84 ycmWe+0|EgKb^#$EEy&9a0$iM6ij9X03^>6gl*hox1mZ$@%q*;69v?pv5Ci~