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

40
maps/RuinsOfAlphResearchCenter.asm
View File

@@ -61,13 +61,13 @@ ScientistScript_0x591d1:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
ifequal NUM_UNOWN, UnknownScript_0x591df
ifequal NUM_UNOWN, .PrinterAvailable
writetext UnknownText_0x59311
waitbutton
closetext
end
UnknownScript_0x591df:
.PrinterAvailable:
writetext UnknownText_0x5935f
waitbutton
closetext
@@ -77,29 +77,29 @@ ScientistScript_0x591e5:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
ifequal NUM_UNOWN, UnknownScript_0x5920b
ifequal NUM_UNOWN, .GotAllUnown
checkflag ENGINE_UNOWN_DEX
iftrue UnknownScript_0x59205
iftrue .GotUnownDex
checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
iftrue UnknownScript_0x591ff
iftrue .UnownAppeared
writetext UnknownText_0x593ed
waitbutton
closetext
end
UnknownScript_0x591ff:
.UnownAppeared:
writetext UnknownText_0x59478
waitbutton
closetext
end
UnknownScript_0x59205:
.GotUnownDex:
writetext UnknownText_0x59445
waitbutton
closetext
end
UnknownScript_0x5920b:
.GotAllUnown:
writetext UnknownText_0x594cb
waitbutton
closetext
@@ -110,21 +110,21 @@ ScientistScript_0x59214:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
ifequal NUM_UNOWN, UnknownScript_0x5922e
ifequal NUM_UNOWN, .GotAllUnown
checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
iftrue UnknownScript_0x59228
iftrue .UnownAppeared
writetext UnknownText_0x5954f
waitbutton
closetext
end
UnknownScript_0x59228:
.UnownAppeared:
writetext UnknownText_0x595cb
waitbutton
closetext
end
UnknownScript_0x5922e:
.GotAllUnown:
writetext UnknownText_0x59769
waitbutton
closetext
@@ -133,16 +133,16 @@ UnknownScript_0x5922e:
MapRuinsOfAlphResearchCenterSignpost1Script:
opentext
checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
iftrue UnknownScript_0x59241
iftrue .SkipChecking
checkcode VAR_UNOWNCOUNT
ifequal NUM_UNOWN, UnknownScript_0x59247
UnknownScript_0x59241:
ifequal NUM_UNOWN, .GotAllUnown
.SkipChecking:
writetext UnknownText_0x597b6
waitbutton
closetext
end
UnknownScript_0x59247:
.GotAllUnown:
writetext UnknownText_0x597d9
waitbutton
closetext
@@ -151,16 +151,16 @@ UnknownScript_0x59247:
MapRuinsOfAlphResearchCenterSignpost2Script:
opentext
checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
iftrue UnknownScript_0x5925a
iftrue .SkipChecking
checkcode VAR_UNOWNCOUNT
ifequal NUM_UNOWN, UnknownScript_0x59260
UnknownScript_0x5925a:
ifequal NUM_UNOWN, .PrinterAvailable
.SkipChecking:
writetext UnknownText_0x5980e
waitbutton
closetext
end
UnknownScript_0x59260:
.PrinterAvailable:
writetext UnknownText_0x5982d
waitbutton
special UnownPrinter