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

Browse Source

...

This commit is contained in:

Rangi

2018-04-04 23:56:40 -04:00

parent 145efc1353 f750d4f418

commit 81306889e3

274 changed files with 667 additions and 554 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

0

engine/events/battle_tower/battle_tower.asm Executable file → Normal file

0

engine/events/battle_tower/trainer_text.asm Executable file → Normal file