diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 20:24:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 20:24:09 -0400 |
| commit | af09e73d6733245ea61189f339b81ab68f645c17 (patch) | |
| tree | d425cff00e4c7dd8a564dbf17091d0d5d5f563fe /graphics | |
| parent | e129d04b931a4fc0e6584b4340dc57b9162264d5 (diff) | |
| parent | 8e6dd3bafeab105f079e120d3b2cd7e61cf10477 (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/battle_transitions/frontier_logo.bin (renamed from graphics/battle_transitions/frontier_brain.bin) | bin | 2048 -> 2048 bytes |
| -rw-r--r-- | graphics/battle_transitions/frontier_logo.png (renamed from graphics/battle_transitions/frontier_brain.png) | bin | 1582 -> 1582 bytes |
| -rw-r--r-- | graphics/battle_transitions/frontier_logo_center.bin (renamed from graphics/battle_transitions/frontier_transition.bin) | bin | 428 -> 428 bytes |
| -rw-r--r-- | graphics/battle_transitions/frontier_logo_center.png (renamed from graphics/battle_transitions/frontier_transition.png) | bin | 448 -> 448 bytes |
| -rw-r--r-- | graphics/battle_transitions/frontier_logo_circles.png (renamed from graphics/battle_transitions/frontier_transition_circles.png) | bin | 733 -> 733 bytes |
| -rw-r--r-- | graphics/misc/pokeball_selection.png (renamed from graphics/misc/birch_ballarrow.png) | bin | 635 -> 635 bytes |
| -rw-r--r-- | graphics/misc/starter_circle.png (renamed from graphics/misc/birch_circle.png) | bin | 349 -> 349 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/graphics/battle_transitions/frontier_brain.bin b/graphics/battle_transitions/frontier_logo.bin Binary files differindex 968b6eaca..968b6eaca 100644 --- a/graphics/battle_transitions/frontier_brain.bin +++ b/graphics/battle_transitions/frontier_logo.bin diff --git a/graphics/battle_transitions/frontier_brain.png b/graphics/battle_transitions/frontier_logo.png Binary files differindex 25af2e3ab..25af2e3ab 100644 --- a/graphics/battle_transitions/frontier_brain.png +++ b/graphics/battle_transitions/frontier_logo.png diff --git a/graphics/battle_transitions/frontier_transition.bin b/graphics/battle_transitions/frontier_logo_center.bin Binary files differindex 7b9d2af28..7b9d2af28 100644 --- a/graphics/battle_transitions/frontier_transition.bin +++ b/graphics/battle_transitions/frontier_logo_center.bin diff --git a/graphics/battle_transitions/frontier_transition.png b/graphics/battle_transitions/frontier_logo_center.png Binary files differindex 05ea84f2c..05ea84f2c 100644 --- a/graphics/battle_transitions/frontier_transition.png +++ b/graphics/battle_transitions/frontier_logo_center.png diff --git a/graphics/battle_transitions/frontier_transition_circles.png b/graphics/battle_transitions/frontier_logo_circles.png Binary files differindex 50e44e40c..50e44e40c 100644 --- a/graphics/battle_transitions/frontier_transition_circles.png +++ b/graphics/battle_transitions/frontier_logo_circles.png diff --git a/graphics/misc/birch_ballarrow.png b/graphics/misc/pokeball_selection.png Binary files differindex d2f0a3d97..d2f0a3d97 100644 --- a/graphics/misc/birch_ballarrow.png +++ b/graphics/misc/pokeball_selection.png diff --git a/graphics/misc/birch_circle.png b/graphics/misc/starter_circle.png Binary files differindex 3501dfec4..3501dfec4 100644 --- a/graphics/misc/birch_circle.png +++ b/graphics/misc/starter_circle.png |
