10 Commits

Author	SHA1	Message	Date
PikalaxALT	6b2d0ae841	Fix merge conflicts	2015-11-01 18:19:52 -05:00
PikalaxALT	3b4805ee98	Sweepthrough of ClearBox arg conversion to lb	2015-11-01 09:38:48 -05:00
PikalaxALT	ed29db5841	No more -bash000; engine/movement.asm, SPRITEMOVEFN	2015-10-29 23:32:11 -04:00
JimB16	9a9cb38e39	merge with newest update	2015-10-26 03:26:53 +01:00
PikalaxALT	4d17f6e1f6	Address comments on PR 322	2015-10-24 19:49:19 -04:00
PikalaxALT	6c25592b8c	So very jumb	2015-10-19 16:49:29 -04:00
JimB16	3b9a3cc3be	merge conflicts resolved	2015-10-19 16:25:15 +02:00
PikalaxALT	da7849d800	Restructured functions in main.asm to resemble the home functions they clone	2015-10-17 13:00:34 -04:00
PikalaxALT	4fa6c6daa4	Split up bank 2; other relabelings	2015-10-16 13:35:43 -04:00
PikalaxALT	327faac497	Magikarp functions moved to event/magikarp.asm	2015-10-11 12:26:39 -04:00