From d3e0eda398eaed26110b58de07322c3cd1415bbe Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 30 Dec 2018 18:05:26 -0500 Subject: [PATCH] =?UTF-8?q?Distinguish=20"caller"=20and=20"called"=20phone?= =?UTF-8?q?=20scripts+text=20(NPCs=20call=20you=20automatically,=20you=20c?= =?UTF-8?q?all=20them=20from=20the=20Pok=C3=A9gear)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/phone/text/{trainers.asm => generic_called.asm} | 0 data/phone/text/{extra.asm => generic_caller.asm} | 0 data/phone/text/{extra2.asm => generic_caller_2.asm} | 0 .../phone/scripts/{generic.asm => generic_called.asm} | 0 .../phone/scripts/{callers.asm => generic_caller.asm} | 0 main.asm | 10 +++++----- 6 files changed, 5 insertions(+), 5 deletions(-) rename data/phone/text/{trainers.asm => generic_called.asm} (100%) rename data/phone/text/{extra.asm => generic_caller.asm} (100%) rename data/phone/text/{extra2.asm => generic_caller_2.asm} (100%) rename engine/phone/scripts/{generic.asm => generic_called.asm} (100%) rename engine/phone/scripts/{callers.asm => generic_caller.asm} (100%) diff --git a/data/phone/text/trainers.asm b/data/phone/text/generic_called.asm similarity index 100% rename from data/phone/text/trainers.asm rename to data/phone/text/generic_called.asm diff --git a/data/phone/text/extra.asm b/data/phone/text/generic_caller.asm similarity index 100% rename from data/phone/text/extra.asm rename to data/phone/text/generic_caller.asm diff --git a/data/phone/text/extra2.asm b/data/phone/text/generic_caller_2.asm similarity index 100% rename from data/phone/text/extra2.asm rename to data/phone/text/generic_caller_2.asm diff --git a/engine/phone/scripts/generic.asm b/engine/phone/scripts/generic_called.asm similarity index 100% rename from engine/phone/scripts/generic.asm rename to engine/phone/scripts/generic_called.asm diff --git a/engine/phone/scripts/callers.asm b/engine/phone/scripts/generic_caller.asm similarity index 100% rename from engine/phone/scripts/callers.asm rename to engine/phone/scripts/generic_caller.asm diff --git a/main.asm b/main.asm index c02ab7cc4..a3a12df85 100644 --- a/main.asm +++ b/main.asm @@ -269,7 +269,7 @@ INCBIN "gfx/unknown/unknown_egg.2bpp.lz" SECTION "Crystal Phone Text", ROMX -INCLUDE "data/phone/text/extra.asm" +INCLUDE "data/phone/text/generic_caller.asm" SECTION "bank20", ROMX @@ -323,7 +323,7 @@ INCLUDE "engine/games/slot_machine.asm" SECTION "Phone Engine", ROMX -INCLUDE "engine/phone/scripts/callers.asm" +INCLUDE "engine/phone/scripts/generic_caller.asm" INCLUDE "engine/phone/scripts/jack_gossip.asm" INCLUDE "engine/phone/scripts/liz_gossip.asm" INCLUDE "engine/phone/scripts/chad_gossip.asm" @@ -403,7 +403,7 @@ INCLUDE "engine/phone/scripts/wilton.asm" INCLUDE "engine/phone/scripts/kenji.asm" INCLUDE "engine/phone/scripts/parry.asm" INCLUDE "engine/phone/scripts/erin.asm" -INCLUDE "engine/phone/scripts/generic.asm" +INCLUDE "engine/phone/scripts/generic_called.asm" INCLUDE "engine/events/trainer_scripts.asm" @@ -560,7 +560,7 @@ INCLUDE "mobile/mobile_5c.asm" SECTION "Crystal Phone Text 2", ROMX -INCLUDE "data/phone/text/extra2.asm" +INCLUDE "data/phone/text/generic_caller_2.asm" SECTION "UpdateBattleHUDs", ROMX @@ -599,7 +599,7 @@ 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/trainers.asm" +INCLUDE "data/phone/text/generic_called.asm" SECTION "Miscellaneous Text", ROMX