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

Browse Source

# Conflicts:
#	include/strings.h

...

This commit is contained in:

KDSKardabox

2018-02-13 10:02:27 +05:30

parent ae321d6e7c 398e775d90

commit aaea65c37b

27 changed files with 2535 additions and 6615 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

6452

asm/item_menu.s

File diff suppressed because it is too large Load Diff