Merge branch 'master' into doc-overworld

Browse Source

...

This commit is contained in:

GriffinR authored and GitHub committed 2020-07-15 00:40:47 -04:00

2 parents ebb6c4ee66 3c356a1d7a

commit e129d04b93

88 files changed

+1413 -1248

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/contest/clink_tilemap11.bin → graphics/contest/results_screen.bin

File renamed without changes.

graphics/contest/misc_2.pal → graphics/contest/results_screen.pal

File renamed without changes.

graphics/contest/misc_2.png → graphics/contest/results_screen.png

File renamed without changes.

graphics/contest/clink_tilemap7.bin → graphics/contest/results_screen_beauty.bin

File renamed without changes.

graphics/contest/clink_tilemap6.bin → graphics/contest/results_screen_cool.bin

File renamed without changes.

graphics/contest/clink_tilemap8.bin → graphics/contest/results_screen_cute.bin

File renamed without changes.

graphics/contest/clink_tilemap3.bin → graphics/contest/results_screen_hyper.bin

File renamed without changes.

graphics/contest/clink_tilemap5.bin → graphics/contest/results_screen_link.bin

File renamed without changes.

graphics/contest/clink_tilemap4.bin → graphics/contest/results_screen_master.bin

File renamed without changes.

graphics/contest/clink_tilemap1.bin → graphics/contest/results_screen_normal.bin

File renamed without changes.

graphics/contest/clink_tilemap9.bin → graphics/contest/results_screen_smart.bin

File renamed without changes.

graphics/contest/clink_tilemap2.bin → graphics/contest/results_screen_super.bin

File renamed without changes.

graphics/contest/clink_tilemap10.bin → graphics/contest/results_screen_tough.bin

File renamed without changes.