From feb34b49ba23151507332a6354f124f4fe7b1a4b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 19:51:30 -0500 Subject: [PATCH] =?UTF-8?q?data/phone=5Ftext=20=E2=86=92=20data/phone/text?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/phone_constants.asm | 4 +- data/{ => phone}/phone_contacts.asm | 0 .../special_calls.asm} | 0 .../text}/alan_overworld.asm | 0 .../text}/anthony_overworld.asm | 0 .../text}/arnie_overworld.asm | 0 .../text}/beth_overworld.asm | 0 .../text}/beverly_overworld.asm | 0 data/{phone_text => phone/text}/bill.asm | 0 .../text}/brent_overworld.asm | 0 data/{phone_text => phone/text}/buena.asm | 0 .../text}/chad_overworld.asm | 0 .../text}/dana_overworld.asm | 0 .../text}/derek_overworld.asm | 0 data/{phone_text => phone/text}/elm.asm | 0 .../text}/erin_overworld.asm | 0 data/{phone_text => phone/text}/extra.asm | 0 data/{phone_text => phone/text}/extra2.asm | 0 .../text}/gaven_overworld.asm | 0 .../text}/gina_overworld.asm | 0 .../text}/huey_overworld.asm | 0 .../text}/irwin_overworld.asm | 0 .../text}/jack_overworld.asm | 0 .../text}/joey_overworld.asm | 0 .../text}/jose_overworld.asm | 0 .../text}/kenji_overworld.asm | 0 .../text}/liz_overworld.asm | 0 data/{phone_text => phone/text}/mom.asm | 0 .../text}/parry_overworld.asm | 0 .../text}/ralph_overworld.asm | 0 .../text}/reena_overworld.asm | 0 .../text}/tiffany_overworld.asm | 0 .../text}/todd_overworld.asm | 0 data/{phone_text => phone/text}/trainers1.asm | 0 .../text}/tully_overworld.asm | 0 .../text}/vance_overworld.asm | 0 .../text}/wade_overworld.asm | 0 .../text}/wilton_overworld.asm | 0 engine/phone/buenas_password.asm | 2 +- engine/phone/phone.asm | 4 +- main.asm | 68 +++++++++---------- 41 files changed, 39 insertions(+), 39 deletions(-) rename data/{ => phone}/phone_contacts.asm (100%) rename data/{phone_special.asm => phone/special_calls.asm} (100%) rename data/{phone_text => phone/text}/alan_overworld.asm (100%) rename data/{phone_text => phone/text}/anthony_overworld.asm (100%) rename data/{phone_text => phone/text}/arnie_overworld.asm (100%) rename data/{phone_text => phone/text}/beth_overworld.asm (100%) rename data/{phone_text => phone/text}/beverly_overworld.asm (100%) rename data/{phone_text => phone/text}/bill.asm (100%) rename data/{phone_text => phone/text}/brent_overworld.asm (100%) rename data/{phone_text => phone/text}/buena.asm (100%) rename data/{phone_text => phone/text}/chad_overworld.asm (100%) rename data/{phone_text => phone/text}/dana_overworld.asm (100%) rename data/{phone_text => phone/text}/derek_overworld.asm (100%) rename data/{phone_text => phone/text}/elm.asm (100%) rename data/{phone_text => phone/text}/erin_overworld.asm (100%) rename data/{phone_text => phone/text}/extra.asm (100%) rename data/{phone_text => phone/text}/extra2.asm (100%) rename data/{phone_text => phone/text}/gaven_overworld.asm (100%) rename data/{phone_text => phone/text}/gina_overworld.asm (100%) rename data/{phone_text => phone/text}/huey_overworld.asm (100%) rename data/{phone_text => phone/text}/irwin_overworld.asm (100%) rename data/{phone_text => phone/text}/jack_overworld.asm (100%) rename data/{phone_text => phone/text}/joey_overworld.asm (100%) rename data/{phone_text => phone/text}/jose_overworld.asm (100%) rename data/{phone_text => phone/text}/kenji_overworld.asm (100%) rename data/{phone_text => phone/text}/liz_overworld.asm (100%) rename data/{phone_text => phone/text}/mom.asm (100%) rename data/{phone_text => phone/text}/parry_overworld.asm (100%) rename data/{phone_text => phone/text}/ralph_overworld.asm (100%) rename data/{phone_text => phone/text}/reena_overworld.asm (100%) rename data/{phone_text => phone/text}/tiffany_overworld.asm (100%) rename data/{phone_text => phone/text}/todd_overworld.asm (100%) rename data/{phone_text => phone/text}/trainers1.asm (100%) rename data/{phone_text => phone/text}/tully_overworld.asm (100%) rename data/{phone_text => phone/text}/vance_overworld.asm (100%) rename data/{phone_text => phone/text}/wade_overworld.asm (100%) rename data/{phone_text => phone/text}/wilton_overworld.asm (100%) 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 similarity index 100% rename from data/phone_contacts.asm rename to data/phone/phone_contacts.asm diff --git a/data/phone_special.asm b/data/phone/special_calls.asm similarity index 100% rename from data/phone_special.asm rename to data/phone/special_calls.asm diff --git a/data/phone_text/alan_overworld.asm b/data/phone/text/alan_overworld.asm similarity index 100% rename from data/phone_text/alan_overworld.asm rename to data/phone/text/alan_overworld.asm diff --git a/data/phone_text/anthony_overworld.asm b/data/phone/text/anthony_overworld.asm similarity index 100% rename from data/phone_text/anthony_overworld.asm rename to data/phone/text/anthony_overworld.asm diff --git a/data/phone_text/arnie_overworld.asm b/data/phone/text/arnie_overworld.asm similarity index 100% rename from data/phone_text/arnie_overworld.asm rename to data/phone/text/arnie_overworld.asm diff --git a/data/phone_text/beth_overworld.asm b/data/phone/text/beth_overworld.asm similarity index 100% rename from data/phone_text/beth_overworld.asm rename to data/phone/text/beth_overworld.asm diff --git a/data/phone_text/beverly_overworld.asm b/data/phone/text/beverly_overworld.asm similarity index 100% rename from data/phone_text/beverly_overworld.asm rename to data/phone/text/beverly_overworld.asm diff --git a/data/phone_text/bill.asm b/data/phone/text/bill.asm similarity index 100% rename from data/phone_text/bill.asm rename to data/phone/text/bill.asm diff --git a/data/phone_text/brent_overworld.asm b/data/phone/text/brent_overworld.asm similarity index 100% rename from data/phone_text/brent_overworld.asm rename to data/phone/text/brent_overworld.asm diff --git a/data/phone_text/buena.asm b/data/phone/text/buena.asm similarity index 100% rename from data/phone_text/buena.asm rename to data/phone/text/buena.asm diff --git a/data/phone_text/chad_overworld.asm b/data/phone/text/chad_overworld.asm similarity index 100% rename from data/phone_text/chad_overworld.asm rename to data/phone/text/chad_overworld.asm diff --git a/data/phone_text/dana_overworld.asm b/data/phone/text/dana_overworld.asm similarity index 100% rename from data/phone_text/dana_overworld.asm rename to data/phone/text/dana_overworld.asm diff --git a/data/phone_text/derek_overworld.asm b/data/phone/text/derek_overworld.asm similarity index 100% rename from data/phone_text/derek_overworld.asm rename to data/phone/text/derek_overworld.asm diff --git a/data/phone_text/elm.asm b/data/phone/text/elm.asm similarity index 100% rename from data/phone_text/elm.asm rename to data/phone/text/elm.asm diff --git a/data/phone_text/erin_overworld.asm b/data/phone/text/erin_overworld.asm similarity index 100% rename from data/phone_text/erin_overworld.asm rename to data/phone/text/erin_overworld.asm diff --git a/data/phone_text/extra.asm b/data/phone/text/extra.asm similarity index 100% rename from data/phone_text/extra.asm rename to data/phone/text/extra.asm diff --git a/data/phone_text/extra2.asm b/data/phone/text/extra2.asm similarity index 100% rename from data/phone_text/extra2.asm rename to data/phone/text/extra2.asm diff --git a/data/phone_text/gaven_overworld.asm b/data/phone/text/gaven_overworld.asm similarity index 100% rename from data/phone_text/gaven_overworld.asm rename to data/phone/text/gaven_overworld.asm diff --git a/data/phone_text/gina_overworld.asm b/data/phone/text/gina_overworld.asm similarity index 100% rename from data/phone_text/gina_overworld.asm rename to data/phone/text/gina_overworld.asm diff --git a/data/phone_text/huey_overworld.asm b/data/phone/text/huey_overworld.asm similarity index 100% rename from data/phone_text/huey_overworld.asm rename to data/phone/text/huey_overworld.asm diff --git a/data/phone_text/irwin_overworld.asm b/data/phone/text/irwin_overworld.asm similarity index 100% rename from data/phone_text/irwin_overworld.asm rename to data/phone/text/irwin_overworld.asm diff --git a/data/phone_text/jack_overworld.asm b/data/phone/text/jack_overworld.asm similarity index 100% rename from data/phone_text/jack_overworld.asm rename to data/phone/text/jack_overworld.asm diff --git a/data/phone_text/joey_overworld.asm b/data/phone/text/joey_overworld.asm similarity index 100% rename from data/phone_text/joey_overworld.asm rename to data/phone/text/joey_overworld.asm diff --git a/data/phone_text/jose_overworld.asm b/data/phone/text/jose_overworld.asm similarity index 100% rename from data/phone_text/jose_overworld.asm rename to data/phone/text/jose_overworld.asm diff --git a/data/phone_text/kenji_overworld.asm b/data/phone/text/kenji_overworld.asm similarity index 100% rename from data/phone_text/kenji_overworld.asm rename to data/phone/text/kenji_overworld.asm diff --git a/data/phone_text/liz_overworld.asm b/data/phone/text/liz_overworld.asm similarity index 100% rename from data/phone_text/liz_overworld.asm rename to data/phone/text/liz_overworld.asm diff --git a/data/phone_text/mom.asm b/data/phone/text/mom.asm similarity index 100% rename from data/phone_text/mom.asm rename to data/phone/text/mom.asm diff --git a/data/phone_text/parry_overworld.asm b/data/phone/text/parry_overworld.asm similarity index 100% rename from data/phone_text/parry_overworld.asm rename to data/phone/text/parry_overworld.asm diff --git a/data/phone_text/ralph_overworld.asm b/data/phone/text/ralph_overworld.asm similarity index 100% rename from data/phone_text/ralph_overworld.asm rename to data/phone/text/ralph_overworld.asm diff --git a/data/phone_text/reena_overworld.asm b/data/phone/text/reena_overworld.asm similarity index 100% rename from data/phone_text/reena_overworld.asm rename to data/phone/text/reena_overworld.asm diff --git a/data/phone_text/tiffany_overworld.asm b/data/phone/text/tiffany_overworld.asm similarity index 100% rename from data/phone_text/tiffany_overworld.asm rename to data/phone/text/tiffany_overworld.asm diff --git a/data/phone_text/todd_overworld.asm b/data/phone/text/todd_overworld.asm similarity index 100% rename from data/phone_text/todd_overworld.asm rename to data/phone/text/todd_overworld.asm diff --git a/data/phone_text/trainers1.asm b/data/phone/text/trainers1.asm similarity index 100% rename from data/phone_text/trainers1.asm rename to data/phone/text/trainers1.asm diff --git a/data/phone_text/tully_overworld.asm b/data/phone/text/tully_overworld.asm similarity index 100% rename from data/phone_text/tully_overworld.asm rename to data/phone/text/tully_overworld.asm diff --git a/data/phone_text/vance_overworld.asm b/data/phone/text/vance_overworld.asm similarity index 100% rename from data/phone_text/vance_overworld.asm rename to data/phone/text/vance_overworld.asm diff --git a/data/phone_text/wade_overworld.asm b/data/phone/text/wade_overworld.asm similarity index 100% rename from data/phone_text/wade_overworld.asm rename to data/phone/text/wade_overworld.asm diff --git a/data/phone_text/wilton_overworld.asm b/data/phone/text/wilton_overworld.asm similarity index 100% rename from data/phone_text/wilton_overworld.asm rename to 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