22 Commits

Author	SHA1	Message	Date
PikalaxALT	8bf255b9f8	Prepare to merge	2016-01-18 00:39:01 -05:00
PikalaxALT	1df28a6beb	Merge branch 'master' of github.com:pret/pokecrystal into scriptmacrorenaming	2015-12-24 14:30:32 -05:00
PikalaxALT	3d36f1a837	Events and some WRAM cleanup	2015-12-18 20:07:09 -05:00
IIMarckus	da87d2a929	'db "@" \ db "@"' to 'db "@@"'.	2015-12-18 03:39:09 -07:00
PikalaxALT	8612a4a531	Renaming sections, further dissolving main.asm	2015-11-28 15:13:40 -05:00
PikalaxALT	f3c8f75209	bug contest judgint labels	2015-11-23 21:19:53 -05:00
PikalaxALT	58020fb5f6	trade animation	2015-11-23 00:21:21 -05:00
PikalaxALT	6b2d0ae841	Fix merge conflicts	2015-11-01 18:19:52 -05:00
PikalaxALT	8153737bae	Enumerate text constants	2015-10-30 10:34:35 -04:00
JimB16	a7cb2a5e9b	changed more labels	2015-09-10 01:27:07 +02:00
JimB16	0d4c2776d9	changed varlabels for multiply- and divide-func, renamed battletext-labels	2015-09-06 23:38:01 +02:00
JimB16	706f289c70	change more labelss	2015-08-25 01:56:30 +02:00
JimB16	3922ad2c3c	changed labels and added comments	2015-08-23 15:09:56 +02:00
yenatch	e2c2e20f93	Use charmaps for special string codepoints. ... Also fix all the text. Also fix some unreferenced scripts that were interpreted as text.	2015-06-27 22:53:38 -07:00
IIMarckus	2bf3a322ba	Labels for "sent some to mom" text.	2015-06-11 10:57:45 -06:00
yenatch	7c862ca7e2	Blind wram part 5. ... starting to go smoothly	2015-02-10 15:43:27 -08:00
yenatch	bc3a21193d	Residual damage, battle text labels, pic predefs.	2014-06-18 00:55:44 -07:00
yenatch	e23f341258	Battle type constants in the wild. ... Also add constants for trap and Celebi event battles.	2014-06-13 22:53:20 -07:00
yenatch	fd6cfc73ee	Text macros in text/.	2014-03-06 00:45:28 -05:00
yenatch	cf2acc1001	Use :: to export labels between objects. ... This fixes the build.	2014-02-01 20:26:39 -05:00
yenatch	869de91bd5	LostBattle and HalveMoney	2013-06-17 18:19:45 -04:00
Sanky	b3d8c2ec49	Split battle text from main.	2013-05-12 12:38:49 +02:00