pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues 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

18
maps/VermilionPort.asm
View File

@@ -147,18 +147,18 @@ SailorScript_0x74e97:
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x74e1a
checkcode VAR_WEEKDAY
if_equal MONDAY, UnknownScript_0x74eda
if_equal TUESDAY, UnknownScript_0x74eda
if_equal THURSDAY, UnknownScript_0x74ee0
if_equal FRIDAY, UnknownScript_0x74ee0
if_equal SATURDAY, UnknownScript_0x74ee0
if_equal MONDAY, .NextShipWednesday
if_equal TUESDAY, .NextShipWednesday
if_equal THURSDAY, .NextShipSunday
if_equal FRIDAY, .NextShipSunday
if_equal SATURDAY, .NextShipSunday
writetext UnknownText_0x74f4d
yesorno
iffalse UnknownScript_0x74e87
writetext UnknownText_0x74f8b
buttonsound
checkitem S_S_TICKET
iffalse UnknownScript_0x74ed4
iffalse .NoTicket
writetext UnknownText_0x74fc2
waitbutton
closetext
@@ -166,19 +166,19 @@ SailorScript_0x74e97:
applymovement PLAYER, MovementData_0x74efe
jump SailorScript_0x74dc4
UnknownScript_0x74ed4:
.NoTicket:
writetext UnknownText_0x74ff2
waitbutton
closetext
end
UnknownScript_0x74eda:
.NextShipWednesday:
writetext UnknownText_0x75059
waitbutton
closetext
end
UnknownScript_0x74ee0:
.NextShipSunday:
writetext UnknownText_0x75080
waitbutton
closetext