yenatch 81e2a3f0cf Merge remote-tracking branch 'xcrystal/master' into master ...

Conflicts:
	battle/ai/scoring.asm
	main.asm

2014-10-23 02:41:52 -04:00

..

items.asm

Better labels for item/switch AI.

2014-09-30 11:20:38 -07:00

scoring.asm

Merge remote-tracking branch 'xcrystal/master' into master

2014-10-23 02:41:52 -04:00