Merge branch 'master' into doc-dome

Browse Source

...

This commit is contained in:

GriffinR

2020-01-08 01:15:36 -05:00

committed by GitHub

parent 017fa294b5 8b1595ebc3

commit e5df61e362

164 changed files with 6060 additions and 5867 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

graphics/event_objects/pics/effects/unknown_33.png → graphics/event_objects/pics/effects/lavaridge_gym_warp.png

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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