1604 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bryan Bishop	35324ae43f	Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds ... https://github.com/kanzure/pokecrystal/pull/198	2013-09-09 15:55:43 -05:00
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
yenatch	3b119687f3	leftover trainer class names from red ... you can find these in pokered at TrainerNamePointers (9:7e64)	2013-09-07 22:48:07 -04:00
yenatch	03a6cfc2d3	OTName wram label	2013-09-07 22:47:58 -04: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	353b4ac6da	fix up TreeMons/RockMons	2013-09-07 17:35:41 -04:00
yenatch	6e5876377f	split out std scripts from main.asm	2013-09-07 15:30:07 -04:00
yenatch	ed2063276a	add a menudata2 header in std scripts ... thats it for std incbins	2013-09-07 15:26:52 -04:00
yenatch	eaaf719440	label some jumps in std scripts	2013-09-07 14:42:28 -04:00
yenatch	3301e5b77b	shorten PrintMoveDescription -> PrintMoveDesc so rgbds doesnt choke ... still need to fix this 15-char macro argument limit	2013-09-07 14:14:29 -04: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