summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-09-22 15:08:38 -0500
committerDiegoisawesome <diego@domoreaweso.me>2018-09-22 15:23:47 -0500
commit9e840dc5fea3d732a347092c804afb3c6a86d61a (patch)
tree22141282dc7f0f7cf9fd05f48dbb884def3d9f19 /graphics
parentd50554bb8e90d314ae0131e925224406992a4c97 (diff)
parent1f767e4c4925f77f1a34c3da124b8be267a0b193 (diff)
Merge remote-tracking branch 'Tetra/master'
Diffstat (limited to 'graphics')
-rw-r--r--graphics/battle_interface/healthbox_doubles_opponent.png (renamed from graphics/battle_interface/window4.png)bin284 -> 284 bytes
-rw-r--r--graphics/battle_interface/healthbox_doubles_player.png (renamed from graphics/battle_interface/window3.png)bin293 -> 293 bytes
-rw-r--r--graphics/battle_interface/healthbox_safari.png (renamed from graphics/battle_interface/window5.png)bin297 -> 297 bytes
-rw-r--r--graphics/battle_interface/healthbox_singles_opponent.png (renamed from graphics/battle_interface/window2.png)bin296 -> 296 bytes
-rw-r--r--graphics/battle_interface/healthbox_singles_player.png (renamed from graphics/battle_interface/window.png)bin336 -> 336 bytes
5 files changed, 0 insertions, 0 deletions
diff --git a/graphics/battle_interface/window4.png b/graphics/battle_interface/healthbox_doubles_opponent.png
index def9d07af..def9d07af 100644
--- a/graphics/battle_interface/window4.png
+++ b/graphics/battle_interface/healthbox_doubles_opponent.png
Binary files differ
diff --git a/graphics/battle_interface/window3.png b/graphics/battle_interface/healthbox_doubles_player.png
index f843c664b..f843c664b 100644
--- a/graphics/battle_interface/window3.png
+++ b/graphics/battle_interface/healthbox_doubles_player.png
Binary files differ
diff --git a/graphics/battle_interface/window5.png b/graphics/battle_interface/healthbox_safari.png
index e48f380a4..e48f380a4 100644
--- a/graphics/battle_interface/window5.png
+++ b/graphics/battle_interface/healthbox_safari.png
Binary files differ
diff --git a/graphics/battle_interface/window2.png b/graphics/battle_interface/healthbox_singles_opponent.png
index 52f70e858..52f70e858 100644
--- a/graphics/battle_interface/window2.png
+++ b/graphics/battle_interface/healthbox_singles_opponent.png
Binary files differ
diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/healthbox_singles_player.png
index 0862ca399..0862ca399 100644
--- a/graphics/battle_interface/window.png
+++ b/graphics/battle_interface/healthbox_singles_player.png
Binary files differ