summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-01-22 17:33:52 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-01-22 17:33:52 -0500
commitf44b7ad5c30f80d1032a9cab2e3272ef0a7efe86 (patch)
tree7ae0c8fcc4ec276ec715f7ec23f79929b481ea0a /data
parentcb5e3378de0582217cdb308d33cee7afb4d7cb89 (diff)
Add data/text/
Diffstat (limited to 'data')
-rw-r--r--data/common_text/common_text.asm16
-rw-r--r--data/pokemon/gen1_base_special.asm (renamed from data/pokemon/rby_base_special.asm)0
-rw-r--r--data/pokemon/gen1_order.asm (renamed from data/pokemon/rby_order.asm)0
-rw-r--r--data/text/battle_text.asm (renamed from data/battle/battle_text.asm)0
-rw-r--r--data/text/common_text.asm16
-rw-r--r--data/text/common_text_1.asm (renamed from data/common_text/common_text_1.asm)0
-rw-r--r--data/text/common_text_2.asm (renamed from data/common_text/common_text_2.asm)0
-rw-r--r--data/text/common_text_3.asm (renamed from data/common_text/common_text_3.asm)0
-rw-r--r--data/text/mail_input_chars.asm (renamed from data/mail_input_chars.asm)0
-rw-r--r--data/text/name_input_chars.asm (renamed from data/name_input_chars.asm)0
-rw-r--r--data/text/std_text.asm (renamed from data/std_text.asm)0
-rw-r--r--data/text/unused_dakutens.asm (renamed from data/unused/dakutens.asm)0
-rw-r--r--data/text/unused_gen1_trainer_names.asm (renamed from data/unused/gen_1_trainer_names.asm)0
-rw-r--r--data/text/unused_sweet_honey_text.asm (renamed from data/unused/sweet_honey_text.asm)0
-rwxr-xr-xdata/unused_53d84.asm (renamed from data/unused/unknown_53d84.asm)0
15 files changed, 16 insertions, 16 deletions
diff --git a/data/common_text/common_text.asm b/data/common_text/common_text.asm
deleted file mode 100644
index 2f88b4e9d..000000000
--- a/data/common_text/common_text.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDE "constants.asm"
-
-
-SECTION "Text 1", ROMX
-
-INCLUDE "data/common_text/common_text_1.asm"
-
-
-SECTION "Text 2", ROMX
-
-INCLUDE "data/common_text/common_text_2.asm"
-
-
-SECTION "Text 3", ROMX
-
-INCLUDE "data/common_text/common_text_3.asm"
diff --git a/data/pokemon/rby_base_special.asm b/data/pokemon/gen1_base_special.asm
index 9998692ab..9998692ab 100644
--- a/data/pokemon/rby_base_special.asm
+++ b/data/pokemon/gen1_base_special.asm
diff --git a/data/pokemon/rby_order.asm b/data/pokemon/gen1_order.asm
index e40ba0273..e40ba0273 100644
--- a/data/pokemon/rby_order.asm
+++ b/data/pokemon/gen1_order.asm
diff --git a/data/battle/battle_text.asm b/data/text/battle_text.asm
index eaff02017..eaff02017 100644
--- a/data/battle/battle_text.asm
+++ b/data/text/battle_text.asm
diff --git a/data/text/common_text.asm b/data/text/common_text.asm
new file mode 100644
index 000000000..72ef91fea
--- /dev/null
+++ b/data/text/common_text.asm
@@ -0,0 +1,16 @@
+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/common_text/common_text_1.asm b/data/text/common_text_1.asm
index 38007bc43..38007bc43 100644
--- a/data/common_text/common_text_1.asm
+++ b/data/text/common_text_1.asm
diff --git a/data/common_text/common_text_2.asm b/data/text/common_text_2.asm
index bddd0d470..bddd0d470 100644
--- a/data/common_text/common_text_2.asm
+++ b/data/text/common_text_2.asm
diff --git a/data/common_text/common_text_3.asm b/data/text/common_text_3.asm
index a04432637..a04432637 100644
--- a/data/common_text/common_text_3.asm
+++ b/data/text/common_text_3.asm
diff --git a/data/mail_input_chars.asm b/data/text/mail_input_chars.asm
index ca3833529..ca3833529 100644
--- a/data/mail_input_chars.asm
+++ b/data/text/mail_input_chars.asm
diff --git a/data/name_input_chars.asm b/data/text/name_input_chars.asm
index d89289142..d89289142 100644
--- a/data/name_input_chars.asm
+++ b/data/text/name_input_chars.asm
diff --git a/data/std_text.asm b/data/text/std_text.asm
index 4b027abac..4b027abac 100644
--- a/data/std_text.asm
+++ b/data/text/std_text.asm
diff --git a/data/unused/dakutens.asm b/data/text/unused_dakutens.asm
index 756018d79..756018d79 100644
--- a/data/unused/dakutens.asm
+++ b/data/text/unused_dakutens.asm
diff --git a/data/unused/gen_1_trainer_names.asm b/data/text/unused_gen1_trainer_names.asm
index a802a5048..a802a5048 100644
--- a/data/unused/gen_1_trainer_names.asm
+++ b/data/text/unused_gen1_trainer_names.asm
diff --git a/data/unused/sweet_honey_text.asm b/data/text/unused_sweet_honey_text.asm
index 9bfa4f6b1..9bfa4f6b1 100644
--- a/data/unused/sweet_honey_text.asm
+++ b/data/text/unused_sweet_honey_text.asm
diff --git a/data/unused/unknown_53d84.asm b/data/unused_53d84.asm
index 026ec5275..026ec5275 100755
--- a/data/unused/unknown_53d84.asm
+++ b/data/unused_53d84.asm