Merge branch 'master' into doc-link

Browse Source

...

This commit is contained in:

GriffinR authored and GitHub committed 2020-06-10 17:36:43 -04:00

2 parents 2859900ea9 a7815857ad

commit a9a427c6f2

22 files changed

+520 -914

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/battle_transitions/85BC314.bin → graphics/battle_transitions/regice.bin

File renamed without changes.

graphics/battle_transitions/85BC2B4.pal → graphics/battle_transitions/regice.pal

File renamed without changes.

graphics/battle_transitions/85BD314.bin → graphics/battle_transitions/regirock.bin

File renamed without changes.

graphics/battle_transitions/85BC2F4.pal → graphics/battle_transitions/regirock.pal

File renamed without changes.

graphics/battle_transitions/85BBC14.png → graphics/battle_transitions/regis.png

File renamed without changes.

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

graphics/battle_transitions/85BCB14.bin → graphics/battle_transitions/registeel.bin

File renamed without changes.

graphics/battle_transitions/85BC2D4.pal → graphics/battle_transitions/registeel.pal

File renamed without changes.