Pewter Museum Bullshit

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

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

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

data/tilesets.asm

@@ -50,4 +50,5 @@ Tilesets::
 	tileset TilesetAerodactylWordRoom
 	tileset TilesetNihon1
 	tileset TilesetForestKanto
+	tileset TilesetMuseum
 	assert_table_length NUM_TILESETS + 1

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

engine/tilesets/tileset_anims.asm

@@ -298,6 +298,7 @@ TilesetHoOhWordRoomAnim:
 TilesetKabutoWordRoomAnim:
 TilesetOmanyteWordRoomAnim:
 TilesetAerodactylWordRoomAnim:
+TilesetMuseumAnim:
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation

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"
 

layout.link

@@ -305,7 +305,6 @@ ROMX $77
 	"European Mail"
 ROMX $78
 	"Debug Room"
-	"Tileset Data 8"
 ROMX $7b
 	"Battle Tower Text"
 ROMX $7c

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