pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity
335c2699f0
pokecrystal-board/engine/phone
History
Rangi 335c2699f0 Merge branch 'master' of https://github.com/pret/pokecrystal 
# 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
2018-02-25 20:39:54 -05:00
..
buenas_password.asm Remove checkmorn/checkday/checknite macros 2018-02-02 21:20:13 -05:00
generic_calls.asm Remove checkmorn/checkday/checknite macros 2018-02-02 21:20:13 -05:00
phone_callers.asm Script commands don't have underscores 2018-02-02 21:09:17 -05:00
phone_gossip.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-25 20:39:54 -05:00
phone_scripts.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-25 20:39:54 -05:00
phone.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00