From 518dd46ca16c79736511289069d2525635ed52e4 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Wed, 24 Jan 2018 21:27:23 -0500
Subject: [PATCH] data/text/X_text.asm is redundant

---
 Makefile                                         |  2 +-
 data/text/{battle_text.asm => battle.asm}        |  0
 data/text/common.asm                             | 16 ++++++++++++++++
 data/text/{common_text_1.asm => common_1.asm}    |  0
 data/text/{common_text_2.asm => common_2.asm}    |  0
 data/text/{common_text_3.asm => common_3.asm}    |  0
 data/text/common_text.asm                        | 16 ----------------
 ...eet_honey_text.asm => unused_sweet_honey.asm} |  0
 main.asm                                         |  4 ++--
 maps/GoldenrodNameRater.asm                      |  2 +-
 pokecrystal.link                                 |  2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)
 rename data/text/{battle_text.asm => battle.asm} (100%)
 create mode 100644 data/text/common.asm
 rename data/text/{common_text_1.asm => common_1.asm} (100%)
 rename data/text/{common_text_2.asm => common_2.asm} (100%)
 rename data/text/{common_text_3.asm => common_3.asm} (100%)
 delete mode 100644 data/text/common_text.asm
 rename data/text/{unused_sweet_honey_text.asm => unused_sweet_honey.asm} (100%)

diff --git a/Makefile b/Makefile
index 203bd4aa7..6dadfcb44 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ audio.o \
 home.o \
 main.o \
 wram.o \
-data/text/common_text.o \
+data/text/common.o \
 data/maps/maps.o \
 data/pokemon/dex_entries.o \
 data/pokemon/egg_moves.o \
diff --git a/data/text/battle_text.asm b/data/text/battle.asm
similarity index 100%
rename from data/text/battle_text.asm
rename to 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
similarity index 100%
rename from data/text/common_text_1.asm
rename to data/text/common_1.asm
diff --git a/data/text/common_text_2.asm b/data/text/common_2.asm
similarity index 100%
rename from data/text/common_text_2.asm
rename to data/text/common_2.asm
diff --git a/data/text/common_text_3.asm b/data/text/common_3.asm
similarity index 100%
rename from data/text/common_text_3.asm
rename to 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
similarity index 100%
rename from data/text/unused_sweet_honey_text.asm
rename to data/text/unused_sweet_honey.asm
diff --git a/main.asm b/main.asm
index 8ce0db6ff..50b4c6f0b 100644
--- a/main.asm
+++ b/main.asm
@@ -279,7 +279,7 @@ SECTION "bank20", ROMX
 INCLUDE "engine/player_movement.asm"
 INCLUDE "engine/engine_flags.asm"
 INCLUDE "engine/variables.asm"
-INCLUDE "data/text/battle_text.asm"
+INCLUDE "data/text/battle.asm"
 INCLUDE "engine/debug.asm"
 
 
@@ -539,7 +539,7 @@ SECTION "Mobile 5F", ROMX
 INCLUDE "mobile/mobile_5f.asm"
 
 
-SECTION "Common Text 1", ROMX
+SECTION "Phone Text 2", ROMX
 
 INCLUDE "data/text/std_text.asm"
 INCLUDE "data/phone/text/jack_overworld.asm"
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index ebee5d6a5..8e9f0612d 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf:
 GoldenrodNameRaterRadio:
 	jumpstd radio2
 
-INCLUDE "data/text/unused_sweet_honey_text.asm"
+INCLUDE "data/text/unused_sweet_honey.asm"
 
 GoldenrodNameRater_MapEvents:
 	; filler
diff --git a/pokecrystal.link b/pokecrystal.link
index 0cfb54a8b..fc8fbb38a 100644
--- a/pokecrystal.link
+++ b/pokecrystal.link
@@ -271,7 +271,7 @@ ROMX $6a
 ROMX $6b
 	"Map Scripts 24"
 ROMX $6c
-	"Common Text 1"
+	"Phone Text 2"
 	"Map Scripts 25"
 ROMX $6d
 	"Special Phone Text"