Merge with master

Browse Source

...

This commit is contained in:

DizzyEggg

2018-09-22 00:22:13 +02:00

parent d05875dd04 a1edceb595

commit a69af8f2f5

33 changed files with 982 additions and 599 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

0

graphics/battle_interface/window4.png → graphics/battle_interface/healthbox_doubles_opponent.png

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

0

graphics/battle_interface/window3.png → graphics/battle_interface/healthbox_doubles_player.png

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

0

graphics/battle_interface/window5.png → graphics/battle_interface/healthbox_safari.png

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

0

graphics/battle_interface/window2.png → graphics/battle_interface/healthbox_singles_opponent.png

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

0

graphics/battle_interface/window.png → graphics/battle_interface/healthbox_singles_player.png

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