diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2018-01-21 20:38:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-21 20:38:34 -0500 |
| commit | 097da4e0112275a25b99160f5bc409a51f3a13d7 (patch) | |
| tree | bf94ff010c6a0efcba7cdf3cb958805cabc191a6 /graphics/battle_transitions | |
| parent | 19864d3cd93e57880da1430489c365907fb0a7a3 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' into libc
Diffstat (limited to 'graphics/battle_transitions')
| -rw-r--r--[-rwxr-xr-x] | graphics/battle_transitions/frontier_transition.png | bin | 448 -> 448 bytes |
| -rw-r--r--[-rwxr-xr-x] | graphics/battle_transitions/frontier_transition_circles.png | bin | 733 -> 733 bytes |
| -rw-r--r--[-rwxr-xr-x] | graphics/battle_transitions/vs.png | bin | 343 -> 343 bytes |
| -rw-r--r--[-rwxr-xr-x] | graphics/battle_transitions/vs_frame.bin | bin | 2048 -> 2048 bytes |
| -rw-r--r--[-rwxr-xr-x] | graphics/battle_transitions/vs_frame.png | bin | 317 -> 317 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/graphics/battle_transitions/frontier_transition.png b/graphics/battle_transitions/frontier_transition.png Binary files differindex 05ea84f2c..05ea84f2c 100755..100644 --- a/graphics/battle_transitions/frontier_transition.png +++ b/graphics/battle_transitions/frontier_transition.png diff --git a/graphics/battle_transitions/frontier_transition_circles.png b/graphics/battle_transitions/frontier_transition_circles.png Binary files differindex 50e44e40c..50e44e40c 100755..100644 --- a/graphics/battle_transitions/frontier_transition_circles.png +++ b/graphics/battle_transitions/frontier_transition_circles.png diff --git a/graphics/battle_transitions/vs.png b/graphics/battle_transitions/vs.png Binary files differindex 5491990f6..5491990f6 100755..100644 --- a/graphics/battle_transitions/vs.png +++ b/graphics/battle_transitions/vs.png diff --git a/graphics/battle_transitions/vs_frame.bin b/graphics/battle_transitions/vs_frame.bin Binary files differindex 2ad153964..2ad153964 100755..100644 --- a/graphics/battle_transitions/vs_frame.bin +++ b/graphics/battle_transitions/vs_frame.bin diff --git a/graphics/battle_transitions/vs_frame.png b/graphics/battle_transitions/vs_frame.png Binary files differindex 0b38c8960..0b38c8960 100755..100644 --- a/graphics/battle_transitions/vs_frame.png +++ b/graphics/battle_transitions/vs_frame.png |
