mirror of https://github.com/pret/pokecrystal.git
335c2699f0
# 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 |
||
|---|---|---|
| .. | ||
| battle.asm | ||
| common.asm | ||
| common_1.asm | ||
| common_2.asm | ||
| common_3.asm | ||
| mail_input_chars.asm | ||
| name_input_chars.asm | ||
| std_text.asm | ||
| unused_dakutens.asm | ||
| unused_gen1_trainer_names.asm | ||
| unused_sweet_honey.asm | ||