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
..
images	Tileset images are 128px wide	2018-01-03 02:02:15 -05:00
assembly_programming.md	Expand assembly documentation	2017-12-25 14:33:18 -05:00
battle_anim_commands.md	Bold	2018-01-01 18:44:08 -05:00
bugs_and_glitches.md	Document the Magikarp bug fix from PR #443	2017-12-28 14:08:29 -05:00
design_flaws.md	Split tilesets/ into gfx/tilesets and data/tilesets/	2018-01-09 23:53:58 -05:00
event_commands.md	Use more constants in scripts	2018-01-12 02:27:42 -05:00
map_scripts.md	Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts	2018-01-13 00:47:38 -05:00
menu.md	Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)	2018-01-14 23:43:51 -05:00
move_effect_commands.md	Other files belong in data/battle/	2018-01-10 17:49:19 -05:00
movement_commands.md	Renaming: (fix #412)	2017-12-24 14:33:17 -05:00
music_commands.md	Correct documentation	2017-12-26 22:36:01 -05:00
pic_animations.md	Use "battle_anims" and "sprite_anims" for clarity, not just "anims"	2017-12-26 18:45:04 -05:00
text_commands.md	fix markdown reference links	2017-12-24 21:27:20 -05:00