diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:00:47 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:14:15 -0700 |
commit | 415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch) | |
tree | 8793240342d37104610f34756f6fee9db706ee8f /graphics/trainers/magma_admin_f | |
parent | ae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff) | |
parent | 1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff) |
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'graphics/trainers/magma_admin_f')
-rw-r--r-- | graphics/trainers/magma_admin_f/front.png | bin | 782 -> 0 bytes | |||
-rw-r--r-- | graphics/trainers/magma_admin_f/palette.pal | 19 |
2 files changed, 0 insertions, 19 deletions
diff --git a/graphics/trainers/magma_admin_f/front.png b/graphics/trainers/magma_admin_f/front.png Binary files differdeleted file mode 100644 index c5890b11f..000000000 --- a/graphics/trainers/magma_admin_f/front.png +++ /dev/null diff --git a/graphics/trainers/magma_admin_f/palette.pal b/graphics/trainers/magma_admin_f/palette.pal deleted file mode 100644 index a987cdbc1..000000000 --- a/graphics/trainers/magma_admin_f/palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -106 74 74 -123 123 123 -90 90 90 -82 98 148 -57 57 65 -65 74 115 -139 49 65 -189 189 180 -222 82 98 -189 57 74 -255 255 255 -0 0 0 |