Merge branch 'master' into fix-eventobj

Browse Source

...

This commit is contained in:

GriffinR

2020-01-08 05:51:49 -05:00

committed by GitHub

parent ef67f2d33b 8b1595ebc3

commit 635267ce32

27 changed files with 850 additions and 825 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

graphics/pokemon/farfetch_d/anim_front.png → graphics/pokemon/farfetchd/anim_front.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1.0 KiB

graphics/pokemon/farfetch_d/back.png → graphics/pokemon/farfetchd/back.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 696 B After Width:  |  Height:  |  Size: 696 B

graphics/pokemon/farfetch_d/footprint.png → graphics/pokemon/farfetchd/footprint.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 99 B After Width:  |  Height:  |  Size: 99 B

graphics/pokemon/farfetch_d/front.png → graphics/pokemon/farfetchd/front.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 733 B After Width:  |  Height:  |  Size: 733 B

graphics/pokemon/farfetch_d/icon.png → graphics/pokemon/farfetchd/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 396 B After Width:  |  Height:  |  Size: 396 B

graphics/pokemon/farfetch_d/normal.pal → graphics/pokemon/farfetchd/normal.pal

graphics/pokemon/farfetch_d/shiny.pal → graphics/pokemon/farfetchd/shiny.pal