pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Distinguish "caller" and "called" phone scripts+text (NPCs call you automatically, you call them from the Pokégear)

Browse Source
This commit is contained in:
Rangi 2018-12-30 18:05:26 -05:00
parent 059e0df298
commit d3e0eda398
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/phone/text/trainers.asm → data/phone/text/generic_called.asm
View File

0
data/phone/text/extra.asm → data/phone/text/generic_caller.asm
View File

0
data/phone/text/extra2.asm → data/phone/text/generic_caller_2.asm
View File

0
engine/phone/scripts/generic.asm → engine/phone/scripts/generic_called.asm
View File

0
engine/phone/scripts/callers.asm → engine/phone/scripts/generic_caller.asm
View File

10
main.asm
View File

@ -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