data/text/X_text.asm is redundant

pret · Jan 25, 2018 · 518dd46 · 518dd46
1 parent 8e83eb1
commit 518dd46
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git 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 → data/text/battle.asm b/data/text/battle_text.asm → data/text/battle.asm
diff --git a/data/text/common.asm 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 → data/text/common_1.asm b/data/text/common_text_1.asm → data/text/common_1.asm
diff --git a/data/text/common_text_2.asm → data/text/common_2.asm b/data/text/common_text_2.asm → data/text/common_2.asm
diff --git a/data/text/common_text_3.asm → data/text/common_3.asm b/data/text/common_text_3.asm → data/text/common_3.asm
diff --git a/data/text/common_text.asm b/data/text/common_text.asm
diff --git a/data/text/unused_sweet_honey_text.asm → data/text/unused_sweet_honey.asm b/data/text/unused_sweet_honey_text.asm → data/text/unused_sweet_honey.asm
diff --git 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
@@ -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
@@ -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"