Rename Bill's brother to Bill's older sister (#1132)
This commit is contained in:
@@ -1,41 +0,0 @@
|
||||
object_const_def
|
||||
const BILLSBROTHERSHOUSE_POKEFAN_F
|
||||
const BILLSBROTHERSHOUSE_YOUNGSTER
|
||||
|
||||
BillsBrothersHouse_MapScripts:
|
||||
def_scene_scripts
|
||||
|
||||
def_callbacks
|
||||
|
||||
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:
|
||||
db 0, 0 ; filler
|
||||
|
||||
def_warp_events
|
||||
warp_event 2, 7, FUCHSIA_CITY, 4
|
||||
warp_event 3, 7, FUCHSIA_CITY, 4
|
||||
|
||||
def_coord_events
|
||||
|
||||
def_bg_events
|
||||
|
||||
def_object_events
|
||||
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
|
@@ -65,12 +65,12 @@ BillsMomScript:
|
||||
closetext
|
||||
end
|
||||
|
||||
BillsSisterScript:
|
||||
BillsYoungerSisterScript:
|
||||
faceplayer
|
||||
opentext
|
||||
checkcellnum PHONE_BILL
|
||||
iftrue .GotBillsNumber
|
||||
writetext BillsSisterUsefulNumberText
|
||||
writetext BillsYoungerSisterUsefulNumberText
|
||||
askforphonenumber PHONE_BILL
|
||||
ifequal PHONE_CONTACTS_FULL, .NoRoom
|
||||
ifequal PHONE_CONTACT_REFUSED, .Refused
|
||||
@@ -81,19 +81,19 @@ BillsSisterScript:
|
||||
waitsfx
|
||||
promptbutton
|
||||
.GotBillsNumber:
|
||||
writetext BillsSisterStorageSystemText
|
||||
writetext BillsYoungerSisterStorageSystemText
|
||||
waitbutton
|
||||
closetext
|
||||
end
|
||||
|
||||
.Refused:
|
||||
writetext BillsSisterRefusedNumberText
|
||||
writetext BillsYoungerSisterRefusedNumberText
|
||||
waitbutton
|
||||
closetext
|
||||
end
|
||||
|
||||
.NoRoom:
|
||||
writetext BillsSisterPhoneFullText
|
||||
writetext BillsYoungerSisterPhoneFullText
|
||||
promptbutton
|
||||
sjump .Refused
|
||||
|
||||
@@ -204,7 +204,7 @@ BillsMomText_AfterEcruteak:
|
||||
line "father."
|
||||
done
|
||||
|
||||
BillsSisterUsefulNumberText:
|
||||
BillsYoungerSisterUsefulNumberText:
|
||||
text "Are you a trainer?"
|
||||
|
||||
para "I've got a useful"
|
||||
@@ -217,7 +217,7 @@ RecordedBillsNumberText:
|
||||
line "BILL's number."
|
||||
done
|
||||
|
||||
BillsSisterRefusedNumberText:
|
||||
BillsYoungerSisterRefusedNumberText:
|
||||
text "My brother made"
|
||||
line "the PC #MON"
|
||||
cont "storage system."
|
||||
@@ -227,12 +227,12 @@ BillsSisterRefusedNumberText:
|
||||
cont "number…"
|
||||
done
|
||||
|
||||
BillsSisterPhoneFullText:
|
||||
BillsYoungerSisterPhoneFullText:
|
||||
text "You can't record"
|
||||
line "any more numbers."
|
||||
done
|
||||
|
||||
BillsSisterStorageSystemText:
|
||||
BillsYoungerSisterStorageSystemText:
|
||||
text "My big brother"
|
||||
line "BILL made the PC"
|
||||
|
||||
@@ -257,4 +257,4 @@ BillsFamilysHouse_MapEvents:
|
||||
def_object_events
|
||||
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
|
||||
object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsYoungerSisterScript, -1
|
||||
|
41
maps/BillsOlderSistersHouse.asm
Normal file
41
maps/BillsOlderSistersHouse.asm
Normal file
@@ -0,0 +1,41 @@
|
||||
object_const_def
|
||||
const BILLSOLDERSISTERSHOUSE_POKEFAN_F
|
||||
const BILLSOLDERSISTERSHOUSE_YOUNGSTER
|
||||
|
||||
BillsOlderSistersHouse_MapScripts:
|
||||
def_scene_scripts
|
||||
|
||||
def_callbacks
|
||||
|
||||
BillsOlderSisterScript:
|
||||
jumptextfaceplayer BillsOlderSisterText
|
||||
|
||||
BillsOlderSistersHouseYoungsterScript:
|
||||
jumptextfaceplayer BillsOlderSistersHouseYoungsterText
|
||||
|
||||
BillsOlderSisterText:
|
||||
text "My grandpa is at "
|
||||
line "my brother BILL's"
|
||||
cont "on CERULEAN CAPE."
|
||||
done
|
||||
|
||||
BillsOlderSistersHouseYoungsterText:
|
||||
text "I saw these weird,"
|
||||
line "slow #MON on"
|
||||
cont "CYCLING ROAD."
|
||||
done
|
||||
|
||||
BillsOlderSistersHouse_MapEvents:
|
||||
db 0, 0 ; filler
|
||||
|
||||
def_warp_events
|
||||
warp_event 2, 7, FUCHSIA_CITY, 4
|
||||
warp_event 3, 7, FUCHSIA_CITY, 4
|
||||
|
||||
def_coord_events
|
||||
|
||||
def_bg_events
|
||||
|
||||
def_object_events
|
||||
object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsOlderSisterScript, -1
|
||||
object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsOlderSistersHouseYoungsterScript, -1
|
@@ -129,7 +129,7 @@ FuchsiaCity_MapEvents:
|
||||
warp_event 5, 13, FUCHSIA_MART, 2
|
||||
warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1
|
||||
warp_event 8, 27, FUCHSIA_GYM, 1
|
||||
warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1
|
||||
warp_event 11, 27, BILLS_OLDER_SISTERS_HOUSE, 1
|
||||
warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1
|
||||
warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1
|
||||
warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; inaccessible
|
||||
|
Reference in New Issue
Block a user