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/data/text
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
..
battle.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-25 20:39:54 -05:00
common_1.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-25 20:39:54 -05:00
common_2.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-25 20:39:54 -05:00
common_3.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-25 20:39:54 -05:00
common.asm data/text/X_text.asm is redundant 2018-01-24 21:27:23 -05:00
mail_input_chars.asm Add data/text/ 2018-01-22 17:33:52 -05:00
name_input_chars.asm Add data/text/ 2018-01-22 17:33:52 -05:00
std_text.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
unused_dakutens.asm Add data/text/ 2018-01-22 17:33:52 -05:00
unused_gen1_trainer_names.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
unused_sweet_honey.asm data/text/X_text.asm is redundant 2018-01-24 21:27:23 -05:00