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

20
maps/Route34IlexForestGate.asm
View File

@@ -22,9 +22,9 @@ Route34IlexForestGate_MapScripts:
appear ROUTE34ILEXFORESTGATE_TEACHER1
return
UnknownScript_0x62d3d:
Route34IlexForestGateCelebiEvent:
checkevent EVENT_FOREST_IS_RESTLESS
iffalse UnknownScript_0x62d62
iffalse .skip
showemote EMOTE_SHOCK, ROUTE34ILEXFORESTGATE_TEACHER2, 20
turnobject ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
turnobject PLAYER, RIGHT
@@ -37,29 +37,29 @@ UnknownScript_0x62d3d:
waitbutton
closetext
applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a
UnknownScript_0x62d62:
.skip:
end
TeacherScript_0x62d63:
faceplayer
opentext
checkevent EVENT_FOREST_IS_RESTLESS
iftrue UnknownScript_0x62d84
iftrue .ForestIsRestless
checkevent EVENT_GOT_TM12_SWEET_SCENT
iftrue UnknownScript_0x62d7e
iftrue .GotSweetScent
writetext UnknownText_0x62d9d
buttonsound
verbosegiveitem TM_SWEET_SCENT
iffalse UnknownScript_0x62d82
iffalse .NoRoom
setevent EVENT_GOT_TM12_SWEET_SCENT
UnknownScript_0x62d7e:
.GotSweetScent:
writetext UnknownText_0x62df6
waitbutton
UnknownScript_0x62d82:
.NoRoom:
closetext
end
UnknownScript_0x62d84:
.ForestIsRestless:
writetext UnknownText_0x62e41
buttonsound
closetext
@@ -143,7 +143,7 @@ Route34IlexForestGate_MapEvents:
warp_event 5, 7, ILEX_FOREST, 1
db 1 ; coord events
coord_event 4, 7, SCENE_DEFAULT, UnknownScript_0x62d3d
coord_event 4, 7, SCENE_DEFAULT, Route34IlexForestGateCelebiEvent
db 0 ; bg events