pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Disambiguating granddaughter + grandpa #426

Browse Source
This commit is contained in:
surskitty
2017-12-25 15:06:14 -05:00
parent 79d9f16237
commit c13b7af4f5
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@@ -37,15 +37,15 @@ SSAquaCaptain:
closetext closetext
end end
Granddaughter2: SSAquaGranddaughterBefore:
spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
opentext opentext
writetext GranddaughterCaptainPlayWithMeText writetext SSAquaGranddaughterCaptainPlayWithMeText
waitbutton waitbutton
closetext closetext
faceplayer faceplayer
opentext opentext
writetext GranddaughterHasToFindGrandpaText writetext SSAquaGranddaughterHasToFindGrandpaText
waitbutton waitbutton
closetext closetext
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
@@ -64,14 +64,14 @@ Granddaughter2:
checkflag ENGINE_PLAYER_IS_FEMALE checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .PlayerIsFemale iftrue .PlayerIsFemale
opentext opentext
writetext GranddaughterWasPlayingMText writetext SSAquaGranddaughterWasPlayingMText
waitbutton waitbutton
closetext closetext
jump .cont jump .cont
.PlayerIsFemale: .PlayerIsFemale:
opentext opentext
writetext GranddaughterWasPlayingFText writetext SSAquaGranddaughterWasPlayingFText
waitbutton waitbutton
closetext closetext
.cont: .cont:
@@ -84,7 +84,7 @@ Granddaughter2:
setmapscene FAST_SHIP_1F, $0 setmapscene FAST_SHIP_1F, $0
jump SSAquaMetalCoatAndDocking jump SSAquaMetalCoatAndDocking
Grandpa: SSAquaGrandpa:
faceplayer faceplayer
opentext opentext
checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
@@ -98,7 +98,7 @@ Grandpa:
end end
SSAquaMetalCoatAndDocking: SSAquaMetalCoatAndDocking:
writetext GrandpaHaveThisText writetext SSAquaGrandpaHaveThisText
buttonsound buttonsound
verbosegiveitem METAL_COAT verbosegiveitem METAL_COAT
iffalse .NoRoom iffalse .NoRoom
@@ -117,7 +117,7 @@ SSAquaMetalCoatAndDocking:
end end
SSAquaFoundGranddaughter: SSAquaFoundGranddaughter:
writetext GrandpaHaveThisText writetext SSAquaGrandpaHaveThisText
buttonsound buttonsound
verbosegiveitem METAL_COAT verbosegiveitem METAL_COAT
iffalse .NoRoom iffalse .NoRoom
@@ -127,15 +127,15 @@ SSAquaFoundGranddaughter:
end end
SSAquaGotMetalCoat: SSAquaGotMetalCoat:
writetext GrandpaTravellingText writetext SSAquaGrandpaTravellingText
waitbutton waitbutton
closetext closetext
end end
Granddaughter1: SSAquaGranddaughterAfter:
faceplayer faceplayer
opentext opentext
writetext GranddaughterHadFunText writetext SSAquaGranddaughterHadFunText
waitbutton waitbutton
closetext closetext
end end
@@ -284,17 +284,17 @@ SSAquaEntertainedGranddaughterText:
line "you for that." line "you for that."
done done
GrandpaHaveThisText: SSAquaGrandpaHaveThisText:
text "I know! I'd like" text "I know! I'd like"
line "you to have this!" line "you to have this!"
done done
GrandpaTravellingText: SSAquaGrandpaTravellingText:
text "We're traveling" text "We're traveling"
line "around the world." line "around the world."
done done
GranddaughterCaptainPlayWithMeText: SSAquaGranddaughterCaptainPlayWithMeText:
text "CAPTAIN, play with" text "CAPTAIN, play with"
line "me, please?" line "me, please?"
@@ -302,38 +302,38 @@ GranddaughterCaptainPlayWithMeText:
line "to play more!" line "to play more!"
done done
GranddaughterHasToFindGrandpaText: SSAquaGranddaughterHasToFindGrandpaText:
text "Hi! Will you play" text "Hi! Will you play"
line "with me?" line "with me?"
para "…Oh!" para "…Oh!"
para "Grandpa's worried" para "SSAquaGrandpa's worried"
line "about me?" line "about me?"
para "I have to go!" para "I have to go!"
para "I have to go find" para "I have to go find"
line "Grandpa!" line "SSAquaGrandpa!"
done done
GranddaughterWasPlayingMText: SSAquaGranddaughterWasPlayingMText:
text "Grandpa, here I" text "SSAquaGrandpa, here I"
line "am! I was playing" line "am! I was playing"
para "with the CAPTAIN" para "with the CAPTAIN"
line "and this guy!" line "and this guy!"
done done
GranddaughterWasPlayingFText: SSAquaGranddaughterWasPlayingFText:
text "Grandpa, here I" text "SSAquaGrandpa, here I"
line "am! I was playing" line "am! I was playing"
para "with the CAPTAIN" para "with the CAPTAIN"
line "and this big girl!" line "and this big girl!"
done done
GranddaughterHadFunText: SSAquaGranddaughterHadFunText:
text "I had lots of fun" text "I had lots of fun"
line "playing!" line "playing!"
done done
@@ -485,9 +485,9 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader:
.ObjectEvents: .ObjectEvents:
db 11 db 11
object_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1 object_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
object_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Grandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN object_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
object_event SPRITE_TWIN, 17, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Granddaughter1, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 object_event SPRITE_TWIN, 17, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
object_event SPRITE_TWIN, 25, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Granddaughter2, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 object_event SPRITE_TWIN, 25, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
object_event SPRITE_POKEFAN_M, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP object_event SPRITE_POKEFAN_M, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
object_event SPRITE_TWIN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP object_event SPRITE_TWIN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
object_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP object_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP