summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/text/battle.asm (renamed from data/text/battle_text.asm)0
-rw-r--r--data/text/common.asm16
-rw-r--r--data/text/common_1.asm (renamed from data/text/common_text_1.asm)0
-rw-r--r--data/text/common_2.asm (renamed from data/text/common_text_2.asm)0
-rw-r--r--data/text/common_3.asm (renamed from data/text/common_text_3.asm)0
-rw-r--r--data/text/common_text.asm16
-rw-r--r--data/text/unused_sweet_honey.asm (renamed from data/text/unused_sweet_honey_text.asm)0
7 files changed, 16 insertions, 16 deletions
diff --git a/data/text/battle_text.asm b/data/text/battle.asm
index eaff02017..eaff02017 100644
--- a/data/text/battle_text.asm
+++ b/data/text/battle.asm
diff --git a/data/text/common.asm b/data/text/common.asm
new file mode 100644
index 000000000..d1fbb8b1a
--- /dev/null
+++ b/data/text/common.asm
@@ -0,0 +1,16 @@
+INCLUDE "constants.asm"
+
+
+SECTION "Text 1", ROMX
+
+INCLUDE "data/text/common_1.asm"
+
+
+SECTION "Text 2", ROMX
+
+INCLUDE "data/text/common_2.asm"
+
+
+SECTION "Text 3", ROMX
+
+INCLUDE "data/text/common_3.asm"
diff --git a/data/text/common_text_1.asm b/data/text/common_1.asm
index 38007bc43..38007bc43 100644
--- a/data/text/common_text_1.asm
+++ b/data/text/common_1.asm
diff --git a/data/text/common_text_2.asm b/data/text/common_2.asm
index aaf14cc48..aaf14cc48 100644
--- a/data/text/common_text_2.asm
+++ b/data/text/common_2.asm
diff --git a/data/text/common_text_3.asm b/data/text/common_3.asm
index a04432637..a04432637 100644
--- a/data/text/common_text_3.asm
+++ b/data/text/common_3.asm
diff --git a/data/text/common_text.asm b/data/text/common_text.asm
deleted file mode 100644
index 72ef91fea..000000000
--- a/data/text/common_text.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDE "constants.asm"
-
-
-SECTION "Text 1", ROMX
-
-INCLUDE "data/text/common_text_1.asm"
-
-
-SECTION "Text 2", ROMX
-
-INCLUDE "data/text/common_text_2.asm"
-
-
-SECTION "Text 3", ROMX
-
-INCLUDE "data/text/common_text_3.asm"
diff --git a/data/text/unused_sweet_honey_text.asm b/data/text/unused_sweet_honey.asm
index 9bfa4f6b1..9bfa4f6b1 100644
--- a/data/text/unused_sweet_honey_text.asm
+++ b/data/text/unused_sweet_honey.asm