summaryrefslogtreecommitdiff
path: root/common_syms
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-03-31 20:43:42 -0400
committerPhlosioneer <mattmdrr2@gmail.com>2019-03-31 20:43:42 -0400
commitcd069446e06c277222be0aaa05fb43b090259234 (patch)
treea740e2042ff6af3465cfdaa15fc29c35269cfa70 /common_syms
parent3181c64c64afa47b3adc04f325ad3798c8c324ec (diff)
parent93c4e35d844046d12c7d8bcc64e8fc3e03e85e0d (diff)
Merge branch 'master' into pokedex-area-const-array
Diffstat (limited to 'common_syms')
-rwxr-xr-xcommon_syms/battle_anim_special.txt (renamed from common_syms/battle_anim_8170478.txt)0
1 files changed, 0 insertions, 0 deletions
diff --git a/common_syms/battle_anim_8170478.txt b/common_syms/battle_anim_special.txt
index 2fc194df7..2fc194df7 100755
--- a/common_syms/battle_anim_8170478.txt
+++ b/common_syms/battle_anim_special.txt