diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
| commit | 93f767e26de82d1d4133e719a758578ede98b306 (patch) | |
| tree | 0932ef3730d627bb9d9fc6c919cdcd5a6a358d7f /graphics/battle_transitions | |
| parent | dd7e19107879f74d8f962a6a47d619470eaefbcd (diff) | |
| parent | e50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff) | |
resolve conflict
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 |
