From 852ad77cb126d57651fc775aadb061e41aaca631 Mon Sep 17 00:00:00 2001
From: Zeta_Null <z0zetanull@gmail.com>
Date: Thu, 26 Oct 2023 00:28:11 -0400
Subject: [PATCH] Pewter Museum Bullshit

---
 audio/music/nihontest.asm           | 329 ++++++++++++++++++++++++++++
 constants/tileset_constants.asm     |   1 +
 data/maps/maps.asm                  |   2 +-
 data/tilesets.asm                   |   1 +
 data/tilesets/museum_attributes.bin | Bin 0 -> 2048 bytes
 data/tilesets/museum_collision.asm  | 128 +++++++++++
 data/tilesets/museum_metatiles.bin  | Bin 0 -> 2048 bytes
 engine/tilesets/tileset_anims.asm   |   1 +
 gfx/tilesets.asm                    |  12 +
 gfx/tilesets/museum.png             | Bin 0 -> 3136 bytes
 layout.link                         |   1 -
 maps/Museum1F.ablk                  | Bin 0 -> 40 bytes
 maps/Museum2F.ablk                  | Bin 0 -> 28 bytes
 maps/PlayersHouse2F.asm             |   2 +-
 14 files changed, 474 insertions(+), 3 deletions(-)
 create mode 100644 audio/music/nihontest.asm
 create mode 100644 data/tilesets/museum_attributes.bin
 create mode 100644 data/tilesets/museum_collision.asm
 create mode 100644 data/tilesets/museum_metatiles.bin
 create mode 100644 gfx/tilesets/museum.png
 create mode 100644 maps/Museum1F.ablk
 create mode 100644 maps/Museum2F.ablk

diff --git a/audio/music/nihontest.asm b/audio/music/nihontest.asm
new file mode 100644
index 0000000..1d60109
--- /dev/null
+++ b/audio/music/nihontest.asm
@@ -0,0 +1,329 @@
+Music_NihonTest:
+	channel_count 4
+	channel 1, Music_NihonTest_Ch1
+	channel 2, Music_NihonTest_Ch2
+	channel 3, Music_NihonTest_Ch3
+	channel 4, Music_NihonTest_Ch4
+
+Music_NihonTest_Ch1:
+	tempo 256
+	volume 7, 7
+	note_type 12, 15, 8
+.mainLoop:
+	duty_cycle 0
+	volume_envelope 15, 8
+	transpose 2, 0
+	octave 3
+	tempo 107
+	note A_, 4
+	rest 4
+	octave 4
+	note C_, 4
+	rest 4
+	octave 3
+	note A_, 4
+	rest 4
+	note G_, 4
+	rest 4
+	note A_, 4
+	rest 4
+	octave 4
+	note C_, 4
+	rest 4
+	octave 3
+	note G_, 4
+	rest 4
+	note E_, 4
+	rest 4
+	note G_, 4
+	rest 4
+	note B_, 4
+	rest 4
+	note A_, 4
+	rest 4
+	octave 4
+	note D_, 4
+	rest 4
+	octave 3
+	note F_, 4
+	rest 4
+	note A_, 4
+	rest 4
+	note G_, 4
+	rest 4
+	note F_, 4
+	rest 4
+	note E_, 4
+	rest 4
+	note F_, 4
+	rest 4
+	note G_, 4
+	rest 4
+	note A_, 4
+	rest 4
+	note A_, 4
+	rest 4
+	octave 4
+	note D_, 4
+	rest 4
+	note C_, 4
+	rest 4
+	octave 3
+	note G_, 4
+	rest 4
+	note A_, 4
+	rest 4
+	note D_, 4
+	rest 4
+	note G_, 4
+	rest 4
+	note E_, 4
+	rest 4
+	note G_, 4
+	rest 4
+	note A_, 4
+	rest 4
+	note E_, 4
+	rest 4
+	note G_, 4
+	rest 4
+	octave 8
+	sound_loop 0, .mainLoop
+
+Music_NihonTest_Ch2:
+	note_type 12, 15, 8
+.mainLoop:
+	duty_cycle 2
+	octave 4
+	transpose 1, 0
+	note B_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note G_, 4
+	octave 3
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	octave 4
+	note A_, 4
+	octave 3
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	octave 4
+	note E_, 4
+	octave 3
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	octave 4
+	note E_, 4
+	octave 3
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	octave 4
+	note D_, 4
+	octave 3
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	octave 4
+	note D_, 4
+	octave 3
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	octave 4
+	note C_, 4
+	octave 3
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	rest 4
+	octave 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	rest 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	rest 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	rest 4
+	octave 3
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	rest 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	rest 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	rest 4
+	octave 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	rest 4
+	octave 3
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	octave 8
+	sound_loop 0, .mainLoop
+
+Music_NihonTest_Ch3:
+	note_type 12, 1, 0
+.mainLoop:
+	note_type 12, 1, 0
+	octave 5
+	vibrato 4, 2, 5
+	volume_envelope 1, 6
+	note D_, 2
+	note E_, 2
+	note E_, 1
+	note F_, 7
+	note D_, 8
+	octave 4
+	note B_, 12
+	octave 5
+	note C_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	rest 2
+	note E_, 2
+	rest 2
+	note C_, 2
+	rest 2
+	note C_, 2
+	rest 2
+	octave 4
+	note G_, 12
+	note A_, 2
+	octave 5
+	note C_, 2
+	note C_, 1
+	note D_, 7
+	octave 4
+	note B_, 8
+	note G_, 4
+	octave 5
+	note C_, 1
+	note D_, 7
+	octave 4
+	note B_, 4
+	octave 5
+	vibrato 5, 2, 5
+	note C_, 14
+	vibrato 0, 2, 5
+	note C_, 14
+	vibrato 4, 2, 5
+	octave 4
+	note A_, 4
+	note B_, 1
+	octave 5
+	note C_, 11
+	octave 4
+	note B_, 4
+	note G_, 12
+	note F_, 4
+	note A_, 1
+	note B_, 3
+	note A_, 4
+	octave 5
+	note C_, 4
+	octave 4
+	note E_, 4
+	note F_, 1
+	note G_, 11
+	note D_, 4
+	note E_, 1
+	note F_, 11
+	note A_, 4
+	note G_, 12
+	note B_, 4
+	note B_, 1
+	octave 5
+	note C_, 11
+	vibrato 0, 2, 5
+	note C_, 16
+	octave 8
+	sound_loop 0, .mainLoop
+
+Music_NihonTest_Ch4:
+	toggle_noise 0
+	drum_speed 12
+.mainLoop:
+	rest 12
+	octave 3
+	drum_note 1, 1
+	rest 15
+	drum_note 1, 1
+	rest 3
+	drum_note 1, 1
+	rest 1
+	drum_note 1, 1
+	rest 9
+	drum_note 1, 1
+	rest 15
+	drum_note 1, 1
+	rest 3
+	drum_note 1, 1
+	rest 1
+	drum_note 1, 1
+	rest 9
+	drum_note 1, 1
+	rest 15
+	drum_note 1, 1
+	rest 3
+	drum_note 1, 1
+	rest 1
+	drum_note 1, 1
+	rest 9
+	drum_note 1, 1
+	rest 15
+	drum_note 1, 1
+	rest 3
+	drum_note 1, 1
+	rest 1
+	drum_note 1, 1
+	rest 9
+	drum_note 1, 1
+	rest 15
+	drum_note 1, 1
+	rest 3
+	drum_note 1, 1
+	rest 1
+	drum_note 1, 1
+	rest 9
+	drum_note 1, 1
+	rest 15
+	drum_note 1, 1
+	rest 3
+	drum_note 1, 1
+	rest 1
+	drum_note 1, 1
+	rest 9
+	drum_note 1, 1
+	rest 15
+	drum_note 1, 1
+	rest 3
+	drum_note 1, 1
+	rest 1
+	drum_note 1, 1
+	rest 9
+	drum_note 1, 1
+	rest 15
+	drum_note 1, 1
+	octave 8
+	rest 3
+	sound_loop 0, .mainLoop
diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index c259ac2..ce9d0d0 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -38,6 +38,7 @@
 	const TILESET_AERODACTYL_WORD_ROOM ; 24
 	const TILESET_NIHON_01             ; 25
 	const TILESET_FOREST_KANTO         ; 26
+	const TILESET_MUSEUM               ; 27
 DEF NUM_TILESETS EQU const_value - 1
 
 ; wTileset struct size
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index fde6e0c..9c3e26a 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -491,7 +491,7 @@ MapGroup_Viridian:
 	map Route2NuggetHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map Route2Gate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map VictoryRoadGate, TILESET_GATE, GATE, LANDMARK_ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-        map ViridianForest, TILESET_FOREST, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE ; MUSIC_ROUTE_2 is the viridian forest remix
+        map ViridianForest, TILESET_FOREST_KANTO, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE ; MUSIC_ROUTE_2 is the viridian forest remix
         map ViridianForestViridianGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
         map ViridianForestPewterGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_VIRIDIAN_MAPS
diff --git a/data/tilesets.asm b/data/tilesets.asm
index 57a6454..c531ccd 100644
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@@ -50,4 +50,5 @@ Tilesets::
 	tileset TilesetAerodactylWordRoom
 	tileset TilesetNihon1
 	tileset TilesetForestKanto
+	tileset TilesetMuseum
 	assert_table_length NUM_TILESETS + 1
diff --git a/data/tilesets/museum_attributes.bin b/data/tilesets/museum_attributes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..42dec29f5981ebae0b419758931039adb3eabdc6
GIT binary patch
literal 2048
zcmeHHK@P(p4090Sw*P;3@rsv>N<Hns)J0S-C^*58z+f>DV+(YLxf_I7ZRTmycFFsn
z#~$zJcK4wAQ2lCt##fPZ*~6rh*%<k`k7>Xd)ldEht*SG5K%UqmKk-yg*0t(3{#oa-
zz<q`16t{MR@QY5x6~+1N7R)&95!O4bcY~1o=Q#QupDj)LT_RP<lh!;GRXpo_Mt#Q-
qPqH04NH^&(KO*A^73W*1dlFyH7yU2wsrPc1e$bkswS0%ab?zs_3kSde

literal 0
HcmV?d00001

diff --git a/data/tilesets/museum_collision.asm b/data/tilesets/museum_collision.asm
new file mode 100644
index 0000000..b9261b0
--- /dev/null
+++ b/data/tilesets/museum_collision.asm
@@ -0,0 +1,128 @@
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3c
+	tilecoll WALL, WALL, WALL, WALL ; 3d
+	tilecoll WALL, WALL, WALL, FLOOR ; 3e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3f
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 40
+	tilecoll WALL, WALL, WALL, WALL ; 41
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 42
+	tilecoll WALL, WALL, FLOOR, WALL ; 43
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 44
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 45
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 46
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 47
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 48
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 49
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 4a
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4b
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 4c
+	tilecoll WALL, WALL, WALL, WALL ; 4d
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 4e
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4f
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 50
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 51
+	tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 52
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 53
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 54
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 55
+	tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 56
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 57
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 58
+	tilecoll WALL, WALL, WALL, WALL ; 59
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 5a
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 60
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 61
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 62
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 63
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 64
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 65
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 66
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 67
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 68
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 69
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 70
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 73
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 74
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 76
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 77
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 78
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 79
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f
diff --git a/data/tilesets/museum_metatiles.bin b/data/tilesets/museum_metatiles.bin
new file mode 100644
index 0000000000000000000000000000000000000000..442127be3a3a56fc3d642d6241b1a67cd866ba17
GIT binary patch
literal 2048
zcmeHHSx<vN7-YNvkB9LBuNRG$hlVIb9|(zeON?i|umAryTtX*o+s7uRntp6D`QY36
zc4ycn2s3ELNMH~WK?n++zR)_SOe~vFKE~1TZ|uYG`cRm-G9lfSpPZhZ-#>IZ$}cX7
zr)Tix_3b@LlT`IYBLeqZ#6b=wX=I|EWv$2KJnyZm_Eqt@UVTcnU-4AAcyx}1>MI8I
z)%(G|_HB@)AD={$+V_?HJqTUT^|p7a$AN>1Nn&vc6kgvDU*GloqPV@Y_0u{Aaee{Z
z+=|wSb`#8-z3cFO-?Q~Hxo_vh>>RkhAztxx^^c`Psau?7v2-ZwVyj<&U-1o#wI7v#
ge%ImJ=O8Qpk74`#zxmTM;L0koy9XW~{k8r505D!|S^xk5

literal 0
HcmV?d00001

diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm
index 8412ae7..5d568ee 100644
--- a/engine/tilesets/tileset_anims.asm
+++ b/engine/tilesets/tileset_anims.asm
@@ -298,6 +298,7 @@ TilesetHoOhWordRoomAnim:
 TilesetKabutoWordRoomAnim:
 TilesetOmanyteWordRoomAnim:
 TilesetAerodactylWordRoomAnim:
+TilesetMuseumAnim:
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm
index cc179bc..5a97b66 100644
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@@ -345,6 +345,15 @@ INCBIN "data/tilesets/forest_kanto_metatiles.bin"
 TilesetForestKantoColl::
 INCLUDE "data/tilesets/forest_kanto_collision.asm"
 
+TilesetMuseumGFX::
+INCBIN "gfx/tilesets/museum.2bpp.lz"
+
+TilesetMuseumMeta::
+INCBIN "data/tilesets/museum_metatiles.bin"
+
+TilesetMuseumColl::
+INCLUDE "data/tilesets/museum_collision.asm"
+
 
 SECTION "Tileset Data 9", ROMX
 
@@ -469,6 +478,9 @@ INCBIN "data/tilesets/forest_kanto_attributes.bin"
 
 SECTION "Tileset Data 12", ROMX
 
+TilesetMuseumAttr::
+INCBIN "data/tilesets/museum_attributes.bin"
+
 TilesetTraditionalHouseGFX::
 INCBIN "gfx/tilesets/traditional_house.2bpp.lz"
 
diff --git a/gfx/tilesets/museum.png b/gfx/tilesets/museum.png
new file mode 100644
index 0000000000000000000000000000000000000000..03574a74c1c43a9e79ca1dd2255184268c08b236
GIT binary patch
literal 3136
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

literal 0
HcmV?d00001

diff --git a/layout.link b/layout.link
index 27f015f..e88be65 100644
--- a/layout.link
+++ b/layout.link
@@ -305,7 +305,6 @@ ROMX $77
 	"European Mail"
 ROMX $78
 	"Debug Room"
-	"Tileset Data 8"
 ROMX $7b
 	"Battle Tower Text"
 ROMX $7c
diff --git a/maps/Museum1F.ablk b/maps/Museum1F.ablk
new file mode 100644
index 0000000000000000000000000000000000000000..0efaefada0654b1c3b232055f2c6e1007e3d1467
GIT binary patch
literal 40
tcmcDqu?Yxp_5}h5$6y8qA3p|v1{c?G2KS`UL<R;A&*&gG?h;P!5&*+92~z+7

literal 0
HcmV?d00001

diff --git a/maps/Museum2F.ablk b/maps/Museum2F.ablk
new file mode 100644
index 0000000000000000000000000000000000000000..355e5d80d476c15b1fee286daa2ab4bbf8eb8da8
GIT binary patch
literal 28
bcmcDq0Rme)1`x3Kj);t6a0j!)+!z=DL^T8;

literal 0
HcmV?d00001

diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index 45d43a6..53e033d 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -116,7 +116,7 @@ PlayersHouse2F_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
-	warp_event  7,  0, PLAYERS_HOUSE_1F, 3
+	warp_event  7,  0, SILENT_HILLS, 1
 
 	def_coord_events