diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
| commit | 06bf25405c98257e47953b5d3c327e314ea371b3 (patch) | |
| tree | 81be5b612621bdd74f632dbedb9f85c4d1d203b9 /graphics/battle_transitions | |
| parent | 282cae4a9fbd019a973fb6618337d29a61f97f42 (diff) | |
| parent | be05c5bd52769b58316986bd7451cb2483571099 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-pika
Conflicts:
include/use_pokeblock.h
Diffstat (limited to 'graphics/battle_transitions')
| -rw-r--r--[-rwxr-xr-x] | graphics/battle_transitions/vs.png | bin | 533 -> 533 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.pal | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | graphics/battle_transitions/vs_frame.png | bin | 317 -> 317 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/graphics/battle_transitions/vs.png b/graphics/battle_transitions/vs.png Binary files differindex a1badcb02..a1badcb02 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.pal b/graphics/battle_transitions/vs_frame.pal index 104afd395..104afd395 100755..100644 --- a/graphics/battle_transitions/vs_frame.pal +++ b/graphics/battle_transitions/vs_frame.pal 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 |
