From fc61d58dc45e1a205ab63cdb7a8df62450383bf9 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 01:03:47 -0500 Subject: [PATCH] =?UTF-8?q?Rename=20some=20more=20maps=20The=20Pok=C3=A9co?= =?UTF-8?q?m=20Center's=20.blk=20contains=201F=20and=20the=20Administratio?= =?UTF-8?q?n=20room,=20but=20the=20.asm=20script=20is=20just=20for=20the?= =?UTF-8?q?=20Admin=20room;=201F-related=20text=20and=20scripts=20are=20in?= =?UTF-8?q?=20GoldenrodPokecenter1F.asm.=20Presumably=20both=20map=20scrip?= =?UTF-8?q?ts=20shared=20the=20same=20.blk.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/map_constants.asm | 8 ++-- data/maps/blocks.asm | 10 ++-- data/maps/data.asm | 8 ++-- data/maps/definitions.asm | 8 ++-- data/maps/scripts.asm | 8 ++-- maps/BillsBrothersHouse.asm | 48 +++++++++++++++++++ ...odBillsHouse.asm => BillsFamilysHouse.asm} | 22 ++++----- ...gsHouse.asm => DayOfWeekSiblingsHouse.asm} | 6 +-- maps/FuchsiaBillSpeechHouse.asm | 48 ------------------- maps/FuchsiaCity.asm | 2 +- maps/GoldenrodCity.asm | 2 +- maps/GoldenrodPokecenter1F.asm | 2 +- ...e.asm => PokecomCenterAdminRoomMobile.asm} | 46 +++++++++--------- ...e.blk => PokecomCenterAdminRoomMobile.blk} | 0 maps/Route26.asm | 2 +- 15 files changed, 110 insertions(+), 110 deletions(-) create mode 100644 maps/BillsBrothersHouse.asm rename maps/{GoldenrodBillsHouse.asm => BillsFamilysHouse.asm} (91%) rename maps/{Route26DayofWeekSiblingsHouse.asm => DayOfWeekSiblingsHouse.asm} (90%) delete mode 100644 maps/FuchsiaBillSpeechHouse.asm rename maps/{GoldenrodPokeComCenter2FMobile.asm => PokecomCenterAdminRoomMobile.asm} (76%) rename maps/{GoldenrodPokeComCenter2FMobile.blk => PokecomCenterAdminRoomMobile.blk} (100%) diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 9dbe66a8a..f327cd407 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -245,7 +245,7 @@ ENDM mapconst GOLDENROD_GYM, 9, 10 ; 3 mapconst GOLDENROD_BIKE_SHOP, 4, 4 ; 4 mapconst GOLDENROD_HAPPINESS_RATER, 4, 4 ; 5 - mapconst GOLDENROD_BILLS_HOUSE, 4, 4 ; 6 + mapconst BILLS_FAMILYS_HOUSE, 4, 4 ; 6 mapconst GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7 mapconst GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 mapconst GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 @@ -260,7 +260,7 @@ ENDM mapconst GOLDENROD_DEPT_STORE_ROOF, 4, 8 ; 18 mapconst GOLDENROD_GAME_CORNER, 7, 10 ; 19 mapconst GOLDENROD_POKECENTER_1F, 4, 5 ; 20 - mapconst GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 ; 21 + mapconst POKECOM_CENTER_ADMIN_ROOM_MOBILE, 16, 16 ; 21 mapconst ILEX_FOREST_AZALEA_GATE, 4, 5 ; 22 mapconst ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 23 mapconst DAY_CARE, 4, 5 ; 24 @@ -337,7 +337,7 @@ ENDM mapconst FUCHSIA_MART, 4, 6 ; 6 mapconst SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7 mapconst FUCHSIA_GYM, 9, 5 ; 8 - mapconst FUCHSIA_BILL_SPEECH_HOUSE, 4, 4 ; 9 + mapconst BILLS_BROTHERS_HOUSE, 4, 4 ; 9 mapconst FUCHSIA_POKECENTER_1F, 4, 5 ; 10 mapconst FUCHSIA_POKECENTER_2F_BETA, 4, 8 ; 11 mapconst SAFARI_ZONE_WARDENS_HOME, 4, 5 ; 12 @@ -452,7 +452,7 @@ ENDM 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_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 + 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 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 764ab0a70..1b3eda585 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -165,7 +165,7 @@ CharcoalKiln_Blocks: LakeOfRageHiddenPowerHouse_Blocks: LakeOfRageMagikarpHouse_Blocks: GoldenrodHappinessRater_Blocks: -GoldenrodBillsHouse_Blocks: +BillsFamilysHouse_Blocks: GoldenrodPPSpeechHouse_Blocks: GoldenrodNameRater_Blocks: VermilionFishingSpeechHouse_Blocks: @@ -174,7 +174,7 @@ VermilionDiglettsCaveSpeechHouse_Blocks: BluesHouse_Blocks: PewterNidoranSpeechHouse_Blocks: PewterSnoozeSpeechHouse_Blocks: -FuchsiaBillSpeechHouse_Blocks: +BillsBrothersHouse_Blocks: LavenderSpeechHouse_Blocks: LavenderNameRater_Blocks: Route12SuperRodHouse_Blocks: @@ -190,7 +190,7 @@ ViridianNicknameSpeechHouse_Blocks: Route2NuggetSpeechHouse_Blocks: PlayersNeighborsHouse_Blocks: Route26HealSpeechHouse_Blocks: -Route26DayofWeekSiblingsHouse_Blocks: +DayOfWeekSiblingsHouse_Blocks: Route27SandstormHouse_Blocks: MrPsychicsHouse_Blocks: Route5CleanseTagSpeechHouse_Blocks: @@ -1022,8 +1022,8 @@ BattleTower1F_Blocks: BattleTowerBattleRoom_Blocks: INCBIN "maps/BattleTowerBattleRoom.blk" -GoldenrodPokeComCenter2FMobile_Blocks: - INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk" +PokecomCenterAdminRoomMobile_Blocks: + INCBIN "maps/PokecomCenterAdminRoomMobile.blk" MobileTradeRoomMobile_Blocks: INCBIN "maps/MobileTradeRoomMobile.blk" diff --git a/data/maps/data.asm b/data/maps/data.asm index b0c7ba02b..16a972437 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -524,7 +524,7 @@ ENDM map_data GoldenrodGym, GOLDENROD_GYM, $00, 0 map_data GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $00, 0 map_data GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $00, 0 - map_data GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $00, 0 + map_data BillsFamilysHouse, BILLS_FAMILYS_HOUSE, $00, 0 map_data GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $00, 0 map_data GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $00, 0 map_data GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $00, 0 @@ -539,7 +539,7 @@ ENDM map_data GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0 map_data GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0 map_data GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0 - map_data GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $00, 0 + map_data PokecomCenterAdminRoomMobile, POKECOM_CENTER_ADMIN_ROOM_MOBILE, $00, 0 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 @@ -585,7 +585,7 @@ ENDM map_data FuchsiaMart, FUCHSIA_MART, $00, 0 map_data SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0 map_data FuchsiaGym, FUCHSIA_GYM, $00, 0 - map_data FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $00, 0 + map_data BillsBrothersHouse, BILLS_BROTHERS_HOUSE, $00, 0 map_data FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0 map_data FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0 map_data SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0 @@ -659,7 +659,7 @@ ENDM 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 Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_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 map_data FightingDojo, FIGHTING_DOJO, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index 25b7246bc..ccc723177 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -256,7 +256,7 @@ MapGroup_Goldenrod: map_def GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodBikeShop, TILESET_CHAMPIONS_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodHappinessRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodBillsHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def BillsFamilysHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -271,7 +271,7 @@ MapGroup_Goldenrod: map_def GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PokecomCenterAdminRoomMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -342,7 +342,7 @@ MapGroup_Fuchsia: map_def FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def FuchsiaBillSpeechHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def BillsBrothersHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def SafariZoneWardensHome, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -450,7 +450,7 @@ MapGroup_NewBark: 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 Route26DayofWeekSiblingsHouse, 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 diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index e7631dcaf..fd4288a57 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -3,7 +3,7 @@ SECTION "Map Scripts 1", ROMX INCLUDE "maps/GoldenrodGym.asm" INCLUDE "maps/GoldenrodBikeShop.asm" INCLUDE "maps/GoldenrodHappinessRater.asm" -INCLUDE "maps/GoldenrodBillsHouse.asm" +INCLUDE "maps/BillsFamilysHouse.asm" INCLUDE "maps/GoldenrodMagnetTrainStation.asm" INCLUDE "maps/GoldenrodFlowerShop.asm" INCLUDE "maps/GoldenrodPPSpeechHouse.asm" @@ -63,7 +63,7 @@ INCLUDE "maps/RadioTower5F.asm" INCLUDE "maps/OlivineLighthouse5F.asm" INCLUDE "maps/OlivineLighthouse6F.asm" INCLUDE "maps/GoldenrodPokecenter1F.asm" -INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm" +INCLUDE "maps/PokecomCenterAdminRoomMobile.asm" INCLUDE "maps/IlexForestAzaleaGate.asm" INCLUDE "maps/Route34IlexForestGate.asm" INCLUDE "maps/DayCare.asm" @@ -156,7 +156,7 @@ INCLUDE "maps/PlayersHouse2F.asm" INCLUDE "maps/PlayersNeighborsHouse.asm" INCLUDE "maps/ElmsHouse.asm" INCLUDE "maps/Route26HealSpeechHouse.asm" -INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm" +INCLUDE "maps/DayOfWeekSiblingsHouse.asm" INCLUDE "maps/Route27SandstormHouse.asm" INCLUDE "maps/Route29Route46Gate.asm" @@ -361,7 +361,7 @@ INCLUDE "maps/MoveDeletersHouse.asm" INCLUDE "maps/FuchsiaMart.asm" INCLUDE "maps/SafariZoneMainOffice.asm" INCLUDE "maps/FuchsiaGym.asm" -INCLUDE "maps/FuchsiaBillSpeechHouse.asm" +INCLUDE "maps/BillsBrothersHouse.asm" INCLUDE "maps/FuchsiaPokecenter1F.asm" INCLUDE "maps/FuchsiaPokecenter2FBeta.asm" INCLUDE "maps/SafariZoneWardensHome.asm" diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm new file mode 100644 index 000000000..4e56146fa --- /dev/null +++ b/maps/BillsBrothersHouse.asm @@ -0,0 +1,48 @@ +const_value set 2 + const BILLSBROTHERSHOUSE_POKEFAN_F + const BILLSBROTHERSHOUSE_YOUNGSTER + +BillsBrothersHouse_MapScripts: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +BillsBrotherScript: + jumptextfaceplayer BillsBrotherText + +BillsBrothersHouseYoungsterScript: + jumptextfaceplayer BillsBrothersHouseYoungsterText + +BillsBrotherText: + text "My grandpa is at " + line "my brother BILL's" + cont "on CERULEAN CAPE." + done + +BillsBrothersHouseYoungsterText: + text "I saw these weird," + line "slow #MON on" + cont "CYCLING ROAD." + done + +BillsBrothersHouse_MapEvents: + ; filler + db 0, 0 + +.Warps: + db 2 + warp_def 2, 7, 4, FUCHSIA_CITY + warp_def 3, 7, 4, FUCHSIA_CITY + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 2 + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/BillsFamilysHouse.asm similarity index 91% rename from maps/GoldenrodBillsHouse.asm rename to maps/BillsFamilysHouse.asm index 33c8dbd17..6aa014301 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -1,16 +1,16 @@ const_value set 2 - const GOLDENRODBILLSHOUSE_BILL - const GOLDENRODBILLSHOUSE_POKEFAN_F - const GOLDENRODBILLSHOUSE_TWIN + const BILLSFAMILYSHOUSE_BILL + const BILLSFAMILYSHOUSE_POKEFAN_F + const BILLSFAMILYSHOUSE_TWIN -GoldenrodBillsHouse_MapScripts: +BillsFamilysHouse_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -BillsHouseBill: +BillScript: faceplayer opentext checkevent EVENT_GOT_EEVEE @@ -51,7 +51,7 @@ UnknownScript_0x54c1f: closetext end -BillsMom: +BillsMomScript: faceplayer opentext checkevent EVENT_MET_BILL @@ -67,7 +67,7 @@ UnknownScript_0x54c33: closetext end -BillsSister: +BillsSisterScript: faceplayer opentext checkcellnum PHONE_BILL @@ -242,7 +242,7 @@ UnknownText_0x55069: line "system." done -GoldenrodBillsHouse_MapEvents: +BillsFamilysHouse_MapEvents: ; filler db 0, 0 @@ -262,6 +262,6 @@ GoldenrodBillsHouse_MapEvents: .ObjectEvents: db 3 - object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL - object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMom, -1 - object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSister, -1 + object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL + object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1 + object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1 diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm similarity index 90% rename from maps/Route26DayofWeekSiblingsHouse.asm rename to maps/DayOfWeekSiblingsHouse.asm index e958d81f2..de1272660 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 - const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX + const DAYOFWEEKSIBLINGSHOUSE_POKEDEX -Route26DayofWeekSiblingsHouse_MapScripts: +DayOfWeekSiblingsHouse_MapScripts: .SceneScripts: db 0 @@ -70,7 +70,7 @@ UnknownText_0x7b2b9: line "ROUTE 37" done -Route26DayofWeekSiblingsHouse_MapEvents: +DayOfWeekSiblingsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm deleted file mode 100644 index 8a72256b6..000000000 --- a/maps/FuchsiaBillSpeechHouse.asm +++ /dev/null @@ -1,48 +0,0 @@ -const_value set 2 - const FUCHSIABILLSPEECHHOUSE_POKEFAN_F - const FUCHSIABILLSPEECHHOUSE_YOUNGSTER - -FuchsiaBillSpeechHouse_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -FuchsiaBillSpeechHousePokefanFScript: - jumptextfaceplayer FuchsiaBillSpeechHousePokefanFText - -FuchsiaBillSpeechHouseYoungsterScript: - jumptextfaceplayer FuchsiaBillSpeechHouseYoungsterText - -FuchsiaBillSpeechHousePokefanFText: - text "My grandpa is at " - line "my brother BILL's" - cont "on CERULEAN CAPE." - done - -FuchsiaBillSpeechHouseYoungsterText: - text "I saw these weird," - line "slow #MON on" - cont "CYCLING ROAD." - done - -FuchsiaBillSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 4, FUCHSIA_CITY - warp_def 3, 7, 4, FUCHSIA_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 34a636aaf..319dae2cd 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -133,7 +133,7 @@ FuchsiaCity_MapEvents: warp_def 5, 13, 2, FUCHSIA_MART warp_def 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE warp_def 8, 27, 1, FUCHSIA_GYM - warp_def 11, 27, 1, FUCHSIA_BILL_SPEECH_HOUSE + warp_def 11, 27, 1, BILLS_BROTHERS_HOUSE warp_def 19, 27, 1, FUCHSIA_POKECENTER_1F warp_def 27, 27, 1, SAFARI_ZONE_WARDENS_HOME warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index f9f506fdd..8b64a4435 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -560,7 +560,7 @@ GoldenrodCity_MapEvents: warp_def 24, 7, 1, GOLDENROD_GYM warp_def 29, 29, 1, GOLDENROD_BIKE_SHOP warp_def 31, 21, 1, GOLDENROD_HAPPINESS_RATER - warp_def 5, 25, 1, GOLDENROD_BILLS_HOUSE + warp_def 5, 25, 1, BILLS_FAMILYS_HOUSE warp_def 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION warp_def 29, 5, 1, GOLDENROD_FLOWER_SHOP warp_def 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index f01194311..9402f8743 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -812,7 +812,7 @@ GoldenrodPokecenter1F_MapEvents: db 4 warp_def 3, 7, 15, GOLDENROD_CITY warp_def 4, 7, 15, GOLDENROD_CITY - warp_def 0, 6, 1, GOLDENROD_POKECOM_CENTER_2F_MOBILE + warp_def 0, 6, 1, POKECOM_CENTER_ADMIN_ROOM_MOBILE warp_def 0, 7, 1, POKECENTER_2F .CoordEvents: diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm similarity index 76% rename from maps/GoldenrodPokeComCenter2FMobile.asm rename to maps/PokecomCenterAdminRoomMobile.asm index d45b3ac56..53a1043f8 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -1,25 +1,25 @@ const_value set 2 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST1 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST2 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3 + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1 + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2 + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3 -GoldenrodPokeComCenter2FMobile_MapScripts: +PokecomCenterAdminRoomMobile_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -GoldenrodPokeComCenter2FMobileScientist1Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist1Text +PokecomCenterAdminRoomMobileScientist1Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist1Text -GoldenrodPokeComCenter2FMobileScientist2Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist2Text +PokecomCenterAdminRoomMobileScientist2Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist2Text -GoldenrodPokeComCenter2FMobileScientist3Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist3Text +PokecomCenterAdminRoomMobileScientist3Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist3Text -MapGoldenrodPokeComCenter2FMobileSignpost0Script: +PokecomCenterAdminRoomMobileSignpost0Script: opentext writetext UnknownText_0x627ee waitbutton @@ -61,7 +61,7 @@ MenuDataHeader_0x62602: db "モバイルセンター@" ; MOBILE CENTER db "やめる@" ; QUIT -MapGoldenrodPokeComCenter2FMobileSignpost1Script: +PokecomCenterAdminRoomMobileSignpost1Script: opentext writetext UnknownText_0x62989 waitbutton @@ -103,10 +103,10 @@ MenuDataHeader_0x6264c: db "でんわつながらないとき@" ; Don't use phone db "やめる@" ; QUIT -MapGoldenrodPokeComCenter2FMobileSignpost2Script: +PokecomCenterAdminRoomMobileSignpost2Script: jumptext UnknownText_0x62b26 -GoldenrodPokeComCenter2FMobileScientist1Text: +PokecomCenterAdminRoomMobileScientist1Text: text "#COM CENTER and" line "MOBILE CENTER were" @@ -120,7 +120,7 @@ GoldenrodPokeComCenter2FMobileScientist1Text: line "strangers." done -GoldenrodPokeComCenter2FMobileScientist2Text: +PokecomCenterAdminRoomMobileScientist2Text: text "When you linked" line "with someone by" @@ -137,7 +137,7 @@ GoldenrodPokeComCenter2FMobileScientist2Text: line "got the shakes!" done -GoldenrodPokeComCenter2FMobileScientist3Text: +PokecomCenterAdminRoomMobileScientist3Text: text "They were able to" line "build this huge" @@ -262,7 +262,7 @@ UnknownText_0x62b26: para "<……> <……> <……>" done -GoldenrodPokeComCenter2FMobile_MapEvents: +PokecomCenterAdminRoomMobile_MapEvents: ; filler db 0, 0 @@ -276,12 +276,12 @@ GoldenrodPokeComCenter2FMobile_MapEvents: .BGEvents: db 3 - bg_event 6, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script - bg_event 6, 28, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script - bg_event 3, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script + bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script + bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script + bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script .ObjectEvents: db 3 - object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1 - object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1 - object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1 + object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1 + object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1 + object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.blk b/maps/PokecomCenterAdminRoomMobile.blk similarity index 100% rename from maps/GoldenrodPokeComCenter2FMobile.blk rename to maps/PokecomCenterAdminRoomMobile.blk diff --git a/maps/Route26.asm b/maps/Route26.asm index 293a0add7..75599372b 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -420,7 +420,7 @@ Route26_MapEvents: db 3 warp_def 7, 5, 3, VICTORY_ROAD_GATE warp_def 15, 57, 1, ROUTE_26_HEAL_SPEECH_HOUSE - warp_def 5, 71, 1, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE + warp_def 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE .CoordEvents: db 0