mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
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 |
||
|---|---|---|
| .. | ||
| ai | ||
| move_effects | ||
| anim_hp_bar.asm | ||
| battle_transition.asm | ||
| battlestart_copytilemapatonce.asm | ||
| checkbattlescene.asm | ||
| consumehelditem.asm | ||
| core.asm | ||
| effect_commands.asm | ||
| hidden_power.asm | ||
| link_result.asm | ||
| menu.asm | ||
| misc.asm | ||
| read_trainer_attributes.asm | ||
| read_trainer_dvs.asm | ||
| read_trainer_party.asm | ||
| returntobattle_useball.asm | ||
| sliding_intro.asm | ||
| start_battle.asm | ||
| trainer_huds.asm | ||
| updatebattlehuds.asm | ||
| used_move_text.asm | ||