Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	maps/Route25.asm
#	maps/Route27.asm
#	maps/Route35.asm
#	maps/Route39.asm
#	maps/Route42.asm
#	maps/Route43.asm
#	maps/Route43MahoganyGate.asm
#	maps/Route45.asm
#	maps/Route5CleanseTagHouse.asm
#	maps/Route6SaffronGate.asm
#	maps/Route7SaffronGate.asm
#	maps/ViridianCity.asm
This commit is contained in:
Rangi
2018-01-30 22:01:20 -05:00
parent 6e00101b89 7547ad839c
commit 72cdcb621c
19 changed files with 610 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
maps/ViridianCity.asm
View File

@@ -14,24 +14,24 @@ ViridianCity_MapScripts:
setflag ENGINE_FLYPOINT_VIRIDIAN
return
GrampsScript_0x1a9a4c:
ViridianCityCoffeeGramps:
faceplayer
opentext
writetext UnknownText_0x1a9aa5
yesorno
iffalse UnknownScript_0x1a9a5b
iffalse .no
writetext UnknownText_0x1a9b6f
waitbutton
closetext
end
UnknownScript_0x1a9a5b:
.no:
writetext UnknownText_0x1a9bb7
waitbutton
closetext
end
GrampsScript_0x1a9a61:
ViridianCityGrampsNearGym:
faceplayer
opentext
checkevent EVENT_BLUE_IN_CINNABAR
@@ -47,7 +47,7 @@ GrampsScript_0x1a9a61:
closetext
end
FisherScript_0x1a9a75:
ViridianCityDreamEaterFisher:
faceplayer
opentext
checkevent EVENT_GOT_TM42_DREAM_EATER
@@ -234,7 +234,7 @@ ViridianCity_MapEvents:
bg_event 30, 19, BGEVENT_READ, ViridianCityMartSign
db 4 ; object events
object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1
object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1
object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1
object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1
object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1
object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1
object_event 17, 21, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1