pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Consistent map naming ("Town" and "City" are left out in houses and gates)

Browse Source
This commit is contained in:
Remy Oukaour 2018-01-01 18:08:18 -05:00
parent f27f79488a
commit 985946740e
18 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
constants/map_constants.asm
View File

@ -351,7 +351,7 @@ ENDM
mapgroup LAVENDER_POKECENTER_1F, 4, 5 ; 5
mapgroup LAVENDER_POKECENTER_2F_BETA, 4, 8 ; 6
mapgroup MR_FUJIS_HOUSE, 4, 5 ; 7
mapgroup LAVENDER_TOWN_SPEECH_HOUSE, 4, 4 ; 8
mapgroup LAVENDER_SPEECH_HOUSE, 4, 4 ; 8
mapgroup LAVENDER_NAME_RATER, 4, 4 ; 9
mapgroup LAVENDER_MART, 4, 6 ; 10
mapgroup SOUL_HOUSE, 4, 5 ; 11
@ -413,7 +413,7 @@ ENDM
mapgroup CIANWOOD_GYM, 9, 5 ; 5
mapgroup CIANWOOD_POKECENTER_1F, 4, 5 ; 6
mapgroup CIANWOOD_PHARMACY, 4, 4 ; 7
mapgroup CIANWOOD_CITY_PHOTO_STUDIO, 4, 4 ; 8
mapgroup CIANWOOD_PHOTO_STUDIO, 4, 4 ; 8
mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4 ; 9
mapgroup POKE_SEERS_HOUSE, 4, 4 ; 10
mapgroup BATTLE_TOWER_1F, 5, 8 ; 11
@ -470,7 +470,7 @@ ENDM
mapgroup COPYCATS_HOUSE_1F, 4, 4 ; 11
mapgroup COPYCATS_HOUSE_2F, 3, 5 ; 12
mapgroup ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13
mapgroup ROUTE_5_SAFFRON_CITY_GATE, 4, 5 ; 14
mapgroup ROUTE_5_SAFFRON_GATE, 4, 5 ; 14
mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15
newgroup ; 26

6
maps.asm
View File

@ -192,7 +192,7 @@ INCLUDE "maps/IcePathB3F.asm"
INCLUDE "maps/LavenderPokecenter1F.asm"
INCLUDE "maps/LavenderPokecenter2FBeta.asm"
INCLUDE "maps/MrFujisHouse.asm"
INCLUDE "maps/LavenderTownSpeechHouse.asm"
INCLUDE "maps/LavenderSpeechHouse.asm"
INCLUDE "maps/LavenderNameRater.asm"
INCLUDE "maps/LavenderMart.asm"
INCLUDE "maps/SoulHouse.asm"
@ -240,7 +240,7 @@ INCLUDE "maps/ManiasHouse.asm"
INCLUDE "maps/CianwoodGym.asm"
INCLUDE "maps/CianwoodPokecenter1F.asm"
INCLUDE "maps/CianwoodPharmacy.asm"
INCLUDE "maps/CianwoodCityPhotoStudio.asm"
INCLUDE "maps/CianwoodPhotoStudio.asm"
INCLUDE "maps/CianwoodLugiaSpeechHouse.asm"
INCLUDE "maps/PokeSeersHouse.asm"
INCLUDE "maps/BattleTower1F.asm"
@ -305,7 +305,7 @@ INCLUDE "maps/SilphCo1F.asm"
INCLUDE "maps/CopycatsHouse1F.asm"
INCLUDE "maps/CopycatsHouse2F.asm"
INCLUDE "maps/Route5UndergroundPathEntrance.asm"
INCLUDE "maps/Route5SaffronCityGate.asm"
INCLUDE "maps/Route5SaffronGate.asm"
INCLUDE "maps/Route5CleanseTagSpeechHouse.asm"

0
maps/BetaCinnabarIslandPokemonLabHallway.blk → maps/BetaCinnabarPokemonLabHallway.blk
View File

0
maps/BetaCinnabarIslandPokemonLabRoom1.blk → maps/BetaCinnabarPokemonLabRoom1.blk
View File

0
maps/BetaCinnabarIslandPokemonLabRoom2.blk → maps/BetaCinnabarPokemonLabRoom2.blk
View File

0
maps/BetaCinnabarIslandPokemonLabRoom3.blk → maps/BetaCinnabarPokemonLabRoom3.blk
View File

0
maps/BetaTeakCity.blk → maps/BetaEcruteakCity.blk
View File

0
maps/BetaSSAquaInsideCutOut.blk → maps/BetaFastShipInsideCutOut.blk
View File

2
maps/CianwoodCity.asm
View File

@ -390,7 +390,7 @@ CianwoodCity_MapEventHeader:
warp_def 8, 43, 1, CIANWOOD_GYM
warp_def 23, 43, 1, CIANWOOD_POKECENTER_1F
warp_def 15, 47, 1, CIANWOOD_PHARMACY
warp_def 9, 31, 1, CIANWOOD_CITY_PHOTO_STUDIO
warp_def 9, 31, 1, CIANWOOD_PHOTO_STUDIO
warp_def 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
warp_def 5, 17, 1, POKE_SEERS_HOUSE

6
maps/CianwoodCityPhotoStudio.asm → maps/CianwoodPhotoStudio.asm
View File

@ -1,7 +1,7 @@
const_value set 2
const CIANWOODCITYPHOTOSTUDIO_FISHING_GURU
const CIANWOODPHOTOSTUDIO_FISHING_GURU
CianwoodCityPhotoStudio_MapScriptHeader:
CianwoodPhotoStudio_MapScriptHeader:
.SceneScripts:
db 0
@ -48,7 +48,7 @@ UnknownText_0x9e156:
line "memento…"
done
CianwoodCityPhotoStudio_MapEventHeader:
CianwoodPhotoStudio_MapEventHeader:
; filler
db 0, 0

20
maps/LavenderTownSpeechHouse.asm → maps/LavenderSpeechHouse.asm
View File

@ -1,20 +1,20 @@
const_value set 2
const LAVENDERTOWNSPEECHHOUSE_POKEFAN_F
const LAVENDERSPEECHHOUSE_POKEFAN_F
LavenderTownSpeechHouse_MapScriptHeader:
LavenderSpeechHouse_MapScriptHeader:
.SceneScripts:
db 0
.MapCallbacks:
db 0
LavenderTownSpeechHousePokefanFScript:
jumptextfaceplayer LavenderTownSpeechHousePokefanFText
LavenderSpeechHousePokefanFScript:
jumptextfaceplayer LavenderSpeechHousePokefanFText
LavenderTownSpeechHouseBookshelf:
LavenderSpeechHouseBookshelf:
jumpstd picturebookshelf
LavenderTownSpeechHousePokefanFText:
LavenderSpeechHousePokefanFText:
text "LAVENDER is a"
line "tiny, quiet town"
@ -28,7 +28,7 @@ LavenderTownSpeechHousePokefanFText:
line "built."
done
LavenderTownSpeechHouse_MapEventHeader:
LavenderSpeechHouse_MapEventHeader:
; filler
db 0, 0
@ -42,9 +42,9 @@ LavenderTownSpeechHouse_MapEventHeader:
.BGEvents:
db 2
bg_event 0, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf
bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
.ObjectEvents:
db 1
object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownSpeechHousePokefanFScript, -1
object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1

2
maps/LavenderTown.asm
View File

@ -113,7 +113,7 @@ LavenderTown_MapEventHeader:
db 7
warp_def 5, 5, 1, LAVENDER_POKECENTER_1F
warp_def 5, 9, 1, MR_FUJIS_HOUSE
warp_def 3, 13, 1, LAVENDER_TOWN_SPEECH_HOUSE
warp_def 3, 13, 1, LAVENDER_SPEECH_HOUSE
warp_def 7, 13, 1, LAVENDER_NAME_RATER
warp_def 1, 5, 2, LAVENDER_MART
warp_def 13, 11, 1, SOUL_HOUSE

4
maps/Route5.asm
View File

@ -46,8 +46,8 @@ Route5_MapEventHeader:
.Warps:
db 4
warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
warp_def 8, 17, 1, ROUTE_5_SAFFRON_CITY_GATE
warp_def 9, 17, 2, ROUTE_5_SAFFRON_CITY_GATE
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
.CoordEvents:

14
maps/Route5SaffronCityGate.asm → maps/Route5SaffronGate.asm
View File

@ -1,17 +1,17 @@
const_value set 2
const ROUTE5SAFFRONCITYGATE_OFFICER
const ROUTE5SAFFRONGATE_OFFICER
Route5SaffronCityGate_MapScriptHeader:
Route5SaffronGate_MapScriptHeader:
.SceneScripts:
db 0
.MapCallbacks:
db 0
Route5SaffronCityGateOfficerScript:
jumptextfaceplayer Route5SaffronCityGateOfficerText
Route5SaffronGateOfficerScript:
jumptextfaceplayer Route5SaffronGateOfficerText
Route5SaffronCityGateOfficerText:
Route5SaffronGateOfficerText:
text "You're from JOHTO,"
line "aren't you?"
@ -20,7 +20,7 @@ Route5SaffronCityGateOfficerText:
cont "don't you agree?"
done
Route5SaffronCityGate_MapEventHeader:
Route5SaffronGate_MapEventHeader:
; filler
db 0, 0
@ -39,4 +39,4 @@ Route5SaffronCityGate_MapEventHeader:
.ObjectEvents:
db 1
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1

2
maps/SaffronCity.asm
View File

@ -279,7 +279,7 @@ SaffronCity_MapEventHeader:
warp_def 8, 3, 2, SAFFRON_TRAIN_STATION
warp_def 18, 21, 1, SILPH_CO_1F
warp_def 9, 11, 1, COPYCATS_HOUSE_1F
warp_def 18, 3, 3, ROUTE_5_SAFFRON_CITY_GATE
warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE
warp_def 0, 24, 3, ROUTE_7_SAFFRON_GATE
warp_def 0, 25, 4, ROUTE_7_SAFFRON_GATE
warp_def 16, 33, 1, ROUTE_6_SAFFRON_GATE

30
maps/blockdata.asm
View File

@ -175,7 +175,7 @@ BluesHouse_BlockData:
PewterNidoranSpeechHouse_BlockData:
PewterSnoozeSpeechHouse_BlockData:
FuchsiaBillSpeechHouse_BlockData:
LavenderTownSpeechHouse_BlockData:
LavenderSpeechHouse_BlockData:
LavenderNameRater_BlockData:
Route12SuperRodHouse_BlockData:
Route28FamousSpeechHouse_BlockData:
@ -183,7 +183,7 @@ CeladonMansionRoofHouse_BlockData:
Route16FuchsiaSpeechHouse_BlockData:
ManiasHouse_BlockData:
CianwoodPharmacy_BlockData:
CianwoodCityPhotoStudio_BlockData:
CianwoodPhotoStudio_BlockData:
CianwoodLugiaSpeechHouse_BlockData:
PokeSeersHouse_BlockData:
ViridianNicknameSpeechHouse_BlockData:
@ -211,11 +211,11 @@ Route6SaffronGate_BlockData:
Route40BattleTowerGate_BlockData:
Route2Gate_BlockData:
Route2946Gate_BlockData:
Route5SaffronCityGate_BlockData:
Route5SaffronGate_BlockData:
INCBIN "maps/NorthSouthGate.blk"
BetaTeakCity_BlockData:
INCBIN "maps/BetaTeakCity.blk"
BetaEcruteakCity_BlockData:
INCBIN "maps/BetaEcruteakCity.blk"
BetaCherrygroveCity_BlockData:
INCBIN "maps/BetaCherrygroveCity.blk"
@ -372,17 +372,17 @@ BetaPewterMuseumOfScience2F_BlockData:
EarlsPokemonAcademy_BlockData:
INCBIN "maps/EarlsPokemonAcademy.blk"
BetaCinnabarIslandPokemonLabHallway_BlockData:
INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk"
BetaCinnabarPokemonLabHallway_BlockData:
INCBIN "maps/BetaCinnabarPokemonLabHallway.blk"
BetaCinnabarIslandPokemonLabRoom1_BlockData:
INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk"
BetaCinnabarPokemonLabRoom1_BlockData:
INCBIN "maps/BetaCinnabarPokemonLabRoom1.blk"
BetaCinnabarIslandPokemonLabRoom2_BlockData:
INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk"
BetaCinnabarPokemonLabRoom2_BlockData:
INCBIN "maps/BetaCinnabarPokemonLabRoom2.blk"
BetaCinnabarIslandPokemonLabRoom3_BlockData:
INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk"
BetaCinnabarPokemonLabRoom3_BlockData:
INCBIN "maps/BetaCinnabarPokemonLabRoom3.blk"
GoldenrodDeptStore1F_BlockData:
CeladonDeptStore1F_BlockData:
@ -824,8 +824,8 @@ FastShip1F_BlockData:
FastShipB1F_BlockData:
INCBIN "maps/FastShipB1F.blk"
BetaSSAquaInsideCutOut_BlockData:
INCBIN "maps/BetaSSAquaInsideCutOut.blk"
BetaFastShipInsideCutOut_BlockData:
INCBIN "maps/BetaFastShipInsideCutOut.blk"
FastShipCabins_NNW_NNE_NE_BlockData:
INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk"

6
maps/map_headers.asm
View File

@ -373,7 +373,7 @@ MapGroup_Lavender:
map_header LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header MrFujisHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header LavenderTownSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header LavenderSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header LavenderNameRater, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header SoulHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
@ -435,7 +435,7 @@ MapGroup_Cianwood:
map_header CianwoodGym, TILESET_SPROUT_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodPharmacy, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodCityPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodLugiaSpeechHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header PokeSeersHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, 1, PALETTE_DAY, FISHGROUP_SHORE
@ -492,7 +492,7 @@ MapGroup_Saffron:
map_header CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route5SaffronCityGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE

6
maps/second_map_headers.asm
View File

@ -593,7 +593,7 @@ ENDM
map_header_2 LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $0, 0
map_header_2 LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, 0
map_header_2 MrFujisHouse, MR_FUJIS_HOUSE, $0, 0
map_header_2 LavenderTownSpeechHouse, LAVENDER_TOWN_SPEECH_HOUSE, $0, 0
map_header_2 LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $0, 0
map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, 0
map_header_2 LavenderMart, LAVENDER_MART, $0, 0
map_header_2 SoulHouse, SOUL_HOUSE, $0, 0
@ -634,7 +634,7 @@ ENDM
map_header_2 CianwoodGym, CIANWOOD_GYM, $0, 0
map_header_2 CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $0, 0
map_header_2 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, 0
map_header_2 CianwoodCityPhotoStudio, CIANWOOD_CITY_PHOTO_STUDIO, $0, 0
map_header_2 CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $0, 0
map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, 0
map_header_2 PokeSeersHouse, POKE_SEERS_HOUSE, $0, 0
map_header_2 BattleTower1F, BATTLE_TOWER_1F, $0, 0
@ -673,7 +673,7 @@ ENDM
map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, 0
map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, 0
map_header_2 Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $0, 0
map_header_2 Route5SaffronCityGate, ROUTE_5_SAFFRON_CITY_GATE, $0, 0
map_header_2 Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $0, 0
map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, 0
map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, 0
map_header_2 CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $0, 0