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 |
||
|---|---|---|
| .. | ||
| news | ||
| stadium | ||
| fixed_words.asm | ||
| mobile_5b.asm | ||
| mobile_5c.asm | ||
| mobile_5e.asm | ||
| mobile_5f.asm | ||
| mobile_12.asm | ||
| mobile_12_2.asm | ||
| mobile_22.asm | ||
| mobile_22_2.asm | ||
| mobile_40.asm | ||
| mobile_41.asm | ||
| mobile_42.asm | ||
| mobile_45.asm | ||
| mobile_45_sprite_engine.asm | ||
| mobile_46.asm | ||
| mobile_menu.asm | ||
| print_opp_message.asm | ||