Merge branch 'master' into doc-overworld

Browse Source

...

This commit is contained in:

GriffinR

2020-07-08 15:51:58 -04:00

committed by GitHub

parent c0bc7e8f7b 9ff261ac2a

commit ebb6c4ee66

498 changed files with 8011 additions and 7053 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

graphics/link/misc.bin → graphics/union_room_chat/background.bin

graphics/link/misc.png → graphics/union_room_chat/background.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 513 B After Width:  |  Height:  |  Size: 513 B

graphics/link/link_winedge.bin → graphics/union_room_chat/border.bin

graphics/link/link_winedge.png → graphics/union_room_chat/border.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 189 B After Width:  |  Height:  |  Size: 189 B

graphics/interface/unk_palette3.pal → graphics/union_room_chat/interface.pal

graphics/interface/unk_cursor.png → graphics/union_room_chat/keyboard_cursor.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 307 B After Width:  |  Height:  |  Size: 307 B

graphics/interface/unk_rbutton.png → graphics/union_room_chat/r_button.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 188 B After Width:  |  Height:  |  Size: 188 B

graphics/interface/unk_change_case.png → graphics/union_room_chat/r_button_labels.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 247 B After Width:  |  Height:  |  Size: 247 B

graphics/interface/unk_cursor_arrow.png → graphics/union_room_chat/text_entry_arrow.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 157 B After Width:  |  Height:  |  Size: 157 B

graphics/interface/unk_dash.png → graphics/union_room_chat/text_entry_cursor.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 146 B After Width:  |  Height:  |  Size: 146 B

graphics/interface/unk_palette1.pal → graphics/union_room_chat/unk_palette1.pal

graphics/interface/unk_palette2.pal → graphics/union_room_chat/unk_palette2.pal

graphics/link/link1.pal → graphics/union_room_chat/window_1.pal

graphics/link/link2.pal → graphics/union_room_chat/window_2.pal