diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 01:15:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 01:15:36 -0500 |
| commit | e5df61e362beaaab9ae4344f4f160397df9c54cc (patch) | |
| tree | 8bb86e5e523406b21daa08aff9bce080184fe31e /graphics | |
| parent | 017fa294b5c88ddd7513cb4976b5c29cad0b94a5 (diff) | |
| parent | 8b1595ebc36a623240fa8dd509864f5400eed1f9 (diff) | |
Merge branch 'master' into doc-dome
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/event_objects/pics/effects/lavaridge_gym_warp.png (renamed from graphics/event_objects/pics/effects/unknown_33.png) | bin | 406 -> 406 bytes | |||
| -rw-r--r-- | graphics/pokemon/farfetchd/anim_front.png (renamed from graphics/pokemon/farfetch_d/anim_front.png) | bin | 1032 -> 1032 bytes | |||
| -rw-r--r-- | graphics/pokemon/farfetchd/back.png (renamed from graphics/pokemon/farfetch_d/back.png) | bin | 696 -> 696 bytes | |||
| -rw-r--r-- | graphics/pokemon/farfetchd/footprint.png (renamed from graphics/pokemon/farfetch_d/footprint.png) | bin | 99 -> 99 bytes | |||
| -rw-r--r-- | graphics/pokemon/farfetchd/front.png (renamed from graphics/pokemon/farfetch_d/front.png) | bin | 733 -> 733 bytes | |||
| -rw-r--r-- | graphics/pokemon/farfetchd/icon.png (renamed from graphics/pokemon/farfetch_d/icon.png) | bin | 396 -> 396 bytes | |||
| -rw-r--r-- | graphics/pokemon/farfetchd/normal.pal (renamed from graphics/pokemon/farfetch_d/normal.pal) | 0 | ||||
| -rw-r--r-- | graphics/pokemon/farfetchd/shiny.pal (renamed from graphics/pokemon/farfetch_d/shiny.pal) | 0 |
8 files changed, 0 insertions, 0 deletions
diff --git a/graphics/event_objects/pics/effects/unknown_33.png b/graphics/event_objects/pics/effects/lavaridge_gym_warp.png Binary files differindex 26b852200..26b852200 100644 --- a/graphics/event_objects/pics/effects/unknown_33.png +++ b/graphics/event_objects/pics/effects/lavaridge_gym_warp.png diff --git a/graphics/pokemon/farfetch_d/anim_front.png b/graphics/pokemon/farfetchd/anim_front.png Binary files differindex 23176939b..23176939b 100644 --- a/graphics/pokemon/farfetch_d/anim_front.png +++ b/graphics/pokemon/farfetchd/anim_front.png diff --git a/graphics/pokemon/farfetch_d/back.png b/graphics/pokemon/farfetchd/back.png Binary files differindex 7f981b389..7f981b389 100644 --- a/graphics/pokemon/farfetch_d/back.png +++ b/graphics/pokemon/farfetchd/back.png diff --git a/graphics/pokemon/farfetch_d/footprint.png b/graphics/pokemon/farfetchd/footprint.png Binary files differindex 2f08f732d..2f08f732d 100644 --- a/graphics/pokemon/farfetch_d/footprint.png +++ b/graphics/pokemon/farfetchd/footprint.png diff --git a/graphics/pokemon/farfetch_d/front.png b/graphics/pokemon/farfetchd/front.png Binary files differindex d938c1b50..d938c1b50 100644 --- a/graphics/pokemon/farfetch_d/front.png +++ b/graphics/pokemon/farfetchd/front.png diff --git a/graphics/pokemon/farfetch_d/icon.png b/graphics/pokemon/farfetchd/icon.png Binary files differindex cb3cd931b..cb3cd931b 100644 --- a/graphics/pokemon/farfetch_d/icon.png +++ b/graphics/pokemon/farfetchd/icon.png diff --git a/graphics/pokemon/farfetch_d/normal.pal b/graphics/pokemon/farfetchd/normal.pal index 397d1195c..397d1195c 100644 --- a/graphics/pokemon/farfetch_d/normal.pal +++ b/graphics/pokemon/farfetchd/normal.pal diff --git a/graphics/pokemon/farfetch_d/shiny.pal b/graphics/pokemon/farfetchd/shiny.pal index 5537612ce..5537612ce 100644 --- a/graphics/pokemon/farfetch_d/shiny.pal +++ b/graphics/pokemon/farfetchd/shiny.pal |
