summaryrefslogtreecommitdiff
path: root/data/scripts/apprentice.inc
diff options
context:
space:
mode:
authorhuderlem <huderlem@gmail.com>2019-01-03 20:37:25 -0600
committerGitHub <noreply@github.com>2019-01-03 20:37:25 -0600
commitcba2f81bf870734960492b2d586d5a0684d99cf5 (patch)
tree5845c0ad7355d3568637287b19796be4668d1b36 /data/scripts/apprentice.inc
parentfd201f8395fccaf26349b352d3b0eda98bec8593 (diff)
parent97ebeef1dbe8b4954d234fda067651f63d7e6360 (diff)
Merge pull request #507 from Tetrable/master
Finish off labeling flags
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 034732db2..ac4bd1979 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -33,7 +33,7 @@ EventScript_Apprentice:: @ 82B688D
special CallApprenticeFunction
compare VAR_0x8004, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE
- goto_if_set FLAG_0x934, Script_Apprentice_ReleaseAndEnd
+ goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, Script_Apprentice_ReleaseAndEnd
BattleFrontier_BattleTowerLobby_EventScript_2B68BE:
setvar VAR_0x8004, 11
@@ -289,7 +289,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
Script_Apprentice_SetLeavingFlags:
setflag FLAG_HIDE_APPRENTICE
- setflag FLAG_0x934
+ setflag FLAG_DAILY_APPRENTICE_LEAVES
return
Script_Apprentice_LeaveGoRight: