diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
| commit | a3ebca4d814adcf245212cb549f72812f2cf39c6 (patch) | |
| tree | 88fddcd03a5f19cf84b6199863f95fd06f1954bf /graphics | |
| parent | 1e3da62d24ad91e4d69ac6974476fd5ea47cae9b (diff) | |
| parent | a0ff38d0be4f618822d96cc7833e7c331ee78b5f (diff) | |
Fix merge conflicts
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/battle_anims/sprites/effect.pal | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/graphics/battle_anims/sprites/effect.pal b/graphics/battle_anims/sprites/effect.pal deleted file mode 100644 index 3dcf4cff6..000000000 --- a/graphics/battle_anims/sprites/effect.pal +++ /dev/null @@ -1,27 +0,0 @@ -JASC-PAL -0100 -24 -230 205 8 -230 172 41 -222 148 65 -222 115 90 -213 82 123 -213 57 148 -205 24 172 -205 0 205 -205 0 189 -205 0 164 -205 0 131 -205 0 106 -213 0 82 -213 0 49 -213 0 24 -222 0 0 -222 8 0 -222 41 0 -222 74 0 -222 98 0 -230 131 0 -230 156 0 -230 189 0 -238 222 0 |