Pewter Museum

Works pretty okay but floor 2 is bugged. Don't go there right now unless you're trying to fix it.

data/maps/attributes.asm

@@ -712,8 +712,8 @@ ENDM
 	map_attributes MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
 	map_attributes Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
     map_attributes BellchimeTrail, BELLCHIME_TRAIL, $00, 0
-	map_attributes PewterMuseumOfScience1F, PEWTER_MUSEUM_OF_SCIENCE_1F, $0A, 0
-	map_attributes PewterMuseumOfScience2F, PEWTER_MUSEUM_OF_SCIENCE_2F, $0A, 0
+	map_attributes PewterMuseumOfScience1F, PEWTER_MUSEUM_OF_SCIENCE_1F, $00, 0
+	map_attributes PewterMuseumOfScience2F, PEWTER_MUSEUM_OF_SCIENCE_2F, $00, 0
 	map_attributes ViridianForest, VIRIDIAN_FOREST, $00, 0
 	map_attributes ViridianForestViridianGate, VIRIDIAN_FOREST_VIRIDIAN_GATE, $00, 0
 	map_attributes ViridianForestPewterGate, VIRIDIAN_FOREST_PEWTER_GATE, $00, 0

data/tilesets/kanto_collision.asm

@@ -178,3 +178,7 @@
 	tilecoll WALL, FLOOR, WALL, FLOOR ; b1
 	tilecoll FLOOR, WALL, FLOOR, WALL ; b2
 	tilecoll FLOOR, FLOOR, WALL, WALL ; b3
+	tilecoll WATER, WATER, WATER, WATER ; b4
+	tilecoll WATER, WATER, WATER, WATER ; b5
+	tilecoll WATER, WATER, WATER, WATER ; b6
+	tilecoll WATER, WATER, WATER, WATER ; b7

engine/tilesets/tileset_anims.asm

@@ -37,7 +37,6 @@ _AnimateTileset::
 
 Tileset0Anim:
 TilesetJohtoModernAnim:
-TilesetKantoAnim:
 	dw vTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -292,6 +291,19 @@ TilesetNihonSnowyAnim:
 	dw NULL,  StandingTileFrame8
 	dw NULL,  DoneTileAnimation
 
+TilesetKantoAnim:
+	dw vTiles2 tile $14, AnimateWaterTile
+	dw NULL,  AnimateLavaBubbleTile2
+	dw NULL,  WaitTileAnimation
+	dw NULL,  WaitTileAnimation
+	dw NULL,  AnimateWaterPalette
+	dw NULL,  AnimateLavaBubbleTile1
+	dw NULL,  AnimateFlowerTile
+	dw NULL,  WaitTileAnimation
+	dw NULL,  WaitTileAnimation
+	dw NULL,  StandingTileFrame8
+	dw NULL,  DoneTileAnimation
+
 TilesetBattleTowerOutsideAnim:
 TilesetHouseAnim:
 TilesetPlayersHouseAnim:

maps/CinnabarIsland.ablk

@@ -1,2 +1,2 @@
-”dbQQ>???;”dN>?,,)”dN$W*,ed)”dN1(,,,)”dP\<1A>Ž*,)”d{{y|r(,)”-{
+”dbQQ>???;”dN>?,,´µ)”dN$W*,¶·)”dN1(,,,)”dP\<1A>Ž*,)”d{{y|r(,)”-{
 {t(,)”C-$W%<25>™™™™™™™™™

maps/PewterMuseumOfScience1F.ablk

@@ -1,3 +1 @@
-
-
-
	




C
+<<<PPCMMMM@ASOLN
O
DEW
GbUa

HI[RFtFt

maps/PewterMuseumOfScience1F.asm

@@ -304,4 +304,4 @@ PewterMuseumOfScience1F_MapEvents:
 	def_bg_events
 
 	def_object_events
-	object_event  2,  9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MuseumFossilScientist, -1
+	object_event  6,  3, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MuseumFossilScientist, -1

maps/PewterMuseumOfScience2F.ablk

@@ -1 +1 @@
-




 !




+<<<<<=>




?KXYZ
`

VF


maps/PewterMuseumOfScience2F.asm

@@ -1,183 +1,18 @@
+	object_const_def
+
 PewterMuseumOfScience2F_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-
-Museum2FScientistScript:
-	jumptextfaceplayer Museum2FScientistText
-
-Museum2FChildScript:
-	jumptextfaceplayer Museum2FChildText
-
-Museum2FTeacherScript:
-	jumptextfaceplayer Museum2FTeacherText
-
-Museum2FLassScript:
-	jumptextfaceplayer Museum2FLassText
-
-Museum2FPokefanMScript:
-	faceplayer
-	opentext
-	checkevent EVENT_LISTENED_TO_SEISMIC_TOSS_INTRO
-	iftrue Museum2FTutorSeismicTossScript
-	sjump .ok
-.ok
-	waitbutton
-	setevent EVENT_LISTENED_TO_SEISMIC_TOSS_INTRO
-Museum2FTutorSeismicTossScript:
-	writetext Text_Museum2FTutorSeismicToss
-	waitbutton
-	checkitem SILVER_LEAF
-	iffalse .NoSilverLeaf
-	writetext Text_Museum2FTutorQuestion
-	yesorno
-	iffalse .TutorRefused
-	setval SEISMIC_TOSS
-	writetext Text_Museum2FTutorMoveText
-	special MoveTutor
-	ifequal $0, .TeachMove
-.TutorRefused
-	jumptext Text_Museum2FTutorRefused
-
-.NoSilverLeaf
-	jumptext Text_Museum2FTutorNoSilverLeaf
-
-.TeachMove
-	takeitem SILVER_LEAF
-	jumptext Text_Museum2FTutorTaught
-
-Museum2FScientistText:
-	text "Meteorites struck"
-	line "Mt.Moon near"
-	cont "Pewter City."
-
-	para "We have one"
-	line "on display."
-
-	para "It seems to emit"
-	line "strange energy…"
-	done
-
-
-Museum2FLassText:
-	text "#mon revived"
-	line "from fossils are"
-
-	para "all part Rock-"
-	line "type."
-
-	para "Were they always"
-	line "that way, or is it"
-
-	para "a result of the"
-	line "fossilization"
-	cont "process?"
-	done
-
-Museum2FPokefanMImperialText:
-	text "This space shuttle"
-	line "used to fly 160"
-
-	para "miles above the"
-	line "earth, defying"
-	cont "gravity!"
-
-	para "You know what else"
-	line "can defy gravity?"
-
-	para "Seismic Toss,"
-	line "of course!"
-	done
-
-Museum2FChildText:
-	text "Stuff and rocks"
-	line "and rocks and"
-
-	para "stuff. Can we go"
-	line "already?"
-	done
-
-Museum2FTeacherText:
-	text "Sigh… My son isn't"
-	line "enjoying the mu-"
-
-	para "seum as much as I"
-	line "hoped he would."
-
-	para "Kids, huh?"
-	done
-
-Museum2FPokefanMMetricText:
-	text "This space shuttle"
-	line "used to fly 250"
-
-	para "kilometers above"
-	line "the earth, defy-"
-	cont "ing gravity!"
-
-	para "You know what else"
-	line "can defy gravity?"
-
-	para "Seismic Toss,"
-	line "of course!"
-	done
-
-Text_Museum2FTutorSeismicToss:
-	text "I can teach your"
-	line "#mon to use"
-
-	para "Seismic Toss for"
-	line "one Silver Leaf."
-	done
-
-Text_Museum2FTutorMoveText:
-	text_start
-	done
-
-Text_Museum2FTutorNoSilverLeaf:
-	text "You don't have a"
-	line "Silver Leaf!"
-	done
-
-Text_Museum2FTutorQuestion:
-	text "Should I teach"
-	line "your #mon"
-	cont "Seismic Toss?"
-	done
-
-Text_Museum2FTutorRefused:
-	text "If you say so."
-	done
-
-Text_Museum2FTutorTaught:
-	text "Now your #mon"
-	line "knows how to use"
-	cont "Seismic Toss!"
-	done
-
-Museum2FMoonStoneSignpostText:
-	text "Meteorite that"
-	line "fell on Mt.Moon."
-	cont "(Moon Stone)"
-	done
-
-Museum2FSpaceShuttleSignpostText:
-	text "Space Shuttle"
-	done
 	
 PewterMuseumOfScience2F_MapEvents:
+	db 0, 0 ; filler
+	
 	def_warp_events
-	warp_event  7,  7, PEWTER_MUSEUM_OF_SCIENCE_1F, 5
+	warp_event  7,  7, PEWTER_MUSEUM_OF_SCIENCE_1F, 1
 
 	def_coord_events
 
 	def_bg_events
-	bg_event  3,  6, BGEVENT_READ, Museum2FMoonStoneSignpostText
-	bg_event 11,  2, BGEVENT_READ, Museum2FSpaceShuttleSignpostText
 
 	def_object_events
-	object_event  7,  5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Museum2FScientistScript, -1
-	object_event  1,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Museum2FChildScript, -1
-	object_event  2,  7, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Museum2FTeacherScript, -1
-	object_event  2,  1, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Museum2FLassScript, -1
-	object_event 12,  5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Museum2FPokefanMScript, -1