diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /graphics | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/battle_interface/textbox.png (renamed from graphics/interface/menu.png) | bin | 444 -> 444 bytes | |||
| -rw-r--r-- | graphics/battle_interface/textbox_0.pal (renamed from graphics/interface/menu_0.pal) | 0 | ||||
| -rw-r--r-- | graphics/battle_interface/textbox_1.pal (renamed from graphics/interface/menu_1.pal) | 0 | ||||
| -rw-r--r-- | graphics/battle_interface/textbox_map.bin (renamed from graphics/interface/menu_map.bin) | bin | 4096 -> 4096 bytes | |||
| -rw-r--r-- | graphics/pokedex/85B8BF0.pal | 19 | ||||
| -rwxr-xr-x | graphics/pokedex/85B8C10.png | bin | 0 -> 135 bytes | |||
| -rw-r--r-- | graphics/trainers/front_pics/pokefan_f_front_pic.png (renamed from graphics/trainers/front_pics/winstrate_f_front_pic.png) | bin | 849 -> 849 bytes | |||
| -rw-r--r-- | graphics/trainers/front_pics/pokefan_m_front_pic.png (renamed from graphics/trainers/front_pics/winstrate_m_front_pic.png) | bin | 786 -> 786 bytes | |||
| -rw-r--r-- | graphics/trainers/palettes/pokefan_f.pal (renamed from graphics/trainers/palettes/winstrate_f.pal) | 0 | ||||
| -rw-r--r-- | graphics/trainers/palettes/pokefan_m.pal (renamed from graphics/trainers/palettes/winstrate_m.pal) | 0 |
10 files changed, 0 insertions, 19 deletions
diff --git a/graphics/interface/menu.png b/graphics/battle_interface/textbox.png Binary files differindex 96f6b8b15..96f6b8b15 100644 --- a/graphics/interface/menu.png +++ b/graphics/battle_interface/textbox.png diff --git a/graphics/interface/menu_0.pal b/graphics/battle_interface/textbox_0.pal index 67e1af896..67e1af896 100644 --- a/graphics/interface/menu_0.pal +++ b/graphics/battle_interface/textbox_0.pal diff --git a/graphics/interface/menu_1.pal b/graphics/battle_interface/textbox_1.pal index 3adc73766..3adc73766 100644 --- a/graphics/interface/menu_1.pal +++ b/graphics/battle_interface/textbox_1.pal diff --git a/graphics/interface/menu_map.bin b/graphics/battle_interface/textbox_map.bin Binary files differindex 8a7b3f1f0..8a7b3f1f0 100644 --- a/graphics/interface/menu_map.bin +++ b/graphics/battle_interface/textbox_map.bin diff --git a/graphics/pokedex/85B8BF0.pal b/graphics/pokedex/85B8BF0.pal deleted file mode 100644 index 969c38cbd..000000000 --- a/graphics/pokedex/85B8BF0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 148 -0 131 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -148 148 255 -156 156 255 -172 172 255 -189 189 255 -205 205 255 -222 222 255 -238 238 255 -255 255 255 diff --git a/graphics/pokedex/85B8C10.png b/graphics/pokedex/85B8C10.png Binary files differnew file mode 100755 index 000000000..ef52a4138 --- /dev/null +++ b/graphics/pokedex/85B8C10.png diff --git a/graphics/trainers/front_pics/winstrate_f_front_pic.png b/graphics/trainers/front_pics/pokefan_f_front_pic.png Binary files differindex 4d4f9cffe..4d4f9cffe 100644 --- a/graphics/trainers/front_pics/winstrate_f_front_pic.png +++ b/graphics/trainers/front_pics/pokefan_f_front_pic.png diff --git a/graphics/trainers/front_pics/winstrate_m_front_pic.png b/graphics/trainers/front_pics/pokefan_m_front_pic.png Binary files differindex a6dc4a18e..a6dc4a18e 100644 --- a/graphics/trainers/front_pics/winstrate_m_front_pic.png +++ b/graphics/trainers/front_pics/pokefan_m_front_pic.png diff --git a/graphics/trainers/palettes/winstrate_f.pal b/graphics/trainers/palettes/pokefan_f.pal index 09728f005..09728f005 100644 --- a/graphics/trainers/palettes/winstrate_f.pal +++ b/graphics/trainers/palettes/pokefan_f.pal diff --git a/graphics/trainers/palettes/winstrate_m.pal b/graphics/trainers/palettes/pokefan_m.pal index 1d1f48875..1d1f48875 100644 --- a/graphics/trainers/palettes/winstrate_m.pal +++ b/graphics/trainers/palettes/pokefan_m.pal |
