diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-12-30 18:05:26 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-12-30 18:05:26 -0500 |
| commit | d3e0eda398eaed26110b58de07322c3cd1415bbe (patch) | |
| tree | 4a15590018569b53c0c95e6ef5c5094b0fb2b5b8 | |
| parent | 059e0df29858e7690208582ac370f7448baaeb7a (diff) | |
Distinguish "caller" and "called" phone scripts+text (NPCs call you automatically, you call them from the Pokégear)
| -rw-r--r-- | data/phone/text/generic_called.asm (renamed from data/phone/text/trainers.asm) | 0 | ||||
| -rw-r--r-- | data/phone/text/generic_caller.asm (renamed from data/phone/text/extra.asm) | 0 | ||||
| -rw-r--r-- | data/phone/text/generic_caller_2.asm (renamed from data/phone/text/extra2.asm) | 0 | ||||
| -rw-r--r-- | engine/phone/scripts/generic_called.asm (renamed from engine/phone/scripts/generic.asm) | 0 | ||||
| -rw-r--r-- | engine/phone/scripts/generic_caller.asm (renamed from engine/phone/scripts/callers.asm) | 0 | ||||
| -rw-r--r-- | main.asm | 10 |
6 files changed, 5 insertions, 5 deletions
diff --git a/data/phone/text/trainers.asm b/data/phone/text/generic_called.asm index 5e99f60a0..5e99f60a0 100644 --- a/data/phone/text/trainers.asm +++ b/data/phone/text/generic_called.asm diff --git a/data/phone/text/extra.asm b/data/phone/text/generic_caller.asm index f7c2bb380..f7c2bb380 100644 --- a/data/phone/text/extra.asm +++ b/data/phone/text/generic_caller.asm diff --git a/data/phone/text/extra2.asm b/data/phone/text/generic_caller_2.asm index da6acc40c..da6acc40c 100644 --- a/data/phone/text/extra2.asm +++ b/data/phone/text/generic_caller_2.asm diff --git a/engine/phone/scripts/generic.asm b/engine/phone/scripts/generic_called.asm index 407480d36..407480d36 100644 --- a/engine/phone/scripts/generic.asm +++ b/engine/phone/scripts/generic_called.asm diff --git a/engine/phone/scripts/callers.asm b/engine/phone/scripts/generic_caller.asm index a929ba1d8..a929ba1d8 100644 --- a/engine/phone/scripts/callers.asm +++ b/engine/phone/scripts/generic_caller.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 |