2Tie 2f0b152e5a this is how you fix conflicts, right?		2018-06-18 22:53:06 -06:00
..
items	Merge branch 'math_etc' into 'master'	2018-06-10 14:20:59 +02:00
maps	Add proper tileset constants	2018-06-07 17:14:18 +02:00
moves	Use fullwidth digits	2018-06-01 10:46:40 -04:00
pokemon	Define landmark constants	2018-06-05 11:56:42 -04:00
sprites	Disassemble overworld sprites	2018-05-31 19:38:55 -04:00
trainers	Finish dumping trainer parties.	2018-06-06 02:37:26 -06:00
types	Declare Pokédex type search data; add more comments	2018-05-31 11:32:30 -04:00
predef_pointers.inc	this is how you fix conflicts, right?	2018-06-18 22:53:06 -06:00
super_palettes.inc	Merge branch 'master' into build_more_roms	2018-06-02 21:26:20 -04:00
tileset_headers.asm	Make the repository build all four ROMs	2018-06-02 20:16:37 -04:00
wild.asm	Define landmark constants	2018-06-05 11:56:42 -04:00