summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-06-13 13:40:57 -0400
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-06-13 13:40:57 -0400
commite2eb17dcbd8f9021b7e9fc805c8c03fac6b3b255 (patch)
tree5705aaca2ef0713f55ca22a4a814161e26aa4582 /graphics
parent1ce33843b645e3139bd414c2d048c628967f4e07 (diff)
parentf75c048434d5dc7538e628206c29a0730404db81 (diff)
Merge branch 'master' of https://github.com/pret/pokefirered
Diffstat (limited to 'graphics')
-rw-r--r--graphics/battle_anims/backgrounds/water_contest.bin (renamed from graphics/unknown/unknown_E822B8.bin)0
-rw-r--r--graphics/battle_anims/backgrounds/water_opponent.bin (renamed from graphics/unknown/unknown_E81D14.bin)bin4096 -> 4096 bytes
-rw-r--r--graphics/battle_anims/backgrounds/water_player.bin (renamed from graphics/unknown/unknown_E81FE4.bin)0
3 files changed, 0 insertions, 0 deletions
diff --git a/graphics/unknown/unknown_E822B8.bin b/graphics/battle_anims/backgrounds/water_contest.bin
index 6312b8645..6312b8645 100644
--- a/graphics/unknown/unknown_E822B8.bin
+++ b/graphics/battle_anims/backgrounds/water_contest.bin
diff --git a/graphics/unknown/unknown_E81D14.bin b/graphics/battle_anims/backgrounds/water_opponent.bin
index d48de1d6f..d48de1d6f 100644
--- a/graphics/unknown/unknown_E81D14.bin
+++ b/graphics/battle_anims/backgrounds/water_opponent.bin
Binary files differ
diff --git a/graphics/unknown/unknown_E81FE4.bin b/graphics/battle_anims/backgrounds/water_player.bin
index 6a6f7c049..6a6f7c049 100644
--- a/graphics/unknown/unknown_E81FE4.bin
+++ b/graphics/battle_anims/backgrounds/water_player.bin