diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
| commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
| tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /graphics/battle_transitions | |
| parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) | |
fix merge conflicts
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 |
