Pewter Museum & Viridian Forest warps

Required a little tinkering because I'm vain and wanted the door to be accurate. Please understand.

When doing Viridian Forest I had a bit of a moment and kept trying to use the entirely wrong building when it was staring me in the face. I am sorry.

I'm getting an 8-bit error on Mewtwo's object code in Cerulean Cave B1F. Misty may need to check this, I'm just getting these locations put in the overworld.

data/tilesets/kanto_collision.asm

@@ -126,3 +126,4 @@
 	tilecoll WALL, WALL, WALL, WALL ; 7d
 	tilecoll WALL, WALL, WALL, WALL ; 7e
 	tilecoll WALL, WALL, WALL, WALL ; 7f
+	tilecoll WALL, WALL, DOOR, WALL ; 80

gfx/tilesets.asm

@@ -234,15 +234,6 @@ INCBIN "data/tilesets/johto_modern_metatiles.bin"
 TilesetJohtoModernColl::
 INCLUDE "data/tilesets/johto_modern_collision.asm"
 
-TilesetTraditionalHouseGFX::
-INCBIN "gfx/tilesets/traditional_house.2bpp.lz"
-
-TilesetTraditionalHouseMeta::
-INCBIN "data/tilesets/traditional_house_metatiles.bin"
-
-TilesetTraditionalHouseColl::
-INCLUDE "data/tilesets/traditional_house_collision.asm"
-
 
 SECTION "Tileset Data 6", ROMX
 
@@ -463,3 +454,14 @@ INCBIN "data/tilesets/aerodactyl_word_room_attributes.bin"
 
 TilesetNihon1Attr::
 INCBIN "data/tilesets/nihon01_attributes.bin"
+
+SECTION "Tileset Data 12", ROMX
+
+TilesetTraditionalHouseGFX::
+INCBIN "gfx/tilesets/traditional_house.2bpp.lz"
+
+TilesetTraditionalHouseMeta::
+INCBIN "data/tilesets/traditional_house_metatiles.bin"
+
+TilesetTraditionalHouseColl::
+INCLUDE "data/tilesets/traditional_house_collision.asm"

maps/PewterCity.ablk

@@ -5,7 +5,7 @@ RRRRRRRRRRRR?;
tt

 T!tt
 
 ,)
ttuqqv7}~t
 
-ttn,)/7}}~/B,)







+ttn,)/7}€~/B,)







 
 
 

maps/PewterCity.asm

@@ -129,12 +129,8 @@ PewterGymSignText:
 	done
 
 PewterMuseumSignText:
-	text "There's a notice"
+	text "PEWTER MUSEUM OF"
-	line "here…"
+	line "SCIENCE"
-
-	para "PEWTER MUSEUM OF"
-	line "SCIENCE is closed"
-	cont "for renovations…"
 	done
 
 PewterCityMtMoonGiftShopSignText:
@@ -159,6 +155,7 @@ PewterCity_MapEvents:
 	warp_event 23, 17, PEWTER_MART, 2
 	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
 
 	def_coord_events
 

maps/Route2.ablk

@@ -3,22 +3,15 @@
 
 
>??;
 11111$W%
-n2ll1tt
+mn2l1tt
-n
+mn
 
-11111lnll
+11111 !
 
-1nlnl
+17~11112ll//
-
-1nnnnLL111nnnnmm2llnnnnmL/ononmm/mo
 
 
-o
+OP T! !|}~RO|~R/UUUUUn
-o
-mOPl
-l
-
-l T!n|}~ROMRR/UUUUUn
 
 
 

maps/Route2.asm

@@ -3,7 +3,6 @@
 	const ROUTE2_BUG_CATCHER2
 	const ROUTE2_BUG_CATCHER3
 	const ROUTE2_POKE_BALL1
-	const ROUTE2_POKE_BALL2
 	const ROUTE2_POKE_BALL3
 	const ROUTE2_POKE_BALL4
 	const ROUTE2_FRUIT_TREE
@@ -153,23 +152,23 @@ Route2_MapEvents:
 	warp_event 16, 27, ROUTE_2_GATE, 1
 	warp_event 17, 27, ROUTE_2_GATE, 2
 	warp_event 12,  7, DIGLETTS_CAVE, 3
+	warp_event  5, 33, VIRIDIAN_FOREST_VIRIDIAN_GATE, 1
+	warp_event  3, 11, VIRIDIAN_FOREST_PEWTER_GATE, 3
+	warp_event  4, 11, VIRIDIAN_FOREST_PEWTER_GATE, 4
 
 	def_coord_events
 
 	def_bg_events
 	bg_event  7, 51, BGEVENT_READ, Route2Sign
 	bg_event 11,  9, BGEVENT_READ, Route2DiglettsCaveSign
-	bg_event  7, 23, BGEVENT_ITEM, Route2HiddenMaxEther
+	bg_event 19, 32, BGEVENT_ITEM, Route2HiddenMaxEther
-	bg_event  4, 14, BGEVENT_ITEM, Route2HiddenFullHeal
+	bg_event  8, 33, BGEVENT_ITEM, Route2HiddenRevive
-	bg_event  4, 27, BGEVENT_ITEM, Route2HiddenFullRestore
-	bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive
 
 	def_object_events
 	object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1
 	object_event  6,  4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
 	object_event  0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
-	object_event  0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
+	object_event 14, 44, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
-	object_event  2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
+	object_event 11,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
-	object_event 19,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
 	object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
-	object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route2FruitTree, -1
+	object_event  2,  3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route2FruitTree, -1

maps/ViridianForest.asm

@@ -62,7 +62,7 @@ BugCatcherDaneSeenText:
 	text "Welcome to"
 	line "Viridian Forest."
 	cont "Enjoy my Bug-type"
-	cont "#mon."
+	cont "#MON!"
 	done
 
 BugCatcherDaneBeatenText:
@@ -88,11 +88,11 @@ BugCatcherDionBeatenText:
 	done
 	
 BugCatcherDionAfterBattleText:
-	text "Bug-type #mon"
+	text "Bug-type #MON"
 	line "make all kinds of"
 	cont "sounds."
 
-	para "For bug #mon"
+	para "For bug #MON"
 	line "fans, knowing how"
 	cont "to distinguish"
 	cont "them is key!"
@@ -100,11 +100,11 @@ BugCatcherDionAfterBattleText:
 
 BugCatcherStaceySeenText:
 	text "Wow, that's a HUGE"
-	line "#mon!"
+	line "#MON!"
 
 	para "…"
 	line "…What kind of"
-	cont "trainer?!"
+	cont "TRAINER?!"
 	done
 
 BugCatcherStaceyBeatenText:
@@ -116,14 +116,14 @@ BugCatcherStaceyAfterBattleText:
 	text "Has anyone ever"
 	line "told you that from"
 	cont "behind you look"
-	cont "like a Venonat?"
+	cont "like a VENONAT?"
 	done
 	
 BugCatcherEllisSeenText:
 	text "There's nothing"
 	line "more efficient and"
 	cont "beautiful than a"
-	cont "Bug-type #mon."
+	cont "Bug-type #MON."
 	done
 
 BugCatcherEllisBeatenText:
@@ -139,20 +139,20 @@ BugCatcherEllisAfterBattleText:
 
 BugCatcherAbnerSeenText:
 	text "Many people prefer"
-	line "solid bug #mon"
+	line "solid bug #MON"
 	cont "over squishy bug"
-	cont "#mon."
+	cont "#MON."
 	done
 
 BugCatcherAbnerBeatenText:
 	text "Thanks for your"
 	line "hard work, my"
-	cont "lovely #mon…"
+	cont "lovely #MON…"
 	done
 	
 BugCatcherAbnerAfterBattleText:
 	text "Doesn't matter what"
-	line "kind of #mon--"
+	line "kind of #MON--"
 
 	para "as long as you"
 	line "like them, they"
@@ -161,15 +161,15 @@ BugCatcherAbnerAfterBattleText:
 
 ViridianForestSignText1:
 	text "Leaving"
-	line "Viridian Forest"
+	line "VIRIDIAN FOREST"
-	cont "Pewter City Ahead"
+	cont "PEWTER CITY ahead"
 	done
 
 ViridianForestSignText2:
 	text "Trainer Tips"
 
 	para "Hold on to that"
-	line "Big Mushroom!"
+	line "BIG MUSHROOM!"
 
 	para "Some maniacs will"
 	line "pay lots of money"
@@ -179,21 +179,22 @@ ViridianForestSignText2:
 ViridianForestSignText3:
 	text "Trainer Tips"
 
-	para "Grass-type #mon"
+	para "Weaken #MON"
-	line "are unaffected by"
+	line "before trying"
+	cont "to catch them!"
 	
-	para "powder and spore"
+	para "When healthy,"
-	line "moves!"
+	line "they may escape!"
 	done
 
 ViridianForestSignText4:
 	text "For poison, use"
-	line "Antidote! Get it"
+	line "ANTIDOTE! Get it"
-	cont "at #mon Marts!"
+	cont "at #MON MARTs!"
 	done
 
 ViridianForestSignText5:
-	text "Trainer Tips"
+	text "TRAINER TIPS"
 
 	para "Poison-type #-"
 	line "mon can't be poi-"
@@ -201,9 +202,9 @@ ViridianForestSignText5:
 	done
 
 ViridianForestSignText6:
-	text "Trainer Tips"
+	text "TRAINER TIPS"
 
-	para "Weaken #mon"
+	para "Weaken #MON"
 	line "before attempting"
 	cont "capture!"