1596 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bryan Bishop	6d7043c0c6	Merge pull request #197 from yenatch/master ... comment some move effects	2013-09-08 20:24:26 -07:00
yenatch	9f7adeafcf	ItemIsMail and comment thief move effect	2013-09-08 23:18:30 -04:00
yenatch	bd7563e0b6	comment arena trap move effect asm	2013-09-08 22:44:20 -04:00
yenatch	05db4b4cb6	comment nightmare move effect asm	2013-09-08 22:42:07 -04:00
yenatch	b4d37c675f	comment defrost move effect asm	2013-09-08 22:30:10 -04:00
yenatch	7a1951528d	comment curse move effect asm	2013-09-08 22:23:55 -04:00
Bryan Bishop	78a3951d47	Merge pull request #196 from yenatch/std-scripts ... std scripts	2013-09-08 17:06:54 -07:00
Bryan Bishop	50232cc92b	Merge pull request #195 from yenatch/predefs ... predefs	2013-09-08 16:47:29 -07:00
Bryan Bishop	3652417dda	Merge pull request #172 from kanzure/refactor-preprocessor ... Move main preprocessor into pokemontools	2013-09-08 09:20:02 -07:00
Bryan Bishop	5c4dc08ee4	Merge branch 'master' into refactor-preprocessor	2013-09-08 11:18:39 -05:00
Bryan Bishop	740f91370d	Merge pull request #190 from yenatch/master ... specials	2013-09-08 09:15:46 -07:00
Bryan Bishop	c9dba36d13	Merge pull request #194 from kanzure/fix-asm-whitespace ... whitespace -> tabs in main.asm	2013-09-07 18:03:06 -07:00
Bryan Bishop	4f7824ff08	whitespace -> tabs in main.asm ... How did these get in here?	2013-09-07 19:53:22 -05:00
yenatch	45e791bb42	StdScripts label in engine/scripting.asm	2013-09-07 05:08:34 -04:00
yenatch	5376a0c96b	the bomb 3 ... std scripts	2013-09-07 05:08:12 -04:00
yenatch	6f541d5723	labels for each predef ... also fix up any labels that got missed finally found a reference to the weird nop function (Function2d43)	2013-09-06 22:50:58 -04:00
yenatch	266e401b7d	the bomb 2 ... remaining predef asm	2013-09-06 18:31:40 -04:00
Bryan Bishop	11fea19455	Merge pull request #191 from Sanky/master ... PYTHON in Makefile	2013-09-06 13:42:33 -07:00
Sanky	03af68dc41	define PYTHON in Makefile for simpler local changes	2013-09-06 22:25:42 +02:00
yenatch	67dd49967d	labels for each special ... also fix up labels from last commit	2013-09-06 04:04:27 -04:00
yenatch	1660b814e8	the bomb ... specials asm dump	2013-09-06 03:50:55 -04:00
yenatch	4a429aded4	add a label in the text engine	2013-09-06 03:47:07 -04:00
yenatch	fb68f75d9f	update some labels and special/predef pointers	2013-09-06 01:57:03 -04:00
yenatch	a4707eccaf	couple more specials in bank 3	2013-09-05 17:40:21 -04:00
yenatch	2aff956ba4	some specials in bank 3 and unown dex asm	2013-09-05 17:05:30 -04:00