diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:27:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 10:27:50 -0500 |
| commit | 3f5936239785c8dae923e1f5c4bb91492e67cb5a (patch) | |
| tree | cb0c74dc4a2c09551e1b6699b7c71ed7dc7c85d7 /graphics | |
| parent | 763724a98046c81da15dd5a5877ad30adb8129ba (diff) | |
| parent | ea748ff7f51a7c119658930f878d046cc8b83c51 (diff) | |
Merge branch 'master' into doc-pokejump
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/easy_chat/button_window.png (renamed from graphics/easy_chat/rwindow.png) | bin | 419 -> 419 bytes | |||
| -rw-r--r-- | graphics/easy_chat/rectangle_cursor.png (renamed from graphics/easy_chat/cursor.png) | bin | 199 -> 199 bytes | |||
| -rw-r--r-- | graphics/easy_chat/text_input_frame.png (renamed from graphics/misc/interview_frame_2.png) | bin | 260 -> 260 bytes | |||
| -rw-r--r-- | graphics/easy_chat/text_input_frame_green.pal (renamed from graphics/misc/interview_frame_green.pal) | 0 | ||||
| -rw-r--r-- | graphics/easy_chat/text_input_frame_orange.pal (renamed from graphics/misc/interview_frame_orange.pal) | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/graphics/easy_chat/rwindow.png b/graphics/easy_chat/button_window.png Binary files differindex 6319f9a5d..6319f9a5d 100644 --- a/graphics/easy_chat/rwindow.png +++ b/graphics/easy_chat/button_window.png diff --git a/graphics/easy_chat/cursor.png b/graphics/easy_chat/rectangle_cursor.png Binary files differindex 502ea2d69..502ea2d69 100644 --- a/graphics/easy_chat/cursor.png +++ b/graphics/easy_chat/rectangle_cursor.png diff --git a/graphics/misc/interview_frame_2.png b/graphics/easy_chat/text_input_frame.png Binary files differindex c0fbba87d..c0fbba87d 100644 --- a/graphics/misc/interview_frame_2.png +++ b/graphics/easy_chat/text_input_frame.png diff --git a/graphics/misc/interview_frame_green.pal b/graphics/easy_chat/text_input_frame_green.pal index c64a7216f..c64a7216f 100644 --- a/graphics/misc/interview_frame_green.pal +++ b/graphics/easy_chat/text_input_frame_green.pal diff --git a/graphics/misc/interview_frame_orange.pal b/graphics/easy_chat/text_input_frame_orange.pal index 165bad8de..165bad8de 100644 --- a/graphics/misc/interview_frame_orange.pal +++ b/graphics/easy_chat/text_input_frame_orange.pal |
