Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti

Browse Source

...

This commit is contained in:

GriffinR committed 2020-07-08 15:45:31 -04:00

2 parents 8b462f3f6c 8b80b417e2

commit 431c60c92c

109 files changed

+7618 -6664

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

No files matched your search

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.