ref: 517eab65267bfd64e29ed173c668b00c7e67d843
parent: c5cc23a35fa2c544e3fa8f5101878ba2127ca83e
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Tue Jan 23 07:54:17 EST 2018
"Speech" houses just have dialog NPCs
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -365,7 +365,7 @@
mapconst ROUTE_28, 9, 20 ; 1
mapconst SILVER_CAVE_OUTSIDE, 18, 20 ; 2
mapconst SILVER_CAVE_POKECENTER_1F, 4, 5 ; 3
- mapconst ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4 ; 4
+ mapconst ROUTE_28_STEEL_WING_HOUSE, 4, 4 ; 4
newgroup ; 20
@@ -436,7 +436,7 @@
mapconst VIRIDIAN_MART, 4, 6 ; 8
mapconst VIRIDIAN_POKECENTER_1F, 4, 5 ; 9
mapconst VIRIDIAN_POKECENTER_2F_BETA, 4, 8 ; 10
- mapconst ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4 ; 11
+ mapconst ROUTE_2_NUGGET_HOUSE, 4, 4 ; 11
mapconst ROUTE_2_GATE, 4, 5 ; 12
mapconst VICTORY_ROAD_GATE, 9, 10 ; 13
@@ -451,7 +451,7 @@
mapconst PLAYERS_HOUSE_2F, 3, 4 ; 7
mapconst PLAYERS_NEIGHBORS_HOUSE, 4, 4 ; 8
mapconst ELMS_HOUSE, 4, 4 ; 9
- mapconst ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10
+ mapconst ROUTE_26_HEAL_HOUSE, 4, 4 ; 10
mapconst DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11
mapconst ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12
mapconst ROUTE_29_ROUTE_46_GATE, 4, 5 ; 13
@@ -472,7 +472,7 @@
mapconst COPYCATS_HOUSE_2F, 3, 5 ; 12
mapconst ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13
mapconst ROUTE_5_SAFFRON_GATE, 4, 5 ; 14
- mapconst ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15
+ mapconst ROUTE_5_CLEANSE_TAG_HOUSE, 4, 4 ; 15
newgroup ; 26
@@ -484,6 +484,6 @@
mapconst CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 ; 6
mapconst GUIDE_GENTS_HOUSE, 4, 4 ; 7
mapconst CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 ; 8
- mapconst ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4 ; 9
+ mapconst ROUTE_30_BERRY_HOUSE, 4, 4 ; 9
mapconst MR_POKEMONS_HOUSE, 4, 4 ; 10
mapconst ROUTE_31_VIOLET_GATE, 4, 5 ; 11
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -178,7 +178,7 @@
LavenderSpeechHouse_Blocks:
LavenderNameRater_Blocks:
Route12SuperRodHouse_Blocks:
-Route28FamousSpeechHouse_Blocks:
+Route28SteelWingHouse_Blocks:
CeladonMansionRoofHouse_Blocks:
Route16FuchsiaSpeechHouse_Blocks:
ManiasHouse_Blocks:
@@ -187,17 +187,17 @@
CianwoodLugiaSpeechHouse_Blocks:
PokeSeersHouse_Blocks:
ViridianNicknameSpeechHouse_Blocks:
-Route2NuggetSpeechHouse_Blocks:
+Route2NuggetHouse_Blocks:
PlayersNeighborsHouse_Blocks:
-Route26HealSpeechHouse_Blocks:
+Route26HealHouse_Blocks:
DayOfWeekSiblingsHouse_Blocks:
Route27SandstormHouse_Blocks:
MrPsychicsHouse_Blocks:
-Route5CleanseTagSpeechHouse_Blocks:
+Route5CleanseTagHouse_Blocks:
CherrygroveGymSpeechHouse_Blocks:
GuideGentsHouse_Blocks:
CherrygroveEvolutionSpeechHouse_Blocks:
-Route30BerrySpeechHouse_Blocks:
+Route30BerryHouse_Blocks:
INCBIN "maps/House1.blk"
SafariZoneFuchsiaGateBeta_Blocks:
--- a/data/maps/data.asm
+++ b/data/maps/data.asm
@@ -601,7 +601,7 @@
map_data Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0
map_data Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $00, 0
map_data SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $00, 0
- map_data Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $00, 0
+ map_data Route28SteelWingHouse, ROUTE_28_STEEL_WING_HOUSE, $00, 0
map_data Pokecenter2F, POKECENTER_2F, $00, 0
map_data TradeCenter, TRADE_CENTER, $00, 0
map_data Colosseum, COLOSSEUM, $00, 0
@@ -650,7 +650,7 @@
map_data ViridianMart, VIRIDIAN_MART, $00, 0
map_data ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $00, 0
map_data ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $00, 0
- map_data Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $00, 0
+ map_data Route2NuggetHouse, ROUTE_2_NUGGET_HOUSE, $00, 0
map_data Route2Gate, ROUTE_2_GATE, $00, 0
map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0
map_data ElmsLab, ELMS_LAB, $00, 0
@@ -658,7 +658,7 @@
map_data PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0
map_data PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0
map_data ElmsHouse, ELMS_HOUSE, $00, 0
- map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0
+ map_data Route26HealHouse, ROUTE_26_HEAL_HOUSE, $00, 0
map_data DayOfWeekSiblingsHouse, DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0
map_data Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0
map_data Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0
@@ -674,12 +674,12 @@
map_data CopycatsHouse2F, COPYCATS_HOUSE_2F, $00, 0
map_data Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $00, 0
map_data Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $00, 0
- map_data Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $00, 0
+ map_data Route5CleanseTagHouse, ROUTE_5_CLEANSE_TAG_HOUSE, $00, 0
map_data CherrygroveMart, CHERRYGROVE_MART, $00, 0
map_data CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $00, 0
map_data CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $00, 0
map_data GuideGentsHouse, GUIDE_GENTS_HOUSE, $00, 0
map_data CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $00, 0
- map_data Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $00, 0
+ map_data Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0
map_data MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
map_data Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
--- a/data/maps/definitions.asm
+++ b/data/maps/definitions.asm
@@ -368,7 +368,7 @@
map_def Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
map_def SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
map_def SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
- map_def Route28FamousSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+ map_def Route28SteelWingHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
MapGroup_CableClub:
map_def Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
@@ -435,7 +435,7 @@
map_def ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
- map_def Route2NuggetSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+ map_def Route2NuggetHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@@ -449,7 +449,7 @@
map_def PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
- map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+ map_def Route26HealHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def DayOfWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@@ -469,7 +469,7 @@
map_def CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
- map_def Route5CleanseTagSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+ map_def Route5CleanseTagHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
MapGroup_Cherrygrove:
map_def Route30, TILESET_JOHTO, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
@@ -480,6 +480,6 @@
map_def CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def GuideGentsHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def CherrygroveEvolutionSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
- map_def Route30BerrySpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+ map_def Route30BerryHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def MrPokemonsHouse, TILESET_FACILITY, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -155,7 +155,7 @@
INCLUDE "maps/PlayersHouse2F.asm"
INCLUDE "maps/PlayersNeighborsHouse.asm"
INCLUDE "maps/ElmsHouse.asm"
-INCLUDE "maps/Route26HealSpeechHouse.asm"
+INCLUDE "maps/Route26HealHouse.asm"
INCLUDE "maps/DayOfWeekSiblingsHouse.asm"
INCLUDE "maps/Route27SandstormHouse.asm"
INCLUDE "maps/Route29Route46Gate.asm"
@@ -206,7 +206,7 @@
INCLUDE "maps/ViridianMart.asm"
INCLUDE "maps/ViridianPokecenter1F.asm"
INCLUDE "maps/ViridianPokecenter2FBeta.asm"
-INCLUDE "maps/Route2NuggetSpeechHouse.asm"
+INCLUDE "maps/Route2NuggetHouse.asm"
INCLUDE "maps/Route2Gate.asm"
INCLUDE "maps/VictoryRoadGate.asm"
@@ -294,7 +294,7 @@
INCLUDE "maps/CopycatsHouse2F.asm"
INCLUDE "maps/Route5UndergroundPathEntrance.asm"
INCLUDE "maps/Route5SaffronGate.asm"
-INCLUDE "maps/Route5CleanseTagSpeechHouse.asm"
+INCLUDE "maps/Route5CleanseTagHouse.asm"
SECTION "Map Scripts 16", ROMX
@@ -371,7 +371,7 @@
INCLUDE "maps/CherrygroveGymSpeechHouse.asm"
INCLUDE "maps/GuideGentsHouse.asm"
INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm"
-INCLUDE "maps/Route30BerrySpeechHouse.asm"
+INCLUDE "maps/Route30BerryHouse.asm"
INCLUDE "maps/MrPokemonsHouse.asm"
INCLUDE "maps/Route31VioletGate.asm"
@@ -477,7 +477,7 @@
INCLUDE "maps/Route10South.asm"
INCLUDE "maps/Route23.asm"
INCLUDE "maps/SilverCavePokecenter1F.asm"
-INCLUDE "maps/Route28FamousSpeechHouse.asm"
+INCLUDE "maps/Route28SteelWingHouse.asm"
SECTION "Map Scripts 25", ROMX
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -152,7 +152,7 @@
.Warps:
db 5
- warp_def 15, 15, 1, ROUTE_2_NUGGET_SPEECH_HOUSE
+ warp_def 15, 15, 1, ROUTE_2_NUGGET_HOUSE
warp_def 15, 31, 3, ROUTE_2_GATE
warp_def 16, 27, 1, ROUTE_2_GATE
warp_def 17, 27, 2, ROUTE_2_GATE
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -419,7 +419,7 @@
.Warps:
db 3
warp_def 7, 5, 3, VICTORY_ROAD_GATE
- warp_def 15, 57, 1, ROUTE_26_HEAL_SPEECH_HOUSE
+ warp_def 15, 57, 1, ROUTE_26_HEAL_HOUSE
warp_def 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE
.CoordEvents:
--- /dev/null
+++ b/maps/Route26HealHouse.asm
@@ -1,0 +1,70 @@
+const_value set 2
+ const ROUTE26HEALHOUSE_TEACHER
+
+Route26HealHouse_MapScripts:
+.SceneScripts:
+ db 0
+
+.MapCallbacks:
+ db 0
+
+TeacherScript_0x7b125:
+ faceplayer
+ opentext
+ writetext UnknownText_0x7b14d
+ waitbutton
+ closetext
+ special Special_FadeBlackQuickly
+ special ReloadSpritesNoPalettes
+ special Special_StubbedTrainerRankings_Healings
+ playmusic MUSIC_HEAL
+ special HealParty
+ pause 60
+ special Special_FadeInQuickly
+ special RestartMapMusic
+ opentext
+ writetext UnknownText_0x7b18b
+ waitbutton
+ closetext
+ end
+
+Route26HealHouseBookshelf:
+ jumpstd picturebookshelf
+
+UnknownText_0x7b14d:
+ text "Your #MON look"
+ line "a little tired."
+
+ para "You should rest"
+ line "them a while."
+ done
+
+UnknownText_0x7b18b:
+ text "There!"
+
+ para "Your #MON are"
+ line "looking good!"
+
+ para "Keep at it!"
+ done
+
+Route26HealHouse_MapEvents:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 2
+ warp_def 2, 7, 2, ROUTE_26
+ warp_def 3, 7, 2, ROUTE_26
+
+.CoordEvents:
+ db 0
+
+.BGEvents:
+ db 2
+ bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf
+ bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf
+
+.ObjectEvents:
+ db 1
+ object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1
--- a/maps/Route26HealSpeechHouse.asm
+++ /dev/null
@@ -1,70 +1,0 @@
-const_value set 2
- const ROUTE26HEALSPEECHHOUSE_TEACHER
-
-Route26HealSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
-
-.MapCallbacks:
- db 0
-
-TeacherScript_0x7b125:
- faceplayer
- opentext
- writetext UnknownText_0x7b14d
- waitbutton
- closetext
- special Special_FadeBlackQuickly
- special ReloadSpritesNoPalettes
- special Special_StubbedTrainerRankings_Healings
- playmusic MUSIC_HEAL
- special HealParty
- pause 60
- special Special_FadeInQuickly
- special RestartMapMusic
- opentext
- writetext UnknownText_0x7b18b
- waitbutton
- closetext
- end
-
-Route26HealHouseBookshelf:
- jumpstd picturebookshelf
-
-UnknownText_0x7b14d:
- text "Your #MON look"
- line "a little tired."
-
- para "You should rest"
- line "them a while."
- done
-
-UnknownText_0x7b18b:
- text "There!"
-
- para "Your #MON are"
- line "looking good!"
-
- para "Keep at it!"
- done
-
-Route26HealSpeechHouse_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 2
- warp_def 2, 7, 2, ROUTE_26
- warp_def 3, 7, 2, ROUTE_26
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 2
- bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf
- bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf
-
-.ObjectEvents:
- db 1
- object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1
--- a/maps/Route28FamousSpeechHouse.asm
+++ /dev/null
@@ -1,93 +1,0 @@
-const_value set 2
- const ROUTE28FAMOUSSPEECHHOUSE_CELEBRITY
- const ROUTE28FAMOUSSPEECHHOUSE_FEAROW
-
-Route28FamousSpeechHouse_MapScripts:
-.SceneScripts:
- db 1
- scene_script .DummyScene
-
-.MapCallbacks:
- db 0
-
-.DummyScene:
- end
-
-Celebrity:
- faceplayer
- opentext
- checkevent EVENT_GOT_TM47_STEEL_WING
- iftrue .AlreadyGotItem
- writetext CelebrityText1
- buttonsound
- verbosegiveitem TM_STEEL_WING
- iffalse .Done
- setevent EVENT_GOT_TM47_STEEL_WING
-.Done:
- closetext
- end
-.AlreadyGotItem:
- writetext CelebrityText2
- waitbutton
- closetext
- end
-
-CelebritysFearow:
- opentext
- writetext CelebritysFearowText
- cry FEAROW
- waitbutton
- closetext
- end
-
-CelebrityHouseBookshelf:
- jumpstd magazinebookshelf
-
-CelebrityText1:
- text "Oh, dear."
- line "You've found me."
-
- para "Please don't tell"
- line "anyone about me."
-
- para "I'll give you this"
- line "for keeping my"
- cont "secret. Please?"
- done
-
-CelebrityText2:
- text "It's tough being a"
- line "top celebrity."
-
- para "Everywhere I go,"
- line "people chase me."
-
- para "I just want to be"
- line "left alone…"
- done
-
-CelebritysFearowText:
- text "FEAROW: Feero!"
- done
-
-Route28FamousSpeechHouse_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 2
- warp_def 2, 7, 1, ROUTE_28
- warp_def 3, 7, 1, ROUTE_28
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 2
- bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf
- bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf
-
-.ObjectEvents:
- db 2
- object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1
- object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1
--- /dev/null
+++ b/maps/Route28SteelWingHouse.asm
@@ -1,0 +1,93 @@
+const_value set 2
+ const ROUTE28STEELWINGHOUSE_CELEBRITY
+ const ROUTE28STEELWINGHOUSE_FEAROW
+
+Route28SteelWingHouse_MapScripts:
+.SceneScripts:
+ db 1
+ scene_script .DummyScene
+
+.MapCallbacks:
+ db 0
+
+.DummyScene:
+ end
+
+Celebrity:
+ faceplayer
+ opentext
+ checkevent EVENT_GOT_TM47_STEEL_WING
+ iftrue .AlreadyGotItem
+ writetext CelebrityText1
+ buttonsound
+ verbosegiveitem TM_STEEL_WING
+ iffalse .Done
+ setevent EVENT_GOT_TM47_STEEL_WING
+.Done:
+ closetext
+ end
+.AlreadyGotItem:
+ writetext CelebrityText2
+ waitbutton
+ closetext
+ end
+
+CelebritysFearow:
+ opentext
+ writetext CelebritysFearowText
+ cry FEAROW
+ waitbutton
+ closetext
+ end
+
+CelebrityHouseBookshelf:
+ jumpstd magazinebookshelf
+
+CelebrityText1:
+ text "Oh, dear."
+ line "You've found me."
+
+ para "Please don't tell"
+ line "anyone about me."
+
+ para "I'll give you this"
+ line "for keeping my"
+ cont "secret. Please?"
+ done
+
+CelebrityText2:
+ text "It's tough being a"
+ line "top celebrity."
+
+ para "Everywhere I go,"
+ line "people chase me."
+
+ para "I just want to be"
+ line "left alone…"
+ done
+
+CelebritysFearowText:
+ text "FEAROW: Feero!"
+ done
+
+Route28SteelWingHouse_MapEvents:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 2
+ warp_def 2, 7, 1, ROUTE_28
+ warp_def 3, 7, 1, ROUTE_28
+
+.CoordEvents:
+ db 0
+
+.BGEvents:
+ db 2
+ bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf
+ bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf
+
+.ObjectEvents:
+ db 2
+ object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1
+ object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1
--- /dev/null
+++ b/maps/Route2NuggetHouse.asm
@@ -1,0 +1,72 @@
+const_value set 2
+ const ROUTE2NUGGETHOUSE_FISHER
+
+Route2NuggetHouse_MapScripts:
+.SceneScripts:
+ db 0
+
+.MapCallbacks:
+ db 0
+
+FisherScript_0x9b847:
+ faceplayer
+ opentext
+ checkevent EVENT_GOT_NUGGET_FROM_GUY
+ iftrue .GotItem
+ writetext UnknownText_0x9b865
+ buttonsound
+ verbosegiveitem NUGGET
+ iffalse .Done
+ setevent EVENT_GOT_NUGGET_FROM_GUY
+.GotItem:
+ writetext UnknownText_0x9b8e5
+ waitbutton
+.Done:
+ closetext
+ end
+
+Route2NuggetHouseBookshelf:
+; unused
+ jumpstd difficultbookshelf
+
+UnknownText_0x9b865:
+ text "Hi! Wow, I'm glad"
+ line "to see you."
+
+ para "You're the first"
+ line "visitor I've had"
+ cont "in a long time."
+
+ para "I'm super-happy!"
+ line "Let me give you a"
+ cont "little present."
+ done
+
+UnknownText_0x9b8e5:
+ text "That's a NUGGET."
+
+ para "I can't give you"
+ line "any nuggets of"
+
+ para "wisdom, so that'll"
+ line "have to do!"
+ done
+
+Route2NuggetHouse_MapEvents:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 2
+ warp_def 2, 7, 1, ROUTE_2
+ warp_def 3, 7, 1, ROUTE_2
+
+.CoordEvents:
+ db 0
+
+.BGEvents:
+ db 0
+
+.ObjectEvents:
+ db 1
+ object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1
--- a/maps/Route2NuggetSpeechHouse.asm
+++ /dev/null
@@ -1,72 +1,0 @@
-const_value set 2
- const ROUTE2NUGGETSPEECHHOUSE_FISHER
-
-Route2NuggetSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
-
-.MapCallbacks:
- db 0
-
-FisherScript_0x9b847:
- faceplayer
- opentext
- checkevent EVENT_GOT_NUGGET_FROM_GUY
- iftrue .GotItem
- writetext UnknownText_0x9b865
- buttonsound
- verbosegiveitem NUGGET
- iffalse .Done
- setevent EVENT_GOT_NUGGET_FROM_GUY
-.GotItem:
- writetext UnknownText_0x9b8e5
- waitbutton
-.Done:
- closetext
- end
-
-Route2NuggetSpeechHouseBookshelf:
-; unused
- jumpstd difficultbookshelf
-
-UnknownText_0x9b865:
- text "Hi! Wow, I'm glad"
- line "to see you."
-
- para "You're the first"
- line "visitor I've had"
- cont "in a long time."
-
- para "I'm super-happy!"
- line "Let me give you a"
- cont "little present."
- done
-
-UnknownText_0x9b8e5:
- text "That's a NUGGET."
-
- para "I can't give you"
- line "any nuggets of"
-
- para "wisdom, so that'll"
- line "have to do!"
- done
-
-Route2NuggetSpeechHouse_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 2
- warp_def 2, 7, 1, ROUTE_2
- warp_def 3, 7, 1, ROUTE_2
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 0
-
-.ObjectEvents:
- db 1
- object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -412,7 +412,7 @@
.Warps:
db 2
- warp_def 7, 39, 1, ROUTE_30_BERRY_SPEECH_HOUSE
+ warp_def 7, 39, 1, ROUTE_30_BERRY_HOUSE
warp_def 17, 5, 1, MR_POKEMONS_HOUSE
.CoordEvents:
--- /dev/null
+++ b/maps/Route30BerryHouse.asm
@@ -1,0 +1,68 @@
+const_value set 2
+ const ROUTE30BERRYHOUSE_POKEFAN_M
+
+Route30BerryHouse_MapScripts:
+.SceneScripts:
+ db 0
+
+.MapCallbacks:
+ db 0
+
+PokefanMScript_0x196d64:
+ faceplayer
+ opentext
+ checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
+ iftrue UnknownScript_0x196d79
+ writetext UnknownText_0x196d82
+ buttonsound
+ verbosegiveitem BERRY
+ iffalse UnknownScript_0x196d7d
+ setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
+UnknownScript_0x196d79:
+ writetext UnknownText_0x196dec
+ waitbutton
+UnknownScript_0x196d7d:
+ closetext
+ end
+
+Route30BerryHouseBookshelf:
+ jumpstd magazinebookshelf
+
+UnknownText_0x196d82:
+ text "You know, #MON"
+ line "eat BERRIES."
+
+ para "Well, my #MON"
+ line "got healthier by"
+ cont "eating a BERRY."
+
+ para "Here. I'll share"
+ line "one with you!"
+ done
+
+UnknownText_0x196dec:
+ text "Check trees for"
+ line "BERRIES. They just"
+ cont "drop right off."
+ done
+
+Route30BerryHouse_MapEvents:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 2
+ warp_def 2, 7, 1, ROUTE_30
+ warp_def 3, 7, 1, ROUTE_30
+
+.CoordEvents:
+ db 0
+
+.BGEvents:
+ db 2
+ bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf
+ bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf
+
+.ObjectEvents:
+ db 1
+ object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1
--- a/maps/Route30BerrySpeechHouse.asm
+++ /dev/null
@@ -1,68 +1,0 @@
-const_value set 2
- const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M
-
-Route30BerrySpeechHouse_MapScripts:
-.SceneScripts:
- db 0
-
-.MapCallbacks:
- db 0
-
-PokefanMScript_0x196d64:
- faceplayer
- opentext
- checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
- iftrue UnknownScript_0x196d79
- writetext UnknownText_0x196d82
- buttonsound
- verbosegiveitem BERRY
- iffalse UnknownScript_0x196d7d
- setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
-UnknownScript_0x196d79:
- writetext UnknownText_0x196dec
- waitbutton
-UnknownScript_0x196d7d:
- closetext
- end
-
-Route30BerrySpeechHouseBookshelf:
- jumpstd magazinebookshelf
-
-UnknownText_0x196d82:
- text "You know, #MON"
- line "eat BERRIES."
-
- para "Well, my #MON"
- line "got healthier by"
- cont "eating a BERRY."
-
- para "Here. I'll share"
- line "one with you!"
- done
-
-UnknownText_0x196dec:
- text "Check trees for"
- line "BERRIES. They just"
- cont "drop right off."
- done
-
-Route30BerrySpeechHouse_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 2
- warp_def 2, 7, 1, ROUTE_30
- warp_def 3, 7, 1, ROUTE_30
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 2
- bg_event 0, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf
- bg_event 1, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf
-
-.ObjectEvents:
- db 1
- object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -48,7 +48,7 @@
warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE
warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE
- warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE
+ warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE
.CoordEvents:
db 0
--- /dev/null
+++ b/maps/Route5CleanseTagHouse.asm
@@ -1,0 +1,83 @@
+const_value set 2
+ const ROUTE5CLEANSETAGHOUSE_GRANNY
+ const ROUTE5CLEANSETAGHOUSE_TEACHER
+
+Route5CleanseTagHouse_MapScripts:
+.SceneScripts:
+ db 0
+
+.MapCallbacks:
+ db 0
+
+GrannyScript_0x18b634:
+ faceplayer
+ opentext
+ checkevent EVENT_GOT_CLEANSE_TAG
+ iftrue UnknownScript_0x18b649
+ writetext UnknownText_0x18b655
+ buttonsound
+ verbosegiveitem CLEANSE_TAG
+ iffalse UnknownScript_0x18b64d
+ setevent EVENT_GOT_CLEANSE_TAG
+UnknownScript_0x18b649:
+ writetext UnknownText_0x18b6a7
+ waitbutton
+UnknownScript_0x18b64d:
+ closetext
+ end
+
+Route5CleanseTagHouseTeacherScript:
+ jumptextfaceplayer Route5CleanseTagHouseTeacherText
+
+HouseForSaleBookshelf:
+ jumpstd difficultbookshelf
+
+UnknownText_0x18b655:
+ text "Eeyaaaah!"
+
+ para "I sense a sinister"
+ line "shadow hovering"
+ cont "over you."
+
+ para "Take this to ward"
+ line "it off!"
+ done
+
+UnknownText_0x18b6a7:
+ text "You were in mortal"
+ line "danger, but you"
+ cont "are protected now."
+ done
+
+Route5CleanseTagHouseTeacherText:
+ text "My grandma is into"
+ line "warding off what"
+
+ para "she believes to be"
+ line "evil spirits."
+
+ para "I'm sorry that she"
+ line "startled you."
+ done
+
+Route5CleanseTagHouse_MapEvents:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 2
+ warp_def 2, 7, 4, ROUTE_5
+ warp_def 3, 7, 4, ROUTE_5
+
+.CoordEvents:
+ db 0
+
+.BGEvents:
+ db 2
+ bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf
+ bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf
+
+.ObjectEvents:
+ db 2
+ object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1
+ object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1
--- a/maps/Route5CleanseTagSpeechHouse.asm
+++ /dev/null
@@ -1,83 +1,0 @@
-const_value set 2
- const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY
- const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER
-
-Route5CleanseTagSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
-
-.MapCallbacks:
- db 0
-
-GrannyScript_0x18b634:
- faceplayer
- opentext
- checkevent EVENT_GOT_CLEANSE_TAG
- iftrue UnknownScript_0x18b649
- writetext UnknownText_0x18b655
- buttonsound
- verbosegiveitem CLEANSE_TAG
- iffalse UnknownScript_0x18b64d
- setevent EVENT_GOT_CLEANSE_TAG
-UnknownScript_0x18b649:
- writetext UnknownText_0x18b6a7
- waitbutton
-UnknownScript_0x18b64d:
- closetext
- end
-
-Route5CleanseTagSpeechHouseTeacherScript:
- jumptextfaceplayer Route5CleanseTagSpeechHouseTeacherText
-
-HouseForSaleBookshelf:
- jumpstd difficultbookshelf
-
-UnknownText_0x18b655:
- text "Eeyaaaah!"
-
- para "I sense a sinister"
- line "shadow hovering"
- cont "over you."
-
- para "Take this to ward"
- line "it off!"
- done
-
-UnknownText_0x18b6a7:
- text "You were in mortal"
- line "danger, but you"
- cont "are protected now."
- done
-
-Route5CleanseTagSpeechHouseTeacherText:
- text "My grandma is into"
- line "warding off what"
-
- para "she believes to be"
- line "evil spirits."
-
- para "I'm sorry that she"
- line "startled you."
- done
-
-Route5CleanseTagSpeechHouse_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 2
- warp_def 2, 7, 4, ROUTE_5
- warp_def 3, 7, 4, ROUTE_5
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 2
- bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf
- bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf
-
-.ObjectEvents:
- db 2
- object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1
- object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1