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

Browse Source

...

This commit is contained in:

golem galvanize

2018-12-18 20:23:32 -05:00

parent 15a7b1bc08 b2ac3b6d6f

commit f7df299be8

11 changed files with 6562 additions and 13009 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

12488

asm/battle_anim_815A0D4.s

File diff suppressed because it is too large Load Diff

1632

asm/battle_anim_effects_3.s Normal file

File diff suppressed because it is too large Load Diff