diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-23 17:20:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-23 17:20:21 -0500 |
| commit | d787c66374df60fceb34fa5860c34bf56e476cbe (patch) | |
| tree | 782f2b25f21adacb48fd516694b8a82864fe0b99 /main.asm | |
| parent | 878092004956418bfd77bfdb9fc9dd7f640f80d2 (diff) | |
| parent | c51968f0de6b8420c141dde27339e82a42837c5b (diff) | |
Merge pull request #420 from surskitty/master
Partial Phone Script Labels
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -762,7 +762,7 @@ INCLUDE "engine/mon_icons.asm" SECTION "bank24", ROMX -INCLUDE "engine/phone.asm" +INCLUDE "engine/phone/phone.asm" INCLUDE "engine/timeset.asm" INCLUDE "engine/pokegear.asm" INCLUDE "engine/fish.asm" @@ -771,8 +771,9 @@ INCLUDE "engine/slot_machine.asm" SECTION "Phone Engine", ROMX -INCLUDE "engine/more_phone_scripts.asm" -INCLUDE "engine/buena_phone_scripts.asm" +INCLUDE "engine/phone/phone_callers.asm" +INCLUDE "engine/phone/phone_gossip.asm" +INCLUDE "engine/phone/buenas_password.asm" SECTION "Phone Text", ROMX @@ -806,7 +807,8 @@ INCLUDE "gfx/mail.asm" SECTION "bank2F", ROMX INCLUDE "engine/std_scripts.asm" -INCLUDE "engine/phone_scripts.asm" +INCLUDE "engine/phone/phone_scripts.asm" +INCLUDE "engine/phone/generic_calls.asm" INCLUDE "engine/trainer_scripts.asm" |