shithub: pokecrystal

--- a/constants/map_constants.asm

+++ b/constants/map_constants.asm

@@ -161,7 +161,7 @@

 	map_const WISE_TRIOS_ROOM,                              4,  4 ;  2

 	map_const ECRUTEAK_POKECENTER_1F,                       5,  4 ;  3

 	map_const ECRUTEAK_LUGIA_SPEECH_HOUSE,                  4,  4 ;  4

-	map_const DANCE_THEATRE,                                6,  7 ;  5

+	map_const DANCE_THEATER,                                6,  7 ;  5

 	map_const ECRUTEAK_MART,                                6,  4 ;  6

 	map_const ECRUTEAK_GYM,                                 5,  9 ;  7

 	map_const ECRUTEAK_ITEMFINDER_HOUSE,                    4,  4 ;  8

--- a/data/maps/attributes.asm

+++ b/data/maps/attributes.asm

@@ -486,7 +486,7 @@

 	map_attributes WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0

 	map_attributes EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0

 	map_attributes EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0

-	map_attributes DanceTheatre, DANCE_THEATRE, $00, 0

+	map_attributes DanceTheater, DANCE_THEATER, $00, 0

 	map_attributes EcruteakMart, ECRUTEAK_MART, $00, 0

 	map_attributes EcruteakGym, ECRUTEAK_GYM, $00, 0

 	map_attributes EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $00, 0

--- a/data/maps/blocks.asm

+++ b/data/maps/blocks.asm

@@ -803,8 +803,8 @@

 GoldenrodBikeShop_Blocks:

 	INCBIN "maps/GoldenrodBikeShop.blk"

-DanceTheatre_Blocks:

-	INCBIN "maps/DanceTheatre.blk"

+DanceTheater_Blocks:

+	INCBIN "maps/DanceTheater.blk"

 EcruteakTinTowerEntrance_Blocks:

 	INCBIN "maps/EcruteakTinTowerEntrance.blk"

--- a/data/maps/maps.asm

+++ b/data/maps/maps.asm

@@ -175,7 +175,7 @@

 	map WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map DanceTheatre, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map DanceTheater, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map EcruteakMart, TILESET_MART, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map EcruteakGym, TILESET_TOWER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

--- a/data/maps/scripts.asm

+++ b/data/maps/scripts.asm

@@ -195,7 +195,7 @@

 INCLUDE "maps/WiseTriosRoom.asm"

 INCLUDE "maps/EcruteakPokecenter1F.asm"

 INCLUDE "maps/EcruteakLugiaSpeechHouse.asm"

-INCLUDE "maps/DanceTheatre.asm"

+INCLUDE "maps/DanceTheater.asm"

 INCLUDE "maps/EcruteakMart.asm"

 INCLUDE "maps/EcruteakGym.asm"

 INCLUDE "maps/EcruteakItemfinderHouse.asm"

--- /dev/null

+++ b/maps/DanceTheater.asm

@@ -1,0 +1,360 @@

+	object_const_def

+	const DANCETHEATER_KIMONO_GIRL1

+	const DANCETHEATER_KIMONO_GIRL2

+	const DANCETHEATER_KIMONO_GIRL3

+	const DANCETHEATER_KIMONO_GIRL4

+	const DANCETHEATER_KIMONO_GIRL5

+	const DANCETHEATER_GENTLEMAN

+	const DANCETHEATER_RHYDON

+	const DANCETHEATER_COOLTRAINER_M

+	const DANCETHEATER_GRANNY

+DanceTheater_MapScripts:

+	def_scene_scripts

+	def_callbacks

+TrainerKimonoGirlNaoko:

+	trainer KIMONO_GIRL, NAOKO, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaokoSeenText, KimonoGirlNaokoBeatenText, 0, .Script

+.Script:

+	endifjustbattled

+	opentext

+	writetext KimonoGirlNaokoAfterBattleText

+	waitbutton

+	closetext

+	end

+TrainerKimonoGirlSayo:

+	trainer KIMONO_GIRL, SAYO, EVENT_BEAT_KIMONO_GIRL_SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script

+.Script:

+	endifjustbattled

+	opentext

+	writetext KimonoGirlSayoAfterBattleText

+	waitbutton

+	closetext

+	end

+TrainerKimonoGirlZuki:

+	trainer KIMONO_GIRL, ZUKI, EVENT_BEAT_KIMONO_GIRL_ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script

+.Script:

+	endifjustbattled

+	opentext

+	writetext KimonoGirlZukiAfterBattleText

+	waitbutton

+	closetext

+	end

+TrainerKimonoGirlKuni:

+	trainer KIMONO_GIRL, KUNI, EVENT_BEAT_KIMONO_GIRL_KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script

+.Script:

+	endifjustbattled

+	opentext

+	writetext KimonoGirlKuniAfterBattleText

+	waitbutton

+	closetext

+	end

+TrainerKimonoGirlMiki:

+	trainer KIMONO_GIRL, MIKI, EVENT_BEAT_KIMONO_GIRL_MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script

+.Script:

+	endifjustbattled

+	opentext

+	writetext KimonoGirlMikiAfterBattleText

+	waitbutton

+	closetext

+	end

+DanceTheaterSurfGuy:

+	faceplayer

+	opentext

+	writetext SurfGuyNeverLeftAScratchText

+	promptbutton

+	checkevent EVENT_GOT_HM03_SURF

+	iftrue SurfGuyAlreadyGaveSurf

+	checkevent EVENT_BEAT_KIMONO_GIRL_NAOKO

+	iffalse .KimonoGirlsUndefeated

+	checkevent EVENT_BEAT_KIMONO_GIRL_SAYO

+	iffalse .KimonoGirlsUndefeated

+	checkevent EVENT_BEAT_KIMONO_GIRL_ZUKI

+	iffalse .KimonoGirlsUndefeated

+	checkevent EVENT_BEAT_KIMONO_GIRL_KUNI

+	iffalse .KimonoGirlsUndefeated

+	checkevent EVENT_BEAT_KIMONO_GIRL_MIKI

+	iffalse .KimonoGirlsUndefeated

+	sjump .GetSurf

+.KimonoGirlsUndefeated:

+	checkflag ENGINE_PLAYER_IS_FEMALE

+	iftrue .PlayerIsFemale

+	writetext SurfGuyLadGiftText

+	waitbutton

+	closetext

+	end

+.PlayerIsFemale:

+	writetext SurfGuyLassieGiftText

+	waitbutton

+	closetext

+	end

+.GetSurf:

+	writetext SurfGuyLikeADanceText

+	promptbutton

+	verbosegiveitem HM_SURF

+	setevent EVENT_GOT_HM03_SURF

+	writetext SurfGuySurfExplanationText

+	waitbutton

+	closetext

+	end

+SurfGuyAlreadyGaveSurf:

+	writetext SurfGuyElegantKimonoGirlsText

+	waitbutton

+	closetext

+	end

+DanceTheaterRhydon:

+	opentext

+	writetext RhydonText

+	cry RHYDON

+	waitbutton

+	closetext

+	end

+DanceTheaterCooltrainerMScript:

+	jumptextfaceplayer DanceTheaterCooltrainerMText

+DanceTheaterGrannyScript:

+	jumptextfaceplayer DanceTheaterGrannyText

+DanceTheaterFancyPanel:

+	jumptext DanceTheaterFancyPanelText

+KimonoGirlNaokoSeenText:

+	text "You have lovely"

+	line "#MON. May I see"

+	cont "them in battle?"

+	done

+KimonoGirlNaokoBeatenText:

+	text "Oh, you are very"

+	line "strong."

+	done

+KimonoGirlNaokoAfterBattleText:

+	text "I enjoyed that"

+	line "bout. I would like"

+	cont "to see you again."

+	done

+KimonoGirlSayoSeenText:

+	text "I always dance"

+	line "with my #MON."

+	para "Of course, I also"

+	line "train them."

+	done

+KimonoGirlSayoBeatenText:

+	text "Oh, so close!"

+	line "I almost had you."

+	done

+KimonoGirlSayoAfterBattleText:

+	text "Rhythm is impor-"

+	line "tant for both"

+	para "dancing and #-"

+	line "MON."

+	done

+KimonoGirlZukiSeenText:

+	text "Isn't my barrette"

+	line "pretty?"

+	para "Oh. A #MON"

+	line "battle?"

+	done

+KimonoGirlZukiBeatenText:

+	text "I don't have any"

+	line "#MON left…"

+	done

+KimonoGirlZukiAfterBattleText:

+	text "I put a different"

+	line "flower in my bar-"

+	cont "rette every month."

+	done

+KimonoGirlKuniSeenText:

+	text "Oh, you're a cute"

+	line "trainer. Would you"

+	cont "like to battle?"

+	done

+KimonoGirlKuniBeatenText:

+	text "You're stronger"

+	line "than you look."

+	done

+KimonoGirlKuniAfterBattleText:

+	text "I trained a lot,"

+	line "so I thought I was"

+	para "a capable trainer."

+	line "I guess I'm not."

+	done

+KimonoGirlMikiSeenText:

+	text "Do you like my"

+	line "dancing? I'm good"

+	cont "at #MON too."

+	done

+KimonoGirlMikiBeatenText:

+	text "Ooh, you're good"

+	line "at #MON too."

+	done

+KimonoGirlMikiAfterBattleText:

+	text "I can keep dancing"

+	line "because there are"

+	para "people who enjoy"

+	line "what I do."

+	para "My #MON keep my"

+	line "spirits up too."

+	done

+SurfGuyNeverLeftAScratchText:

+	text "Not only are the"

+	line "KIMONO GIRLS great"

+	para "dancers, they're"

+	line "also skilled at"

+	cont "#MON."

+	para "I always challenge"

+	line "them, but I've"

+	para "never even left a"

+	line "scratch…"

+	done

+SurfGuyLadGiftText:

+	text "Lad! If you can"

+	line "defeat all the"

+	para "KIMONO GIRLS, I'll"

+	line "give you a gift."

+	done

+SurfGuyLassieGiftText:

+	text "Lassie, if you can"

+	line "defeat all the"

+	para "KIMONO GIRLS, I'll"

+	line "give you a gift."

+	done

+SurfGuyLikeADanceText:

+	text "The way you bat-"

+	line "tled, it was like"

+	cont "watching a dance."

+	para "It was a rare"

+	line "treat to see!"

+	para "I want you to have"

+	line "this. Don't worry"

+	cont "--take it!"

+	done

+SurfGuySurfExplanationText:

+	text "That's SURF."

+	para "It's a move that"

+	line "lets #MON swim"

+	cont "across water."

+	done

+SurfGuyElegantKimonoGirlsText:

+	text "I wish my #MON"

+	line "were as elegant as"

+	cont "the KIMONO GIRLS…"

+	done

+RhydonText:

+	text "RHYDON: Gugooh"

+	line "gugogooh!"

+	done

+DanceTheaterCooltrainerMText:

+	text "That man's always"

+	line "with his RHYDON."

+	para "Says he wants a"

+	line "#MON that can"

+	cont "SURF and dance."

+	para "Is he trying to"

+	line "make a synchro-"

+	cont "nized swimming"

+	cont "#MON?"

+	done

+DanceTheaterGrannyText:

+	text "The KIMONO GIRLS"

+	line "are so beautiful…"

+	para "But they have to"

+	line "go through rigor-"

+	cont "ous training."

+	para "And they have to"

+	line "learn to follow"

+	para "customs before ap-"

+	line "pearing in public."

+	para "But if you love"

+	line "something, any-"

+	cont "thing is possible."

+	done

+DanceTheaterFancyPanelText:

+	text "It's a fancy panel"

+	line "that's decorated"

+	cont "with flowers."

+	done

+DanceTheater_MapEvents:

+	db 0, 0 ; filler

+	def_warp_events

+	warp_event  5, 13, ECRUTEAK_CITY, 8

+	warp_event  6, 13, ECRUTEAK_CITY, 8

+	def_coord_events

+	def_bg_events

+	bg_event  5,  6, BGEVENT_UP, DanceTheaterFancyPanel

+	bg_event  6,  6, BGEVENT_UP, DanceTheaterFancyPanel

+	def_object_events

+	object_event  0,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko, -1

+	object_event  2,  1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1

+	object_event  6,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1

+	object_event  9,  1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1

+	object_event 11,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1

+	object_event  7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1

+	object_event  6,  8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1

+	object_event 10, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheaterCooltrainerMScript, -1

+	object_event  3,  6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterGrannyScript, -1

--- /dev/null

+++ b/maps/DanceTheater.blk

@@ -1,0 +1,1 @@

+------,,,,,,.0000/*+*

\ No newline at end of file

--- a/maps/DanceTheatre.asm

+++ /dev/null

@@ -1,360 +1,0 @@

-	object_const_def

-	const DANCETHEATRE_KIMONO_GIRL1

-	const DANCETHEATRE_KIMONO_GIRL2

-	const DANCETHEATRE_KIMONO_GIRL3

-	const DANCETHEATRE_KIMONO_GIRL4

-	const DANCETHEATRE_KIMONO_GIRL5

-	const DANCETHEATRE_GENTLEMAN

-	const DANCETHEATRE_RHYDON

-	const DANCETHEATRE_COOLTRAINER_M

-	const DANCETHEATRE_GRANNY

-DanceTheatre_MapScripts:

-	def_scene_scripts

-	def_callbacks

-TrainerKimonoGirlNaoko:

-	trainer KIMONO_GIRL, NAOKO, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaokoSeenText, KimonoGirlNaokoBeatenText, 0, .Script

-.Script:

-	endifjustbattled

-	opentext

-	writetext KimonoGirlNaokoAfterBattleText

-	waitbutton

-	closetext

-	end

-TrainerKimonoGirlSayo:

-	trainer KIMONO_GIRL, SAYO, EVENT_BEAT_KIMONO_GIRL_SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script

-.Script:

-	endifjustbattled

-	opentext

-	writetext KimonoGirlSayoAfterBattleText

-	waitbutton

-	closetext

-	end

-TrainerKimonoGirlZuki:

-	trainer KIMONO_GIRL, ZUKI, EVENT_BEAT_KIMONO_GIRL_ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script

-.Script:

-	endifjustbattled

-	opentext

-	writetext KimonoGirlZukiAfterBattleText

-	waitbutton

-	closetext

-	end

-TrainerKimonoGirlKuni:

-	trainer KIMONO_GIRL, KUNI, EVENT_BEAT_KIMONO_GIRL_KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script

-.Script:

-	endifjustbattled

-	opentext

-	writetext KimonoGirlKuniAfterBattleText

-	waitbutton

-	closetext

-	end

-TrainerKimonoGirlMiki:

-	trainer KIMONO_GIRL, MIKI, EVENT_BEAT_KIMONO_GIRL_MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script

-.Script:

-	endifjustbattled

-	opentext

-	writetext KimonoGirlMikiAfterBattleText

-	waitbutton

-	closetext

-	end

-DanceTheaterSurfGuy:

-	faceplayer

-	opentext

-	writetext SurfGuyNeverLeftAScratchText

-	promptbutton

-	checkevent EVENT_GOT_HM03_SURF

-	iftrue SurfGuyAlreadyGaveSurf

-	checkevent EVENT_BEAT_KIMONO_GIRL_NAOKO

-	iffalse .KimonoGirlsUndefeated

-	checkevent EVENT_BEAT_KIMONO_GIRL_SAYO

-	iffalse .KimonoGirlsUndefeated

-	checkevent EVENT_BEAT_KIMONO_GIRL_ZUKI

-	iffalse .KimonoGirlsUndefeated

-	checkevent EVENT_BEAT_KIMONO_GIRL_KUNI

-	iffalse .KimonoGirlsUndefeated

-	checkevent EVENT_BEAT_KIMONO_GIRL_MIKI

-	iffalse .KimonoGirlsUndefeated

-	sjump .GetSurf

-.KimonoGirlsUndefeated:

-	checkflag ENGINE_PLAYER_IS_FEMALE

-	iftrue .PlayerIsFemale

-	writetext SurfGuyLadGiftText

-	waitbutton

-	closetext

-	end

-.PlayerIsFemale:

-	writetext SurfGuyLassieGiftText

-	waitbutton

-	closetext

-	end

-.GetSurf:

-	writetext SurfGuyLikeADanceText

-	promptbutton

-	verbosegiveitem HM_SURF

-	setevent EVENT_GOT_HM03_SURF

-	writetext SurfGuySurfExplanationText

-	waitbutton

-	closetext

-	end

-SurfGuyAlreadyGaveSurf:

-	writetext SurfGuyElegantKimonoGirlsText

-	waitbutton

-	closetext

-	end

-DanceTheaterRhydon:

-	opentext

-	writetext RhydonText

-	cry RHYDON

-	waitbutton

-	closetext

-	end

-DanceTheatreCooltrainerMScript:

-	jumptextfaceplayer DanceTheatreCooltrainerMText

-DanceTheatreGrannyScript:

-	jumptextfaceplayer DanceTheatreGrannyText

-DanceTheatreFancyPanel:

-	jumptext DanceTheatreFancyPanelText

-KimonoGirlNaokoSeenText:

-	text "You have lovely"

-	line "#MON. May I see"

-	cont "them in battle?"

-	done

-KimonoGirlNaokoBeatenText:

-	text "Oh, you are very"

-	line "strong."

-	done

-KimonoGirlNaokoAfterBattleText:

-	text "I enjoyed that"

-	line "bout. I would like"

-	cont "to see you again."

-	done

-KimonoGirlSayoSeenText:

-	text "I always dance"

-	line "with my #MON."

-	para "Of course, I also"

-	line "train them."

-	done

-KimonoGirlSayoBeatenText:

-	text "Oh, so close!"

-	line "I almost had you."

-	done

-KimonoGirlSayoAfterBattleText:

-	text "Rhythm is impor-"

-	line "tant for both"

-	para "dancing and #-"

-	line "MON."

-	done

-KimonoGirlZukiSeenText:

-	text "Isn't my barrette"

-	line "pretty?"

-	para "Oh. A #MON"

-	line "battle?"

-	done

-KimonoGirlZukiBeatenText:

-	text "I don't have any"

-	line "#MON left…"

-	done

-KimonoGirlZukiAfterBattleText:

-	text "I put a different"

-	line "flower in my bar-"

-	cont "rette every month."

-	done

-KimonoGirlKuniSeenText:

-	text "Oh, you're a cute"

-	line "trainer. Would you"

-	cont "like to battle?"

-	done

-KimonoGirlKuniBeatenText:

-	text "You're stronger"

-	line "than you look."

-	done

-KimonoGirlKuniAfterBattleText:

-	text "I trained a lot,"

-	line "so I thought I was"

-	para "a capable trainer."

-	line "I guess I'm not."

-	done

-KimonoGirlMikiSeenText:

-	text "Do you like my"

-	line "dancing? I'm good"

-	cont "at #MON too."

-	done

-KimonoGirlMikiBeatenText:

-	text "Ooh, you're good"

-	line "at #MON too."

-	done

-KimonoGirlMikiAfterBattleText:

-	text "I can keep dancing"

-	line "because there are"

-	para "people who enjoy"

-	line "what I do."

-	para "My #MON keep my"

-	line "spirits up too."

-	done

-SurfGuyNeverLeftAScratchText:

-	text "Not only are the"

-	line "KIMONO GIRLS great"

-	para "dancers, they're"

-	line "also skilled at"

-	cont "#MON."

-	para "I always challenge"

-	line "them, but I've"

-	para "never even left a"

-	line "scratch…"

-	done

-SurfGuyLadGiftText:

-	text "Lad! If you can"

-	line "defeat all the"

-	para "KIMONO GIRLS, I'll"

-	line "give you a gift."

-	done

-SurfGuyLassieGiftText:

-	text "Lassie, if you can"

-	line "defeat all the"

-	para "KIMONO GIRLS, I'll"

-	line "give you a gift."

-	done

-SurfGuyLikeADanceText:

-	text "The way you bat-"

-	line "tled, it was like"

-	cont "watching a dance."

-	para "It was a rare"

-	line "treat to see!"

-	para "I want you to have"

-	line "this. Don't worry"

-	cont "--take it!"

-	done

-SurfGuySurfExplanationText:

-	text "That's SURF."

-	para "It's a move that"

-	line "lets #MON swim"

-	cont "across water."

-	done

-SurfGuyElegantKimonoGirlsText:

-	text "I wish my #MON"

-	line "were as elegant as"

-	cont "the KIMONO GIRLS…"

-	done

-RhydonText:

-	text "RHYDON: Gugooh"

-	line "gugogooh!"

-	done

-DanceTheatreCooltrainerMText:

-	text "That man's always"

-	line "with his RHYDON."

-	para "Says he wants a"

-	line "#MON that can"

-	cont "SURF and dance."

-	para "Is he trying to"

-	line "make a synchro-"

-	cont "nized swimming"

-	cont "#MON?"

-	done

-DanceTheatreGrannyText:

-	text "The KIMONO GIRLS"

-	line "are so beautiful…"

-	para "But they have to"

-	line "go through rigor-"

-	cont "ous training."

-	para "And they have to"

-	line "learn to follow"

-	para "customs before ap-"

-	line "pearing in public."

-	para "But if you love"

-	line "something, any-"

-	cont "thing is possible."

-	done

-DanceTheatreFancyPanelText:

-	text "It's a fancy panel"

-	line "that's decorated"

-	cont "with flowers."

-	done

-DanceTheatre_MapEvents:

-	db 0, 0 ; filler

-	def_warp_events

-	warp_event  5, 13, ECRUTEAK_CITY, 8

-	warp_event  6, 13, ECRUTEAK_CITY, 8

-	def_coord_events

-	def_bg_events

-	bg_event  5,  6, BGEVENT_UP, DanceTheatreFancyPanel

-	bg_event  6,  6, BGEVENT_UP, DanceTheatreFancyPanel

-	def_object_events

-	object_event  0,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko, -1

-	object_event  2,  1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1

-	object_event  6,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1

-	object_event  9,  1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1

-	object_event 11,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1

-	object_event  7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1

-	object_event  6,  8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1

-	object_event 10, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1

-	object_event  3,  6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1

--- a/maps/DanceTheatre.blk

+++ /dev/null

@@ -1,1 +1,0 @@

-------,,,,,,.0000/*+*

\ No newline at end of file

--- a/maps/EcruteakCity.asm

+++ b/maps/EcruteakCity.asm

@@ -267,7 +267,7 @@

 	warp_event 20,  3, WISE_TRIOS_ROOM, 2

 	warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1

 	warp_event  5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1

-	warp_event 23, 21, DANCE_THEATRE, 1

+	warp_event 23, 21, DANCE_THEATER, 1

 	warp_event 29, 21, ECRUTEAK_MART, 2

 	warp_event  6, 27, ECRUTEAK_GYM, 1

 	warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1