Blue's Lab Groundwork

So the scenes are massively unfinished and need some bug fixes, namely;
- Make the Silent Hills scene load properly.
- Finish the interior scene; have the player walk into the map.
- Make the scene loading in the second Blue's Lab room load properly (same issue as Silent Hills)

Main issues come from the events not working like RBY:
- You cannot be walked directly into a warp!
- Coord events don't seem to trigger scenes on their own and I'm just kind of perplexed by it.

If anyone more experienced wants to take a stab at it, by all means! This is looking really good!

data/maps/attributes.asm

@@ -816,6 +816,7 @@ ENDM
 	connection west, SilentHills, SILENT_HILLS, 0
 	
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
+	map_attributes BlueLab, BLUE_LAB, $00, 0
 	map_attributes QuietCave, QUIET_CAVE, $76, 0
 	map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0
 	map_attributes SilversHouse, SILVERS_HOUSE, $00, 0

data/maps/blocks.asm

@@ -1207,3 +1207,6 @@ WinnersPathOutside_Blocks:
 	
 UnnumberedRoute_Blocks:
 	INCBIN "maps/UnnumberedRoute.ablk"
+	
+BlueLab_Blocks:
+	INCBIN "maps/BlueLab.ablk"

data/maps/maps.asm

@@ -688,6 +688,7 @@ MapGroup_SilentHills:
 	map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
 	map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
 	map Route49OldCityGate, TILESET_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map BlueLab, TILESET_BLUE_LAB, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	assert_table_length NUM_SILENT_HILLS_MAPS
 	
 MapGroup_BlueForest:

data/maps/scenes.asm

@@ -86,4 +86,6 @@ MapScenes::
 	scene_var MOBILE_BATTLE_ROOM,                          wMobileBattleRoomSceneID
 	scene_var CERULEAN_CAVE_1F,                            wCeruleanCave1FSceneID
 	scene_var PEWTER_MUSEUM_OF_SCIENCE_1F,				   wPewterMuseum1FSceneID
+	scene_var SILENT_HILLS,					   		       wSilentHillsSceneID
+	scene_var BLUE_LAB,									   wBlueLabSceneID
 	db -1 ; end

data/maps/scripts.asm

@@ -494,13 +494,13 @@ INCLUDE "maps/CeruleanCave1F.asm"
 INCLUDE "maps/CeruleanCave2F.asm"
 INCLUDE "maps/CeruleanCaveB1F.asm"
 INCLUDE "maps/SilentHills.asm"
+
+SECTION "Map Scripts 26", ROMX
+
 INCLUDE "maps/LakeOfRageTraderHouse.asm"
 INCLUDE "maps/LakeOfRagePokecenter1F.asm"
 INCLUDE "maps/LakeOfRageMart.asm"
 INCLUDE "maps/LakeOfRagePrycesHouse.asm"
-
-SECTION "Map Scripts 26", ROMX
-
 INCLUDE "maps/DebugRoom.asm"
 INCLUDE "maps/CliffCave.asm"
 INCLUDE "maps/Route49.asm"
@@ -514,6 +514,8 @@ INCLUDE "maps/KantoPokecenter2F.asm"
 INCLUDE "maps/CalsHouse1F.asm"
 INCLUDE "maps/CalsHouse2F.asm"
 INCLUDE "maps/CliffEdgeGate.asm"
+
+SECTION "Map Scripts 27", ROMX
 INCLUDE "maps/EmbeddedTower.asm"
 INCLUDE "maps/Route48.asm"
 INCLUDE "maps/JohtoSafariZoneGate.asm"
@@ -521,8 +523,6 @@ INCLUDE "maps/JohtoSafariZone.asm"
 INCLUDE "maps/LavenderCrypt.asm"
 INCLUDE "maps/UnderwaterTunnel.asm"
 INCLUDE "maps/BillsGarden.asm"
-
-SECTION "Map Scripts 27", ROMX
 INCLUDE "maps/CeladonUniversityOutside.asm"
 INCLUDE "maps/CeladonUniversityInside.asm"
 INCLUDE "maps/MtMoonCrater.asm"
@@ -544,6 +544,8 @@ INCLUDE "maps/MtEmberHiddenPath.asm"
 INCLUDE "maps/TwoIsland.asm"
 INCLUDE "maps/CapeBrink.asm"
 INCLUDE "maps/Route47.asm"
+
+SECTION "Map Scripts 28", ROMX
 INCLUDE "maps/ThreeIsland.asm"
 INCLUDE "maps/BondBridge.asm"
 INCLUDE "maps/BerryForest.asm"
@@ -553,8 +555,6 @@ INCLUDE "maps/IcefallCave1F.asm"
 INCLUDE "maps/IcefallCaveB1F.asm"
 INCLUDE "maps/IcefallCaveBack.asm"
 INCLUDE "maps/FiveIsland.asm"
-
-SECTION "Map Scripts 28", ROMX
 INCLUDE "maps/FiveIslandMeadow.asm"
 INCLUDE "maps/MemorialPillar.asm"
 INCLUDE "maps/WaterLabyrinth.asm"
@@ -570,6 +570,15 @@ INCLUDE "maps/OutcastIsland.asm"
 INCLUDE "maps/SevenIsland.asm"
 INCLUDE "maps/CanyonEntrance.asm"
 INCLUDE "maps/SevaultCanyon.asm"
+
+SECTION "Map Scripts 29", ROMX
+INCLUDE "maps/Route49OldCityGate.asm"
+INCLUDE "maps/WinnersPath.asm"
+INCLUDE "maps/WinnersPathOutside.asm"
+INCLUDE "maps/UnnumberedRoute.asm"
+INCLUDE "maps/BlueLab.asm"
+
+SECTION "Map Scripts 30", ROMX
 INCLUDE "maps/TanobyRuins.asm"
 INCLUDE "maps/TanobyChambers.asm"
 INCLUDE "maps/NavalRockExterior.asm"
@@ -589,9 +598,3 @@ INCLUDE "maps/ThreeIslandPort.asm"
 INCLUDE "maps/AlteringCave.asm"
 INCLUDE "maps/SinjohRuinsExterior.asm"
 INCLUDE "maps/SinjohRuinsInterior.asm"
-
-SECTION "Map Scripts 29", ROMX
-INCLUDE "maps/Route49OldCityGate.asm"
-INCLUDE "maps/WinnersPath.asm"
-INCLUDE "maps/WinnersPathOutside.asm"
-INCLUDE "maps/UnnumberedRoute.asm"

data/phone/non_trainer_names.asm

@@ -7,6 +7,7 @@ NonTrainerCallerNames:
 	dw .bill
 	dw .elm
 	dw .buena
+	dw .blue
 	assert_table_length NUM_NONTRAINER_PHONECONTACTS + 1
 
 .none:     db "----------@"
@@ -15,3 +16,4 @@ NonTrainerCallerNames:
 .elm:      db "PROF.ELM:@"
 .bikeshop: db "BIKE SHOP:@"
 .buena:    db "BUENA:<LF>   DISC JOCKEY@"
+.blue:	   db "BILL:@"

data/phone/permanent_numbers.asm

@@ -1,4 +1,5 @@
 PermanentNumbers:
 	db PHONECONTACT_MOM
 	db PHONECONTACT_ELM
+	db PHONECONTACT_BLUE
 	db -1 ; end

data/phone/phone_contacts.asm

@@ -19,7 +19,7 @@ PhoneContacts:
 	phone SCHOOLBOY,    JACK1,                 NATIONAL_PARK,             ANYTIME, JackPhoneCalleeScript,    ANYTIME, JackPhoneCallerScript
 	phone POKEFANF,     BEVERLY1,              NATIONAL_PARK,             ANYTIME, BeverlyPhoneCalleeScript, ANYTIME, BeverlyPhoneCallerScript
 	phone SAILOR,       HUEY1,                 OLIVINE_LIGHTHOUSE_2F,     ANYTIME, HueyPhoneCalleeScript,    ANYTIME, HueyPhoneCallerScript
-	phone TRAINER_NONE, PHONE_00,              N_A,                       0,       UnusedPhoneScript,        0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONECONTACT_BLUE,    BLUE_LAB,                  ANYTIME, BluePhoneCalleeScript,    0,       UnusedPhoneScript
 	phone TRAINER_NONE, PHONE_00,              N_A,                       0,       UnusedPhoneScript,        0,       UnusedPhoneScript
 	phone TRAINER_NONE, PHONE_00,              N_A,                       0,       UnusedPhoneScript,        0,       UnusedPhoneScript
 	phone COOLTRAINERM, GAVEN3,                ROUTE_26,                  ANYTIME, GavenPhoneCalleeScript,   ANYTIME, GavenPhoneCallerScript

data/phone/text/blue_callee.asm

@@ -0,0 +1,17 @@
+; This'll serve as a story progression-ator, like Elm in Johto.
+
+BlueAnswerPhoneRegularText:
+	text "Yes? @"
+	text_ram wStringBuffer3
+	text " here…"
+
+	para "Ah, <PLAYER>."
+	
+	para "Nope, no updates"
+	line "on gramps yet."
+	
+	para "I'll let you know"
+	line "if I turn up any"
+	cont "clues!"
+	done
+

data/tilesets.asm

@@ -59,4 +59,5 @@ Tilesets::
 	tileset TilesetNihonSouth
 	tileset TilesetNihonWest
 	tileset TilesetLavenderCrypt
+	tileset TilesetBlueLab
 	assert_table_length NUM_TILESETS + 1

data/tilesets/bluelab_collision.asm

@@ -0,0 +1,17 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 02
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 03
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 07
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 10

data/tilesets/bluelab_metatiles.bin

@@ -0,0 +1,2 @@
+))))))))))))))))















































		8989	





89



	





89#""$3224**











 !01"$
+24
















::::::::"""$2224***





#"

32

*