summaryrefslogtreecommitdiff
path: root/data/scripts/apprentice.inc
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-03-02 17:35:44 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-03-02 17:35:44 -0500
commit9372731c3ef1ac5f7ed59a85b071bde7b87d2460 (patch)
tree3122377a548140355ae1a3350212cc52827bc9ac /data/scripts/apprentice.inc
parent3716da5430a976d05afecdf82f43f14fc2584949 (diff)
parent043071ae12aa6854119a44304a5facbd58fa3624 (diff)
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'data/scripts/apprentice.inc')
-rw-r--r--data/scripts/apprentice.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index ac4bd1979..d6713cde4 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -269,8 +269,8 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
apprentice_msg TRUE, 11
setvar VAR_0x8004, 25
special CallApprenticeFunction
- setvar VAR_0x8004, 19
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE
+ call Common_ShowEasyChatScreen
lock
faceplayer
setvar VAR_0x8004, 21