pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Don't say "House" twice

Browse Source
This commit is contained in:
Rangi 2018-01-22 18:29:21 -05:00
parent f44b7ad5c3
commit 7f187be36c
9 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/map_constants.asm
View File

@ -270,13 +270,13 @@ ENDM
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

4
data/maps/blocks.asm
View File

@ -168,9 +168,9 @@ GoldenrodHappinessRater_Blocks:
GoldenrodBillsHouse_Blocks:
GoldenrodPPSpeechHouse_Blocks:
GoldenrodNameRater_Blocks:
VermilionHouseFishingSpeechHouse_Blocks:
VermilionFishingSpeechHouse_Blocks:
VermilionMagnetTrainSpeechHouse_Blocks:
VermilionHouseDiglettsCaveSpeechHouse_Blocks:
VermilionDiglettsCaveSpeechHouse_Blocks:
BluesHouse_Blocks:
PewterNidoranSpeechHouse_Blocks:
PewterSnoozeSpeechHouse_Blocks:

4
data/maps/data.asm
View File

@ -543,13 +543,13 @@ ENDM
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

4
data/maps/definitions.asm
View File

@ -280,13 +280,13 @@ MapGroup_Vermilion:
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

4
data/maps/scripts.asm
View File

@ -329,13 +329,13 @@ SECTION "Map Scripts 17", ROMX
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"

4
maps/VermilionCity.asm
View File

@ -273,12 +273,12 @@ VermilionCity_MapEvents:
.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

40
maps/VermilionDiglettsCaveSpeechHouse.asm Normal file
View File

@ -0,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

6
maps/VermilionHouseFishingSpeechHouse.asm → maps/VermilionFishingSpeechHouse.asm
View File

@ -1,7 +1,7 @@
const_value set 2
const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU
const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU
VermilionHouseFishingSpeechHouse_MapScripts:
VermilionFishingSpeechHouse_MapScripts:
.SceneScripts:
db 0
@ -50,7 +50,7 @@ FishingDudesHousePhotoText:
line "great time…"
done
VermilionHouseFishingSpeechHouse_MapEvents:
VermilionFishingSpeechHouse_MapEvents:
; filler
db 0, 0

40
maps/VermilionHouseDiglettsCaveSpeechHouse.asm
View File

@ -1,40 +0,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