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:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm
This commit is contained in:
Rangi
2018-02-25 20:39:54 -05:00
parent 10173f2a62 f44f306cfd
commit 335c2699f0
98 changed files with 1274 additions and 1227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
maps/SaffronCity.asm
View File

@@ -22,13 +22,13 @@ LassScript_0x19932a:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x199338
iftrue .ReturnedPart
writetext UnknownText_0x19938d
waitbutton
closetext
end
UnknownScript_0x199338:
.ReturnedPart:
writetext UnknownText_0x19940d
waitbutton
closetext
@@ -38,13 +38,13 @@ PokefanMScript_0x19933e:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x19934c
iftrue .ReturnedPart
writetext UnknownText_0x199460
waitbutton
closetext
end
UnknownScript_0x19934c:
.ReturnedPart:
writetext UnknownText_0x1994ae
waitbutton
closetext
@@ -60,13 +60,13 @@ FisherScript_0x199358:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x199366
iftrue .ReturnedPart
writetext UnknownText_0x1995fc
waitbutton
closetext
end
UnknownScript_0x199366:
.ReturnedPart:
writetext UnknownText_0x19964b
waitbutton
closetext