diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:51:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 15:51:58 -0400 |
| commit | ebb6c4ee661758874972956a94eb06d38eaa18a8 (patch) | |
| tree | bccf414f4a854c2fd88290cbe5c221f56ba34f17 /graphics | |
| parent | c0bc7e8f7b94ebab1e39b761aa194630e4c7bf6b (diff) | |
| parent | 9ff261ac2a249a669a42381509ef288287535b4f (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/union_room_chat/background.bin (renamed from graphics/link/misc.bin) | bin | 1280 -> 1280 bytes | |||
| -rw-r--r-- | graphics/union_room_chat/background.png (renamed from graphics/link/misc.png) | bin | 513 -> 513 bytes | |||
| -rw-r--r-- | graphics/union_room_chat/border.bin (renamed from graphics/link/link_winedge.bin) | bin | 1280 -> 1280 bytes | |||
| -rw-r--r-- | graphics/union_room_chat/border.png (renamed from graphics/link/link_winedge.png) | bin | 189 -> 189 bytes | |||
| -rw-r--r-- | graphics/union_room_chat/interface.pal (renamed from graphics/interface/unk_palette3.pal) | 0 | ||||
| -rw-r--r-- | graphics/union_room_chat/keyboard_cursor.png (renamed from graphics/interface/unk_cursor.png) | bin | 307 -> 307 bytes | |||
| -rw-r--r-- | graphics/union_room_chat/r_button.png (renamed from graphics/interface/unk_rbutton.png) | bin | 188 -> 188 bytes | |||
| -rw-r--r-- | graphics/union_room_chat/r_button_labels.png (renamed from graphics/interface/unk_change_case.png) | bin | 247 -> 247 bytes | |||
| -rw-r--r-- | graphics/union_room_chat/text_entry_arrow.png (renamed from graphics/interface/unk_cursor_arrow.png) | bin | 157 -> 157 bytes | |||
| -rw-r--r-- | graphics/union_room_chat/text_entry_cursor.png (renamed from graphics/interface/unk_dash.png) | bin | 146 -> 146 bytes | |||
| -rw-r--r-- | graphics/union_room_chat/unk_palette1.pal (renamed from graphics/interface/unk_palette1.pal) | 0 | ||||
| -rw-r--r-- | graphics/union_room_chat/unk_palette2.pal (renamed from graphics/interface/unk_palette2.pal) | 0 | ||||
| -rw-r--r-- | graphics/union_room_chat/window_1.pal (renamed from graphics/link/link1.pal) | 0 | ||||
| -rw-r--r-- | graphics/union_room_chat/window_2.pal (renamed from graphics/link/link2.pal) | 0 |
14 files changed, 0 insertions, 0 deletions
diff --git a/graphics/link/misc.bin b/graphics/union_room_chat/background.bin Binary files differindex e91b50c8d..e91b50c8d 100644 --- a/graphics/link/misc.bin +++ b/graphics/union_room_chat/background.bin diff --git a/graphics/link/misc.png b/graphics/union_room_chat/background.png Binary files differindex ae6ba4d02..ae6ba4d02 100644 --- a/graphics/link/misc.png +++ b/graphics/union_room_chat/background.png diff --git a/graphics/link/link_winedge.bin b/graphics/union_room_chat/border.bin Binary files differindex f3e264d05..f3e264d05 100644 --- a/graphics/link/link_winedge.bin +++ b/graphics/union_room_chat/border.bin diff --git a/graphics/link/link_winedge.png b/graphics/union_room_chat/border.png Binary files differindex 86ddacc03..86ddacc03 100644 --- a/graphics/link/link_winedge.png +++ b/graphics/union_room_chat/border.png diff --git a/graphics/interface/unk_palette3.pal b/graphics/union_room_chat/interface.pal index 071f73b42..071f73b42 100644 --- a/graphics/interface/unk_palette3.pal +++ b/graphics/union_room_chat/interface.pal diff --git a/graphics/interface/unk_cursor.png b/graphics/union_room_chat/keyboard_cursor.png Binary files differindex fac4e0a93..fac4e0a93 100644 --- a/graphics/interface/unk_cursor.png +++ b/graphics/union_room_chat/keyboard_cursor.png diff --git a/graphics/interface/unk_rbutton.png b/graphics/union_room_chat/r_button.png Binary files differindex 168a293f3..168a293f3 100644 --- a/graphics/interface/unk_rbutton.png +++ b/graphics/union_room_chat/r_button.png diff --git a/graphics/interface/unk_change_case.png b/graphics/union_room_chat/r_button_labels.png Binary files differindex 185c4abf5..185c4abf5 100644 --- a/graphics/interface/unk_change_case.png +++ b/graphics/union_room_chat/r_button_labels.png diff --git a/graphics/interface/unk_cursor_arrow.png b/graphics/union_room_chat/text_entry_arrow.png Binary files differindex 574758cdf..574758cdf 100644 --- a/graphics/interface/unk_cursor_arrow.png +++ b/graphics/union_room_chat/text_entry_arrow.png diff --git a/graphics/interface/unk_dash.png b/graphics/union_room_chat/text_entry_cursor.png Binary files differindex 34c3709cf..34c3709cf 100644 --- a/graphics/interface/unk_dash.png +++ b/graphics/union_room_chat/text_entry_cursor.png diff --git a/graphics/interface/unk_palette1.pal b/graphics/union_room_chat/unk_palette1.pal index 12bc76261..12bc76261 100644 --- a/graphics/interface/unk_palette1.pal +++ b/graphics/union_room_chat/unk_palette1.pal diff --git a/graphics/interface/unk_palette2.pal b/graphics/union_room_chat/unk_palette2.pal index d2a55fec6..d2a55fec6 100644 --- a/graphics/interface/unk_palette2.pal +++ b/graphics/union_room_chat/unk_palette2.pal diff --git a/graphics/link/link1.pal b/graphics/union_room_chat/window_1.pal index a86815b0e..a86815b0e 100644 --- a/graphics/link/link1.pal +++ b/graphics/union_room_chat/window_1.pal diff --git a/graphics/link/link2.pal b/graphics/union_room_chat/window_2.pal index a8c95a3c0..a8c95a3c0 100644 --- a/graphics/link/link2.pal +++ b/graphics/union_room_chat/window_2.pal |
