diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
| commit | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (patch) | |
| tree | 7b51d7b9cb9a370fe1dd9db8eeadc23089ba1328 /graphics/battle_interface | |
| parent | fa9d1759bd7fa17ced37225bd31d46466da857c6 (diff) | |
| parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) | |
Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
# asm/shop.s
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.png Binary files differindex 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.png Binary files differindex 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.png Binary files differindex 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.png Binary files differindex 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.png Binary files differindex 0862ca399..0862ca399 100644 --- a/graphics/battle_interface/window.png +++ b/graphics/battle_interface/healthbox_singles_player.png |
