41 files changed, 39 insertions, 39 deletions

diff --git a/constants/phone_constants.asm b/constants/phone_constants.asm
index b2312ab4b..058772f2d 100644
--- a/constants/phone_constants.asm
+++ b/constants/phone_constants.asm
@@ -1,4 +1,4 @@
-; PhoneContacts indexes (see data/phone_contacts.asm)
+; PhoneContacts indexes (see data/phone/phone_contacts.asm)
 	const_def
 	const PHONE_00
 	const PHONE_MOM
@@ -39,7 +39,7 @@
 	const PHONE_PICNICKER_ERIN
 	const PHONE_BUENA
 
-; SpecialPhoneCallList indexes (see data/phone_special.asm)
+; SpecialPhoneCallList indexes (see data/phone/special_calls.asm)
 	const_def
 	const SPECIALCALL_NONE
 	const SPECIALCALL_POKERUS
diff --git a/data/phone_contacts.asm b/data/phone/phone_contacts.asm
index cfeaad8a1..cfeaad8a1 100644
--- a/data/phone_contacts.asm
+++ b/data/phone/phone_contacts.asm
diff --git a/data/phone_special.asm b/data/phone/special_calls.asm
index 03c27743a..03c27743a 100644
--- a/data/phone_special.asm
+++ b/data/phone/special_calls.asm
diff --git a/data/phone_text/alan_overworld.asm b/data/phone/text/alan_overworld.asm
index e1246037a..e1246037a 100644
--- a/data/phone_text/alan_overworld.asm
+++ b/data/phone/text/alan_overworld.asm
diff --git a/data/phone_text/anthony_overworld.asm b/data/phone/text/anthony_overworld.asm
index 71e419c42..71e419c42 100644
--- a/data/phone_text/anthony_overworld.asm
+++ b/data/phone/text/anthony_overworld.asm
diff --git a/data/phone_text/arnie_overworld.asm b/data/phone/text/arnie_overworld.asm
index 4b12bd976..4b12bd976 100644
--- a/data/phone_text/arnie_overworld.asm
+++ b/data/phone/text/arnie_overworld.asm
diff --git a/data/phone_text/beth_overworld.asm b/data/phone/text/beth_overworld.asm
index 5c23a7ab6..5c23a7ab6 100644
--- a/data/phone_text/beth_overworld.asm
+++ b/data/phone/text/beth_overworld.asm
diff --git a/data/phone_text/beverly_overworld.asm b/data/phone/text/beverly_overworld.asm
index cd4b5b4d3..cd4b5b4d3 100644
--- a/data/phone_text/beverly_overworld.asm
+++ b/data/phone/text/beverly_overworld.asm
diff --git a/data/phone_text/bill.asm b/data/phone/text/bill.asm
index 37c0cd546..37c0cd546 100644
--- a/data/phone_text/bill.asm
+++ b/data/phone/text/bill.asm
diff --git a/data/phone_text/brent_overworld.asm b/data/phone/text/brent_overworld.asm
index 0ece72091..0ece72091 100644
--- a/data/phone_text/brent_overworld.asm
+++ b/data/phone/text/brent_overworld.asm
diff --git a/data/phone_text/buena.asm b/data/phone/text/buena.asm
index 226839ee5..226839ee5 100644
--- a/data/phone_text/buena.asm
+++ b/data/phone/text/buena.asm
diff --git a/data/phone_text/chad_overworld.asm b/data/phone/text/chad_overworld.asm
index 883baa21c..883baa21c 100644
--- a/data/phone_text/chad_overworld.asm
+++ b/data/phone/text/chad_overworld.asm
diff --git a/data/phone_text/dana_overworld.asm b/data/phone/text/dana_overworld.asm
index 099909eb6..099909eb6 100644
--- a/data/phone_text/dana_overworld.asm
+++ b/data/phone/text/dana_overworld.asm
diff --git a/data/phone_text/derek_overworld.asm b/data/phone/text/derek_overworld.asm
index 12472ec75..12472ec75 100644
--- a/data/phone_text/derek_overworld.asm
+++ b/data/phone/text/derek_overworld.asm
diff --git a/data/phone_text/elm.asm b/data/phone/text/elm.asm
index cea36061f..cea36061f 100644
--- a/data/phone_text/elm.asm
+++ b/data/phone/text/elm.asm
diff --git a/data/phone_text/erin_overworld.asm b/data/phone/text/erin_overworld.asm
index 3cfbe742e..3cfbe742e 100644
--- a/data/phone_text/erin_overworld.asm
+++ b/data/phone/text/erin_overworld.asm
diff --git a/data/phone_text/extra.asm b/data/phone/text/extra.asm
index 92ac0f508..92ac0f508 100644
--- a/data/phone_text/extra.asm
+++ b/data/phone/text/extra.asm
diff --git a/data/phone_text/extra2.asm b/data/phone/text/extra2.asm
index cef21f23b..cef21f23b 100644
--- a/data/phone_text/extra2.asm
+++ b/data/phone/text/extra2.asm
diff --git a/data/phone_text/gaven_overworld.asm b/data/phone/text/gaven_overworld.asm
index 501aa0e79..501aa0e79 100644
--- a/data/phone_text/gaven_overworld.asm
+++ b/data/phone/text/gaven_overworld.asm
diff --git a/data/phone_text/gina_overworld.asm b/data/phone/text/gina_overworld.asm
index 559e7fc5b..559e7fc5b 100644
--- a/data/phone_text/gina_overworld.asm
+++ b/data/phone/text/gina_overworld.asm
diff --git a/data/phone_text/huey_overworld.asm b/data/phone/text/huey_overworld.asm
index 4629f8022..4629f8022 100644
--- a/data/phone_text/huey_overworld.asm
+++ b/data/phone/text/huey_overworld.asm
diff --git a/data/phone_text/irwin_overworld.asm b/data/phone/text/irwin_overworld.asm
index 530ad94dd..530ad94dd 100644
--- a/data/phone_text/irwin_overworld.asm
+++ b/data/phone/text/irwin_overworld.asm
diff --git a/data/phone_text/jack_overworld.asm b/data/phone/text/jack_overworld.asm
index 3cef012c3..3cef012c3 100644
--- a/data/phone_text/jack_overworld.asm
+++ b/data/phone/text/jack_overworld.asm
diff --git a/data/phone_text/joey_overworld.asm b/data/phone/text/joey_overworld.asm
index cb7c5934d..cb7c5934d 100644
--- a/data/phone_text/joey_overworld.asm
+++ b/data/phone/text/joey_overworld.asm
diff --git a/data/phone_text/jose_overworld.asm b/data/phone/text/jose_overworld.asm
index 05e50172c..05e50172c 100644
--- a/data/phone_text/jose_overworld.asm
+++ b/data/phone/text/jose_overworld.asm
diff --git a/data/phone_text/kenji_overworld.asm b/data/phone/text/kenji_overworld.asm
index a3206b946..a3206b946 100644
--- a/data/phone_text/kenji_overworld.asm
+++ b/data/phone/text/kenji_overworld.asm
diff --git a/data/phone_text/liz_overworld.asm b/data/phone/text/liz_overworld.asm
index cd840b5f8..cd840b5f8 100644
--- a/data/phone_text/liz_overworld.asm
+++ b/data/phone/text/liz_overworld.asm
diff --git a/data/phone_text/mom.asm b/data/phone/text/mom.asm
index 249b5c01d..249b5c01d 100644
--- a/data/phone_text/mom.asm
+++ b/data/phone/text/mom.asm
diff --git a/data/phone_text/parry_overworld.asm b/data/phone/text/parry_overworld.asm
index 6286aa272..6286aa272 100644
--- a/data/phone_text/parry_overworld.asm
+++ b/data/phone/text/parry_overworld.asm
diff --git a/data/phone_text/ralph_overworld.asm b/data/phone/text/ralph_overworld.asm
index 6c737cdf1..6c737cdf1 100644
--- a/data/phone_text/ralph_overworld.asm
+++ b/data/phone/text/ralph_overworld.asm
diff --git a/data/phone_text/reena_overworld.asm b/data/phone/text/reena_overworld.asm
index 04bf42c9a..04bf42c9a 100644
--- a/data/phone_text/reena_overworld.asm
+++ b/data/phone/text/reena_overworld.asm
diff --git a/data/phone_text/tiffany_overworld.asm b/data/phone/text/tiffany_overworld.asm
index a03173dfa..a03173dfa 100644
--- a/data/phone_text/tiffany_overworld.asm
+++ b/data/phone/text/tiffany_overworld.asm
diff --git a/data/phone_text/todd_overworld.asm b/data/phone/text/todd_overworld.asm
index 6b4e9dd4c..6b4e9dd4c 100644
--- a/data/phone_text/todd_overworld.asm
+++ b/data/phone/text/todd_overworld.asm
diff --git a/data/phone_text/trainers1.asm b/data/phone/text/trainers1.asm
index 29080f114..29080f114 100644
--- a/data/phone_text/trainers1.asm
+++ b/data/phone/text/trainers1.asm
diff --git a/data/phone_text/tully_overworld.asm b/data/phone/text/tully_overworld.asm
index 48d41ba7c..48d41ba7c 100644
--- a/data/phone_text/tully_overworld.asm
+++ b/data/phone/text/tully_overworld.asm
diff --git a/data/phone_text/vance_overworld.asm b/data/phone/text/vance_overworld.asm
index b01907d36..b01907d36 100644
--- a/data/phone_text/vance_overworld.asm
+++ b/data/phone/text/vance_overworld.asm
diff --git a/data/phone_text/wade_overworld.asm b/data/phone/text/wade_overworld.asm
index 7b0b96009..7b0b96009 100644
--- a/data/phone_text/wade_overworld.asm
+++ b/data/phone/text/wade_overworld.asm
diff --git a/data/phone_text/wilton_overworld.asm b/data/phone/text/wilton_overworld.asm
index a6e43ffb4..a6e43ffb4 100644
--- a/data/phone_text/wilton_overworld.asm
+++ b/data/phone/text/wilton_overworld.asm
diff --git a/engine/phone/buenas_password.asm b/engine/phone/buenas_password.asm
index bfcd1604c..0d144afa6 100644
--- a/engine/phone/buenas_password.asm
+++ b/engine/phone/buenas_password.asm
@@ -167,4 +167,4 @@ BuenaPhoneScript_Random1:
 	end
 ; a0c28
 
-INCLUDE "data/phone_text/buena.asm"
+INCLUDE "data/phone/text/buena.asm"
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
index 53bb519b3..9932d0f4f 100644
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -761,9 +761,9 @@ GetCallerLocation: ; 90439
 ; 9045f
 
 
-INCLUDE "data/phone_contacts.asm"
+INCLUDE "data/phone/phone_contacts.asm"
 
-INCLUDE "data/phone_special.asm"
+INCLUDE "data/phone/special_calls.asm"
 
 
 UnknownScript_0x90657: ; 0x90657
diff --git a/main.asm b/main.asm
index b935f90d3..4667de12f 100644
--- a/main.asm
+++ b/main.asm
@@ -294,7 +294,7 @@ INCBIN "gfx/unknown/unknown_egg.2bpp.lz"
 
 SECTION "Crystal Phone Text", ROMX
 
-INCLUDE "data/phone_text/extra.asm"
+INCLUDE "data/phone/text/extra.asm"
 
 
 SECTION "bank20", ROMX
@@ -354,23 +354,23 @@ INCLUDE "engine/phone/buenas_password.asm"
 
 SECTION "Phone Text", ROMX
 
-INCLUDE "data/phone_text/anthony_overworld.asm"
-INCLUDE "data/phone_text/todd_overworld.asm"
-INCLUDE "data/phone_text/gina_overworld.asm"
-INCLUDE "data/phone_text/irwin_overworld.asm"
-INCLUDE "data/phone_text/arnie_overworld.asm"
-INCLUDE "data/phone_text/alan_overworld.asm"
-INCLUDE "data/phone_text/dana_overworld.asm"
-INCLUDE "data/phone_text/chad_overworld.asm"
-INCLUDE "data/phone_text/derek_overworld.asm"
-INCLUDE "data/phone_text/tully_overworld.asm"
-INCLUDE "data/phone_text/brent_overworld.asm"
-INCLUDE "data/phone_text/tiffany_overworld.asm"
-INCLUDE "data/phone_text/vance_overworld.asm"
-INCLUDE "data/phone_text/wilton_overworld.asm"
-INCLUDE "data/phone_text/kenji_overworld.asm"
-INCLUDE "data/phone_text/parry_overworld.asm"
-INCLUDE "data/phone_text/erin_overworld.asm"
+INCLUDE "data/phone/text/anthony_overworld.asm"
+INCLUDE "data/phone/text/todd_overworld.asm"
+INCLUDE "data/phone/text/gina_overworld.asm"
+INCLUDE "data/phone/text/irwin_overworld.asm"
+INCLUDE "data/phone/text/arnie_overworld.asm"
+INCLUDE "data/phone/text/alan_overworld.asm"
+INCLUDE "data/phone/text/dana_overworld.asm"
+INCLUDE "data/phone/text/chad_overworld.asm"
+INCLUDE "data/phone/text/derek_overworld.asm"
+INCLUDE "data/phone/text/tully_overworld.asm"
+INCLUDE "data/phone/text/brent_overworld.asm"
+INCLUDE "data/phone/text/tiffany_overworld.asm"
+INCLUDE "data/phone/text/vance_overworld.asm"
+INCLUDE "data/phone/text/wilton_overworld.asm"
+INCLUDE "data/phone/text/kenji_overworld.asm"
+INCLUDE "data/phone/text/parry_overworld.asm"
+INCLUDE "data/phone/text/erin_overworld.asm"
 
 
 SECTION "bank2E", ROMX
@@ -550,7 +550,7 @@ INCLUDE "mobile/mobile_5c.asm"
 
 SECTION "Crystal Phone Text 2", ROMX
 
-INCLUDE "data/phone_text/extra2.asm"
+INCLUDE "data/phone/text/extra2.asm"
 
 
 SECTION "UpdateBattleHUDs", ROMX
@@ -571,25 +571,25 @@ INCLUDE "mobile/mobile_5f.asm"
 SECTION "Common Text 1", ROMX
 
 INCLUDE "data/std_text.asm"
-INCLUDE "data/phone_text/jack_overworld.asm"
-INCLUDE "data/phone_text/beverly_overworld.asm"
-INCLUDE "data/phone_text/huey_overworld.asm"
-INCLUDE "data/phone_text/gaven_overworld.asm"
-INCLUDE "data/phone_text/beth_overworld.asm"
-INCLUDE "data/phone_text/jose_overworld.asm"
-INCLUDE "data/phone_text/reena_overworld.asm"
-INCLUDE "data/phone_text/joey_overworld.asm"
-INCLUDE "data/phone_text/wade_overworld.asm"
-INCLUDE "data/phone_text/ralph_overworld.asm"
-INCLUDE "data/phone_text/liz_overworld.asm"
+INCLUDE "data/phone/text/jack_overworld.asm"
+INCLUDE "data/phone/text/beverly_overworld.asm"
+INCLUDE "data/phone/text/huey_overworld.asm"
+INCLUDE "data/phone/text/gaven_overworld.asm"
+INCLUDE "data/phone/text/beth_overworld.asm"
+INCLUDE "data/phone/text/jose_overworld.asm"
+INCLUDE "data/phone/text/reena_overworld.asm"
+INCLUDE "data/phone/text/joey_overworld.asm"
+INCLUDE "data/phone/text/wade_overworld.asm"
+INCLUDE "data/phone/text/ralph_overworld.asm"
+INCLUDE "data/phone/text/liz_overworld.asm"
 
 
 SECTION "Special Phone Text", ROMX
 
-INCLUDE "data/phone_text/mom.asm"
-INCLUDE "data/phone_text/bill.asm"
-INCLUDE "data/phone_text/elm.asm"
-INCLUDE "data/phone_text/trainers1.asm"
+INCLUDE "data/phone/text/mom.asm"
+INCLUDE "data/phone/text/bill.asm"
+INCLUDE "data/phone/text/elm.asm"
+INCLUDE "data/phone/text/trainers1.asm"
 
 
 SECTION "Miscellaneous Text", ROMX