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:
#	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

20
maps/RuinsOfAlphKabutoChamber.asm
View File

@@ -57,10 +57,10 @@ MapRuinsOfAlphKabutoChamberSignpost2Script:
writebyte UNOWNPUZZLE_KABUTO
special UnownPuzzle
closetext
iftrue UnknownScript_0x58778
iftrue .PuzzleComplete
end
UnknownScript_0x58778:
.PuzzleComplete:
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_KABUTO_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_A_TO_K
@@ -84,27 +84,27 @@ ScientistScript_0x587a8:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
ifequal NUM_UNOWN, UnknownScript_0x587cf
ifequal NUM_UNOWN, .AllUnownCaught
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue UnknownScript_0x587c9
iftrue .WallOpen
checkevent EVENT_SOLVED_KABUTO_PUZZLE
iffalse UnknownScript_0x587c0
iffalse .PuzzleIncomplete
writetext UnknownText_0x589b8
buttonsound
UnknownScript_0x587c0:
.PuzzleIncomplete:
writetext UnknownText_0x588f5
waitbutton
closetext
turnobject RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
end
UnknownScript_0x587c9:
.WallOpen:
writetext UnknownText_0x5897c
waitbutton
closetext
end
UnknownScript_0x587cf:
.AllUnownCaught:
writetext UnknownText_0x594cb
waitbutton
closetext
@@ -126,7 +126,7 @@ MapRuinsOfAlphKabutoChamberSignpost4Script:
MapRuinsOfAlphKabutoChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue UnknownScript_0x587f7
iftrue .WallOpen
opentext
writetext UnknownText_0x58ad9
writebyte UNOWNWORDS_ESCAPE
@@ -134,7 +134,7 @@ MapRuinsOfAlphKabutoChamberSignpost5Script:
closetext
end
UnknownScript_0x587f7:
.WallOpen:
opentext
writetext UnknownText_0x58afa
waitbutton