From 2c9d23b788267653d09643c62454bf80aed05dcb Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Sat, 13 Jul 2024 16:58:26 -0400 Subject: [PATCH] More Pewter Museum stuff --- data/tilesets/museum_attributes.bin | Bin 672 -> 704 bytes data/tilesets/museum_collision.asm | 2 ++ data/tilesets/museum_metatiles.bin | Bin 672 -> 704 bytes gfx/tilesets/museum.png | Bin 3490 -> 4187 bytes maps/PewterCity.ablk | 2 +- maps/PewterCity.asm | 1 + maps/PewterMuseumOfScience1F.ablk | 2 +- 7 files changed, 5 insertions(+), 2 deletions(-) diff --git a/data/tilesets/museum_attributes.bin b/data/tilesets/museum_attributes.bin index 517bc2cae0144867f5bf284124cdd892d1ce585a..84a0b54c12e4ca358cef37d7890c5c844033edf0 100644 GIT binary patch delta 61 wcmZ3$dVqC96C)cdD+3TrTp%`i9^)1!R@TWOOg;)6JUkq5%)!CIivk!K0B;BgivR!s delta 28 icmX@Wx`1^<6C)cVBLfgjTp%`i9^)1!M#jk@Og;c=HU|s< diff --git a/data/tilesets/museum_collision.asm b/data/tilesets/museum_collision.asm index 6cff9e8..99099a0 100644 --- a/data/tilesets/museum_collision.asm +++ b/data/tilesets/museum_collision.asm @@ -40,3 +40,5 @@ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 27 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, WALL, FLOOR, FLOOR ; 2b diff --git a/data/tilesets/museum_metatiles.bin b/data/tilesets/museum_metatiles.bin index ace55ca806481abab518571325488ebe320d87d9..201e5bc83b7059395703624504c5be205321e074 100644 GIT binary patch delta 40 vcmZ3$dVqDq0wx6>UOs*qSveUUT|IppTRVFWPA+ZjJ$1 diff --git a/gfx/tilesets/museum.png b/gfx/tilesets/museum.png index e7c766b36ee4aa8394e79b1b51eced6c49810582..a5beaaeb934b292c6474d5b2d439975698f77497 100644 GIT binary patch delta 4141 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 literal 3490 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 diff --git a/maps/PewterCity.ablk b/maps/PewterCity.ablk index bb50fed..970d465 100644 --- a/maps/PewterCity.ablk +++ b/maps/PewterCity.ablk @@ -3,7 +3,7 @@ RRRRRRRRRRRR?;tt„ƒƒ‡ Žtt -,)ttuqqv7}~t +,)ttuqqv|}~t ttn,)/7}€~/B,) diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 021c933..d8e3095 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -156,6 +156,7 @@ PewterCity_MapEvents: warp_event 13, 25, PEWTER_POKECENTER_1F, 1 warp_event 7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1 warp_event 14, 7, PEWTER_MUSEUM_OF_SCIENCE_1F, 1 + warp_event 19, 5, PEWTER_MUSEUM_OF_SCIENCE_1F, 3 def_coord_events diff --git a/maps/PewterMuseumOfScience1F.ablk b/maps/PewterMuseumOfScience1F.ablk index 185c87d..7dd0533 100644 --- a/maps/PewterMuseumOfScience1F.ablk +++ b/maps/PewterMuseumOfScience1F.ablk @@ -1 +1 @@ -% !& $& $ \ No newline at end of file +%* +!& $& $ \ No newline at end of file