ref: 7f187be36c7977dce03c9ee96e863c7797b740cb
parent: f44b7ad5c30f80d1032a9cab2e3272ef0a7efe86
author: Rangi <[email protected]>
date: Mon Jan 22 13:29:21 EST 2018
Don't say "House" twice
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -270,13 +270,13 @@
mapconst ROUTE_6, 9, 10 ; 1
mapconst ROUTE_11, 9, 20 ; 2
mapconst VERMILION_CITY, 18, 20 ; 3
- mapconst VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4 ; 4
+ mapconst VERMILION_FISHING_SPEECH_HOUSE, 4, 4 ; 4
mapconst VERMILION_POKECENTER_1F, 4, 5 ; 5
mapconst VERMILION_POKECENTER_2F_BETA, 4, 8 ; 6
mapconst POKEMON_FAN_CLUB, 4, 5 ; 7
mapconst VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4 ; 8
mapconst VERMILION_MART, 4, 6 ; 9
- mapconst VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10
+ mapconst VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10
mapconst VERMILION_GYM, 9, 5 ; 11
mapconst ROUTE_6_SAFFRON_GATE, 4, 5 ; 12
mapconst ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -168,9 +168,9 @@
GoldenrodBillsHouse_Blocks:
GoldenrodPPSpeechHouse_Blocks:
GoldenrodNameRater_Blocks:
-VermilionHouseFishingSpeechHouse_Blocks:
+VermilionFishingSpeechHouse_Blocks:
VermilionMagnetTrainSpeechHouse_Blocks:
-VermilionHouseDiglettsCaveSpeechHouse_Blocks:
+VermilionDiglettsCaveSpeechHouse_Blocks:
BluesHouse_Blocks:
PewterNidoranSpeechHouse_Blocks:
PewterSnoozeSpeechHouse_Blocks:
--- a/data/maps/data.asm
+++ b/data/maps/data.asm
@@ -543,13 +543,13 @@
map_data IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0
map_data Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0
map_data DayCare, DAY_CARE, $00, 0
- map_data VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $00, 0
+ map_data VermilionFishingSpeechHouse, VERMILION_FISHING_SPEECH_HOUSE, $00, 0
map_data VermilionPokecenter1F, VERMILION_POKECENTER_1F, $00, 0
map_data VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $00, 0
map_data PokemonFanClub, POKEMON_FAN_CLUB, $00, 0
map_data VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $00, 0
map_data VermilionMart, VERMILION_MART, $00, 0
- map_data VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0
+ map_data VermilionDiglettsCaveSpeechHouse, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0
map_data VermilionGym, VERMILION_GYM, $00, 0
map_data Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $00, 0
map_data Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $00, 0
--- a/data/maps/definitions.asm
+++ b/data/maps/definitions.asm
@@ -280,13 +280,13 @@
map_def Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
map_def Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map_def VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
- map_def VermilionHouseFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+ map_def VermilionFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def PokemonFanClub, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def VermilionMagnetTrainSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
- map_def VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+ map_def VermilionDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -329,13 +329,13 @@
INCLUDE "maps/MahoganyTown.asm"
INCLUDE "maps/Route32.asm"
-INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm"
+INCLUDE "maps/VermilionFishingSpeechHouse.asm"
INCLUDE "maps/VermilionPokecenter1F.asm"
INCLUDE "maps/VermilionPokecenter2FBeta.asm"
INCLUDE "maps/PokemonFanClub.asm"
INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm"
INCLUDE "maps/VermilionMart.asm"
-INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm"
+INCLUDE "maps/VermilionDiglettsCaveSpeechHouse.asm"
INCLUDE "maps/VermilionGym.asm"
INCLUDE "maps/Route6SaffronGate.asm"
INCLUDE "maps/Route6UndergroundPathEntrance.asm"
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -273,12 +273,12 @@
.Warps:
db 10
- warp_def 5, 5, 1, VERMILION_HOUSE_FISHING_SPEECH_HOUSE
+ warp_def 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE
warp_def 9, 5, 1, VERMILION_POKECENTER_1F
warp_def 7, 13, 1, POKEMON_FAN_CLUB
warp_def 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE
warp_def 21, 13, 2, VERMILION_MART
- warp_def 21, 17, 1, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE
+ warp_def 21, 17, 1, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE
warp_def 10, 19, 1, VERMILION_GYM
warp_def 19, 31, 1, VERMILION_PORT_PASSAGE
warp_def 20, 31, 2, VERMILION_PORT_PASSAGE
--- /dev/null
+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm
@@ -1,0 +1,40 @@
+const_value set 2
+ const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
+
+VermilionDiglettsCaveSpeechHouse_MapScripts:
+.SceneScripts:
+ db 0
+
+.MapCallbacks:
+ db 0
+
+VermilionDiglettsCaveSpeechHouseGentlemanScript:
+ jumptextfaceplayer VermilionDiglettsCaveSpeechHouseGentlemanText
+
+VermilionDiglettsCaveSpeechHouseGentlemanText:
+ text "Over many years,"
+ line "DIGLETT dug a"
+ cont "large tunnel."
+
+ para "That tunnel goes"
+ line "to a distant town."
+ done
+
+VermilionDiglettsCaveSpeechHouse_MapEvents:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 2
+ warp_def 2, 7, 6, VERMILION_CITY
+ warp_def 3, 7, 6, VERMILION_CITY
+
+.CoordEvents:
+ db 0
+
+.BGEvents:
+ db 0
+
+.ObjectEvents:
+ db 1
+ object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1
--- /dev/null
+++ b/maps/VermilionFishingSpeechHouse.asm
@@ -1,0 +1,71 @@
+const_value set 2
+ const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU
+
+VermilionFishingSpeechHouse_MapScripts:
+.SceneScripts:
+ db 0
+
+.MapCallbacks:
+ db 0
+
+FishingDude:
+ jumptextfaceplayer FishingDudeText
+
+FishingDudesHousePhoto:
+ jumptext FishingDudesHousePhotoText
+
+FishingDudesHouseBookshelf:
+; unused
+ jumpstd picturebookshelf
+
+FishingDudeText:
+ text "I am the FISHING"
+ line "DUDE, the elder of"
+ cont "the FISHING BROS."
+
+ para "Have you met the"
+ line "FISHING GURU at"
+ cont "LAKE OF RAGE?"
+
+ para "He dreams about"
+ line "seeing the world's"
+ cont "greatest MAGIKARP."
+
+ para "If you don't mind,"
+ line "could you show him"
+
+ para "any MAGIKARP you"
+ line "catch?"
+
+ para "Who knows, you may"
+ line "catch the MAGIKARP"
+ cont "of his dreams."
+ done
+
+FishingDudesHousePhotoText:
+ text "It's a photo of"
+ line "people fishing…"
+
+ para "They're having a"
+ line "great time…"
+ done
+
+VermilionFishingSpeechHouse_MapEvents:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 2
+ warp_def 2, 7, 1, VERMILION_CITY
+ warp_def 3, 7, 1, VERMILION_CITY
+
+.CoordEvents:
+ db 0
+
+.BGEvents:
+ db 1
+ bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto
+
+.ObjectEvents:
+ db 1
+ object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1
--- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
+++ /dev/null
@@ -1,40 +1,0 @@
-const_value set 2
- const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
-
-VermilionHouseDiglettsCaveSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
-
-.MapCallbacks:
- db 0
-
-VermilionHouseDiglettsCaveSpeechHouseGentlemanScript:
- jumptextfaceplayer VermilionHouseDiglettsCaveSpeechHouseGentlemanText
-
-VermilionHouseDiglettsCaveSpeechHouseGentlemanText:
- text "Over many years,"
- line "DIGLETT dug a"
- cont "large tunnel."
-
- para "That tunnel goes"
- line "to a distant town."
- done
-
-VermilionHouseDiglettsCaveSpeechHouse_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 2
- warp_def 2, 7, 6, VERMILION_CITY
- warp_def 3, 7, 6, VERMILION_CITY
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 0
-
-.ObjectEvents:
- db 1
- object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1
--- a/maps/VermilionHouseFishingSpeechHouse.asm
+++ /dev/null
@@ -1,71 +1,0 @@
-const_value set 2
- const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU
-
-VermilionHouseFishingSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
-
-.MapCallbacks:
- db 0
-
-FishingDude:
- jumptextfaceplayer FishingDudeText
-
-FishingDudesHousePhoto:
- jumptext FishingDudesHousePhotoText
-
-FishingDudesHouseBookshelf:
-; unused
- jumpstd picturebookshelf
-
-FishingDudeText:
- text "I am the FISHING"
- line "DUDE, the elder of"
- cont "the FISHING BROS."
-
- para "Have you met the"
- line "FISHING GURU at"
- cont "LAKE OF RAGE?"
-
- para "He dreams about"
- line "seeing the world's"
- cont "greatest MAGIKARP."
-
- para "If you don't mind,"
- line "could you show him"
-
- para "any MAGIKARP you"
- line "catch?"
-
- para "Who knows, you may"
- line "catch the MAGIKARP"
- cont "of his dreams."
- done
-
-FishingDudesHousePhotoText:
- text "It's a photo of"
- line "people fishing…"
-
- para "They're having a"
- line "great time…"
- done
-
-VermilionHouseFishingSpeechHouse_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 2
- warp_def 2, 7, 1, VERMILION_CITY
- warp_def 3, 7, 1, VERMILION_CITY
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 1
- bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto
-
-.ObjectEvents:
- db 1
- object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1