7 Commits

Author	SHA1	Message	Date
PikalaxALT	6b2d0ae841	Fix merge conflicts	2015-11-01 18:19:52 -05:00
PikalaxALT	31c407bb3d	Buena local labels	2015-11-01 12:44:30 -05: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	119d6b4119	About time I got to these functions	2015-10-24 10:39:52 -04: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