summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-08-27 11:13:32 -0500
committercamthesaxman <cameronghall@cox.net>2017-08-27 11:13:32 -0500
commit9202e8d4c0b8ae285d0dae4ead2582c04c5d100f (patch)
treed2c0257b7b9b289b054c85d38445718fcd9b126b /data
parent42a36959b95aad5a55a2f7bb17dcdc941dd89750 (diff)
data2c.s -> battle_moves.s
Diffstat (limited to 'data')
-rw-r--r--data/battle_moves.s (renamed from data/battle_moves.inc)5
-rw-r--r--data/data2c.s10
2 files changed, 5 insertions, 10 deletions
diff --git a/data/battle_moves.inc b/data/battle_moves.s
index ff7e2cb33..ea32446d2 100644
--- a/data/battle_moves.inc
+++ b/data/battle_moves.s
@@ -1,3 +1,8 @@
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+
+ .section .rodata
+
.align 2
gBattleMoves:: @ 81FB12C
@ NONE
diff --git a/data/data2c.s b/data/data2c.s
deleted file mode 100644
index 260b451cf..000000000
--- a/data/data2c.s
+++ /dev/null
@@ -1,10 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-
-
-@ 81FB12C
- .include "data/battle_moves.inc"
-