Add map objects from bank 60.

constants/engine_flags.asm

@@ -60,7 +60,7 @@
 	engine_flag_def ENGINE_UNLOCKED_UNOWNS_UNUSED_6,              wUnlockedUnowns, 6   ; $30
 	engine_flag_def ENGINE_UNLOCKED_UNOWNS_UNUSED_7,              wUnlockedUnowns, 7
 
-	engine_flag_def ENGINE_FLYPOINT_KRISS_HOUSE,                  wVisitedSpawns,     0 ; your house
+	engine_flag_def ENGINE_FLYPOINT_PLAYERS_HOUSE,                wVisitedSpawns,     0 ; your house
 	engine_flag_def ENGINE_FLYPOINT_VIRIDIAN_POKECENTER,          wVisitedSpawns,     1 ; viridian pokecenter
 	engine_flag_def ENGINE_FLYPOINT_PALLET,                       wVisitedSpawns,     2 ; pallet
 	engine_flag_def ENGINE_FLYPOINT_VIRIDIAN,                     wVisitedSpawns,     3 ; viridian

constants/event_flags.asm

@@ -728,7 +728,7 @@
 	const EVENT_DECO_GEODUDE_DOLL
 	const EVENT_DECO_MACHOP_DOLL
 	const EVENT_DECO_TENTACOOL_DOLL
-	const EVENT_KRISS_ROOM_POSTER
+	const EVENT_PLAYERS_ROOM_POSTER
 	const EVENT_DECO_GOLD_TROPHY
 	const EVENT_DECO_SILVER_TROPHY
 	const EVENT_DECO_BIG_SNORLAX_DOLL
@@ -818,8 +818,8 @@
 	const EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
 	const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
 	const EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
-; More Crystal-specific events
 	const EVENT_LISTENED_TO_INITIAL_RADIO
+; More Crystal-specific events
 	const EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
 	const EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
 	const EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
@@ -1803,8 +1803,8 @@
 	const EVENT_RIVAL_SPROUT_TOWER
 	const EVENT_RIVAL_BURNED_TOWER
 	const EVENT_RIVAL_DRAGONS_DEN
-	const EVENT_KRISS_HOUSE_MOM_1
-	const EVENT_KRISS_HOUSE_MOM_2
+	const EVENT_PLAYERS_HOUSE_MOM_1
+	const EVENT_PLAYERS_HOUSE_MOM_2
 	const EVENT_MR_POKEMONS_HOUSE_OAK
 	const EVENT_VIOLET_CITY_EARL
 	const EVENT_EARLS_ACADEMY_EARL
@@ -1925,10 +1925,10 @@
 	const EVENT_KURTS_HOUSE_KURT_1
 	const EVENT_KURTS_HOUSE_KURT_2
 	const EVENT_SLOWPOKE_WELL_KURT ; 740
-	const EVENT_KRISS_HOUSE_2F_CONSOLE
-	const EVENT_KRISS_HOUSE_2F_DOLL_1
-	const EVENT_KRISS_HOUSE_2F_DOLL_2
-	const EVENT_KRISS_HOUSE_2F_BIG_DOLL
+	const EVENT_PLAYERS_HOUSE_2F_CONSOLE
+	const EVENT_PLAYERS_HOUSE_2F_DOLL_1
+	const EVENT_PLAYERS_HOUSE_2F_DOLL_2
+	const EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
 	const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
 	const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
 	const EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
@@ -2008,8 +2008,8 @@
 	const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
 	const EVENT_DRAGON_SHRINE_CLAIR ; 790
 	const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
-	const EVENT_KRISS_HOUSE_1F_NEIGHBOR
-	const EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
+	const EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
+	const EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
 	const EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
 	const EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
 	const EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM

constants/map_constants.asm

@@ -433,9 +433,9 @@ ENDM
 	map_const ROUTE_29,                                    9, 30 ;  3
 	map_const NEW_BARK_TOWN,                               9, 10 ;  4
 	map_const ELMS_LAB,                                    6,  5 ;  5
-	map_const KRISS_HOUSE_1F,                              4,  5 ;  6
-	map_const KRISS_HOUSE_2F,                              3,  4 ;  7
-	map_const KRISS_NEIGHBORS_HOUSE,                       4,  4 ;  8
+	map_const PLAYERS_HOUSE_1F,                            4,  5 ;  6
+	map_const PLAYERS_HOUSE_2F,                            3,  4 ;  7
+	map_const PLAYERS_NEIGHBORS_HOUSE,                     4,  4 ;  8
 	map_const ELMS_HOUSE,                                  4,  4 ;  9
 	map_const ROUTE_26_HEAL_SPEECH_HOUSE,                  4,  4 ; 10
 	map_const ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE,         4,  4 ; 11

engine/engine_flags.asm

@@ -146,7 +146,7 @@ EngineFlags:
 	engine_flag ENGINE_UNLOCKED_UNOWNS_UNUSED_6
 	engine_flag ENGINE_UNLOCKED_UNOWNS_UNUSED_7
 
-	engine_flag ENGINE_FLYPOINT_KRISS_HOUSE
+	engine_flag ENGINE_FLYPOINT_PLAYERS_HOUSE
 	engine_flag ENGINE_FLYPOINT_VIRIDIAN_POKECENTER
 	engine_flag ENGINE_FLYPOINT_PALLET
 	engine_flag ENGINE_FLYPOINT_VIRIDIAN

engine/specials.asm

@@ -138,8 +138,8 @@ SpecialsPointers:
 	add_special FadeOutMusic
 	add_special Diploma
 	add_special PrintDiploma
-	add_special Function90a1b
-	add_special Function90a54
+	add_special InitialSetDSTFlag
+	add_special InitialClearDSTFlag
 	add_special Function90a8d
 	add_special SpecialNone
 

macros/scripts/events.asm

@@ -800,12 +800,12 @@ playmusic: MACRO
 	dw \1 ; music_pointer
 ENDM
 
-	enum encountermusic_command ; $80
+	enum encountermusic_command ; $7f
 encountermusic: MACRO
 	db encountermusic_command
 ENDM
 
-	enum musicfadeout_command ; $81
+	enum musicfadeout_command ; $80
 musicfadeout: MACRO
 	db musicfadeout_command
 	dw \1 ; music
@@ -936,18 +936,18 @@ askforphonenumber: MACRO
 	db \1 ; number
 ENDM
 
-	enum phonecall_command ; $98
+	enum phonecall_command ; $97
 phonecall: MACRO
 	db phonecall_command
 	dw \1 ; caller_name
 ENDM
 
-	enum hangup_command ; $99
+	enum hangup_command ; $98
 hangup: MACRO
 	db hangup_command
 ENDM
 
-	enum describedecoration_command ; $9a
+	enum describedecoration_command ; $99
 describedecoration: MACRO
 	db describedecoration_command
 	db \1 ; byte

main.asm

@@ -1243,9 +1243,9 @@ InitClock:
 	dr $90641, $908dc
 SetDayOfWeek:
 	dr $908dc, $90a1b
-Function90a1b:
+InitialSetDSTFlag:
 	dr $90a1b, $90a54
-Function90a54:
+InitialClearDSTFlag:
 	dr $90a54, $90a8d
 Function90a8d:
 	dr $90a8d, $90b0f
@@ -1935,16 +1935,15 @@ SECTION "bank5f", ROMX, BANK[$5f]
 	dr $17c000, $180000
 
 SECTION "bank60", ROMX, BANK[$60]
-;INCLUDE "maps/ElmsLab.asm"
-;INCLUDE "maps/PlayersHouse1F.asm"
-;INCLUDE "maps/PlayersHouse2F.asm"
-;INCLUDE "maps/PlayersNeighborsHouse.asm"
-;INCLUDE "maps/ElmsHouse.asm"
-;INCLUDE "maps/Route26HealHouse.asm"
-;INCLUDE "maps/DayOfWeekSiblingsHouse.asm"
-;INCLUDE "maps/Route27SandstormHouse.asm"
-;INCLUDE "maps/Route29Route46Gate.asm"
-	dr $180000, $184000
+INCLUDE "maps/ElmsLab.asm"
+INCLUDE "maps/PlayersHouse1F.asm"
+INCLUDE "maps/PlayersHouse2F.asm"
+INCLUDE "maps/PlayersNeighborsHouse.asm"
+INCLUDE "maps/ElmsHouse.asm"
+INCLUDE "maps/Route26HealHouse.asm"
+INCLUDE "maps/DayOfWeekSiblingsHouse.asm"
+INCLUDE "maps/Route27SandstormHouse.asm"
+INCLUDE "maps/Route29Route46Gate.asm"
 
 SECTION "bank61", ROMX, BANK[$61]
 INCLUDE "maps/FightingDojo.asm"

maps/DayOfWeekSiblingsHouse.asm

@@ -0,0 +1,83 @@
+	const_def 2 ; object constants
+	const DAYOFWEEKSIBLINGSHOUSE_POKEDEX
+
+DayOfWeekSiblingsHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+DayOfWeekSiblingsHousePokedexScript:
+	opentext
+	writetext DayOfWeekSiblingsHousePokedexText1
+	yesorno
+	iffalse .End
+	writetext DayOfWeekSiblingsHousePokedexText2
+	yesorno
+	iffalse .End
+	writetext DayOfWeekSiblingsHousePokedexText3
+	waitbutton
+.End:
+	closetext
+	end
+
+DayOfWeekSiblingsHousePokedexText1:
+	text "There's something"
+	line "written here."
+
+	para "Read it?"
+	done
+
+DayOfWeekSiblingsHousePokedexText2:
+	text "To my brothers and"
+	line "sisters:"
+
+	para "We take pride in"
+	line "serving #MON"
+	cont "trainers."
+
+	para "When trainers talk"
+	line "to you, give them"
+	cont "something useful."
+
+	para "Love,"
+	line "MONICA"
+
+	para "Keep reading?"
+	done
+
+DayOfWeekSiblingsHousePokedexText3:
+	text "Monday, MONICA"
+	line "ROUTE 40"
+
+	para "Tuesday, TUSCANY"
+	line "ROUTE 29"
+
+	para "Wednesday, WESLEY"
+	line "LAKE OF RAGE"
+
+	para "Thursday, ARTHUR"
+	line "ROUTE 36"
+
+	para "Friday, FRIEDA"
+	line "ROUTE 32"
+
+	para "Saturday, SANTOS"
+	line "BLACKTHORN CITY"
+
+	para "Sunday, SUNNY"
+	line "ROUTE 37"
+	done
+
+DayOfWeekSiblingsHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_26, 3
+	warp_event  3,  7, ROUTE_26, 3
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event  3,  3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayOfWeekSiblingsHousePokedexScript, -1

maps/ElmsHouse.asm

@@ -0,0 +1,100 @@
+	const_def 2 ; object constants
+	const ELMSHOUSE_ELMS_WIFE
+	const ELMSHOUSE_ELMS_SON
+
+ElmsHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+ElmsWife:
+	jumptextfaceplayer ElmsWifeText
+
+ElmsSon:
+	jumptextfaceplayer ElmsSonText
+
+ElmsHousePC:
+	jumptext ElmsHousePCText
+
+ElmsHouseBookshelf:
+	jumpstd difficultbookshelf
+
+ElmsWifeText:
+	text "Hi, <PLAYER>! My"
+	line "husband's always"
+
+	para "so busy--I hope"
+	line "he's OK."
+
+	para "When he's caught"
+	line "up in his #MON"
+
+	para "research, he even"
+	line "forgets to eat."
+	done
+
+ElmsSonText:
+	text "When I grow up,"
+	line "I'm going to help"
+	cont "my Dad!"
+
+	para "I'm going to be a"
+	line "great #MON"
+	cont "professor!"
+	done
+
+ElmsHouseLabFoodText:
+; unused
+	text "There's some food"
+	line "here. It must be"
+	cont "for the LAB."
+	done
+
+ElmsHousePokemonFoodText:
+; unused
+	text "There's some food"
+	line "here. This must be"
+	cont "for #MON."
+	done
+
+ElmsHousePCText:
+	text "#MON. Where do"
+	line "they come from? "
+
+	para "Where are they"
+	line "going?"
+
+	para "Why has no one"
+	line "ever witnessed a"
+	cont "#MON's birth?"
+
+	para "I want to know! I"
+	line "will dedicate my"
+
+	para "life to the study"
+	line "of #MON!"
+
+	para "…"
+
+	para "It's a part of"
+	line "PROF.ELM's re-"
+	cont "search papers."
+	done
+
+ElmsHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, NEW_BARK_TOWN, 4
+	warp_event  3,  7, NEW_BARK_TOWN, 4
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  0,  1, BGEVENT_READ, ElmsHousePC
+	bg_event  6,  1, BGEVENT_READ, ElmsHouseBookshelf
+	bg_event  7,  1, BGEVENT_READ, ElmsHouseBookshelf
+
+	db 2 ; object events
+	object_event  1,  5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1
+	object_event  5,  4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1

maps/PlayersHouse1F.asm

@@ -0,0 +1,310 @@
+	const_def 2 ; object constants
+	const PLAYERSHOUSE1F_MOM1
+	const PLAYERSHOUSE1F_MOM2
+	const PLAYERSHOUSE1F_MOM3
+	const PLAYERSHOUSE1F_MOM4
+
+PlayersHouse1F_MapScripts:
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
+
+	db 0 ; callbacks
+
+.DummyScene0:
+	priorityjump MeetMomScript
+	end
+
+.DummyScene1:
+	end
+
+MeetMomScript:
+	applymovement PLAYER, PlayersHouseDownstairsMovement
+	playmusic MUSIC_MOM
+	turnobject PLAYERSHOUSE1F_MOM1, UP
+	showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15
+	applymovement PLAYERSHOUSE1F_MOM1, MomWalksToPlayerMovement
+	opentext
+	writetext ElmsLookingForYouText
+	buttonsound
+	stringtotext GearName, MEM_BUFFER_1
+	scall PlayersHouse1FReceiveItemStd
+	setflag ENGINE_POKEGEAR
+	setflag ENGINE_PHONE_CARD
+	addcellnum PHONE_MOM
+	setscene SCENE_FINISHED
+	setevent EVENT_PLAYERS_HOUSE_MOM_1
+	clearevent EVENT_PLAYERS_HOUSE_MOM_2
+	writetext MomGivesPokegearText
+	buttonsound
+	special SetDayOfWeek
+.SetDayOfWeek:
+	writetext IsItDSTText
+	yesorno
+	iffalse .WrongDay
+	special InitialSetDSTFlag
+	yesorno
+	iffalse .SetDayOfWeek
+	jump .DayOfWeekDone
+
+.WrongDay:
+	special InitialClearDSTFlag
+	yesorno
+	iffalse .SetDayOfWeek
+.DayOfWeekDone:
+	writetext ComeHomeForDSTText
+	yesorno
+	iffalse .ExplainPhone
+	jump .KnowPhone
+
+.KnowPhone:
+	writetext KnowTheInstructionsText
+	buttonsound
+	jump .FinishPhone
+
+.ExplainPhone:
+	writetext DontKnowTheInstructionsText
+	buttonsound
+	jump .FinishPhone
+
+.FinishPhone:
+	writetext InstructionsNextText
+	waitbutton
+	closetext
+	applymovement PLAYERSHOUSE1F_MOM1, MomTurnsBackMovement
+	special RestartMapMusic
+	end
+
+GearName:
+	db "#GEAR@"
+
+PlayersHouse1FReceiveItemStd:
+	jumpstd receiveitem
+	end
+
+MomScript:
+	faceplayer
+	opentext
+	checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM
+	iftrue .FirstTimeBanking
+	checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
+	iftrue .BankOfMom
+	checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
+	iftrue .GaveMysteryEgg
+	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+	iftrue .GotAPokemon
+	writetext HurryUpElmIsWaitingText
+	waitbutton
+	closetext
+	end
+
+.GotAPokemon:
+	writetext SoWhatWasProfElmsErrandText
+	waitbutton
+	closetext
+	end
+
+.FirstTimeBanking:
+	writetext ImBehindYouText
+	waitbutton
+	closetext
+	end
+
+.GaveMysteryEgg:
+	setevent EVENT_FIRST_TIME_BANKING_WITH_MOM
+.BankOfMom:
+	setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
+	special BankOfMom
+	waitbutton
+	closetext
+	end
+
+TVScript:
+	jumptext TVText
+
+StoveScript:
+	jumptext StoveText
+
+SinkScript:
+	jumptext SinkText
+
+FridgeScript:
+	jumptext FridgeText
+
+PlayersHouseDownstairsMovement:
+	step DOWN
+	step_end
+
+MomWalksToPlayerMovement:
+	slow_step RIGHT
+	slow_step RIGHT
+	slow_step UP
+	step_end
+
+MomTurnsBackMovement:
+	slow_step DOWN
+	slow_step LEFT
+	slow_step LEFT
+	step_end
+
+ElmsLookingForYouText:
+	text "Oh, <PLAYER>…! Our"
+	line "neighbor, PROF."
+
+	para "ELM, was looking"
+	line "for you."
+
+	para "He said he wanted"
+	line "you to do some-"
+	cont "thing for him."
+
+	para "Oh! I almost for-"
+	line "got! Your #MON"
+
+	para "GEAR is back from"
+	line "the repair shop."
+
+	para "Here you go!"
+	done
+
+MomGivesPokegearText:
+	text "#MON GEAR, or"
+	line "just #GEAR."
+
+	para "It's essential if"
+	line "you want to be a"
+	cont "good trainer."
+
+	para "Oh, the day of the"
+	line "week isn't set."
+
+	para "You mustn't forget"
+	line "that!"
+	done
+
+IsItDSTText:
+	text "Is it Daylight"
+	line "Saving Time now?"
+	done
+
+ComeHomeForDSTText:
+	text "Come home to"
+	line "adjust your clock"
+
+	para "for Daylight"
+	line "Saving Time."
+
+	para "By the way, do you"
+	line "know how to use"
+	cont "the PHONE?"
+	done
+
+KnowTheInstructionsText:
+	text "Don't you just"
+	line "turn the #GEAR"
+
+	para "on and select the"
+	line "PHONE icon?"
+	done
+
+DontKnowTheInstructionsText:
+	text "I'll read the"
+	line "instructions."
+
+	para "Turn the #GEAR"
+	line "on and select the"
+	cont "PHONE icon."
+	done
+
+InstructionsNextText:
+	text "Phone numbers are"
+	line "stored in memory."
+
+	para "Just choose a name"
+	line "you want to call."
+
+	para "Gee, isn't that"
+	line "convenient?"
+	done
+
+HurryUpElmIsWaitingText:
+	text "PROF.ELM is wait-"
+	line "ing for you."
+
+	para "Hurry up, baby!"
+	done
+
+SoWhatWasProfElmsErrandText:
+	text "So, what was PROF."
+	line "ELM's errand?"
+
+	para "…"
+
+	para "That does sound"
+	line "challenging."
+
+	para "But, you should be"
+	line "proud that people"
+	cont "rely on you."
+	done
+
+ImBehindYouText:
+	text "<PLAYER>, do it!"
+
+	para "I'm behind you all"
+	line "the way!"
+	done
+
+StoveText:
+	text "Mom's specialty!"
+
+	para "CINNABAR VOLCANO"
+	line "BURGER!"
+	done
+
+SinkText:
+	text "The sink is spot-"
+	line "less. Mom likes it"
+	cont "clean."
+	done
+
+FridgeText:
+	text "Let's see what's"
+	line "in the fridge…"
+
+	para "FRESH WATER and"
+	line "tasty LEMONADE!"
+	done
+
+TVText:
+	text "There's a movie on"
+	line "TV: Stars dot the"
+
+	para "sky as two boys"
+	line "ride on a train…"
+
+	para "I'd better get"
+	line "rolling too!"
+	done
+
+PlayersHouse1F_MapEvents:
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  6,  7, NEW_BARK_TOWN, 2
+	warp_event  7,  7, NEW_BARK_TOWN, 2
+	warp_event  9,  0, PLAYERS_HOUSE_2F, 1
+
+	db 0 ; coord events
+
+	db 4 ; bg events
+	bg_event  0,  1, BGEVENT_READ, StoveScript
+	bg_event  1,  1, BGEVENT_READ, SinkScript
+	bg_event  2,  1, BGEVENT_READ, FridgeScript
+	bg_event  4,  1, BGEVENT_READ, TVScript
+
+	db 4 ; object events
+	object_event  7,  3, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_1
+	object_event  2,  2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2
+	object_event  7,  3, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2
+	object_event  0,  2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2

maps/PlayersHouse2F.asm

@@ -0,0 +1,132 @@
+	const_def 2 ; object constants
+	const PLAYERSHOUSE2F_CONSOLE
+	const PLAYERSHOUSE2F_DOLL_1
+	const PLAYERSHOUSE2F_DOLL_2
+	const PLAYERSHOUSE2F_BIG_DOLL
+
+PlayersHouse2F_MapScripts:
+	db 0 ; scene scripts
+
+	db 2 ; callbacks
+	callback MAPCALLBACK_NEWMAP, .InitializeRoom
+	callback MAPCALLBACK_TILES, .SetSpawn
+
+; unused
+.Null:
+	end
+
+.InitializeRoom:
+	special ToggleDecorationsVisibility
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
+	checkevent EVENT_INITIALIZED_EVENTS
+	iftrue .SkipInitialization
+	jumpstd initializeevents
+	return
+
+.SkipInitialization:
+	return
+
+.SetSpawn:
+	special ToggleMaptileDecorations
+	return
+
+PlayersHouseRadioScript:
+	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+	iftrue .NormalRadio
+	checkevent EVENT_LISTENED_TO_INITIAL_RADIO
+	iftrue .AbbreviatedRadio
+	playmusic MUSIC_POKEMON_TALK
+	opentext
+	writetext PlayersRadioText1
+	pause 45
+	writetext PlayersRadioText2
+	pause 45
+	writetext PlayersRadioText3
+	pause 45
+	musicfadeout MUSIC_NEW_BARK_TOWN, 16
+	writetext PlayersRadioText4
+	pause 45
+	closetext
+	setevent EVENT_LISTENED_TO_INITIAL_RADIO
+	end
+
+.NormalRadio:
+	jumpstd radio1
+
+.AbbreviatedRadio:
+	opentext
+	writetext PlayersRadioText4
+	pause 45
+	closetext
+	end
+PlayersHouseBookshelfScript:
+	jumpstd picturebookshelf
+
+PlayersHousePCScript:
+	opentext
+	special PlayersHousePC
+	iftrue .Warp
+	closetext
+	end
+.Warp:
+	warp NONE, 0, 0
+	end
+
+PlayersHousePosterScript:
+	conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script
+
+.Script:
+	describedecoration DECODESC_POSTER
+
+Doll1Script:
+	describedecoration DECODESC_LEFT_DOLL
+
+Doll2Script:
+	describedecoration DECODESC_RIGHT_DOLL
+
+BigDollScript:
+	describedecoration DECODESC_BIG_DOLL
+
+GameConsoleScript:
+	describedecoration DECODESC_CONSOLE
+
+
+PlayersRadioText1:
+	text "PROF.OAK'S #MON"
+	line "TALK! Please tune"
+	cont "in next time!"
+	done
+
+PlayersRadioText2:
+	text "#MON CHANNEL!"
+	done
+
+PlayersRadioText3:
+	text "This is DJ MARY,"
+	line "your co-host!"
+	done
+
+PlayersRadioText4:
+	text "#MON!"
+	line "#MON CHANNEL…"
+	done
+
+PlayersHouse2F_MapEvents:
+	db 0, 0 ; filler
+
+	db 1 ; warp events
+	warp_event  7,  0, PLAYERS_HOUSE_1F, 3
+
+	db 0 ; coord events
+
+	db 4 ; bg events
+	bg_event  2,  1, BGEVENT_UP, PlayersHousePCScript
+	bg_event  3,  1, BGEVENT_READ, PlayersHouseRadioScript
+	bg_event  5,  1, BGEVENT_READ, PlayersHouseBookshelfScript
+	bg_event  6,  0, BGEVENT_IFSET, PlayersHousePosterScript
+
+	db 4 ; object events
+	object_event  4,  2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE
+	object_event  4,  4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
+	object_event  5,  4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
+	object_event  0,  1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL

maps/PlayersNeighborsHouse.asm

@@ -0,0 +1,97 @@
+	const_def 2 ; object constants
+	const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F
+
+PlayersNeighborsHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+PlayersNeighborsDaughterScript:
+	jumptextfaceplayer PlayersNeighborsDaughterText
+
+PlayersNeighborsHouseBookshelfScript:
+	jumpstd magazinebookshelf
+
+PlayersNeighborsHouseRadioScript:
+	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+	iftrue .NormalRadio
+	checkevent EVENT_LISTENED_TO_INITIAL_RADIO
+	iftrue .AbbreviatedRadio
+	playmusic MUSIC_POKEMON_TALK
+	opentext
+	writetext PlayerNeighborRadioText1
+	pause 45
+	writetext PlayerNeighborRadioText2
+	pause 45
+	writetext PlayerNeighborRadioText3
+	pause 45
+	musicfadeout MUSIC_NEW_BARK_TOWN, 16
+	writetext PlayerNeighborRadioText4
+	pause 45
+	closetext
+	setevent EVENT_LISTENED_TO_INITIAL_RADIO
+	end
+.NormalRadio:
+	jumpstd radio1
+.AbbreviatedRadio:
+	opentext
+	writetext PlayerNeighborRadioText4
+	pause 45
+	closetext
+	end
+
+PlayersNeighborsDaughterText:
+	text "PIKACHU is an"
+	line "evolved #MON."
+
+	para "I was amazed by"
+	line "PROF.ELM's find-"
+	cont "ings."
+
+	para "He's so famous for"
+	line "his research on"
+	cont "#MON evolution."
+
+	para "…sigh…"
+
+	para "I wish I could be"
+	line "a researcher like"
+	cont "him…"
+	done
+
+PlayerNeighborRadioText1:
+	text "PROF.OAK'S #MON"
+	line "TALK! Please tune"
+	cont "in next time!"
+	done
+
+PlayerNeighborRadioText2:
+	text "#MON CHANNEL!"
+	done
+
+PlayerNeighborRadioText3:
+	text "This is DJ MARY,"
+	line "your co-host!"
+	done
+
+PlayerNeighborRadioText4:
+	text "#MON!"
+	line "#MON CHANNEL…"
+	done
+
+PlayersNeighborsHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, NEW_BARK_TOWN, 3
+	warp_event  3,  7, NEW_BARK_TOWN, 3
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  0,  1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
+	bg_event  1,  1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
+	bg_event  7,  1, BGEVENT_READ, PlayersNeighborsHouseRadioScript
+
+	db 1 ; object events
+	object_event  2,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1

maps/Route26HealHouse.asm

@@ -0,0 +1,62 @@
+	const_def 2 ; object constants
+	const ROUTE26HEALHOUSE_TEACHER
+
+Route26HealHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+Route26HealHouseTeacherScript:
+	faceplayer
+	opentext
+	writetext Route26HealHouseRestAWhileText
+	waitbutton
+	closetext
+	special FadeBlackQuickly
+	special ReloadSpritesNoPalettes
+	playmusic MUSIC_HEAL
+	special HealParty
+	pause 60
+	special FadeInQuickly
+	special RestartMapMusic
+	opentext
+	writetext Route26HealHouseKeepAtItText
+	waitbutton
+	closetext
+	end
+
+Route26HealHouseBookshelf:
+	jumpstd picturebookshelf
+
+Route26HealHouseRestAWhileText:
+	text "Your #MON look"
+	line "a little tired."
+
+	para "You should rest"
+	line "them a while."
+	done
+
+Route26HealHouseKeepAtItText:
+	text "There!"
+
+	para "Your #MON are"
+	line "looking good!"
+
+	para "Keep at it!"
+	done
+
+Route26HealHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_26, 2
+	warp_event  3,  7, ROUTE_26, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, Route26HealHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, Route26HealHouseBookshelf
+
+	db 1 ; object events
+	object_event  2,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route26HealHouseTeacherScript, -1

maps/Route27SandstormHouse.asm

@@ -0,0 +1,108 @@
+	const_def 2 ; object constants
+	const ROUTE27SANDSTORMHOUSE_GRANNY
+
+Route27SandstormHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+SandstormHouseWoman:
+	faceplayer
+	opentext
+	checkevent EVENT_GOT_TM37_SANDSTORM
+	iftrue .AlreadyGotItem
+	special GetFirstPokemonHappiness
+	writetext SandstormHouseWomanText1
+	buttonsound
+	ifgreater 150 - 1, .Loyal
+	jump .Disloyal
+
+.Loyal:
+	writetext SandstormHouseWomanLoyalText
+	buttonsound
+	verbosegiveitem TM_SANDSTORM
+	iffalse .Done
+	setevent EVENT_GOT_TM37_SANDSTORM
+.AlreadyGotItem:
+	writetext SandstormHouseSandstormDescription
+	waitbutton
+.Done:
+	closetext
+	end
+
+.Disloyal:
+	writetext SandstormHouseWomanDisloyalText
+	waitbutton
+	closetext
+	end
+
+SandstormHouseBookshelf:
+	jumpstd magazinebookshelf
+
+SandstormHouseWomanText1:
+	text "Where are you off"
+	line "to with #MON?"
+
+	para "#MON LEAGUE?"
+
+	para "Are your #MON"
+	line "loyal enough for"
+	cont "you to win?"
+
+	para "Let me see…"
+	done
+
+SandstormHouseWomanLoyalText:
+	text "Ah! Your #MON"
+	line "trusts you very"
+	cont "much."
+
+	para "It's nice to see a"
+	line "good trainer."
+
+	para "Here. A gift for"
+	line "your journey."
+	done
+
+SandstormHouseSandstormDescription:
+	text "TM37 happens to be"
+	line "SANDSTORM."
+
+	para "It's a move that"
+	line "inflicts damage on"
+	cont "both battlers."
+
+	para "It's for advanced"
+	line "trainers only."
+
+	para "Use it if you"
+	line "dare. Good luck!"
+	done
+
+SandstormHouseWomanDisloyalText:
+	text "If it doesn't come"
+	line "to trust you some"
+
+	para "more, it could be"
+	line "tough going."
+
+	para "Trust is the tie"
+	line "that binds #MON"
+	cont "and trainers."
+	done
+
+Route27SandstormHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_27, 1
+	warp_event  3,  7, ROUTE_27, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, SandstormHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, SandstormHouseBookshelf
+
+	db 1 ; object events
+	object_event  2,  4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1

maps/Route29Route46Gate.asm

@@ -0,0 +1,52 @@
+	const_def 2 ; object constants
+	const ROUTE29ROUTE46GATE_OFFICER
+	const ROUTE29ROUTE46GATE_YOUNGSTER
+
+Route29Route46Gate_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+Route29Route46GateOfficerScript:
+	jumptextfaceplayer Route29Route46GateOfficerText
+
+Route29Route46GateYoungsterScript:
+	jumptextfaceplayer Route29Route46GateYoungsterText
+
+Route29Route46GateOfficerText:
+	text "You can't climb"
+	line "ledges."
+
+	para "But you can jump"
+	line "down from them to"
+	cont "take a shortcut."
+	done
+
+Route29Route46GateYoungsterText:
+	text "Different kinds of"
+	line "#MON appear"
+	cont "past here."
+
+	para "If you want to"
+	line "catch them all,"
+
+	para "you have to look"
+	line "everywhere."
+	done
+
+Route29Route46Gate_MapEvents:
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  4,  0, ROUTE_46, 1
+	warp_event  5,  0, ROUTE_46, 2
+	warp_event  4,  7, ROUTE_29, 1
+	warp_event  5,  7, ROUTE_29, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1
+	object_event  6,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1