pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity
2b82338920
pokecrystal-board/engine/battle
History
Remy Oukaour 14c8cf5b48 Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452) 
# 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
2018-01-14 23:43:51 -05:00
..
ai Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
effect_commands Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
anim_hp_bar.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
battle_transition.asm Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 2018-01-14 23:00:22 -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 Document hardcoded SRAM addresses. 2018-01-08 22:48:58 -05:00
consumehelditem.asm Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00
core.asm Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 2018-01-14 23:00:22 -05:00
effect_commands.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
hidden_power.asm Do a little cleanup towards issue #465 2018-01-09 17:20:47 -05:00
link_result.asm Split battle/ into data/ and engine/ components 2017-12-26 17:47:05 -05:00
menu.asm Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452) 2018-01-14 23:43:51 -05:00
misc.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
read_trainer_attributes.asm Split battle/ into data/ and engine/ components 2017-12-26 17:47:05 -05:00
read_trainer_dvs.asm Remove redundant data/ filename prefixes 2017-12-27 01:29:15 -05:00
read_trainer_party.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
returntobattle_useball.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
sliding_intro.asm Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 2018-01-14 23:00:22 -05:00
start_battle.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
trainer_huds.asm Resolve #461 2018-01-10 13:47:57 -05:00
updatebattlehuds.asm Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00
used_move_text.asm Arrays end with -1, not $ff 2018-01-10 22:53:42 -05:00