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
..
caught_mon.asm	Move events/ to engine/events/	2017-12-27 00:09:12 -05:00
contest_2.asm	Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)	2018-01-14 22:56:36 -05:00
contest.asm	Move events/ to engine/events/	2017-12-27 00:09:12 -05:00
display_stats.asm	Clean up Predef function names	2018-01-02 15:05:14 +01:00
judging.asm	Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)	2018-01-14 22:56:36 -05:00