diff options
| author | garak <garakmon@gmail.com> | 2018-09-24 08:40:33 -0400 | 
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-09-24 08:40:33 -0400 | 
| commit | 72f9afcbf4a81909019f21acad0484b72ed217f6 (patch) | |
| tree | bc7e9a48b8056e28403e251dab7ac64f649ad9e4 /graphics/battle_interface | |
| parent | 3964dbd4822f1b22bbc696add7e56ff0c5b2caea (diff) | |
| parent | 7ceabffc842dfdf127fd594055f895a0803f54f6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'graphics/battle_interface')
| -rw-r--r-- | graphics/battle_interface/healthbox_doubles_opponent.png (renamed from graphics/battle_interface/window4.png) | bin | 284 -> 284 bytes | 
| -rw-r--r-- | graphics/battle_interface/healthbox_doubles_player.png (renamed from graphics/battle_interface/window3.png) | bin | 293 -> 293 bytes | 
| -rw-r--r-- | graphics/battle_interface/healthbox_safari.png (renamed from graphics/battle_interface/window5.png) | bin | 297 -> 297 bytes | 
| -rw-r--r-- | graphics/battle_interface/healthbox_singles_opponent.png (renamed from graphics/battle_interface/window2.png) | bin | 296 -> 296 bytes | 
| -rw-r--r-- | graphics/battle_interface/healthbox_singles_player.png (renamed from graphics/battle_interface/window.png) | bin | 336 -> 336 bytes | 
5 files changed, 0 insertions, 0 deletions
| diff --git a/graphics/battle_interface/window4.png b/graphics/battle_interface/healthbox_doubles_opponent.pngBinary files differ index def9d07af..def9d07af 100644 --- a/graphics/battle_interface/window4.png +++ b/graphics/battle_interface/healthbox_doubles_opponent.png diff --git a/graphics/battle_interface/window3.png b/graphics/battle_interface/healthbox_doubles_player.pngBinary files differ index f843c664b..f843c664b 100644 --- a/graphics/battle_interface/window3.png +++ b/graphics/battle_interface/healthbox_doubles_player.png diff --git a/graphics/battle_interface/window5.png b/graphics/battle_interface/healthbox_safari.pngBinary files differ index e48f380a4..e48f380a4 100644 --- a/graphics/battle_interface/window5.png +++ b/graphics/battle_interface/healthbox_safari.png diff --git a/graphics/battle_interface/window2.png b/graphics/battle_interface/healthbox_singles_opponent.pngBinary files differ index 52f70e858..52f70e858 100644 --- a/graphics/battle_interface/window2.png +++ b/graphics/battle_interface/healthbox_singles_opponent.png diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/healthbox_singles_player.pngBinary files differ index 0862ca399..0862ca399 100644 --- a/graphics/battle_interface/window.png +++ b/graphics/battle_interface/healthbox_singles_player.png | 
