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
..
scripts	Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts	2018-01-13 00:47:38 -05:00
code.asm	Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)	2018-01-14 22:56:36 -05:00
color.asm	Reorganize some macros	2018-01-07 13:11:29 -05:00
coords.asm	bgrows → * BG_MAP_WIDTH	2017-12-29 18:59:50 -05:00
data.asm	menu_coords macro for (x1, y1, x2, y2) order (see issue #440)	2018-01-13 16:38:14 -05:00
enum.asm	Specialized macros go with their data/code	2018-01-10 00:08:05 -05:00
predef.asm	dwb → dab	2017-12-26 14:39:16 -05:00
rst.asm	endm -> ENDM	2017-12-28 22:31:16 +01:00
wram.asm	Resolve #461	2018-01-10 13:47:57 -05:00