pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity
60e21a8663
pokecrystal-board/mobile
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
..
news Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
stadium Move all misc/ and unknown/ files to meaningful directories 2017-12-15 13:21:47 -05:00
fixed_words.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mobile_5b.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-15 21:21:58 -05:00
mobile_5c.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-25 20:39:54 -05:00
mobile_5e.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mobile_5f.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-25 20:39:54 -05:00
mobile_12_2.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mobile_12.asm Sync code with wiki 2018-02-04 13:16:40 -05:00
mobile_22_2.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mobile_22.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mobile_40.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-25 20:39:54 -05:00
mobile_41.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mobile_42.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
mobile_45_sprite_engine.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mobile_45.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mobile_46.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-25 20:39:54 -05:00
mobile_menu.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
print_opp_message.asm Use BANK for all hardcoded banks with BANK in comments. 2018-01-02 16:46:40 -05:00