yenatch 193dbd53a6 Merge commit '0ead58cd' into merge-mrwint ...

Conflicts:
	main.asm

2013-10-25 17:57:27 -04:00

..

ai

…

effects

…

moves

…

effect_command_pointers.asm

…

effect_commands.asm

Merge commit '0ead58cd' into merge-mrwint

2013-10-25 17:57:27 -04:00

hidden_power.asm

…

magikarp_length.asm

…

move_names.asm

…

type_matchup.asm

…