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/Route6SaffronGate.asm
View File

@@ -10,23 +10,23 @@ Route6SaffronGate_MapScripts:
.DummyScene:
end
OfficerScript_0x1926ea:
Route6SaffronGuardScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x1926f8
writetext UnknownText_0x1926fe
iftrue .ReturnedPart
writetext Route6SaffronGuardWelcomeText
waitbutton
closetext
end
UnknownScript_0x1926f8:
writetext UnknownText_0x1927cb
.ReturnedPart:
writetext Route6SaffronGuardMagnetTrainText
waitbutton
closetext
end
UnknownText_0x1926fe:
Route6SaffronGuardWelcomeText:
text "Welcome to SAFFRON"
line "CITY, home of the"
cont "MAGNET TRAIN!"
@@ -47,7 +47,7 @@ UnknownText_0x1926fe:
line "PLANT."
done
UnknownText_0x1927cb:
Route6SaffronGuardMagnetTrainText:
text "The MAGNET TRAIN"
line "is the most famous"
@@ -69,4 +69,4 @@ Route6SaffronGate_MapEvents:
db 0 ; bg events
db 1 ; object events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1