Merge branch 'master' into doc-introcred

Browse Source

...

This commit is contained in:

GriffinR

2021-03-29 20:56:15 -04:00

committed by GitHub

parent dea07dc865 e8b6b4b65e

commit 50e9666e16

114 changed files with 10795 additions and 6942 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_games/berrycrush_background.bin → graphics/berry_crush/bg.bin

graphics/link_games/berrycrush_container_cap.bin → graphics/berry_crush/container_cap.bin

graphics/berry_crusher/tiles.bin → graphics/berry_crush/crusher.bin

graphics/berry_crusher/tiles.pal → graphics/berry_crush/crusher.pal

graphics/berry_crusher/tiles.png → graphics/berry_crush/crusher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 2.1 KiB

graphics/link_games/berrycrush_grinder_base.png → graphics/berry_crush/crusher_base.png

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

graphics/link_games/berrycrush_grinder_top.bin → graphics/berry_crush/crusher_top.bin

graphics/link_games/berrycrush_misc.pal → graphics/berry_crush/effects.pal

graphics/link_games/berrycrush_btnpress.png → graphics/berry_crush/impact.png

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

graphics/link_games/berrycrush_sparkle.png → graphics/berry_crush/sparkle.png

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

graphics/link_games/berrycrush_timerdigits.png → graphics/berry_crush/timer_digits.png

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

graphics/link_games/dodrioberry_berrysprites.png → graphics/dodrio_berry_picking/berries.png

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

graphics/link_games/dodrioberry_bg1.bin → graphics/dodrio_berry_picking/bg.bin

graphics/link_games/dodrioberry_bg1.pal → graphics/dodrio_berry_picking/bg.pal

graphics/link_games/dodrioberry_bg1.png → graphics/dodrio_berry_picking/bg.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB

graphics/link_games/dodrioberry_platform.png → graphics/dodrio_berry_picking/cloud.png

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

graphics/link_games/dodrioberry_pkmn.png → graphics/dodrio_berry_picking/dodrio.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 3.3 KiB

graphics/link_games/dodrioberry_shiny.pal → graphics/dodrio_berry_picking/shiny.pal

graphics/link_games/dodrioberry_status.png → graphics/dodrio_berry_picking/status.png

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

graphics/link_games/dodrioberry_bg2.pal → graphics/dodrio_berry_picking/tree_border.pal

graphics/link_games/dodrioberry_bg2.png → graphics/dodrio_berry_picking/tree_border.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

graphics/link_games/dodrioberry_bg2left.bin → graphics/dodrio_berry_picking/tree_border_left.bin

graphics/link_games/dodrioberry_bg2right.bin → graphics/dodrio_berry_picking/tree_border_right.bin

graphics/interface/blank_1x2.png → graphics/interface/comm_error_bg.png

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

graphics/link_games/321start.png → graphics/minigame_countdown/321start.png

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

graphics/link_games/321start_2.png → graphics/minigame_countdown/321start_static.png

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

graphics/misc/85B2890.pal → graphics/misc/cave_transition_enter.pal

graphics/misc/85B28A0.pal → graphics/misc/cave_transition_exit.pal

graphics/trainer_card/unknown_56F18C.pal → graphics/trainer_card/unused.pal