mirror of https://github.com/pret/pokecrystal.git
14c8cf5b48
# Conflicts: # data/player_names.asm # engine/battle/menu.asm # engine/billspc.asm # engine/billspctop.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/delete_save_change_clock.asm # engine/events/buena.asm # engine/events/elevator.asm # engine/events/kurt.asm # engine/events/mom.asm # engine/events/move_tutor.asm # engine/events/pokecenter_pc.asm # engine/events/pokepic.asm # engine/events/std_scripts.asm # engine/events/unown_walls.asm # engine/init_gender.asm # engine/intro_menu.asm # engine/mail.asm # engine/main_menu.asm # engine/mart.asm # engine/menu_2.asm # engine/mon_menu.asm # engine/pack.asm # engine/slot_machine.asm # engine/start_menu.asm # home/menu.asm # maps/CeladonDeptStore6F.asm # maps/CeladonGameCornerPrizeRoom.asm # maps/DragonShrine.asm # maps/EarlsPokemonAcademy.asm # maps/GoldenrodCity.asm # maps/GoldenrodDeptStore6F.asm # maps/GoldenrodGameCorner.asm # maps/GoldenrodPokeComCenter2FMobile.asm # mobile/mobile_12.asm # mobile/mobile_12_2.asm # mobile/mobile_22.asm # mobile/mobile_22_2.asm # mobile/mobile_40.asm # mobile/mobile_45.asm # mobile/mobile_45_sprite_engine.asm # mobile/mobile_46.asm # mobile/mobile_5c.asm # mobile/mobile_5f.asm # mobile/mobile_menu.asm |
||
---|---|---|
.. | ||
ai | ||
effect_commands | ||
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 |