Merge branch 'master' into doc-overworld

Browse Source

...

This commit is contained in:

GriffinR

2020-07-18 20:24:09 -04:00

committed by GitHub

parent e129d04b93 8e6dd3bafe

commit af09e73d67

247 changed files with 4787 additions and 4035 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/battle_transitions/frontier_brain.bin → graphics/battle_transitions/frontier_logo.bin

graphics/battle_transitions/frontier_brain.png → graphics/battle_transitions/frontier_logo.png

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

graphics/battle_transitions/frontier_transition.bin → graphics/battle_transitions/frontier_logo_center.bin

graphics/battle_transitions/frontier_transition.png → graphics/battle_transitions/frontier_logo_center.png

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

graphics/battle_transitions/frontier_transition_circles.png → graphics/battle_transitions/frontier_logo_circles.png

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

graphics/misc/birch_ballarrow.png → graphics/misc/pokeball_selection.png

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

graphics/misc/birch_circle.png → graphics/misc/starter_circle.png

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