pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08: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

24
maps/RadioTower3F.asm
View File

@@ -30,13 +30,13 @@ GymGuyScript_0x5e556:
faceplayer
opentext
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x5e564
iftrue .NoRockets
writetext UnknownText_0x5e682
waitbutton
closetext
end
UnknownScript_0x5e564:
.NoRockets:
writetext UnknownText_0x5e6eb
waitbutton
closetext
@@ -46,37 +46,37 @@ CooltrainerFScript_0x5e56a:
faceplayer
opentext
checkevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
iftrue UnknownScript_0x5e59d
iftrue .GotSunnyDay
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x5e58a
iftrue .NoRockets
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
iftrue UnknownScript_0x5e584
iftrue .UsedCardKey
writetext UnknownText_0x5e754
waitbutton
closetext
end
UnknownScript_0x5e584:
.UsedCardKey:
writetext UnknownText_0x5e7cb
waitbutton
closetext
end
UnknownScript_0x5e58a:
.NoRockets:
writetext UnknownText_0x5e7e2
buttonsound
verbosegiveitem TM_SUNNY_DAY
iffalse UnknownScript_0x5e5a1
iffalse .NoRoom
writetext UnknownText_0x5e821
waitbutton
closetext
setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
end
UnknownScript_0x5e59d:
.GotSunnyDay:
writetext UnknownText_0x5e85c
waitbutton
UnknownScript_0x5e5a1:
.NoRoom:
closetext
end
@@ -129,10 +129,10 @@ MapRadioTower3FSignpost2Script::
writetext UnknownText_0x5eaa4
waitbutton
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
iftrue UnknownScript_0x5e603
iftrue .UsedCardKey
checkitem CARD_KEY
iftrue UnknownScript_0x5e605
UnknownScript_0x5e603:
.UsedCardKey:
closetext
end