Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)

Browse Source

# Conflicts:
#	engine/battle/core.asm
#	engine/save.asm

...

This commit is contained in:

Remy Oukaour

2018-01-14 23:00:22 -05:00

parent 5c28d05bb4 6c5cd7a963

commit dfcca93b45

54 changed files with 298 additions and 324 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

249

mobile/mobile_5f.asm

File diff suppressed because it is too large Load Diff