Leahnaya/pokecrystal
1
0
Fork 0
mirror of https://github.com/pret/pokecrystal.git synced 2026-05-09 12:51:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
fb2ac9e210
pokecrystal/engine/battle
History
Rangi 335c2699f0 Merge branch 'master' of https://github.com/pret/pokecrystal 
# 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
2018-02-25 20:39:54 -05:00
..
ai Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-25 20:39:54 -05:00
move_effects Use maskbits NUM_TYPES 2018-02-20 10:54:48 -05:00
anim_hp_bar.asm Keep documentation in sync with new WRAM labels 2018-02-03 20:40:21 -05:00
battle_transition.asm Macro factors out sine code, just like sine data, since it's used 5 times 2018-02-03 21:11:55 -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-25 20:39:54 -05:00
effect_commands.asm Consistent "X percent [+/- Y]" order 2018-02-04 21:21:34 -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