Merge branch 'master' of github.com:pret/pokeemerald

Browse Source

...

This commit is contained in:

Diegoisawesome

2018-08-15 16:22:54 -07:00

parent e7da514382 f65da613cf

commit 13dc7a4170

12 changed files with 3887 additions and 5451 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/pokemon.c

+1247 -3

File diff suppressed because it is too large Load Diff