summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-05 20:47:28 -0700
committerGitHub <noreply@github.com>2018-04-05 20:47:28 -0700
commited5847cb41c48357d83b92823e08393a1ca54bdd (patch)
treeea68024a14289a5a84bba21591f0e426eaa8b035 /asm
parentb58527a387a65b84d2aefd23e589a53844308d6a (diff)
parent90380f68bd0725eb77f38f5c00828efba89e5219 (diff)
Merge pull request #587 from pret/rename_files
Rename two files
Diffstat (limited to 'asm')
-rw-r--r--asm/contest_painting_effects.s (renamed from asm/cute_sketch.s)0
-rw-r--r--asm/decompress.s (renamed from asm/battle_1.s)0
2 files changed, 0 insertions, 0 deletions
diff --git a/asm/cute_sketch.s b/asm/contest_painting_effects.s
index bc72a6ef5..bc72a6ef5 100644
--- a/asm/cute_sketch.s
+++ b/asm/contest_painting_effects.s
diff --git a/asm/battle_1.s b/asm/decompress.s
index 99e449d8f..99e449d8f 100644
--- a/asm/battle_1.s
+++ b/asm/decompress.s