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

@@ -6,23 +6,23 @@ Route7SaffronGate_MapScripts:
db 0 ; callbacks
OfficerScript_0x73518:
Route7SaffronGuardScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x73526
writetext UnknownText_0x7352c
iftrue .ReturnedPart
writetext Route7SaffronGuardPowerPlantText
waitbutton
closetext
end
UnknownScript_0x73526:
writetext UnknownText_0x73592
.ReturnedPart:
writetext Route7SaffronGuardSeriousText
waitbutton
closetext
end
UnknownText_0x7352c:
Route7SaffronGuardPowerPlantText:
text "Did you hear about"
line "the accident at"
cont "the POWER PLANT?"
@@ -32,7 +32,7 @@ UnknownText_0x7352c:
cont "LAVENDER TOWN."
done
UnknownText_0x73592:
Route7SaffronGuardSeriousText:
text "I take my GUARD"
line "job seriously."
@@ -57,4 +57,4 @@ Route7SaffronGate_MapEvents:
db 0 ; bg events
db 1 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x73518, -1
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1