Leahnaya/pokecrystal
1
0
Fork 0
mirror of https://github.com/pret/pokecrystal.git synced 2026-05-18 19:28:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
32ed487a47
pokecrystal/engine/battle
History
Rangi 32ed487a47 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
2018-02-03 19:42:56 -05:00
..
ai Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
move_effects Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
anim_hp_bar.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
battle_transition.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
battlestart_copytilemapatonce.asm Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00
checkbattlescene.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
consumehelditem.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
core.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
effect_commands.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
hidden_power.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
link_result.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
menu.asm MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440) 2018-01-23 16:08:43 -05:00
misc.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
read_trainer_attributes.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
read_trainer_dvs.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
read_trainer_party.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
returntobattle_useball.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
sliding_intro.asm Fix wVirtualOAM labels, part 2. 2018-01-30 14:52:46 -05:00
start_battle.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
trainer_huds.asm Fix wVirtualOAM labels, part 2. 2018-01-30 14:52:46 -05:00
updatebattlehuds.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
used_move_text.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00