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

12
maps/Route40.asm
View File

@@ -94,9 +94,9 @@ MonicaScript:
faceplayer
opentext
checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
iftrue MonicaMondayScript
iftrue .Monday
checkcode VAR_WEEKDAY
if_not_equal MONDAY, MonicaNotMondayScript
if_not_equal MONDAY, .NotMonday
checkevent EVENT_MET_MONICA_OF_MONDAY
iftrue .MetMonica
writetext MeetMonicaText
@@ -106,21 +106,21 @@ MonicaScript:
writetext MonicaGivesGiftText
buttonsound
verbosegiveitem SHARP_BEAK
iffalse MonicaDoneScript
iffalse .done
setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
writetext MonicaGaveGiftText
waitbutton
closetext
end
MonicaMondayScript:
.Monday:
writetext MonicaMondayText
waitbutton
MonicaDoneScript:
.done:
closetext
end
MonicaNotMondayScript:
.NotMonday:
writetext MonicaNotMondayText
waitbutton
closetext