Merge branch 'master' into doc-overworld

Browse Source

...

This commit is contained in:

GriffinR authored and GitHub committed 2020-07-18 20:24:09 -04:00

2 parents e129d04b93 8e6dd3bafe

commit af09e73d67

247 files changed

+4787 -4035

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

No files matched your search

graphics/battle_transitions/frontier_brain.bin → graphics/battle_transitions/frontier_logo.bin

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.