Rename some more maps

The Pokécom Center's .blk contains 1F and the Administration room, but the .asm script is just for the Admin room; 1F-related text and scripts are in GoldenrodPokecenter1F.asm. Presumably both map scripts shared the same .blk.
This commit is contained in:
Rangi
2018-01-23 01:03:47 -05:00
parent 14cb5a3cb0
commit fc61d58dc4
15 changed files with 110 additions and 110 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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:

View File

@@ -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 "でんわ<GA>つながらないとき@" ; 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

View File

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