Remy Oukaour 5c28d05bb4 Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) ...

# Conflicts:
#	data/items/descriptions.asm
#	data/sprite_anims/framesets.asm
#	engine/crystal_colors.asm
#	engine/events/kurt.asm
#	engine/events/special.asm
#	engine/events/std_scripts.asm
#	engine/events_3.asm
#	engine/item_effects.asm
#	engine/namingscreen.asm
#	engine/scripting.asm
#	engine/stats_screen.asm
#	engine/trade_animation.asm
#	home/audio.asm
#	main.asm
#	maps/BattleTower1F.asm
#	maps/BattleTowerBattleRoom.asm
#	maps/BurnedTowerB1F.asm
#	maps/ElmsLab.asm
#	maps/GoldenrodDeptStore5F.asm
#	maps/GoldenrodUnderground.asm
#	maps/HallOfFame.asm
#	maps/MahoganyTown.asm
#	maps/ManiasHouse.asm
#	maps/MobileBattleRoom.asm
#	maps/MobileTradeRoomMobile.asm
#	maps/RadioTower2F.asm
#	maps/Route35NationalParkGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/Route39Farmhouse.asm
#	tilesets/palette_maps.asm

2018-01-14 22:56:36 -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 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)

2018-01-14 22:56:36 -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

Use "battle_anims" and "sprite_anims" for clarity, not just "anims"

2017-12-26 18:45:04 -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 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)

2018-01-14 22:56:36 -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

menu_coords macro for (x1, y1, x2, y2) order (see issue #440)

2018-01-13 16:38:14 -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

Resolve #461

2018-01-10 13:47:57 -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