diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-12-31 00:40:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-31 00:40:45 -0500 |
| commit | ec85c01e7c6d15060eddcc653db33a4b317646d2 (patch) | |
| tree | 4266c43bcdc1c80c52def44e1470182d3f1c665c /graphics/trainers | |
| parent | 093610b46e99b517a416ccd5a572054dff09801b (diff) | |
| parent | 0c74e2097ffbe8395d6f3659c2a49fc829d69b99 (diff) | |
Merge branch 'master' into doc-factscreen
Diffstat (limited to 'graphics/trainers')
| -rw-r--r-- | graphics/trainers/front_pics/cooltrainer_f_front_pic.png (renamed from graphics/trainers/front_pics/cool_trainer_f_front_pic.png) | bin | 681 -> 681 bytes | |||
| -rw-r--r-- | graphics/trainers/front_pics/cooltrainer_m_front_pic.png (renamed from graphics/trainers/front_pics/cool_trainer_m_front_pic.png) | bin | 627 -> 627 bytes | |||
| -rw-r--r-- | graphics/trainers/palettes/cooltrainer_f.pal (renamed from graphics/trainers/palettes/cool_trainer_f.pal) | 0 | ||||
| -rw-r--r-- | graphics/trainers/palettes/cooltrainer_m.pal (renamed from graphics/trainers/palettes/cool_trainer_m.pal) | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/graphics/trainers/front_pics/cool_trainer_f_front_pic.png b/graphics/trainers/front_pics/cooltrainer_f_front_pic.png Binary files differindex 572aa811a..572aa811a 100644 --- a/graphics/trainers/front_pics/cool_trainer_f_front_pic.png +++ b/graphics/trainers/front_pics/cooltrainer_f_front_pic.png diff --git a/graphics/trainers/front_pics/cool_trainer_m_front_pic.png b/graphics/trainers/front_pics/cooltrainer_m_front_pic.png Binary files differindex 6b998992e..6b998992e 100644 --- a/graphics/trainers/front_pics/cool_trainer_m_front_pic.png +++ b/graphics/trainers/front_pics/cooltrainer_m_front_pic.png diff --git a/graphics/trainers/palettes/cool_trainer_f.pal b/graphics/trainers/palettes/cooltrainer_f.pal index 292d0fc78..292d0fc78 100644 --- a/graphics/trainers/palettes/cool_trainer_f.pal +++ b/graphics/trainers/palettes/cooltrainer_f.pal diff --git a/graphics/trainers/palettes/cool_trainer_m.pal b/graphics/trainers/palettes/cooltrainer_m.pal index 52a32e925..52a32e925 100644 --- a/graphics/trainers/palettes/cool_trainer_m.pal +++ b/graphics/trainers/palettes/cooltrainer_m.pal |
